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

Diff of /eclass/eutils.eclass

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

Revision 1.322 Revision 1.349
1# Copyright 1999-2009 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.322 2009/12/11 20:31:34 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.349 2010/08/19 21:32:26 vapier 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.
… …
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# @FUNCTION: eshopts_push 98# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`] 99# @USAGE: [options to `set` or `shopt`]
75# @DESCRIPTION: 100# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior. 101# 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 102# 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 103# 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. 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.
80# 108#
81# A common example is to disable shell globbing so that special meaning/care 109# 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: 110# may be used with variables/arguments to custom functions. That would be:
83# @CODE 111# @CODE
84# eshopts_push -o noglob 112# eshopts_push -o noglob
… …
92# @CODE 120# @CODE
93eshopts_push() { 121eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with 122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value 123 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]} 124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
97 __ESHOPTS_SAVE__[$i]=$- 126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
98 [[ $# -eq 0 ]] && return 0 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
99 set "$@" || die "eshopts_push: bad options to set: $*" 132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
100} 134}
101 135
102# @FUNCTION: eshopts_pop 136# @FUNCTION: eshopts_pop
103# @USAGE: 137# @USAGE:
104# @DESCRIPTION: 138# @DESCRIPTION:
… …
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments" 142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 )) 143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair" 144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]} 145 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __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
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-" 150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}" 151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
115} 153}
116 154
117# Default directory where patches are located 155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
118EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
120EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
121# Default options for patch 165# Default options for patch:
166# @CODE
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
124# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
125EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
126# 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,
127# and not the full path .. 175# and not the full path. Globs accepted.
128EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
129# Change the printed message for a single patch. 179# Change the printed message for a single patch.
130EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
131# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
133# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
134# 186# @DESCRIPTION:
135# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
136# 188# arch naming style.
137EPATCH_FORCE="no" 189EPATCH_FORCE="no"
138 190
139# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
140# 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.
141# 199#
142# 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
143# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
144# 202#
145# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
146# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
147# 205# ${EPATCH_FORCE} == "yes"
148# Above EPATCH_* variables can be used to control various defaults,
149# bug they should be left as is to ensure an ebuild can rely on
150# them for.
151#
152# Patches are applied in current directory.
153#
154# Bulk Patches should preferably have the form of:
155#
156# ??_${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.
157# 215#
158# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
159# 218#
160# 01_all_misc-fix.patch.bz2 219# Refer to the other EPATCH_xxx variables for more customization of behavior.
161# 02_sparc_another-fix.patch.bz2
162#
163# This ensures that there are a set order, and you can have ARCH
164# specific patches.
165#
166# If you however give an argument to epatch(), it will treat it as a
167# single patch that need to be applied if its a file. If on the other
168# hand its a directory, it will set EPATCH_SOURCE to this.
169#
170# <azarah@gentoo.org> (10 Nov 2002)
171#
172epatch() { 220epatch() {
173 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
174 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
175 echo "${1//?/=}" 224 echo "${1//?/=}"
176 } 225 }
177 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
178 local PIPE_CMD=""
179 local STDERR_TARGET="${T}/$$.out"
180 local PATCH_TARGET="${T}/$$.patch"
181 local PATCH_SUFFIX=""
182 local SINGLE_PATCH="no"
183 local x=""
184 226
185 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
186 228
187 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
188 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
189 local m="" 233 local m
190 for m in "$@" ; do 234 for m in "$@" ; do
191 epatch "${m}" 235 epatch "${m}"
192 done 236 done
193 return 0 237 return 0
194 fi 238 fi
195 239
196 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
197 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
198 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
199 246 set -- "$1"
200 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
201 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
202 250
203 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
204 then 252 # Some people like to make dirs of patches w/out suffixes (vim)
205 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
206 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} ]]
207 then 297 then
208 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
209 else 323 else
210 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 324 einfo " ${patchname} ..."
211 fi 325 fi
212 else 326
213 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 327 # most of the time, there will only be one run per unique name,
214 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 328 # but if there are more, make sure we get unique log filenames
215 then 329 local STDERR_TARGET="${T}/${patchname}.out"
216 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
217 fi 349 fi
350 else
351 PATCH_TARGET=${x}
352 fi
218 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} *****"
219 echo 369 echo
220 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} )"
221 eerror 407 eerror
222 eerror " ${EPATCH_SOURCE}" 408 eerror "Include in your bugreport the contents of:"
223 eerror " ( ${EPATCH_SOURCE##*/} )" 409 eerror
410 eerror " ${STDERR_TARGET}"
224 echo 411 echo
225 die "Cannot find \$EPATCH_SOURCE!"
226 fi
227
228 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
229 fi
230
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 ;;
240 bz2)
241 PIPE_CMD="bzip2 -dc"
242 PATCH_SUFFIX="bz2"
243 ;;
244 gz|Z|z)
245 PIPE_CMD="gzip -dc"
246 PATCH_SUFFIX="gz"
247 ;;
248 ZIP|zip)
249 PIPE_CMD="unzip -p"
250 PATCH_SUFFIX="zip"
251 ;;
252 *)
253 PIPE_CMD="cat"
254 PATCH_SUFFIX="patch"
255 ;;
256 esac
257
258 if [ "${SINGLE_PATCH}" = "no" ]
259 then
260 einfo "${EPATCH_MULTI_MSG}"
261 fi
262 for x in ${EPATCH_SOURCE}
263 do
264 # New ARCH dependant patch naming scheme ...
265 #
266 # ???_arch_foo.patch
267 #
268 if [ -f ${x} ] && \
269 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
270 [ "${EPATCH_FORCE}" = "yes" ])
271 then
272 local count=0
273 local popts="${EPATCH_OPTS}"
274 local patchname=${x##*/}
275
276 if [ -n "${EPATCH_EXCLUDE}" ]
277 then
278 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
279 then
280 continue
281 fi
282 fi
283
284 if [ "${SINGLE_PATCH}" = "yes" ]
285 then
286 if [ -n "${EPATCH_SINGLE_MSG}" ]
287 then
288 einfo "${EPATCH_SINGLE_MSG}"
289 else
290 einfo "Applying ${patchname} ..."
291 fi
292 else
293 einfo " ${patchname} ..."
294 fi
295
296 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
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
326 # Allow for prefix to differ ... im lazy, so shoot me :/
327 while [ "${count}" -lt 5 ]
328 do
329 # Generate some useful debug info ...
330 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332
333 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335
336 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338
339 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
340 then
341 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
342 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
343 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
344 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
345 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
346
347 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
348 _epatch_assert
349
350 if [ "$?" -ne 0 ]
351 then
352 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
353 echo
354 eerror "A dry-run of patch command succeeded, but actually"
355 eerror "applying the patch failed!"
356 #die "Real world sux compared to the dreamworld!"
357 count=5
358 fi
359
360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361
362 break
363 fi
364
365 count=$((count + 1))
366 done
367
368 if [ "${PATCH_SUFFIX}" != "patch" ]
369 then
370 rm -f ${PATCH_TARGET}
371 fi
372
373 if [ "${count}" -eq 5 ]
374 then
375 echo
376 eerror "Failed Patch: ${patchname} !"
377 eerror " ( ${PATCH_TARGET} )"
378 eerror
379 eerror "Include in your bugreport the contents of:"
380 eerror
381 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
382 echo
383 die "Failed Patch: ${patchname}!" 412 die "Failed Patch: ${patchname}!"
384 fi 413 fi
385 414
386 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 415 # if everything worked, delete the patch log
387 416 rm -f "${STDERR_TARGET}"
388 eend 0 417 eend 0
389 fi
390 done 418 done
391 if [ "${SINGLE_PATCH}" = "no" ] 419
392 then 420 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
393 einfo "Done with patching" 421 : # everything worked
394 fi
395} 422}
396epatch_user() { 423epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options" 424 [[ $# -ne 0 ]] && die "epatch_user takes no options"
398 425
399 # don't clobber any EPATCH vars that the parent might want 426 # don't clobber any EPATCH vars that the parent might want
400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches 427 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 428 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
402 EPATCH_SOURCE=${base}/${CTARGET}/${check} 429 EPATCH_SOURCE=${base}/${CTARGET}/${check}
403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} 430 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} 431 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
405 if [[ -d ${EPATCH_SOURCE} ]] ; then 432 if [[ -d ${EPATCH_SOURCE} ]] ; then
406 EPATCH_SOURCE=${EPATCH_SOURCE} \ 433 EPATCH_SOURCE=${EPATCH_SOURCE} \
407 EPATCH_SUFFIX="patch" \ 434 EPATCH_SUFFIX="patch" \
408 EPATCH_FORCE="yes" \ 435 EPATCH_FORCE="yes" \
409 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 436 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
410 epatch 437 epatch
411 break 438 return 0
412 fi 439 fi
413 done 440 done
441 return 1
414} 442}
415 443
416# @FUNCTION: emktemp 444# @FUNCTION: emktemp
417# @USAGE: [temp dir] 445# @USAGE: [temp dir]
418# @DESCRIPTION: 446# @DESCRIPTION:
… …
690 fi 718 fi
691 ;; 719 ;;
692 720
693 *) 721 *)
694 if [[ -z $@ ]] ; then 722 if [[ -z $@ ]] ; then
695 useradd ${opts} \ 723 useradd -r ${opts} \
696 -c "added by portage for ${PN}" \ 724 -c "added by portage for ${PN}" \
697 ${euser} \ 725 ${euser} \
698 || die "enewuser failed" 726 || die "enewuser failed"
699 else 727 else
700 einfo " - Extra: $@" 728 einfo " - Extra: $@"
701 useradd ${opts} "$@" \ 729 useradd -r ${opts} "$@" \
702 ${euser} \ 730 ${euser} \
703 || die "enewuser failed" 731 || die "enewuser failed"
704 fi 732 fi
705 ;; 733 ;;
706 esac 734 esac
… …
819 esac 847 esac
820 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 848 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
821 ;; 849 ;;
822 850
823 *) 851 *)
852 # We specify -r so that we get a GID in the system range from login.defs
824 groupadd ${opts} ${egroup} || die "enewgroup failed" 853 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
825 ;; 854 ;;
826 esac 855 esac
827 export SANDBOX_ON="${oldsandbox}" 856 export SANDBOX_ON="${oldsandbox}"
828} 857}
829 858
… …
840 869
841# Make a desktop file ! 870# Make a desktop file !
842# Great for making those icons in kde/gnome startmenu ! 871# Great for making those icons in kde/gnome startmenu !
843# Amaze your friends ! Get the women ! Join today ! 872# Amaze your friends ! Get the women ! Join today !
844# 873#
845# make_desktop_entry(<command>, [name], [icon], [type], [path]) 874# make_desktop_entry(<command>, [name], [icon], [type], [fields])
846# 875#
847# binary: what command does the app run with ? 876# binary: what command does the app run with ?
848# name: the name that will show up in the menu 877# name: the name that will show up in the menu
849# icon: give your little like a pretty little icon ... 878# icon: give your little like a pretty little icon ...
850# this can be relative (to /usr/share/pixmaps) or 879# this can be relative (to /usr/share/pixmaps) or
851# a full path to an icon 880# a full path to an icon
852# type: what kind of application is this ? for categories: 881# type: what kind of application is this ? for categories:
853# http://standards.freedesktop.org/menu-spec/latest/apa.html 882# http://standards.freedesktop.org/menu-spec/latest/apa.html
854# path: if your app needs to startup in a specific dir 883# fields: extra fields to append to the desktop file; a printf string
855make_desktop_entry() { 884make_desktop_entry() {
856 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 885 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
857 886
858 local exec=${1} 887 local exec=${1}
859 local name=${2:-${PN}} 888 local name=${2:-${PN}}
860 local icon=${3:-${PN}} 889 local icon=${3:-${PN}}
861 local type=${4} 890 local type=${4}
862 local path=${5} 891 local fields=${5}
863 892
864 if [[ -z ${type} ]] ; then 893 if [[ -z ${type} ]] ; then
865 local catmaj=${CATEGORY%%-*} 894 local catmaj=${CATEGORY%%-*}
866 local catmin=${CATEGORY##*-} 895 local catmin=${CATEGORY##*-}
867 case ${catmaj} in 896 case ${catmaj} in
868 app) 897 app)
869 case ${catmin} in 898 case ${catmin} in
870 accessibility) type=Accessibility;; 899 accessibility) type=Accessibility;;
871 admin) type=System;; 900 admin) type=System;;
872 antivirus) type=System;; 901 antivirus) type=System;;
873 arch) type=Archiving;; 902 arch) type=Archiving;;
874 backup) type=Archiving;; 903 backup) type=Archiving;;
875 cdr) type=DiscBurning;; 904 cdr) type=DiscBurning;;
876 dicts) type=Dictionary;; 905 dicts) type=Dictionary;;
877 doc) type=Documentation;; 906 doc) type=Documentation;;
878 editors) type=TextEditor;; 907 editors) type=TextEditor;;
879 emacs) type=TextEditor;; 908 emacs) type=TextEditor;;
880 emulation) type=Emulator;; 909 emulation) type=Emulator;;
881 laptop) type=HardwareSettings;; 910 laptop) type=HardwareSettings;;
882 office) type=Office;; 911 office) type=Office;;
883 pda) type=PDA;; 912 pda) type=PDA;;
884 vim) type=TextEditor;; 913 vim) type=TextEditor;;
885 xemacs) type=TextEditor;; 914 xemacs) type=TextEditor;;
886 *) type=;;
887 esac 915 esac
888 ;; 916 ;;
889 917
890 dev) 918 dev)
891 type="Development" 919 type="Development"
892 ;; 920 ;;
893 921
894 games) 922 games)
895 case ${catmin} in 923 case ${catmin} in
896 action|fps) type=ActionGame;; 924 action|fps) type=ActionGame;;
897 arcade) type=ArcadeGame;; 925 arcade) type=ArcadeGame;;
898 board) type=BoardGame;; 926 board) type=BoardGame;;
899 emulation) type=Emulator;; 927 emulation) type=Emulator;;
900 kids) type=KidsGame;; 928 kids) type=KidsGame;;
901 puzzle) type=LogicGame;; 929 puzzle) type=LogicGame;;
902 roguelike) type=RolePlaying;; 930 roguelike) type=RolePlaying;;
903 rpg) type=RolePlaying;; 931 rpg) type=RolePlaying;;
904 simulation) type=Simulation;; 932 simulation) type=Simulation;;
905 sports) type=SportsGame;; 933 sports) type=SportsGame;;
906 strategy) type=StrategyGame;; 934 strategy) type=StrategyGame;;
907 *) type=;;
908 esac 935 esac
909 type="Game;${type}" 936 type="Game;${type}"
910 ;; 937 ;;
911 938
912 gnome) 939 gnome)
… …
921 type="Network;Email" 948 type="Network;Email"
922 ;; 949 ;;
923 950
924 media) 951 media)
925 case ${catmin} in 952 case ${catmin} in
953 gfx)
926 gfx) type=Graphics;; 954 type=Graphics
955 ;;
956 *)
957 case ${catmin} in
927 radio) type=Tuner;; 958 radio) type=Tuner;;
928 sound) type=Audio;; 959 sound) type=Audio;;
929 tv) type=TV;; 960 tv) type=TV;;
930 video) type=Video;; 961 video) type=Video;;
931 *) type=;; 962 esac
963 type="AudioVideo;${type}"
964 ;;
932 esac 965 esac
933 type="AudioVideo;${type}"
934 ;; 966 ;;
935 967
936 net) 968 net)
937 case ${catmin} in 969 case ${catmin} in
938 dialup) type=Dialup;; 970 dialup) type=Dialup;;
939 ftp) type=FileTransfer;; 971 ftp) type=FileTransfer;;
940 im) type=InstantMessaging;; 972 im) type=InstantMessaging;;
941 irc) type=IRCClient;; 973 irc) type=IRCClient;;
942 mail) type=Email;; 974 mail) type=Email;;
943 news) type=News;; 975 news) type=News;;
944 nntp) type=News;; 976 nntp) type=News;;
945 p2p) type=FileTransfer;; 977 p2p) type=FileTransfer;;
946 *) type=;; 978 voip) type=Telephony;;
947 esac 979 esac
948 type="Network;${type}" 980 type="Network;${type}"
949 ;; 981 ;;
950 982
951 sci) 983 sci)
952 case ${catmin} in 984 case ${catmin} in
953 astro*) type=Astronomy;; 985 astro*) type=Astronomy;;
954 bio*) type=Biology;; 986 bio*) type=Biology;;
955 calc*) type=Calculator;; 987 calc*) type=Calculator;;
956 chem*) type=Chemistry;; 988 chem*) type=Chemistry;;
957 elec*) type=Electronics;; 989 elec*) type=Electronics;;
958 geo*) type=Geology;; 990 geo*) type=Geology;;
959 math*) type=Math;; 991 math*) type=Math;;
960 physics) type=Physics;; 992 physics) type=Physics;;
961 visual*) type=DataVisualization;; 993 visual*) type=DataVisualization;;
962 *) type=;;
963 esac 994 esac
964 type="Science;${type}" 995 type="Education;Science;${type}"
965 ;; 996 ;;
966 997
967 sys) 998 sys)
968 type="System" 999 type="System"
969 ;; 1000 ;;
970 1001
971 www) 1002 www)
972 case ${catmin} in 1003 case ${catmin} in
973 client) type=WebBrowser;; 1004 client) type=WebBrowser;;
974 *) type=;;
975 esac 1005 esac
976 type="Network" 1006 type="Network;${type}"
977 ;; 1007 ;;
978 1008
979 *) 1009 *)
980 type= 1010 type=
981 ;; 1011 ;;
… …
986 else 1016 else
987 local desktop_name="${PN}-${SLOT}" 1017 local desktop_name="${PN}-${SLOT}"
988 fi 1018 fi
989 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1019 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
990 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1020 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1021
1022 # Don't append another ";" when a valid category value is provided.
1023 type=${type%;}${type:+;}
1024
1025 eshopts_push -s extglob
1026 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1027 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1028 ewarn "allowed in .desktop files if the value is not an absolute path."
1029 icon=${icon%.@(xpm|png|svg)}
1030 fi
1031 eshopts_pop
991 1032
992 cat <<-EOF > "${desktop}" 1033 cat <<-EOF > "${desktop}"
993 [Desktop Entry] 1034 [Desktop Entry]
994 Name=${name} 1035 Name=${name}
995 Type=Application 1036 Type=Application
996 Comment=${DESCRIPTION} 1037 Comment=${DESCRIPTION}
997 Exec=${exec} 1038 Exec=${exec}
998 TryExec=${exec%% *} 1039 TryExec=${exec%% *}
999 Icon=${icon} 1040 Icon=${icon}
1000 Categories=${type}; 1041 Categories=${type}
1001 EOF 1042 EOF
1002 1043
1003 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1044 if [[ ${fields:-=} != *=* ]] ; then
1045 # 5th arg used to be value to Path=
1046 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1047 fields="Path=${fields}"
1048 fi
1049 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1004 1050
1005 ( 1051 (
1006 # wrap the env here so that the 'insinto' call 1052 # wrap the env here so that the 'insinto' call
1007 # doesn't corrupt the env of the caller 1053 # doesn't corrupt the env of the caller
1008 insinto /usr/share/applications 1054 insinto /usr/share/applications
1009 doins "${desktop}" 1055 doins "${desktop}"
1010 ) 1056 ) || die "installing desktop file failed"
1011} 1057}
1012 1058
1013# @FUNCTION: validate_desktop_entries 1059# @FUNCTION: validate_desktop_entries
1014# @USAGE: [directories] 1060# @USAGE: [directories]
1015# @MAINTAINER: 1061# @MAINTAINER:
… …
1294 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1340 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1295 1341
1296 local shrtsrc=$(basename "${src}") 1342 local shrtsrc=$(basename "${src}")
1297 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1343 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1298 if [[ -z ${skip} ]] ; then 1344 if [[ -z ${skip} ]] ; then
1299 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1345 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1300 local skip=0 1346 local skip=0
1301 exe=tail 1347 exe=tail
1302 case ${ver} in 1348 case ${ver} in
1303 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1349 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1304 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1350 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
… …
1306 2.0|2.0.1) 1352 2.0|2.0.1)
1307 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1353 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1308 ;; 1354 ;;
1309 2.1.1) 1355 2.1.1)
1310 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1356 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1311 let skip="skip + 1" 1357 (( skip++ ))
1312 ;; 1358 ;;
1313 2.1.2) 1359 2.1.2)
1314 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1360 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1315 let skip="skip + 1" 1361 (( skip++ ))
1316 ;; 1362 ;;
1317 2.1.3) 1363 2.1.3)
1318 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1364 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1319 let skip="skip + 1" 1365 (( skip++ ))
1320 ;; 1366 ;;
1321 2.1.4|2.1.5) 1367 2.1.4|2.1.5)
1322 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1368 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1323 skip=$(head -n ${skip} "${src}" | wc -c) 1369 skip=$(head -n ${skip} "${src}" | wc -c)
1324 exe="dd" 1370 exe="dd"
… …
1333 esac 1379 esac
1334 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1380 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1335 fi 1381 fi
1336 case ${exe} in 1382 case ${exe} in
1337 tail) exe="tail -n +${skip} '${src}'";; 1383 tail) exe="tail -n +${skip} '${src}'";;
1338 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1384 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1339 *) die "makeself cant handle exe '${exe}'" 1385 *) die "makeself cant handle exe '${exe}'"
1340 esac 1386 esac
1341 1387
1342 # lets grab the first few bytes of the file to figure out what kind of archive it is 1388 # lets grab the first few bytes of the file to figure out what kind of archive it is
1343 local tmpfile=$(emktemp) 1389 local tmpfile=$(emktemp)
… …
1380 lic="${PWD}/${lic}" 1426 lic="${PWD}/${lic}"
1381 elif [ -e "${lic}" ] ; then 1427 elif [ -e "${lic}" ] ; then
1382 lic="${lic}" 1428 lic="${lic}"
1383 fi 1429 fi
1384 fi 1430 fi
1385 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1386 local l="`basename ${lic}`" 1431 local l="`basename ${lic}`"
1387 1432
1388 # here is where we check for the licenses the user already 1433 # here is where we check for the licenses the user already
1389 # accepted ... if we don't find a match, we make the user accept 1434 # accepted ... if we don't find a match, we make the user accept
1390 local alic 1435 local alic
… …
1394 eshopts_pop 1439 eshopts_pop
1395 return 0 1440 return 0
1396 fi 1441 fi
1397 done 1442 done
1398 eshopts_pop 1443 eshopts_pop
1444 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1399 1445
1400 local licmsg=$(emktemp) 1446 local licmsg=$(emktemp)
1401 cat <<-EOF > ${licmsg} 1447 cat <<-EOF > ${licmsg}
1402 ********************************************************** 1448 **********************************************************
1403 The following license outlines the terms of use of this 1449 The following license outlines the terms of use of this
… …
1476 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1522 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1477 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1523 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1478 export CDROM_SET=-1 1524 export CDROM_SET=-1
1479 for f in ${CDROM_CHECK_1//:/ } ; do 1525 for f in ${CDROM_CHECK_1//:/ } ; do
1480 ((++CDROM_SET)) 1526 ((++CDROM_SET))
1481 [[ -e ${CD_ROOT}/${f} ]] && break 1527 [[ -e ${CDROM_ROOT}/${f} ]] && break
1482 done 1528 done
1483 export CDROM_MATCH=${f} 1529 export CDROM_MATCH=${f}
1484 return 1530 return
1485 fi 1531 fi
1486 1532
… …
1754} 1800}
1755 1801
1756# @FUNCTION: built_with_use 1802# @FUNCTION: built_with_use
1757# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1803# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1758# @DESCRIPTION: 1804# @DESCRIPTION:
1805#
1806# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1807#
1759# A temporary hack until portage properly supports DEPENDing on USE 1808# A temporary hack until portage properly supports DEPENDing on USE
1760# flags being enabled in packages. This will check to see if the specified 1809# flags being enabled in packages. This will check to see if the specified
1761# DEPEND atom was built with the specified list of USE flags. The 1810# DEPEND atom was built with the specified list of USE flags. The
1762# --missing option controls the behavior if called on a package that does 1811# --missing option controls the behavior if called on a package that does
1763# not actually support the defined USE flags (aka listed in IUSE). 1812# not actually support the defined USE flags (aka listed in IUSE).
Legend:
Removed from v.1.322  
changed lines
  Added in v.1.349
  ViewVC Help
Powered by ViewVC 1.1.20