/[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.330
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.330 2010/02/15 02:10:39 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
54fi
55
52# @FUNCTION: ecvs_clean 56# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 57# @USAGE: [list of dirs]
54# @DESCRIPTION: 58# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 59# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 60# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 72esvn_clean() {
69 [[ -z $* ]] && set -- . 73 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 74 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 75}
72 76
73# Default directory where patches are located 77# @FUNCTION: eshopts_push
78# @USAGE: [options to `set` or `shopt`]
79# @DESCRIPTION:
80# Often times code will want to enable a shell option to change code behavior.
81# Since changing shell options can easily break other pieces of code (which
82# assume the default state), eshopts_push is used to (1) push the current shell
83# options onto a stack and (2) pass the specified arguments to set.
84#
85# If the first argument is '-s' or '-u', we assume you want to call `shopt`
86# rather than `set` as there are some options only available via that.
87#
88# A common example is to disable shell globbing so that special meaning/care
89# may be used with variables/arguments to custom functions. That would be:
90# @CODE
91# eshopts_push -o noglob
92# for x in ${foo} ; do
93# if ...some check... ; then
94# eshopts_pop
95# return 0
96# fi
97# done
98# eshopts_pop
99# @CODE
100eshopts_push() {
101 # have to assume __ESHOPTS_SAVE__ isn't screwed with
102 # as a `declare -a` here will reset its value
103 local i=${#__ESHOPTS_SAVE__[@]}
104 if [[ $1 == -[su] ]] ; then
105 __ESHOPTS_SAVE__[$i]=$(shopt -p)
106 [[ $# -eq 0 ]] && return 0
107 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
108 else
109 __ESHOPTS_SAVE__[$i]=$-
110 [[ $# -eq 0 ]] && return 0
111 set "$@" || die "eshopts_push: bad options to set: $*"
112 fi
113}
114
115# @FUNCTION: eshopts_pop
116# @USAGE:
117# @DESCRIPTION:
118# Restore the shell options to the state saved with the corresponding
119# eshopts_push call. See that function for more details.
120eshopts_pop() {
121 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
122 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
123 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
124 local s=${__ESHOPTS_SAVE__[$i]}
125 unset __ESHOPTS_SAVE__[$i]
126 if [[ ${s} == "shopt -"* ]] ; then
127 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
128 else
129 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
130 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
131 fi
132}
133
134# @VARIABLE: EPATCH_SOURCE
135# @DESCRIPTION:
136# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 137EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 138# @VARIABLE: EPATCH_SUFFIX
139# @DESCRIPTION:
140# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 141EPATCH_SUFFIX="patch.bz2"
142# @VARIABLE: EPATCH_OPTS
143# @DESCRIPTION:
77# Default options for patch 144# Default options for patch:
145# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 146# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 147# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 148# -E - automatically remove empty files
149# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 150EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
151# @VARIABLE: EPATCH_EXCLUDE
152# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 153# List of patches not to apply. Note this is only file names,
83# and not the full path .. 154# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 155EPATCH_EXCLUDE=""
156# @VARIABLE: EPATCH_SINGLE_MSG
157# @DESCRIPTION:
85# Change the printed message for a single patch. 158# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 159EPATCH_SINGLE_MSG=""
160# @VARIABLE: EPATCH_MULTI_MSG
161# @DESCRIPTION:
87# Change the printed message for multiple patches. 162# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 163EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 164# @VARIABLE: EPATCH_FORCE
90# 165# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 166# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 167# arch naming style.
93EPATCH_FORCE="no" 168EPATCH_FORCE="no"
94 169
95# This function is for bulk patching, or in theory for just one 170# @FUNCTION: epatch
96# or two patches. 171# @USAGE: [patches] [dirs of patches]
172# @DESCRIPTION:
173# epatch is designed to greatly simplify the application of patches. It can
174# process patch files directly, or directories of patches. The patches may be
175# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
176# the -p option as epatch will automatically attempt -p0 to -p5 until things
177# apply successfully.
97# 178#
98# It should work with .bz2, .gz, .zip and plain text patches. 179# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 180# specified by EPATCH_SOURCE.
100# 181#
101# You do not have to specify '-p' option to patch, as it will 182# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 183# @CODE
103# 184# ${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} 185# ??_${ARCH}_foo.${EPATCH_SUFFIX}
186# else
187# *.${EPATCH_SUFFIX}
188# @CODE
189# The leading ?? are typically numbers used to force consistent patch ordering.
190# The arch field is used to apply patches only for the host architecture with
191# the special value of "all" means apply for everyone. Note that using values
192# other than "all" is highly discouraged -- you should apply patches all the
193# time and let architecture details be detected at configure/compile time.
113# 194#
114# For example: 195# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
196# for patches to apply.
115# 197#
116# 01_all_misc-fix.patch.bz2 198# 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() { 199epatch() {
129 _epatch_draw_line() { 200 _epatch_draw_line() {
201 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 202 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 203 echo "${1//?/=}"
132 } 204 }
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 205
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 206 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 207
143 if [ "$#" -gt 1 ] 208 # Let the rest of the code process one user arg at a time --
144 then 209 # each arg may expand into multiple patches, and each arg may
210 # need to start off with the default global EPATCH_xxx values
211 if [[ $# -gt 1 ]] ; then
145 local m="" 212 local m
146 for m in "$@" ; do 213 for m in "$@" ; do
147 epatch "${m}" 214 epatch "${m}"
148 done 215 done
149 return 0 216 return 0
150 fi 217 fi
151 218
152 if [ -n "$1" -a -f "$1" ] 219 local SINGLE_PATCH="no"
153 then 220 # no args means process ${EPATCH_SOURCE}
221 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
222
223 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 224 SINGLE_PATCH="yes"
155 225 set -- "$1"
156 local EPATCH_SOURCE="$1" 226 # Use the suffix from the single patch (localize it); the code
227 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 228 local EPATCH_SUFFIX=$1
158 229
159 elif [ -n "$1" -a -d "$1" ] 230 elif [[ -d $1 ]] ; then
160 then 231 # 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 ... 232 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 233
234 else
235 # sanity check ... if it isn't a dir or file, wtf man ?
236 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
237 echo
238 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
239 eerror
240 eerror " ${EPATCH_SOURCE}"
241 eerror " ( ${EPATCH_SOURCE##*/} )"
242 echo
243 die "Cannot find \$EPATCH_SOURCE!"
244 fi
245
246 local PIPE_CMD
247 case ${EPATCH_SUFFIX##*\.} in
248 xz) PIPE_CMD="xz -dc" ;;
249 lzma) PIPE_CMD="lzma -dc" ;;
250 bz2) PIPE_CMD="bzip2 -dc" ;;
251 gz|Z|z) PIPE_CMD="gzip -dc" ;;
252 ZIP|zip) PIPE_CMD="unzip -p" ;;
253 *) ;;
254 esac
255
256 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
257
258 local x
259 for x in "$@" ; do
260 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
261 # didn't match anything, ignore continue on
262 [[ ! -f ${x} ]] && continue
263
264 local patchname=${x##*/}
265
266 # Apply single patches, or forced sets of patches, or
267 # patches with ARCH dependant names.
268 # ???_arch_foo.patch
269 # Else, skip this input altogether
270 local a=${patchname#*_} # strip the ???_
271 a=${a%%_*} # strip the _foo.patch
272 if ! [[ ${SINGLE_PATCH} == "yes" || \
273 ${EPATCH_FORCE} == "yes" || \
274 ${a} == all || \
275 ${a} == ${ARCH} ]]
163 then 276 then
164 local EPATCH_SOURCE="$1/*" 277 continue
278 fi
279
280 # Let people filter things dynamically
281 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
282 # let people use globs in the exclude
283 eshopts_push -o noglob
284
285 local ex
286 for ex in ${EPATCH_EXCLUDE} ; do
287 if [[ ${patchname} == ${ex} ]] ; then
288 eshopts_pop
289 continue 2
290 fi
291 done
292
293 eshopts_pop
294 fi
295
296 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
297 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
298 einfo "${EPATCH_SINGLE_MSG}"
299 else
300 einfo "Applying ${patchname} ..."
301 fi
165 else 302 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 303 einfo " ${patchname} ..."
167 fi 304 fi
168 else 305
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 306 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 307 # but if there are more, make sure we get unique log filenames
171 then 308 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 309 if [[ -e ${STDERR_TARGET} ]] ; then
310 STDERR_TARGET="${T}/${patchname}-$$.out"
311 fi
312
313 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
314
315 # Decompress the patch if need be
316 local count=0
317 local PATCH_TARGET
318 if [[ -n ${PIPE_CMD} ]] ; then
319 PATCH_TARGET="${T}/$$.patch"
320 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
321
322 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
323 echo
324 eerror "Could not extract patch!"
325 #die "Could not extract patch!"
326 count=5
327 break
173 fi 328 fi
329 else
330 PATCH_TARGET=${x}
331 fi
174 332
333 # Check for absolute paths in patches. If sandbox is disabled,
334 # people could (accidently) patch files in the root filesystem.
335 # Or trigger other unpleasantries #237667. So disallow -p0 on
336 # such patches.
337 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
338 if [[ -n ${abs_paths} ]] ; then
339 count=1
340 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
341 fi
342
343 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
344 while [[ ${count} -lt 5 ]] ; do
345 # Generate some useful debug info ...
346 (
347 _epatch_draw_line "***** ${patchname} *****"
175 echo 348 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 349 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
350 echo
351 _epatch_draw_line "***** ${patchname} *****"
352 ) >> "${STDERR_TARGET}"
353
354 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
355 (
356 _epatch_draw_line "***** ${patchname} *****"
357 echo
358 echo "ACTUALLY APPLYING ${patchname} ..."
359 echo
360 _epatch_draw_line "***** ${patchname} *****"
361 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
362 ) >> "${STDERR_TARGET}"
363
364 if [ $? -ne 0 ] ; then
365 echo
366 eerror "A dry-run of patch command succeeded, but actually"
367 eerror "applying the patch failed!"
368 #die "Real world sux compared to the dreamworld!"
369 count=5
370 fi
371 break
372 fi
373
374 : $(( count++ ))
375 done
376
377 # if we had to decompress the patch, delete the temp one
378 if [[ -n ${PIPE_CMD} ]] ; then
379 rm -f "${PATCH_TARGET}"
380 fi
381
382 if [[ ${count} -ge 5 ]] ; then
383 echo
384 eerror "Failed Patch: ${patchname} !"
385 eerror " ( ${PATCH_TARGET} )"
177 eerror 386 eerror
178 eerror " ${EPATCH_SOURCE}" 387 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 388 eerror
389 eerror " ${STDERR_TARGET}"
180 echo 390 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}!" 391 die "Failed Patch: ${patchname}!"
336 fi 392 fi
337 393
338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 394 # if everything worked, delete the patch log
339 395 rm -f "${STDERR_TARGET}"
340 eend 0 396 eend 0
341 fi
342 done 397 done
343 if [ "${SINGLE_PATCH}" = "no" ] 398
344 then 399 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
345 einfo "Done with patching" 400 : # everything worked
401}
402epatch_user() {
403 [[ $# -ne 0 ]] && die "epatch_user takes no options"
404
405 # don't clobber any EPATCH vars that the parent might want
406 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
407 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
408 EPATCH_SOURCE=${base}/${CTARGET}/${check}
409 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
410 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
411 if [[ -d ${EPATCH_SOURCE} ]] ; then
412 EPATCH_SOURCE=${EPATCH_SOURCE} \
413 EPATCH_SUFFIX="patch" \
414 EPATCH_FORCE="yes" \
415 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
416 epatch
417 break
346 fi 418 fi
419 done
347} 420}
348 421
349# @FUNCTION: emktemp 422# @FUNCTION: emktemp
350# @USAGE: [temp dir] 423# @USAGE: [temp dir]
351# @DESCRIPTION: 424# @DESCRIPTION:
392# Small wrapper for getent (Linux), 465# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), 466# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
394# and pw (FreeBSD) used in enewuser()/enewgroup() 467# and pw (FreeBSD) used in enewuser()/enewgroup()
395egetent() { 468egetent() {
396 case ${CHOST} in 469 case ${CHOST} in
470 *-darwin[678])
471 case "$2" in
472 *[!0-9]*) # Non numeric
473 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
474 ;;
475 *) # Numeric
476 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
477 ;;
478 esac
479 ;;
397 *-darwin9) 480 *-darwin*)
398 local mytype=$1 481 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users" 482 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups" 483 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in 484 case "$2" in
402 *[!0-9]*) # Non numeric 485 *[!0-9]*) # Non numeric
404 ;; 487 ;;
405 *) # Numeric 488 *) # Numeric
406 local mykey="UniqueID" 489 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID" 490 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null 491 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 ;; 492 ;;
420 esac 493 esac
421 ;; 494 ;;
422 *-freebsd*|*-dragonfly*) 495 *-freebsd*|*-dragonfly*)
423 local opts action="user" 496 local opts action="user"
623 fi 696 fi
624 ;; 697 ;;
625 698
626 *) 699 *)
627 if [[ -z $@ ]] ; then 700 if [[ -z $@ ]] ; then
628 useradd ${opts} ${euser} \ 701 useradd ${opts} \
629 -c "added by portage for ${PN}" \ 702 -c "added by portage for ${PN}" \
703 ${euser} \
630 || die "enewuser failed" 704 || die "enewuser failed"
631 else 705 else
632 einfo " - Extra: $@" 706 einfo " - Extra: $@"
633 useradd ${opts} ${euser} "$@" \ 707 useradd ${opts} "$@" \
708 ${euser} \
634 || die "enewuser failed" 709 || die "enewuser failed"
635 fi 710 fi
636 ;; 711 ;;
637 esac 712 esac
638 713
920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 995 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 996 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
922 997
923 cat <<-EOF > "${desktop}" 998 cat <<-EOF > "${desktop}"
924 [Desktop Entry] 999 [Desktop Entry]
925 Version=1.0
926 Name=${name} 1000 Name=${name}
927 Type=Application 1001 Type=Application
928 Comment=${DESCRIPTION} 1002 Comment=${DESCRIPTION}
929 Exec=${exec} 1003 Exec=${exec}
930 TryExec=${exec%% *} 1004 TryExec=${exec%% *}
1312 lic="${PWD}/${lic}" 1386 lic="${PWD}/${lic}"
1313 elif [ -e "${lic}" ] ; then 1387 elif [ -e "${lic}" ] ; then
1314 lic="${lic}" 1388 lic="${lic}"
1315 fi 1389 fi
1316 fi 1390 fi
1317 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1318 local l="`basename ${lic}`" 1391 local l="`basename ${lic}`"
1319 1392
1320 # here is where we check for the licenses the user already 1393 # 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 1394 # accepted ... if we don't find a match, we make the user accept
1322 local shopts=$-
1323 local alic 1395 local alic
1324 set -o noglob #so that bash doesn't expand "*" 1396 eshopts_push -o noglob # so that bash doesn't expand "*"
1325 for alic in ${ACCEPT_LICENSE} ; do 1397 for alic in ${ACCEPT_LICENSE} ; do
1326 if [[ ${alic} == ${l} ]]; then 1398 if [[ ${alic} == ${l} ]]; then
1327 set +o noglob; set -${shopts} #reset old shell opts 1399 eshopts_pop
1328 return 0 1400 return 0
1329 fi 1401 fi
1330 done 1402 done
1331 set +o noglob; set -$shopts #reset old shell opts 1403 eshopts_pop
1404 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1332 1405
1333 local licmsg=$(emktemp) 1406 local licmsg=$(emktemp)
1334 cat <<-EOF > ${licmsg} 1407 cat <<-EOF > ${licmsg}
1335 ********************************************************** 1408 **********************************************************
1336 The following license outlines the terms of use of this 1409 The following license outlines the terms of use of this
1614 else 1687 else
1615 nols="${nols} ${f}" 1688 nols="${nols} ${f}"
1616 fi 1689 fi
1617 done 1690 done
1618 [[ -n ${nols} ]] \ 1691 [[ -n ${nols} ]] \
1619 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1692 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1620 export LINGUAS=${newls:1} 1693 export LINGUAS=${newls:1}
1621} 1694}
1622 1695
1623# @FUNCTION: preserve_old_lib 1696# @FUNCTION: preserve_old_lib
1624# @USAGE: <libs to preserve> [more libs] 1697# @USAGE: <libs to preserve> [more libs]
1687} 1760}
1688 1761
1689# @FUNCTION: built_with_use 1762# @FUNCTION: built_with_use
1690# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1763# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1691# @DESCRIPTION: 1764# @DESCRIPTION:
1765#
1766# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1767#
1692# A temporary hack until portage properly supports DEPENDing on USE 1768# A temporary hack until portage properly supports DEPENDing on USE
1693# flags being enabled in packages. This will check to see if the specified 1769# 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 1770# 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 1771# --missing option controls the behavior if called on a package that does
1696# not actually support the defined USE flags (aka listed in IUSE). 1772# not actually support the defined USE flags (aka listed in IUSE).

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

  ViewVC Help
Powered by ViewVC 1.1.20