/[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.206
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.206 2005/10/07 16:21:48 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 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
434 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 440 getent "$1" "$2"
436 fi 441 ;;
442 esac
437} 443}
438 444
439# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
440# vapier@gentoo.org 446# vapier@gentoo.org
441# 447#
479 fi 485 fi
480 else 486 else
481 euid="next" 487 euid="next"
482 fi 488 fi
483 if [[ ${euid} == "next" ]] ; then 489 if [[ ${euid} == "next" ]] ; then
484 local pwrange 490 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 491 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 492 done
493 fi 493 fi
494 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
500 if [[ ! -e ${eshell} ]] ; then 500 if [[ ! -e ${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 502 die "${eshell} does not exist"
503 fi 503 fi
504 else 504 else
505 case ${USERLAND} in 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 Darwin) eshell="/usr/bin/false";; 506 [[ -x ${ROOT}${shell} ]] && break
507 BSD) eshell="/usr/sbin/nologin";; 507 done
508 *) eshell="/bin/false";; 508
509 esac 509 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use"
511 die "Unable to identify the shell to use"
512 fi
513
514 eshell=${shell}
510 fi 515 fi
511 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
513 518
514 # handle homedir 519 # handle homedir
551 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
552 557
553 # handle extra and add the user 558 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 559 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
556 case ${USERLAND} in 561 case ${CHOST} in
557 Darwin) 562 *-darwin*)
558 ### Make the user 563 ### Make the user
559 if [[ -z $@ ]] ; then 564 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 579 einfo "eextra: $@"
575 die "Required function missing" 580 die "Required function missing"
576 fi 581 fi
577 ;; 582 ;;
578 BSD) 583 *-freebsd*)
579 if [[ -z $@ ]] ; then 584 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
582 die "enewuser failed" 587 die "enewuser failed"
583 else 588 else
596 useradd ${opts} ${euser} "$@" \ 601 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 602 || die "enewuser failed"
598 fi 603 fi
599 ;; 604 ;;
600 esac 605 esac
606
607 if [[ ! -e ${ROOT}/${ehome} ]] ; then
608 einfo " - Creating ${ehome} in ${ROOT}"
609 mkdir -p "${ROOT}/${ehome}"
610 chown ${euser} "${ROOT}/${ehome}"
611 chmod 755 "${ROOT}/${ehome}"
612 fi
613
601 export SANDBOX_ON=${oldsandbox} 614 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} 615}
611 616
612# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 618# vapier@gentoo.org
614# 619#
643 then 648 then
644 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
645 then 650 then
646 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
647 then 652 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
650 else 655 else
651 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
652 fi 657 fi
653 else 658 else
667 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
668 673
669 # add the group 674 # add the group
670 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 677 case ${CHOST} in
678 *-darwin*)
673 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
674 then 680 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
678 die "Required function missing" 684 die "Required function missing"
679 fi 685 fi
680 686
681 # If we need the next available 687 # If we need the next available
682 case ${egid} in 688 case ${egid} in
683 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
686 done 692 done
687 esac 693 esac
688 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 696 ;;
697
698 *-freebsd*)
691 case ${egid} in 699 case ${egid} in
692 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
695 done 703 done
696 esac 704 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 706 ;;
707
708 *-netbsd*)
709 case ${egid} in
710 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break
713 done
714 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed"
716 ;;
717
718 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 720 ;;
721 esac
701 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
702} 723}
703 724
704# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 726# vapier@gentoo.org
730# name: the name that will show up in the menu 751# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 754# a full path to an icon
734# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 756# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 758make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 759 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 760
740 local exec=${1} 761 local exec=${1}
766 dev) 787 dev)
767 type="Development" 788 type="Development"
768 ;; 789 ;;
769 790
770 games) 791 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 792 case ${catmin} in
774 action) type=ActionGame;; 793 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 794 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 795 board) type=BoardGame;;
777 kid) type=KidsGame;; 796 kid) type=KidsGame;;
860Exec=${exec} 879Exec=${exec}
861Path=${path} 880Path=${path}
862Icon=${icon} 881Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
864 883
884 (
885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 887 insinto /usr/share/applications
866 doins "${desktop}" 888 doins "${desktop}"
867 889 )
868 return 0
869} 890}
870 891
871# Make a GDM/KDM Session file 892# Make a GDM/KDM Session file
872# 893#
873# make_desktop_entry(<title>, <command>) 894# make_desktop_entry(<title>, <command>)
902 doins "${i}" 923 doins "${i}"
903 elif [[ -d ${i} ]] ; then 924 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 925 for j in "${i}"/*.desktop ; do
905 doins "${j}" 926 doins "${j}"
906 done 927 done
907 fi 928 fi
908 done 929 done
909} 930}
910newmenu() { 931newmenu() {
911 insinto /usr/share/applications 932 insinto /usr/share/applications
912 newins "$1" "$2" 933 newins "$1" "$2"
920 doins "${i}" 941 doins "${i}"
921 elif [[ -d ${i} ]] ; then 942 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 943 for j in "${i}"/*.png ; do
923 doins "${j}" 944 doins "${j}"
924 done 945 done
925 fi 946 fi
926 done 947 done
927} 948}
928newicon() { 949newicon() {
929 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
930 newins "$1" "$2" 951 newins "$1" "$2"
935############################################################## 956##############################################################
936 957
937 958
938# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 960find_unpackable_file() {
940 local src="$1" 961 local src=$1
941 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
944 else 964 else
945 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 968 src=${PWD}/${src}
951 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 970 src=${src}
954 fi
955 fi 971 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 974 echo "${src}"
958} 975}
959 976
960# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
976# lseek 993# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 996# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 997unpack_pdv() {
981 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 999 local sizeoff_t=$2
983 1000
1001 [[ -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 :(" 1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1003
986 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 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\"` 1007 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] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1075# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1076# the proper offset from the script itself.
1059unpack_makeself() { 1077unpack_makeself() {
1060 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1061 local skip="$2" 1079 local skip=$2
1062 local exe="$3" 1080 local exe=$3
1063 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1064 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1067 then 1087 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1069 local skip=0 1089 local skip=0
1140check_license() { 1160check_license() {
1141 local lic=$1 1161 local lic=$1
1142 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1164 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1170 lic="${lic}"
1151 fi
1152 fi 1171 fi
1172 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1155 1175
1156 # here is where we check for the licenses the user already 1176 # 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 1177 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1178 local shopts=$-
1329# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1334 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1335 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1336 local mline="" 1356 local mline=""
1337 local showedmsg=0 1357 local showedmsg=0
1338 1358
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1361 fi 1381 fi
1362 showedmsg=1 1382 showedmsg=1
1363 fi 1383 fi
1364 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1385 einfo "or hit CTRL+C to abort the emerge."
1386 echo
1387 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1391 read
1367 fi 1392 fi
1368 done 1393 done
1369} 1394}
1370 1395
1493 LIB=$1 1518 LIB=$1
1494 1519
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1497 1522
1498 einfo "An old version of an installed library was detected on your system." 1523 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" 1524 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," 1525 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:" 1526 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1528 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1531 fi
1507} 1532}
1508 1533
1509# Hack for people to figure out if a package was built with 1534# Hack for people to figure out if a package was built with
1510# certain USE flags 1535# certain USE flags
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1609# $5 == path for wrapper
1585make_wrapper() { 1610make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1612 local tmpwrapper=$(emktemp)
1613 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1615 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1616#!/bin/sh
1590cd "${chdir}" 1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1592exec ${bin} "\$@" 1621exec ${bin} "\$@"
1593EOF 1622EOF
1594 chmod go+rx "${tmpwrapper}" 1623 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1624 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1625 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1626 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1627 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1628 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1629 fi
1602} 1630}

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

  ViewVC Help
Powered by ViewVC 1.1.20