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

Diff of /eclass/eutils.eclass

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

Revision 1.294 Revision 1.325
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.294 2008/01/14 04:52:35 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.325 2010/01/09 20:06:24 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
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50} 50}
51 51
52# Default directory where patches are located 52# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs]
54# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD.
57ecvs_clean() {
58 [[ -z $* ]] && set -- .
59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
61}
62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
72
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.
53EPATCH_SOURCE="${WORKDIR}/patch" 120EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 121# @VARIABLE: EPATCH_SUFFIX
122# @DESCRIPTION:
123# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 124EPATCH_SUFFIX="patch.bz2"
125# @VARIABLE: EPATCH_OPTS
126# @DESCRIPTION:
56# Default options for patch 127# Default options for patch:
128# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 129# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 130# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 131# -E - automatically remove empty files
132# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 133EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
134# @VARIABLE: EPATCH_EXCLUDE
135# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 136# List of patches not to apply. Note this is only file names,
62# and not the full path .. 137# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 138EPATCH_EXCLUDE=""
139# @VARIABLE: EPATCH_SINGLE_MSG
140# @DESCRIPTION:
64# Change the printed message for a single patch. 141# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 142EPATCH_SINGLE_MSG=""
143# @VARIABLE: EPATCH_MULTI_MSG
144# @DESCRIPTION:
66# Change the printed message for multiple patches. 145# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 146EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 147# @VARIABLE: EPATCH_FORCE
69# 148# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 149# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 150# arch naming style.
72EPATCH_FORCE="no" 151EPATCH_FORCE="no"
73 152
74# This function is for bulk patching, or in theory for just one 153# @FUNCTION: epatch
75# 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.
76# 161#
77# 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
78# Currently all patches should be the same format. 163# specified by EPATCH_SOURCE.
79# 164#
80# You do not have to specify '-p' option to patch, as it will 165# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 166# @CODE
82# 167# ${EPATCH_FORCE} == "yes"
83# Above EPATCH_* variables can be used to control various defaults,
84# bug they should be left as is to ensure an ebuild can rely on
85# them for.
86#
87# Patches are applied in current directory.
88#
89# Bulk Patches should preferibly have the form of:
90#
91# ??_${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.
92# 177#
93# For example: 178# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
179# for patches to apply.
94# 180#
95# 01_all_misc-fix.patch.bz2 181# Refer to the other EPATCH_xxx variables for more customization of behavior.
96# 02_sparc_another-fix.patch.bz2
97#
98# This ensures that there are a set order, and you can have ARCH
99# specific patches.
100#
101# If you however give an argument to epatch(), it will treat it as a
102# single patch that need to be applied if its a file. If on the other
103# hand its a directory, it will set EPATCH_SOURCE to this.
104#
105# <azarah@gentoo.org> (10 Nov 2002)
106#
107epatch() { 182epatch() {
108 _epatch_draw_line() { 183 _epatch_draw_line() {
184 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 185 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 186 echo "${1//?/=}"
111 } 187 }
112 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
113 local PIPE_CMD=""
114 local STDERR_TARGET="${T}/$$.out"
115 local PATCH_TARGET="${T}/$$.patch"
116 local PATCH_SUFFIX=""
117 local SINGLE_PATCH="no"
118 local x=""
119 188
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 189 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 190
122 if [ "$#" -gt 1 ] 191 # Let the rest of the code process one user arg at a time --
123 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
124 local m="" 195 local m
125 for m in "$@" ; do 196 for m in "$@" ; do
126 epatch "${m}" 197 epatch "${m}"
127 done 198 done
128 return 0 199 return 0
129 fi 200 fi
130 201
131 if [ -n "$1" -a -f "$1" ] 202 local SINGLE_PATCH="no"
132 then 203 # no args means process ${EPATCH_SOURCE}
204 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
205
206 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 207 SINGLE_PATCH="yes"
134 208 set -- "$1"
135 local EPATCH_SOURCE="$1" 209 # Use the suffix from the single patch (localize it); the code
210 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 211 local EPATCH_SUFFIX=$1
137 212
138 elif [ -n "$1" -a -d "$1" ] 213 elif [[ -d $1 ]] ; then
139 then 214 # Some people like to make dirs of patches w/out suffixes (vim)
140 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 215 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 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} ]]
142 then 259 then
143 local EPATCH_SOURCE="$1/*" 260 continue
144 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
146 fi
147 else
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
150 then
151 EPATCH_SOURCE="$1"
152 fi 261 fi
153 262
154 echo 263 # Let people filter things dynamically
155 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
156 eerror
157 eerror " ${EPATCH_SOURCE}"
158 eerror " ( ${EPATCH_SOURCE##*/} )"
159 echo
160 die "Cannot find \$EPATCH_SOURCE!"
161 fi
162
163 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
164 fi
165
166 case ${EPATCH_SUFFIX##*\.} in
167 bz2)
168 PIPE_CMD="bzip2 -dc"
169 PATCH_SUFFIX="bz2"
170 ;;
171 gz|Z|z)
172 PIPE_CMD="gzip -dc"
173 PATCH_SUFFIX="gz"
174 ;;
175 ZIP|zip)
176 PIPE_CMD="unzip -p"
177 PATCH_SUFFIX="zip"
178 ;;
179 *)
180 PIPE_CMD="cat"
181 PATCH_SUFFIX="patch"
182 ;;
183 esac
184
185 if [ "${SINGLE_PATCH}" = "no" ]
186 then
187 einfo "${EPATCH_MULTI_MSG}"
188 fi
189 for x in ${EPATCH_SOURCE}
190 do
191 # New ARCH dependant patch naming scheme ...
192 #
193 # ???_arch_foo.patch
194 #
195 if [ -f ${x} ] && \
196 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
197 [ "${EPATCH_FORCE}" = "yes" ])
198 then
199 local count=0
200 local popts="${EPATCH_OPTS}"
201 local patchname=${x##*/}
202
203 if [ -n "${EPATCH_EXCLUDE}" ] 264 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
204 then 265 # let people use globs in the exclude
205 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ] 266 eshopts_push -o noglob
206 then 267
268 local ex
269 for ex in ${EPATCH_EXCLUDE} ; do
270 if [[ ${patchname} == ${ex} ]] ; then
271 eshopts_pop
207 continue 272 continue
208 fi 273 fi
274 done
275 eshopts_pop
276 fi
277
278 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
279 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
280 einfo "${EPATCH_SINGLE_MSG}"
281 else
282 einfo "Applying ${patchname} ..."
209 fi 283 fi
210
211 if [ "${SINGLE_PATCH}" = "yes" ]
212 then
213 if [ -n "${EPATCH_SINGLE_MSG}" ]
214 then
215 einfo "${EPATCH_SINGLE_MSG}"
216 else 284 else
217 einfo "Applying ${patchname} ..." 285 einfo " ${patchname} ..."
286 fi
287
288 # most of the time, there will only be one run per unique name,
289 # but if there are more, make sure we get unique log filenames
290 local STDERR_TARGET="${T}/${patchname}.out"
291 if [[ -e ${STDERR_TARGET} ]] ; then
292 STDERR_TARGET="${T}/${patchname}-$$.out"
293 fi
294
295 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
296
297 # Decompress the patch if need be
298 local count=0
299 local PATCH_TARGET
300 if [[ -n ${PIPE_CMD} ]] ; then
301 PATCH_TARGET="${T}/$$.patch"
302 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
303
304 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
305 echo
306 eerror "Could not extract patch!"
307 #die "Could not extract patch!"
308 count=5
309 break
310 fi
311 else
312 PATCH_TARGET=${x}
313 fi
314
315 # Check for absolute paths in patches. If sandbox is disabled,
316 # people could (accidently) patch files in the root filesystem.
317 # Or trigger other unpleasantries #237667. So disallow -p0 on
318 # such patches.
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then
321 count=1
322 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
323 fi
324
325 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
326 while [[ ${count} -lt 5 ]] ; do
327 # Generate some useful debug info ...
328 (
329 _epatch_draw_line "***** ${patchname} *****"
330 echo
331 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
332 echo
333 _epatch_draw_line "***** ${patchname} *****"
334 ) >> "${STDERR_TARGET}"
335
336 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
337 (
338 _epatch_draw_line "***** ${patchname} *****"
339 echo
340 echo "ACTUALLY APPLYING ${patchname} ..."
341 echo
342 _epatch_draw_line "***** ${patchname} *****"
343 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
344 ) >> "${STDERR_TARGET}"
345
346 if [ $? -ne 0 ] ; then
347 echo
348 eerror "A dry-run of patch command succeeded, but actually"
349 eerror "applying the patch failed!"
350 #die "Real world sux compared to the dreamworld!"
351 count=5
218 fi 352 fi
219 else 353 break
220 einfo " ${patchname} ..."
221 fi 354 fi
222 355
223 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 356 : $(( count++ ))
224 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225
226 # Allow for prefix to differ ... im lazy, so shoot me :/
227 while [ "${count}" -lt 5 ]
228 do
229 # Generate some useful debug info ...
230 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
231 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232
233 if [ "${PATCH_SUFFIX}" != "patch" ]
234 then
235 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
236 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 else
238 PATCH_TARGET="${x}"
239 fi
240
241 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
242 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243
244 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246
247 if [ "${PATCH_SUFFIX}" != "patch" ]
248 then
249 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
250 then
251 echo
252 eerror "Could not extract patch!"
253 #die "Could not extract patch!"
254 count=5
255 break
256 fi
257 fi
258
259 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
260 then
261 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266
267 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
268 _epatch_assert
269
270 if [ "$?" -ne 0 ]
271 then
272 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo
274 eerror "A dry-run of patch command succeeded, but actually"
275 eerror "applying the patch failed!"
276 #die "Real world sux compared to the dreamworld!"
277 count=5
278 fi
279
280 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
281
282 break
283 fi
284
285 count=$((count + 1))
286 done 357 done
287 358
288 if [ "${PATCH_SUFFIX}" != "patch" ] 359 # if we had to decompress the patch, delete the temp one
289 then 360 if [[ -n ${PIPE_CMD} ]] ; then
290 rm -f ${PATCH_TARGET} 361 rm -f "${PATCH_TARGET}"
291 fi 362 fi
292 363
293 if [ "${count}" -eq 5 ] 364 if [[ ${count} -ge 5 ]] ; then
294 then
295 echo 365 echo
296 eerror "Failed Patch: ${patchname} !" 366 eerror "Failed Patch: ${patchname} !"
297 eerror " ( ${PATCH_TARGET} )" 367 eerror " ( ${PATCH_TARGET} )"
298 eerror 368 eerror
299 eerror "Include in your bugreport the contents of:" 369 eerror "Include in your bugreport the contents of:"
300 eerror 370 eerror
301 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 371 eerror " ${STDERR_TARGET}"
302 echo 372 echo
303 die "Failed Patch: ${patchname}!" 373 die "Failed Patch: ${patchname}!"
304 fi 374 fi
305 375
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 376 # if everything worked, delete the patch log
307 377 rm -f "${STDERR_TARGET}"
308 eend 0 378 eend 0
309 fi
310 done 379 done
311 if [ "${SINGLE_PATCH}" = "no" ] 380
312 then 381 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 einfo "Done with patching" 382 : # everything worked
383}
384epatch_user() {
385 [[ $# -ne 0 ]] && die "epatch_user takes no options"
386
387 # don't clobber any EPATCH vars that the parent might want
388 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
389 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
390 EPATCH_SOURCE=${base}/${CTARGET}/${check}
391 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
392 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
393 if [[ -d ${EPATCH_SOURCE} ]] ; then
394 EPATCH_SOURCE=${EPATCH_SOURCE} \
395 EPATCH_SUFFIX="patch" \
396 EPATCH_FORCE="yes" \
397 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
398 epatch
399 break
314 fi 400 fi
401 done
315} 402}
316 403
317# @FUNCTION: emktemp 404# @FUNCTION: emktemp
318# @USAGE: [temp dir] 405# @USAGE: [temp dir]
319# @DESCRIPTION: 406# @DESCRIPTION:
355# base-system@gentoo.org (Linux) 442# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 443# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 444# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 445# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 446# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 447# Small wrapper for getent (Linux),
448# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 449# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 450egetent() {
363 case ${CHOST} in 451 case ${CHOST} in
364 *-darwin*) 452 *-darwin[678])
365 case "$2" in 453 case "$2" in
366 *[!0-9]*) # Non numeric 454 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 455 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
368 ;; 456 ;;
369 *) # Numeric 457 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 458 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
459 ;;
460 esac
461 ;;
462 *-darwin*)
463 local mytype=$1
464 [[ "passwd" == $mytype ]] && mytype="Users"
465 [[ "group" == $mytype ]] && mytype="Groups"
466 case "$2" in
467 *[!0-9]*) # Non numeric
468 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
469 ;;
470 *) # Numeric
471 local mykey="UniqueID"
472 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
473 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 474 ;;
372 esac 475 esac
373 ;; 476 ;;
374 *-freebsd*|*-dragonfly*) 477 *-freebsd*|*-dragonfly*)
375 local opts action="user" 478 local opts action="user"
575 fi 678 fi
576 ;; 679 ;;
577 680
578 *) 681 *)
579 if [[ -z $@ ]] ; then 682 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 683 useradd ${opts} \
581 -c "added by portage for ${PN}" \ 684 -c "added by portage for ${PN}" \
685 ${euser} \
582 || die "enewuser failed" 686 || die "enewuser failed"
583 else 687 else
584 einfo " - Extra: $@" 688 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 689 useradd ${opts} "$@" \
690 ${euser} \
586 || die "enewuser failed" 691 || die "enewuser failed"
587 fi 692 fi
588 ;; 693 ;;
589 esac 694 esac
590 695
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 977 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 978 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 979
875 cat <<-EOF > "${desktop}" 980 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 981 [Desktop Entry]
877 Version=1.0
878 Name=${name} 982 Name=${name}
879 Type=Application 983 Type=Application
880 Comment=${DESCRIPTION} 984 Comment=${DESCRIPTION}
881 Exec=${exec} 985 Exec=${exec}
882 TryExec=${exec%% *} 986 TryExec=${exec%% *}
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1025 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1026 fi
923} 1027}
924 1028
925# @FUNCTION: make_session_desktop 1029# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1030# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1031# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1032# Make a GDM/KDM Session file. The title is the file to execute to start the
929# Window Manager. The command is the name of the Window Manager. 1033# Window Manager. The command is the name of the Window Manager.
1034#
1035# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1036make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1037 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
932 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1038 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1039
934 local title=$1 1040 local title=$1
935 local command=$2 1041 local command=$2
936 local desktop=${T}/${wm}.desktop 1042 local desktop=${T}/${wm:-${PN}}.desktop
1043 shift 2
937 1044
938 cat <<-EOF > "${desktop}" 1045 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1046 [Desktop Entry]
940 Name=${title} 1047 Name=${title}
941 Comment=This session logs you into ${title} 1048 Comment=This session logs you into ${title}
942 Exec=${command} 1049 Exec=${command} $*
943 TryExec=${command} 1050 TryExec=${command}
944 Type=Application 1051 Type=XSession
945 EOF 1052 EOF
946 1053
947 ( 1054 (
948 # wrap the env here so that the 'insinto' call 1055 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1056 # doesn't corrupt the env of the caller
1261 lic="${PWD}/${lic}" 1368 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1369 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1370 lic="${lic}"
1264 fi 1371 fi
1265 fi 1372 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1373 local l="`basename ${lic}`"
1268 1374
1269 # here is where we check for the licenses the user already 1375 # here is where we check for the licenses the user already
1270 # accepted ... if we don't find a match, we make the user accept 1376 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1377 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1378 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1379 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1380 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1381 eshopts_pop
1277 return 0 1382 return 0
1278 fi 1383 fi
1279 done 1384 done
1280 set +o noglob; set -$shopts #reset old shell opts 1385 eshopts_pop
1386 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1387
1282 local licmsg=$(emktemp) 1388 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1389 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1390 **********************************************************
1285 The following license outlines the terms of use of this 1391 The following license outlines the terms of use of this
1454# displayed and we'll hang out here until: 1560# displayed and we'll hang out here until:
1455# (1) the file is found on a mounted cdrom 1561# (1) the file is found on a mounted cdrom
1456# (2) the user hits CTRL+C 1562# (2) the user hits CTRL+C
1457_cdrom_locate_file_on_cd() { 1563_cdrom_locate_file_on_cd() {
1458 local mline="" 1564 local mline=""
1459 local showedmsg=0 1565 local showedmsg=0 showjolietmsg=0
1460 1566
1461 while [[ -z ${CDROM_ROOT} ]] ; do 1567 while [[ -z ${CDROM_ROOT} ]] ; do
1462 local i=0 1568 local i=0
1463 local -a cdset=(${*//:/ }) 1569 local -a cdset=(${*//:/ })
1464 if [[ -n ${CDROM_SET} ]] ; then 1570 if [[ -n ${CDROM_SET} ]] ; then
1505 showedmsg=1 1611 showedmsg=1
1506 fi 1612 fi
1507 einfo "Press return to scan for the cd again" 1613 einfo "Press return to scan for the cd again"
1508 einfo "or hit CTRL+C to abort the emerge." 1614 einfo "or hit CTRL+C to abort the emerge."
1509 echo 1615 echo
1616 if [[ ${showjolietmsg} -eq 0 ]] ; then
1617 showjolietmsg=1
1618 else
1510 einfo "If you are having trouble with the detection" 1619 ewarn "If you are having trouble with the detection"
1511 einfo "of your CD, it is possible that you do not have" 1620 ewarn "of your CD, it is possible that you do not have"
1512 einfo "Joliet support enabled in your kernel. Please" 1621 ewarn "Joliet support enabled in your kernel. Please"
1513 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1622 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1623 ebeep 5
1624 fi
1514 read || die "something is screwed with your system" 1625 read || die "something is screwed with your system"
1515 done 1626 done
1516} 1627}
1517 1628
1518# @FUNCTION: strip-linguas 1629# @FUNCTION: strip-linguas
1527# of the lists. 1638# of the lists.
1528strip-linguas() { 1639strip-linguas() {
1529 local ls newls nols 1640 local ls newls nols
1530 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1641 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1531 local op=$1; shift 1642 local op=$1; shift
1532 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1643 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1533 local d f 1644 local d f
1534 for d in "$@" ; do 1645 for d in "$@" ; do
1535 if [[ ${op} == "-u" ]] ; then 1646 if [[ ${op} == "-u" ]] ; then
1536 newls=${ls} 1647 newls=${ls}
1537 else 1648 else
1538 newls="" 1649 newls=""
1539 fi 1650 fi
1540 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1651 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1541 if [[ ${op} == "-i" ]] ; then 1652 if [[ ${op} == "-i" ]] ; then
1542 hasq ${f} ${ls} && newls="${newls} ${f}" 1653 hasq ${f} ${ls} && newls="${newls} ${f}"
1543 else 1654 else
1544 hasq ${f} ${ls} || newls="${newls} ${f}" 1655 hasq ${f} ${ls} || newls="${newls} ${f}"
1545 fi 1656 fi
1558 else 1669 else
1559 nols="${nols} ${f}" 1670 nols="${nols} ${f}"
1560 fi 1671 fi
1561 done 1672 done
1562 [[ -n ${nols} ]] \ 1673 [[ -n ${nols} ]] \
1563 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1674 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1564 export LINGUAS=${newls:1} 1675 export LINGUAS=${newls:1}
1565} 1676}
1566 1677
1567# @FUNCTION: preserve_old_lib 1678# @FUNCTION: preserve_old_lib
1568# @USAGE: <libs to preserve> [more libs] 1679# @USAGE: <libs to preserve> [more libs]
1578 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1689 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1579 die "Invalid preserve_old_lib() usage" 1690 die "Invalid preserve_old_lib() usage"
1580 fi 1691 fi
1581 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1692 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1582 1693
1694 # let portage worry about it
1695 has preserve-libs ${FEATURES} && return 0
1696
1583 local lib dir 1697 local lib dir
1584 for lib in "$@" ; do 1698 for lib in "$@" ; do
1585 [[ -e ${ROOT}/${lib} ]] || continue 1699 [[ -e ${ROOT}/${lib} ]] || continue
1586 dir=${lib%/*} 1700 dir=${lib%/*}
1587 dodir ${dir} || die "dodir ${dir} failed" 1701 dodir ${dir} || die "dodir ${dir} failed"
1597preserve_old_lib_notify() { 1711preserve_old_lib_notify() {
1598 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1712 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1599 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1713 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1600 die "Invalid preserve_old_lib_notify() usage" 1714 die "Invalid preserve_old_lib_notify() usage"
1601 fi 1715 fi
1716
1717 # let portage worry about it
1718 has preserve-libs ${FEATURES} && return 0
1602 1719
1603 local lib notice=0 1720 local lib notice=0
1604 for lib in "$@" ; do 1721 for lib in "$@" ; do
1605 [[ -e ${ROOT}/${lib} ]] || continue 1722 [[ -e ${ROOT}/${lib} ]] || continue
1606 if [[ ${notice} -eq 0 ]] ; then 1723 if [[ ${notice} -eq 0 ]] ; then
1615 ewarn " # revdep-rebuild --library ${lib##*/}" 1732 ewarn " # revdep-rebuild --library ${lib##*/}"
1616 done 1733 done
1617 if [[ ${notice} -eq 1 ]] ; then 1734 if [[ ${notice} -eq 1 ]] ; then
1618 ewarn 1735 ewarn
1619 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1736 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1620 ewarn "delete the old libraries." 1737 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1738 for lib in "$@" ; do
1739 ewarn " # rm '${lib}'"
1740 done
1621 fi 1741 fi
1622} 1742}
1623 1743
1624# @FUNCTION: built_with_use 1744# @FUNCTION: built_with_use
1625# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1745# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1630# --missing option controls the behavior if called on a package that does 1750# --missing option controls the behavior if called on a package that does
1631# not actually support the defined USE flags (aka listed in IUSE). 1751# not actually support the defined USE flags (aka listed in IUSE).
1632# The default is to abort (call die). The -a and -o flags control 1752# The default is to abort (call die). The -a and -o flags control
1633# the requirements of the USE flags. They correspond to "and" and "or" 1753# the requirements of the USE flags. They correspond to "and" and "or"
1634# logic. So the -a flag means all listed USE flags must be enabled 1754# logic. So the -a flag means all listed USE flags must be enabled
1635# while the -o flag means at least one of the listed fIUSE flags must be 1755# while the -o flag means at least one of the listed IUSE flags must be
1636# enabled. The --hidden option is really for internal use only as it 1756# enabled. The --hidden option is really for internal use only as it
1637# means the USE flag we're checking is hidden expanded, so it won't be found 1757# means the USE flag we're checking is hidden expanded, so it won't be found
1638# in IUSE like normal USE flags. 1758# in IUSE like normal USE flags.
1639# 1759#
1640# Remember that this function isn't terribly intelligent so order of optional 1760# Remember that this function isn't terribly intelligent so order of optional
1675 die) die "Unable to determine what USE flags $PKG was built with";; 1795 die) die "Unable to determine what USE flags $PKG was built with";;
1676 esac 1796 esac
1677 fi 1797 fi
1678 1798
1679 if [[ ${hidden} == "no" ]] ; then 1799 if [[ ${hidden} == "no" ]] ; then
1680 local IUSE_BUILT=$(<${IUSEFILE}) 1800 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1681 # Don't check USE_EXPAND #147237 1801 # Don't check USE_EXPAND #147237
1682 local expand 1802 local expand
1683 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1803 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1684 if [[ $1 == ${expand}_* ]] ; then 1804 if [[ $1 == ${expand}_* ]] ; then
1685 expand="" 1805 expand=""
1686 break 1806 break
1687 fi 1807 fi
1688 done 1808 done
1689 if [[ -n ${expand} ]] ; then 1809 if [[ -n ${expand} ]] ; then
1690 if ! has $1 ${IUSE_BUILT} ; then 1810 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1691 case ${missing_action} in 1811 case ${missing_action} in
1692 true) return 0;; 1812 true) return 0;;
1693 false) return 1;; 1813 false) return 1;;
1694 die) die "$PKG does not actually support the $1 USE flag!";; 1814 die) die "$PKG does not actually support the $1 USE flag!";;
1695 esac 1815 esac
1726 done 1846 done
1727 eend 0 1847 eend 0
1728} 1848}
1729 1849
1730# @FUNCTION: make_wrapper 1850# @FUNCTION: make_wrapper
1731# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1851# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1732# @DESCRIPTION: 1852# @DESCRIPTION:
1733# Create a shell wrapper script named wrapper in installpath 1853# Create a shell wrapper script named wrapper in installpath
1734# (defaults to the bindir) to execute target (default of wrapper) by 1854# (defaults to the bindir) to execute target (default of wrapper) by
1735# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1855# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1736# libpaths followed by optionally changing directory to chdir. 1856# libpaths followed by optionally changing directory to chdir.
1759 ) || die 1879 ) || die
1760 else 1880 else
1761 newbin "${tmpwrapper}" "${wrapper}" || die 1881 newbin "${tmpwrapper}" "${wrapper}" || die
1762 fi 1882 fi
1763} 1883}
1884
1885# @FUNCTION: prepalldocs
1886# @USAGE:
1887# @DESCRIPTION:
1888# Compress files in /usr/share/doc which are not already
1889# compressed, excluding /usr/share/doc/${PF}/html.
1890# Uses the ecompressdir to do the compression.
1891# 2009-02-18 by betelgeuse:
1892# Commented because ecompressdir is even more internal to
1893# Portage than prepalldocs (it's not even mentioned in man 5
1894# ebuild). Please submit a better version for review to gentoo-dev
1895# if you want prepalldocs here.
1896#prepalldocs() {
1897# if [[ -n $1 ]] ; then
1898# ewarn "prepalldocs: invalid usage; takes no arguments"
1899# fi
1900
1901# cd "${D}"
1902# [[ -d usr/share/doc ]] || return 0
1903
1904# find usr/share/doc -exec gzip {} +
1905# ecompressdir --ignore /usr/share/doc/${PF}/html
1906# ecompressdir --queue /usr/share/doc
1907#}

Legend:
Removed from v.1.294  
changed lines
  Added in v.1.325

  ViewVC Help
Powered by ViewVC 1.1.20