/[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.328
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.328 2010/01/10 15:58:58 scarabeus 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
… …
68esvn_clean() { 68esvn_clean() {
69 [[ -z $* ]] && set -- . 69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 71}
72 72
73# Default directory where patches are located 73# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`]
75# @DESCRIPTION:
76# 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
78# 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.
80#
81# 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:
83# @CODE
84# eshopts_push -o noglob
85# for x in ${foo} ; do
86# if ...some check... ; then
87# eshopts_pop
88# return 0
89# fi
90# done
91# eshopts_pop
92# @CODE
93eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]}
97 __ESHOPTS_SAVE__[$i]=$-
98 [[ $# -eq 0 ]] && return 0
99 set "$@" || die "eshopts_push: bad options to set: $*"
100}
101
102# @FUNCTION: eshopts_pop
103# @USAGE:
104# @DESCRIPTION:
105# Restore the shell options to the state saved with the corresponding
106# eshopts_push call. See that function for more details.
107eshopts_pop() {
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __ESHOPTS_SAVE__[$i]
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
115}
116
117# @VARIABLE: EPATCH_SOURCE
118# @DESCRIPTION:
119# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 120EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 121# @VARIABLE: EPATCH_SUFFIX
122# @DESCRIPTION:
123# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 124EPATCH_SUFFIX="patch.bz2"
125# @VARIABLE: EPATCH_OPTS
126# @DESCRIPTION:
77# Default options for patch 127# Default options for patch:
128# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 129# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 130# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 131# -E - automatically remove empty files
132# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 133EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
134# @VARIABLE: EPATCH_EXCLUDE
135# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 136# List of patches not to apply. Note this is only file names,
83# and not the full path .. 137# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 138EPATCH_EXCLUDE=""
139# @VARIABLE: EPATCH_SINGLE_MSG
140# @DESCRIPTION:
85# Change the printed message for a single patch. 141# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 142EPATCH_SINGLE_MSG=""
143# @VARIABLE: EPATCH_MULTI_MSG
144# @DESCRIPTION:
87# Change the printed message for multiple patches. 145# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 146EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 147# @VARIABLE: EPATCH_FORCE
90# 148# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 149# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 150# arch naming style.
93EPATCH_FORCE="no" 151EPATCH_FORCE="no"
94 152
95# This function is for bulk patching, or in theory for just one 153# @FUNCTION: epatch
96# or two patches. 154# @USAGE: [patches] [dirs of patches]
155# @DESCRIPTION:
156# epatch is designed to greatly simplify the application of patches. It can
157# process patch files directly, or directories of patches. The patches may be
158# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
159# the -p option as epatch will automatically attempt -p0 to -p5 until things
160# apply successfully.
97# 161#
98# It should work with .bz2, .gz, .zip and plain text patches. 162# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 163# specified by EPATCH_SOURCE.
100# 164#
101# You do not have to specify '-p' option to patch, as it will 165# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 166# @CODE
103# 167# ${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} 168# ??_${ARCH}_foo.${EPATCH_SUFFIX}
169# else
170# *.${EPATCH_SUFFIX}
171# @CODE
172# The leading ?? are typically numbers used to force consistent patch ordering.
173# The arch field is used to apply patches only for the host architecture with
174# the special value of "all" means apply for everyone. Note that using values
175# other than "all" is highly discouraged -- you should apply patches all the
176# time and let architecture details be detected at configure/compile time.
113# 177#
114# For example: 178# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
179# for patches to apply.
115# 180#
116# 01_all_misc-fix.patch.bz2 181# 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() { 182epatch() {
129 _epatch_draw_line() { 183 _epatch_draw_line() {
184 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 185 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 186 echo "${1//?/=}"
132 } 187 }
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 188
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 189 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 190
143 if [ "$#" -gt 1 ] 191 # Let the rest of the code process one user arg at a time --
144 then 192 # each arg may expand into multiple patches, and each arg may
193 # need to start off with the default global EPATCH_xxx values
194 if [[ $# -gt 1 ]] ; then
145 local m="" 195 local m
146 for m in "$@" ; do 196 for m in "$@" ; do
147 epatch "${m}" 197 epatch "${m}"
148 done 198 done
149 return 0 199 return 0
150 fi 200 fi
151 201
152 if [ -n "$1" -a -f "$1" ] 202 local SINGLE_PATCH="no"
153 then 203 # no args means process ${EPATCH_SOURCE}
204 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
205
206 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 207 SINGLE_PATCH="yes"
155 208 set -- "$1"
156 local EPATCH_SOURCE="$1" 209 # Use the suffix from the single patch (localize it); the code
210 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 211 local EPATCH_SUFFIX=$1
158 212
159 elif [ -n "$1" -a -d "$1" ] 213 elif [[ -d $1 ]] ; then
160 then 214 # 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 ... 215 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 216
217 else
218 # sanity check ... if it isn't a dir or file, wtf man ?
219 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
220 echo
221 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
222 eerror
223 eerror " ${EPATCH_SOURCE}"
224 eerror " ( ${EPATCH_SOURCE##*/} )"
225 echo
226 die "Cannot find \$EPATCH_SOURCE!"
227 fi
228
229 local PIPE_CMD
230 case ${EPATCH_SUFFIX##*\.} in
231 xz) PIPE_CMD="xz -dc" ;;
232 lzma) PIPE_CMD="lzma -dc" ;;
233 bz2) PIPE_CMD="bzip2 -dc" ;;
234 gz|Z|z) PIPE_CMD="gzip -dc" ;;
235 ZIP|zip) PIPE_CMD="unzip -p" ;;
236 *) ;;
237 esac
238
239 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
240
241 local x
242 for x in "$@" ; do
243 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
244 # didn't match anything, ignore continue on
245 [[ ! -f ${x} ]] && continue
246
247 local patchname=${x##*/}
248
249 # Apply single patches, or forced sets of patches, or
250 # patches with ARCH dependant names.
251 # ???_arch_foo.patch
252 # Else, skip this input altogether
253 local a=${patchname#*_} # strip the ???_
254 a=${a%%_*} # strip the _foo.patch
255 if ! [[ ${SINGLE_PATCH} == "yes" || \
256 ${EPATCH_FORCE} == "yes" || \
257 ${a} == all || \
258 ${a} == ${ARCH} ]]
163 then 259 then
164 local EPATCH_SOURCE="$1/*" 260 continue
261 fi
262
263 # Let people filter things dynamically
264 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
265 # let people use globs in the exclude
266 eshopts_push -o noglob
267
268 local ex
269 for ex in ${EPATCH_EXCLUDE} ; do
270 if [[ ${patchname} == ${ex} ]] ; then
271 eshopts_pop
272 continue 2
273 fi
274 done
275
276 eshopts_pop
277 fi
278
279 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
280 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
281 einfo "${EPATCH_SINGLE_MSG}"
282 else
283 einfo "Applying ${patchname} ..."
284 fi
165 else 285 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 286 einfo " ${patchname} ..."
167 fi 287 fi
168 else 288
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 289 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 290 # but if there are more, make sure we get unique log filenames
171 then 291 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 292 if [[ -e ${STDERR_TARGET} ]] ; then
293 STDERR_TARGET="${T}/${patchname}-$$.out"
294 fi
295
296 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
297
298 # Decompress the patch if need be
299 local count=0
300 local PATCH_TARGET
301 if [[ -n ${PIPE_CMD} ]] ; then
302 PATCH_TARGET="${T}/$$.patch"
303 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
304
305 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
306 echo
307 eerror "Could not extract patch!"
308 #die "Could not extract patch!"
309 count=5
310 break
173 fi 311 fi
312 else
313 PATCH_TARGET=${x}
314 fi
174 315
316 # Check for absolute paths in patches. If sandbox is disabled,
317 # people could (accidently) patch files in the root filesystem.
318 # Or trigger other unpleasantries #237667. So disallow -p0 on
319 # such patches.
320 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
321 if [[ -n ${abs_paths} ]] ; then
322 count=1
323 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
324 fi
325
326 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
327 while [[ ${count} -lt 5 ]] ; do
328 # Generate some useful debug info ...
329 (
330 _epatch_draw_line "***** ${patchname} *****"
175 echo 331 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 332 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
333 echo
334 _epatch_draw_line "***** ${patchname} *****"
335 ) >> "${STDERR_TARGET}"
336
337 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
338 (
339 _epatch_draw_line "***** ${patchname} *****"
340 echo
341 echo "ACTUALLY APPLYING ${patchname} ..."
342 echo
343 _epatch_draw_line "***** ${patchname} *****"
344 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
345 ) >> "${STDERR_TARGET}"
346
347 if [ $? -ne 0 ] ; then
348 echo
349 eerror "A dry-run of patch command succeeded, but actually"
350 eerror "applying the patch failed!"
351 #die "Real world sux compared to the dreamworld!"
352 count=5
353 fi
354 break
355 fi
356
357 : $(( count++ ))
358 done
359
360 # if we had to decompress the patch, delete the temp one
361 if [[ -n ${PIPE_CMD} ]] ; then
362 rm -f "${PATCH_TARGET}"
363 fi
364
365 if [[ ${count} -ge 5 ]] ; then
366 echo
367 eerror "Failed Patch: ${patchname} !"
368 eerror " ( ${PATCH_TARGET} )"
177 eerror 369 eerror
178 eerror " ${EPATCH_SOURCE}" 370 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 371 eerror
372 eerror " ${STDERR_TARGET}"
180 echo 373 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}!" 374 die "Failed Patch: ${patchname}!"
336 fi 375 fi
337 376
338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 377 # if everything worked, delete the patch log
339 378 rm -f "${STDERR_TARGET}"
340 eend 0 379 eend 0
341 fi
342 done 380 done
343 if [ "${SINGLE_PATCH}" = "no" ] 381
344 then 382 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
345 einfo "Done with patching" 383 : # everything worked
384}
385epatch_user() {
386 [[ $# -ne 0 ]] && die "epatch_user takes no options"
387
388 # don't clobber any EPATCH vars that the parent might want
389 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
390 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
391 EPATCH_SOURCE=${base}/${CTARGET}/${check}
392 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
393 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
394 if [[ -d ${EPATCH_SOURCE} ]] ; then
395 EPATCH_SOURCE=${EPATCH_SOURCE} \
396 EPATCH_SUFFIX="patch" \
397 EPATCH_FORCE="yes" \
398 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
399 epatch
400 break
346 fi 401 fi
402 done
347} 403}
348 404
349# @FUNCTION: emktemp 405# @FUNCTION: emktemp
350# @USAGE: [temp dir] 406# @USAGE: [temp dir]
351# @DESCRIPTION: 407# @DESCRIPTION:
… …
392# Small wrapper for getent (Linux), 448# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), 449# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
394# and pw (FreeBSD) used in enewuser()/enewgroup() 450# and pw (FreeBSD) used in enewuser()/enewgroup()
395egetent() { 451egetent() {
396 case ${CHOST} in 452 case ${CHOST} in
453 *-darwin[678])
454 case "$2" in
455 *[!0-9]*) # Non numeric
456 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
457 ;;
458 *) # Numeric
459 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
460 ;;
461 esac
462 ;;
397 *-darwin9) 463 *-darwin*)
398 local mytype=$1 464 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users" 465 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups" 466 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in 467 case "$2" in
402 *[!0-9]*) # Non numeric 468 *[!0-9]*) # Non numeric
… …
404 ;; 470 ;;
405 *) # Numeric 471 *) # Numeric
406 local mykey="UniqueID" 472 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID" 473 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null 474 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 ;; 475 ;;
420 esac 476 esac
421 ;; 477 ;;
422 *-freebsd*|*-dragonfly*) 478 *-freebsd*|*-dragonfly*)
423 local opts action="user" 479 local opts action="user"
… …
623 fi 679 fi
624 ;; 680 ;;
625 681
626 *) 682 *)
627 if [[ -z $@ ]] ; then 683 if [[ -z $@ ]] ; then
628 useradd ${opts} ${euser} \ 684 useradd ${opts} \
629 -c "added by portage for ${PN}" \ 685 -c "added by portage for ${PN}" \
686 ${euser} \
630 || die "enewuser failed" 687 || die "enewuser failed"
631 else 688 else
632 einfo " - Extra: $@" 689 einfo " - Extra: $@"
633 useradd ${opts} ${euser} "$@" \ 690 useradd ${opts} "$@" \
691 ${euser} \
634 || die "enewuser failed" 692 || die "enewuser failed"
635 fi 693 fi
636 ;; 694 ;;
637 esac 695 esac
638 696
… …
920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 978 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 979 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
922 980
923 cat <<-EOF > "${desktop}" 981 cat <<-EOF > "${desktop}"
924 [Desktop Entry] 982 [Desktop Entry]
925 Version=1.0
926 Name=${name} 983 Name=${name}
927 Type=Application 984 Type=Application
928 Comment=${DESCRIPTION} 985 Comment=${DESCRIPTION}
929 Exec=${exec} 986 Exec=${exec}
930 TryExec=${exec%% *} 987 TryExec=${exec%% *}
… …
1312 lic="${PWD}/${lic}" 1369 lic="${PWD}/${lic}"
1313 elif [ -e "${lic}" ] ; then 1370 elif [ -e "${lic}" ] ; then
1314 lic="${lic}" 1371 lic="${lic}"
1315 fi 1372 fi
1316 fi 1373 fi
1317 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1318 local l="`basename ${lic}`" 1374 local l="`basename ${lic}`"
1319 1375
1320 # here is where we check for the licenses the user already 1376 # 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 1377 # accepted ... if we don't find a match, we make the user accept
1322 local shopts=$-
1323 local alic 1378 local alic
1324 set -o noglob #so that bash doesn't expand "*" 1379 eshopts_push -o noglob # so that bash doesn't expand "*"
1325 for alic in ${ACCEPT_LICENSE} ; do 1380 for alic in ${ACCEPT_LICENSE} ; do
1326 if [[ ${alic} == ${l} ]]; then 1381 if [[ ${alic} == ${l} ]]; then
1327 set +o noglob; set -${shopts} #reset old shell opts 1382 eshopts_pop
1328 return 0 1383 return 0
1329 fi 1384 fi
1330 done 1385 done
1331 set +o noglob; set -$shopts #reset old shell opts 1386 eshopts_pop
1387 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1332 1388
1333 local licmsg=$(emktemp) 1389 local licmsg=$(emktemp)
1334 cat <<-EOF > ${licmsg} 1390 cat <<-EOF > ${licmsg}
1335 ********************************************************** 1391 **********************************************************
1336 The following license outlines the terms of use of this 1392 The following license outlines the terms of use of this
… …
1614 else 1670 else
1615 nols="${nols} ${f}" 1671 nols="${nols} ${f}"
1616 fi 1672 fi
1617 done 1673 done
1618 [[ -n ${nols} ]] \ 1674 [[ -n ${nols} ]] \
1619 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1675 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1620 export LINGUAS=${newls:1} 1676 export LINGUAS=${newls:1}
1621} 1677}
1622 1678
1623# @FUNCTION: preserve_old_lib 1679# @FUNCTION: preserve_old_lib
1624# @USAGE: <libs to preserve> [more libs] 1680# @USAGE: <libs to preserve> [more libs]
Legend:
Removed from v.1.315  
changed lines
  Added in v.1.328
  ViewVC Help
Powered by ViewVC 1.1.13