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