/[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.207
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.207 2005/10/12 13:52:01 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
584 einfo " - Extra: $@" 589 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 591 "$@" || die "enewuser failed"
592 fi
593 ;;
594
595 *-netbsd*)
596 if [[ -z $@ ]] ; then
597 useradd ${opts} ${euser} || die "enewuser failed"
598 else
599 einfo " - Extra: $@"
600 useradd ${opts} ${euser} "$@" || die "enewuser failed"
587 fi 601 fi
588 ;; 602 ;;
589 *) 603 *)
590 if [[ -z $@ ]] ; then 604 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 605 useradd ${opts} ${euser} \
596 useradd ${opts} ${euser} "$@" \ 610 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 611 || die "enewuser failed"
598 fi 612 fi
599 ;; 613 ;;
600 esac 614 esac
615
616 if [[ ! -e ${ROOT}/${ehome} ]] ; then
617 einfo " - Creating ${ehome} in ${ROOT}"
618 mkdir -p "${ROOT}/${ehome}"
619 chown ${euser} "${ROOT}/${ehome}"
620 chmod 755 "${ROOT}/${ehome}"
621 fi
622
601 export SANDBOX_ON=${oldsandbox} 623 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} 624}
611 625
612# Simplify/standardize adding groups to the system 626# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 627# vapier@gentoo.org
614# 628#
643 then 657 then
644 if [ "${egid}" -gt 0 ] 658 if [ "${egid}" -gt 0 ]
645 then 659 then
646 if [ -z "`egetent group ${egid}`" ] 660 if [ -z "`egetent group ${egid}`" ]
647 then 661 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 662 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 663 opts="${opts} ${egid}"
650 else 664 else
651 opts="${opts} -g ${egid}" 665 opts="${opts} -g ${egid}"
652 fi 666 fi
653 else 667 else
667 opts="${opts} ${eextra}" 681 opts="${opts} ${eextra}"
668 682
669 # add the group 683 # add the group
670 local oldsandbox="${SANDBOX_ON}" 684 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 685 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 686 case ${CHOST} in
687 *-darwin*)
673 if [ ! -z "${eextra}" ]; 688 if [ ! -z "${eextra}" ];
674 then 689 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 690 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 691 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 692 einfo "eextra: ${eextra}"
678 die "Required function missing" 693 die "Required function missing"
679 fi 694 fi
680 695
681 # If we need the next available 696 # If we need the next available
682 case ${egid} in 697 case ${egid} in
683 *[!0-9]*) # Non numeric 698 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 699 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 700 [ -z "`egetent group ${egid}`" ] && break
686 done 701 done
687 esac 702 esac
688 dscl . create /groups/${egroup} gid ${egid} 703 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 704 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 705 ;;
706
707 *-freebsd*)
691 case ${egid} in 708 case ${egid} in
692 *[!0-9]*) # Non numeric 709 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 710 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 711 [ -z "`egetent group ${egid}`" ] && break
695 done 712 done
696 esac 713 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 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 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 728 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 729 ;;
730 esac
701 export SANDBOX_ON="${oldsandbox}" 731 export SANDBOX_ON="${oldsandbox}"
702} 732}
703 733
704# Simple script to replace 'dos2unix' binaries 734# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 735# vapier@gentoo.org
730# name: the name that will show up in the menu 760# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 761# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 762# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 763# a full path to an icon
734# type: what kind of application is this ? for categories: 764# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 765# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 766# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 767make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 768 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 769
740 local exec=${1} 770 local exec=${1}
766 dev) 796 dev)
767 type="Development" 797 type="Development"
768 ;; 798 ;;
769 799
770 games) 800 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 801 case ${catmin} in
774 action) type=ActionGame;; 802 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 803 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 804 board) type=BoardGame;;
777 kid) type=KidsGame;; 805 kid) type=KidsGame;;
860Exec=${exec} 888Exec=${exec}
861Path=${path} 889Path=${path}
862Icon=${icon} 890Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 891Categories=Application;${type};" > "${desktop}"
864 892
893 (
894 # wrap the env here so that the 'insinto' call
895 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 896 insinto /usr/share/applications
866 doins "${desktop}" 897 doins "${desktop}"
867 898 )
868 return 0
869} 899}
870 900
871# Make a GDM/KDM Session file 901# Make a GDM/KDM Session file
872# 902#
873# make_desktop_entry(<title>, <command>) 903# make_desktop_entry(<title>, <command>)
902 doins "${i}" 932 doins "${i}"
903 elif [[ -d ${i} ]] ; then 933 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 934 for j in "${i}"/*.desktop ; do
905 doins "${j}" 935 doins "${j}"
906 done 936 done
907 fi 937 fi
908 done 938 done
909} 939}
910newmenu() { 940newmenu() {
911 insinto /usr/share/applications 941 insinto /usr/share/applications
912 newins "$1" "$2" 942 newins "$1" "$2"
920 doins "${i}" 950 doins "${i}"
921 elif [[ -d ${i} ]] ; then 951 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 952 for j in "${i}"/*.png ; do
923 doins "${j}" 953 doins "${j}"
924 done 954 done
925 fi 955 fi
926 done 956 done
927} 957}
928newicon() { 958newicon() {
929 insinto /usr/share/pixmaps 959 insinto /usr/share/pixmaps
930 newins "$1" "$2" 960 newins "$1" "$2"
935############################################################## 965##############################################################
936 966
937 967
938# for internal use only (unpack_pdv and unpack_makeself) 968# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 969find_unpackable_file() {
940 local src="$1" 970 local src=$1
941 if [ -z "${src}" ] 971 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 972 src=${DISTDIR}/${A}
944 else 973 else
945 if [ -e "${DISTDIR}/${src}" ] 974 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 975 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 976 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 977 src=${PWD}/${src}
951 elif [ -e "${src}" ] 978 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 979 src=${src}
954 fi
955 fi 980 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 981 fi
982 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 983 echo "${src}"
958} 984}
959 985
960# Unpack those pesky pdv generated files ... 986# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 987# They're self-unpacking programs with the binary package stuffed in
976# lseek 1002# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1004# lseek(3, -4, SEEK_END) = 2981250
979# 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.
980unpack_pdv() { 1006unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1007 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 1008 local sizeoff_t=$2
983 1009
1010 [[ -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 :(" 1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1012
986 local shrtsrc="`basename ${src}`" 1013 local shrtsrc="`basename ${src}`"
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1015 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\"` 1016 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] 1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1083# - If the file is not specified then unpack will utilize ${A}.
1057# - 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
1058# the proper offset from the script itself. 1085# the proper offset from the script itself.
1059unpack_makeself() { 1086unpack_makeself() {
1060 local src="$(find_unpackable_file "$1")" 1087 local src=$(find_unpackable_file "$1")
1061 local skip="$2" 1088 local skip=$2
1062 local exe="$3" 1089 local exe=$3
1063 1090
1091 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1092
1064 local shrtsrc="$(basename "${src}")" 1093 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1095 if [ -z "${skip}" ]
1067 then 1096 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1097 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1069 local skip=0 1098 local skip=0
1140check_license() { 1169check_license() {
1141 local lic=$1 1170 local lic=$1
1142 if [ -z "${lic}" ] ; then 1171 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1172 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1173 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1174 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1175 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1176 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1177 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1178 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1179 lic="${lic}"
1151 fi
1152 fi 1180 fi
1181 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1182 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1183 local l="`basename ${lic}`"
1155 1184
1156 # here is where we check for the licenses the user already 1185 # 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 1186 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1187 local shopts=$-
1329# displayed and we'll hang out here until: 1358# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1359# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1360# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1361cdrom_locate_file_on_cd() {
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1362 while [[ -z ${CDROM_ROOT} ]] ; do
1334 local dir="$(dirname ${@})" 1363 local dir=$(dirname "$*")
1335 local file="$(basename ${@})" 1364 local file=$(basename "$*")
1336 local mline="" 1365 local mline=""
1337 local showedmsg=0 1366 local showedmsg=0
1338 1367
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1368 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1369 [[ -d ${mline}/${dir} ]] || continue
1361 fi 1390 fi
1362 showedmsg=1 1391 showedmsg=1
1363 fi 1392 fi
1364 einfo "Press return to scan for the cd again" 1393 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1394 einfo "or hit CTRL+C to abort the emerge."
1395 echo
1396 einfo "If you are having trouble with the detection"
1397 einfo "of your CD, it is possible that you do not have"
1398 einfo "Joliet support enabled in your kernel. Please"
1399 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1400 read
1367 fi 1401 fi
1368 done 1402 done
1369} 1403}
1370 1404
1493 LIB=$1 1527 LIB=$1
1494 1528
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1529 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1530 SONAME=`basename ${LIB}`
1497 1531
1498 einfo "An old version of an installed library was detected on your system." 1532 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" 1533 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," 1534 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:" 1535 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1536 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1537 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1538 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1539 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1540 fi
1507} 1541}
1508 1542
1509# Hack for people to figure out if a package was built with 1543# Hack for people to figure out if a package was built with
1510# certain USE flags 1544# certain USE flags
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1617# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1618# $5 == path for wrapper
1585make_wrapper() { 1619make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1620 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1621 local tmpwrapper=$(emktemp)
1622 # We don't want to quote ${bin} so that people can pass complex
1623 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1624 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1625#!/bin/sh
1590cd "${chdir}" 1626cd "${chdir:-.}"
1627if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1628 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1629fi
1592exec ${bin} "\$@" 1630exec ${bin} "\$@"
1593EOF 1631EOF
1594 chmod go+rx "${tmpwrapper}" 1632 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1633 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1634 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1635 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1636 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1637 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1638 fi
1602} 1639}

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

  ViewVC Help
Powered by ViewVC 1.1.20