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

Diff of /eclass/eutils.eclass

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

Revision 1.214 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.214 2005/10/26 00:39:12 vapier 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 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 164 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
285 277
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
288 do 280 do
289 # Generate some useful debug info ... 281 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 284
293 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 286 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 292
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 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##*/}
303 295
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 298
307 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 300 then
309 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
310 then 302 then
316 fi 308 fi
317 fi 309 fi
318 310
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${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
320 then 312 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 318
327 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
328 _epatch_assert 320 _epatch_assert
329 321
330 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 389 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 391 echo "${tmp}"
400 else 392 else
401 [[ ${exe} == "touch" ]] \ 393 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 395 && mktemp -p "${topdir}" \
404 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
405 fi 402 fi
406} 403}
407 404
408# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 418 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 420 ;;
424 esac 421 esac
425 ;; 422 ;;
426 *-freebsd*) 423 *-freebsd*|*-dragonfly*)
427 local opts action="user" 424 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 425 [[ $1 == "passwd" ]] || action="group"
429 426
430 # lookup by uid/gid 427 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 428 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 430 fi
434 431
435 pw show ${action} ${opts} "$2" -q 432 pw show ${action} ${opts} "$2" -q
436 ;; 433 ;;
437 *-netbsd*) 434 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1 435 grep "$2:\*:" /etc/$1
439 ;; 436 ;;
440 *) 437 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 439 getent "$1" "$2"
497 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
498 495
499 # handle shell 496 # handle shell
500 local eshell=$1; shift 497 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
504 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"
505 fi 506 fi
506 else 507 else
507 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
508 [[ -x ${ROOT}${shell} ]] && break 509 [[ -x ${ROOT}${shell} ]] && break
509 done 510 done
580 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 582 einfo "eextra: $@"
582 die "Required function missing" 583 die "Required function missing"
583 fi 584 fi
584 ;; 585 ;;
585 *-freebsd*) 586 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
589 die "enewuser failed" 590 die "enewuser failed"
590 else 591 else
600 else 601 else
601 einfo " - Extra: $@" 602 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi 604 fi
604 ;; 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
605 *) 620 *)
606 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
607 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
608 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
609 || die "enewuser failed" 624 || die "enewuser failed"
704 esac 719 esac
705 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
707 ;; 722 ;;
708 723
709 *-freebsd*) 724 *-freebsd*|*-dragonfly*)
710 case ${egid} in 725 case ${egid} in
711 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
713 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
714 done 729 done
848 type="Network;${type}" 863 type="Network;${type}"
849 ;; 864 ;;
850 865
851 sci) 866 sci)
852 case ${catmin} in 867 case ${catmin} in
853 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
854 bio*) type=Biology;; 869 bio*) type=Biology;;
855 calc*) type=Calculator;; 870 calc*) type=Calculator;;
856 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
857 geo*) type=Geology;; 872 geo*) type=Geology;;
858 math*) type=Math;; 873 math*) type=Math;;
1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1085# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1086# - 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
1087# the proper offset from the script itself. 1102# the proper offset from the script itself.
1088unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1089 local src=$(find_unpackable_file "$1") 1105 local src=$(find_unpackable_file "${src_input}")
1090 local skip=$2 1106 local skip=$2
1091 local exe=$3 1107 local exe=$3
1092 1108
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1094 1110
1095 local shrtsrc=$(basename "${src}") 1111 local shrtsrc=$(basename "${src}")
1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1097 if [[ -z ${skip} ]] ; then 1113 if [[ -z ${skip} ]] ; then
1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1252 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1253 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1254 1270
1255 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1256 # 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
1257 if [[ ! -z ${CD_ROOT} ]] ; then
1258 export CDROM_ROOT=${CD_ROOT}
1259 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1260 return
1261 fi
1262 # do the same for CD_ROOT_X
1263 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1264 local var= 1274 local var=
1265 cdcnt=0 1275 cdcnt=0
1266 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1267 ((++cdcnt)) 1277 ((++cdcnt))
1268 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1269 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1270 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1271 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1272 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."
1273 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1274 fi 1285 fi
1275 export CDROM_ROOTS_${cdcnt}="${!var}"
1276 done 1286 done
1277 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1278 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}
1279 return 1295 return
1280 fi 1296 fi
1281 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1283 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1284 if [[ -z ${CDROM_NAME} ]] ; then
1285 echo "cdrom for ${PN}."
1286 else
1287 echo "${CDROM_NAME}."
1288 fi
1289 echo 1302 echo
1290 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"
1291 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1292 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1293 einfo "directory containing the files." 1306 einfo "directory containing the files."
1321 echo 1334 echo
1322 einfo "For example:" 1335 einfo "For example:"
1323 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1324 echo 1337 echo
1325 fi 1338 fi
1339
1326 export CDROM_SET="" 1340 export CDROM_SET=""
1327 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1328 cdrom_load_next_cd 1342 cdrom_load_next_cd
1329} 1343}
1330 1344
1331# 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.
1332# 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.
1333# 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.
1334# 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.
1335cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1336 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1337 local var= 1350 local var
1338 1351 ((++CDROM_CURRENT_CD))
1339 if [[ ! -z ${CD_ROOT} ]] ; then
1340 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1341 return
1342 fi
1343 1352
1344 unset CDROM_ROOT 1353 unset CDROM_ROOT
1345 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1346 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1348 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1349 else 1359 else
1350 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1351 fi 1361 fi
1352 1362
1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1358# 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
1359# 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
1360# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1361# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1362# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1363cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1364 local mline="" 1374 local mline=""
1365 local showedmsg=0 1375 local showedmsg=0
1366 1376
1367 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1368 local i=0 1378 local i=0
1411 echo 1421 echo
1412 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1413 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"
1414 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1415 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1416 read 1426 read || die "something is screwed with your system"
1417 done 1427 done
1418} 1428}
1419 1429
1420# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1421# a package can support 1431# a package can support
1431# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1432strip-linguas() { 1442strip-linguas() {
1433 local ls newls 1443 local ls newls
1434 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1435 local op=$1; shift 1445 local op=$1; shift
1436 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1437 local d f 1447 local d f
1438 for d in "$@" ; do 1448 for d in "$@" ; do
1439 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1440 newls=${ls} 1450 newls=${ls}
1441 else 1451 else
1442 newls="" 1452 newls=""
1443 fi 1453 fi
1444 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1445 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1446 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1447 else 1457 else
1448 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1449 fi 1459 fi
1505 1515
1506# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1507# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1508# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1509# 1519#
1510# 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
1511# 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
1512# 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
1513# 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
1514# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1515# 1525#
1546 1556
1547 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."
1548 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"
1549 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,"
1550 ewarn "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1551 ewarn " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1552 ewarn 1562 ewarn
1553 ewarn "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1554 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1555 fi 1565 fi
1556} 1566}

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

  ViewVC Help
Powered by ViewVC 1.1.20