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

Diff of /eclass/eutils.eclass

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

Revision 1.193 Revision 1.231
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.193 2005/07/21 02:16:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.231 2006/03/18 18:38:11 swegener Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
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 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 90# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# 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. 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 94EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 95# List of patches not to apply. Not this is only file names,
125# and not the full path .. 96# and not the full path ..
126EPATCH_EXCLUDE="" 97EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 98# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 99EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 137# hand its a directory, it will set EPATCH_SOURCE to this.
167# 138#
168# <azarah@gentoo.org> (10 Nov 2002) 139# <azarah@gentoo.org> (10 Nov 2002)
169# 140#
170epatch() { 141epatch() {
142 _epatch_draw_line() {
143 [[ -z $1 ]] && set "$(printf "%65s" '')"
144 echo "${1//?/=}"
145 }
146 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 147 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 148 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 149 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 150 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 151 local SINGLE_PATCH="no"
176 local x="" 152 local x=""
153
154 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 155
178 if [ "$#" -gt 1 ] 156 if [ "$#" -gt 1 ]
179 then 157 then
180 local m="" 158 local m=""
181 for m in "$@" ; do 159 for m in "$@" ; do
282 260
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 261 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 262 while [ "${count}" -lt 5 ]
285 do 263 do
286 # Generate some useful debug info ... 264 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 267
290 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 269 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 270 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 275
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 278
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 281
304 if [ "${PATCH_SUFFIX}" != "patch" ] 282 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 283 then
306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 284 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then 285 then
311 count=5 289 count=5
312 break 290 break
313 fi 291 fi
314 fi 292 fi
315 293
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 294 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 295 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 301
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 302 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
303 _epatch_assert
325 304
326 if [ "$?" -ne 0 ] 305 if [ "$?" -ne 0 ]
327 then 306 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 307 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 308 echo
375# vapier@gentoo.org 354# vapier@gentoo.org
376# 355#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 356# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 357emktemp() {
379 local exe="touch" 358 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 359 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 360 local topdir=$1
382 361
383 if [ -z "${topdir}" ] 362 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 363 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 364 && topdir="/tmp" \
387 || topdir="${T}" 365 || topdir=${T}
388 fi 366 fi
389 367
390 if [ -z "$(type -p mktemp)" ] 368 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 369 local tmp=/
393 while [ -e "${tmp}" ] ; do 370 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 371 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 372 done
396 ${exe} "${tmp}" 373 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 374 echo "${tmp}"
398 else 375 else
399 [ "${exe}" == "touch" ] \ 376 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 377 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 378 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 379 || TMPDIR="${topdir}" mktemp -t tmp
380 else
381 [[ ${USERLAND} == "GNU" ]] \
382 && mktemp -d "${topdir}" \
383 || TMPDIR="${topdir}" mktemp -dt tmp
384 fi
403 fi 385 fi
404} 386}
405 387
406# Small wrapper for getent (Linux), nidump (Mac OS X), 388# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 389# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 390# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 391# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 392#
411# egetent(database, key) 393# egetent(database, key)
412egetent() { 394egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 395 case ${CHOST} in
396 *-darwin*)
414 case "$2" in 397 case "$2" in
415 *[!0-9]*) # Non numeric 398 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 399 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 400 ;;
418 *) # Numeric 401 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 403 ;;
421 esac 404 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 405 ;;
423 local action 406 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 407 local opts action="user"
425 then 408 [[ $1 == "passwd" ]] || action="group"
426 action="user" 409
427 else 410 # lookup by uid/gid
428 action="group" 411 if [[ $2 == [[:digit:]]* ]] ; then
412 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 413 fi
414
430 pw show "${action}" "$2" -q 415 pw show ${action} ${opts} "$2" -q
431 else 416 ;;
417 *-netbsd*|*-openbsd*)
418 grep "$2:\*:" /etc/$1
419 ;;
420 *)
432 which nscd >& /dev/null && nscd -i "$1" 421 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 422 getent "$1" "$2"
434 fi 423 ;;
424 esac
435} 425}
436 426
437# Simplify/standardize adding users to the system 427# Simplify/standardize adding users to the system
438# vapier@gentoo.org 428# vapier@gentoo.org
439# 429#
477 fi 467 fi
478 else 468 else
479 euid="next" 469 euid="next"
480 fi 470 fi
481 if [[ ${euid} == "next" ]] ; then 471 if [[ ${euid} == "next" ]] ; then
482 local pwrange 472 for euid in $(seq 101 999) ; do
483 if [[ ${USERLAND} == "BSD" ]] ; then
484 pwrange=$(jot 898 101)
485 else
486 pwrange=$(seq 101 999)
487 fi
488 for euid in ${pwrange} ; do
489 [[ -z $(egetent passwd ${euid}) ]] && break 473 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 474 done
491 fi 475 fi
492 opts="${opts} -u ${euid}" 476 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 477 einfo " - Userid: ${euid}"
494 478
495 # handle shell 479 # handle shell
496 local eshell=$1; shift 480 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 481 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 482 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 483 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 484 die "${eshell} does not exist in ${ROOT}"
501 fi 485 fi
486 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
487 eerror "Do not specify ${eshell} yourself, use -1"
488 die "Pass '-1' as the shell parameter"
489 fi
502 else 490 else
503 case ${USERLAND} in 491 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 492 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 493 done
506 *) eshell="/bin/false";; 494
507 esac 495 if [[ ${shell} == "/dev/null" ]] ; then
496 eerror "Unable to identify the shell to use"
497 die "Unable to identify the shell to use"
498 fi
499
500 eshell=${shell}
508 fi 501 fi
509 einfo " - Shell: ${eshell}" 502 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 503 opts="${opts} -s ${eshell}"
511 504
512 # handle homedir 505 # handle homedir
549 einfo " - Groups: ${egroups}" 542 einfo " - Groups: ${egroups}"
550 543
551 # handle extra and add the user 544 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 545 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 546 export SANDBOX_ON="0"
554 case ${USERLAND} in 547 case ${CHOST} in
555 Darwin) 548 *-darwin*)
556 ### Make the user 549 ### Make the user
557 if [[ -z $@ ]] ; then 550 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 551 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 552 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 553 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 564 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 565 einfo "eextra: $@"
573 die "Required function missing" 566 die "Required function missing"
574 fi 567 fi
575 ;; 568 ;;
576 BSD) 569 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 570 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 571 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 572 -c "added by portage for ${PN}" \
580 die "enewuser failed" 573 die "enewuser failed"
581 else 574 else
582 einfo " - Extra: $@" 575 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 576 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 577 "$@" || die "enewuser failed"
585 fi 578 fi
586 ;; 579 ;;
580
581 *-netbsd*)
582 if [[ -z $@ ]] ; then
583 useradd ${opts} ${euser} || die "enewuser failed"
584 else
585 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" || die "enewuser failed"
587 fi
588 ;;
589
590 *-openbsd*)
591 if [[ -z $@ ]] ; then
592 useradd -u ${euid} -s ${eshell} \
593 -d ${ehome} -c "Added by portage for ${PN}" \
594 -g ${egroups} ${euser} || die "enewuser failed"
595 else
596 einfo " - Extra: $@"
597 useradd -u ${euid} -s ${eshell} \
598 -d ${ehome} -c "Added by portage for ${PN}" \
599 -g ${egroups} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
587 *) 603 *)
588 if [[ -z $@ ]] ; then 604 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 605 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 606 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 607 || die "enewuser failed"
641 then 657 then
642 if [ "${egid}" -gt 0 ] 658 if [ "${egid}" -gt 0 ]
643 then 659 then
644 if [ -z "`egetent group ${egid}`" ] 660 if [ -z "`egetent group ${egid}`" ]
645 then 661 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 662 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 663 opts="${opts} ${egid}"
648 else 664 else
649 opts="${opts} -g ${egid}" 665 opts="${opts} -g ${egid}"
650 fi 666 fi
651 else 667 else
665 opts="${opts} ${eextra}" 681 opts="${opts} ${eextra}"
666 682
667 # add the group 683 # add the group
668 local oldsandbox="${SANDBOX_ON}" 684 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 685 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 686 case ${CHOST} in
687 *-darwin*)
671 if [ ! -z "${eextra}" ]; 688 if [ ! -z "${eextra}" ];
672 then 689 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 690 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 691 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 692 einfo "eextra: ${eextra}"
676 die "Required function missing" 693 die "Required function missing"
677 fi 694 fi
678 695
679 # If we need the next available 696 # If we need the next available
680 case ${egid} in 697 case ${egid} in
681 *[!0-9]*) # Non numeric 698 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 699 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 700 [ -z "`egetent group ${egid}`" ] && break
684 done 701 done
685 esac 702 esac
686 dscl . create /groups/${egroup} gid ${egid} 703 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 704 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 705 ;;
706
707 *-freebsd*|*-dragonfly*)
689 case ${egid} in 708 case ${egid} in
690 *[!0-9]*) # Non numeric 709 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 710 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 711 [ -z "`egetent group ${egid}`" ] && break
693 done 712 done
694 esac 713 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 715 ;;
716
717 *-netbsd*)
718 case ${egid} in
719 *[!0-9]*) # Non numeric
720 for egid in $(seq 101 999); do
721 [ -z "`egetent group ${egid}`" ] && break
722 done
723 esac
724 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
725 ;;
726
727 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 728 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 729 ;;
730 esac
699 export SANDBOX_ON="${oldsandbox}" 731 export SANDBOX_ON="${oldsandbox}"
700} 732}
701 733
702# Simple script to replace 'dos2unix' binaries 734# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 735# vapier@gentoo.org
814 type="Network;${type}" 846 type="Network;${type}"
815 ;; 847 ;;
816 848
817 sci) 849 sci)
818 case ${catmin} in 850 case ${catmin} in
819 astro*) type=Astronomoy;; 851 astro*) type=Astronomy;;
820 bio*) type=Biology;; 852 bio*) type=Biology;;
821 calc*) type=Calculator;; 853 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 854 chem*) type=Chemistry;;
823 geo*) type=Geology;; 855 geo*) type=Geology;;
824 math*) type=Math;; 856 math*) type=Math;;
856Exec=${exec} 888Exec=${exec}
857Path=${path} 889Path=${path}
858Icon=${icon} 890Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 891Categories=Application;${type};" > "${desktop}"
860 892
893 (
894 # wrap the env here so that the 'insinto' call
895 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 896 insinto /usr/share/applications
862 doins "${desktop}" 897 doins "${desktop}"
863 898 )
864 return 0
865} 899}
866 900
867# Make a GDM/KDM Session file 901# Make a GDM/KDM Session file
868# 902#
869# make_desktop_entry(<title>, <command>) 903# make_desktop_entry(<title>, <command>)
931############################################################## 965##############################################################
932 966
933 967
934# for internal use only (unpack_pdv and unpack_makeself) 968# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 969find_unpackable_file() {
936 local src="$1" 970 local src=$1
937 if [ -z "${src}" ] 971 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 972 src=${DISTDIR}/${A}
940 else 973 else
941 if [ -e "${DISTDIR}/${src}" ] 974 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 975 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 976 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 977 src=${PWD}/${src}
947 elif [ -e "${src}" ] 978 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 979 src=${src}
950 fi
951 fi 980 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 981 fi
982 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 983 echo "${src}"
954} 984}
955 985
956# Unpack those pesky pdv generated files ... 986# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 987# They're self-unpacking programs with the binary package stuffed in
972# lseek 1002# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1004# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1005# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1006unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1007 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1008 local sizeoff_t=$2
979 1009
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1012
982 local shrtsrc="`basename ${src}`" 1013 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1017
987 # grab metadata for debug reasons 1018 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1083# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1084# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1085# the proper offset from the script itself.
1055unpack_makeself() { 1086unpack_makeself() {
1087 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1088 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1089 local skip=$2
1058 local exe="$3" 1090 local exe=$3
1059 1091
1092 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1093
1060 local shrtsrc="$(basename "${src}")" 1094 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1095 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1096 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1097 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1098 local skip=0
1066 exe=tail 1099 exe=tail
1067 case ${ver} in 1100 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1101 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1102 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1114 ;;
1082 2.1.3) 1115 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1116 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1117 let skip="skip + 1"
1085 ;; 1118 ;;
1086 2.1.4) 1119 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1120 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1121 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1122 exe="dd"
1090 ;; 1123 ;;
1091 *) 1124 *)
1136check_license() { 1169check_license() {
1137 local lic=$1 1170 local lic=$1
1138 if [ -z "${lic}" ] ; then 1171 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1172 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1173 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1174 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1175 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1176 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1177 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1178 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1179 lic="${lic}"
1147 fi
1148 fi 1180 fi
1181 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1182 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1183 local l="`basename ${lic}`"
1151 1184
1152 # here is where we check for the licenses the user already 1185 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1186 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1187 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1243 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1244 # the # of files they gave us
1212 local cdcnt=0 1245 local cdcnt=0
1213 local f= 1246 local f=
1214 for f in "$@" ; do 1247 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1248 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1249 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1250 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1251 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1252 export CDROM_CURRENT_CD=1
1220 1253
1221 # now we see if the user gave use CD_ROOT ... 1254 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1255 # if they did, let's just believe them that it's correct
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1256 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1257 local var=
1231 cdcnt=0 1258 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1259 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1260 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1261 var="CD_ROOT_${cdcnt}"
1262 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1263 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1264 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1265 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1266 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1267 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1268 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1269 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1270 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1271 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1272 export CDROM_SET=-1
1273 for f in ${CDROM_CHECK_1//:/ } ; do
1274 ((++CDROM_SET))
1275 [[ -e ${CD_ROOT}/${f} ]] && break
1276 done
1277 export CDROM_MATCH=${f}
1245 return 1278 return
1246 fi 1279 fi
1247 1280
1281 # User didn't help us out so lets make sure they know they can
1282 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1283 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1284 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1285 echo
1256 einfo "If you do not have the CD, but have the data files" 1286 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1287 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1288 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1289 einfo "directory containing the files."
1263 echo 1293 echo
1264 else 1294 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1295 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1296 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1297 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1298 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1299 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1300 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1301 done
1272 echo 1302 echo
1273 einfo "If you do not have the CDs, but have the data files" 1303 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1305 einfo "the following variables so they point to the right place:"
1276 einfon "" 1306 einfon ""
1277 cdcnt=0 1307 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1308 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1309 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1310 echo -n " CD_ROOT_${cdcnt}"
1281 done 1311 done
1282 echo 1312 echo
1283 einfo "Or, if you have all the files in the same place, or" 1313 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1314 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1317 echo
1288 einfo "For example:" 1318 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1319 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1320 echo
1291 fi 1321 fi
1322
1323 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1324 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1325 cdrom_load_next_cd
1294} 1326}
1295 1327
1296# this is only used when you need access to more than one cd. 1328# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1329# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1330# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1331# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1332cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1333 local var
1303 1334 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1335
1309 unset CDROM_ROOT 1336 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1337 var=CD_ROOT_${CDROM_CURRENT_CD}
1338 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1339 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1340 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1341 _cdrom_locate_file_on_cd ${!var}
1314 else 1342 else
1315 export CDROM_ROOT=${!var} 1343 export CDROM_ROOT=${!var}
1316 fi 1344 fi
1317 1345
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1346 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1351# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1352# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1353# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1354# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1355# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1356_cdrom_locate_file_on_cd() {
1357 local mline=""
1358 local showedmsg=0
1359
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1360 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1361 local i=0
1362 local -a cdset=(${*//:/ })
1363 if [[ -n ${CDROM_SET} ]] ; then
1364 cdset=(${cdset[${CDROM_SET}]})
1365 fi
1366
1367 while [[ -n ${cdset[${i}]} ]] ; do
1368 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1369 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1370
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1371 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1372 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1373 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1374 export CDROM_ROOT=${mline}
1375 export CDROM_SET=${i}
1376 export CDROM_MATCH=${cdset[${i}]}
1377 return
1378 fi
1379 done
1380
1381 ((++i))
1339 done 1382 done
1340 1383
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1384 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1385 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1386 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1387 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1388 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1389 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1390 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1391 fi
1358 showedmsg=1 1392 else
1393 if [[ -z ${CDROM_NAME_1} ]] ; then
1394 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1395 else
1396 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1397 einfo "Please insert+mount the ${!var} cdrom now !"
1398 fi
1359 fi 1399 fi
1400 showedmsg=1
1401 fi
1360 einfo "Press return to scan for the cd again" 1402 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1403 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1404 echo
1363 einfo "If you are having trouble with the detection" 1405 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1406 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1407 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1408 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1409 read || die "something is screwed with your system"
1368 fi
1369 done 1410 done
1370} 1411}
1371 1412
1372# Make sure that LINGUAS only contains languages that 1413# Make sure that LINGUAS only contains languages that
1373# a package can support 1414# a package can support
1383# directories and uses the union of the lists. 1424# directories and uses the union of the lists.
1384strip-linguas() { 1425strip-linguas() {
1385 local ls newls 1426 local ls newls
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1427 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1428 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1429 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1389 local d f 1430 local d f
1390 for d in "$@" ; do 1431 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1432 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1433 newls=${ls}
1393 else 1434 else
1394 newls="" 1435 newls=""
1395 fi 1436 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1437 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1438 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1439 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1399 else 1440 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1441 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1401 fi 1442 fi
1457 1498
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1499# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1500# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1501# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1502#
1462# These functions are useful when a lib in your package changes --soname. Such 1503# These functions are useful when a lib in your package changes --library. Such
1463# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1504# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1464# would break packages that link against it. Most people get around this 1505# would break packages that link against it. Most people get around this
1465# by using the portage SLOT mechanism, but that is not always a relevant 1506# by using the portage SLOT mechanism, but that is not always a relevant
1466# solution, so instead you can add the following to your ebuilds: 1507# solution, so instead you can add the following to your ebuilds:
1467# 1508#
1498 1539
1499 ewarn "An old version of an installed library was detected on your system." 1540 ewarn "An old version of an installed library was detected on your system."
1500 ewarn "In order to avoid breaking packages that link against it, this older version" 1541 ewarn "In order to avoid breaking packages that link against it, this older version"
1501 ewarn "is not being removed. In order to make full use of this newer version," 1542 ewarn "is not being removed. In order to make full use of this newer version,"
1502 ewarn "you will need to execute the following command:" 1543 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1544 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1545 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1546 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1547 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1548 fi
1508} 1549}
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1562 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1563
1523 local PKG=$(best_version $1) 1564 local PKG=$(best_version $1)
1524 shift 1565 shift
1525 1566
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1567 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1568
1569 # if the USE file doesnt exist, assume the $PKG is either
1570 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1571 [[ ! -e ${USEFILE} ]] && return 0
1528 1572
1529 local USE_BUILT=$(<${USEFILE}) 1573 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1574 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1575 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1576 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1628# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1629# $5 == path for wrapper
1586make_wrapper() { 1630make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1631 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1632 local tmpwrapper=$(emktemp)
1633 # We don't want to quote ${bin} so that people can pass complex
1634 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1635 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1636#!/bin/sh
1591cd "${chdir}" 1637cd "${chdir:-.}"
1638if [ -n "${libdir}" ] ; then
1639 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1640 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1641 else
1642 export LD_LIBRARY_PATH="${libdir}"
1643 fi
1644fi
1593exec ${bin} "\$@" 1645exec ${bin} "\$@"
1594EOF 1646EOF
1595 chmod go+rx "${tmpwrapper}" 1647 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1648 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1649 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1650 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1651 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1652 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1653 fi
1603} 1654}

Legend:
Removed from v.1.193  
changed lines
  Added in v.1.231

  ViewVC Help
Powered by ViewVC 1.1.20