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

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

  ViewVC Help
Powered by ViewVC 1.1.20