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

Diff of /eclass/eutils.eclass

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

Revision 1.198 Revision 1.218
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.198 2005/09/18 22:02:59 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 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.
166# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
167# 167#
168# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
169# 169#
170epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 172 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
313 count=5 314 count=5
314 break 315 break
315 fi 316 fi
316 fi 317 fi
317 318
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 320 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 326
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
327 329
328 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
329 then 331 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 333 echo
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 412#
411# egetent(database, key) 413# egetent(database, key)
412egetent() { 414egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 415 case ${CHOST} in
416 *-darwin*)
414 case "$2" in 417 case "$2" in
415 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 420 ;;
418 *) # Numeric 421 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 423 ;;
421 esac 424 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 425 ;;
423 local action 426 *-freebsd*)
424 if [ "$1" == "passwd" ] 427 local opts action="user"
425 then 428 [[ $1 == "passwd" ]] || action="group"
426 action="user" 429
427 else 430 # lookup by uid/gid
428 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 433 fi
434
430 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
431 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
432 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 442 getent "$1" "$2"
434 fi 443 ;;
444 esac
435} 445}
436 446
437# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
438# vapier@gentoo.org 448# vapier@gentoo.org
439# 449#
492 if [[ ! -e ${eshell} ]] ; then 502 if [[ ! -e ${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 504 die "${eshell} does not exist"
495 fi 505 fi
496 else 506 else
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break; 508 [[ -x ${ROOT}${shell} ]] && break
499 done 509 done
500 510
501 if [[ ${shell} == "/dev/null" ]]; then 511 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 512 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 513 die "Unable to identify the shell to use"
504 fi 514 fi
505 515
506 eshell=${shell} 516 eshell=${shell}
548 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
549 559
550 # handle extra and add the user 560 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 561 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
553 case ${USERLAND} in 563 case ${CHOST} in
554 Darwin) 564 *-darwin*)
555 ### Make the user 565 ### Make the user
556 if [[ -z $@ ]] ; then 566 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 581 einfo "eextra: $@"
572 die "Required function missing" 582 die "Required function missing"
573 fi 583 fi
574 ;; 584 ;;
575 BSD) 585 *-freebsd*)
576 if [[ -z $@ ]] ; then 586 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
579 die "enewuser failed" 589 die "enewuser failed"
580 else 590 else
581 einfo " - Extra: $@" 591 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 593 "$@" || die "enewuser failed"
584 fi 594 fi
585 ;; 595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
600 else
601 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
586 *) 619 *)
587 if [[ -z $@ ]] ; then 620 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 623 || die "enewuser failed"
640 then 673 then
641 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
642 then 675 then
643 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
644 then 677 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
647 else 680 else
648 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
649 fi 682 fi
650 else 683 else
664 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
665 698
666 # add the group 699 # add the group
667 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 702 case ${CHOST} in
703 *-darwin*)
670 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
671 then 705 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
675 die "Required function missing" 709 die "Required function missing"
676 fi 710 fi
677 711
678 # If we need the next available 712 # If we need the next available
679 case ${egid} in 713 case ${egid} in
680 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 715 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
683 done 717 done
684 esac 718 esac
685 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 721 ;;
722
723 *-freebsd*)
688 case ${egid} in 724 case ${egid} in
689 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 726 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
692 done 728 done
693 esac 729 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 745 ;;
746 esac
698 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
699} 748}
700 749
701# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 751# vapier@gentoo.org
813 type="Network;${type}" 862 type="Network;${type}"
814 ;; 863 ;;
815 864
816 sci) 865 sci)
817 case ${catmin} in 866 case ${catmin} in
818 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
819 bio*) type=Biology;; 868 bio*) type=Biology;;
820 calc*) type=Calculator;; 869 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
822 geo*) type=Geology;; 871 geo*) type=Geology;;
823 math*) type=Math;; 872 math*) type=Math;;
855Exec=${exec} 904Exec=${exec}
856Path=${path} 905Path=${path}
857Icon=${icon} 906Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
859 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 912 insinto /usr/share/applications
861 doins "${desktop}" 913 doins "${desktop}"
862 914 )
863 return 0
864} 915}
865 916
866# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
867# 918#
868# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1024 local sizeoff_t=$2
974 1025
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1028
978 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1033
983 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1101# the proper offset from the script itself.
1051unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1104 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1105 local skip=$2
1054 local exe=$3 1106 local exe=$3
1055 1107
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1109
1058 local shrtsrc=$(basename "${src}") 1110 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1114 local skip=0
1064 exe=tail 1115 exe=tail
1065 case ${ver} in 1116 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1130 ;;
1080 2.1.3) 1131 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1133 let skip="skip + 1"
1083 ;; 1134 ;;
1084 2.1.4) 1135 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1138 exe="dd"
1088 ;; 1139 ;;
1089 *) 1140 *)
1134check_license() { 1185check_license() {
1135 local lic=$1 1186 local lic=$1
1136 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1137 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1138 else 1189 else
1139 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1140 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1141 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1142 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1143 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1144 lic="${src}" 1195 lic="${lic}"
1145 fi
1146 fi 1196 fi
1197 fi
1147 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1148 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1149 1200
1150 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1151 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1152 local shopts=$- 1203 local shopts=$-
1208 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1260 # the # of files they gave us
1210 local cdcnt=0 1261 local cdcnt=0
1211 local f= 1262 local f=
1212 for f in "$@" ; do 1263 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1266 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1218 1269
1219 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1273 local var=
1229 cdcnt=0 1274 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1284 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1285 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1243 return 1294 return
1244 fi 1295 fi
1245 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1301 echo
1254 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1305 einfo "directory containing the files."
1261 echo 1309 echo
1262 else 1310 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1312 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1317 done
1270 echo 1318 echo
1271 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1274 einfon "" 1322 einfon ""
1275 cdcnt=0 1323 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1279 done 1327 done
1280 echo 1328 echo
1281 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1333 echo
1286 einfo "For example:" 1334 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1336 echo
1289 fi 1337 fi
1338
1339 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1341 cdrom_load_next_cd
1292} 1342}
1293 1343
1294# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1349 local var
1301 1350 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1351
1307 unset CDROM_ROOT 1352 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1312 else 1358 else
1313 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1314 fi 1360 fi
1315 1361
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1385 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1386
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1337 done 1398 done
1338 1399
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1400 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1405 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1407 fi
1356 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1357 fi 1415 fi
1416 showedmsg=1
1417 fi
1358 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1420 echo
1361 einfo "If you are having trouble with the detection" 1421 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1422 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1423 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1425 read
1366 fi
1367 done 1426 done
1368} 1427}
1369 1428
1370# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1371# a package can support 1430# a package can support
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1579
1521 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1522 shift 1581 shift
1523 1582
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1526 1588
1527 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1645# $5 == path for wrapper
1584make_wrapper() { 1646make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1652#!/bin/sh
1589cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1591exec ${bin} "\$@" 1661exec ${bin} "\$@"
1592EOF 1662EOF
1593 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1665 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1667 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1669 fi
1601} 1670}

Legend:
Removed from v.1.198  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20