/[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.229
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.229 2006/03/16 03:44:54 agriffis 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"
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"
176 local x="" 151 local x=""
152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 154
178 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
179 then 156 then
180 local m="" 157 local m=""
181 for m in "$@" ; do 158 for m in "$@" ; do
282 259
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
285 do 262 do
286 # Generate some useful debug info ... 263 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 266
290 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 268 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 274
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 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##*/}
300 277
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 280
304 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 282 then
306 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
307 then 284 then
311 count=5 288 count=5
312 break 289 break
313 fi 290 fi
314 fi 291 fi
315 292
316 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
317 then 294 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 300
324 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
325 303
326 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
327 then 305 then
328 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##*/}
329 echo 307 echo
375# vapier@gentoo.org 353# vapier@gentoo.org
376# 354#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 356emktemp() {
379 local exe="touch" 357 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 359 local topdir=$1
382 360
383 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 363 && topdir="/tmp" \
387 || topdir="${T}" 364 || topdir=${T}
388 fi 365 fi
389 366
390 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 368 local tmp=/
393 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 371 done
396 ${exe} "${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#
477 fi 466 fi
478 else 467 else
479 euid="next" 468 euid="next"
480 fi 469 fi
481 if [[ ${euid} == "next" ]] ; then 470 if [[ ${euid} == "next" ]] ; then
482 local pwrange 471 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 472 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 473 done
491 fi 474 fi
492 opts="${opts} -u ${euid}" 475 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 476 einfo " - Userid: ${euid}"
494 477
495 # handle shell 478 # handle shell
496 local eshell=$1; shift 479 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 480 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 481 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 482 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 483 die "${eshell} does not exist in ${ROOT}"
501 fi 484 fi
485 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
486 eerror "Do not specify ${eshell} yourself, use -1"
487 die "Pass '-1' as the shell parameter"
488 fi
502 else 489 else
503 case ${USERLAND} in 490 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 491 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 492 done
506 *) eshell="/bin/false";; 493
507 esac 494 if [[ ${shell} == "/dev/null" ]] ; then
495 eerror "Unable to identify the shell to use"
496 die "Unable to identify the shell to use"
497 fi
498
499 eshell=${shell}
508 fi 500 fi
509 einfo " - Shell: ${eshell}" 501 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 502 opts="${opts} -s ${eshell}"
511 503
512 # handle homedir 504 # handle homedir
549 einfo " - Groups: ${egroups}" 541 einfo " - Groups: ${egroups}"
550 542
551 # handle extra and add the user 543 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 544 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 545 export SANDBOX_ON="0"
554 case ${USERLAND} in 546 case ${CHOST} in
555 Darwin) 547 *-darwin*)
556 ### Make the user 548 ### Make the user
557 if [[ -z $@ ]] ; then 549 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 550 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 551 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 552 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 563 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 564 einfo "eextra: $@"
573 die "Required function missing" 565 die "Required function missing"
574 fi 566 fi
575 ;; 567 ;;
576 BSD) 568 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 569 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 570 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 571 -c "added by portage for ${PN}" \
580 die "enewuser failed" 572 die "enewuser failed"
581 else 573 else
582 einfo " - Extra: $@" 574 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 575 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 576 "$@" || die "enewuser failed"
585 fi 577 fi
586 ;; 578 ;;
579
580 *-netbsd*)
581 if [[ -z $@ ]] ; then
582 useradd ${opts} ${euser} || die "enewuser failed"
583 else
584 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" || die "enewuser failed"
586 fi
587 ;;
588
589 *-openbsd*)
590 if [[ -z $@ ]] ; then
591 useradd -u ${euid} -s ${eshell} \
592 -d ${ehome} -c "Added by portage for ${PN}" \
593 -g ${egroups} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd -u ${euid} -s ${eshell} \
597 -d ${ehome} -c "Added by portage for ${PN}" \
598 -g ${egroups} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
587 *) 602 *)
588 if [[ -z $@ ]] ; then 603 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 604 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 605 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 606 || die "enewuser failed"
641 then 656 then
642 if [ "${egid}" -gt 0 ] 657 if [ "${egid}" -gt 0 ]
643 then 658 then
644 if [ -z "`egetent group ${egid}`" ] 659 if [ -z "`egetent group ${egid}`" ]
645 then 660 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 661 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 662 opts="${opts} ${egid}"
648 else 663 else
649 opts="${opts} -g ${egid}" 664 opts="${opts} -g ${egid}"
650 fi 665 fi
651 else 666 else
665 opts="${opts} ${eextra}" 680 opts="${opts} ${eextra}"
666 681
667 # add the group 682 # add the group
668 local oldsandbox="${SANDBOX_ON}" 683 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 684 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 685 case ${CHOST} in
686 *-darwin*)
671 if [ ! -z "${eextra}" ]; 687 if [ ! -z "${eextra}" ];
672 then 688 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 689 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 690 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 691 einfo "eextra: ${eextra}"
676 die "Required function missing" 692 die "Required function missing"
677 fi 693 fi
678 694
679 # If we need the next available 695 # If we need the next available
680 case ${egid} in 696 case ${egid} in
681 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
684 done 700 done
685 esac 701 esac
686 dscl . create /groups/${egroup} gid ${egid} 702 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 703 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 704 ;;
705
706 *-freebsd*|*-dragonfly*)
689 case ${egid} in 707 case ${egid} in
690 *[!0-9]*) # Non numeric 708 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 709 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 710 [ -z "`egetent group ${egid}`" ] && break
693 done 711 done
694 esac 712 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 714 ;;
715
716 *-netbsd*)
717 case ${egid} in
718 *[!0-9]*) # Non numeric
719 for egid in $(seq 101 999); do
720 [ -z "`egetent group ${egid}`" ] && break
721 done
722 esac
723 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
724 ;;
725
726 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 727 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 728 ;;
729 esac
699 export SANDBOX_ON="${oldsandbox}" 730 export SANDBOX_ON="${oldsandbox}"
700} 731}
701 732
702# Simple script to replace 'dos2unix' binaries 733# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 734# vapier@gentoo.org
814 type="Network;${type}" 845 type="Network;${type}"
815 ;; 846 ;;
816 847
817 sci) 848 sci)
818 case ${catmin} in 849 case ${catmin} in
819 astro*) type=Astronomoy;; 850 astro*) type=Astronomy;;
820 bio*) type=Biology;; 851 bio*) type=Biology;;
821 calc*) type=Calculator;; 852 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 853 chem*) type=Chemistry;;
823 geo*) type=Geology;; 854 geo*) type=Geology;;
824 math*) type=Math;; 855 math*) type=Math;;
856Exec=${exec} 887Exec=${exec}
857Path=${path} 888Path=${path}
858Icon=${icon} 889Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 890Categories=Application;${type};" > "${desktop}"
860 891
892 (
893 # wrap the env here so that the 'insinto' call
894 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 895 insinto /usr/share/applications
862 doins "${desktop}" 896 doins "${desktop}"
863 897 )
864 return 0
865} 898}
866 899
867# Make a GDM/KDM Session file 900# Make a GDM/KDM Session file
868# 901#
869# make_desktop_entry(<title>, <command>) 902# make_desktop_entry(<title>, <command>)
931############################################################## 964##############################################################
932 965
933 966
934# for internal use only (unpack_pdv and unpack_makeself) 967# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 968find_unpackable_file() {
936 local src="$1" 969 local src=$1
937 if [ -z "${src}" ] 970 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 971 src=${DISTDIR}/${A}
940 else 972 else
941 if [ -e "${DISTDIR}/${src}" ] 973 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 974 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 975 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 976 src=${PWD}/${src}
947 elif [ -e "${src}" ] 977 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 978 src=${src}
950 fi
951 fi 979 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 980 fi
981 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 982 echo "${src}"
954} 983}
955 984
956# Unpack those pesky pdv generated files ... 985# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 986# They're self-unpacking programs with the binary package stuffed in
972# lseek 1001# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1002# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1003# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1004# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1005unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1006 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1007 local sizeoff_t=$2
979 1008
1009 [[ -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 :(" 1010 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1011
982 local shrtsrc="`basename ${src}`" 1012 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1013 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1014 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\"` 1015 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1016
987 # grab metadata for debug reasons 1017 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1081# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1082# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1083# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1084# the proper offset from the script itself.
1055unpack_makeself() { 1085unpack_makeself() {
1086 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1087 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1088 local skip=$2
1058 local exe="$3" 1089 local exe=$3
1059 1090
1091 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1092
1060 local shrtsrc="$(basename "${src}")" 1093 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1095 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1096 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1097 local skip=0
1066 exe=tail 1098 exe=tail
1067 case ${ver} in 1099 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1100 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1101 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1113 ;;
1082 2.1.3) 1114 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1115 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1116 let skip="skip + 1"
1085 ;; 1117 ;;
1086 2.1.4) 1118 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1119 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1120 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1121 exe="dd"
1090 ;; 1122 ;;
1091 *) 1123 *)
1136check_license() { 1168check_license() {
1137 local lic=$1 1169 local lic=$1
1138 if [ -z "${lic}" ] ; then 1170 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1171 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1172 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1173 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1174 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1175 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1176 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1177 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1178 lic="${lic}"
1147 fi
1148 fi 1179 fi
1180 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1181 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1182 local l="`basename ${lic}`"
1151 1183
1152 # here is where we check for the licenses the user already 1184 # 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 1185 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1186 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1242 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1243 # the # of files they gave us
1212 local cdcnt=0 1244 local cdcnt=0
1213 local f= 1245 local f=
1214 for f in "$@" ; do 1246 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1247 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1248 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1249 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1250 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1251 export CDROM_CURRENT_CD=1
1220 1252
1221 # now we see if the user gave use CD_ROOT ... 1253 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1254 # 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 1255 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1256 local var=
1231 cdcnt=0 1257 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1258 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1260 var="CD_ROOT_${cdcnt}"
1261 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1262 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1263 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1264 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1265 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1266 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1267 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1268 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1269 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1270 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1271 export CDROM_SET=-1
1272 for f in ${CDROM_CHECK_1//:/ } ; do
1273 ((++CDROM_SET))
1274 [[ -e ${CD_ROOT}/${f} ]] && break
1275 done
1276 export CDROM_MATCH=${f}
1245 return 1277 return
1246 fi 1278 fi
1247 1279
1280 # User didn't help us out so lets make sure they know they can
1281 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1283 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 1284 echo
1256 einfo "If you do not have the CD, but have the data files" 1285 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1286 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1287 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1288 einfo "directory containing the files."
1263 echo 1292 echo
1264 else 1293 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1294 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1295 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1296 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1297 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1298 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1299 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1300 done
1272 echo 1301 echo
1273 einfo "If you do not have the CDs, but have the data files" 1302 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1304 einfo "the following variables so they point to the right place:"
1276 einfon "" 1305 einfon ""
1277 cdcnt=0 1306 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1307 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1308 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1309 echo -n " CD_ROOT_${cdcnt}"
1281 done 1310 done
1282 echo 1311 echo
1283 einfo "Or, if you have all the files in the same place, or" 1312 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" 1313 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1316 echo
1288 einfo "For example:" 1317 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1318 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1319 echo
1291 fi 1320 fi
1321
1322 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1323 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1324 cdrom_load_next_cd
1294} 1325}
1295 1326
1296# this is only used when you need access to more than one cd. 1327# 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. 1328# 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. 1329# 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. 1330# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1331cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1332 local var
1303 1333 ((++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 1334
1309 unset CDROM_ROOT 1335 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1336 var=CD_ROOT_${CDROM_CURRENT_CD}
1337 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1338 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1339 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1340 _cdrom_locate_file_on_cd ${!var}
1314 else 1341 else
1315 export CDROM_ROOT=${!var} 1342 export CDROM_ROOT=${!var}
1316 fi 1343 fi
1317 1344
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1345 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 1350# 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 1351# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1352# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1353# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1354# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1355_cdrom_locate_file_on_cd() {
1356 local mline=""
1357 local showedmsg=0
1358
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1359 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1360 local i=0
1361 local -a cdset=(${*//:/ })
1362 if [[ -n ${CDROM_SET} ]] ; then
1363 cdset=(${cdset[${CDROM_SET}]})
1364 fi
1365
1366 while [[ -n ${cdset[${i}]} ]] ; do
1367 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1368 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1369
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1370 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1371 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1372 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1373 export CDROM_ROOT=${mline}
1374 export CDROM_SET=${i}
1375 export CDROM_MATCH=${cdset[${i}]}
1376 return
1377 fi
1378 done
1379
1380 ((++i))
1339 done 1381 done
1340 1382
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1383 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1384 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1385 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1386 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1387 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1388 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 !" 1389 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1390 fi
1358 showedmsg=1 1391 else
1392 if [[ -z ${CDROM_NAME_1} ]] ; then
1393 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1394 else
1395 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1396 einfo "Please insert+mount the ${!var} cdrom now !"
1397 fi
1359 fi 1398 fi
1399 showedmsg=1
1400 fi
1360 einfo "Press return to scan for the cd again" 1401 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1402 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1403 echo
1363 einfo "If you are having trouble with the detection" 1404 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1405 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1406 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1407 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1408 read || die "something is screwed with your system"
1368 fi
1369 done 1409 done
1370} 1410}
1371 1411
1372# Make sure that LINGUAS only contains languages that 1412# Make sure that LINGUAS only contains languages that
1373# a package can support 1413# a package can support
1383# directories and uses the union of the lists. 1423# directories and uses the union of the lists.
1384strip-linguas() { 1424strip-linguas() {
1385 local ls newls 1425 local ls newls
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1426 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1427 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1428 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1389 local d f 1429 local d f
1390 for d in "$@" ; do 1430 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1431 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1432 newls=${ls}
1393 else 1433 else
1394 newls="" 1434 newls=""
1395 fi 1435 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1436 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1437 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1438 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1399 else 1439 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1440 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1401 fi 1441 fi
1457 1497
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1498# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1499# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1500# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1501#
1462# These functions are useful when a lib in your package changes --soname. Such 1502# 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 1503# 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 1504# 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 1505# 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: 1506# solution, so instead you can add the following to your ebuilds:
1467# 1507#
1498 1538
1499 ewarn "An old version of an installed library was detected on your system." 1539 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" 1540 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," 1541 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:" 1542 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1543 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1544 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1545 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1546 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1547 fi
1508} 1548}
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1561 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1562
1523 local PKG=$(best_version $1) 1563 local PKG=$(best_version $1)
1524 shift 1564 shift
1525 1565
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1566 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1567
1568 # if the USE file doesnt exist, assume the $PKG is either
1569 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1570 [[ ! -e ${USEFILE} ]] && return 0
1528 1571
1529 local USE_BUILT=$(<${USEFILE}) 1572 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1573 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1574 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1575 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1627# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1628# $5 == path for wrapper
1586make_wrapper() { 1629make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1630 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1631 local tmpwrapper=$(emktemp)
1632 # We don't want to quote ${bin} so that people can pass complex
1633 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1634 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1635#!/bin/sh
1591cd "${chdir}" 1636cd "${chdir:-.}"
1637if [ -n "${libdir}" ] ; then
1638 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1639 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1640 else
1641 export LD_LIBRARY_PATH="${libdir}"
1642 fi
1643fi
1593exec ${bin} "\$@" 1644exec ${bin} "\$@"
1594EOF 1645EOF
1595 chmod go+rx "${tmpwrapper}" 1646 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1647 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1648 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1649 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1650 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1651 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1652 fi
1603} 1653}

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

  ViewVC Help
Powered by ViewVC 1.1.20