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

Diff of /eclass/eutils.eclass

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

Revision 1.200 Revision 1.234
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.234 2006/04/25 15:47:30 wolf31o2 Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib portability 12inherit multilib portability
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15RDEPEND=""
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 16# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
18 19
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# Wait for the supplied number of seconds. If no argument is supplied, defaults
60# to point to the latest version of the library present. 61# to point to the latest version of the library present.
61# 62#
62# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
63# 64#
64gen_usr_ldscript() { 65gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 66 local lib libdir=$(get_libdir)
66 # Just make sure it exists 67 # Just make sure it exists
67 dodir /usr/${libdir} 68 dodir /usr/${libdir}
68 69
69 for lib in "${@}" ; do 70 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 77
77 See bug http://bugs.gentoo.org/4411 for more info. 78 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 79 */
79 GROUP ( /${libdir}/${lib} ) 80 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 81 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 82 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 83 done
83} 84}
84 85
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 86
116# Default directory where patches are located 87# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 88EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 89# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 90EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 91# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 92# 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. 93# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
94# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 96# List of patches not to apply. Not this is only file names,
125# and not the full path .. 97# and not the full path ..
126EPATCH_EXCLUDE="" 98EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 99# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 100EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 138# hand its a directory, it will set EPATCH_SOURCE to this.
167# 139#
168# <azarah@gentoo.org> (10 Nov 2002) 140# <azarah@gentoo.org> (10 Nov 2002)
169# 141#
170epatch() { 142epatch() {
143 _epatch_draw_line() {
144 [[ -z $1 ]] && set "$(printf "%65s" '')"
145 echo "${1//?/=}"
146 }
147 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 148 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 149 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 150 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 151 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 152 local SINGLE_PATCH="no"
284 261
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 262 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 263 while [ "${count}" -lt 5 ]
287 do 264 do
288 # Generate some useful debug info ... 265 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 268
292 if [ "${PATCH_SUFFIX}" != "patch" ] 269 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 270 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 276
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 279
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 282
306 if [ "${PATCH_SUFFIX}" != "patch" ] 283 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 284 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 285 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 286 then
313 count=5 290 count=5
314 break 291 break
315 fi 292 fi
316 fi 293 fi
317 294
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 296 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 302
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
327 305
328 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
329 then 307 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 309 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 372 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 373 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 374 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 375 echo "${tmp}"
398 else 376 else
399 [[ ${exe} == "touch" ]] \ 377 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 378 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 379 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 380 || TMPDIR="${topdir}" mktemp -t tmp
381 else
382 [[ ${USERLAND} == "GNU" ]] \
383 && mktemp -d "${topdir}" \
384 || TMPDIR="${topdir}" mktemp -dt tmp
385 fi
403 fi 386 fi
404} 387}
405 388
406# Small wrapper for getent (Linux), nidump (Mac OS X), 389# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 390# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 391# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 392# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 393#
411# egetent(database, key) 394# egetent(database, key)
412egetent() { 395egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 396 case ${CHOST} in
397 *-darwin*)
414 case "$2" in 398 case "$2" in
415 *[!0-9]*) # Non numeric 399 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 400 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 401 ;;
418 *) # Numeric 402 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 403 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 404 ;;
421 esac 405 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 406 ;;
423 local action 407 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 408 local opts action="user"
425 then 409 [[ $1 == "passwd" ]] || action="group"
426 action="user" 410
427 else 411 # lookup by uid/gid
428 action="group" 412 if [[ $2 == [[:digit:]]* ]] ; then
413 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 414 fi
415
430 pw show "${action}" "$2" -q 416 pw show ${action} ${opts} "$2" -q
431 else 417 ;;
418 *-netbsd*|*-openbsd*)
419 grep "$2:\*:" /etc/$1
420 ;;
421 *)
432 which nscd >& /dev/null && nscd -i "$1" 422 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 423 getent "$1" "$2"
434 fi 424 ;;
425 esac
435} 426}
436 427
437# Simplify/standardize adding users to the system 428# Simplify/standardize adding users to the system
438# vapier@gentoo.org 429# vapier@gentoo.org
439# 430#
446# shell: /bin/false 437# shell: /bin/false
447# homedir: /dev/null 438# homedir: /dev/null
448# groups: none 439# groups: none
449# extra: comment of 'added by portage for ${PN}' 440# extra: comment of 'added by portage for ${PN}'
450enewuser() { 441enewuser() {
442 case ${EBUILD_PHASE} in
443 unpack|compile|test|install)
444 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
445 eerror "Package fails at QA and at life. Please file a bug."
446 die "Bad package! enewuser is only for use in pkg_* functions!"
447 esac
448
451 # get the username 449 # get the username
452 local euser=$1; shift 450 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 451 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 452 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
487 einfo " - Userid: ${euid}" 485 einfo " - Userid: ${euid}"
488 486
489 # handle shell 487 # handle shell
490 local eshell=$1; shift 488 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 489 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 490 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 491 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 492 die "${eshell} does not exist in ${ROOT}"
495 fi 493 fi
494 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
495 eerror "Do not specify ${eshell} yourself, use -1"
496 die "Pass '-1' as the shell parameter"
497 fi
496 else 498 else
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do 499 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break; 500 [[ -x ${ROOT}${shell} ]] && break
499 done 501 done
500 502
501 if [[ ${shell} == "/dev/null" ]]; then 503 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 504 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 505 die "Unable to identify the shell to use"
504 fi 506 fi
505 507
506 eshell=${shell} 508 eshell=${shell}
548 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
549 551
550 # handle extra and add the user 552 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 553 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
553 case ${USERLAND} in 555 case ${CHOST} in
554 Darwin) 556 *-darwin*)
555 ### Make the user 557 ### Make the user
556 if [[ -z $@ ]] ; then 558 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 573 einfo "eextra: $@"
572 die "Required function missing" 574 die "Required function missing"
573 fi 575 fi
574 ;; 576 ;;
575 BSD) 577 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 578 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
579 die "enewuser failed" 581 die "enewuser failed"
580 else 582 else
581 einfo " - Extra: $@" 583 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 585 "$@" || die "enewuser failed"
584 fi 586 fi
585 ;; 587 ;;
588
589 *-netbsd*)
590 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} || die "enewuser failed"
592 else
593 einfo " - Extra: $@"
594 useradd ${opts} ${euser} "$@" || die "enewuser failed"
595 fi
596 ;;
597
598 *-openbsd*)
599 if [[ -z $@ ]] ; then
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} || die "enewuser failed"
603 else
604 einfo " - Extra: $@"
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} "$@" || die "enewuser failed"
608 fi
609 ;;
610
586 *) 611 *)
587 if [[ -z $@ ]] ; then 612 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 613 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 614 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 615 || die "enewuser failed"
614# Default values if you do not specify any: 639# Default values if you do not specify any:
615# groupname: REQUIRED ! 640# groupname: REQUIRED !
616# gid: next available (see groupadd(8)) 641# gid: next available (see groupadd(8))
617# extra: none 642# extra: none
618enewgroup() { 643enewgroup() {
644 case ${EBUILD_PHASE} in
645 unpack|compile|test|install)
646 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
647 eerror "Package fails at QA and at life. Please file a bug."
648 die "Bad package! enewgroup is only for use in pkg_* functions!"
649 esac
650
619 # get the group 651 # get the group
620 local egroup="$1"; shift 652 local egroup="$1"; shift
621 if [ -z "${egroup}" ] 653 if [ -z "${egroup}" ]
622 then 654 then
623 eerror "No group specified !" 655 eerror "No group specified !"
640 then 672 then
641 if [ "${egid}" -gt 0 ] 673 if [ "${egid}" -gt 0 ]
642 then 674 then
643 if [ -z "`egetent group ${egid}`" ] 675 if [ -z "`egetent group ${egid}`" ]
644 then 676 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 677 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 678 opts="${opts} ${egid}"
647 else 679 else
648 opts="${opts} -g ${egid}" 680 opts="${opts} -g ${egid}"
649 fi 681 fi
650 else 682 else
664 opts="${opts} ${eextra}" 696 opts="${opts} ${eextra}"
665 697
666 # add the group 698 # add the group
667 local oldsandbox="${SANDBOX_ON}" 699 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 700 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 701 case ${CHOST} in
702 *-darwin*)
670 if [ ! -z "${eextra}" ]; 703 if [ ! -z "${eextra}" ];
671 then 704 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 705 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 706 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 707 einfo "eextra: ${eextra}"
675 die "Required function missing" 708 die "Required function missing"
676 fi 709 fi
677 710
678 # If we need the next available 711 # If we need the next available
679 case ${egid} in 712 case ${egid} in
680 *[!0-9]*) # Non numeric 713 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 714 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 715 [ -z "`egetent group ${egid}`" ] && break
683 done 716 done
684 esac 717 esac
685 dscl . create /groups/${egroup} gid ${egid} 718 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 719 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 720 ;;
721
722 *-freebsd*|*-dragonfly*)
688 case ${egid} in 723 case ${egid} in
689 *[!0-9]*) # Non numeric 724 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 725 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 726 [ -z "`egetent group ${egid}`" ] && break
692 done 727 done
693 esac 728 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 729 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 730 ;;
731
732 *-netbsd*)
733 case ${egid} in
734 *[!0-9]*) # Non numeric
735 for egid in $(seq 101 999); do
736 [ -z "`egetent group ${egid}`" ] && break
737 done
738 esac
739 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
740 ;;
741
742 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 743 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 744 ;;
745 esac
698 export SANDBOX_ON="${oldsandbox}" 746 export SANDBOX_ON="${oldsandbox}"
699} 747}
700 748
701# Simple script to replace 'dos2unix' binaries 749# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 750# vapier@gentoo.org
813 type="Network;${type}" 861 type="Network;${type}"
814 ;; 862 ;;
815 863
816 sci) 864 sci)
817 case ${catmin} in 865 case ${catmin} in
818 astro*) type=Astronomoy;; 866 astro*) type=Astronomy;;
819 bio*) type=Biology;; 867 bio*) type=Biology;;
820 calc*) type=Calculator;; 868 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 869 chem*) type=Chemistry;;
822 geo*) type=Geology;; 870 geo*) type=Geology;;
823 math*) type=Math;; 871 math*) type=Math;;
851Version=0.9.2 899Version=0.9.2
852Name=${name} 900Name=${name}
853Type=Application 901Type=Application
854Comment=${DESCRIPTION} 902Comment=${DESCRIPTION}
855Exec=${exec} 903Exec=${exec}
904TryExec=${exec}
856Path=${path} 905Path=${path}
857Icon=${icon} 906Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
859 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 912 insinto /usr/share/applications
861 doins "${desktop}" 913 doins "${desktop}"
862 914 )
863 return 0
864} 915}
865 916
866# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
867# 918#
868# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1024 local sizeoff_t=$2
974 1025
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1028
978 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1033
983 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1101# the proper offset from the script itself.
1051unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1104 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1105 local skip=$2
1054 local exe=$3 1106 local exe=$3
1055 1107
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1109
1058 local shrtsrc=$(basename "${src}") 1110 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1114 local skip=0
1064 exe=tail 1115 exe=tail
1065 case ${ver} in 1116 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1130 ;;
1080 2.1.3) 1131 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1133 let skip="skip + 1"
1083 ;; 1134 ;;
1084 2.1.4) 1135 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1138 exe="dd"
1088 ;; 1139 ;;
1089 *) 1140 *)
1208 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1260 # the # of files they gave us
1210 local cdcnt=0 1261 local cdcnt=0
1211 local f= 1262 local f=
1212 for f in "$@" ; do 1263 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1266 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1218 1269
1219 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1273 local var=
1229 cdcnt=0 1274 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1284 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1285 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1243 return 1294 return
1244 fi 1295 fi
1245 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1301 echo
1254 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1305 einfo "directory containing the files."
1261 echo 1309 echo
1262 else 1310 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1312 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1317 done
1270 echo 1318 echo
1271 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1274 einfon "" 1322 einfon ""
1275 cdcnt=0 1323 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1279 done 1327 done
1280 echo 1328 echo
1281 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1333 echo
1286 einfo "For example:" 1334 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1336 echo
1289 fi 1337 fi
1338
1339 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1341 cdrom_load_next_cd
1292} 1342}
1293 1343
1294# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1349 local var
1301 1350 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1351
1307 unset CDROM_ROOT 1352 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1312 else 1358 else
1313 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1314 fi 1360 fi
1315 1361
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1385 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1386
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1337 done 1398 done
1338 1399
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1400 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1405 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1407 fi
1356 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1357 fi 1415 fi
1416 showedmsg=1
1417 fi
1358 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1420 echo
1361 einfo "If you are having trouble with the detection" 1421 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1422 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1423 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1425 read || die "something is screwed with your system"
1366 fi
1367 done 1426 done
1368} 1427}
1369 1428
1370# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1371# a package can support 1430# a package can support
1381# directories and uses the union of the lists. 1440# directories and uses the union of the lists.
1382strip-linguas() { 1441strip-linguas() {
1383 local ls newls 1442 local ls newls
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1444 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1445 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1387 local d f 1446 local d f
1388 for d in "$@" ; do 1447 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1448 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1449 newls=${ls}
1391 else 1450 else
1392 newls="" 1451 newls=""
1393 fi 1452 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1453 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1454 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1397 else 1456 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1399 fi 1458 fi
1455 1514
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1515# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1516# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1517# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1518#
1460# These functions are useful when a lib in your package changes --soname. Such 1519# These functions are useful when a lib in your package changes --library. Such
1461# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1520# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1462# would break packages that link against it. Most people get around this 1521# would break packages that link against it. Most people get around this
1463# by using the portage SLOT mechanism, but that is not always a relevant 1522# by using the portage SLOT mechanism, but that is not always a relevant
1464# solution, so instead you can add the following to your ebuilds: 1523# solution, so instead you can add the following to your ebuilds:
1465# 1524#
1496 1555
1497 ewarn "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1498 ewarn "In order to avoid breaking packages that link against it, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1499 ewarn "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1500 ewarn "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --library ${SONAME}"
1502 ewarn 1561 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1564 fi
1506} 1565}
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1579
1521 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1522 shift 1581 shift
1523 1582
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1526 1588
1527 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1645# $5 == path for wrapper
1584make_wrapper() { 1646make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1652#!/bin/sh
1589cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1591exec ${bin} "\$@" 1661exec ${bin} "\$@"
1592EOF 1662EOF
1593 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1665 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1667 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1669 fi
1601} 1670}

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.234

  ViewVC Help
Powered by ViewVC 1.1.20