/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.157 Revision 1.226
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.226 2006/02/20 11:56:33 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 18
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 21# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 22# must be an integer greater than zero.
105# to point to the latest version of the library present. 60# to point to the latest version of the library present.
106# 61#
107# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
108# 63#
109gen_usr_ldscript() { 64gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
111 # Just make sure it exists 66 # Just make sure it exists
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
69 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 71 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 75 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 76
121 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
122GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 80 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
125}
126
127# Simple function to draw a line consisting of '=' the same length as $*
128#
129# <azarah@gentoo.org> (11 Nov 2002)
130#
131draw_line() {
132 local i=0
133 local str_length=""
134
135 # Handle calls that do not have args, or wc not being installed ...
136 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
137 then
138 echo "==============================================================="
139 return 0
140 fi
141
142 # Get the length of $*
143 str_length="$(echo -n "$*" | wc -m)"
144
145 while [ "$i" -lt "${str_length}" ]
146 do
147 echo -n "="
148
149 i=$((i + 1))
150 done 82 done
151
152 echo
153
154 return 0
155} 83}
84
156 85
157# Default directory where patches are located 86# Default directory where patches are located
158EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 88# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 90# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
165# and not the full path .. 95# and not the full path ..
166EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 97# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
170# 102#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 104#
173EPATCH_FORCE="no" 105EPATCH_FORCE="no"
204# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
205# 137#
206# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
207# 139#
208epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
209 local PIPE_CMD="" 159 local PIPE_CMD=""
210 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
211 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
214 local x="" 164 local x=""
215 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
216 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
217 then 169 then
218 local m="" 170 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 171 for m in "$@" ; do
221 epatch "${m}" 172 epatch "${m}"
222 done 173 done
223 return 0 174 return 0
224 fi 175 fi
278 ;; 229 ;;
279 esac 230 esac
280 231
281 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
282 then 233 then
283 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
284 fi 235 fi
285 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
286 do 237 do
287 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
288 # 239 #
289 # ???_arch_foo.patch 240 # ???_arch_foo.patch
290 # 241 #
291 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
294 then 245 then
295 local count=0 246 local count=0
296 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 248 local patchname=${x##*/}
321 272
322 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
323 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
324 do 275 do
325 # Generate some useful debug info ... 276 # Generate some useful debug info ...
326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 279
329 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
330 then 281 then
331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 287
337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 290
340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 293
343 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
344 then 295 then
345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
346 then 297 then
350 count=5 301 count=5
351 break 302 break
352 fi 303 fi
353 fi 304 fi
354 305
355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
356 then 307 then
357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 313
363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
364 316
365 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
366 then 318 then
367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
368 echo 320 echo
386 fi 338 fi
387 339
388 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
389 then 341 then
390 echo 342 echo
391 eerror "Failed Patch: ${patchname}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
392 eerror 345 eerror
393 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
394 eerror 347 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 349 echo
406 then 359 then
407 einfo "Done with patching" 360 einfo "Done with patching"
408 fi 361 fi
409} 362}
410 363
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
537# Cheap replacement for when debianutils (and thus mktemp) 364# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 365# does not exist on the users system
539# vapier@gentoo.org 366# vapier@gentoo.org
540# 367#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 369emktemp() {
543 local exe="touch" 370 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 372 local topdir=$1
546 373
547 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 376 && topdir="/tmp" \
551 || topdir="${T}" 377 || topdir=${T}
552 fi 378 fi
553 379
554 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 381 local tmp=/
557 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 384 done
560 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 386 echo "${tmp}"
562 else 387 else
563 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
564 && exe="-p" \ 389 [[ ${USERLAND} == "GNU" ]] \
565 || exe="-d" 390 && mktemp -p "${topdir}" \
566 mktemp ${exe} "${topdir}" 391 || TMPDIR="${topdir}" mktemp -t tmp
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && mktemp -d "${topdir}" \
395 || TMPDIR="${topdir}" mktemp -dt tmp
396 fi
567 fi 397 fi
568} 398}
569 399
570# Small wrapper for getent (Linux), nidump (Mac OS X), 400# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 401# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 402# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 403# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 404#
575# egetent(database, key) 405# egetent(database, key)
576egetent() { 406egetent() {
577 if useq ppc-macos ; then 407 case ${CHOST} in
408 *-darwin*)
578 case "$2" in 409 case "$2" in
579 *[!0-9]*) # Non numeric 410 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 411 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 412 ;;
582 *) # Numeric 413 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 415 ;;
585 esac 416 esac
586 elif useq x86-fbsd ; then 417 ;;
587 local action 418 *-freebsd*|*-dragonfly*)
588 if [ "$1" == "passwd" ] 419 local opts action="user"
589 then 420 [[ $1 == "passwd" ]] || action="group"
590 action="user" 421
591 else 422 # lookup by uid/gid
592 action="group" 423 if [[ $2 == [[:digit:]]* ]] ; then
424 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 425 fi
426
594 pw show "${action}" "$2" -q 427 pw show ${action} ${opts} "$2" -q
595 else 428 ;;
429 *-netbsd*|*-openbsd*)
430 grep "$2:\*:" /etc/$1
431 ;;
432 *)
596 which nscd >& /dev/null && nscd -i "$1" 433 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 434 getent "$1" "$2"
598 fi 435 ;;
436 esac
599} 437}
600 438
601# Simplify/standardize adding users to the system 439# Simplify/standardize adding users to the system
602# vapier@gentoo.org 440# vapier@gentoo.org
603# 441#
611# homedir: /dev/null 449# homedir: /dev/null
612# groups: none 450# groups: none
613# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
614enewuser() { 452enewuser() {
615 # get the username 453 # get the username
616 local euser="$1"; shift 454 local euser=$1; shift
617 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 456 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
621 fi 458 fi
622 459
623 # lets see if the username already exists 460 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 462 return 0
627 fi 463 fi
628 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
629 465
630 # options to pass to useradd 466 # options to pass to useradd
631 local opts= 467 local opts=
632 468
633 # handle uid 469 # handle uid
634 local euid="$1"; shift 470 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 474 euid="next"
642 fi 475 fi
643 else 476 else
644 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
646 fi 479 fi
647 else 480 else
648 euid="next" 481 euid="next"
649 fi 482 fi
650 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
651 then 484 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 485 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 486 done
661 fi 487 fi
662 opts="${opts} -u ${euid}" 488 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 489 einfo " - Userid: ${euid}"
664 490
665 # handle shell 491 # handle shell
666 local eshell="$1"; shift 492 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 493 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 494 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 495 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 496 die "${eshell} does not exist in ${ROOT}"
673 fi 497 fi
674 else 498 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
675 if [ "${USERLAND}" == "BSD" ] 499 eerror "Do not specify ${eshell} yourself, use -1"
676 then 500 die "Pass '-1' as the shell parameter"
677 eshell="/usr/bin/false" 501 fi
678 else 502 else
679 eshell="/bin/false" 503 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 [[ -x ${ROOT}${shell} ]] && break
505 done
506
507 if [[ ${shell} == "/dev/null" ]] ; then
508 eerror "Unable to identify the shell to use"
509 die "Unable to identify the shell to use"
680 fi 510 fi
511
512 eshell=${shell}
681 fi 513 fi
682 einfo " - Shell: ${eshell}" 514 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 515 opts="${opts} -s ${eshell}"
684 516
685 # handle homedir 517 # handle homedir
686 local ehome="$1"; shift 518 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 519 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 520 ehome="/dev/null"
690 fi 521 fi
691 einfo " - Home: ${ehome}" 522 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 523 opts="${opts} -d ${ehome}"
693 524
694 # handle groups 525 # handle groups
695 local egroups="$1"; shift 526 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 527 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 528 local oldifs=${IFS}
699 local defgroup="" exgroups="" 529 local defgroup="" exgroups=""
700 530
701 export IFS="," 531 export IFS=","
702 for g in ${egroups} 532 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 533 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 534 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 535 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 536 die "${g} is not a valid GID"
709 fi 537 fi
710 if [ -z "${defgroup}" ] 538 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 539 defgroup=${g}
713 else 540 else
714 exgroups="${exgroups},${g}" 541 exgroups="${exgroups},${g}"
715 fi 542 fi
716 export IFS="," 543 export IFS=","
717 done 544 done
718 export IFS="${oldifs}" 545 export IFS=${oldifs}
719 546
720 opts="${opts} -g ${defgroup}" 547 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 548 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 549 opts="${opts} -G ${exgroups:1}"
724 fi 550 fi
725 else 551 else
726 egroups="(none)" 552 egroups="(none)"
727 fi 553 fi
728 einfo " - Groups: ${egroups}" 554 einfo " - Groups: ${egroups}"
729 555
730 # handle extra and add the user 556 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 557 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 558 export SANDBOX_ON="0"
734 if useq ppc-macos 559 case ${CHOST} in
735 then 560 *-darwin*)
736 ### Make the user 561 ### Make the user
737 if [ -z "${eextra}" ] 562 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 563 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 564 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 565 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 566 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 567 ### Add the user to the groups specified
744 local oldifs="${IFS}" 568 local oldifs=${IFS}
745 export IFS="," 569 export IFS=","
746 for g in ${egroups} 570 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 571 dscl . merge /groups/${g} users ${euser}
749 done 572 done
750 export IFS="${oldifs}" 573 export IFS=${oldifs}
751 else 574 else
752 einfo "Extra options are not supported on macos yet" 575 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 576 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 577 einfo "eextra: $@"
755 die "Required function missing" 578 die "Required function missing"
756 fi 579 fi
757 elif use x86-fbsd ; then 580 ;;
758 if [ -z "${eextra}" ] 581 *-freebsd*|*-dragonfly*)
759 then 582 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 584 -c "added by portage for ${PN}" \
762 die "enewuser failed" 585 die "enewuser failed"
763 else 586 else
764 einfo " - Extra: ${eextra}" 587 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 589 "$@" || die "enewuser failed"
767 fi 590 fi
591 ;;
592
593 *-netbsd*)
594 if [[ -z $@ ]] ; then
595 useradd ${opts} ${euser} || die "enewuser failed"
768 else 596 else
769 if [ -z "${eextra}" ] 597 einfo " - Extra: $@"
770 then 598 useradd ${opts} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
602 *-openbsd*)
603 if [[ -z $@ ]] ; then
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} || die "enewuser failed"
607 else
608 einfo " - Extra: $@"
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} "$@" || die "enewuser failed"
612 fi
613 ;;
614
615 *)
616 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 617 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 618 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 619 || die "enewuser failed"
774 else 620 else
775 einfo " - Extra: ${eextra}" 621 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 622 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 623 || die "enewuser failed"
778 fi 624 fi
625 ;;
626 esac
627
628 if [[ ! -e ${ROOT}/${ehome} ]] ; then
629 einfo " - Creating ${ehome} in ${ROOT}"
630 mkdir -p "${ROOT}/${ehome}"
631 chown ${euser} "${ROOT}/${ehome}"
632 chmod 755 "${ROOT}/${ehome}"
779 fi 633 fi
634
780 export SANDBOX_ON="${oldsandbox}" 635 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 636}
790 637
791# Simplify/standardize adding groups to the system 638# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 639# vapier@gentoo.org
793# 640#
822 then 669 then
823 if [ "${egid}" -gt 0 ] 670 if [ "${egid}" -gt 0 ]
824 then 671 then
825 if [ -z "`egetent group ${egid}`" ] 672 if [ -z "`egetent group ${egid}`" ]
826 then 673 then
827 if useq ppc-macos ; then 674 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 675 opts="${opts} ${egid}"
829 else 676 else
830 opts="${opts} -g ${egid}" 677 opts="${opts} -g ${egid}"
831 fi 678 fi
832 else 679 else
846 opts="${opts} ${eextra}" 693 opts="${opts} ${eextra}"
847 694
848 # add the group 695 # add the group
849 local oldsandbox="${SANDBOX_ON}" 696 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 697 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 698 case ${CHOST} in
699 *-darwin*)
852 if [ ! -z "${eextra}" ]; 700 if [ ! -z "${eextra}" ];
853 then 701 then
854 einfo "Extra options are not supported on macos yet" 702 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 703 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 704 einfo "eextra: ${eextra}"
857 die "Required function missing" 705 die "Required function missing"
858 fi 706 fi
859 707
860 # If we need the next available 708 # If we need the next available
861 case ${egid} in 709 case ${egid} in
862 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 711 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
865 done 713 done
866 esac 714 esac
867 dscl . create /groups/${egroup} gid ${egid} 715 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 716 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 717 ;;
718
719 *-freebsd*|*-dragonfly*)
870 case ${egid} in 720 case ${egid} in
871 *[!0-9]*) # Non numeric 721 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 722 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 723 [ -z "`egetent group ${egid}`" ] && break
874 done 724 done
875 esac 725 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 726 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 727 ;;
728
729 *-netbsd*)
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
737 ;;
738
739 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 740 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 741 ;;
742 esac
880 export SANDBOX_ON="${oldsandbox}" 743 export SANDBOX_ON="${oldsandbox}"
881} 744}
882 745
883# Simple script to replace 'dos2unix' binaries 746# Simple script to replace 'dos2unix' binaries
884# vapier@gentoo.org 747# vapier@gentoo.org
909# name: the name that will show up in the menu 772# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 773# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 774# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 775# a full path to an icon
913# type: what kind of application is this ? for categories: 776# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 777# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 778# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 779make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 780 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 781
919 local exec="${1}" 782 local exec=${1}
920 local name="${2:-${PN}}" 783 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 784 local icon=${3:-${PN}.png}
922 local type="${4}" 785 local type=${4}
923 local subdir="${6}" 786 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 787
925 if [ -z "${type}" ] 788 if [[ -z ${type} ]] ; then
926 then 789 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 790 local catmin=${CATEGORY##*-}
928 "app-emulation") 791 case ${catmaj} in
929 type=Emulator 792 app)
930 subdir="Emulation" 793 case ${catmin} in
794 admin) type=System;;
795 cdr) type=DiscBurning;;
796 dicts) type=Dictionary;;
797 editors) type=TextEditor;;
798 emacs) type=TextEditor;;
799 emulation) type=Emulator;;
800 laptop) type=HardwareSettings;;
801 office) type=Office;;
802 vim) type=TextEditor;;
803 xemacs) type=TextEditor;;
804 *) type=;;
805 esac
931 ;; 806 ;;
932 "games-"*) 807
933 type=Game 808 dev)
934 subdir="Games" 809 type="Development"
935 ;; 810 ;;
936 "net-"*) 811
937 type=Network 812 games)
938 subdir="${type}" 813 case ${catmin} in
814 action) type=ActionGame;;
815 arcade) type=ArcadeGame;;
816 board) type=BoardGame;;
817 kid) type=KidsGame;;
818 emulation) type=Emulator;;
819 puzzle) type=LogicGame;;
820 rpg) type=RolePlaying;;
821 roguelike) type=RolePlaying;;
822 simulation) type=Simulation;;
823 sports) type=SportsGame;;
824 strategy) type=StrategyGame;;
825 *) type=;;
826 esac
827 type="Game;${type}"
939 ;; 828 ;;
829
830 mail)
831 type="Network;Email"
832 ;;
833
834 media)
835 case ${catmin} in
836 gfx) type=Graphics;;
837 radio) type=Tuner;;
838 sound) type=Audio;;
839 tv) type=TV;;
840 video) type=Video;;
841 *) type=;;
842 esac
843 type="AudioVideo;${type}"
844 ;;
845
846 net)
847 case ${catmin} in
848 dialup) type=Dialup;;
849 ftp) type=FileTransfer;;
850 im) type=InstantMessaging;;
851 irc) type=IRCClient;;
852 mail) type=Email;;
853 news) type=News;;
854 nntp) type=News;;
855 p2p) type=FileTransfer;;
856 *) type=;;
857 esac
858 type="Network;${type}"
859 ;;
860
861 sci)
862 case ${catmin} in
863 astro*) type=Astronomy;;
864 bio*) type=Biology;;
865 calc*) type=Calculator;;
866 chem*) type=Chemistry;;
867 geo*) type=Geology;;
868 math*) type=Math;;
869 *) type=;;
870 esac
871 type="Science;${type}"
872 ;;
873
874 www)
875 case ${catmin} in
876 client) type=WebBrowser;;
877 *) type=;;
878 esac
879 type="Network"
880 ;;
881
940 *) 882 *)
941 type= 883 type=
942 subdir=
943 ;; 884 ;;
944 esac 885 esac
945 fi 886 fi
887 if [ "${SLOT}" == "0" ] ; then
888 local desktop_name="${PN}"
889 else
890 local desktop_name="${PN}-${SLOT}"
891 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 892 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 893
948echo "[Desktop Entry] 894echo "[Desktop Entry]
949Encoding=UTF-8 895Encoding=UTF-8
950Version=0.9.2 896Version=0.9.2
951Name=${name} 897Name=${name}
954Exec=${exec} 900Exec=${exec}
955Path=${path} 901Path=${path}
956Icon=${icon} 902Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 903Categories=Application;${type};" > "${desktop}"
958 904
905 (
906 # wrap the env here so that the 'insinto' call
907 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 908 insinto /usr/share/applications
960 doins "${desktop}" 909 doins "${desktop}"
961 910 )
962 return 0
963} 911}
964 912
965# Make a GDM/KDM Session file 913# Make a GDM/KDM Session file
966# 914#
967# make_desktop_entry(<title>, <command>) 915# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 916# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 917# command: Name of the Window Manager
970 918
971make_session_desktop() { 919make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 920 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 921 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 922
976 local title="${1}" 923 local title=$1
977 local command="${2}" 924 local command=$2
978 local desktop="${T}/${wm}.desktop" 925 local desktop=${T}/${wm}.desktop
979 926
980echo "[Desktop Entry] 927echo "[Desktop Entry]
981Encoding=UTF-8 928Encoding=UTF-8
982Name=${title} 929Name=${title}
983Comment=This session logs you into ${title} 930Comment=This session logs you into ${title}
985TryExec=${command} 932TryExec=${command}
986Type=Application" > "${desktop}" 933Type=Application" > "${desktop}"
987 934
988 insinto /usr/share/xsessions 935 insinto /usr/share/xsessions
989 doins "${desktop}" 936 doins "${desktop}"
990
991 return 0
992} 937}
993 938
994domenu() { 939domenu() {
995 local i 940 local i j
996 local j
997 insinto /usr/share/applications 941 insinto /usr/share/applications
998 for i in ${@} 942 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 943 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 944 doins "${i}"
1003 elif [ -d "${i}" ]; 945 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 946 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 947 doins "${j}"
1008 done 948 done
1009 fi 949 fi
1010 done 950 done
1011} 951}
952newmenu() {
953 insinto /usr/share/applications
954 newins "$1" "$2"
955}
1012 956
1013doicon() { 957doicon() {
1014 local i 958 local i j
1015 local j
1016 insinto /usr/share/pixmaps 959 insinto /usr/share/pixmaps
1017 for i in ${@} 960 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 961 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 962 doins "${i}"
1022 elif [ -d "${i}" ]; 963 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 964 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 965 doins "${j}"
1027 done 966 done
1028 fi 967 fi
1029 done 968 done
969}
970newicon() {
971 insinto /usr/share/pixmaps
972 newins "$1" "$2"
1030} 973}
1031 974
1032############################################################## 975##############################################################
1033# END: Handle .desktop files and menu entries # 976# END: Handle .desktop files and menu entries #
1034############################################################## 977##############################################################
1035 978
1036 979
1037# for internal use only (unpack_pdv and unpack_makeself) 980# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 981find_unpackable_file() {
1039 local src="$1" 982 local src=$1
1040 if [ -z "${src}" ] 983 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 984 src=${DISTDIR}/${A}
1043 else 985 else
1044 if [ -e "${DISTDIR}/${src}" ] 986 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 987 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 988 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 989 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 990 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 991 src=${src}
1053 fi
1054 fi 992 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 993 fi
994 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 995 echo "${src}"
1057} 996}
1058 997
1059# Unpack those pesky pdv generated files ... 998# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 999# They're self-unpacking programs with the binary package stuffed in
1075# lseek 1014# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1015# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 1016# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 1017# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 1018unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 1019 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 1020 local sizeoff_t=$2
1082 1021
1022 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1023 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 1024
1085 local shrtsrc="`basename ${src}`" 1025 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1028 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1089 1029
1090 # grab metadata for debug reasons 1030 # grab metadata for debug reasons
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1095# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1096# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1097# the proper offset from the script itself.
1158unpack_makeself() { 1098unpack_makeself() {
1099 local src_input=${1:-${A}}
1159 local src="$(find_unpackable_file "$1")" 1100 local src=$(find_unpackable_file "${src_input}")
1160 local skip="$2" 1101 local skip=$2
1161 local exe="$3" 1102 local exe=$3
1162 1103
1104 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1105
1163 local shrtsrc="$(basename "${src}")" 1106 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1107 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1108 if [[ -z ${skip} ]] ; then
1166 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1168 local skip=0 1110 local skip=0
1169 exe=tail 1111 exe=tail
1170 case ${ver} in 1112 case ${ver} in
1171 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1113 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1184 ;; 1126 ;;
1185 2.1.3) 1127 2.1.3)
1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1128 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1187 let skip="skip + 1" 1129 let skip="skip + 1"
1188 ;; 1130 ;;
1189 2.1.4) 1131 2.1.4|2.1.5)
1190 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1132 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1191 skip=$(head -n ${skip} "${src}" | wc -c) 1133 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd" 1134 exe="dd"
1193 ;; 1135 ;;
1194 *) 1136 *)
1239check_license() { 1181check_license() {
1240 local lic=$1 1182 local lic=$1
1241 if [ -z "${lic}" ] ; then 1183 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1184 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1185 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1186 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1187 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1188 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1189 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1190 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1191 lic="${lic}"
1250 fi
1251 fi 1192 fi
1193 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1194 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1195 local l="`basename ${lic}`"
1254 1196
1255 # here is where we check for the licenses the user already 1197 # here is where we check for the licenses the user already
1256 # accepted ... if we don't find a match, we make the user accept 1198 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$- 1199 local shopts=$-
1313 # first we figure out how many cds we're dealing with by 1255 # first we figure out how many cds we're dealing with by
1314 # the # of files they gave us 1256 # the # of files they gave us
1315 local cdcnt=0 1257 local cdcnt=0
1316 local f= 1258 local f=
1317 for f in "$@" ; do 1259 for f in "$@" ; do
1318 cdcnt=$((cdcnt + 1)) 1260 ((++cdcnt))
1319 export CDROM_CHECK_${cdcnt}="$f" 1261 export CDROM_CHECK_${cdcnt}="$f"
1320 done 1262 done
1321 export CDROM_TOTAL_CDS=${cdcnt} 1263 export CDROM_TOTAL_CDS=${cdcnt}
1322 export CDROM_CURRENT_CD=1 1264 export CDROM_CURRENT_CD=1
1323 1265
1324 # now we see if the user gave use CD_ROOT ... 1266 # now we see if the user gave use CD_ROOT ...
1325 # if they did, let's just believe them that it's correct 1267 # if they did, let's just believe them that it's correct
1326 if [[ ! -z ${CD_ROOT} ]] ; then
1327 export CDROM_ROOT=${CD_ROOT}
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1329 return
1330 fi
1331 # do the same for CD_ROOT_X
1332 if [[ ! -z ${CD_ROOT_1} ]] ; then 1268 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1333 local var= 1269 local var=
1334 cdcnt=0 1270 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1272 ((++cdcnt))
1337 var="CD_ROOT_${cdcnt}" 1273 var="CD_ROOT_${cdcnt}"
1274 [[ -z ${!var} ]] && var="CD_ROOT"
1338 if [[ -z ${!var} ]] ; then 1275 if [[ -z ${!var} ]] ; then
1339 eerror "You must either use just the CD_ROOT" 1276 eerror "You must either use just the CD_ROOT"
1340 eerror "or specify ALL the CD_ROOT_X variables." 1277 eerror "or specify ALL the CD_ROOT_X variables."
1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1342 die "could not locate CD_ROOT_${cdcnt}" 1279 die "could not locate CD_ROOT_${cdcnt}"
1343 fi 1280 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1345 done 1281 done
1346 export CDROM_ROOT=${CDROM_ROOTS_1} 1282 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 export CDROM_SET=-1
1285 for f in ${CDROM_CHECK_1//:/ } ; do
1286 ((++CDROM_SET))
1287 [[ -e ${CD_ROOT}/${f} ]] && break
1288 done
1289 export CDROM_MATCH=${f}
1348 return 1290 return
1349 fi 1291 fi
1350 1292
1293 # User didn't help us out so lets make sure they know they can
1294 # simplify the whole process ...
1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1295 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1352 einfon "This ebuild will need the " 1296 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1353 if [[ -z ${CDROM_NAME} ]] ; then
1354 echo "cdrom for ${PN}."
1355 else
1356 echo "${CDROM_NAME}."
1357 fi
1358 echo 1297 echo
1359 einfo "If you do not have the CD, but have the data files" 1298 einfo "If you do not have the CD, but have the data files"
1360 einfo "mounted somewhere on your filesystem, just export" 1299 einfo "mounted somewhere on your filesystem, just export"
1361 einfo "the variable CD_ROOT so that it points to the" 1300 einfo "the variable CD_ROOT so that it points to the"
1362 einfo "directory containing the files." 1301 einfo "directory containing the files."
1366 echo 1305 echo
1367 else 1306 else
1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1369 cdcnt=0 1308 cdcnt=0
1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1371 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1372 var="CDROM_NAME_${cdcnt}" 1311 var="CDROM_NAME_${cdcnt}"
1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1312 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1374 done 1313 done
1375 echo 1314 echo
1376 einfo "If you do not have the CDs, but have the data files" 1315 einfo "If you do not have the CDs, but have the data files"
1377 einfo "mounted somewhere on your filesystem, just export" 1316 einfo "mounted somewhere on your filesystem, just export"
1378 einfo "the following variables so they point to the right place:" 1317 einfo "the following variables so they point to the right place:"
1379 einfon "" 1318 einfon ""
1380 cdcnt=0 1319 cdcnt=0
1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1320 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1382 cdcnt=$((cdcnt + 1)) 1321 ((++cdcnt))
1383 echo -n " CD_ROOT_${cdcnt}" 1322 echo -n " CD_ROOT_${cdcnt}"
1384 done 1323 done
1385 echo 1324 echo
1386 einfo "Or, if you have all the files in the same place, or" 1325 einfo "Or, if you have all the files in the same place, or"
1387 einfo "you only have one cdrom, you can export CD_ROOT" 1326 einfo "you only have one cdrom, you can export CD_ROOT"
1390 echo 1329 echo
1391 einfo "For example:" 1330 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom" 1331 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo 1332 echo
1394 fi 1333 fi
1334
1335 export CDROM_SET=""
1395 export CDROM_CURRENT_CD=0 1336 export CDROM_CURRENT_CD=0
1396 cdrom_load_next_cd 1337 cdrom_load_next_cd
1397} 1338}
1398 1339
1399# this is only used when you need access to more than one cd. 1340# this is only used when you need access to more than one cd.
1400# when you have finished using the first cd, just call this function. 1341# when you have finished using the first cd, just call this function.
1401# when it returns, CDROM_ROOT will be pointing to the second cd. 1342# when it returns, CDROM_ROOT will be pointing to the second cd.
1402# remember, you can only go forward in the cd chain, you can't go back. 1343# remember, you can only go forward in the cd chain, you can't go back.
1403cdrom_load_next_cd() { 1344cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1405 local var= 1345 local var
1406 1346 ((++CDROM_CURRENT_CD))
1407 if [[ ! -z ${CD_ROOT} ]] ; then
1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1409 return
1410 fi
1411 1347
1412 unset CDROM_ROOT 1348 unset CDROM_ROOT
1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1349 var=CD_ROOT_${CDROM_CURRENT_CD}
1350 [[ -z ${!var} ]] && var="CD_ROOT"
1414 if [[ -z ${!var} ]] ; then 1351 if [[ -z ${!var} ]] ; then
1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1352 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1416 cdrom_locate_file_on_cd ${!var} 1353 _cdrom_locate_file_on_cd ${!var}
1417 else 1354 else
1418 export CDROM_ROOT=${!var} 1355 export CDROM_ROOT=${!var}
1419 fi 1356 fi
1420 1357
1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1358 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1426# all it does is try to locate a give file on a cd ... if the cd isn't 1363# all it does is try to locate a give file on a cd ... if the cd isn't
1427# found, then a message asking for the user to insert the cdrom will be 1364# found, then a message asking for the user to insert the cdrom will be
1428# displayed and we'll hang out here until: 1365# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1366# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1367# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1368_cdrom_locate_file_on_cd() {
1369 local mline=""
1370 local showedmsg=0
1371
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1372 while [[ -z ${CDROM_ROOT} ]] ; do
1373 local i=0
1374 local -a cdset=(${*//:/ })
1375 if [[ -n ${CDROM_SET} ]] ; then
1376 cdset=(${cdset[${CDROM_SET}]})
1377 fi
1378
1379 while [[ -n ${cdset[${i}]} ]] ; do
1433 local dir="$(dirname ${@})" 1380 local dir=$(dirname ${cdset[${i}]})
1434 local file="$(basename ${@})" 1381 local file=$(basename ${cdset[${i}]})
1435 local mline=""
1436 local showedmsg=0
1437 1382
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1383 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1384 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1385 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1441 && export CDROM_ROOT=${mline} 1386 export CDROM_ROOT=${mline}
1387 export CDROM_SET=${i}
1388 export CDROM_MATCH=${cdset[${i}]}
1389 return
1390 fi
1391 done
1392
1393 ((++i))
1442 done 1394 done
1443 1395
1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1396 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then 1397 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1398 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then 1399 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !" 1400 einfo "Please insert+mount the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else 1401 else
1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1456 else
1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1458 einfo "Please insert+mount the ${!var} cdrom now !" 1402 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1459 fi
1460 fi 1403 fi
1461 showedmsg=1 1404 else
1405 if [[ -z ${CDROM_NAME_1} ]] ; then
1406 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1407 else
1408 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1409 einfo "Please insert+mount the ${!var} cdrom now !"
1410 fi
1462 fi 1411 fi
1412 showedmsg=1
1413 fi
1463 einfo "Press return to scan for the cd again" 1414 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1415 einfo "or hit CTRL+C to abort the emerge."
1465 read 1416 echo
1466 fi 1417 einfo "If you are having trouble with the detection"
1418 einfo "of your CD, it is possible that you do not have"
1419 einfo "Joliet support enabled in your kernel. Please"
1420 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1421 read || die "something is screwed with your system"
1467 done 1422 done
1468} 1423}
1469 1424
1470# Make sure that LINGUAS only contains languages that 1425# Make sure that LINGUAS only contains languages that
1471# a package can support 1426# a package can support
1481# directories and uses the union of the lists. 1436# directories and uses the union of the lists.
1482strip-linguas() { 1437strip-linguas() {
1483 local ls newls 1438 local ls newls
1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1485 local op=$1; shift 1440 local op=$1; shift
1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1441 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1487 local d f 1442 local d f
1488 for d in "$@" ; do 1443 for d in "$@" ; do
1489 if [[ ${op} == "-u" ]] ; then 1444 if [[ ${op} == "-u" ]] ; then
1490 newls=${ls} 1445 newls=${ls}
1491 else 1446 else
1492 newls="" 1447 newls=""
1493 fi 1448 fi
1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1449 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1495 if [[ ${op} == "-i" ]] ; then 1450 if [[ ${op} == "-i" ]] ; then
1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1497 else 1452 else
1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1499 fi 1454 fi
1513 else 1468 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1470 fi
1516 done 1471 done
1517 if [[ -z ${newls} ]] ; then 1472 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1473 export LINGUAS=""
1519 else 1474 else
1520 export LINGUAS=${newls:1} 1475 export LINGUAS=${newls:1}
1521 fi 1476 fi
1522} 1477}
1523 1478
1533 while ((i--)) ; do 1488 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1490 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1492 case ${ARCH} in
1538 x86) export ARCH="i386";; 1493 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1494 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1495 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1496 mips) export ARCH="mips";;
1542 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1497 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1543 *) export ARCH="${ARCH}";; 1498 *) export ARCH="${ARCH}";;
1544 esac 1499 esac
1545} 1500}
1546 1501
1547# set's ARCH back to what portage expects 1502# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1503set_arch_to_portage() {
1592 LIB=$1 1547 LIB=$1
1593 1548
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1550 SONAME=`basename ${LIB}`
1596 1551
1597 einfo "An old version of an installed library was detected on your system." 1552 ewarn "An old version of an installed library was detected on your system."
1598 einfo "In order to avoid breaking packages that link against is, this older version" 1553 ewarn "In order to avoid breaking packages that link against it, this older version"
1599 einfo "is not being removed. In order to make full use of this newer version," 1554 ewarn "is not being removed. In order to make full use of this newer version,"
1600 einfo "you will need to execute the following command:" 1555 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1556 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1557 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1558 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1559 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1560 fi
1606} 1561}
1607 1562
1608# Hack for people to figure out if a package was built with 1563# Hack for people to figure out if a package was built with
1609# certain USE flags 1564# certain USE flags
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620 1575
1621 local PKG=$(best_version $1) 1576 local PKG=$(best_version $1)
1622 shift 1577 shift
1623 1578
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1579 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1580
1581 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided
1625 [[ ! -e ${USEFILE} ]] && return 1 1583 [[ ! -e ${USEFILE} ]] && return 0
1626 1584
1627 local USE_BUILT=$(<${USEFILE}) 1585 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do 1586 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then 1587 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0 1588 has $1 ${USE_BUILT} && return 0
1655dopamd() { 1613dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1614 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1615
1658 use pam || return 0 1616 use pam || return 0
1659 1617
1660 insinto /etc/pam.d 1618 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1619 doins "$@" || die "failed to install $@"
1664} 1620}
1665# newpamd <old name> <new name> 1621# newpamd <old name> <new name>
1666# 1622#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1623# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1624newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1625 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1626
1671 use pam || return 0 1627 use pam || return 0
1672 1628
1673 insinto /etc/pam.d 1629 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1630 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1631}
1632
1633# make a wrapper script ...
1634# NOTE: this was originally games_make_wrapper, but I noticed other places where
1635# this could be used, so I have moved it here and made it not games-specific
1636# -- wolf31o2
1637# $1 == wrapper name
1638# $2 == binary to run
1639# $3 == directory to chdir before running binary
1640# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1641# $5 == path for wrapper
1642make_wrapper() {
1643 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1644 local tmpwrapper=$(emktemp)
1645 # We don't want to quote ${bin} so that people can pass complex
1646 # things as $bin ... "./someprog --args"
1647 cat << EOF > "${tmpwrapper}"
1648#!/bin/sh
1649cd "${chdir:-.}"
1650if [ -n "${libdir}" ] ; then
1651 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1652 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1653 else
1654 export LD_LIBRARY_PATH="${libdir}"
1655 fi
1656fi
1657exec ${bin} "\$@"
1658EOF
1659 chmod go+rx "${tmpwrapper}"
1660 if [[ -n ${path} ]] ; then
1661 exeinto "${path}"
1662 newexe "${tmpwrapper}" "${wrapper}"
1663 else
1664 newbin "${tmpwrapper}" "${wrapper}"
1665 fi
1666}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.226

  ViewVC Help
Powered by ViewVC 1.1.20