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

Diff of /eclass/eutils.eclass

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

Revision 1.197 Revision 1.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.197 2005/09/18 17:33:44 flameeyes 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 ;;
423 local action 405 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 406 local opts action="user"
425 then 407 [[ $1 == "passwd" ]] || action="group"
426 action="user" 408
427 else 409 # lookup by uid/gid
428 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 412 fi
413
430 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
431 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
432 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 421 getent "$1" "$2"
434 fi 422 ;;
423 esac
435} 424}
436 425
437# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
438# vapier@gentoo.org 427# vapier@gentoo.org
439# 428#
446# shell: /bin/false 435# shell: /bin/false
447# homedir: /dev/null 436# homedir: /dev/null
448# groups: none 437# groups: none
449# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
450enewuser() { 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
451 # get the username 447 # get the username
452 local euser=$1; shift 448 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 449 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 450 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
487 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
488 484
489 # handle shell 485 # handle shell
490 local eshell=$1; shift 486 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
494 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"
495 fi 495 fi
496 else 496 else
497 case ${USERLAND} in 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 Darwin) eshell="/usr/bin/false";; 498 [[ -x ${ROOT}${shell} ]] && break
499 BSD) eshell="/usr/sbin/nologin";; 499 done
500 *) eshell="/bin/false";; 500
501 esac 501 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
504 fi
505
506 eshell=${shell}
502 fi 507 fi
503 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
504 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
505 510
506 # handle homedir 511 # handle homedir
543 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
544 549
545 # handle extra and add the user 550 # handle extra and add the user
546 local oldsandbox=${SANDBOX_ON} 551 local oldsandbox=${SANDBOX_ON}
547 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
548 case ${USERLAND} in 553 case ${CHOST} in
549 Darwin) 554 *-darwin*)
550 ### Make the user 555 ### Make the user
551 if [[ -z $@ ]] ; then 556 if [[ -z $@ ]] ; then
552 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
553 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
554 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
565 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
566 einfo "eextra: $@" 571 einfo "eextra: $@"
567 die "Required function missing" 572 die "Required function missing"
568 fi 573 fi
569 ;; 574 ;;
570 BSD) 575 *-freebsd*|*-dragonfly*)
571 if [[ -z $@ ]] ; then 576 if [[ -z $@ ]] ; then
572 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
573 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
574 die "enewuser failed" 579 die "enewuser failed"
575 else 580 else
576 einfo " - Extra: $@" 581 einfo " - Extra: $@"
577 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
578 "$@" || die "enewuser failed" 583 "$@" || die "enewuser failed"
579 fi 584 fi
580 ;; 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
581 *) 609 *)
582 if [[ -z $@ ]] ; then 610 if [[ -z $@ ]] ; then
583 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
584 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
585 || die "enewuser failed" 613 || die "enewuser failed"
609# Default values if you do not specify any: 637# Default values if you do not specify any:
610# groupname: REQUIRED ! 638# groupname: REQUIRED !
611# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
612# extra: none 640# extra: none
613enewgroup() { 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
614 # get the group 649 # get the group
615 local egroup="$1"; shift 650 local egroup="$1"; shift
616 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
617 then 652 then
618 eerror "No group specified !" 653 eerror "No group specified !"
635 then 670 then
636 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
637 then 672 then
638 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
639 then 674 then
640 if [[ "${USERLAND}" == "Darwin" ]]; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
641 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
642 else 677 else
643 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
644 fi 679 fi
645 else 680 else
659 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
660 695
661 # add the group 696 # add the group
662 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
663 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
664 if [[ "${USERLAND}" == "Darwin" ]]; then 699 case ${CHOST} in
700 *-darwin*)
665 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
666 then 702 then
667 einfo "Extra options are not supported on Darwin/OS X yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
668 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
669 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
670 die "Required function missing" 706 die "Required function missing"
671 fi 707 fi
672 708
673 # If we need the next available 709 # If we need the next available
674 case ${egid} in 710 case ${egid} in
675 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
676 for egid in $(seq 101 999); do 712 for egid in $(seq 101 999); do
677 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
678 done 714 done
679 esac 715 esac
680 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
681 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
682 elif [[ "${USERLAND}" == "BSD" ]] ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
683 case ${egid} in 721 case ${egid} in
684 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
685 for egid in $(seq 101 999); do 723 for egid in $(seq 101 999); do
686 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
687 done 725 done
688 esac 726 esac
689 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
690 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 *)
691 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
692 fi 742 ;;
743 esac
693 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
694} 745}
695 746
696# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
697# vapier@gentoo.org 748# vapier@gentoo.org
808 type="Network;${type}" 859 type="Network;${type}"
809 ;; 860 ;;
810 861
811 sci) 862 sci)
812 case ${catmin} in 863 case ${catmin} in
813 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
814 bio*) type=Biology;; 865 bio*) type=Biology;;
815 calc*) type=Calculator;; 866 calc*) type=Calculator;;
816 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
817 geo*) type=Geology;; 868 geo*) type=Geology;;
818 math*) type=Math;; 869 math*) type=Math;;
838 local desktop_name="${PN}" 889 local desktop_name="${PN}"
839 else 890 else
840 local desktop_name="${PN}-${SLOT}" 891 local desktop_name="${PN}-${SLOT}"
841 fi 892 fi
842 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
843 895
844echo "[Desktop Entry] 896echo "[Desktop Entry]
845Encoding=UTF-8 897Encoding=UTF-8
846Version=0.9.2 898Version=0.9.2
847Name=${name} 899Name=${name}
848Type=Application 900Type=Application
849Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
850Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
851Path=${path} 904Path=${path}
852Icon=${icon} 905Icon=${icon}
853Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
854 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
855 insinto /usr/share/applications 911 insinto /usr/share/applications
856 doins "${desktop}" 912 doins "${desktop}"
857 913 )
858 return 0
859} 914}
860 915
861# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
862# 917#
863# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
968 local sizeoff_t=$2 1023 local sizeoff_t=$2
969 1024
970 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
971 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
972 1027
973 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
974 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
975 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
976 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
977 1032
978 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1042# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1043# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1044# - 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
1045# the proper offset from the script itself. 1100# the proper offset from the script itself.
1046unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1047 local src=$(find_unpackable_file "$1") 1103 local src=$(find_unpackable_file "${src_input}")
1048 local skip=$2 1104 local skip=$2
1049 local exe=$3 1105 local exe=$3
1050 1106
1051 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1052 1108
1053 local shrtsrc=$(basename "${src}") 1109 local shrtsrc=$(basename "${src}")
1054 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1055 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1056 then
1057 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1058 local skip=0 1113 local skip=0
1059 exe=tail 1114 exe=tail
1060 case ${ver} in 1115 case ${ver} in
1061 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
1062 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1074 ;; 1129 ;;
1075 2.1.3) 1130 2.1.3)
1076 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1077 let skip="skip + 1" 1132 let skip="skip + 1"
1078 ;; 1133 ;;
1079 2.1.4) 1134 2.1.4|2.1.5)
1080 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)
1081 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1082 exe="dd" 1137 exe="dd"
1083 ;; 1138 ;;
1084 *) 1139 *)
1129check_license() { 1184check_license() {
1130 local lic=$1 1185 local lic=$1
1131 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1132 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1133 else 1188 else
1134 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1135 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1136 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1137 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1138 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1139 lic="${src}" 1194 lic="${lic}"
1140 fi
1141 fi 1195 fi
1196 fi
1142 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1143 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1144 1199
1145 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1146 # accepted ... if we don't find a match, we make the user accept 1201 # accepted ... if we don't find a match, we make the user accept
1147 local shopts=$- 1202 local shopts=$-
1203 # 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
1204 # the # of files they gave us 1259 # the # of files they gave us
1205 local cdcnt=0 1260 local cdcnt=0
1206 local f= 1261 local f=
1207 for f in "$@" ; do 1262 for f in "$@" ; do
1208 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1209 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1210 done 1265 done
1211 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1212 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1213 1268
1214 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1215 # 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
1216 if [[ ! -z ${CD_ROOT} ]] ; then
1217 export CDROM_ROOT=${CD_ROOT}
1218 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1219 return
1220 fi
1221 # do the same for CD_ROOT_X
1222 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1223 local var= 1272 local var=
1224 cdcnt=0 1273 cdcnt=0
1225 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1226 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1227 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1228 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1229 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1230 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1231 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."
1232 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1233 fi 1283 fi
1234 export CDROM_ROOTS_${cdcnt}="${!var}"
1235 done 1284 done
1236 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1237 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}
1238 return 1293 return
1239 fi 1294 fi
1240 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1241 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1242 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1243 if [[ -z ${CDROM_NAME} ]] ; then
1244 echo "cdrom for ${PN}."
1245 else
1246 echo "${CDROM_NAME}."
1247 fi
1248 echo 1300 echo
1249 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"
1250 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1251 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1252 einfo "directory containing the files." 1304 einfo "directory containing the files."
1256 echo 1308 echo
1257 else 1309 else
1258 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1259 cdcnt=0 1311 cdcnt=0
1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1261 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1262 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1263 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1264 done 1316 done
1265 echo 1317 echo
1266 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"
1267 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1269 einfon "" 1321 einfon ""
1270 cdcnt=0 1322 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1273 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1274 done 1326 done
1275 echo 1327 echo
1276 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"
1277 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1280 echo 1332 echo
1281 einfo "For example:" 1333 einfo "For example:"
1282 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1283 echo 1335 echo
1284 fi 1336 fi
1337
1338 export CDROM_SET=""
1285 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1286 cdrom_load_next_cd 1340 cdrom_load_next_cd
1287} 1341}
1288 1342
1289# 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.
1290# 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.
1291# 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.
1292# 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.
1293cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1294 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1295 local var= 1348 local var
1296 1349 ((++CDROM_CURRENT_CD))
1297 if [[ ! -z ${CD_ROOT} ]] ; then
1298 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1299 return
1300 fi
1301 1350
1302 unset CDROM_ROOT 1351 unset CDROM_ROOT
1303 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1304 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1305 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1306 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1307 else 1357 else
1308 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1309 fi 1359 fi
1310 1360
1311 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1316# all it does is try to locate a give file on a cd ... if the cd isn't 1366# all it does is try to locate a give file on a cd ... if the cd isn't
1317# found, then a message asking for the user to insert the cdrom will be 1367# found, then a message asking for the user to insert the cdrom will be
1318# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1319# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1320# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1321cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1322 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1323 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}]})
1324 local file=$(basename "$*") 1384 local file=$(basename ${cdset[${i}]})
1325 local mline=""
1326 local showedmsg=0
1327 1385
1328 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
1329 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1330 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1331 && 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))
1332 done 1397 done
1333 1398
1334 if [[ -z ${CDROM_ROOT} ]] ; then
1335 echo 1399 echo
1336 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1337 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1338 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1339 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1340 else
1341 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1342 fi
1343 else 1404 else
1344 if [[ -z ${CDROM_NAME_1} ]] ; then
1345 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1346 else
1347 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1348 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1349 fi
1350 fi 1406 fi
1351 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
1352 fi 1414 fi
1415 showedmsg=1
1416 fi
1353 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1354 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1355 echo 1419 echo
1356 einfo "If you are having trouble with the detection" 1420 einfo "If you are having trouble with the detection"
1357 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"
1358 einfo "Joliet support enabled in your kernel. Please" 1422 einfo "Joliet support enabled in your kernel. Please"
1359 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1360 read 1424 read || die "something is screwed with your system"
1361 fi
1362 done 1425 done
1363} 1426}
1364 1427
1365# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1366# a package can support 1429# a package can support
1376# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1377strip-linguas() { 1440strip-linguas() {
1378 local ls newls 1441 local ls newls
1379 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1380 local op=$1; shift 1443 local op=$1; shift
1381 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1382 local d f 1445 local d f
1383 for d in "$@" ; do 1446 for d in "$@" ; do
1384 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1385 newls=${ls} 1448 newls=${ls}
1386 else 1449 else
1387 newls="" 1450 newls=""
1388 fi 1451 fi
1389 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1390 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1391 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1392 else 1455 else
1393 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1394 fi 1457 fi
1395 done 1458 done
1396 ls=${newls} 1459 ls=${newls}
1397 done 1460 done
1398 ls=${ls//.po}
1399 else 1461 else
1400 ls=$@ 1462 ls="$@"
1401 fi 1463 fi
1402 1464
1403 ls=" ${ls} "
1404 newls="" 1465 newls=""
1405 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1406 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1407 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1408 else 1469 else
1409 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1410 fi 1471 fi
1411 done 1472 done
1412 if [[ -z ${newls} ]] ; then
1413 export LINGUAS=""
1414 else
1415 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1416 fi
1417} 1474}
1418 1475
1419# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1420# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1421 1478
1450 1507
1451# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1452# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1453# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1454# 1511#
1455# 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
1456# 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
1457# 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
1458# 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
1459# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1460# 1517#
1491 1548
1492 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."
1493 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"
1494 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,"
1495 ewarn "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1496 ewarn " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1497 ewarn 1554 ewarn
1498 ewarn "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1499 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1500 fi 1557 fi
1501} 1558}
1514 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1515 1572
1516 local PKG=$(best_version $1) 1573 local PKG=$(best_version $1)
1517 shift 1574 shift
1518 1575
1519 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
1520 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1521 1581
1522 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1523 while [[ $# -gt 0 ]] ; do 1583 while [[ $# -gt 0 ]] ; do
1524 if [[ ${opt} = "-o" ]] ; then 1584 if [[ ${opt} = "-o" ]] ; then
1525 has $1 ${USE_BUILT} && return 0 1585 has $1 ${USE_BUILT} && return 0
1577# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1637# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1578# $5 == path for wrapper 1638# $5 == path for wrapper
1579make_wrapper() { 1639make_wrapper() {
1580 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1640 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1581 local tmpwrapper=$(emktemp) 1641 local tmpwrapper=$(emktemp)
1642 # We don't want to quote ${bin} so that people can pass complex
1643 # things as $bin ... "./someprog --args"
1582 cat << EOF > "${tmpwrapper}" 1644 cat << EOF > "${tmpwrapper}"
1583#!/bin/sh 1645#!/bin/sh
1584cd "${chdir}" 1646cd "${chdir:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1585export 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
1653fi
1586exec ${bin} "\$@" 1654exec ${bin} "\$@"
1587EOF 1655EOF
1588 chmod go+rx "${tmpwrapper}" 1656 chmod go+rx "${tmpwrapper}"
1589 if [ -n "${5}" ] 1657 if [[ -n ${path} ]] ; then
1590 then
1591 exeinto ${5} 1658 exeinto "${path}"
1592 newexe "${tmpwrapper}" "${wrapper}" 1659 newexe "${tmpwrapper}" "${wrapper}"
1593 else 1660 else
1594 newbin "${tmpwrapper}" "${wrapper}" 1661 newbin "${tmpwrapper}" "${wrapper}"
1595 fi 1662 fi
1596} 1663}

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

  ViewVC Help
Powered by ViewVC 1.1.20