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

Diff of /eclass/eutils.eclass

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

Revision 1.182 Revision 1.205
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.182 2005/06/11 00:02:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.205 2005/10/07 15:31:46 flameeyes 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
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
18 16
19DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
20 18
21# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
69 dodir /usr/${libdir} 67 dodir /usr/${libdir}
70 68
71 for lib in "${@}" ; do 69 for lib in "${@}" ; do
72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
73 /* GNU ld script 71 /* GNU ld script
74 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
75 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
76 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
77 otherwise we run into linking problems. 75 otherwise we run into linking problems.
78 76
79 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
80 */ 78 */
81 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
82 END_LDSCRIPT 80 END_LDSCRIPT
83 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
174 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
178 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 179
180 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
181 then 181 then
182 local m="" 182 local m=""
183 for m in "$@" ; do 183 for m in "$@" ; do
377# vapier@gentoo.org 377# vapier@gentoo.org
378# 378#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 380emktemp() {
381 local exe="touch" 381 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 383 local topdir=$1
384 384
385 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 387 && topdir="/tmp" \
389 || topdir="${T}" 388 || topdir=${T}
390 fi 389 fi
391 390
392 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 392 local tmp=/
395 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 395 done
398 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 397 echo "${tmp}"
400 else 398 else
401 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
402 && exe="-p" \ 400 && exe="-p" \
403 || exe="-d" 401 || exe="-d"
404 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
405 fi 403 fi
406} 404}
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 410#
413# egetent(database, key) 411# egetent(database, key)
414egetent() { 412egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 413 case ${CHOST} in
414 *-darwin*)
416 case "$2" in 415 case "$2" in
417 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 418 ;;
420 *) # Numeric 419 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 421 ;;
423 esac 422 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 423 ;;
425 local action 424 *-freebsd*)
426 if [ "$1" == "passwd" ] 425 local opts action="user"
427 then 426 [[ $1 == "passwd" ]] || action="group"
428 action="user" 427
429 else 428 # lookup by uid/gid
430 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 431 fi
432
432 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
433 else 434 ;;
435 *)
434 which nscd >& /dev/null && nscd -i "$1" 436 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 437 getent "$1" "$2"
436 fi 438 ;;
439 esac
437} 440}
438 441
439# Simplify/standardize adding users to the system 442# Simplify/standardize adding users to the system
440# vapier@gentoo.org 443# vapier@gentoo.org
441# 444#
479 fi 482 fi
480 else 483 else
481 euid="next" 484 euid="next"
482 fi 485 fi
483 if [[ ${euid} == "next" ]] ; then 486 if [[ ${euid} == "next" ]] ; then
484 local pwrange 487 for euid in $(seq 101 999) ; do
485 if [[ ${USERLAND} == "BSD" ]] ; then
486 pwrange=$(jot 898 101)
487 else
488 pwrange=$(seq 101 999)
489 fi
490 for euid in ${pwrange} ; do
491 [[ -z $(egetent passwd ${euid}) ]] && break 488 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 489 done
493 fi 490 fi
494 opts="${opts} -u ${euid}" 491 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 492 einfo " - Userid: ${euid}"
500 if [[ ! -e ${eshell} ]] ; then 497 if [[ ! -e ${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 498 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 499 die "${eshell} does not exist"
503 fi 500 fi
504 else 501 else
505 case ${USERLAND} in 502 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 Darwin) eshell="/usr/bin/false";; 503 [[ -x ${ROOT}${shell} ]] && break
507 BSD) eshell="/usr/sbin/nologin";; 504 done
508 *) eshell="/bin/false";; 505
509 esac 506 if [[ ${shell} == "/dev/null" ]] ; then
507 eerror "Unable to identify the shell to use"
508 die "Unable to identify the shell to use"
509 fi
510
511 eshell=${shell}
510 fi 512 fi
511 einfo " - Shell: ${eshell}" 513 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 514 opts="${opts} -s ${eshell}"
513 515
514 # handle homedir 516 # handle homedir
551 einfo " - Groups: ${egroups}" 553 einfo " - Groups: ${egroups}"
552 554
553 # handle extra and add the user 555 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 556 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 557 export SANDBOX_ON="0"
556 case ${USERLAND} in 558 case ${CHOST} in
557 Darwin) 559 *-darwin*)
558 ### Make the user 560 ### Make the user
559 if [[ -z $@ ]] ; then 561 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 562 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 563 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 564 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 575 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 576 einfo "eextra: $@"
575 die "Required function missing" 577 die "Required function missing"
576 fi 578 fi
577 ;; 579 ;;
578 BSD) 580 *-freebsd*)
579 if [[ -z $@ ]] ; then 581 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 583 -c "added by portage for ${PN}" \
582 die "enewuser failed" 584 die "enewuser failed"
583 else 585 else
596 useradd ${opts} ${euser} "$@" \ 598 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 599 || die "enewuser failed"
598 fi 600 fi
599 ;; 601 ;;
600 esac 602 esac
603
604 if [[ ! -e ${ROOT}/${ehome} ]] ; then
605 einfo " - Creating ${ehome} in ${ROOT}"
606 mkdir -p "${ROOT}/${ehome}"
607 chown ${euser} "${ROOT}/${ehome}"
608 chmod 755 "${ROOT}/${ehome}"
609 fi
610
601 export SANDBOX_ON=${oldsandbox} 611 export SANDBOX_ON=${oldsandbox}
602
603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
604 then
605 einfo " - Creating ${ehome} in ${D}"
606 dodir ${ehome}
607 fowners ${euser} ${ehome}
608 fperms 755 ${ehome}
609 fi
610} 612}
611 613
612# Simplify/standardize adding groups to the system 614# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 615# vapier@gentoo.org
614# 616#
643 then 645 then
644 if [ "${egid}" -gt 0 ] 646 if [ "${egid}" -gt 0 ]
645 then 647 then
646 if [ -z "`egetent group ${egid}`" ] 648 if [ -z "`egetent group ${egid}`" ]
647 then 649 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 650 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 651 opts="${opts} ${egid}"
650 else 652 else
651 opts="${opts} -g ${egid}" 653 opts="${opts} -g ${egid}"
652 fi 654 fi
653 else 655 else
667 opts="${opts} ${eextra}" 669 opts="${opts} ${eextra}"
668 670
669 # add the group 671 # add the group
670 local oldsandbox="${SANDBOX_ON}" 672 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 673 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 674 case ${CHOST} in
675 *-darwin*)
673 if [ ! -z "${eextra}" ]; 676 if [ ! -z "${eextra}" ];
674 then 677 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 678 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 679 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 680 einfo "eextra: ${eextra}"
678 die "Required function missing" 681 die "Required function missing"
679 fi 682 fi
680 683
681 # If we need the next available 684 # If we need the next available
682 case ${egid} in 685 case ${egid} in
683 *[!0-9]*) # Non numeric 686 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 687 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 688 [ -z "`egetent group ${egid}`" ] && break
686 done 689 done
687 esac 690 esac
688 dscl . create /groups/${egroup} gid ${egid} 691 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 692 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 693 ;;
694
695 *-freebsd*)
691 case ${egid} in 696 case ${egid} in
692 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
695 done 700 done
696 esac 701 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 703 ;;
704 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 705 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 706 ;;
707 esac
701 export SANDBOX_ON="${oldsandbox}" 708 export SANDBOX_ON="${oldsandbox}"
702} 709}
703 710
704# Simple script to replace 'dos2unix' binaries 711# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 712# vapier@gentoo.org
730# name: the name that will show up in the menu 737# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 738# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 739# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 740# a full path to an icon
734# type: what kind of application is this ? for categories: 741# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 742# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 743# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 744make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 745 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 746
740 local exec=${1} 747 local exec=${1}
766 dev) 773 dev)
767 type="Development" 774 type="Development"
768 ;; 775 ;;
769 776
770 games) 777 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 778 case ${catmin} in
774 action) type=ActionGame;; 779 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 780 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 781 board) type=BoardGame;;
777 kid) type=KidsGame;; 782 kid) type=KidsGame;;
860Exec=${exec} 865Exec=${exec}
861Path=${path} 866Path=${path}
862Icon=${icon} 867Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 868Categories=Application;${type};" > "${desktop}"
864 869
870 (
871 # wrap the env here so that the 'insinto' call
872 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 873 insinto /usr/share/applications
866 doins "${desktop}" 874 doins "${desktop}"
867 875 )
868 return 0
869} 876}
870 877
871# Make a GDM/KDM Session file 878# Make a GDM/KDM Session file
872# 879#
873# make_desktop_entry(<title>, <command>) 880# make_desktop_entry(<title>, <command>)
902 doins "${i}" 909 doins "${i}"
903 elif [[ -d ${i} ]] ; then 910 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 911 for j in "${i}"/*.desktop ; do
905 doins "${j}" 912 doins "${j}"
906 done 913 done
907 fi 914 fi
908 done 915 done
909} 916}
910newmenu() { 917newmenu() {
911 insinto /usr/share/applications 918 insinto /usr/share/applications
912 newins "$1" "$2" 919 newins "$1" "$2"
920 doins "${i}" 927 doins "${i}"
921 elif [[ -d ${i} ]] ; then 928 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 929 for j in "${i}"/*.png ; do
923 doins "${j}" 930 doins "${j}"
924 done 931 done
925 fi 932 fi
926 done 933 done
927} 934}
928newicon() { 935newicon() {
929 insinto /usr/share/pixmaps 936 insinto /usr/share/pixmaps
930 newins "$1" "$2" 937 newins "$1" "$2"
935############################################################## 942##############################################################
936 943
937 944
938# for internal use only (unpack_pdv and unpack_makeself) 945# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 946find_unpackable_file() {
940 local src="$1" 947 local src=$1
941 if [ -z "${src}" ] 948 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 949 src=${DISTDIR}/${A}
944 else 950 else
945 if [ -e "${DISTDIR}/${src}" ] 951 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 952 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 953 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 954 src=${PWD}/${src}
951 elif [ -e "${src}" ] 955 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 956 src=${src}
954 fi
955 fi 957 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 958 fi
959 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 960 echo "${src}"
958} 961}
959 962
960# Unpack those pesky pdv generated files ... 963# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 964# They're self-unpacking programs with the binary package stuffed in
976# lseek 979# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 980# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 981# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 982# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 983unpack_pdv() {
981 local src="`find_unpackable_file $1`" 984 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 985 local sizeoff_t=$2
983 986
987 [[ -z ${src} ]] && die "Could not locate source for '$1'"
984 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 988 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 989
986 local shrtsrc="`basename ${src}`" 990 local shrtsrc="`basename ${src}`"
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 991 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 992 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
989 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 993 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1060# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1061# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1062# the proper offset from the script itself.
1059unpack_makeself() { 1063unpack_makeself() {
1060 local src="$(find_unpackable_file "$1")" 1064 local src=$(find_unpackable_file "$1")
1061 local skip="$2" 1065 local skip=$2
1062 local exe="$3" 1066 local exe=$3
1063 1067
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1069
1064 local shrtsrc="$(basename "${src}")" 1070 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1072 if [ -z "${skip}" ]
1067 then 1073 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1069 local skip=0 1075 local skip=0
1140check_license() { 1146check_license() {
1141 local lic=$1 1147 local lic=$1
1142 if [ -z "${lic}" ] ; then 1148 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1149 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1150 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1151 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1152 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1153 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1154 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1155 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1156 lic="${lic}"
1151 fi
1152 fi 1157 fi
1158 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1159 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1160 local l="`basename ${lic}`"
1155 1161
1156 # here is where we check for the licenses the user already 1162 # here is where we check for the licenses the user already
1157 # accepted ... if we don't find a match, we make the user accept 1163 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1164 local shopts=$-
1329# displayed and we'll hang out here until: 1335# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1336# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1337# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1338cdrom_locate_file_on_cd() {
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1339 while [[ -z ${CDROM_ROOT} ]] ; do
1334 local dir="$(dirname ${@})" 1340 local dir=$(dirname "$*")
1335 local file="$(basename ${@})" 1341 local file=$(basename "$*")
1336 local mline="" 1342 local mline=""
1337 local showedmsg=0 1343 local showedmsg=0
1338 1344
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1345 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1346 [[ -d ${mline}/${dir} ]] || continue
1361 fi 1367 fi
1362 showedmsg=1 1368 showedmsg=1
1363 fi 1369 fi
1364 einfo "Press return to scan for the cd again" 1370 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1371 einfo "or hit CTRL+C to abort the emerge."
1372 echo
1373 einfo "If you are having trouble with the detection"
1374 einfo "of your CD, it is possible that you do not have"
1375 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1377 read
1367 fi 1378 fi
1368 done 1379 done
1369} 1380}
1370 1381
1493 LIB=$1 1504 LIB=$1
1494 1505
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1506 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1507 SONAME=`basename ${LIB}`
1497 1508
1498 einfo "An old version of an installed library was detected on your system." 1509 ewarn "An old version of an installed library was detected on your system."
1499 einfo "In order to avoid breaking packages that link against is, this older version" 1510 ewarn "In order to avoid breaking packages that link against it, this older version"
1500 einfo "is not being removed. In order to make full use of this newer version," 1511 ewarn "is not being removed. In order to make full use of this newer version,"
1501 einfo "you will need to execute the following command:" 1512 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1513 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1514 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1515 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1517 fi
1507} 1518}
1508 1519
1509# Hack for people to figure out if a package was built with 1520# Hack for people to figure out if a package was built with
1510# certain USE flags 1521# certain USE flags
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1594# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1595# $5 == path for wrapper
1585make_wrapper() { 1596make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1597 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1598 local tmpwrapper=$(emktemp)
1599 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1601 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1602#!/bin/sh
1590cd "${chdir}" 1603cd "${chdir:-.}"
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1606fi
1592exec ${bin} "\$@" 1607exec ${bin} "\$@"
1593EOF 1608EOF
1594 chmod go+rx "${tmpwrapper}" 1609 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1610 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1611 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1612 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1613 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1614 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1615 fi
1602} 1616}

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.205

  ViewVC Help
Powered by ViewVC 1.1.20