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

Diff of /eclass/eutils.eclass

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

Revision 1.206 Revision 1.226
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.206 2005/10/07 16:21:48 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.226 2006/02/20 11:56:33 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.
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 159 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
284 272
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
287 do 275 do
288 # Generate some useful debug info ... 276 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 279
292 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 281 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 287
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 290
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 293
306 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 295 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 297 then
313 count=5 301 count=5
314 break 302 break
315 fi 303 fi
316 fi 304 fi
317 305
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 307 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 313
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
327 316
328 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
329 then 318 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 320 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 384 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 386 echo "${tmp}"
398 else 387 else
399 [[ ${exe} == "touch" ]] \ 388 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 389 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 390 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 391 || TMPDIR="${topdir}" mktemp -t tmp
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && mktemp -d "${topdir}" \
395 || TMPDIR="${topdir}" mktemp -dt tmp
396 fi
403 fi 397 fi
404} 398}
405 399
406# Small wrapper for getent (Linux), nidump (Mac OS X), 400# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 401# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 413 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 415 ;;
422 esac 416 esac
423 ;; 417 ;;
424 *-freebsd*) 418 *-freebsd*|*-dragonfly*)
425 local opts action="user" 419 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 420 [[ $1 == "passwd" ]] || action="group"
427 421
428 # lookup by uid/gid 422 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 423 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 424 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 425 fi
432 426
433 pw show ${action} ${opts} "$2" -q 427 pw show ${action} ${opts} "$2" -q
434 ;; 428 ;;
435 *-netbsd*) 429 *-netbsd*|*-openbsd*)
436 grep "$2:\*:" /etc/$1 430 grep "$2:\*:" /etc/$1
437 ;; 431 ;;
438 *) 432 *)
439 type -p nscd >& /dev/null && nscd -i "$1" 433 type -p nscd >& /dev/null && nscd -i "$1"
440 getent "$1" "$2" 434 getent "$1" "$2"
495 einfo " - Userid: ${euid}" 489 einfo " - Userid: ${euid}"
496 490
497 # handle shell 491 # handle shell
498 local eshell=$1; shift 492 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 493 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 494 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 495 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 496 die "${eshell} does not exist in ${ROOT}"
497 fi
498 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
499 eerror "Do not specify ${eshell} yourself, use -1"
500 die "Pass '-1' as the shell parameter"
503 fi 501 fi
504 else 502 else
505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 503 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 [[ -x ${ROOT}${shell} ]] && break 504 [[ -x ${ROOT}${shell} ]] && break
507 done 505 done
578 einfo "Please report the ebuild along with the info below" 576 einfo "Please report the ebuild along with the info below"
579 einfo "eextra: $@" 577 einfo "eextra: $@"
580 die "Required function missing" 578 die "Required function missing"
581 fi 579 fi
582 ;; 580 ;;
583 *-freebsd*) 581 *-freebsd*|*-dragonfly*)
584 if [[ -z $@ ]] ; then 582 if [[ -z $@ ]] ; then
585 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
586 -c "added by portage for ${PN}" \ 584 -c "added by portage for ${PN}" \
587 die "enewuser failed" 585 die "enewuser failed"
588 else 586 else
589 einfo " - Extra: $@" 587 einfo " - Extra: $@"
590 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
591 "$@" || die "enewuser failed" 589 "$@" || die "enewuser failed"
592 fi 590 fi
593 ;; 591 ;;
592
593 *-netbsd*)
594 if [[ -z $@ ]] ; then
595 useradd ${opts} ${euser} || die "enewuser failed"
596 else
597 einfo " - Extra: $@"
598 useradd ${opts} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
602 *-openbsd*)
603 if [[ -z $@ ]] ; then
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} || die "enewuser failed"
607 else
608 einfo " - Extra: $@"
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} "$@" || die "enewuser failed"
612 fi
613 ;;
614
594 *) 615 *)
595 if [[ -z $@ ]] ; then 616 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} \ 617 useradd ${opts} ${euser} \
597 -c "added by portage for ${PN}" \ 618 -c "added by portage for ${PN}" \
598 || die "enewuser failed" 619 || die "enewuser failed"
693 esac 714 esac
694 dscl . create /groups/${egroup} gid ${egid} 715 dscl . create /groups/${egroup} gid ${egid}
695 dscl . create /groups/${egroup} passwd '*' 716 dscl . create /groups/${egroup} passwd '*'
696 ;; 717 ;;
697 718
698 *-freebsd*) 719 *-freebsd*|*-dragonfly*)
699 case ${egid} in 720 case ${egid} in
700 *[!0-9]*) # Non numeric 721 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 722 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 723 [ -z "`egetent group ${egid}`" ] && break
703 done 724 done
710 *[!0-9]*) # Non numeric 731 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 732 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break 733 [ -z "`egetent group ${egid}`" ] && break
713 done 734 done
714 esac 735 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed" 736 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
716 ;; 737 ;;
717 738
718 *) 739 *)
719 groupadd ${opts} ${egroup} || die "enewgroup failed" 740 groupadd ${opts} ${egroup} || die "enewgroup failed"
720 ;; 741 ;;
837 type="Network;${type}" 858 type="Network;${type}"
838 ;; 859 ;;
839 860
840 sci) 861 sci)
841 case ${catmin} in 862 case ${catmin} in
842 astro*) type=Astronomoy;; 863 astro*) type=Astronomy;;
843 bio*) type=Biology;; 864 bio*) type=Biology;;
844 calc*) type=Calculator;; 865 calc*) type=Calculator;;
845 chem*) type=Chemistry;; 866 chem*) type=Chemistry;;
846 geo*) type=Geology;; 867 geo*) type=Geology;;
847 math*) type=Math;; 868 math*) type=Math;;
999 local sizeoff_t=$2 1020 local sizeoff_t=$2
1000 1021
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1022 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1023 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1003 1024
1004 local shrtsrc="`basename ${src}`" 1025 local shrtsrc=$(basename "${src}")
1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1028 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1008 1029
1009 # grab metadata for debug reasons 1030 # grab metadata for debug reasons
1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1074# - If the file is not specified then unpack will utilize ${A}. 1095# - If the file is not specified then unpack will utilize ${A}.
1075# - If the offset is not specified then we will attempt to extract 1096# - If the offset is not specified then we will attempt to extract
1076# the proper offset from the script itself. 1097# the proper offset from the script itself.
1077unpack_makeself() { 1098unpack_makeself() {
1099 local src_input=${1:-${A}}
1078 local src=$(find_unpackable_file "$1") 1100 local src=$(find_unpackable_file "${src_input}")
1079 local skip=$2 1101 local skip=$2
1080 local exe=$3 1102 local exe=$3
1081 1103
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1104 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1083 1105
1084 local shrtsrc=$(basename "${src}") 1106 local shrtsrc=$(basename "${src}")
1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1107 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1086 if [ -z "${skip}" ] 1108 if [[ -z ${skip} ]] ; then
1087 then
1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1089 local skip=0 1110 local skip=0
1090 exe=tail 1111 exe=tail
1091 case ${ver} in 1112 case ${ver} in
1092 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1113 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1093 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1105 ;; 1126 ;;
1106 2.1.3) 1127 2.1.3)
1107 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1128 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1108 let skip="skip + 1" 1129 let skip="skip + 1"
1109 ;; 1130 ;;
1110 2.1.4) 1131 2.1.4|2.1.5)
1111 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1132 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1112 skip=$(head -n ${skip} "${src}" | wc -c) 1133 skip=$(head -n ${skip} "${src}" | wc -c)
1113 exe="dd" 1134 exe="dd"
1114 ;; 1135 ;;
1115 *) 1136 *)
1234 # first we figure out how many cds we're dealing with by 1255 # first we figure out how many cds we're dealing with by
1235 # the # of files they gave us 1256 # the # of files they gave us
1236 local cdcnt=0 1257 local cdcnt=0
1237 local f= 1258 local f=
1238 for f in "$@" ; do 1259 for f in "$@" ; do
1239 cdcnt=$((cdcnt + 1)) 1260 ((++cdcnt))
1240 export CDROM_CHECK_${cdcnt}="$f" 1261 export CDROM_CHECK_${cdcnt}="$f"
1241 done 1262 done
1242 export CDROM_TOTAL_CDS=${cdcnt} 1263 export CDROM_TOTAL_CDS=${cdcnt}
1243 export CDROM_CURRENT_CD=1 1264 export CDROM_CURRENT_CD=1
1244 1265
1245 # now we see if the user gave use CD_ROOT ... 1266 # now we see if the user gave use CD_ROOT ...
1246 # if they did, let's just believe them that it's correct 1267 # if they did, let's just believe them that it's correct
1247 if [[ ! -z ${CD_ROOT} ]] ; then
1248 export CDROM_ROOT=${CD_ROOT}
1249 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1250 return
1251 fi
1252 # do the same for CD_ROOT_X
1253 if [[ ! -z ${CD_ROOT_1} ]] ; then 1268 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1254 local var= 1269 local var=
1255 cdcnt=0 1270 cdcnt=0
1256 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1257 cdcnt=$((cdcnt + 1)) 1272 ((++cdcnt))
1258 var="CD_ROOT_${cdcnt}" 1273 var="CD_ROOT_${cdcnt}"
1274 [[ -z ${!var} ]] && var="CD_ROOT"
1259 if [[ -z ${!var} ]] ; then 1275 if [[ -z ${!var} ]] ; then
1260 eerror "You must either use just the CD_ROOT" 1276 eerror "You must either use just the CD_ROOT"
1261 eerror "or specify ALL the CD_ROOT_X variables." 1277 eerror "or specify ALL the CD_ROOT_X variables."
1262 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1263 die "could not locate CD_ROOT_${cdcnt}" 1279 die "could not locate CD_ROOT_${cdcnt}"
1264 fi 1280 fi
1265 export CDROM_ROOTS_${cdcnt}="${!var}"
1266 done 1281 done
1267 export CDROM_ROOT=${CDROM_ROOTS_1} 1282 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1268 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 export CDROM_SET=-1
1285 for f in ${CDROM_CHECK_1//:/ } ; do
1286 ((++CDROM_SET))
1287 [[ -e ${CD_ROOT}/${f} ]] && break
1288 done
1289 export CDROM_MATCH=${f}
1269 return 1290 return
1270 fi 1291 fi
1271 1292
1293 # User didn't help us out so lets make sure they know they can
1294 # simplify the whole process ...
1272 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1295 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1273 einfon "This ebuild will need the " 1296 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1274 if [[ -z ${CDROM_NAME} ]] ; then
1275 echo "cdrom for ${PN}."
1276 else
1277 echo "${CDROM_NAME}."
1278 fi
1279 echo 1297 echo
1280 einfo "If you do not have the CD, but have the data files" 1298 einfo "If you do not have the CD, but have the data files"
1281 einfo "mounted somewhere on your filesystem, just export" 1299 einfo "mounted somewhere on your filesystem, just export"
1282 einfo "the variable CD_ROOT so that it points to the" 1300 einfo "the variable CD_ROOT so that it points to the"
1283 einfo "directory containing the files." 1301 einfo "directory containing the files."
1287 echo 1305 echo
1288 else 1306 else
1289 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1290 cdcnt=0 1308 cdcnt=0
1291 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1292 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1293 var="CDROM_NAME_${cdcnt}" 1311 var="CDROM_NAME_${cdcnt}"
1294 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1312 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1295 done 1313 done
1296 echo 1314 echo
1297 einfo "If you do not have the CDs, but have the data files" 1315 einfo "If you do not have the CDs, but have the data files"
1298 einfo "mounted somewhere on your filesystem, just export" 1316 einfo "mounted somewhere on your filesystem, just export"
1299 einfo "the following variables so they point to the right place:" 1317 einfo "the following variables so they point to the right place:"
1300 einfon "" 1318 einfon ""
1301 cdcnt=0 1319 cdcnt=0
1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1320 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303 cdcnt=$((cdcnt + 1)) 1321 ((++cdcnt))
1304 echo -n " CD_ROOT_${cdcnt}" 1322 echo -n " CD_ROOT_${cdcnt}"
1305 done 1323 done
1306 echo 1324 echo
1307 einfo "Or, if you have all the files in the same place, or" 1325 einfo "Or, if you have all the files in the same place, or"
1308 einfo "you only have one cdrom, you can export CD_ROOT" 1326 einfo "you only have one cdrom, you can export CD_ROOT"
1311 echo 1329 echo
1312 einfo "For example:" 1330 einfo "For example:"
1313 einfo "export CD_ROOT_1=/mnt/cdrom" 1331 einfo "export CD_ROOT_1=/mnt/cdrom"
1314 echo 1332 echo
1315 fi 1333 fi
1334
1335 export CDROM_SET=""
1316 export CDROM_CURRENT_CD=0 1336 export CDROM_CURRENT_CD=0
1317 cdrom_load_next_cd 1337 cdrom_load_next_cd
1318} 1338}
1319 1339
1320# this is only used when you need access to more than one cd. 1340# this is only used when you need access to more than one cd.
1321# when you have finished using the first cd, just call this function. 1341# when you have finished using the first cd, just call this function.
1322# when it returns, CDROM_ROOT will be pointing to the second cd. 1342# when it returns, CDROM_ROOT will be pointing to the second cd.
1323# remember, you can only go forward in the cd chain, you can't go back. 1343# remember, you can only go forward in the cd chain, you can't go back.
1324cdrom_load_next_cd() { 1344cdrom_load_next_cd() {
1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1326 local var= 1345 local var
1327 1346 ((++CDROM_CURRENT_CD))
1328 if [[ ! -z ${CD_ROOT} ]] ; then
1329 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1330 return
1331 fi
1332 1347
1333 unset CDROM_ROOT 1348 unset CDROM_ROOT
1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1349 var=CD_ROOT_${CDROM_CURRENT_CD}
1350 [[ -z ${!var} ]] && var="CD_ROOT"
1335 if [[ -z ${!var} ]] ; then 1351 if [[ -z ${!var} ]] ; then
1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1352 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1337 cdrom_locate_file_on_cd ${!var} 1353 _cdrom_locate_file_on_cd ${!var}
1338 else 1354 else
1339 export CDROM_ROOT=${!var} 1355 export CDROM_ROOT=${!var}
1340 fi 1356 fi
1341 1357
1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1358 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1347# all it does is try to locate a give file on a cd ... if the cd isn't 1363# all it does is try to locate a give file on a cd ... if the cd isn't
1348# found, then a message asking for the user to insert the cdrom will be 1364# found, then a message asking for the user to insert the cdrom will be
1349# displayed and we'll hang out here until: 1365# displayed and we'll hang out here until:
1350# (1) the file is found on a mounted cdrom 1366# (1) the file is found on a mounted cdrom
1351# (2) the user hits CTRL+C 1367# (2) the user hits CTRL+C
1352cdrom_locate_file_on_cd() { 1368_cdrom_locate_file_on_cd() {
1369 local mline=""
1370 local showedmsg=0
1371
1353 while [[ -z ${CDROM_ROOT} ]] ; do 1372 while [[ -z ${CDROM_ROOT} ]] ; do
1354 local dir=$(dirname "$*") 1373 local i=0
1374 local -a cdset=(${*//:/ })
1375 if [[ -n ${CDROM_SET} ]] ; then
1376 cdset=(${cdset[${CDROM_SET}]})
1377 fi
1378
1379 while [[ -n ${cdset[${i}]} ]] ; do
1380 local dir=$(dirname ${cdset[${i}]})
1355 local file=$(basename "$*") 1381 local file=$(basename ${cdset[${i}]})
1356 local mline=""
1357 local showedmsg=0
1358 1382
1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1383 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1360 [[ -d ${mline}/${dir} ]] || continue 1384 [[ -d ${mline}/${dir} ]] || continue
1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1385 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1362 && export CDROM_ROOT=${mline} 1386 export CDROM_ROOT=${mline}
1387 export CDROM_SET=${i}
1388 export CDROM_MATCH=${cdset[${i}]}
1389 return
1390 fi
1391 done
1392
1393 ((++i))
1363 done 1394 done
1364 1395
1365 if [[ -z ${CDROM_ROOT} ]] ; then
1366 echo 1396 echo
1367 if [[ ${showedmsg} -eq 0 ]] ; then 1397 if [[ ${showedmsg} -eq 0 ]] ; then
1368 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1398 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1369 if [[ -z ${CDROM_NAME} ]] ; then 1399 if [[ -z ${CDROM_NAME} ]] ; then
1370 einfo "Please insert the cdrom for ${PN} now !" 1400 einfo "Please insert+mount the cdrom for ${PN} now !"
1371 else
1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1373 fi
1374 else 1401 else
1375 if [[ -z ${CDROM_NAME_1} ]] ; then
1376 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1377 else
1378 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1379 einfo "Please insert+mount the ${!var} cdrom now !" 1402 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1380 fi
1381 fi 1403 fi
1382 showedmsg=1 1404 else
1405 if [[ -z ${CDROM_NAME_1} ]] ; then
1406 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1407 else
1408 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1409 einfo "Please insert+mount the ${!var} cdrom now !"
1410 fi
1383 fi 1411 fi
1412 showedmsg=1
1413 fi
1384 einfo "Press return to scan for the cd again" 1414 einfo "Press return to scan for the cd again"
1385 einfo "or hit CTRL+C to abort the emerge." 1415 einfo "or hit CTRL+C to abort the emerge."
1386 echo 1416 echo
1387 einfo "If you are having trouble with the detection" 1417 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have" 1418 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please" 1419 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1420 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1391 read 1421 read || die "something is screwed with your system"
1392 fi
1393 done 1422 done
1394} 1423}
1395 1424
1396# Make sure that LINGUAS only contains languages that 1425# Make sure that LINGUAS only contains languages that
1397# a package can support 1426# a package can support
1407# directories and uses the union of the lists. 1436# directories and uses the union of the lists.
1408strip-linguas() { 1437strip-linguas() {
1409 local ls newls 1438 local ls newls
1410 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1411 local op=$1; shift 1440 local op=$1; shift
1412 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1441 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1413 local d f 1442 local d f
1414 for d in "$@" ; do 1443 for d in "$@" ; do
1415 if [[ ${op} == "-u" ]] ; then 1444 if [[ ${op} == "-u" ]] ; then
1416 newls=${ls} 1445 newls=${ls}
1417 else 1446 else
1418 newls="" 1447 newls=""
1419 fi 1448 fi
1420 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1449 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1421 if [[ ${op} == "-i" ]] ; then 1450 if [[ ${op} == "-i" ]] ; then
1422 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1423 else 1452 else
1424 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1425 fi 1454 fi
1545 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1546 1575
1547 local PKG=$(best_version $1) 1576 local PKG=$(best_version $1)
1548 shift 1577 shift
1549 1578
1550 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1579 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1580
1581 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided
1551 [[ ! -e ${USEFILE} ]] && return 1 1583 [[ ! -e ${USEFILE} ]] && return 0
1552 1584
1553 local USE_BUILT=$(<${USEFILE}) 1585 local USE_BUILT=$(<${USEFILE})
1554 while [[ $# -gt 0 ]] ; do 1586 while [[ $# -gt 0 ]] ; do
1555 if [[ ${opt} = "-o" ]] ; then 1587 if [[ ${opt} = "-o" ]] ; then
1556 has $1 ${USE_BUILT} && return 0 1588 has $1 ${USE_BUILT} && return 0
1613 # We don't want to quote ${bin} so that people can pass complex 1645 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args" 1646 # things as $bin ... "./someprog --args"
1615 cat << EOF > "${tmpwrapper}" 1647 cat << EOF > "${tmpwrapper}"
1616#!/bin/sh 1648#!/bin/sh
1617cd "${chdir:-.}" 1649cd "${chdir:-.}"
1650if [ -n "${libdir}" ] ; then
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1651 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1652 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1653 else
1654 export LD_LIBRARY_PATH="${libdir}"
1655 fi
1620fi 1656fi
1621exec ${bin} "\$@" 1657exec ${bin} "\$@"
1622EOF 1658EOF
1623 chmod go+rx "${tmpwrapper}" 1659 chmod go+rx "${tmpwrapper}"
1624 if [[ -n ${path} ]] ; then 1660 if [[ -n ${path} ]] ; then

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

  ViewVC Help
Powered by ViewVC 1.1.20