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

Diff of /eclass/eutils.eclass

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

Revision 1.208 Revision 1.256
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.208 2005/10/19 03:36:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.256 2006/10/31 19:29:12 agriffis Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
285 263
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
288 do 266 do
289 # Generate some useful debug info ... 267 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 270
293 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 272 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 278
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 281
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 284
307 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 286 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 288 then
316 fi 294 fi
317 fi 295 fi
318 296
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 298 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 304
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 306 _epatch_assert
329 307
330 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 375 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 377 echo "${tmp}"
400 else 378 else
401 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 381 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
405 fi 388 fi
406} 389}
407 390
408# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 404 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 406 ;;
424 esac 407 esac
425 ;; 408 ;;
426 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
427 local opts action="user" 410 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
429 412
430 # lookup by uid/gid 413 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 416 fi
434 417
435 pw show ${action} ${opts} "$2" -q 418 pw show ${action} ${opts} "$2" -q
436 ;; 419 ;;
437 *-netbsd*) 420 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1 421 grep "$2:\*:" /etc/$1
439 ;; 422 ;;
440 *) 423 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 425 getent "$1" "$2"
456# shell: /bin/false 439# shell: /bin/false
457# homedir: /dev/null 440# homedir: /dev/null
458# groups: none 441# groups: none
459# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
460enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
461 # get the username 451 # get the username
462 local euser=$1; shift 452 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 454 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
466 fi 456 fi
467 457
468 # lets see if the username already exists 458 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
470 return 0 460 return 0
471 fi 461 fi
472 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
473 463
474 # options to pass to useradd 464 # options to pass to useradd
475 local opts= 465 local opts=
476 466
477 # handle uid 467 # handle uid
478 local euid=$1; shift 468 local euid=$1; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
480 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
482 euid="next" 472 euid="next"
483 fi 473 fi
484 else 474 else
485 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
487 fi 477 fi
488 else 478 else
489 euid="next" 479 euid="next"
490 fi 480 fi
491 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
492 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
493 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
494 done 484 done
495 fi 485 fi
496 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
498 488
499 # handle shell 489 # handle shell
500 local eshell=$1; shift 490 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
505 fi 499 fi
506 else 500 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
509 done 503 done
510 504
511 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
513 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
514 fi 513 fi
515 514
516 eshell=${shell} 515 eshell=${shell}
517 fi 516 fi
518 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
580 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 580 einfo "eextra: $@"
582 die "Required function missing" 581 die "Required function missing"
583 fi 582 fi
584 ;; 583 ;;
585 *-freebsd*) 584 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
589 die "enewuser failed" 588 die "enewuser failed"
590 else 589 else
600 else 599 else
601 einfo " - Extra: $@" 600 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi 602 fi
604 ;; 603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
605 *) 618 *)
606 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
607 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
608 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
609 || die "enewuser failed" 622 || die "enewuser failed"
633# Default values if you do not specify any: 646# Default values if you do not specify any:
634# groupname: REQUIRED ! 647# groupname: REQUIRED !
635# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
636# extra: none 649# extra: none
637enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
638 # get the group 658 # get the group
639 local egroup="$1"; shift 659 local egroup="$1"; shift
640 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
641 then 661 then
642 eerror "No group specified !" 662 eerror "No group specified !"
643 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
644 fi 664 fi
645 665
646 # see if group already exists 666 # see if group already exists
647 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
648 then
649 return 0 668 return 0
650 fi 669 fi
651 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
652 671
653 # options to pass to useradd 672 # options to pass to useradd
696 fi 715 fi
697 716
698 # If we need the next available 717 # If we need the next available
699 case ${egid} in 718 case ${egid} in
700 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
702 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
703 done 722 done
704 esac 723 esac
705 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
707 ;; 726 ;;
708 727
709 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
710 case ${egid} in 729 case ${egid} in
711 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
713 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
714 done 733 done
715 esac 734 esac
716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
717 ;; 736 ;;
718 737
719 *-netbsd*) 738 *-netbsd*)
720 case ${egid} in 739 case ${egid} in
721 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
723 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
724 done 743 done
725 esac 744 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;; 746 ;;
728 747
754 773
755# Make a desktop file ! 774# Make a desktop file !
756# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
757# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
758# 777#
759# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
760# 779#
761# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
762# name: the name that will show up in the menu 781# name: the name that will show up in the menu
763# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
764# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
765# a full path to an icon 784# a full path to an icon
766# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
802 games) 821 games)
803 case ${catmin} in 822 case ${catmin} in
804 action) type=ActionGame;; 823 action) type=ActionGame;;
805 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
806 board) type=BoardGame;; 825 board) type=BoardGame;;
807 kid) type=KidsGame;; 826 kids) type=KidsGame;;
808 emulation) type=Emulator;; 827 emulation) type=Emulator;;
809 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;; 831 simulation) type=Simulation;;
848 type="Network;${type}" 867 type="Network;${type}"
849 ;; 868 ;;
850 869
851 sci) 870 sci)
852 case ${catmin} in 871 case ${catmin} in
853 astro*) type=Astronomoy;; 872 astro*) type=Astronomy;;
854 bio*) type=Biology;; 873 bio*) type=Biology;;
855 calc*) type=Calculator;; 874 calc*) type=Calculator;;
856 chem*) type=Chemistry;; 875 chem*) type=Chemistry;;
857 geo*) type=Geology;; 876 geo*) type=Geology;;
858 math*) type=Math;; 877 math*) type=Math;;
878 local desktop_name="${PN}" 897 local desktop_name="${PN}"
879 else 898 else
880 local desktop_name="${PN}-${SLOT}" 899 local desktop_name="${PN}-${SLOT}"
881 fi 900 fi
882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
883 903
884echo "[Desktop Entry] 904echo "[Desktop Entry]
885Encoding=UTF-8 905Encoding=UTF-8
886Version=0.9.2 906Version=0.9.2
887Name=${name} 907Name=${name}
888Type=Application 908Type=Application
889Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
890Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
891Path=${path} 912Path=${path}
892Icon=${icon} 913Icon=${icon}
893Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
894 915
895 ( 916 (
900 ) 921 )
901} 922}
902 923
903# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
904# 925#
905# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
906# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
907# command: Name of the Window Manager 928# command: Name of the Window Manager
908 929
909make_session_desktop() { 930make_session_desktop() {
910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1010 local sizeoff_t=$2 1031 local sizeoff_t=$2
1011 1032
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1033 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1034 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1014 1035
1015 local shrtsrc="`basename ${src}`" 1036 local shrtsrc=$(basename "${src}")
1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1039 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1019 1040
1020 # grab metadata for debug reasons 1041 # grab metadata for debug reasons
1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1085# - If the file is not specified then unpack will utilize ${A}. 1106# - If the file is not specified then unpack will utilize ${A}.
1086# - If the offset is not specified then we will attempt to extract 1107# - If the offset is not specified then we will attempt to extract
1087# the proper offset from the script itself. 1108# the proper offset from the script itself.
1088unpack_makeself() { 1109unpack_makeself() {
1110 local src_input=${1:-${A}}
1089 local src=$(find_unpackable_file "$1") 1111 local src=$(find_unpackable_file "${src_input}")
1090 local skip=$2 1112 local skip=$2
1091 local exe=$3 1113 local exe=$3
1092 1114
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1115 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1094 1116
1095 local shrtsrc=$(basename "${src}") 1117 local shrtsrc=$(basename "${src}")
1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1097 if [ -z "${skip}" ] 1119 if [[ -z ${skip} ]] ; then
1098 then
1099 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1100 local skip=0 1121 local skip=0
1101 exe=tail 1122 exe=tail
1102 case ${ver} in 1123 case ${ver} in
1103 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1124 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1104 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1105 ;; 1126 ;;
1106 2.0|2.0.1) 1127 2.0|2.0.1)
1107 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1108 ;; 1129 ;;
1116 ;; 1137 ;;
1117 2.1.3) 1138 2.1.3)
1118 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1119 let skip="skip + 1" 1140 let skip="skip + 1"
1120 ;; 1141 ;;
1121 2.1.4) 1142 2.1.4|2.1.5)
1122 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1143 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1123 skip=$(head -n ${skip} "${src}" | wc -c) 1144 skip=$(head -n ${skip} "${src}" | wc -c)
1124 exe="dd" 1145 exe="dd"
1125 ;; 1146 ;;
1126 *) 1147 *)
1188 # accepted ... if we don't find a match, we make the user accept 1209 # accepted ... if we don't find a match, we make the user accept
1189 local shopts=$- 1210 local shopts=$-
1190 local alic 1211 local alic
1191 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1192 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1193 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1194 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1195 return 0 1216 return 0
1196 fi 1217 fi
1197 done 1218 done
1198 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1231# and when the function returns, you can assume that the cd has been 1252# and when the function returns, you can assume that the cd has been
1232# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1233# 1254#
1234# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1255# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1235# etc... if you want to give the cds better names, then just export 1256# etc... if you want to give the cds better names, then just export
1236# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1257# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1258# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1259# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1260# CDROM_NAME_2="data cd"
1261# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1237# 1262#
1238# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1263# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1239# 1264#
1240# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1265# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1241# - this will attempt to locate a cd based upon a file that is on 1266# - this will attempt to locate a cd based upon a file that is on
1245 # first we figure out how many cds we're dealing with by 1270 # first we figure out how many cds we're dealing with by
1246 # the # of files they gave us 1271 # the # of files they gave us
1247 local cdcnt=0 1272 local cdcnt=0
1248 local f= 1273 local f=
1249 for f in "$@" ; do 1274 for f in "$@" ; do
1250 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1251 export CDROM_CHECK_${cdcnt}="$f" 1276 export CDROM_CHECK_${cdcnt}="$f"
1252 done 1277 done
1253 export CDROM_TOTAL_CDS=${cdcnt} 1278 export CDROM_TOTAL_CDS=${cdcnt}
1254 export CDROM_CURRENT_CD=1 1279 export CDROM_CURRENT_CD=1
1255 1280
1256 # now we see if the user gave use CD_ROOT ... 1281 # now we see if the user gave use CD_ROOT ...
1257 # if they did, let's just believe them that it's correct 1282 # if they did, let's just believe them that it's correct
1258 if [[ ! -z ${CD_ROOT} ]] ; then
1259 export CDROM_ROOT=${CD_ROOT}
1260 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1261 return
1262 fi
1263 # do the same for CD_ROOT_X
1264 if [[ ! -z ${CD_ROOT_1} ]] ; then 1283 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1265 local var= 1284 local var=
1266 cdcnt=0 1285 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1286 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1287 ((++cdcnt))
1269 var="CD_ROOT_${cdcnt}" 1288 var="CD_ROOT_${cdcnt}"
1289 [[ -z ${!var} ]] && var="CD_ROOT"
1270 if [[ -z ${!var} ]] ; then 1290 if [[ -z ${!var} ]] ; then
1271 eerror "You must either use just the CD_ROOT" 1291 eerror "You must either use just the CD_ROOT"
1272 eerror "or specify ALL the CD_ROOT_X variables." 1292 eerror "or specify ALL the CD_ROOT_X variables."
1273 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1293 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1274 die "could not locate CD_ROOT_${cdcnt}" 1294 die "could not locate CD_ROOT_${cdcnt}"
1275 fi 1295 fi
1276 export CDROM_ROOTS_${cdcnt}="${!var}"
1277 done 1296 done
1278 export CDROM_ROOT=${CDROM_ROOTS_1} 1297 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1279 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1298 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1299 export CDROM_SET=-1
1300 for f in ${CDROM_CHECK_1//:/ } ; do
1301 ((++CDROM_SET))
1302 [[ -e ${CD_ROOT}/${f} ]] && break
1303 done
1304 export CDROM_MATCH=${f}
1280 return 1305 return
1281 fi 1306 fi
1282 1307
1308 # User didn't help us out so lets make sure they know they can
1309 # simplify the whole process ...
1283 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1310 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1284 einfon "This ebuild will need the " 1311 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1285 if [[ -z ${CDROM_NAME} ]] ; then
1286 echo "cdrom for ${PN}."
1287 else
1288 echo "${CDROM_NAME}."
1289 fi
1290 echo 1312 echo
1291 einfo "If you do not have the CD, but have the data files" 1313 einfo "If you do not have the CD, but have the data files"
1292 einfo "mounted somewhere on your filesystem, just export" 1314 einfo "mounted somewhere on your filesystem, just export"
1293 einfo "the variable CD_ROOT so that it points to the" 1315 einfo "the variable CD_ROOT so that it points to the"
1294 einfo "directory containing the files." 1316 einfo "directory containing the files."
1295 echo 1317 echo
1296 einfo "For example:" 1318 einfo "For example:"
1297 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1298 echo 1320 echo
1299 else 1321 else
1322 if [[ -n ${CDROM_NAME_SET} ]] ; then
1323 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1324 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 ((++cdcnt))
1327 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1328 done
1329 fi
1330
1300 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1301 cdcnt=0 1332 cdcnt=0
1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303 cdcnt=$((cdcnt + 1)) 1334 ((++cdcnt))
1304 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1305 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1336 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1306 done 1337 done
1307 echo 1338 echo
1308 einfo "If you do not have the CDs, but have the data files" 1339 einfo "If you do not have the CDs, but have the data files"
1309 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1310 einfo "the following variables so they point to the right place:" 1341 einfo "the following variables so they point to the right place:"
1311 einfon "" 1342 einfon ""
1312 cdcnt=0 1343 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1344 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 cdcnt=$((cdcnt + 1)) 1345 ((++cdcnt))
1315 echo -n " CD_ROOT_${cdcnt}" 1346 echo -n " CD_ROOT_${cdcnt}"
1316 done 1347 done
1317 echo 1348 echo
1318 einfo "Or, if you have all the files in the same place, or" 1349 einfo "Or, if you have all the files in the same place, or"
1319 einfo "you only have one cdrom, you can export CD_ROOT" 1350 einfo "you only have one cdrom, you can export CD_ROOT"
1322 echo 1353 echo
1323 einfo "For example:" 1354 einfo "For example:"
1324 einfo "export CD_ROOT_1=/mnt/cdrom" 1355 einfo "export CD_ROOT_1=/mnt/cdrom"
1325 echo 1356 echo
1326 fi 1357 fi
1358
1359 export CDROM_SET=""
1327 export CDROM_CURRENT_CD=0 1360 export CDROM_CURRENT_CD=0
1328 cdrom_load_next_cd 1361 cdrom_load_next_cd
1329} 1362}
1330 1363
1331# this is only used when you need access to more than one cd. 1364# this is only used when you need access to more than one cd.
1332# when you have finished using the first cd, just call this function. 1365# when you have finished using the first cd, just call this function.
1333# when it returns, CDROM_ROOT will be pointing to the second cd. 1366# when it returns, CDROM_ROOT will be pointing to the second cd.
1334# remember, you can only go forward in the cd chain, you can't go back. 1367# remember, you can only go forward in the cd chain, you can't go back.
1335cdrom_load_next_cd() { 1368cdrom_load_next_cd() {
1336 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1337 local var= 1369 local var
1338 1370 ((++CDROM_CURRENT_CD))
1339 if [[ ! -z ${CD_ROOT} ]] ; then
1340 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1341 return
1342 fi
1343 1371
1344 unset CDROM_ROOT 1372 unset CDROM_ROOT
1345 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1373 var=CD_ROOT_${CDROM_CURRENT_CD}
1374 [[ -z ${!var} ]] && var="CD_ROOT"
1346 if [[ -z ${!var} ]] ; then 1375 if [[ -z ${!var} ]] ; then
1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1376 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1348 cdrom_locate_file_on_cd ${!var} 1377 _cdrom_locate_file_on_cd ${!var}
1349 else 1378 else
1350 export CDROM_ROOT=${!var} 1379 export CDROM_ROOT=${!var}
1351 fi 1380 fi
1352 1381
1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1382 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1358# all it does is try to locate a give file on a cd ... if the cd isn't 1387# all it does is try to locate a give file on a cd ... if the cd isn't
1359# found, then a message asking for the user to insert the cdrom will be 1388# found, then a message asking for the user to insert the cdrom will be
1360# displayed and we'll hang out here until: 1389# displayed and we'll hang out here until:
1361# (1) the file is found on a mounted cdrom 1390# (1) the file is found on a mounted cdrom
1362# (2) the user hits CTRL+C 1391# (2) the user hits CTRL+C
1363cdrom_locate_file_on_cd() { 1392_cdrom_locate_file_on_cd() {
1393 local mline=""
1394 local showedmsg=0
1395
1364 while [[ -z ${CDROM_ROOT} ]] ; do 1396 while [[ -z ${CDROM_ROOT} ]] ; do
1365 local dir=$(dirname "$*") 1397 local i=0
1398 local -a cdset=(${*//:/ })
1399 if [[ -n ${CDROM_SET} ]] ; then
1400 cdset=(${cdset[${CDROM_SET}]})
1401 fi
1402
1403 while [[ -n ${cdset[${i}]} ]] ; do
1404 local dir=$(dirname ${cdset[${i}]})
1366 local file=$(basename "$*") 1405 local file=$(basename ${cdset[${i}]})
1367 local mline=""
1368 local showedmsg=0
1369 1406
1370 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1407 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1371 [[ -d ${mline}/${dir} ]] || continue 1408 [[ -d ${mline}/${dir} ]] || continue
1372 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1373 && export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${mline}
1411 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]}
1413 return
1414 fi
1415 done
1416
1417 ((++i))
1374 done 1418 done
1375 1419
1376 if [[ -z ${CDROM_ROOT} ]] ; then
1377 echo 1420 echo
1378 if [[ ${showedmsg} -eq 0 ]] ; then 1421 if [[ ${showedmsg} -eq 0 ]] ; then
1379 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1422 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1380 if [[ -z ${CDROM_NAME} ]] ; then 1423 if [[ -z ${CDROM_NAME} ]] ; then
1381 einfo "Please insert the cdrom for ${PN} now !" 1424 einfo "Please insert+mount the cdrom for ${PN} now !"
1382 else
1383 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1384 fi
1385 else 1425 else
1386 if [[ -z ${CDROM_NAME_1} ]] ; then
1387 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1388 else
1389 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1390 einfo "Please insert+mount the ${!var} cdrom now !" 1426 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1391 fi
1392 fi 1427 fi
1393 showedmsg=1 1428 else
1429 if [[ -z ${CDROM_NAME_1} ]] ; then
1430 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1431 else
1432 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1433 einfo "Please insert+mount the ${!var} cdrom now !"
1434 fi
1394 fi 1435 fi
1436 showedmsg=1
1437 fi
1395 einfo "Press return to scan for the cd again" 1438 einfo "Press return to scan for the cd again"
1396 einfo "or hit CTRL+C to abort the emerge." 1439 einfo "or hit CTRL+C to abort the emerge."
1397 echo 1440 echo
1398 einfo "If you are having trouble with the detection" 1441 einfo "If you are having trouble with the detection"
1399 einfo "of your CD, it is possible that you do not have" 1442 einfo "of your CD, it is possible that you do not have"
1400 einfo "Joliet support enabled in your kernel. Please" 1443 einfo "Joliet support enabled in your kernel. Please"
1401 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1444 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1402 read 1445 read || die "something is screwed with your system"
1403 fi
1404 done 1446 done
1405} 1447}
1406 1448
1407# Make sure that LINGUAS only contains languages that 1449# Make sure that LINGUAS only contains languages that
1408# a package can support 1450# a package can support
1415# The -i builds a list of po files found in all the 1457# The -i builds a list of po files found in all the
1416# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1417# The -u builds a list of po files found in all the 1459# The -u builds a list of po files found in all the
1418# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1419strip-linguas() { 1461strip-linguas() {
1420 local ls newls 1462 local ls newls nols
1421 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1422 local op=$1; shift 1464 local op=$1; shift
1423 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1424 local d f 1466 local d f
1425 for d in "$@" ; do 1467 for d in "$@" ; do
1426 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1427 newls=${ls} 1469 newls=${ls}
1428 else 1470 else
1429 newls="" 1471 newls=""
1430 fi 1472 fi
1431 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1432 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1433 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1434 else 1476 else
1435 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1436 fi 1478 fi
1437 done 1479 done
1438 ls=${newls} 1480 ls=${newls}
1439 done 1481 done
1440 ls=${ls//.po}
1441 else 1482 else
1442 ls=$@ 1483 ls="$@"
1443 fi 1484 fi
1444 1485
1445 ls=" ${ls} " 1486 nols=""
1446 newls="" 1487 newls=""
1447 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1448 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1449 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1450 else 1491 else
1451 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1452 fi 1493 fi
1453 done 1494 done
1454 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1455 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1456 else
1457 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1458 fi
1459} 1498}
1460 1499
1461# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1462# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1463 1502
1492 1531
1493# Jeremy Huddleston <eradicator@gentoo.org>: 1532# Jeremy Huddleston <eradicator@gentoo.org>:
1494# preserve_old_lib /path/to/libblah.so.0 1533# preserve_old_lib /path/to/libblah.so.0
1495# preserve_old_lib_notify /path/to/libblah.so.0 1534# preserve_old_lib_notify /path/to/libblah.so.0
1496# 1535#
1497# These functions are useful when a lib in your package changes --soname. Such 1536# These functions are useful when a lib in your package changes --library. Such
1498# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1537# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1499# would break packages that link against it. Most people get around this 1538# would break packages that link against it. Most people get around this
1500# by using the portage SLOT mechanism, but that is not always a relevant 1539# by using the portage SLOT mechanism, but that is not always a relevant
1501# solution, so instead you can add the following to your ebuilds: 1540# solution, so instead you can add the following to your ebuilds:
1502# 1541#
1533 1572
1534 ewarn "An old version of an installed library was detected on your system." 1573 ewarn "An old version of an installed library was detected on your system."
1535 ewarn "In order to avoid breaking packages that link against it, this older version" 1574 ewarn "In order to avoid breaking packages that link against it, this older version"
1536 ewarn "is not being removed. In order to make full use of this newer version," 1575 ewarn "is not being removed. In order to make full use of this newer version,"
1537 ewarn "you will need to execute the following command:" 1576 ewarn "you will need to execute the following command:"
1538 ewarn " revdep-rebuild --soname ${SONAME}" 1577 ewarn " revdep-rebuild --library ${SONAME}"
1539 ewarn 1578 ewarn
1540 ewarn "After doing that, you can safely remove ${LIB}" 1579 ewarn "After doing that, you can safely remove ${LIB}"
1541 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1542 fi 1581 fi
1543} 1582}
1554built_with_use() { 1593built_with_use() {
1555 local opt=$1 1594 local opt=$1
1556 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1557 1596
1558 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1559 shift 1599 shift
1560 1600
1561 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1562 [[ ! -e ${USEFILE} ]] && return 1 1602 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1603
1604 # if the USE file doesnt exist, assume the $PKG is either
1605 # injected or package.provided
1606 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1607
1608 local IUSE_BUILT=$(<${IUSEFILE})
1609 # Don't check USE_EXPAND #147237
1610 local expand
1611 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1612 if [[ $1 == ${expand}_* ]] ; then
1613 expand=""
1614 break
1615 fi
1616 done
1617 if [[ -n ${expand} ]] ; then
1618 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1619 fi
1563 1620
1564 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1565 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1566 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1567 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0
1624 # We don't want to quote ${bin} so that people can pass complex 1681 # We don't want to quote ${bin} so that people can pass complex
1625 # things as $bin ... "./someprog --args" 1682 # things as $bin ... "./someprog --args"
1626 cat << EOF > "${tmpwrapper}" 1683 cat << EOF > "${tmpwrapper}"
1627#!/bin/sh 1684#!/bin/sh
1628cd "${chdir:-.}" 1685cd "${chdir:-.}"
1686if [ -n "${libdir}" ] ; then
1629if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1687 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1688 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1689 else
1690 export LD_LIBRARY_PATH="${libdir}"
1691 fi
1631fi 1692fi
1632exec ${bin} "\$@" 1693exec ${bin} "\$@"
1633EOF 1694EOF
1634 chmod go+rx "${tmpwrapper}" 1695 chmod go+rx "${tmpwrapper}"
1635 if [[ -n ${path} ]] ; then 1696 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.208  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20