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

Diff of /eclass/eutils.eclass

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

Revision 1.291 Revision 1.324
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2009 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.291 2007/10/10 20:34:08 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50} 50}
51 51
52# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs]
54# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD.
57ecvs_clean() {
58 [[ -z $* ]] && set -- .
59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
61}
62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
72
73# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`]
75# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior.
77# Since changing shell options can easily break other pieces of code (which
78# assume the default state), eshopts_push is used to (1) push the current shell
79# options onto a stack and (2) pass the specified arguments to set.
80#
81# A common example is to disable shell globbing so that special meaning/care
82# may be used with variables/arguments to custom functions. That would be:
83# @CODE
84# eshopts_push -o noglob
85# for x in ${foo} ; do
86# if ...some check... ; then
87# eshopts_pop
88# return 0
89# fi
90# done
91# eshopts_pop
92# @CODE
93eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]}
97 __ESHOPTS_SAVE__[$i]=$-
98 [[ $# -eq 0 ]] && return 0
99 set "$@" || die "eshopts_push: bad options to set: $*"
100}
101
102# @FUNCTION: eshopts_pop
103# @USAGE:
104# @DESCRIPTION:
105# Restore the shell options to the state saved with the corresponding
106# eshopts_push call. See that function for more details.
107eshopts_pop() {
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __ESHOPTS_SAVE__[$i]
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
115}
116
52# Default directory where patches are located 117# Default directory where patches are located
53EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 119# Default extension for patches
55EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
56# Default options for patch 121# Default options for patch
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
59# Set -E to automatically remove empty files. 124# Set -E to automatically remove empty files.
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 125EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
61# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Note this is only file names,
62# and not the full path .. 127# and not the full path ..
63EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
64# Change the printed message for a single patch. 129# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
66# Change the printed message for multiple patches. 131# Change the printed message for multiple patches.
84# bug they should be left as is to ensure an ebuild can rely on 149# bug they should be left as is to ensure an ebuild can rely on
85# them for. 150# them for.
86# 151#
87# Patches are applied in current directory. 152# Patches are applied in current directory.
88# 153#
89# Bulk Patches should preferibly have the form of: 154# Bulk Patches should preferably have the form of:
90# 155#
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 156# ??_${ARCH}_foo.${EPATCH_SUFFIX}
92# 157#
93# For example: 158# For example:
94# 159#
143 local EPATCH_SOURCE="$1/*" 208 local EPATCH_SOURCE="$1/*"
144 else 209 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
146 fi 211 fi
147 else 212 else
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 213 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
149 then
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 214 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
151 then 215 then
152 EPATCH_SOURCE="$1" 216 EPATCH_SOURCE="$1"
153 fi 217 fi
154 218
163 227
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 228 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi 229 fi
166 230
167 case ${EPATCH_SUFFIX##*\.} in 231 case ${EPATCH_SUFFIX##*\.} in
232 xz)
233 PIPE_CMD="xz -dc"
234 PATCH_SUFFIX="xz"
235 ;;
236 lzma)
237 PIPE_CMD="lzma -dc"
238 PATCH_SUFFIX="lzma"
239 ;;
168 bz2) 240 bz2)
169 PIPE_CMD="bzip2 -dc" 241 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2" 242 PATCH_SUFFIX="bz2"
171 ;; 243 ;;
172 gz|Z|z) 244 gz|Z|z)
222 fi 294 fi
223 295
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226 298
299 # Decompress the patch if need be
300 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
301 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303
304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
305 echo
306 eerror "Could not extract patch!"
307 #die "Could not extract patch!"
308 count=5
309 break
310 fi
311 else
312 PATCH_TARGET="${x}"
313 fi
314
315 # Check for absolute paths in patches. If sandbox is disabled,
316 # people could (accidently) patch files in the root filesystem.
317 # Or trigger other unpleasantries #237667. So disallow -p0 on
318 # such patches.
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then
321 count=1
322 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 fi
325
227 # Allow for prefix to differ ... im lazy, so shoot me :/ 326 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ] 327 while [ "${count}" -lt 5 ]
229 do 328 do
230 # Generate some useful debug info ... 329 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 330 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233 332
234 if [ "${PATCH_SUFFIX}" != "patch" ]
235 then
236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
238 else
239 PATCH_TARGET="${x}"
240 fi
241
242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 333 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 334 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244 335
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 337 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
247
248 if [ "${PATCH_SUFFIX}" != "patch" ]
249 then
250 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
251 then
252 echo
253 eerror "Could not extract patch!"
254 #die "Could not extract patch!"
255 count=5
256 break
257 fi
258 fi
259 338
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 339 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then 340 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 341 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 342 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 done 390 done
312 if [ "${SINGLE_PATCH}" = "no" ] 391 if [ "${SINGLE_PATCH}" = "no" ]
313 then 392 then
314 einfo "Done with patching" 393 einfo "Done with patching"
315 fi 394 fi
395}
396epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options"
398
399 # don't clobber any EPATCH vars that the parent might want
400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
402 EPATCH_SOURCE=${base}/${CTARGET}/${check}
403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
405 if [[ -d ${EPATCH_SOURCE} ]] ; then
406 EPATCH_SOURCE=${EPATCH_SOURCE} \
407 EPATCH_SUFFIX="patch" \
408 EPATCH_FORCE="yes" \
409 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
410 epatch
411 break
412 fi
413 done
316} 414}
317 415
318# @FUNCTION: emktemp 416# @FUNCTION: emktemp
319# @USAGE: [temp dir] 417# @USAGE: [temp dir]
320# @DESCRIPTION: 418# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 454# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 455# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 456# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 457# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 458# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 459# Small wrapper for getent (Linux),
460# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 461# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 462egetent() {
364 case ${CHOST} in 463 case ${CHOST} in
365 *-darwin*) 464 *-darwin[678])
366 case "$2" in 465 case "$2" in
367 *[!0-9]*) # Non numeric 466 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 467 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 468 ;;
370 *) # Numeric 469 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 470 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
471 ;;
472 esac
473 ;;
474 *-darwin*)
475 local mytype=$1
476 [[ "passwd" == $mytype ]] && mytype="Users"
477 [[ "group" == $mytype ]] && mytype="Groups"
478 case "$2" in
479 *[!0-9]*) # Non numeric
480 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
481 ;;
482 *) # Numeric
483 local mykey="UniqueID"
484 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
485 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 486 ;;
373 esac 487 esac
374 ;; 488 ;;
375 *-freebsd*|*-dragonfly*) 489 *-freebsd*|*-dragonfly*)
376 local opts action="user" 490 local opts action="user"
576 fi 690 fi
577 ;; 691 ;;
578 692
579 *) 693 *)
580 if [[ -z $@ ]] ; then 694 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 695 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 696 -c "added by portage for ${PN}" \
697 ${euser} \
583 || die "enewuser failed" 698 || die "enewuser failed"
584 else 699 else
585 einfo " - Extra: $@" 700 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 701 useradd ${opts} "$@" \
702 ${euser} \
587 || die "enewuser failed" 703 || die "enewuser failed"
588 fi 704 fi
589 ;; 705 ;;
590 esac 706 esac
591 707
739make_desktop_entry() { 855make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 856 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 857
742 local exec=${1} 858 local exec=${1}
743 local name=${2:-${PN}} 859 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 860 local icon=${3:-${PN}}
745 local type=${4} 861 local type=${4}
746 local path=${5} 862 local path=${5}
747 863
748 if [[ -z ${type} ]] ; then 864 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 865 local catmaj=${CATEGORY%%-*}
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 989 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 990 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 991
876 cat <<-EOF > "${desktop}" 992 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 993 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 994 Name=${name}
881 Type=Application 995 Type=Application
882 Comment=${DESCRIPTION} 996 Comment=${DESCRIPTION}
883 Exec=${exec} 997 Exec=${exec}
884 TryExec=${exec%% *} 998 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 999 Icon=${icon}
887 Categories=${type}; 1000 Categories=${type};
888 EOF 1001 EOF
1002
1003 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 1004
890 ( 1005 (
891 # wrap the env here so that the 'insinto' call 1006 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1007 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1008 insinto /usr/share/applications
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1037 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1038 fi
924} 1039}
925 1040
926# @FUNCTION: make_session_desktop 1041# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1042# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1043# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1044# Make a GDM/KDM Session file. The title is the file to execute to start the
930# Window Manager. The command is the name of the Window Manager. 1045# Window Manager. The command is the name of the Window Manager.
1046#
1047# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1048make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1049 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
933 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1050 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1051
935 local title=$1 1052 local title=$1
936 local command=$2 1053 local command=$2
937 local desktop=${T}/${wm}.desktop 1054 local desktop=${T}/${wm:-${PN}}.desktop
1055 shift 2
938 1056
939 cat <<-EOF > "${desktop}" 1057 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1058 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1059 Name=${title}
943 Comment=This session logs you into ${title} 1060 Comment=This session logs you into ${title}
944 Exec=${command} 1061 Exec=${command} $*
945 TryExec=${command} 1062 TryExec=${command}
946 Type=Application 1063 Type=XSession
947 EOF 1064 EOF
948 1065
949 ( 1066 (
950 # wrap the env here so that the 'insinto' call 1067 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1068 # doesn't corrupt the env of the caller
1263 lic="${PWD}/${lic}" 1380 lic="${PWD}/${lic}"
1264 elif [ -e "${lic}" ] ; then 1381 elif [ -e "${lic}" ] ; then
1265 lic="${lic}" 1382 lic="${lic}"
1266 fi 1383 fi
1267 fi 1384 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1385 local l="`basename ${lic}`"
1270 1386
1271 # here is where we check for the licenses the user already 1387 # here is where we check for the licenses the user already
1272 # accepted ... if we don't find a match, we make the user accept 1388 # accepted ... if we don't find a match, we make the user accept
1273 local shopts=$-
1274 local alic 1389 local alic
1275 set -o noglob #so that bash doesn't expand "*" 1390 eshopts_push -o noglob # so that bash doesn't expand "*"
1276 for alic in ${ACCEPT_LICENSE} ; do 1391 for alic in ${ACCEPT_LICENSE} ; do
1277 if [[ ${alic} == ${l} ]]; then 1392 if [[ ${alic} == ${l} ]]; then
1278 set +o noglob; set -${shopts} #reset old shell opts 1393 eshopts_pop
1279 return 0 1394 return 0
1280 fi 1395 fi
1281 done 1396 done
1282 set +o noglob; set -$shopts #reset old shell opts 1397 eshopts_pop
1398 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1283 1399
1284 local licmsg=$(emktemp) 1400 local licmsg=$(emktemp)
1285 cat <<-EOF > ${licmsg} 1401 cat <<-EOF > ${licmsg}
1286 ********************************************************** 1402 **********************************************************
1287 The following license outlines the terms of use of this 1403 The following license outlines the terms of use of this
1456# displayed and we'll hang out here until: 1572# displayed and we'll hang out here until:
1457# (1) the file is found on a mounted cdrom 1573# (1) the file is found on a mounted cdrom
1458# (2) the user hits CTRL+C 1574# (2) the user hits CTRL+C
1459_cdrom_locate_file_on_cd() { 1575_cdrom_locate_file_on_cd() {
1460 local mline="" 1576 local mline=""
1461 local showedmsg=0 1577 local showedmsg=0 showjolietmsg=0
1462 1578
1463 while [[ -z ${CDROM_ROOT} ]] ; do 1579 while [[ -z ${CDROM_ROOT} ]] ; do
1464 local i=0 1580 local i=0
1465 local -a cdset=(${*//:/ }) 1581 local -a cdset=(${*//:/ })
1466 if [[ -n ${CDROM_SET} ]] ; then 1582 if [[ -n ${CDROM_SET} ]] ; then
1475 while read point node fs foo ; do 1591 while read point node fs foo ; do
1476 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1592 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1477 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1593 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1478 && continue 1594 && continue
1479 point=${point//\040/ } 1595 point=${point//\040/ }
1596 [[ ! -d ${point}/${dir} ]] && continue
1480 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1597 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1481 export CDROM_ROOT=${point} 1598 export CDROM_ROOT=${point}
1482 export CDROM_SET=${i} 1599 export CDROM_SET=${i}
1483 export CDROM_MATCH=${cdset[${i}]} 1600 export CDROM_MATCH=${cdset[${i}]}
1484 return 1601 return
1506 showedmsg=1 1623 showedmsg=1
1507 fi 1624 fi
1508 einfo "Press return to scan for the cd again" 1625 einfo "Press return to scan for the cd again"
1509 einfo "or hit CTRL+C to abort the emerge." 1626 einfo "or hit CTRL+C to abort the emerge."
1510 echo 1627 echo
1628 if [[ ${showjolietmsg} -eq 0 ]] ; then
1629 showjolietmsg=1
1630 else
1511 einfo "If you are having trouble with the detection" 1631 ewarn "If you are having trouble with the detection"
1512 einfo "of your CD, it is possible that you do not have" 1632 ewarn "of your CD, it is possible that you do not have"
1513 einfo "Joliet support enabled in your kernel. Please" 1633 ewarn "Joliet support enabled in your kernel. Please"
1514 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1634 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1635 ebeep 5
1636 fi
1515 read || die "something is screwed with your system" 1637 read || die "something is screwed with your system"
1516 done 1638 done
1517} 1639}
1518 1640
1519# @FUNCTION: strip-linguas 1641# @FUNCTION: strip-linguas
1528# of the lists. 1650# of the lists.
1529strip-linguas() { 1651strip-linguas() {
1530 local ls newls nols 1652 local ls newls nols
1531 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1653 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1532 local op=$1; shift 1654 local op=$1; shift
1533 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1655 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1534 local d f 1656 local d f
1535 for d in "$@" ; do 1657 for d in "$@" ; do
1536 if [[ ${op} == "-u" ]] ; then 1658 if [[ ${op} == "-u" ]] ; then
1537 newls=${ls} 1659 newls=${ls}
1538 else 1660 else
1539 newls="" 1661 newls=""
1540 fi 1662 fi
1541 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1663 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1542 if [[ ${op} == "-i" ]] ; then 1664 if [[ ${op} == "-i" ]] ; then
1543 hasq ${f} ${ls} && newls="${newls} ${f}" 1665 hasq ${f} ${ls} && newls="${newls} ${f}"
1544 else 1666 else
1545 hasq ${f} ${ls} || newls="${newls} ${f}" 1667 hasq ${f} ${ls} || newls="${newls} ${f}"
1546 fi 1668 fi
1559 else 1681 else
1560 nols="${nols} ${f}" 1682 nols="${nols} ${f}"
1561 fi 1683 fi
1562 done 1684 done
1563 [[ -n ${nols} ]] \ 1685 [[ -n ${nols} ]] \
1564 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1686 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1565 export LINGUAS=${newls:1} 1687 export LINGUAS=${newls:1}
1566} 1688}
1567 1689
1568# @FUNCTION: preserve_old_lib 1690# @FUNCTION: preserve_old_lib
1569# @USAGE: <libs to preserve> [more libs] 1691# @USAGE: <libs to preserve> [more libs]
1579 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1701 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1580 die "Invalid preserve_old_lib() usage" 1702 die "Invalid preserve_old_lib() usage"
1581 fi 1703 fi
1582 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1704 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1583 1705
1706 # let portage worry about it
1707 has preserve-libs ${FEATURES} && return 0
1708
1584 local lib dir 1709 local lib dir
1585 for lib in "$@" ; do 1710 for lib in "$@" ; do
1586 [[ -e ${ROOT}/${lib} ]] || continue 1711 [[ -e ${ROOT}/${lib} ]] || continue
1587 dir=${lib%/*} 1712 dir=${lib%/*}
1588 dodir ${dir} || die "dodir ${dir} failed" 1713 dodir ${dir} || die "dodir ${dir} failed"
1598preserve_old_lib_notify() { 1723preserve_old_lib_notify() {
1599 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1724 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1600 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1725 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1601 die "Invalid preserve_old_lib_notify() usage" 1726 die "Invalid preserve_old_lib_notify() usage"
1602 fi 1727 fi
1728
1729 # let portage worry about it
1730 has preserve-libs ${FEATURES} && return 0
1603 1731
1604 local lib notice=0 1732 local lib notice=0
1605 for lib in "$@" ; do 1733 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1734 [[ -e ${ROOT}/${lib} ]] || continue
1607 if [[ ${notice} -eq 0 ]] ; then 1735 if [[ ${notice} -eq 0 ]] ; then
1616 ewarn " # revdep-rebuild --library ${lib##*/}" 1744 ewarn " # revdep-rebuild --library ${lib##*/}"
1617 done 1745 done
1618 if [[ ${notice} -eq 1 ]] ; then 1746 if [[ ${notice} -eq 1 ]] ; then
1619 ewarn 1747 ewarn
1620 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1748 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1621 ewarn "delete the old libraries." 1749 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1750 for lib in "$@" ; do
1751 ewarn " # rm '${lib}'"
1752 done
1622 fi 1753 fi
1623} 1754}
1624 1755
1625# @FUNCTION: built_with_use 1756# @FUNCTION: built_with_use
1626# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1757# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1631# --missing option controls the behavior if called on a package that does 1762# --missing option controls the behavior if called on a package that does
1632# not actually support the defined USE flags (aka listed in IUSE). 1763# not actually support the defined USE flags (aka listed in IUSE).
1633# The default is to abort (call die). The -a and -o flags control 1764# The default is to abort (call die). The -a and -o flags control
1634# the requirements of the USE flags. They correspond to "and" and "or" 1765# the requirements of the USE flags. They correspond to "and" and "or"
1635# logic. So the -a flag means all listed USE flags must be enabled 1766# logic. So the -a flag means all listed USE flags must be enabled
1636# while the -o flag means at least one of the listed fIUSE flags must be 1767# while the -o flag means at least one of the listed IUSE flags must be
1637# enabled. The --hidden option is really for internal use only as it 1768# enabled. The --hidden option is really for internal use only as it
1638# means the USE flag we're checking is hidden expanded, so it won't be found 1769# means the USE flag we're checking is hidden expanded, so it won't be found
1639# in IUSE like normal USE flags. 1770# in IUSE like normal USE flags.
1640# 1771#
1641# Remember that this function isn't terribly intelligent so order of optional 1772# Remember that this function isn't terribly intelligent so order of optional
1676 die) die "Unable to determine what USE flags $PKG was built with";; 1807 die) die "Unable to determine what USE flags $PKG was built with";;
1677 esac 1808 esac
1678 fi 1809 fi
1679 1810
1680 if [[ ${hidden} == "no" ]] ; then 1811 if [[ ${hidden} == "no" ]] ; then
1681 local IUSE_BUILT=$(<${IUSEFILE}) 1812 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1682 # Don't check USE_EXPAND #147237 1813 # Don't check USE_EXPAND #147237
1683 local expand 1814 local expand
1684 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1815 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1685 if [[ $1 == ${expand}_* ]] ; then 1816 if [[ $1 == ${expand}_* ]] ; then
1686 expand="" 1817 expand=""
1687 break 1818 break
1688 fi 1819 fi
1689 done 1820 done
1690 if [[ -n ${expand} ]] ; then 1821 if [[ -n ${expand} ]] ; then
1691 if ! has $1 ${IUSE_BUILT} ; then 1822 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1692 case ${missing_action} in 1823 case ${missing_action} in
1693 true) return 0;; 1824 true) return 0;;
1694 false) return 1;; 1825 false) return 1;;
1695 die) die "$PKG does not actually support the $1 USE flag!";; 1826 die) die "$PKG does not actually support the $1 USE flag!";;
1696 esac 1827 esac
1720epunt_cxx() { 1851epunt_cxx() {
1721 local dir=$1 1852 local dir=$1
1722 [[ -z ${dir} ]] && dir=${S} 1853 [[ -z ${dir} ]] && dir=${S}
1723 ebegin "Removing useless C++ checks" 1854 ebegin "Removing useless C++ checks"
1724 local f 1855 local f
1725 for f in $(find ${dir} -name configure) ; do 1856 find "${dir}" -name configure | while read f ; do
1726 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1857 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1727 done 1858 done
1728 eend 0 1859 eend 0
1729} 1860}
1730 1861
1731# @FUNCTION: make_wrapper 1862# @FUNCTION: make_wrapper
1732# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1863# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1733# @DESCRIPTION: 1864# @DESCRIPTION:
1734# Create a shell wrapper script named wrapper in installpath 1865# Create a shell wrapper script named wrapper in installpath
1735# (defaults to the bindir) to execute target (default of wrapper) by 1866# (defaults to the bindir) to execute target (default of wrapper) by
1736# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1867# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1737# libpaths followed by optionally changing directory to chdir. 1868# libpaths followed by optionally changing directory to chdir.
1760 ) || die 1891 ) || die
1761 else 1892 else
1762 newbin "${tmpwrapper}" "${wrapper}" || die 1893 newbin "${tmpwrapper}" "${wrapper}" || die
1763 fi 1894 fi
1764} 1895}
1896
1897# @FUNCTION: prepalldocs
1898# @USAGE:
1899# @DESCRIPTION:
1900# Compress files in /usr/share/doc which are not already
1901# compressed, excluding /usr/share/doc/${PF}/html.
1902# Uses the ecompressdir to do the compression.
1903# 2009-02-18 by betelgeuse:
1904# Commented because ecompressdir is even more internal to
1905# Portage than prepalldocs (it's not even mentioned in man 5
1906# ebuild). Please submit a better version for review to gentoo-dev
1907# if you want prepalldocs here.
1908#prepalldocs() {
1909# if [[ -n $1 ]] ; then
1910# ewarn "prepalldocs: invalid usage; takes no arguments"
1911# fi
1912
1913# cd "${D}"
1914# [[ -d usr/share/doc ]] || return 0
1915
1916# find usr/share/doc -exec gzip {} +
1917# ecompressdir --ignore /usr/share/doc/${PF}/html
1918# ecompressdir --queue /usr/share/doc
1919#}

Legend:
Removed from v.1.291  
changed lines
  Added in v.1.324

  ViewVC Help
Powered by ViewVC 1.1.20