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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.203  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20