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

Diff of /eclass/eutils.eclass

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

Revision 1.205 Revision 1.228
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.205 2005/10/07 15:31:46 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier 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 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 164 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
284 277
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
287 do 280 do
288 # Generate some useful debug info ... 281 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 284
292 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 286 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 292
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 295
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 298
306 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 300 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 302 then
313 count=5 306 count=5
314 break 307 break
315 fi 308 fi
316 fi 309 fi
317 310
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 312 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 318
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
327 321
328 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
329 then 323 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 325 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 389 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 391 echo "${tmp}"
398 else 392 else
399 [[ ${exe} == "touch" ]] \ 393 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 395 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
403 fi 402 fi
404} 403}
405 404
406# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 418 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 420 ;;
422 esac 421 esac
423 ;; 422 ;;
424 *-freebsd*) 423 *-freebsd*|*-dragonfly*)
425 local opts action="user" 424 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 425 [[ $1 == "passwd" ]] || action="group"
427 426
428 # lookup by uid/gid 427 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 428 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 430 fi
432 431
433 pw show ${action} ${opts} "$2" -q 432 pw show ${action} ${opts} "$2" -q
433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
434 ;; 436 ;;
435 *) 437 *)
436 type -p nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
437 getent "$1" "$2" 439 getent "$1" "$2"
438 ;; 440 ;;
492 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
493 495
494 # handle shell 496 # handle shell
495 local eshell=$1; shift 497 local eshell=$1; shift
496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
497 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
498 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
499 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
502 fi
503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
504 eerror "Do not specify ${eshell} yourself, use -1"
505 die "Pass '-1' as the shell parameter"
500 fi 506 fi
501 else 507 else
502 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
503 [[ -x ${ROOT}${shell} ]] && break 509 [[ -x ${ROOT}${shell} ]] && break
504 done 510 done
575 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
576 einfo "eextra: $@" 582 einfo "eextra: $@"
577 die "Required function missing" 583 die "Required function missing"
578 fi 584 fi
579 ;; 585 ;;
580 *-freebsd*) 586 *-freebsd*|*-dragonfly*)
581 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
582 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
583 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
584 die "enewuser failed" 590 die "enewuser failed"
585 else 591 else
586 einfo " - Extra: $@" 592 einfo " - Extra: $@"
587 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
588 "$@" || die "enewuser failed" 594 "$@" || die "enewuser failed"
589 fi 595 fi
590 ;; 596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
591 *) 620 *)
592 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
594 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
595 || die "enewuser failed" 624 || die "enewuser failed"
690 esac 719 esac
691 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
692 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
693 ;; 722 ;;
694 723
695 *-freebsd*) 724 *-freebsd*|*-dragonfly*)
696 case ${egid} in 725 case ${egid} in
697 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
698 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
699 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
700 done 729 done
701 esac 730 esac
702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
703 ;; 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
704 *) 744 *)
705 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
706 ;; 746 ;;
707 esac 747 esac
708 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
823 type="Network;${type}" 863 type="Network;${type}"
824 ;; 864 ;;
825 865
826 sci) 866 sci)
827 case ${catmin} in 867 case ${catmin} in
828 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
829 bio*) type=Biology;; 869 bio*) type=Biology;;
830 calc*) type=Calculator;; 870 calc*) type=Calculator;;
831 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
832 geo*) type=Geology;; 872 geo*) type=Geology;;
833 math*) type=Math;; 873 math*) type=Math;;
985 local sizeoff_t=$2 1025 local sizeoff_t=$2
986 1026
987 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
988 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
989 1029
990 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
991 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
992 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
993 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
994 1034
995 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1060# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1061# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1062# the proper offset from the script itself. 1102# the proper offset from the script itself.
1063unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1064 local src=$(find_unpackable_file "$1") 1105 local src=$(find_unpackable_file "${src_input}")
1065 local skip=$2 1106 local skip=$2
1066 local exe=$3 1107 local exe=$3
1067 1108
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1069 1110
1070 local shrtsrc=$(basename "${src}") 1111 local shrtsrc=$(basename "${src}")
1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1072 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1073 then
1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1075 local skip=0 1115 local skip=0
1076 exe=tail 1116 exe=tail
1077 case ${ver} in 1117 case ${ver} in
1078 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1079 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1091 ;; 1131 ;;
1092 2.1.3) 1132 2.1.3)
1093 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1094 let skip="skip + 1" 1134 let skip="skip + 1"
1095 ;; 1135 ;;
1096 2.1.4) 1136 2.1.4|2.1.5)
1097 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1098 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1099 exe="dd" 1139 exe="dd"
1100 ;; 1140 ;;
1101 *) 1141 *)
1220 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1221 # the # of files they gave us 1261 # the # of files they gave us
1222 local cdcnt=0 1262 local cdcnt=0
1223 local f= 1263 local f=
1224 for f in "$@" ; do 1264 for f in "$@" ; do
1225 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1226 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1227 done 1267 done
1228 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1229 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1230 1270
1231 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1232 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1233 if [[ ! -z ${CD_ROOT} ]] ; then
1234 export CDROM_ROOT=${CD_ROOT}
1235 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1236 return
1237 fi
1238 # do the same for CD_ROOT_X
1239 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1240 local var= 1274 local var=
1241 cdcnt=0 1275 cdcnt=0
1242 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1243 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1244 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1245 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1246 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1247 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1248 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1249 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1250 fi 1285 fi
1251 export CDROM_ROOTS_${cdcnt}="${!var}"
1252 done 1286 done
1253 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1254 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1255 return 1295 return
1256 fi 1296 fi
1257 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1258 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1259 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1260 if [[ -z ${CDROM_NAME} ]] ; then
1261 echo "cdrom for ${PN}."
1262 else
1263 echo "${CDROM_NAME}."
1264 fi
1265 echo 1302 echo
1266 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1267 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1269 einfo "directory containing the files." 1306 einfo "directory containing the files."
1273 echo 1310 echo
1274 else 1311 else
1275 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1276 cdcnt=0 1313 cdcnt=0
1277 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1278 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1279 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1280 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1281 done 1318 done
1282 echo 1319 echo
1283 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1284 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1285 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1286 einfon "" 1323 einfon ""
1287 cdcnt=0 1324 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1290 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1291 done 1328 done
1292 echo 1329 echo
1293 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1294 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1297 echo 1334 echo
1298 einfo "For example:" 1335 einfo "For example:"
1299 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1300 echo 1337 echo
1301 fi 1338 fi
1339
1340 export CDROM_SET=""
1302 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1303 cdrom_load_next_cd 1342 cdrom_load_next_cd
1304} 1343}
1305 1344
1306# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1307# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1308# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1309# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1310cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1311 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1312 local var= 1350 local var
1313 1351 ((++CDROM_CURRENT_CD))
1314 if [[ ! -z ${CD_ROOT} ]] ; then
1315 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1316 return
1317 fi
1318 1352
1319 unset CDROM_ROOT 1353 unset CDROM_ROOT
1320 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1321 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1322 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1323 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1324 else 1359 else
1325 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1326 fi 1361 fi
1327 1362
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1333# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1334# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1335# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1336# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1337# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1338cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1339 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1340 local dir=$(dirname "$*") 1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1385 local dir=$(dirname ${cdset[${i}]})
1341 local file=$(basename "$*") 1386 local file=$(basename ${cdset[${i}]})
1342 local mline=""
1343 local showedmsg=0
1344 1387
1345 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1346 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1348 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1349 done 1399 done
1350 1400
1351 if [[ -z ${CDROM_ROOT} ]] ; then
1352 echo 1401 echo
1353 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1354 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1355 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1356 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1357 else
1358 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1359 fi
1360 else 1406 else
1361 if [[ -z ${CDROM_NAME_1} ]] ; then
1362 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1363 else
1364 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1365 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1366 fi
1367 fi 1408 fi
1368 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1369 fi 1416 fi
1417 showedmsg=1
1418 fi
1370 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1371 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1372 echo 1421 echo
1373 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1374 einfo "of your CD, it is possible that you do not have" 1423 einfo "of your CD, it is possible that you do not have"
1375 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1377 read 1426 read || die "something is screwed with your system"
1378 fi
1379 done 1427 done
1380} 1428}
1381 1429
1382# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1383# a package can support 1431# a package can support
1393# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1394strip-linguas() { 1442strip-linguas() {
1395 local ls newls 1443 local ls newls
1396 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1397 local op=$1; shift 1445 local op=$1; shift
1398 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1399 local d f 1447 local d f
1400 for d in "$@" ; do 1448 for d in "$@" ; do
1401 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1402 newls=${ls} 1450 newls=${ls}
1403 else 1451 else
1404 newls="" 1452 newls=""
1405 fi 1453 fi
1406 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1407 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1408 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1409 else 1457 else
1410 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1411 fi 1459 fi
1467 1515
1468# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1469# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1470# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1471# 1519#
1472# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1473# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1474# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1475# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1476# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1477# 1525#
1508 1556
1509 ewarn "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1510 ewarn "In order to avoid breaking packages that link against it, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1511 ewarn "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1512 ewarn "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1513 ewarn " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1514 ewarn 1562 ewarn
1515 ewarn "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1517 fi 1565 fi
1518} 1566}
1531 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1532 1580
1533 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1534 shift 1582 shift
1535 1583
1536 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1537 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1538 1589
1539 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1540 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1541 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1542 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1599 # We don't want to quote ${bin} so that people can pass complex 1650 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args" 1651 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh 1653#!/bin/sh
1603cd "${chdir:-.}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1606fi 1661fi
1607exec ${bin} "\$@" 1662exec ${bin} "\$@"
1608EOF 1663EOF
1609 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then 1665 if [[ -n ${path} ]] ; then

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

  ViewVC Help
Powered by ViewVC 1.1.20