/[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.229
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.229 2006/03/16 03:44:54 agriffis 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 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 146 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
284 259
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
287 do 262 do
288 # Generate some useful debug info ... 263 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 266
292 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 268 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 274
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 277
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 280
306 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 282 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 284 then
313 count=5 288 count=5
314 break 289 break
315 fi 290 fi
316 fi 291 fi
317 292
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 294 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 300
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
327 303
328 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
329 then 305 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 307 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 371 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 373 echo "${tmp}"
398 else 374 else
399 [[ ${exe} == "touch" ]] \ 375 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 377 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
403 fi 384 fi
404} 385}
405 386
406# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 400 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 402 ;;
422 esac 403 esac
423 ;; 404 ;;
424 *-freebsd*) 405 *-freebsd*|*-dragonfly*)
425 local opts action="user" 406 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 407 [[ $1 == "passwd" ]] || action="group"
427 408
428 # lookup by uid/gid 409 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 410 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 412 fi
432 413
433 pw show ${action} ${opts} "$2" -q 414 pw show ${action} ${opts} "$2" -q
434 ;; 415 ;;
435 *-netbsd*) 416 *-netbsd*|*-openbsd*)
436 grep "$2:\*:" /etc/$1 417 grep "$2:\*:" /etc/$1
437 ;; 418 ;;
438 *) 419 *)
439 type -p nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
440 getent "$1" "$2" 421 getent "$1" "$2"
495 einfo " - Userid: ${euid}" 476 einfo " - Userid: ${euid}"
496 477
497 # handle shell 478 # handle shell
498 local eshell=$1; shift 479 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 480 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 481 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 482 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 483 die "${eshell} does not exist in ${ROOT}"
484 fi
485 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
486 eerror "Do not specify ${eshell} yourself, use -1"
487 die "Pass '-1' as the shell parameter"
503 fi 488 fi
504 else 489 else
505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 490 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 [[ -x ${ROOT}${shell} ]] && break 491 [[ -x ${ROOT}${shell} ]] && break
507 done 492 done
578 einfo "Please report the ebuild along with the info below" 563 einfo "Please report the ebuild along with the info below"
579 einfo "eextra: $@" 564 einfo "eextra: $@"
580 die "Required function missing" 565 die "Required function missing"
581 fi 566 fi
582 ;; 567 ;;
583 *-freebsd*) 568 *-freebsd*|*-dragonfly*)
584 if [[ -z $@ ]] ; then 569 if [[ -z $@ ]] ; then
585 pw useradd ${euser} ${opts} \ 570 pw useradd ${euser} ${opts} \
586 -c "added by portage for ${PN}" \ 571 -c "added by portage for ${PN}" \
587 die "enewuser failed" 572 die "enewuser failed"
588 else 573 else
589 einfo " - Extra: $@" 574 einfo " - Extra: $@"
590 pw useradd ${euser} ${opts} \ 575 pw useradd ${euser} ${opts} \
591 "$@" || die "enewuser failed" 576 "$@" || die "enewuser failed"
592 fi 577 fi
593 ;; 578 ;;
579
580 *-netbsd*)
581 if [[ -z $@ ]] ; then
582 useradd ${opts} ${euser} || die "enewuser failed"
583 else
584 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" || die "enewuser failed"
586 fi
587 ;;
588
589 *-openbsd*)
590 if [[ -z $@ ]] ; then
591 useradd -u ${euid} -s ${eshell} \
592 -d ${ehome} -c "Added by portage for ${PN}" \
593 -g ${egroups} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd -u ${euid} -s ${eshell} \
597 -d ${ehome} -c "Added by portage for ${PN}" \
598 -g ${egroups} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
594 *) 602 *)
595 if [[ -z $@ ]] ; then 603 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} \ 604 useradd ${opts} ${euser} \
597 -c "added by portage for ${PN}" \ 605 -c "added by portage for ${PN}" \
598 || die "enewuser failed" 606 || die "enewuser failed"
693 esac 701 esac
694 dscl . create /groups/${egroup} gid ${egid} 702 dscl . create /groups/${egroup} gid ${egid}
695 dscl . create /groups/${egroup} passwd '*' 703 dscl . create /groups/${egroup} passwd '*'
696 ;; 704 ;;
697 705
698 *-freebsd*) 706 *-freebsd*|*-dragonfly*)
699 case ${egid} in 707 case ${egid} in
700 *[!0-9]*) # Non numeric 708 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 709 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 710 [ -z "`egetent group ${egid}`" ] && break
703 done 711 done
710 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 719 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
713 done 721 done
714 esac 722 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
716 ;; 724 ;;
717 725
718 *) 726 *)
719 groupadd ${opts} ${egroup} || die "enewgroup failed" 727 groupadd ${opts} ${egroup} || die "enewgroup failed"
720 ;; 728 ;;
837 type="Network;${type}" 845 type="Network;${type}"
838 ;; 846 ;;
839 847
840 sci) 848 sci)
841 case ${catmin} in 849 case ${catmin} in
842 astro*) type=Astronomoy;; 850 astro*) type=Astronomy;;
843 bio*) type=Biology;; 851 bio*) type=Biology;;
844 calc*) type=Calculator;; 852 calc*) type=Calculator;;
845 chem*) type=Chemistry;; 853 chem*) type=Chemistry;;
846 geo*) type=Geology;; 854 geo*) type=Geology;;
847 math*) type=Math;; 855 math*) type=Math;;
999 local sizeoff_t=$2 1007 local sizeoff_t=$2
1000 1008
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1009 [[ -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 :(" 1010 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1003 1011
1004 local shrtsrc="`basename ${src}`" 1012 local shrtsrc=$(basename "${src}")
1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1013 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1014 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\"` 1015 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1008 1016
1009 # grab metadata for debug reasons 1017 # grab metadata for debug reasons
1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1081# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1074# - If the file is not specified then unpack will utilize ${A}. 1082# - If the file is not specified then unpack will utilize ${A}.
1075# - If the offset is not specified then we will attempt to extract 1083# - If the offset is not specified then we will attempt to extract
1076# the proper offset from the script itself. 1084# the proper offset from the script itself.
1077unpack_makeself() { 1085unpack_makeself() {
1086 local src_input=${1:-${A}}
1078 local src=$(find_unpackable_file "$1") 1087 local src=$(find_unpackable_file "${src_input}")
1079 local skip=$2 1088 local skip=$2
1080 local exe=$3 1089 local exe=$3
1081 1090
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1091 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1083 1092
1084 local shrtsrc=$(basename "${src}") 1093 local shrtsrc=$(basename "${src}")
1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1086 if [ -z "${skip}" ] 1095 if [[ -z ${skip} ]] ; then
1087 then
1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1096 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1089 local skip=0 1097 local skip=0
1090 exe=tail 1098 exe=tail
1091 case ${ver} in 1099 case ${ver} in
1092 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1100 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1093 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1101 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1105 ;; 1113 ;;
1106 2.1.3) 1114 2.1.3)
1107 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1115 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1108 let skip="skip + 1" 1116 let skip="skip + 1"
1109 ;; 1117 ;;
1110 2.1.4) 1118 2.1.4|2.1.5)
1111 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1119 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1112 skip=$(head -n ${skip} "${src}" | wc -c) 1120 skip=$(head -n ${skip} "${src}" | wc -c)
1113 exe="dd" 1121 exe="dd"
1114 ;; 1122 ;;
1115 *) 1123 *)
1234 # first we figure out how many cds we're dealing with by 1242 # first we figure out how many cds we're dealing with by
1235 # the # of files they gave us 1243 # the # of files they gave us
1236 local cdcnt=0 1244 local cdcnt=0
1237 local f= 1245 local f=
1238 for f in "$@" ; do 1246 for f in "$@" ; do
1239 cdcnt=$((cdcnt + 1)) 1247 ((++cdcnt))
1240 export CDROM_CHECK_${cdcnt}="$f" 1248 export CDROM_CHECK_${cdcnt}="$f"
1241 done 1249 done
1242 export CDROM_TOTAL_CDS=${cdcnt} 1250 export CDROM_TOTAL_CDS=${cdcnt}
1243 export CDROM_CURRENT_CD=1 1251 export CDROM_CURRENT_CD=1
1244 1252
1245 # now we see if the user gave use CD_ROOT ... 1253 # now we see if the user gave use CD_ROOT ...
1246 # if they did, let's just believe them that it's correct 1254 # 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 1255 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1254 local var= 1256 local var=
1255 cdcnt=0 1257 cdcnt=0
1256 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1258 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1257 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1258 var="CD_ROOT_${cdcnt}" 1260 var="CD_ROOT_${cdcnt}"
1261 [[ -z ${!var} ]] && var="CD_ROOT"
1259 if [[ -z ${!var} ]] ; then 1262 if [[ -z ${!var} ]] ; then
1260 eerror "You must either use just the CD_ROOT" 1263 eerror "You must either use just the CD_ROOT"
1261 eerror "or specify ALL the CD_ROOT_X variables." 1264 eerror "or specify ALL the CD_ROOT_X variables."
1262 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1265 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1263 die "could not locate CD_ROOT_${cdcnt}" 1266 die "could not locate CD_ROOT_${cdcnt}"
1264 fi 1267 fi
1265 export CDROM_ROOTS_${cdcnt}="${!var}"
1266 done 1268 done
1267 export CDROM_ROOT=${CDROM_ROOTS_1} 1269 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1268 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1270 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1271 export CDROM_SET=-1
1272 for f in ${CDROM_CHECK_1//:/ } ; do
1273 ((++CDROM_SET))
1274 [[ -e ${CD_ROOT}/${f} ]] && break
1275 done
1276 export CDROM_MATCH=${f}
1269 return 1277 return
1270 fi 1278 fi
1271 1279
1280 # User didn't help us out so lets make sure they know they can
1281 # simplify the whole process ...
1272 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1273 einfon "This ebuild will need the " 1283 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 1284 echo
1280 einfo "If you do not have the CD, but have the data files" 1285 einfo "If you do not have the CD, but have the data files"
1281 einfo "mounted somewhere on your filesystem, just export" 1286 einfo "mounted somewhere on your filesystem, just export"
1282 einfo "the variable CD_ROOT so that it points to the" 1287 einfo "the variable CD_ROOT so that it points to the"
1283 einfo "directory containing the files." 1288 einfo "directory containing the files."
1287 echo 1292 echo
1288 else 1293 else
1289 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1294 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1290 cdcnt=0 1295 cdcnt=0
1291 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1296 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1292 cdcnt=$((cdcnt + 1)) 1297 ((++cdcnt))
1293 var="CDROM_NAME_${cdcnt}" 1298 var="CDROM_NAME_${cdcnt}"
1294 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1299 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1295 done 1300 done
1296 echo 1301 echo
1297 einfo "If you do not have the CDs, but have the data files" 1302 einfo "If you do not have the CDs, but have the data files"
1298 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1299 einfo "the following variables so they point to the right place:" 1304 einfo "the following variables so they point to the right place:"
1300 einfon "" 1305 einfon ""
1301 cdcnt=0 1306 cdcnt=0
1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1307 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303 cdcnt=$((cdcnt + 1)) 1308 ((++cdcnt))
1304 echo -n " CD_ROOT_${cdcnt}" 1309 echo -n " CD_ROOT_${cdcnt}"
1305 done 1310 done
1306 echo 1311 echo
1307 einfo "Or, if you have all the files in the same place, or" 1312 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" 1313 einfo "you only have one cdrom, you can export CD_ROOT"
1311 echo 1316 echo
1312 einfo "For example:" 1317 einfo "For example:"
1313 einfo "export CD_ROOT_1=/mnt/cdrom" 1318 einfo "export CD_ROOT_1=/mnt/cdrom"
1314 echo 1319 echo
1315 fi 1320 fi
1321
1322 export CDROM_SET=""
1316 export CDROM_CURRENT_CD=0 1323 export CDROM_CURRENT_CD=0
1317 cdrom_load_next_cd 1324 cdrom_load_next_cd
1318} 1325}
1319 1326
1320# this is only used when you need access to more than one cd. 1327# 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. 1328# 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. 1329# 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. 1330# remember, you can only go forward in the cd chain, you can't go back.
1324cdrom_load_next_cd() { 1331cdrom_load_next_cd() {
1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1326 local var= 1332 local var
1327 1333 ((++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 1334
1333 unset CDROM_ROOT 1335 unset CDROM_ROOT
1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1336 var=CD_ROOT_${CDROM_CURRENT_CD}
1337 [[ -z ${!var} ]] && var="CD_ROOT"
1335 if [[ -z ${!var} ]] ; then 1338 if [[ -z ${!var} ]] ; then
1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1339 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1337 cdrom_locate_file_on_cd ${!var} 1340 _cdrom_locate_file_on_cd ${!var}
1338 else 1341 else
1339 export CDROM_ROOT=${!var} 1342 export CDROM_ROOT=${!var}
1340 fi 1343 fi
1341 1344
1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1345 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 1350# 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 1351# found, then a message asking for the user to insert the cdrom will be
1349# displayed and we'll hang out here until: 1352# displayed and we'll hang out here until:
1350# (1) the file is found on a mounted cdrom 1353# (1) the file is found on a mounted cdrom
1351# (2) the user hits CTRL+C 1354# (2) the user hits CTRL+C
1352cdrom_locate_file_on_cd() { 1355_cdrom_locate_file_on_cd() {
1356 local mline=""
1357 local showedmsg=0
1358
1353 while [[ -z ${CDROM_ROOT} ]] ; do 1359 while [[ -z ${CDROM_ROOT} ]] ; do
1354 local dir=$(dirname "$*") 1360 local i=0
1361 local -a cdset=(${*//:/ })
1362 if [[ -n ${CDROM_SET} ]] ; then
1363 cdset=(${cdset[${CDROM_SET}]})
1364 fi
1365
1366 while [[ -n ${cdset[${i}]} ]] ; do
1367 local dir=$(dirname ${cdset[${i}]})
1355 local file=$(basename "$*") 1368 local file=$(basename ${cdset[${i}]})
1356 local mline=""
1357 local showedmsg=0
1358 1369
1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1370 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1360 [[ -d ${mline}/${dir} ]] || continue 1371 [[ -d ${mline}/${dir} ]] || continue
1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1372 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1362 && export CDROM_ROOT=${mline} 1373 export CDROM_ROOT=${mline}
1374 export CDROM_SET=${i}
1375 export CDROM_MATCH=${cdset[${i}]}
1376 return
1377 fi
1378 done
1379
1380 ((++i))
1363 done 1381 done
1364 1382
1365 if [[ -z ${CDROM_ROOT} ]] ; then
1366 echo 1383 echo
1367 if [[ ${showedmsg} -eq 0 ]] ; then 1384 if [[ ${showedmsg} -eq 0 ]] ; then
1368 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1385 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1369 if [[ -z ${CDROM_NAME} ]] ; then 1386 if [[ -z ${CDROM_NAME} ]] ; then
1370 einfo "Please insert the cdrom for ${PN} now !" 1387 einfo "Please insert+mount the cdrom for ${PN} now !"
1371 else
1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1373 fi
1374 else 1388 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 !" 1389 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1380 fi
1381 fi 1390 fi
1382 showedmsg=1 1391 else
1392 if [[ -z ${CDROM_NAME_1} ]] ; then
1393 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1394 else
1395 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1396 einfo "Please insert+mount the ${!var} cdrom now !"
1397 fi
1383 fi 1398 fi
1399 showedmsg=1
1400 fi
1384 einfo "Press return to scan for the cd again" 1401 einfo "Press return to scan for the cd again"
1385 einfo "or hit CTRL+C to abort the emerge." 1402 einfo "or hit CTRL+C to abort the emerge."
1386 echo 1403 echo
1387 einfo "If you are having trouble with the detection" 1404 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have" 1405 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please" 1406 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1407 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1391 read 1408 read || die "something is screwed with your system"
1392 fi
1393 done 1409 done
1394} 1410}
1395 1411
1396# Make sure that LINGUAS only contains languages that 1412# Make sure that LINGUAS only contains languages that
1397# a package can support 1413# a package can support
1407# directories and uses the union of the lists. 1423# directories and uses the union of the lists.
1408strip-linguas() { 1424strip-linguas() {
1409 local ls newls 1425 local ls newls
1410 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1426 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1411 local op=$1; shift 1427 local op=$1; shift
1412 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1428 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1413 local d f 1429 local d f
1414 for d in "$@" ; do 1430 for d in "$@" ; do
1415 if [[ ${op} == "-u" ]] ; then 1431 if [[ ${op} == "-u" ]] ; then
1416 newls=${ls} 1432 newls=${ls}
1417 else 1433 else
1418 newls="" 1434 newls=""
1419 fi 1435 fi
1420 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1436 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1421 if [[ ${op} == "-i" ]] ; then 1437 if [[ ${op} == "-i" ]] ; then
1422 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1438 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1423 else 1439 else
1424 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1440 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1425 fi 1441 fi
1481 1497
1482# Jeremy Huddleston <eradicator@gentoo.org>: 1498# Jeremy Huddleston <eradicator@gentoo.org>:
1483# preserve_old_lib /path/to/libblah.so.0 1499# preserve_old_lib /path/to/libblah.so.0
1484# preserve_old_lib_notify /path/to/libblah.so.0 1500# preserve_old_lib_notify /path/to/libblah.so.0
1485# 1501#
1486# These functions are useful when a lib in your package changes --soname. Such 1502# These functions are useful when a lib in your package changes --library. Such
1487# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1503# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1488# would break packages that link against it. Most people get around this 1504# would break packages that link against it. Most people get around this
1489# by using the portage SLOT mechanism, but that is not always a relevant 1505# by using the portage SLOT mechanism, but that is not always a relevant
1490# solution, so instead you can add the following to your ebuilds: 1506# solution, so instead you can add the following to your ebuilds:
1491# 1507#
1522 1538
1523 ewarn "An old version of an installed library was detected on your system." 1539 ewarn "An old version of an installed library was detected on your system."
1524 ewarn "In order to avoid breaking packages that link against it, this older version" 1540 ewarn "In order to avoid breaking packages that link against it, this older version"
1525 ewarn "is not being removed. In order to make full use of this newer version," 1541 ewarn "is not being removed. In order to make full use of this newer version,"
1526 ewarn "you will need to execute the following command:" 1542 ewarn "you will need to execute the following command:"
1527 ewarn " revdep-rebuild --soname ${SONAME}" 1543 ewarn " revdep-rebuild --library ${SONAME}"
1528 ewarn 1544 ewarn
1529 ewarn "After doing that, you can safely remove ${LIB}" 1545 ewarn "After doing that, you can safely remove ${LIB}"
1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1546 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1531 fi 1547 fi
1532} 1548}
1545 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1561 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1546 1562
1547 local PKG=$(best_version $1) 1563 local PKG=$(best_version $1)
1548 shift 1564 shift
1549 1565
1550 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1566 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1567
1568 # if the USE file doesnt exist, assume the $PKG is either
1569 # injected or package.provided
1551 [[ ! -e ${USEFILE} ]] && return 1 1570 [[ ! -e ${USEFILE} ]] && return 0
1552 1571
1553 local USE_BUILT=$(<${USEFILE}) 1572 local USE_BUILT=$(<${USEFILE})
1554 while [[ $# -gt 0 ]] ; do 1573 while [[ $# -gt 0 ]] ; do
1555 if [[ ${opt} = "-o" ]] ; then 1574 if [[ ${opt} = "-o" ]] ; then
1556 has $1 ${USE_BUILT} && return 0 1575 has $1 ${USE_BUILT} && return 0
1613 # We don't want to quote ${bin} so that people can pass complex 1632 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args" 1633 # things as $bin ... "./someprog --args"
1615 cat << EOF > "${tmpwrapper}" 1634 cat << EOF > "${tmpwrapper}"
1616#!/bin/sh 1635#!/bin/sh
1617cd "${chdir:-.}" 1636cd "${chdir:-.}"
1637if [ -n "${libdir}" ] ; then
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1638 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1639 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1640 else
1641 export LD_LIBRARY_PATH="${libdir}"
1642 fi
1620fi 1643fi
1621exec ${bin} "\$@" 1644exec ${bin} "\$@"
1622EOF 1645EOF
1623 chmod go+rx "${tmpwrapper}" 1646 chmod go+rx "${tmpwrapper}"
1624 if [[ -n ${path} ]] ; then 1647 if [[ -n ${path} ]] ; then

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

  ViewVC Help
Powered by ViewVC 1.1.20