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

Diff of /eclass/eutils.eclass

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

Revision 1.315 Revision 1.345
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.315 2009/02/21 23:28:21 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.345 2010/06/23 21:24:50 cardoe 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
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
52# @FUNCTION: ecvs_clean 66# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 67# @USAGE: [list of dirs]
54# @DESCRIPTION: 68# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 69# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 70# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 82esvn_clean() {
69 [[ -z $* ]] && set -- . 83 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 84 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 85}
72 86
73# Default directory where patches are located 87# @FUNCTION: eshopts_push
88# @USAGE: [options to `set` or `shopt`]
89# @DESCRIPTION:
90# Often times code will want to enable a shell option to change code behavior.
91# Since changing shell options can easily break other pieces of code (which
92# assume the default state), eshopts_push is used to (1) push the current shell
93# options onto a stack and (2) pass the specified arguments to set.
94#
95# If the first argument is '-s' or '-u', we assume you want to call `shopt`
96# rather than `set` as there are some options only available via that.
97#
98# A common example is to disable shell globbing so that special meaning/care
99# may be used with variables/arguments to custom functions. That would be:
100# @CODE
101# eshopts_push -o noglob
102# for x in ${foo} ; do
103# if ...some check... ; then
104# eshopts_pop
105# return 0
106# fi
107# done
108# eshopts_pop
109# @CODE
110eshopts_push() {
111 # have to assume __ESHOPTS_SAVE__ isn't screwed with
112 # as a `declare -a` here will reset its value
113 local i=${#__ESHOPTS_SAVE__[@]}
114 if [[ $1 == -[su] ]] ; then
115 __ESHOPTS_SAVE__[$i]=$(shopt -p)
116 [[ $# -eq 0 ]] && return 0
117 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
118 else
119 __ESHOPTS_SAVE__[$i]=$-
120 [[ $# -eq 0 ]] && return 0
121 set "$@" || die "eshopts_push: bad options to set: $*"
122 fi
123}
124
125# @FUNCTION: eshopts_pop
126# @USAGE:
127# @DESCRIPTION:
128# Restore the shell options to the state saved with the corresponding
129# eshopts_push call. See that function for more details.
130eshopts_pop() {
131 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
132 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
133 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
134 local s=${__ESHOPTS_SAVE__[$i]}
135 unset __ESHOPTS_SAVE__[$i]
136 if [[ ${s} == "shopt -"* ]] ; then
137 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
138 else
139 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
140 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
141 fi
142}
143
144# @VARIABLE: EPATCH_SOURCE
145# @DESCRIPTION:
146# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 147EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 148# @VARIABLE: EPATCH_SUFFIX
149# @DESCRIPTION:
150# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 151EPATCH_SUFFIX="patch.bz2"
152# @VARIABLE: EPATCH_OPTS
153# @DESCRIPTION:
77# Default options for patch 154# Default options for patch:
155# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 156# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 157# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 158# -E - automatically remove empty files
159# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 160EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
161# @VARIABLE: EPATCH_EXCLUDE
162# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 163# List of patches not to apply. Note this is only file names,
83# and not the full path .. 164# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 165EPATCH_EXCLUDE=""
166# @VARIABLE: EPATCH_SINGLE_MSG
167# @DESCRIPTION:
85# Change the printed message for a single patch. 168# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 169EPATCH_SINGLE_MSG=""
170# @VARIABLE: EPATCH_MULTI_MSG
171# @DESCRIPTION:
87# Change the printed message for multiple patches. 172# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 173EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 174# @VARIABLE: EPATCH_FORCE
90# 175# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 176# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 177# arch naming style.
93EPATCH_FORCE="no" 178EPATCH_FORCE="no"
94 179
95# This function is for bulk patching, or in theory for just one 180# @FUNCTION: epatch
96# or two patches. 181# @USAGE: [patches] [dirs of patches]
182# @DESCRIPTION:
183# epatch is designed to greatly simplify the application of patches. It can
184# process patch files directly, or directories of patches. The patches may be
185# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
186# the -p option as epatch will automatically attempt -p0 to -p5 until things
187# apply successfully.
97# 188#
98# It should work with .bz2, .gz, .zip and plain text patches. 189# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 190# specified by EPATCH_SOURCE.
100# 191#
101# You do not have to specify '-p' option to patch, as it will 192# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 193# @CODE
103# 194# ${EPATCH_FORCE} == "yes"
104# Above EPATCH_* variables can be used to control various defaults,
105# bug they should be left as is to ensure an ebuild can rely on
106# them for.
107#
108# Patches are applied in current directory.
109#
110# Bulk Patches should preferably have the form of:
111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 195# ??_${ARCH}_foo.${EPATCH_SUFFIX}
196# else
197# *.${EPATCH_SUFFIX}
198# @CODE
199# The leading ?? are typically numbers used to force consistent patch ordering.
200# The arch field is used to apply patches only for the host architecture with
201# the special value of "all" means apply for everyone. Note that using values
202# other than "all" is highly discouraged -- you should apply patches all the
203# time and let architecture details be detected at configure/compile time.
113# 204#
114# For example: 205# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
206# for patches to apply.
115# 207#
116# 01_all_misc-fix.patch.bz2 208# Refer to the other EPATCH_xxx variables for more customization of behavior.
117# 02_sparc_another-fix.patch.bz2
118#
119# This ensures that there are a set order, and you can have ARCH
120# specific patches.
121#
122# If you however give an argument to epatch(), it will treat it as a
123# single patch that need to be applied if its a file. If on the other
124# hand its a directory, it will set EPATCH_SOURCE to this.
125#
126# <azarah@gentoo.org> (10 Nov 2002)
127#
128epatch() { 209epatch() {
129 _epatch_draw_line() { 210 _epatch_draw_line() {
211 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 212 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 213 echo "${1//?/=}"
132 } 214 }
133 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
134 local PIPE_CMD=""
135 local STDERR_TARGET="${T}/$$.out"
136 local PATCH_TARGET="${T}/$$.patch"
137 local PATCH_SUFFIX=""
138 local SINGLE_PATCH="no"
139 local x=""
140 215
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 216 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 217
143 if [ "$#" -gt 1 ] 218 # Let the rest of the code process one user arg at a time --
144 then 219 # each arg may expand into multiple patches, and each arg may
220 # need to start off with the default global EPATCH_xxx values
221 if [[ $# -gt 1 ]] ; then
145 local m="" 222 local m
146 for m in "$@" ; do 223 for m in "$@" ; do
147 epatch "${m}" 224 epatch "${m}"
148 done 225 done
149 return 0 226 return 0
150 fi 227 fi
151 228
152 if [ -n "$1" -a -f "$1" ] 229 local SINGLE_PATCH="no"
153 then 230 # no args means process ${EPATCH_SOURCE}
231 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
232
233 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 234 SINGLE_PATCH="yes"
155 235 set -- "$1"
156 local EPATCH_SOURCE="$1" 236 # Use the suffix from the single patch (localize it); the code
237 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 238 local EPATCH_SUFFIX=$1
158 239
159 elif [ -n "$1" -a -d "$1" ] 240 elif [[ -d $1 ]] ; then
160 then 241 # Some people like to make dirs of patches w/out suffixes (vim)
161 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 243
244 else
245 # sanity check ... if it isn't a dir or file, wtf man ?
246 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
247 echo
248 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
249 eerror
250 eerror " ${EPATCH_SOURCE}"
251 eerror " ( ${EPATCH_SOURCE##*/} )"
252 echo
253 die "Cannot find \$EPATCH_SOURCE!"
254 fi
255
256 local PIPE_CMD
257 case ${EPATCH_SUFFIX##*\.} in
258 xz) PIPE_CMD="xz -dc" ;;
259 lzma) PIPE_CMD="lzma -dc" ;;
260 bz2) PIPE_CMD="bzip2 -dc" ;;
261 gz|Z|z) PIPE_CMD="gzip -dc" ;;
262 ZIP|zip) PIPE_CMD="unzip -p" ;;
263 *) ;;
264 esac
265
266 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
267
268 local x
269 for x in "$@" ; do
270 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
271 # didn't match anything, ignore continue on
272 [[ ! -f ${x} ]] && continue
273
274 local patchname=${x##*/}
275
276 # Apply single patches, or forced sets of patches, or
277 # patches with ARCH dependant names.
278 # ???_arch_foo.patch
279 # Else, skip this input altogether
280 local a=${patchname#*_} # strip the ???_
281 a=${a%%_*} # strip the _foo.patch
282 if ! [[ ${SINGLE_PATCH} == "yes" || \
283 ${EPATCH_FORCE} == "yes" || \
284 ${a} == all || \
285 ${a} == ${ARCH} ]]
163 then 286 then
164 local EPATCH_SOURCE="$1/*" 287 continue
288 fi
289
290 # Let people filter things dynamically
291 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
292 # let people use globs in the exclude
293 eshopts_push -o noglob
294
295 local ex
296 for ex in ${EPATCH_EXCLUDE} ; do
297 if [[ ${patchname} == ${ex} ]] ; then
298 eshopts_pop
299 continue 2
300 fi
301 done
302
303 eshopts_pop
304 fi
305
306 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
307 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
308 einfo "${EPATCH_SINGLE_MSG}"
309 else
310 einfo "Applying ${patchname} ..."
311 fi
165 else 312 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 313 einfo " ${patchname} ..."
167 fi 314 fi
168 else 315
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 316 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 317 # but if there are more, make sure we get unique log filenames
171 then 318 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 319 if [[ -e ${STDERR_TARGET} ]] ; then
320 STDERR_TARGET="${T}/${patchname}-$$.out"
321 fi
322
323 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
324
325 # Decompress the patch if need be
326 local count=0
327 local PATCH_TARGET
328 if [[ -n ${PIPE_CMD} ]] ; then
329 PATCH_TARGET="${T}/$$.patch"
330 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
331
332 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
333 echo
334 eerror "Could not extract patch!"
335 #die "Could not extract patch!"
336 count=5
337 break
173 fi 338 fi
339 else
340 PATCH_TARGET=${x}
341 fi
174 342
343 # Check for absolute paths in patches. If sandbox is disabled,
344 # people could (accidently) patch files in the root filesystem.
345 # Or trigger other unpleasantries #237667. So disallow -p0 on
346 # such patches.
347 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
348 if [[ -n ${abs_paths} ]] ; then
349 count=1
350 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
351 fi
352
353 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
354 while [[ ${count} -lt 5 ]] ; do
355 # Generate some useful debug info ...
356 (
357 _epatch_draw_line "***** ${patchname} *****"
175 echo 358 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 359 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
360 echo
361 _epatch_draw_line "***** ${patchname} *****"
362 ) >> "${STDERR_TARGET}"
363
364 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
365 (
366 _epatch_draw_line "***** ${patchname} *****"
367 echo
368 echo "ACTUALLY APPLYING ${patchname} ..."
369 echo
370 _epatch_draw_line "***** ${patchname} *****"
371 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
372 ) >> "${STDERR_TARGET}"
373
374 if [ $? -ne 0 ] ; then
375 echo
376 eerror "A dry-run of patch command succeeded, but actually"
377 eerror "applying the patch failed!"
378 #die "Real world sux compared to the dreamworld!"
379 count=5
380 fi
381 break
382 fi
383
384 : $(( count++ ))
385 done
386
387 # if we had to decompress the patch, delete the temp one
388 if [[ -n ${PIPE_CMD} ]] ; then
389 rm -f "${PATCH_TARGET}"
390 fi
391
392 if [[ ${count} -ge 5 ]] ; then
393 echo
394 eerror "Failed Patch: ${patchname} !"
395 eerror " ( ${PATCH_TARGET} )"
177 eerror 396 eerror
178 eerror " ${EPATCH_SOURCE}" 397 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 398 eerror
399 eerror " ${STDERR_TARGET}"
180 echo 400 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
192 bz2)
193 PIPE_CMD="bzip2 -dc"
194 PATCH_SUFFIX="bz2"
195 ;;
196 gz|Z|z)
197 PIPE_CMD="gzip -dc"
198 PATCH_SUFFIX="gz"
199 ;;
200 ZIP|zip)
201 PIPE_CMD="unzip -p"
202 PATCH_SUFFIX="zip"
203 ;;
204 *)
205 PIPE_CMD="cat"
206 PATCH_SUFFIX="patch"
207 ;;
208 esac
209
210 if [ "${SINGLE_PATCH}" = "no" ]
211 then
212 einfo "${EPATCH_MULTI_MSG}"
213 fi
214 for x in ${EPATCH_SOURCE}
215 do
216 # New ARCH dependant patch naming scheme ...
217 #
218 # ???_arch_foo.patch
219 #
220 if [ -f ${x} ] && \
221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
222 [ "${EPATCH_FORCE}" = "yes" ])
223 then
224 local count=0
225 local popts="${EPATCH_OPTS}"
226 local patchname=${x##*/}
227
228 if [ -n "${EPATCH_EXCLUDE}" ]
229 then
230 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
231 then
232 continue
233 fi
234 fi
235
236 if [ "${SINGLE_PATCH}" = "yes" ]
237 then
238 if [ -n "${EPATCH_SINGLE_MSG}" ]
239 then
240 einfo "${EPATCH_SINGLE_MSG}"
241 else
242 einfo "Applying ${patchname} ..."
243 fi
244 else
245 einfo " ${patchname} ..."
246 fi
247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Check for absolute paths in patches. If sandbox is disabled,
268 # people could (accidently) patch files in the root filesystem.
269 # Or trigger other unpleasantries #237667. So disallow -p0 on
270 # such patches.
271 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
272 if [[ -n ${abs_paths} ]] ; then
273 count=1
274 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 fi
277
278 # Allow for prefix to differ ... im lazy, so shoot me :/
279 while [ "${count}" -lt 5 ]
280 do
281 # Generate some useful debug info ...
282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284
285 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290
291 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
292 then
293 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
295 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
298
299 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
300 _epatch_assert
301
302 if [ "$?" -ne 0 ]
303 then
304 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 echo
306 eerror "A dry-run of patch command succeeded, but actually"
307 eerror "applying the patch failed!"
308 #die "Real world sux compared to the dreamworld!"
309 count=5
310 fi
311
312 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313
314 break
315 fi
316
317 count=$((count + 1))
318 done
319
320 if [ "${PATCH_SUFFIX}" != "patch" ]
321 then
322 rm -f ${PATCH_TARGET}
323 fi
324
325 if [ "${count}" -eq 5 ]
326 then
327 echo
328 eerror "Failed Patch: ${patchname} !"
329 eerror " ( ${PATCH_TARGET} )"
330 eerror
331 eerror "Include in your bugreport the contents of:"
332 eerror
333 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
334 echo
335 die "Failed Patch: ${patchname}!" 401 die "Failed Patch: ${patchname}!"
336 fi 402 fi
337 403
338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 404 # if everything worked, delete the patch log
339 405 rm -f "${STDERR_TARGET}"
340 eend 0 406 eend 0
341 fi
342 done 407 done
343 if [ "${SINGLE_PATCH}" = "no" ] 408
344 then 409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
345 einfo "Done with patching" 410 : # everything worked
411}
412epatch_user() {
413 [[ $# -ne 0 ]] && die "epatch_user takes no options"
414
415 # don't clobber any EPATCH vars that the parent might want
416 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
417 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
418 EPATCH_SOURCE=${base}/${CTARGET}/${check}
419 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
420 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
421 if [[ -d ${EPATCH_SOURCE} ]] ; then
422 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch
427 break
346 fi 428 fi
429 done
347} 430}
348 431
349# @FUNCTION: emktemp 432# @FUNCTION: emktemp
350# @USAGE: [temp dir] 433# @USAGE: [temp dir]
351# @DESCRIPTION: 434# @DESCRIPTION:
392# Small wrapper for getent (Linux), 475# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), 476# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
394# and pw (FreeBSD) used in enewuser()/enewgroup() 477# and pw (FreeBSD) used in enewuser()/enewgroup()
395egetent() { 478egetent() {
396 case ${CHOST} in 479 case ${CHOST} in
480 *-darwin[678])
481 case "$2" in
482 *[!0-9]*) # Non numeric
483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
484 ;;
485 *) # Numeric
486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;;
488 esac
489 ;;
397 *-darwin9) 490 *-darwin*)
398 local mytype=$1 491 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users" 492 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups" 493 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in 494 case "$2" in
402 *[!0-9]*) # Non numeric 495 *[!0-9]*) # Non numeric
404 ;; 497 ;;
405 *) # Numeric 498 *) # Numeric
406 local mykey="UniqueID" 499 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID" 500 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null 501 dscl . -search /$mytype $mykey $2 2>/dev/null
409 ;;
410 esac
411 ;;
412 *-darwin*)
413 case "$2" in
414 *[!0-9]*) # Non numeric
415 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
416 ;;
417 *) # Numeric
418 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
419 ;; 502 ;;
420 esac 503 esac
421 ;; 504 ;;
422 *-freebsd*|*-dragonfly*) 505 *-freebsd*|*-dragonfly*)
423 local opts action="user" 506 local opts action="user"
623 fi 706 fi
624 ;; 707 ;;
625 708
626 *) 709 *)
627 if [[ -z $@ ]] ; then 710 if [[ -z $@ ]] ; then
628 useradd ${opts} ${euser} \ 711 useradd -r ${opts} \
629 -c "added by portage for ${PN}" \ 712 -c "added by portage for ${PN}" \
713 ${euser} \
630 || die "enewuser failed" 714 || die "enewuser failed"
631 else 715 else
632 einfo " - Extra: $@" 716 einfo " - Extra: $@"
633 useradd ${opts} ${euser} "$@" \ 717 useradd -r ${opts} "$@" \
718 ${euser} \
634 || die "enewuser failed" 719 || die "enewuser failed"
635 fi 720 fi
636 ;; 721 ;;
637 esac 722 esac
638 723
750 esac 835 esac
751 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 836 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
752 ;; 837 ;;
753 838
754 *) 839 *)
840 # We specify -r so that we get a GID in the system range from login.defs
755 groupadd ${opts} ${egroup} || die "enewgroup failed" 841 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
756 ;; 842 ;;
757 esac 843 esac
758 export SANDBOX_ON="${oldsandbox}" 844 export SANDBOX_ON="${oldsandbox}"
759} 845}
760 846
771 857
772# Make a desktop file ! 858# Make a desktop file !
773# Great for making those icons in kde/gnome startmenu ! 859# Great for making those icons in kde/gnome startmenu !
774# Amaze your friends ! Get the women ! Join today ! 860# Amaze your friends ! Get the women ! Join today !
775# 861#
776# make_desktop_entry(<command>, [name], [icon], [type], [path]) 862# make_desktop_entry(<command>, [name], [icon], [type], [fields])
777# 863#
778# binary: what command does the app run with ? 864# binary: what command does the app run with ?
779# name: the name that will show up in the menu 865# name: the name that will show up in the menu
780# icon: give your little like a pretty little icon ... 866# icon: give your little like a pretty little icon ...
781# this can be relative (to /usr/share/pixmaps) or 867# this can be relative (to /usr/share/pixmaps) or
782# a full path to an icon 868# a full path to an icon
783# type: what kind of application is this ? for categories: 869# type: what kind of application is this ? for categories:
784# http://standards.freedesktop.org/menu-spec/latest/apa.html 870# http://standards.freedesktop.org/menu-spec/latest/apa.html
785# path: if your app needs to startup in a specific dir 871# fields: extra fields to append to the desktop file; a printf string
786make_desktop_entry() { 872make_desktop_entry() {
787 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 873 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
788 874
789 local exec=${1} 875 local exec=${1}
790 local name=${2:-${PN}} 876 local name=${2:-${PN}}
791 local icon=${3:-${PN}} 877 local icon=${3:-${PN}}
792 local type=${4} 878 local type=${4}
793 local path=${5} 879 local fields=${5}
794 880
795 if [[ -z ${type} ]] ; then 881 if [[ -z ${type} ]] ; then
796 local catmaj=${CATEGORY%%-*} 882 local catmaj=${CATEGORY%%-*}
797 local catmin=${CATEGORY##*-} 883 local catmin=${CATEGORY##*-}
798 case ${catmaj} in 884 case ${catmaj} in
799 app) 885 app)
800 case ${catmin} in 886 case ${catmin} in
801 accessibility) type=Accessibility;; 887 accessibility) type=Accessibility;;
802 admin) type=System;; 888 admin) type=System;;
803 antivirus) type=System;; 889 antivirus) type=System;;
804 arch) type=Archiving;; 890 arch) type=Archiving;;
805 backup) type=Archiving;; 891 backup) type=Archiving;;
806 cdr) type=DiscBurning;; 892 cdr) type=DiscBurning;;
807 dicts) type=Dictionary;; 893 dicts) type=Dictionary;;
808 doc) type=Documentation;; 894 doc) type=Documentation;;
809 editors) type=TextEditor;; 895 editors) type=TextEditor;;
810 emacs) type=TextEditor;; 896 emacs) type=TextEditor;;
811 emulation) type=Emulator;; 897 emulation) type=Emulator;;
812 laptop) type=HardwareSettings;; 898 laptop) type=HardwareSettings;;
813 office) type=Office;; 899 office) type=Office;;
814 pda) type=PDA;; 900 pda) type=PDA;;
815 vim) type=TextEditor;; 901 vim) type=TextEditor;;
816 xemacs) type=TextEditor;; 902 xemacs) type=TextEditor;;
817 *) type=;;
818 esac 903 esac
819 ;; 904 ;;
820 905
821 dev) 906 dev)
822 type="Development" 907 type="Development"
823 ;; 908 ;;
824 909
825 games) 910 games)
826 case ${catmin} in 911 case ${catmin} in
827 action|fps) type=ActionGame;; 912 action|fps) type=ActionGame;;
828 arcade) type=ArcadeGame;; 913 arcade) type=ArcadeGame;;
829 board) type=BoardGame;; 914 board) type=BoardGame;;
830 emulation) type=Emulator;; 915 emulation) type=Emulator;;
831 kids) type=KidsGame;; 916 kids) type=KidsGame;;
832 puzzle) type=LogicGame;; 917 puzzle) type=LogicGame;;
833 roguelike) type=RolePlaying;; 918 roguelike) type=RolePlaying;;
834 rpg) type=RolePlaying;; 919 rpg) type=RolePlaying;;
835 simulation) type=Simulation;; 920 simulation) type=Simulation;;
836 sports) type=SportsGame;; 921 sports) type=SportsGame;;
837 strategy) type=StrategyGame;; 922 strategy) type=StrategyGame;;
838 *) type=;;
839 esac 923 esac
840 type="Game;${type}" 924 type="Game;${type}"
841 ;; 925 ;;
842 926
843 gnome) 927 gnome)
852 type="Network;Email" 936 type="Network;Email"
853 ;; 937 ;;
854 938
855 media) 939 media)
856 case ${catmin} in 940 case ${catmin} in
941 gfx)
857 gfx) type=Graphics;; 942 type=Graphics
943 ;;
944 *)
945 case ${catmin} in
858 radio) type=Tuner;; 946 radio) type=Tuner;;
859 sound) type=Audio;; 947 sound) type=Audio;;
860 tv) type=TV;; 948 tv) type=TV;;
861 video) type=Video;; 949 video) type=Video;;
862 *) type=;; 950 esac
951 type="AudioVideo;${type}"
952 ;;
863 esac 953 esac
864 type="AudioVideo;${type}"
865 ;; 954 ;;
866 955
867 net) 956 net)
868 case ${catmin} in 957 case ${catmin} in
869 dialup) type=Dialup;; 958 dialup) type=Dialup;;
870 ftp) type=FileTransfer;; 959 ftp) type=FileTransfer;;
871 im) type=InstantMessaging;; 960 im) type=InstantMessaging;;
872 irc) type=IRCClient;; 961 irc) type=IRCClient;;
873 mail) type=Email;; 962 mail) type=Email;;
874 news) type=News;; 963 news) type=News;;
875 nntp) type=News;; 964 nntp) type=News;;
876 p2p) type=FileTransfer;; 965 p2p) type=FileTransfer;;
877 *) type=;; 966 voip) type=Telephony;;
878 esac 967 esac
879 type="Network;${type}" 968 type="Network;${type}"
880 ;; 969 ;;
881 970
882 sci) 971 sci)
883 case ${catmin} in 972 case ${catmin} in
884 astro*) type=Astronomy;; 973 astro*) type=Astronomy;;
885 bio*) type=Biology;; 974 bio*) type=Biology;;
886 calc*) type=Calculator;; 975 calc*) type=Calculator;;
887 chem*) type=Chemistry;; 976 chem*) type=Chemistry;;
888 elec*) type=Electronics;; 977 elec*) type=Electronics;;
889 geo*) type=Geology;; 978 geo*) type=Geology;;
890 math*) type=Math;; 979 math*) type=Math;;
891 physics) type=Physics;; 980 physics) type=Physics;;
892 visual*) type=DataVisualization;; 981 visual*) type=DataVisualization;;
893 *) type=;;
894 esac 982 esac
895 type="Science;${type}" 983 type="Education;Science;${type}"
896 ;; 984 ;;
897 985
898 sys) 986 sys)
899 type="System" 987 type="System"
900 ;; 988 ;;
901 989
902 www) 990 www)
903 case ${catmin} in 991 case ${catmin} in
904 client) type=WebBrowser;; 992 client) type=WebBrowser;;
905 *) type=;;
906 esac 993 esac
907 type="Network" 994 type="Network;${type}"
908 ;; 995 ;;
909 996
910 *) 997 *)
911 type= 998 type=
912 ;; 999 ;;
918 local desktop_name="${PN}-${SLOT}" 1005 local desktop_name="${PN}-${SLOT}"
919 fi 1006 fi
920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1007 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1008 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
922 1009
1010 # Don't append another ";" when a valid category value is provided.
1011 type=${type%;}${type:+;}
1012
1013 eshopts_push -s extglob
1014 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1015 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1016 ewarn "allowed in .desktop files if the value is not an absolute path."
1017 icon=${icon%.@(xpm|png|svg)}
1018 fi
1019 eshopts_pop
1020
923 cat <<-EOF > "${desktop}" 1021 cat <<-EOF > "${desktop}"
924 [Desktop Entry] 1022 [Desktop Entry]
925 Version=1.0
926 Name=${name} 1023 Name=${name}
927 Type=Application 1024 Type=Application
928 Comment=${DESCRIPTION} 1025 Comment=${DESCRIPTION}
929 Exec=${exec} 1026 Exec=${exec}
930 TryExec=${exec%% *} 1027 TryExec=${exec%% *}
931 Icon=${icon} 1028 Icon=${icon}
932 Categories=${type}; 1029 Categories=${type}
933 EOF 1030 EOF
934 1031
935 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1032 if [[ ${fields:-=} != *=* ]] ; then
1033 # 5th arg used to be value to Path=
1034 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1035 fields="Path=${fields}"
1036 fi
1037 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
936 1038
937 ( 1039 (
938 # wrap the env here so that the 'insinto' call 1040 # wrap the env here so that the 'insinto' call
939 # doesn't corrupt the env of the caller 1041 # doesn't corrupt the env of the caller
940 insinto /usr/share/applications 1042 insinto /usr/share/applications
941 doins "${desktop}" 1043 doins "${desktop}"
942 ) 1044 ) || die "installing desktop file failed"
943} 1045}
944 1046
945# @FUNCTION: validate_desktop_entries 1047# @FUNCTION: validate_desktop_entries
946# @USAGE: [directories] 1048# @USAGE: [directories]
947# @MAINTAINER: 1049# @MAINTAINER:
1226 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1328 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1227 1329
1228 local shrtsrc=$(basename "${src}") 1330 local shrtsrc=$(basename "${src}")
1229 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1331 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1230 if [[ -z ${skip} ]] ; then 1332 if [[ -z ${skip} ]] ; then
1231 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1333 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1232 local skip=0 1334 local skip=0
1233 exe=tail 1335 exe=tail
1234 case ${ver} in 1336 case ${ver} in
1235 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1337 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1236 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1338 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1238 2.0|2.0.1) 1340 2.0|2.0.1)
1239 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1341 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1240 ;; 1342 ;;
1241 2.1.1) 1343 2.1.1)
1242 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1344 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1243 let skip="skip + 1" 1345 (( skip++ ))
1244 ;; 1346 ;;
1245 2.1.2) 1347 2.1.2)
1246 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1348 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1247 let skip="skip + 1" 1349 (( skip++ ))
1248 ;; 1350 ;;
1249 2.1.3) 1351 2.1.3)
1250 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1352 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1251 let skip="skip + 1" 1353 (( skip++ ))
1252 ;; 1354 ;;
1253 2.1.4|2.1.5) 1355 2.1.4|2.1.5)
1254 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1356 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1255 skip=$(head -n ${skip} "${src}" | wc -c) 1357 skip=$(head -n ${skip} "${src}" | wc -c)
1256 exe="dd" 1358 exe="dd"
1265 esac 1367 esac
1266 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1368 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1267 fi 1369 fi
1268 case ${exe} in 1370 case ${exe} in
1269 tail) exe="tail -n +${skip} '${src}'";; 1371 tail) exe="tail -n +${skip} '${src}'";;
1270 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1372 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1271 *) die "makeself cant handle exe '${exe}'" 1373 *) die "makeself cant handle exe '${exe}'"
1272 esac 1374 esac
1273 1375
1274 # lets grab the first few bytes of the file to figure out what kind of archive it is 1376 # lets grab the first few bytes of the file to figure out what kind of archive it is
1275 local tmpfile=$(emktemp) 1377 local tmpfile=$(emktemp)
1312 lic="${PWD}/${lic}" 1414 lic="${PWD}/${lic}"
1313 elif [ -e "${lic}" ] ; then 1415 elif [ -e "${lic}" ] ; then
1314 lic="${lic}" 1416 lic="${lic}"
1315 fi 1417 fi
1316 fi 1418 fi
1317 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1318 local l="`basename ${lic}`" 1419 local l="`basename ${lic}`"
1319 1420
1320 # here is where we check for the licenses the user already 1421 # here is where we check for the licenses the user already
1321 # accepted ... if we don't find a match, we make the user accept 1422 # accepted ... if we don't find a match, we make the user accept
1322 local shopts=$-
1323 local alic 1423 local alic
1324 set -o noglob #so that bash doesn't expand "*" 1424 eshopts_push -o noglob # so that bash doesn't expand "*"
1325 for alic in ${ACCEPT_LICENSE} ; do 1425 for alic in ${ACCEPT_LICENSE} ; do
1326 if [[ ${alic} == ${l} ]]; then 1426 if [[ ${alic} == ${l} ]]; then
1327 set +o noglob; set -${shopts} #reset old shell opts 1427 eshopts_pop
1328 return 0 1428 return 0
1329 fi 1429 fi
1330 done 1430 done
1331 set +o noglob; set -$shopts #reset old shell opts 1431 eshopts_pop
1432 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1332 1433
1333 local licmsg=$(emktemp) 1434 local licmsg=$(emktemp)
1334 cat <<-EOF > ${licmsg} 1435 cat <<-EOF > ${licmsg}
1335 ********************************************************** 1436 **********************************************************
1336 The following license outlines the terms of use of this 1437 The following license outlines the terms of use of this
1614 else 1715 else
1615 nols="${nols} ${f}" 1716 nols="${nols} ${f}"
1616 fi 1717 fi
1617 done 1718 done
1618 [[ -n ${nols} ]] \ 1719 [[ -n ${nols} ]] \
1619 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1720 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1620 export LINGUAS=${newls:1} 1721 export LINGUAS=${newls:1}
1621} 1722}
1622 1723
1623# @FUNCTION: preserve_old_lib 1724# @FUNCTION: preserve_old_lib
1624# @USAGE: <libs to preserve> [more libs] 1725# @USAGE: <libs to preserve> [more libs]
1687} 1788}
1688 1789
1689# @FUNCTION: built_with_use 1790# @FUNCTION: built_with_use
1690# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1791# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1691# @DESCRIPTION: 1792# @DESCRIPTION:
1793#
1794# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1795#
1692# A temporary hack until portage properly supports DEPENDing on USE 1796# A temporary hack until portage properly supports DEPENDing on USE
1693# flags being enabled in packages. This will check to see if the specified 1797# flags being enabled in packages. This will check to see if the specified
1694# DEPEND atom was built with the specified list of USE flags. The 1798# DEPEND atom was built with the specified list of USE flags. The
1695# --missing option controls the behavior if called on a package that does 1799# --missing option controls the behavior if called on a package that does
1696# not actually support the defined USE flags (aka listed in IUSE). 1800# not actually support the defined USE flags (aka listed in IUSE).

Legend:
Removed from v.1.315  
changed lines
  Added in v.1.345

  ViewVC Help
Powered by ViewVC 1.1.20