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

Diff of /eclass/eutils.eclass

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

Revision 1.205 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.205 2005/10/07 15:31:46 flameeyes 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 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 150 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 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##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 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
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${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
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 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
306 _epatch_assert
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 311 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 375 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 377 echo "${tmp}"
398 else 378 else
399 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 381 && mktemp -p "${topdir}" \
402 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
403 fi 388 fi
404} 389}
405 390
406# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 404 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 406 ;;
422 esac 407 esac
423 ;; 408 ;;
424 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
425 local opts action="user" 410 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
427 412
428 # lookup by uid/gid 413 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 416 fi
432 417
433 pw show ${action} ${opts} "$2" -q 418 pw show ${action} ${opts} "$2" -q
419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
434 ;; 422 ;;
435 *) 423 *)
436 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
437 getent "$1" "$2" 425 getent "$1" "$2"
438 ;; 426 ;;
451# shell: /bin/false 439# shell: /bin/false
452# homedir: /dev/null 440# homedir: /dev/null
453# groups: none 441# groups: none
454# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
455enewuser() { 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
456 # get the username 451 # get the username
457 local euser=$1; shift 452 local euser=$1; shift
458 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
459 eerror "No username specified !" 454 eerror "No username specified !"
460 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
461 fi 456 fi
462 457
463 # lets see if the username already exists 458 # lets see if the username already exists
464 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
465 return 0 460 return 0
466 fi 461 fi
467 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
468 463
469 # options to pass to useradd 464 # options to pass to useradd
470 local opts= 465 local opts=
471 466
472 # handle uid 467 # handle uid
473 local euid=$1; shift 468 local euid=$1; shift
474 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
475 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
476 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
477 euid="next" 472 euid="next"
478 fi 473 fi
479 else 474 else
480 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
481 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
482 fi 477 fi
483 else 478 else
484 euid="next" 479 euid="next"
485 fi 480 fi
486 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
487 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
488 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
489 done 484 done
490 fi 485 fi
491 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
492 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
493 488
494 # handle shell 489 # handle shell
495 local eshell=$1; shift 490 local eshell=$1; shift
496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
497 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
498 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
499 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"
500 fi 499 fi
501 else 500 else
502 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
503 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
504 done 503 done
505 504
506 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
507 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
508 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
509 fi 513 fi
510 514
511 eshell=${shell} 515 eshell=${shell}
512 fi 516 fi
513 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
575 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
576 einfo "eextra: $@" 580 einfo "eextra: $@"
577 die "Required function missing" 581 die "Required function missing"
578 fi 582 fi
579 ;; 583 ;;
580 *-freebsd*) 584 *-freebsd*|*-dragonfly*)
581 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
582 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
583 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
584 die "enewuser failed" 588 die "enewuser failed"
585 else 589 else
586 einfo " - Extra: $@" 590 einfo " - Extra: $@"
587 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
588 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
589 fi 593 fi
590 ;; 594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
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
591 *) 618 *)
592 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
594 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
595 || die "enewuser failed" 622 || die "enewuser failed"
619# Default values if you do not specify any: 646# Default values if you do not specify any:
620# groupname: REQUIRED ! 647# groupname: REQUIRED !
621# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
622# extra: none 649# extra: none
623enewgroup() { 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
624 # get the group 658 # get the group
625 local egroup="$1"; shift 659 local egroup="$1"; shift
626 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
627 then 661 then
628 eerror "No group specified !" 662 eerror "No group specified !"
629 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
630 fi 664 fi
631 665
632 # see if group already exists 666 # see if group already exists
633 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
634 then
635 return 0 668 return 0
636 fi 669 fi
637 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
638 671
639 # options to pass to useradd 672 # options to pass to useradd
682 fi 715 fi
683 716
684 # If we need the next available 717 # If we need the next available
685 case ${egid} in 718 case ${egid} in
686 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
687 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
688 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
689 done 722 done
690 esac 723 esac
691 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
692 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
693 ;; 726 ;;
694 727
695 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
696 case ${egid} in 729 case ${egid} in
697 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
698 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
699 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
700 done 733 done
701 esac 734 esac
702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
703 ;; 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
704 *) 748 *)
705 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
706 ;; 750 ;;
707 esac 751 esac
708 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
729 773
730# Make a desktop file ! 774# Make a desktop file !
731# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
732# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
733# 777#
734# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
735# 779#
736# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
737# name: the name that will show up in the menu 781# name: the name that will show up in the menu
738# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
739# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
740# a full path to an icon 784# a full path to an icon
741# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
777 games) 821 games)
778 case ${catmin} in 822 case ${catmin} in
779 action) type=ActionGame;; 823 action) type=ActionGame;;
780 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 825 board) type=BoardGame;;
782 kid) type=KidsGame;; 826 kids) type=KidsGame;;
783 emulation) type=Emulator;; 827 emulation) type=Emulator;;
784 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
785 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
786 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
787 simulation) type=Simulation;; 831 simulation) type=Simulation;;
823 type="Network;${type}" 867 type="Network;${type}"
824 ;; 868 ;;
825 869
826 sci) 870 sci)
827 case ${catmin} in 871 case ${catmin} in
828 astro*) type=Astronomoy;; 872 astro*) type=Astronomy;;
829 bio*) type=Biology;; 873 bio*) type=Biology;;
830 calc*) type=Calculator;; 874 calc*) type=Calculator;;
831 chem*) type=Chemistry;; 875 chem*) type=Chemistry;;
832 geo*) type=Geology;; 876 geo*) type=Geology;;
833 math*) type=Math;; 877 math*) type=Math;;
853 local desktop_name="${PN}" 897 local desktop_name="${PN}"
854 else 898 else
855 local desktop_name="${PN}-${SLOT}" 899 local desktop_name="${PN}-${SLOT}"
856 fi 900 fi
857 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
858 903
859echo "[Desktop Entry] 904echo "[Desktop Entry]
860Encoding=UTF-8 905Encoding=UTF-8
861Version=0.9.2 906Version=0.9.2
862Name=${name} 907Name=${name}
863Type=Application 908Type=Application
864Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
865Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
866Path=${path} 912Path=${path}
867Icon=${icon} 913Icon=${icon}
868Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
869 915
870 ( 916 (
875 ) 921 )
876} 922}
877 923
878# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
879# 925#
880# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
881# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
882# command: Name of the Window Manager 928# command: Name of the Window Manager
883 929
884make_session_desktop() { 930make_session_desktop() {
885 [[ -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
985 local sizeoff_t=$2 1031 local sizeoff_t=$2
986 1032
987 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1033 [[ -z ${src} ]] && die "Could not locate source for '$1'"
988 [[ -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 :("
989 1035
990 local shrtsrc="`basename ${src}`" 1036 local shrtsrc=$(basename "${src}")
991 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
992 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
993 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\"`
994 1040
995 # grab metadata for debug reasons 1041 # grab metadata for debug reasons
1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1060# - If the file is not specified then unpack will utilize ${A}. 1106# - If the file is not specified then unpack will utilize ${A}.
1061# - 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
1062# the proper offset from the script itself. 1108# the proper offset from the script itself.
1063unpack_makeself() { 1109unpack_makeself() {
1110 local src_input=${1:-${A}}
1064 local src=$(find_unpackable_file "$1") 1111 local src=$(find_unpackable_file "${src_input}")
1065 local skip=$2 1112 local skip=$2
1066 local exe=$3 1113 local exe=$3
1067 1114
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1115 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1069 1116
1070 local shrtsrc=$(basename "${src}") 1117 local shrtsrc=$(basename "${src}")
1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1072 if [ -z "${skip}" ] 1119 if [[ -z ${skip} ]] ; then
1073 then
1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1075 local skip=0 1121 local skip=0
1076 exe=tail 1122 exe=tail
1077 case ${ver} in 1123 case ${ver} in
1078 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
1079 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1080 ;; 1126 ;;
1081 2.0|2.0.1) 1127 2.0|2.0.1)
1082 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1083 ;; 1129 ;;
1091 ;; 1137 ;;
1092 2.1.3) 1138 2.1.3)
1093 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1094 let skip="skip + 1" 1140 let skip="skip + 1"
1095 ;; 1141 ;;
1096 2.1.4) 1142 2.1.4|2.1.5)
1097 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)
1098 skip=$(head -n ${skip} "${src}" | wc -c) 1144 skip=$(head -n ${skip} "${src}" | wc -c)
1099 exe="dd" 1145 exe="dd"
1100 ;; 1146 ;;
1101 *) 1147 *)
1163 # 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
1164 local shopts=$- 1210 local shopts=$-
1165 local alic 1211 local alic
1166 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1167 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1168 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1169 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1170 return 0 1216 return 0
1171 fi 1217 fi
1172 done 1218 done
1173 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1206# 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
1207# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1208# 1254#
1209# 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',
1210# 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
1211# 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_#
1212# 1262#
1213# 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.
1214# 1264#
1215# 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] [...]
1216# - 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
1220 # 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
1221 # the # of files they gave us 1271 # the # of files they gave us
1222 local cdcnt=0 1272 local cdcnt=0
1223 local f= 1273 local f=
1224 for f in "$@" ; do 1274 for f in "$@" ; do
1225 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1226 export CDROM_CHECK_${cdcnt}="$f" 1276 export CDROM_CHECK_${cdcnt}="$f"
1227 done 1277 done
1228 export CDROM_TOTAL_CDS=${cdcnt} 1278 export CDROM_TOTAL_CDS=${cdcnt}
1229 export CDROM_CURRENT_CD=1 1279 export CDROM_CURRENT_CD=1
1230 1280
1231 # now we see if the user gave use CD_ROOT ... 1281 # now we see if the user gave use CD_ROOT ...
1232 # 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
1233 if [[ ! -z ${CD_ROOT} ]] ; then
1234 export CDROM_ROOT=${CD_ROOT}
1235 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1236 return
1237 fi
1238 # do the same for CD_ROOT_X
1239 if [[ ! -z ${CD_ROOT_1} ]] ; then 1283 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1240 local var= 1284 local var=
1241 cdcnt=0 1285 cdcnt=0
1242 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1286 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1243 cdcnt=$((cdcnt + 1)) 1287 ((++cdcnt))
1244 var="CD_ROOT_${cdcnt}" 1288 var="CD_ROOT_${cdcnt}"
1289 [[ -z ${!var} ]] && var="CD_ROOT"
1245 if [[ -z ${!var} ]] ; then 1290 if [[ -z ${!var} ]] ; then
1246 eerror "You must either use just the CD_ROOT" 1291 eerror "You must either use just the CD_ROOT"
1247 eerror "or specify ALL the CD_ROOT_X variables." 1292 eerror "or specify ALL the CD_ROOT_X variables."
1248 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."
1249 die "could not locate CD_ROOT_${cdcnt}" 1294 die "could not locate CD_ROOT_${cdcnt}"
1250 fi 1295 fi
1251 export CDROM_ROOTS_${cdcnt}="${!var}"
1252 done 1296 done
1253 export CDROM_ROOT=${CDROM_ROOTS_1} 1297 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1254 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}
1255 return 1305 return
1256 fi 1306 fi
1257 1307
1308 # User didn't help us out so lets make sure they know they can
1309 # simplify the whole process ...
1258 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1310 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1259 einfon "This ebuild will need the " 1311 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1260 if [[ -z ${CDROM_NAME} ]] ; then
1261 echo "cdrom for ${PN}."
1262 else
1263 echo "${CDROM_NAME}."
1264 fi
1265 echo 1312 echo
1266 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"
1267 einfo "mounted somewhere on your filesystem, just export" 1314 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the variable CD_ROOT so that it points to the" 1315 einfo "the variable CD_ROOT so that it points to the"
1269 einfo "directory containing the files." 1316 einfo "directory containing the files."
1270 echo 1317 echo
1271 einfo "For example:" 1318 einfo "For example:"
1272 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1273 echo 1320 echo
1274 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
1275 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1276 cdcnt=0 1332 cdcnt=0
1277 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1278 cdcnt=$((cdcnt + 1)) 1334 ((++cdcnt))
1279 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1280 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1336 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1281 done 1337 done
1282 echo 1338 echo
1283 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"
1284 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1285 einfo "the following variables so they point to the right place:" 1341 einfo "the following variables so they point to the right place:"
1286 einfon "" 1342 einfon ""
1287 cdcnt=0 1343 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1344 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1345 ((++cdcnt))
1290 echo -n " CD_ROOT_${cdcnt}" 1346 echo -n " CD_ROOT_${cdcnt}"
1291 done 1347 done
1292 echo 1348 echo
1293 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"
1294 einfo "you only have one cdrom, you can export CD_ROOT" 1350 einfo "you only have one cdrom, you can export CD_ROOT"
1297 echo 1353 echo
1298 einfo "For example:" 1354 einfo "For example:"
1299 einfo "export CD_ROOT_1=/mnt/cdrom" 1355 einfo "export CD_ROOT_1=/mnt/cdrom"
1300 echo 1356 echo
1301 fi 1357 fi
1358
1359 export CDROM_SET=""
1302 export CDROM_CURRENT_CD=0 1360 export CDROM_CURRENT_CD=0
1303 cdrom_load_next_cd 1361 cdrom_load_next_cd
1304} 1362}
1305 1363
1306# 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.
1307# 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.
1308# 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.
1309# 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.
1310cdrom_load_next_cd() { 1368cdrom_load_next_cd() {
1311 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1312 local var= 1369 local var
1313 1370 ((++CDROM_CURRENT_CD))
1314 if [[ ! -z ${CD_ROOT} ]] ; then
1315 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1316 return
1317 fi
1318 1371
1319 unset CDROM_ROOT 1372 unset CDROM_ROOT
1320 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1373 var=CD_ROOT_${CDROM_CURRENT_CD}
1374 [[ -z ${!var} ]] && var="CD_ROOT"
1321 if [[ -z ${!var} ]] ; then 1375 if [[ -z ${!var} ]] ; then
1322 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1376 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1323 cdrom_locate_file_on_cd ${!var} 1377 _cdrom_locate_file_on_cd ${!var}
1324 else 1378 else
1325 export CDROM_ROOT=${!var} 1379 export CDROM_ROOT=${!var}
1326 fi 1380 fi
1327 1381
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1382 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1333# 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
1334# 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
1335# displayed and we'll hang out here until: 1389# displayed and we'll hang out here until:
1336# (1) the file is found on a mounted cdrom 1390# (1) the file is found on a mounted cdrom
1337# (2) the user hits CTRL+C 1391# (2) the user hits CTRL+C
1338cdrom_locate_file_on_cd() { 1392_cdrom_locate_file_on_cd() {
1393 local mline=""
1394 local showedmsg=0
1395
1339 while [[ -z ${CDROM_ROOT} ]] ; do 1396 while [[ -z ${CDROM_ROOT} ]] ; do
1340 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}]})
1341 local file=$(basename "$*") 1405 local file=$(basename ${cdset[${i}]})
1342 local mline=""
1343 local showedmsg=0
1344 1406
1345 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
1346 [[ -d ${mline}/${dir} ]] || continue 1408 [[ -d ${mline}/${dir} ]] || continue
1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1348 && 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))
1349 done 1418 done
1350 1419
1351 if [[ -z ${CDROM_ROOT} ]] ; then
1352 echo 1420 echo
1353 if [[ ${showedmsg} -eq 0 ]] ; then 1421 if [[ ${showedmsg} -eq 0 ]] ; then
1354 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1422 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1355 if [[ -z ${CDROM_NAME} ]] ; then 1423 if [[ -z ${CDROM_NAME} ]] ; then
1356 einfo "Please insert the cdrom for ${PN} now !" 1424 einfo "Please insert+mount the cdrom for ${PN} now !"
1357 else
1358 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1359 fi
1360 else 1425 else
1361 if [[ -z ${CDROM_NAME_1} ]] ; then
1362 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1363 else
1364 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1365 einfo "Please insert+mount the ${!var} cdrom now !" 1426 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1366 fi
1367 fi 1427 fi
1368 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
1369 fi 1435 fi
1436 showedmsg=1
1437 fi
1370 einfo "Press return to scan for the cd again" 1438 einfo "Press return to scan for the cd again"
1371 einfo "or hit CTRL+C to abort the emerge." 1439 einfo "or hit CTRL+C to abort the emerge."
1372 echo 1440 echo
1373 einfo "If you are having trouble with the detection" 1441 einfo "If you are having trouble with the detection"
1374 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"
1375 einfo "Joliet support enabled in your kernel. Please" 1443 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1444 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1377 read 1445 read || die "something is screwed with your system"
1378 fi
1379 done 1446 done
1380} 1447}
1381 1448
1382# Make sure that LINGUAS only contains languages that 1449# Make sure that LINGUAS only contains languages that
1383# a package can support 1450# a package can support
1390# 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
1391# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1392# 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
1393# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1394strip-linguas() { 1461strip-linguas() {
1395 local ls newls 1462 local ls newls nols
1396 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1397 local op=$1; shift 1464 local op=$1; shift
1398 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1399 local d f 1466 local d f
1400 for d in "$@" ; do 1467 for d in "$@" ; do
1401 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1402 newls=${ls} 1469 newls=${ls}
1403 else 1470 else
1404 newls="" 1471 newls=""
1405 fi 1472 fi
1406 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1407 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1408 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1409 else 1476 else
1410 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1411 fi 1478 fi
1412 done 1479 done
1413 ls=${newls} 1480 ls=${newls}
1414 done 1481 done
1415 ls=${ls//.po}
1416 else 1482 else
1417 ls=$@ 1483 ls="$@"
1418 fi 1484 fi
1419 1485
1420 ls=" ${ls} " 1486 nols=""
1421 newls="" 1487 newls=""
1422 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1423 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1424 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1425 else 1491 else
1426 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1427 fi 1493 fi
1428 done 1494 done
1429 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1430 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1431 else
1432 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1433 fi
1434} 1498}
1435 1499
1436# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1437# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1438 1502
1467 1531
1468# Jeremy Huddleston <eradicator@gentoo.org>: 1532# Jeremy Huddleston <eradicator@gentoo.org>:
1469# preserve_old_lib /path/to/libblah.so.0 1533# preserve_old_lib /path/to/libblah.so.0
1470# preserve_old_lib_notify /path/to/libblah.so.0 1534# preserve_old_lib_notify /path/to/libblah.so.0
1471# 1535#
1472# 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
1473# 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
1474# 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
1475# 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
1476# solution, so instead you can add the following to your ebuilds: 1540# solution, so instead you can add the following to your ebuilds:
1477# 1541#
1508 1572
1509 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."
1510 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"
1511 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,"
1512 ewarn "you will need to execute the following command:" 1576 ewarn "you will need to execute the following command:"
1513 ewarn " revdep-rebuild --soname ${SONAME}" 1577 ewarn " revdep-rebuild --library ${SONAME}"
1514 ewarn 1578 ewarn
1515 ewarn "After doing that, you can safely remove ${LIB}" 1579 ewarn "After doing that, you can safely remove ${LIB}"
1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1517 fi 1581 fi
1518} 1582}
1529built_with_use() { 1593built_with_use() {
1530 local opt=$1 1594 local opt=$1
1531 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1532 1596
1533 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1534 shift 1599 shift
1535 1600
1536 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1537 [[ ! -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
1538 1620
1539 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1540 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1541 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1542 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0
1599 # 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
1600 # things as $bin ... "./someprog --args" 1682 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}" 1683 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh 1684#!/bin/sh
1603cd "${chdir:-.}" 1685cd "${chdir:-.}"
1686if [ -n "${libdir}" ] ; then
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1687 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1605 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
1606fi 1692fi
1607exec ${bin} "\$@" 1693exec ${bin} "\$@"
1608EOF 1694EOF
1609 chmod go+rx "${tmpwrapper}" 1695 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then 1696 if [[ -n ${path} ]] ; then

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

  ViewVC Help
Powered by ViewVC 1.1.20