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

Diff of /eclass/eutils.eclass

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

Revision 1.300 Revision 1.334
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.300 2008/03/01 21:59:54 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.334 2010/02/26 03:15:26 abcd 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 [[ $(type -t eqawarn) == function ]] && \
58 eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
59}
60
61epause() {
62 [[ $(type -t eqawarn) == function ]] && \
63 eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
64}
65
66fi
67
52# @FUNCTION: ecvs_clean 68# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 69# @USAGE: [list of dirs]
54# @DESCRIPTION: 70# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 71# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 72# internal CVS directories. Defaults to $PWD.
… …
68esvn_clean() { 84esvn_clean() {
69 [[ -z $* ]] && set -- . 85 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 86 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 87}
72 88
73# Default directory where patches are located 89# @FUNCTION: eshopts_push
90# @USAGE: [options to `set` or `shopt`]
91# @DESCRIPTION:
92# Often times code will want to enable a shell option to change code behavior.
93# Since changing shell options can easily break other pieces of code (which
94# assume the default state), eshopts_push is used to (1) push the current shell
95# options onto a stack and (2) pass the specified arguments to set.
96#
97# If the first argument is '-s' or '-u', we assume you want to call `shopt`
98# rather than `set` as there are some options only available via that.
99#
100# A common example is to disable shell globbing so that special meaning/care
101# may be used with variables/arguments to custom functions. That would be:
102# @CODE
103# eshopts_push -o noglob
104# for x in ${foo} ; do
105# if ...some check... ; then
106# eshopts_pop
107# return 0
108# fi
109# done
110# eshopts_pop
111# @CODE
112eshopts_push() {
113 # have to assume __ESHOPTS_SAVE__ isn't screwed with
114 # as a `declare -a` here will reset its value
115 local i=${#__ESHOPTS_SAVE__[@]}
116 if [[ $1 == -[su] ]] ; then
117 __ESHOPTS_SAVE__[$i]=$(shopt -p)
118 [[ $# -eq 0 ]] && return 0
119 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
120 else
121 __ESHOPTS_SAVE__[$i]=$-
122 [[ $# -eq 0 ]] && return 0
123 set "$@" || die "eshopts_push: bad options to set: $*"
124 fi
125}
126
127# @FUNCTION: eshopts_pop
128# @USAGE:
129# @DESCRIPTION:
130# Restore the shell options to the state saved with the corresponding
131# eshopts_push call. See that function for more details.
132eshopts_pop() {
133 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
134 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
135 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
136 local s=${__ESHOPTS_SAVE__[$i]}
137 unset __ESHOPTS_SAVE__[$i]
138 if [[ ${s} == "shopt -"* ]] ; then
139 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
140 else
141 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
142 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
143 fi
144}
145
146# @VARIABLE: EPATCH_SOURCE
147# @DESCRIPTION:
148# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 149EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 150# @VARIABLE: EPATCH_SUFFIX
151# @DESCRIPTION:
152# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 153EPATCH_SUFFIX="patch.bz2"
154# @VARIABLE: EPATCH_OPTS
155# @DESCRIPTION:
77# Default options for patch 156# Default options for patch:
157# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 158# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 159# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 160# -E - automatically remove empty files
161# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 162EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
163# @VARIABLE: EPATCH_EXCLUDE
164# @DESCRIPTION:
82# List of patches not to apply. Not this is only file names, 165# List of patches not to apply. Note this is only file names,
83# and not the full path .. 166# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 167EPATCH_EXCLUDE=""
168# @VARIABLE: EPATCH_SINGLE_MSG
169# @DESCRIPTION:
85# Change the printed message for a single patch. 170# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 171EPATCH_SINGLE_MSG=""
172# @VARIABLE: EPATCH_MULTI_MSG
173# @DESCRIPTION:
87# Change the printed message for multiple patches. 174# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 175EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 176# @VARIABLE: EPATCH_FORCE
90# 177# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 178# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 179# arch naming style.
93EPATCH_FORCE="no" 180EPATCH_FORCE="no"
94 181
95# This function is for bulk patching, or in theory for just one 182# @FUNCTION: epatch
96# or two patches. 183# @USAGE: [patches] [dirs of patches]
184# @DESCRIPTION:
185# epatch is designed to greatly simplify the application of patches. It can
186# process patch files directly, or directories of patches. The patches may be
187# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
188# the -p option as epatch will automatically attempt -p0 to -p5 until things
189# apply successfully.
97# 190#
98# It should work with .bz2, .gz, .zip and plain text patches. 191# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 192# specified by EPATCH_SOURCE.
100# 193#
101# You do not have to specify '-p' option to patch, as it will 194# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 195# @CODE
103# 196# ${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 preferibly have the form of:
111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 197# ??_${ARCH}_foo.${EPATCH_SUFFIX}
198# else
199# *.${EPATCH_SUFFIX}
200# @CODE
201# The leading ?? are typically numbers used to force consistent patch ordering.
202# The arch field is used to apply patches only for the host architecture with
203# the special value of "all" means apply for everyone. Note that using values
204# other than "all" is highly discouraged -- you should apply patches all the
205# time and let architecture details be detected at configure/compile time.
113# 206#
114# For example: 207# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
208# for patches to apply.
115# 209#
116# 01_all_misc-fix.patch.bz2 210# 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() { 211epatch() {
129 _epatch_draw_line() { 212 _epatch_draw_line() {
213 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 214 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 215 echo "${1//?/=}"
132 } 216 }
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 217
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 218 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 219
143 if [ "$#" -gt 1 ] 220 # Let the rest of the code process one user arg at a time --
144 then 221 # each arg may expand into multiple patches, and each arg may
222 # need to start off with the default global EPATCH_xxx values
223 if [[ $# -gt 1 ]] ; then
145 local m="" 224 local m
146 for m in "$@" ; do 225 for m in "$@" ; do
147 epatch "${m}" 226 epatch "${m}"
148 done 227 done
149 return 0 228 return 0
150 fi 229 fi
151 230
152 if [ -n "$1" -a -f "$1" ] 231 local SINGLE_PATCH="no"
153 then 232 # no args means process ${EPATCH_SOURCE}
233 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
234
235 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 236 SINGLE_PATCH="yes"
155 237 set -- "$1"
156 local EPATCH_SOURCE="$1" 238 # Use the suffix from the single patch (localize it); the code
239 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 240 local EPATCH_SUFFIX=$1
158 241
159 elif [ -n "$1" -a -d "$1" ] 242 elif [[ -d $1 ]] ; then
160 then 243 # 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 ... 244 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 245
246 else
247 # sanity check ... if it isn't a dir or file, wtf man ?
248 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
249 echo
250 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
251 eerror
252 eerror " ${EPATCH_SOURCE}"
253 eerror " ( ${EPATCH_SOURCE##*/} )"
254 echo
255 die "Cannot find \$EPATCH_SOURCE!"
256 fi
257
258 local PIPE_CMD
259 case ${EPATCH_SUFFIX##*\.} in
260 xz) PIPE_CMD="xz -dc" ;;
261 lzma) PIPE_CMD="lzma -dc" ;;
262 bz2) PIPE_CMD="bzip2 -dc" ;;
263 gz|Z|z) PIPE_CMD="gzip -dc" ;;
264 ZIP|zip) PIPE_CMD="unzip -p" ;;
265 *) ;;
266 esac
267
268 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
269
270 local x
271 for x in "$@" ; do
272 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
273 # didn't match anything, ignore continue on
274 [[ ! -f ${x} ]] && continue
275
276 local patchname=${x##*/}
277
278 # Apply single patches, or forced sets of patches, or
279 # patches with ARCH dependant names.
280 # ???_arch_foo.patch
281 # Else, skip this input altogether
282 local a=${patchname#*_} # strip the ???_
283 a=${a%%_*} # strip the _foo.patch
284 if ! [[ ${SINGLE_PATCH} == "yes" || \
285 ${EPATCH_FORCE} == "yes" || \
286 ${a} == all || \
287 ${a} == ${ARCH} ]]
163 then 288 then
164 local EPATCH_SOURCE="$1/*" 289 continue
290 fi
291
292 # Let people filter things dynamically
293 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
294 # let people use globs in the exclude
295 eshopts_push -o noglob
296
297 local ex
298 for ex in ${EPATCH_EXCLUDE} ; do
299 if [[ ${patchname} == ${ex} ]] ; then
300 eshopts_pop
301 continue 2
302 fi
303 done
304
305 eshopts_pop
306 fi
307
308 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
309 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
310 einfo "${EPATCH_SINGLE_MSG}"
311 else
312 einfo "Applying ${patchname} ..."
313 fi
165 else 314 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 315 einfo " ${patchname} ..."
167 fi 316 fi
168 else 317
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 318 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 319 # but if there are more, make sure we get unique log filenames
171 then 320 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 321 if [[ -e ${STDERR_TARGET} ]] ; then
322 STDERR_TARGET="${T}/${patchname}-$$.out"
323 fi
324
325 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
326
327 # Decompress the patch if need be
328 local count=0
329 local PATCH_TARGET
330 if [[ -n ${PIPE_CMD} ]] ; then
331 PATCH_TARGET="${T}/$$.patch"
332 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
333
334 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
335 echo
336 eerror "Could not extract patch!"
337 #die "Could not extract patch!"
338 count=5
339 break
173 fi 340 fi
341 else
342 PATCH_TARGET=${x}
343 fi
174 344
345 # Check for absolute paths in patches. If sandbox is disabled,
346 # people could (accidently) patch files in the root filesystem.
347 # Or trigger other unpleasantries #237667. So disallow -p0 on
348 # such patches.
349 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
350 if [[ -n ${abs_paths} ]] ; then
351 count=1
352 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
353 fi
354
355 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
356 while [[ ${count} -lt 5 ]] ; do
357 # Generate some useful debug info ...
358 (
359 _epatch_draw_line "***** ${patchname} *****"
175 echo 360 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 361 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
362 echo
363 _epatch_draw_line "***** ${patchname} *****"
364 ) >> "${STDERR_TARGET}"
365
366 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
367 (
368 _epatch_draw_line "***** ${patchname} *****"
369 echo
370 echo "ACTUALLY APPLYING ${patchname} ..."
371 echo
372 _epatch_draw_line "***** ${patchname} *****"
373 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
374 ) >> "${STDERR_TARGET}"
375
376 if [ $? -ne 0 ] ; then
377 echo
378 eerror "A dry-run of patch command succeeded, but actually"
379 eerror "applying the patch failed!"
380 #die "Real world sux compared to the dreamworld!"
381 count=5
382 fi
383 break
384 fi
385
386 : $(( count++ ))
387 done
388
389 # if we had to decompress the patch, delete the temp one
390 if [[ -n ${PIPE_CMD} ]] ; then
391 rm -f "${PATCH_TARGET}"
392 fi
393
394 if [[ ${count} -ge 5 ]] ; then
395 echo
396 eerror "Failed Patch: ${patchname} !"
397 eerror " ( ${PATCH_TARGET} )"
177 eerror 398 eerror
178 eerror " ${EPATCH_SOURCE}" 399 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 400 eerror
401 eerror " ${STDERR_TARGET}"
180 echo 402 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 bz2)
189 PIPE_CMD="bzip2 -dc"
190 PATCH_SUFFIX="bz2"
191 ;;
192 gz|Z|z)
193 PIPE_CMD="gzip -dc"
194 PATCH_SUFFIX="gz"
195 ;;
196 ZIP|zip)
197 PIPE_CMD="unzip -p"
198 PATCH_SUFFIX="zip"
199 ;;
200 *)
201 PIPE_CMD="cat"
202 PATCH_SUFFIX="patch"
203 ;;
204 esac
205
206 if [ "${SINGLE_PATCH}" = "no" ]
207 then
208 einfo "${EPATCH_MULTI_MSG}"
209 fi
210 for x in ${EPATCH_SOURCE}
211 do
212 # New ARCH dependant patch naming scheme ...
213 #
214 # ???_arch_foo.patch
215 #
216 if [ -f ${x} ] && \
217 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
218 [ "${EPATCH_FORCE}" = "yes" ])
219 then
220 local count=0
221 local popts="${EPATCH_OPTS}"
222 local patchname=${x##*/}
223
224 if [ -n "${EPATCH_EXCLUDE}" ]
225 then
226 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
227 then
228 continue
229 fi
230 fi
231
232 if [ "${SINGLE_PATCH}" = "yes" ]
233 then
234 if [ -n "${EPATCH_SINGLE_MSG}" ]
235 then
236 einfo "${EPATCH_SINGLE_MSG}"
237 else
238 einfo "Applying ${patchname} ..."
239 fi
240 else
241 einfo " ${patchname} ..."
242 fi
243
244 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246
247 # Allow for prefix to differ ... im lazy, so shoot me :/
248 while [ "${count}" -lt 5 ]
249 do
250 # Generate some useful debug info ...
251 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
252 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
253
254 if [ "${PATCH_SUFFIX}" != "patch" ]
255 then
256 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
257 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 else
259 PATCH_TARGET="${x}"
260 fi
261
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
264
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267
268 if [ "${PATCH_SUFFIX}" != "patch" ]
269 then
270 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
271 then
272 echo
273 eerror "Could not extract patch!"
274 #die "Could not extract patch!"
275 count=5
276 break
277 fi
278 fi
279
280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
281 then
282 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
287
288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
289 _epatch_assert
290
291 if [ "$?" -ne 0 ]
292 then
293 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 echo
295 eerror "A dry-run of patch command succeeded, but actually"
296 eerror "applying the patch failed!"
297 #die "Real world sux compared to the dreamworld!"
298 count=5
299 fi
300
301 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
302
303 break
304 fi
305
306 count=$((count + 1))
307 done
308
309 if [ "${PATCH_SUFFIX}" != "patch" ]
310 then
311 rm -f ${PATCH_TARGET}
312 fi
313
314 if [ "${count}" -eq 5 ]
315 then
316 echo
317 eerror "Failed Patch: ${patchname} !"
318 eerror " ( ${PATCH_TARGET} )"
319 eerror
320 eerror "Include in your bugreport the contents of:"
321 eerror
322 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
323 echo
324 die "Failed Patch: ${patchname}!" 403 die "Failed Patch: ${patchname}!"
325 fi 404 fi
326 405
327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 406 # if everything worked, delete the patch log
328 407 rm -f "${STDERR_TARGET}"
329 eend 0 408 eend 0
330 fi
331 done 409 done
332 if [ "${SINGLE_PATCH}" = "no" ] 410
333 then 411 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
334 einfo "Done with patching" 412 : # everything worked
413}
414epatch_user() {
415 [[ $# -ne 0 ]] && die "epatch_user takes no options"
416
417 # don't clobber any EPATCH vars that the parent might want
418 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
419 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
420 EPATCH_SOURCE=${base}/${CTARGET}/${check}
421 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
422 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
423 if [[ -d ${EPATCH_SOURCE} ]] ; then
424 EPATCH_SOURCE=${EPATCH_SOURCE} \
425 EPATCH_SUFFIX="patch" \
426 EPATCH_FORCE="yes" \
427 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
428 epatch
429 break
335 fi 430 fi
431 done
336} 432}
337 433
338# @FUNCTION: emktemp 434# @FUNCTION: emktemp
339# @USAGE: [temp dir] 435# @USAGE: [temp dir]
340# @DESCRIPTION: 436# @DESCRIPTION:
… …
376# base-system@gentoo.org (Linux) 472# base-system@gentoo.org (Linux)
377# Joe Jezak <josejx@gmail.com> (OS X) 473# Joe Jezak <josejx@gmail.com> (OS X)
378# usata@gentoo.org (OS X) 474# usata@gentoo.org (OS X)
379# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 475# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
380# @DESCRIPTION: 476# @DESCRIPTION:
381# Small wrapper for getent (Linux), nidump (Mac OS X), 477# Small wrapper for getent (Linux),
478# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
382# and pw (FreeBSD) used in enewuser()/enewgroup() 479# and pw (FreeBSD) used in enewuser()/enewgroup()
383egetent() { 480egetent() {
384 case ${CHOST} in 481 case ${CHOST} in
385 *-darwin*) 482 *-darwin[678])
386 case "$2" in 483 case "$2" in
387 *[!0-9]*) # Non numeric 484 *[!0-9]*) # Non numeric
388 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
389 ;; 486 ;;
390 *) # Numeric 487 *) # Numeric
391 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 488 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
489 ;;
490 esac
491 ;;
492 *-darwin*)
493 local mytype=$1
494 [[ "passwd" == $mytype ]] && mytype="Users"
495 [[ "group" == $mytype ]] && mytype="Groups"
496 case "$2" in
497 *[!0-9]*) # Non numeric
498 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
499 ;;
500 *) # Numeric
501 local mykey="UniqueID"
502 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
503 dscl . -search /$mytype $mykey $2 2>/dev/null
392 ;; 504 ;;
393 esac 505 esac
394 ;; 506 ;;
395 *-freebsd*|*-dragonfly*) 507 *-freebsd*|*-dragonfly*)
396 local opts action="user" 508 local opts action="user"
… …
596 fi 708 fi
597 ;; 709 ;;
598 710
599 *) 711 *)
600 if [[ -z $@ ]] ; then 712 if [[ -z $@ ]] ; then
601 useradd ${opts} ${euser} \ 713 useradd ${opts} \
602 -c "added by portage for ${PN}" \ 714 -c "added by portage for ${PN}" \
715 ${euser} \
603 || die "enewuser failed" 716 || die "enewuser failed"
604 else 717 else
605 einfo " - Extra: $@" 718 einfo " - Extra: $@"
606 useradd ${opts} ${euser} "$@" \ 719 useradd ${opts} "$@" \
720 ${euser} \
607 || die "enewuser failed" 721 || die "enewuser failed"
608 fi 722 fi
609 ;; 723 ;;
610 esac 724 esac
611 725
… …
845 irc) type=IRCClient;; 959 irc) type=IRCClient;;
846 mail) type=Email;; 960 mail) type=Email;;
847 news) type=News;; 961 news) type=News;;
848 nntp) type=News;; 962 nntp) type=News;;
849 p2p) type=FileTransfer;; 963 p2p) type=FileTransfer;;
964 voip) type=Telephony;;
850 *) type=;; 965 *) type=;;
851 esac 966 esac
852 type="Network;${type}" 967 type="Network;${type}"
853 ;; 968 ;;
854 969
… …
863 math*) type=Math;; 978 math*) type=Math;;
864 physics) type=Physics;; 979 physics) type=Physics;;
865 visual*) type=DataVisualization;; 980 visual*) type=DataVisualization;;
866 *) type=;; 981 *) type=;;
867 esac 982 esac
868 type="Science;${type}" 983 type="Education;Science;${type}"
869 ;; 984 ;;
870 985
871 sys) 986 sys)
872 type="System" 987 type="System"
873 ;; 988 ;;
… …
875 www) 990 www)
876 case ${catmin} in 991 case ${catmin} in
877 client) type=WebBrowser;; 992 client) type=WebBrowser;;
878 *) type=;; 993 *) type=;;
879 esac 994 esac
880 type="Network" 995 type="Network;${type}"
881 ;; 996 ;;
882 997
883 *) 998 *)
884 type= 999 type=
885 ;; 1000 ;;
… …
891 local desktop_name="${PN}-${SLOT}" 1006 local desktop_name="${PN}-${SLOT}"
892 fi 1007 fi
893 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1008 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1009 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 1010
1011 # Don't append another ";" when a valid category value is provided.
1012 type=${type%;}${type:+;}
1013
1014 eshopts_push -s extglob
1015 if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then
1016 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1017 ewarn "allowed in .desktop files if the value is not an absolute path."
1018 icon=${icon%.@(xpm|png|svg)}
1019 fi
1020 eshopts_pop
1021
896 cat <<-EOF > "${desktop}" 1022 cat <<-EOF > "${desktop}"
897 [Desktop Entry] 1023 [Desktop Entry]
898 Version=1.0
899 Name=${name} 1024 Name=${name}
900 Type=Application 1025 Type=Application
901 Comment=${DESCRIPTION} 1026 Comment=${DESCRIPTION}
902 Exec=${exec} 1027 Exec=${exec}
903 TryExec=${exec%% *} 1028 TryExec=${exec%% *}
904 Icon=${icon} 1029 Icon=${icon}
905 Categories=${type}; 1030 Categories=${type}
906 EOF 1031 EOF
907 1032
908 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1033 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
909 1034
910 ( 1035 (
… …
942 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1067 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
943 fi 1068 fi
944} 1069}
945 1070
946# @FUNCTION: make_session_desktop 1071# @FUNCTION: make_session_desktop
947# @USAGE: <title> <command> 1072# @USAGE: <title> <command> [command args...]
948# @DESCRIPTION: 1073# @DESCRIPTION:
949# Make a GDM/KDM Session file. The title is the file to execute to start the 1074# Make a GDM/KDM Session file. The title is the file to execute to start the
950# Window Manager. The command is the name of the Window Manager. 1075# Window Manager. The command is the name of the Window Manager.
1076#
1077# You can set the name of the file via the ${wm} variable.
951make_session_desktop() { 1078make_session_desktop() {
952 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1079 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
953 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1080 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
954 1081
955 local title=$1 1082 local title=$1
956 local command=$2 1083 local command=$2
957 local desktop=${T}/${wm}.desktop 1084 local desktop=${T}/${wm:-${PN}}.desktop
1085 shift 2
958 1086
959 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
960 [Desktop Entry] 1088 [Desktop Entry]
961 Name=${title} 1089 Name=${title}
962 Comment=This session logs you into ${title} 1090 Comment=This session logs you into ${title}
963 Exec=${command} 1091 Exec=${command} $*
964 TryExec=${command} 1092 TryExec=${command}
965 Type=Application 1093 Type=XSession
966 EOF 1094 EOF
967 1095
968 ( 1096 (
969 # wrap the env here so that the 'insinto' call 1097 # wrap the env here so that the 'insinto' call
970 # doesn't corrupt the env of the caller 1098 # doesn't corrupt the env of the caller
… …
1282 lic="${PWD}/${lic}" 1410 lic="${PWD}/${lic}"
1283 elif [ -e "${lic}" ] ; then 1411 elif [ -e "${lic}" ] ; then
1284 lic="${lic}" 1412 lic="${lic}"
1285 fi 1413 fi
1286 fi 1414 fi
1287 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1288 local l="`basename ${lic}`" 1415 local l="`basename ${lic}`"
1289 1416
1290 # here is where we check for the licenses the user already 1417 # here is where we check for the licenses the user already
1291 # accepted ... if we don't find a match, we make the user accept 1418 # accepted ... if we don't find a match, we make the user accept
1292 local shopts=$-
1293 local alic 1419 local alic
1294 set -o noglob #so that bash doesn't expand "*" 1420 eshopts_push -o noglob # so that bash doesn't expand "*"
1295 for alic in ${ACCEPT_LICENSE} ; do 1421 for alic in ${ACCEPT_LICENSE} ; do
1296 if [[ ${alic} == ${l} ]]; then 1422 if [[ ${alic} == ${l} ]]; then
1297 set +o noglob; set -${shopts} #reset old shell opts 1423 eshopts_pop
1298 return 0 1424 return 0
1299 fi 1425 fi
1300 done 1426 done
1301 set +o noglob; set -$shopts #reset old shell opts 1427 eshopts_pop
1428 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1302 1429
1303 local licmsg=$(emktemp) 1430 local licmsg=$(emktemp)
1304 cat <<-EOF > ${licmsg} 1431 cat <<-EOF > ${licmsg}
1305 ********************************************************** 1432 **********************************************************
1306 The following license outlines the terms of use of this 1433 The following license outlines the terms of use of this
… …
1553# of the lists. 1680# of the lists.
1554strip-linguas() { 1681strip-linguas() {
1555 local ls newls nols 1682 local ls newls nols
1556 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1683 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1557 local op=$1; shift 1684 local op=$1; shift
1558 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1685 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1559 local d f 1686 local d f
1560 for d in "$@" ; do 1687 for d in "$@" ; do
1561 if [[ ${op} == "-u" ]] ; then 1688 if [[ ${op} == "-u" ]] ; then
1562 newls=${ls} 1689 newls=${ls}
1563 else 1690 else
1564 newls="" 1691 newls=""
1565 fi 1692 fi
1566 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1567 if [[ ${op} == "-i" ]] ; then 1694 if [[ ${op} == "-i" ]] ; then
1568 hasq ${f} ${ls} && newls="${newls} ${f}" 1695 hasq ${f} ${ls} && newls="${newls} ${f}"
1569 else 1696 else
1570 hasq ${f} ${ls} || newls="${newls} ${f}" 1697 hasq ${f} ${ls} || newls="${newls} ${f}"
1571 fi 1698 fi
… …
1584 else 1711 else
1585 nols="${nols} ${f}" 1712 nols="${nols} ${f}"
1586 fi 1713 fi
1587 done 1714 done
1588 [[ -n ${nols} ]] \ 1715 [[ -n ${nols} ]] \
1589 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1716 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1590 export LINGUAS=${newls:1} 1717 export LINGUAS=${newls:1}
1591} 1718}
1592 1719
1593# @FUNCTION: preserve_old_lib 1720# @FUNCTION: preserve_old_lib
1594# @USAGE: <libs to preserve> [more libs] 1721# @USAGE: <libs to preserve> [more libs]
… …
1657} 1784}
1658 1785
1659# @FUNCTION: built_with_use 1786# @FUNCTION: built_with_use
1660# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1787# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1661# @DESCRIPTION: 1788# @DESCRIPTION:
1789#
1790# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1791#
1662# A temporary hack until portage properly supports DEPENDing on USE 1792# A temporary hack until portage properly supports DEPENDing on USE
1663# flags being enabled in packages. This will check to see if the specified 1793# flags being enabled in packages. This will check to see if the specified
1664# DEPEND atom was built with the specified list of USE flags. The 1794# DEPEND atom was built with the specified list of USE flags. The
1665# --missing option controls the behavior if called on a package that does 1795# --missing option controls the behavior if called on a package that does
1666# not actually support the defined USE flags (aka listed in IUSE). 1796# not actually support the defined USE flags (aka listed in IUSE).
1667# The default is to abort (call die). The -a and -o flags control 1797# The default is to abort (call die). The -a and -o flags control
1668# the requirements of the USE flags. They correspond to "and" and "or" 1798# the requirements of the USE flags. They correspond to "and" and "or"
1669# logic. So the -a flag means all listed USE flags must be enabled 1799# logic. So the -a flag means all listed USE flags must be enabled
1670# while the -o flag means at least one of the listed fIUSE flags must be 1800# while the -o flag means at least one of the listed IUSE flags must be
1671# enabled. The --hidden option is really for internal use only as it 1801# enabled. The --hidden option is really for internal use only as it
1672# means the USE flag we're checking is hidden expanded, so it won't be found 1802# means the USE flag we're checking is hidden expanded, so it won't be found
1673# in IUSE like normal USE flags. 1803# in IUSE like normal USE flags.
1674# 1804#
1675# Remember that this function isn't terribly intelligent so order of optional 1805# Remember that this function isn't terribly intelligent so order of optional
… …
1710 die) die "Unable to determine what USE flags $PKG was built with";; 1840 die) die "Unable to determine what USE flags $PKG was built with";;
1711 esac 1841 esac
1712 fi 1842 fi
1713 1843
1714 if [[ ${hidden} == "no" ]] ; then 1844 if [[ ${hidden} == "no" ]] ; then
1715 local IUSE_BUILT=$(<${IUSEFILE}) 1845 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1716 # Don't check USE_EXPAND #147237 1846 # Don't check USE_EXPAND #147237
1717 local expand 1847 local expand
1718 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1848 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1719 if [[ $1 == ${expand}_* ]] ; then 1849 if [[ $1 == ${expand}_* ]] ; then
1720 expand="" 1850 expand=""
1721 break 1851 break
1722 fi 1852 fi
1723 done 1853 done
1724 if [[ -n ${expand} ]] ; then 1854 if [[ -n ${expand} ]] ; then
1725 if ! has $1 ${IUSE_BUILT} ; then 1855 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1726 case ${missing_action} in 1856 case ${missing_action} in
1727 true) return 0;; 1857 true) return 0;;
1728 false) return 1;; 1858 false) return 1;;
1729 die) die "$PKG does not actually support the $1 USE flag!";; 1859 die) die "$PKG does not actually support the $1 USE flag!";;
1730 esac 1860 esac
… …
1794 ) || die 1924 ) || die
1795 else 1925 else
1796 newbin "${tmpwrapper}" "${wrapper}" || die 1926 newbin "${tmpwrapper}" "${wrapper}" || die
1797 fi 1927 fi
1798} 1928}
1929
1930# @FUNCTION: prepalldocs
1931# @USAGE:
1932# @DESCRIPTION:
1933# Compress files in /usr/share/doc which are not already
1934# compressed, excluding /usr/share/doc/${PF}/html.
1935# Uses the ecompressdir to do the compression.
1936# 2009-02-18 by betelgeuse:
1937# Commented because ecompressdir is even more internal to
1938# Portage than prepalldocs (it's not even mentioned in man 5
1939# ebuild). Please submit a better version for review to gentoo-dev
1940# if you want prepalldocs here.
1941#prepalldocs() {
1942# if [[ -n $1 ]] ; then
1943# ewarn "prepalldocs: invalid usage; takes no arguments"
1944# fi
1945
1946# cd "${D}"
1947# [[ -d usr/share/doc ]] || return 0
1948
1949# find usr/share/doc -exec gzip {} +
1950# ecompressdir --ignore /usr/share/doc/${PF}/html
1951# ecompressdir --queue /usr/share/doc
1952#}
Legend:
Removed from v.1.300  
changed lines
  Added in v.1.334
  ViewVC Help
Powered by ViewVC 1.1.20