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

Diff of /eclass/eutils.eclass

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

Revision 1.197 Revision 1.248
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.197 2005/09/18 17:33:44 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.248 2006/08/19 13:52:02 vapier 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()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 395#
411# egetent(database, key) 396# egetent(database, key)
412egetent() { 397egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
414 case "$2" in 400 case "$2" in
415 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 403 ;;
418 *) # Numeric 404 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 406 ;;
421 esac 407 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
423 local action 409 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 410 local opts action="user"
425 then 411 [[ $1 == "passwd" ]] || action="group"
426 action="user" 412
427 else 413 # lookup by uid/gid
428 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 416 fi
417
430 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
431 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
432 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 425 getent "$1" "$2"
434 fi 426 ;;
427 esac
435} 428}
436 429
437# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
438# vapier@gentoo.org 431# vapier@gentoo.org
439# 432#
446# shell: /bin/false 439# shell: /bin/false
447# homedir: /dev/null 440# homedir: /dev/null
448# groups: none 441# groups: none
449# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
450enewuser() { 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
451 # get the username 451 # get the username
452 local euser=$1; shift 452 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 454 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
487 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
488 488
489 # handle shell 489 # handle shell
490 local eshell=$1; shift 490 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
494 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"
495 fi 499 fi
496 else 500 else
497 case ${USERLAND} in 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 Darwin) eshell="/usr/bin/false";; 502 [[ -x ${ROOT}${shell} ]] && break
499 BSD) eshell="/usr/sbin/nologin";; 503 done
500 *) eshell="/bin/false";; 504
501 esac 505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use"
507 die "Unable to identify the shell to use"
508 fi
509
510 eshell=${shell}
502 fi 511 fi
503 einfo " - Shell: ${eshell}" 512 einfo " - Shell: ${eshell}"
504 opts="${opts} -s ${eshell}" 513 opts="${opts} -s ${eshell}"
505 514
506 # handle homedir 515 # handle homedir
543 einfo " - Groups: ${egroups}" 552 einfo " - Groups: ${egroups}"
544 553
545 # handle extra and add the user 554 # handle extra and add the user
546 local oldsandbox=${SANDBOX_ON} 555 local oldsandbox=${SANDBOX_ON}
547 export SANDBOX_ON="0" 556 export SANDBOX_ON="0"
548 case ${USERLAND} in 557 case ${CHOST} in
549 Darwin) 558 *-darwin*)
550 ### Make the user 559 ### Make the user
551 if [[ -z $@ ]] ; then 560 if [[ -z $@ ]] ; then
552 dscl . create /users/${euser} uid ${euid} 561 dscl . create /users/${euser} uid ${euid}
553 dscl . create /users/${euser} shell ${eshell} 562 dscl . create /users/${euser} shell ${eshell}
554 dscl . create /users/${euser} home ${ehome} 563 dscl . create /users/${euser} home ${ehome}
565 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
566 einfo "eextra: $@" 575 einfo "eextra: $@"
567 die "Required function missing" 576 die "Required function missing"
568 fi 577 fi
569 ;; 578 ;;
570 BSD) 579 *-freebsd*|*-dragonfly*)
571 if [[ -z $@ ]] ; then 580 if [[ -z $@ ]] ; then
572 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
573 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
574 die "enewuser failed" 583 die "enewuser failed"
575 else 584 else
576 einfo " - Extra: $@" 585 einfo " - Extra: $@"
577 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
578 "$@" || die "enewuser failed" 587 "$@" || die "enewuser failed"
579 fi 588 fi
580 ;; 589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
581 *) 613 *)
582 if [[ -z $@ ]] ; then 614 if [[ -z $@ ]] ; then
583 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
584 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
585 || die "enewuser failed" 617 || die "enewuser failed"
609# Default values if you do not specify any: 641# Default values if you do not specify any:
610# groupname: REQUIRED ! 642# groupname: REQUIRED !
611# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
612# extra: none 644# extra: none
613enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
614 # get the group 653 # get the group
615 local egroup="$1"; shift 654 local egroup="$1"; shift
616 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
617 then 656 then
618 eerror "No group specified !" 657 eerror "No group specified !"
635 then 674 then
636 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
637 then 676 then
638 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
639 then 678 then
640 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
641 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
642 else 681 else
643 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
644 fi 683 fi
645 else 684 else
659 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
660 699
661 # add the group 700 # add the group
662 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
663 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
664 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
665 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
666 then 706 then
667 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
668 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
669 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
670 die "Required function missing" 710 die "Required function missing"
671 fi 711 fi
672 712
673 # If we need the next available 713 # If we need the next available
674 case ${egid} in 714 case ${egid} in
675 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
676 for egid in $(seq 101 999); do 716 for egid in $(seq 101 999); do
677 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
678 done 718 done
679 esac 719 esac
680 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
681 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
682 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
683 case ${egid} in 725 case ${egid} in
684 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
685 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
686 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
687 done 729 done
688 esac 730 esac
689 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
690 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
691 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
692 fi 746 ;;
747 esac
693 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
694} 749}
695 750
696# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
697# vapier@gentoo.org 752# vapier@gentoo.org
714 769
715# Make a desktop file ! 770# Make a desktop file !
716# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
717# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
718# 773#
719# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
720# 775#
721# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
722# name: the name that will show up in the menu 777# name: the name that will show up in the menu
723# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
724# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
725# a full path to an icon 780# a full path to an icon
726# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
808 type="Network;${type}" 863 type="Network;${type}"
809 ;; 864 ;;
810 865
811 sci) 866 sci)
812 case ${catmin} in 867 case ${catmin} in
813 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
814 bio*) type=Biology;; 869 bio*) type=Biology;;
815 calc*) type=Calculator;; 870 calc*) type=Calculator;;
816 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
817 geo*) type=Geology;; 872 geo*) type=Geology;;
818 math*) type=Math;; 873 math*) type=Math;;
838 local desktop_name="${PN}" 893 local desktop_name="${PN}"
839 else 894 else
840 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
841 fi 896 fi
842 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
843 899
844echo "[Desktop Entry] 900echo "[Desktop Entry]
845Encoding=UTF-8 901Encoding=UTF-8
846Version=0.9.2 902Version=0.9.2
847Name=${name} 903Name=${name}
848Type=Application 904Type=Application
849Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
850Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
851Path=${path} 908Path=${path}
852Icon=${icon} 909Icon=${icon}
853Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
854 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
855 insinto /usr/share/applications 915 insinto /usr/share/applications
856 doins "${desktop}" 916 doins "${desktop}"
857 917 )
858 return 0
859} 918}
860 919
861# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
862# 921#
863# make_desktop_entry(<title>, <command>) 922# make_desktop_entry(<title>, <command>)
968 local sizeoff_t=$2 1027 local sizeoff_t=$2
969 1028
970 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
971 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
972 1031
973 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
974 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
975 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
976 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
977 1036
978 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1042# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1043# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1044# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1045# the proper offset from the script itself. 1104# the proper offset from the script itself.
1046unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1047 local src=$(find_unpackable_file "$1") 1107 local src=$(find_unpackable_file "${src_input}")
1048 local skip=$2 1108 local skip=$2
1049 local exe=$3 1109 local exe=$3
1050 1110
1051 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1052 1112
1053 local shrtsrc=$(basename "${src}") 1113 local shrtsrc=$(basename "${src}")
1054 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1055 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1056 then
1057 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1058 local skip=0 1117 local skip=0
1059 exe=tail 1118 exe=tail
1060 case ${ver} in 1119 case ${ver} in
1061 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1062 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1063 ;; 1122 ;;
1064 2.0|2.0.1) 1123 2.0|2.0.1)
1065 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1066 ;; 1125 ;;
1074 ;; 1133 ;;
1075 2.1.3) 1134 2.1.3)
1076 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1077 let skip="skip + 1" 1136 let skip="skip + 1"
1078 ;; 1137 ;;
1079 2.1.4) 1138 2.1.4|2.1.5)
1080 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1081 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1082 exe="dd" 1141 exe="dd"
1083 ;; 1142 ;;
1084 *) 1143 *)
1129check_license() { 1188check_license() {
1130 local lic=$1 1189 local lic=$1
1131 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1132 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1133 else 1192 else
1134 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1135 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1136 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1137 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1138 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1139 lic="${src}" 1198 lic="${lic}"
1140 fi
1141 fi 1199 fi
1200 fi
1142 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1143 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1144 1203
1145 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1146 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1147 local shopts=$- 1206 local shopts=$-
1189# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1190# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1191# 1250#
1192# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1193# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1194# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1195# 1258#
1196# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1197# 1260#
1198# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1199# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1203 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1204 # the # of files they gave us 1267 # the # of files they gave us
1205 local cdcnt=0 1268 local cdcnt=0
1206 local f= 1269 local f=
1207 for f in "$@" ; do 1270 for f in "$@" ; do
1208 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1209 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1210 done 1273 done
1211 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1212 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1213 1276
1214 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1215 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1216 if [[ ! -z ${CD_ROOT} ]] ; then
1217 export CDROM_ROOT=${CD_ROOT}
1218 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1219 return
1220 fi
1221 # do the same for CD_ROOT_X
1222 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1223 local var= 1280 local var=
1224 cdcnt=0 1281 cdcnt=0
1225 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1226 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1227 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1228 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1229 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1230 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1231 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1232 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1233 fi 1291 fi
1234 export CDROM_ROOTS_${cdcnt}="${!var}"
1235 done 1292 done
1236 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1237 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1238 return 1301 return
1239 fi 1302 fi
1240 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1241 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1242 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1243 if [[ -z ${CDROM_NAME} ]] ; then
1244 echo "cdrom for ${PN}."
1245 else
1246 echo "${CDROM_NAME}."
1247 fi
1248 echo 1308 echo
1249 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1250 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1251 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1252 einfo "directory containing the files." 1312 einfo "directory containing the files."
1253 echo 1313 echo
1254 einfo "For example:" 1314 einfo "For example:"
1255 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1256 echo 1316 echo
1257 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1258 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1259 cdcnt=0 1328 cdcnt=0
1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1261 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1262 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1263 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1264 done 1333 done
1265 echo 1334 echo
1266 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1267 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1269 einfon "" 1338 einfon ""
1270 cdcnt=0 1339 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1273 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1274 done 1343 done
1275 echo 1344 echo
1276 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1277 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1280 echo 1349 echo
1281 einfo "For example:" 1350 einfo "For example:"
1282 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1283 echo 1352 echo
1284 fi 1353 fi
1354
1355 export CDROM_SET=""
1285 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1286 cdrom_load_next_cd 1357 cdrom_load_next_cd
1287} 1358}
1288 1359
1289# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1290# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1291# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1292# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1293cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1294 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1295 local var= 1365 local var
1296 1366 ((++CDROM_CURRENT_CD))
1297 if [[ ! -z ${CD_ROOT} ]] ; then
1298 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1299 return
1300 fi
1301 1367
1302 unset CDROM_ROOT 1368 unset CDROM_ROOT
1303 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1304 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1305 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1306 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1307 else 1374 else
1308 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1309 fi 1376 fi
1310 1377
1311 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1316# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1317# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1318# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1319# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1320# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1321cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1322 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1323 local dir=$(dirname "$*") 1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1324 local file=$(basename "$*") 1401 local file=$(basename ${cdset[${i}]})
1325 local mline=""
1326 local showedmsg=0
1327 1402
1328 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1329 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1330 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1331 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1332 done 1414 done
1333 1415
1334 if [[ -z ${CDROM_ROOT} ]] ; then
1335 echo 1416 echo
1336 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1337 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1338 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1339 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1340 else
1341 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1342 fi
1343 else 1421 else
1344 if [[ -z ${CDROM_NAME_1} ]] ; then
1345 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1346 else
1347 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1348 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1349 fi
1350 fi 1423 fi
1351 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1352 fi 1431 fi
1432 showedmsg=1
1433 fi
1353 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1354 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1355 echo 1436 echo
1356 einfo "If you are having trouble with the detection" 1437 einfo "If you are having trouble with the detection"
1357 einfo "of your CD, it is possible that you do not have" 1438 einfo "of your CD, it is possible that you do not have"
1358 einfo "Joliet support enabled in your kernel. Please" 1439 einfo "Joliet support enabled in your kernel. Please"
1359 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1360 read 1441 read || die "something is screwed with your system"
1361 fi
1362 done 1442 done
1363} 1443}
1364 1444
1365# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1366# a package can support 1446# a package can support
1373# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1374# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1375# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1376# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1377strip-linguas() { 1457strip-linguas() {
1378 local ls newls 1458 local ls newls nols
1379 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1380 local op=$1; shift 1460 local op=$1; shift
1381 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1382 local d f 1462 local d f
1383 for d in "$@" ; do 1463 for d in "$@" ; do
1384 if [[ ${op} == "-u" ]] ; then 1464 if [[ ${op} == "-u" ]] ; then
1385 newls=${ls} 1465 newls=${ls}
1386 else 1466 else
1387 newls="" 1467 newls=""
1388 fi 1468 fi
1389 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1390 if [[ ${op} == "-i" ]] ; then 1470 if [[ ${op} == "-i" ]] ; then
1391 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1392 else 1472 else
1393 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1394 fi 1474 fi
1395 done 1475 done
1396 ls=${newls} 1476 ls=${newls}
1397 done 1477 done
1398 ls=${ls//.po}
1399 else 1478 else
1400 ls=$@ 1479 ls="$@"
1401 fi 1480 fi
1402 1481
1403 ls=" ${ls} " 1482 nols=""
1404 newls="" 1483 newls=""
1405 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1406 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1485 if hasq ${f} ${ls} ; then
1407 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1408 else 1487 else
1409 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1410 fi 1489 fi
1411 done 1490 done
1412 if [[ -z ${newls} ]] ; then 1491 [[ -n ${nols} ]] \
1413 export LINGUAS="" 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1414 else
1415 export LINGUAS=${newls:1} 1493 export LINGUAS=${newls:1}
1416 fi
1417} 1494}
1418 1495
1419# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1420# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1421 1498
1450 1527
1451# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1452# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1453# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1454# 1531#
1455# These functions are useful when a lib in your package changes --soname. Such 1532# These functions are useful when a lib in your package changes --library. Such
1456# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1533# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1457# would break packages that link against it. Most people get around this 1534# would break packages that link against it. Most people get around this
1458# by using the portage SLOT mechanism, but that is not always a relevant 1535# by using the portage SLOT mechanism, but that is not always a relevant
1459# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1460# 1537#
1491 1568
1492 ewarn "An old version of an installed library was detected on your system." 1569 ewarn "An old version of an installed library was detected on your system."
1493 ewarn "In order to avoid breaking packages that link against it, this older version" 1570 ewarn "In order to avoid breaking packages that link against it, this older version"
1494 ewarn "is not being removed. In order to make full use of this newer version," 1571 ewarn "is not being removed. In order to make full use of this newer version,"
1495 ewarn "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1496 ewarn " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1497 ewarn 1574 ewarn
1498 ewarn "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1499 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1500 fi 1577 fi
1501} 1578}
1512built_with_use() { 1589built_with_use() {
1513 local opt=$1 1590 local opt=$1
1514 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1515 1592
1516 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1517 shift 1595 shift
1518 1596
1519 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1520 [[ ! -e ${USEFILE} ]] && return 1 1598
1599 # if the USE file doesnt exist, assume the $PKG is either
1600 # injected or package.provided
1601 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1521 1602
1522 local USE_BUILT=$(<${USEFILE}) 1603 local USE_BUILT=$(<${USEFILE})
1523 while [[ $# -gt 0 ]] ; do 1604 while [[ $# -gt 0 ]] ; do
1524 if [[ ${opt} = "-o" ]] ; then 1605 if [[ ${opt} = "-o" ]] ; then
1525 has $1 ${USE_BUILT} && return 0 1606 has $1 ${USE_BUILT} && return 0
1577# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1658# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1578# $5 == path for wrapper 1659# $5 == path for wrapper
1579make_wrapper() { 1660make_wrapper() {
1580 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1661 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1581 local tmpwrapper=$(emktemp) 1662 local tmpwrapper=$(emktemp)
1663 # We don't want to quote ${bin} so that people can pass complex
1664 # things as $bin ... "./someprog --args"
1582 cat << EOF > "${tmpwrapper}" 1665 cat << EOF > "${tmpwrapper}"
1583#!/bin/sh 1666#!/bin/sh
1584cd "${chdir}" 1667cd "${chdir:-.}"
1668if [ -n "${libdir}" ] ; then
1669 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1585export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1670 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1671 else
1672 export LD_LIBRARY_PATH="${libdir}"
1673 fi
1674fi
1586exec ${bin} "\$@" 1675exec ${bin} "\$@"
1587EOF 1676EOF
1588 chmod go+rx "${tmpwrapper}" 1677 chmod go+rx "${tmpwrapper}"
1589 if [ -n "${5}" ] 1678 if [[ -n ${path} ]] ; then
1590 then
1591 exeinto ${5} 1679 exeinto "${path}"
1592 newexe "${tmpwrapper}" "${wrapper}" 1680 newexe "${tmpwrapper}" "${wrapper}"
1593 else 1681 else
1594 newbin "${tmpwrapper}" "${wrapper}" 1682 newbin "${tmpwrapper}" "${wrapper}"
1595 fi 1683 fi
1596} 1684}

Legend:
Removed from v.1.197  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20