/[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.359
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 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.359 2011/07/20 05:46:46 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
75fi
76
52# @FUNCTION: ecvs_clean 77# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 78# @USAGE: [list of dirs]
54# @DESCRIPTION: 79# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 80# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 81# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 93esvn_clean() {
69 [[ -z $* ]] && set -- . 94 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 95 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 96}
72 97
73# Default directory where patches are located 98# @FUNCTION: eshopts_push
99# @USAGE: [options to `set` or `shopt`]
100# @DESCRIPTION:
101# Often times code will want to enable a shell option to change code behavior.
102# Since changing shell options can easily break other pieces of code (which
103# assume the default state), eshopts_push is used to (1) push the current shell
104# options onto a stack and (2) pass the specified arguments to set.
105#
106# If the first argument is '-s' or '-u', we assume you want to call `shopt`
107# rather than `set` as there are some options only available via that.
108#
109# A common example is to disable shell globbing so that special meaning/care
110# may be used with variables/arguments to custom functions. That would be:
111# @CODE
112# eshopts_push -o noglob
113# for x in ${foo} ; do
114# if ...some check... ; then
115# eshopts_pop
116# return 0
117# fi
118# done
119# eshopts_pop
120# @CODE
121eshopts_push() {
122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
123 # as a `declare -a` here will reset its value
124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
127 [[ $# -eq 0 ]] && return 0
128 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
129 else
130 __ESHOPTS_SAVE__[$i]=$-
131 [[ $# -eq 0 ]] && return 0
132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
134}
135
136# @FUNCTION: eshopts_pop
137# @USAGE:
138# @DESCRIPTION:
139# Restore the shell options to the state saved with the corresponding
140# eshopts_push call. See that function for more details.
141eshopts_pop() {
142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
145 local s=${__ESHOPTS_SAVE__[$i]}
146 unset __ESHOPTS_SAVE__[$i]
147 if [[ ${s} == "shopt -"* ]] ; then
148 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
149 else
150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
153}
154
155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
77# Default options for patch 165# Default options for patch:
166# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 174# List of patches not to apply. Note this is only file names,
83# and not the full path .. 175# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
85# Change the printed message for a single patch. 179# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
87# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
90# 186# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 188# arch naming style.
93EPATCH_FORCE="no" 189EPATCH_FORCE="no"
94 190
95# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
96# or two patches. 192# @USAGE: [patches] [dirs of patches]
193# @DESCRIPTION:
194# epatch is designed to greatly simplify the application of patches. It can
195# process patch files directly, or directories of patches. The patches may be
196# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
197# the -p option as epatch will automatically attempt -p0 to -p5 until things
198# apply successfully.
97# 199#
98# It should work with .bz2, .gz, .zip and plain text patches. 200# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
100# 202#
101# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
103# 205# if ${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} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
207# else
208# *.${EPATCH_SUFFIX}
209# @CODE
210# The leading ?? are typically numbers used to force consistent patch ordering.
211# The arch field is used to apply patches only for the host architecture with
212# the special value of "all" means apply for everyone. Note that using values
213# other than "all" is highly discouraged -- you should apply patches all the
214# time and let architecture details be detected at configure/compile time.
113# 215#
114# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
115# 218#
116# 01_all_misc-fix.patch.bz2 219# 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() { 220epatch() {
129 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 224 echo "${1//?/=}"
132 } 225 }
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 226
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 228
143 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
144 then 230 # each arg may expand into multiple patches, and each arg may
231 # need to start off with the default global EPATCH_xxx values
232 if [[ $# -gt 1 ]] ; then
145 local m="" 233 local m
146 for m in "$@" ; do 234 for m in "$@" ; do
147 epatch "${m}" 235 epatch "${m}"
148 done 236 done
149 return 0 237 return 0
150 fi 238 fi
151 239
152 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
153 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
155 246 set -- "$1"
156 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
158 250
159 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
160 then 252 # 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 ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 254
255 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
256 # Re-use EPATCH_SOURCE as a search dir
257 epatch "${EPATCH_SOURCE}/$1"
258 return $?
259
260 else
261 # sanity check ... if it isn't a dir or file, wtf man ?
262 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
263 echo
264 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
265 eerror
266 eerror " ${EPATCH_SOURCE}"
267 eerror " ( ${EPATCH_SOURCE##*/} )"
268 echo
269 die "Cannot find \$EPATCH_SOURCE!"
270 fi
271
272 local PIPE_CMD
273 case ${EPATCH_SUFFIX##*\.} in
274 xz) PIPE_CMD="xz -dc" ;;
275 lzma) PIPE_CMD="lzma -dc" ;;
276 bz2) PIPE_CMD="bzip2 -dc" ;;
277 gz|Z|z) PIPE_CMD="gzip -dc" ;;
278 ZIP|zip) PIPE_CMD="unzip -p" ;;
279 *) ;;
280 esac
281
282 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
283
284 local x
285 for x in "$@" ; do
286 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
287 # didn't match anything, ignore continue on
288 [[ ! -f ${x} ]] && continue
289
290 local patchname=${x##*/}
291
292 # Apply single patches, or forced sets of patches, or
293 # patches with ARCH dependant names.
294 # ???_arch_foo.patch
295 # Else, skip this input altogether
296 local a=${patchname#*_} # strip the ???_
297 a=${a%%_*} # strip the _foo.patch
298 if ! [[ ${SINGLE_PATCH} == "yes" || \
299 ${EPATCH_FORCE} == "yes" || \
300 ${a} == all || \
301 ${a} == ${ARCH} ]]
163 then 302 then
164 local EPATCH_SOURCE="$1/*" 303 continue
304 fi
305
306 # Let people filter things dynamically
307 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
308 # let people use globs in the exclude
309 eshopts_push -o noglob
310
311 local ex
312 for ex in ${EPATCH_EXCLUDE} ; do
313 if [[ ${patchname} == ${ex} ]] ; then
314 eshopts_pop
315 continue 2
316 fi
317 done
318
319 eshopts_pop
320 fi
321
322 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
323 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
324 einfo "${EPATCH_SINGLE_MSG}"
325 else
326 einfo "Applying ${patchname} ..."
327 fi
165 else 328 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 329 einfo " ${patchname} ..."
167 fi 330 fi
168 else 331
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 332 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 333 # but if there are more, make sure we get unique log filenames
171 then 334 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 335 if [[ -e ${STDERR_TARGET} ]] ; then
336 STDERR_TARGET="${T}/${patchname}-$$.out"
337 fi
338
339 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
340
341 # Decompress the patch if need be
342 local count=0
343 local PATCH_TARGET
344 if [[ -n ${PIPE_CMD} ]] ; then
345 PATCH_TARGET="${T}/$$.patch"
346 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
347
348 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
349 echo
350 eerror "Could not extract patch!"
351 #die "Could not extract patch!"
352 count=5
353 break
173 fi 354 fi
355 else
356 PATCH_TARGET=${x}
357 fi
174 358
359 # Check for absolute paths in patches. If sandbox is disabled,
360 # people could (accidently) patch files in the root filesystem.
361 # Or trigger other unpleasantries #237667. So disallow -p0 on
362 # such patches.
363 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
364 if [[ -n ${abs_paths} ]] ; then
365 count=1
366 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
367 fi
368 # Similar reason, but with relative paths.
369 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
370 if [[ -n ${rel_paths} ]] ; then
371 eqawarn "QA Notice: Your patch uses relative paths '../'."
372 eqawarn " In the future this will cause a failure."
373 eqawarn "${rel_paths}"
374 fi
375
376 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
377 while [[ ${count} -lt 5 ]] ; do
378 # Generate some useful debug info ...
379 (
380 _epatch_draw_line "***** ${patchname} *****"
175 echo 381 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
383 echo
384 _epatch_draw_line "***** ${patchname} *****"
385 ) >> "${STDERR_TARGET}"
386
387 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
388 (
389 _epatch_draw_line "***** ${patchname} *****"
390 echo
391 echo "ACTUALLY APPLYING ${patchname} ..."
392 echo
393 _epatch_draw_line "***** ${patchname} *****"
394 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
395 ) >> "${STDERR_TARGET}"
396
397 if [ $? -ne 0 ] ; then
398 echo
399 eerror "A dry-run of patch command succeeded, but actually"
400 eerror "applying the patch failed!"
401 #die "Real world sux compared to the dreamworld!"
402 count=5
403 fi
404 break
405 fi
406
407 : $(( count++ ))
408 done
409
410 # if we had to decompress the patch, delete the temp one
411 if [[ -n ${PIPE_CMD} ]] ; then
412 rm -f "${PATCH_TARGET}"
413 fi
414
415 if [[ ${count} -ge 5 ]] ; then
416 echo
417 eerror "Failed Patch: ${patchname} !"
418 eerror " ( ${PATCH_TARGET} )"
177 eerror 419 eerror
178 eerror " ${EPATCH_SOURCE}" 420 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 421 eerror
422 eerror " ${STDERR_TARGET}"
180 echo 423 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}!" 424 die "Failed Patch: ${patchname}!"
336 fi 425 fi
337 426
338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 427 # if everything worked, delete the patch log
339 428 rm -f "${STDERR_TARGET}"
340 eend 0 429 eend 0
341 fi
342 done 430 done
343 if [ "${SINGLE_PATCH}" = "no" ] 431
344 then 432 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
345 einfo "Done with patching" 433 : # everything worked
434}
435epatch_user() {
436 [[ $# -ne 0 ]] && die "epatch_user takes no options"
437
438 # don't clobber any EPATCH vars that the parent might want
439 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
440 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
441 EPATCH_SOURCE=${base}/${CTARGET}/${check}
442 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
443 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
444 if [[ -d ${EPATCH_SOURCE} ]] ; then
445 EPATCH_SOURCE=${EPATCH_SOURCE} \
446 EPATCH_SUFFIX="patch" \
447 EPATCH_FORCE="yes" \
448 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
449 epatch
450 return 0
346 fi 451 fi
452 done
453 return 1
347} 454}
348 455
349# @FUNCTION: emktemp 456# @FUNCTION: emktemp
350# @USAGE: [temp dir] 457# @USAGE: [temp dir]
351# @DESCRIPTION: 458# @DESCRIPTION:
392# Small wrapper for getent (Linux), 499# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), 500# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
394# and pw (FreeBSD) used in enewuser()/enewgroup() 501# and pw (FreeBSD) used in enewuser()/enewgroup()
395egetent() { 502egetent() {
396 case ${CHOST} in 503 case ${CHOST} in
504 *-darwin[678])
505 case "$2" in
506 *[!0-9]*) # Non numeric
507 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
508 ;;
509 *) # Numeric
510 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
511 ;;
512 esac
513 ;;
397 *-darwin9) 514 *-darwin*)
398 local mytype=$1 515 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users" 516 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups" 517 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in 518 case "$2" in
402 *[!0-9]*) # Non numeric 519 *[!0-9]*) # Non numeric
404 ;; 521 ;;
405 *) # Numeric 522 *) # Numeric
406 local mykey="UniqueID" 523 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID" 524 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null 525 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 ;; 526 ;;
420 esac 527 esac
421 ;; 528 ;;
422 *-freebsd*|*-dragonfly*) 529 *-freebsd*|*-dragonfly*)
423 local opts action="user" 530 local opts action="user"
623 fi 730 fi
624 ;; 731 ;;
625 732
626 *) 733 *)
627 if [[ -z $@ ]] ; then 734 if [[ -z $@ ]] ; then
628 useradd ${opts} ${euser} \ 735 useradd -r ${opts} \
629 -c "added by portage for ${PN}" \ 736 -c "added by portage for ${PN}" \
737 ${euser} \
630 || die "enewuser failed" 738 || die "enewuser failed"
631 else 739 else
632 einfo " - Extra: $@" 740 einfo " - Extra: $@"
633 useradd ${opts} ${euser} "$@" \ 741 useradd -r ${opts} "$@" \
742 ${euser} \
634 || die "enewuser failed" 743 || die "enewuser failed"
635 fi 744 fi
636 ;; 745 ;;
637 esac 746 esac
638 747
750 esac 859 esac
751 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 860 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
752 ;; 861 ;;
753 862
754 *) 863 *)
864 # We specify -r so that we get a GID in the system range from login.defs
755 groupadd ${opts} ${egroup} || die "enewgroup failed" 865 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
756 ;; 866 ;;
757 esac 867 esac
758 export SANDBOX_ON="${oldsandbox}" 868 export SANDBOX_ON="${oldsandbox}"
759} 869}
760 870
771 881
772# Make a desktop file ! 882# Make a desktop file !
773# Great for making those icons in kde/gnome startmenu ! 883# Great for making those icons in kde/gnome startmenu !
774# Amaze your friends ! Get the women ! Join today ! 884# Amaze your friends ! Get the women ! Join today !
775# 885#
776# make_desktop_entry(<command>, [name], [icon], [type], [path]) 886# make_desktop_entry(<command>, [name], [icon], [type], [fields])
777# 887#
778# binary: what command does the app run with ? 888# binary: what command does the app run with ?
779# name: the name that will show up in the menu 889# name: the name that will show up in the menu
780# icon: give your little like a pretty little icon ... 890# icon: give your little like a pretty little icon ...
781# this can be relative (to /usr/share/pixmaps) or 891# this can be relative (to /usr/share/pixmaps) or
782# a full path to an icon 892# a full path to an icon
783# type: what kind of application is this ? for categories: 893# type: what kind of application is this ? for categories:
784# http://standards.freedesktop.org/menu-spec/latest/apa.html 894# http://standards.freedesktop.org/menu-spec/latest/apa.html
785# path: if your app needs to startup in a specific dir 895# fields: extra fields to append to the desktop file; a printf string
786make_desktop_entry() { 896make_desktop_entry() {
787 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 897 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
788 898
789 local exec=${1} 899 local exec=${1}
790 local name=${2:-${PN}} 900 local name=${2:-${PN}}
791 local icon=${3:-${PN}} 901 local icon=${3:-${PN}}
792 local type=${4} 902 local type=${4}
793 local path=${5} 903 local fields=${5}
794 904
795 if [[ -z ${type} ]] ; then 905 if [[ -z ${type} ]] ; then
796 local catmaj=${CATEGORY%%-*} 906 local catmaj=${CATEGORY%%-*}
797 local catmin=${CATEGORY##*-} 907 local catmin=${CATEGORY##*-}
798 case ${catmaj} in 908 case ${catmaj} in
799 app) 909 app)
800 case ${catmin} in 910 case ${catmin} in
801 accessibility) type=Accessibility;; 911 accessibility) type=Accessibility;;
802 admin) type=System;; 912 admin) type=System;;
803 antivirus) type=System;; 913 antivirus) type=System;;
804 arch) type=Archiving;; 914 arch) type=Archiving;;
805 backup) type=Archiving;; 915 backup) type=Archiving;;
806 cdr) type=DiscBurning;; 916 cdr) type=DiscBurning;;
807 dicts) type=Dictionary;; 917 dicts) type=Dictionary;;
808 doc) type=Documentation;; 918 doc) type=Documentation;;
809 editors) type=TextEditor;; 919 editors) type=TextEditor;;
810 emacs) type=TextEditor;; 920 emacs) type=TextEditor;;
811 emulation) type=Emulator;; 921 emulation) type=Emulator;;
812 laptop) type=HardwareSettings;; 922 laptop) type=HardwareSettings;;
813 office) type=Office;; 923 office) type=Office;;
814 pda) type=PDA;; 924 pda) type=PDA;;
815 vim) type=TextEditor;; 925 vim) type=TextEditor;;
816 xemacs) type=TextEditor;; 926 xemacs) type=TextEditor;;
817 *) type=;;
818 esac 927 esac
819 ;; 928 ;;
820 929
821 dev) 930 dev)
822 type="Development" 931 type="Development"
823 ;; 932 ;;
824 933
825 games) 934 games)
826 case ${catmin} in 935 case ${catmin} in
827 action|fps) type=ActionGame;; 936 action|fps) type=ActionGame;;
828 arcade) type=ArcadeGame;; 937 arcade) type=ArcadeGame;;
829 board) type=BoardGame;; 938 board) type=BoardGame;;
830 emulation) type=Emulator;; 939 emulation) type=Emulator;;
831 kids) type=KidsGame;; 940 kids) type=KidsGame;;
832 puzzle) type=LogicGame;; 941 puzzle) type=LogicGame;;
833 roguelike) type=RolePlaying;; 942 roguelike) type=RolePlaying;;
834 rpg) type=RolePlaying;; 943 rpg) type=RolePlaying;;
835 simulation) type=Simulation;; 944 simulation) type=Simulation;;
836 sports) type=SportsGame;; 945 sports) type=SportsGame;;
837 strategy) type=StrategyGame;; 946 strategy) type=StrategyGame;;
838 *) type=;;
839 esac 947 esac
840 type="Game;${type}" 948 type="Game;${type}"
841 ;; 949 ;;
842 950
843 gnome) 951 gnome)
852 type="Network;Email" 960 type="Network;Email"
853 ;; 961 ;;
854 962
855 media) 963 media)
856 case ${catmin} in 964 case ${catmin} in
965 gfx)
857 gfx) type=Graphics;; 966 type=Graphics
967 ;;
968 *)
969 case ${catmin} in
858 radio) type=Tuner;; 970 radio) type=Tuner;;
859 sound) type=Audio;; 971 sound) type=Audio;;
860 tv) type=TV;; 972 tv) type=TV;;
861 video) type=Video;; 973 video) type=Video;;
862 *) type=;; 974 esac
975 type="AudioVideo;${type}"
976 ;;
863 esac 977 esac
864 type="AudioVideo;${type}"
865 ;; 978 ;;
866 979
867 net) 980 net)
868 case ${catmin} in 981 case ${catmin} in
869 dialup) type=Dialup;; 982 dialup) type=Dialup;;
870 ftp) type=FileTransfer;; 983 ftp) type=FileTransfer;;
871 im) type=InstantMessaging;; 984 im) type=InstantMessaging;;
872 irc) type=IRCClient;; 985 irc) type=IRCClient;;
873 mail) type=Email;; 986 mail) type=Email;;
874 news) type=News;; 987 news) type=News;;
875 nntp) type=News;; 988 nntp) type=News;;
876 p2p) type=FileTransfer;; 989 p2p) type=FileTransfer;;
877 *) type=;; 990 voip) type=Telephony;;
878 esac 991 esac
879 type="Network;${type}" 992 type="Network;${type}"
880 ;; 993 ;;
881 994
882 sci) 995 sci)
883 case ${catmin} in 996 case ${catmin} in
884 astro*) type=Astronomy;; 997 astro*) type=Astronomy;;
885 bio*) type=Biology;; 998 bio*) type=Biology;;
886 calc*) type=Calculator;; 999 calc*) type=Calculator;;
887 chem*) type=Chemistry;; 1000 chem*) type=Chemistry;;
888 elec*) type=Electronics;; 1001 elec*) type=Electronics;;
889 geo*) type=Geology;; 1002 geo*) type=Geology;;
890 math*) type=Math;; 1003 math*) type=Math;;
891 physics) type=Physics;; 1004 physics) type=Physics;;
892 visual*) type=DataVisualization;; 1005 visual*) type=DataVisualization;;
893 *) type=;;
894 esac 1006 esac
895 type="Science;${type}" 1007 type="Education;Science;${type}"
896 ;; 1008 ;;
897 1009
898 sys) 1010 sys)
899 type="System" 1011 type="System"
900 ;; 1012 ;;
901 1013
902 www) 1014 www)
903 case ${catmin} in 1015 case ${catmin} in
904 client) type=WebBrowser;; 1016 client) type=WebBrowser;;
905 *) type=;;
906 esac 1017 esac
907 type="Network" 1018 type="Network;${type}"
908 ;; 1019 ;;
909 1020
910 *) 1021 *)
911 type= 1022 type=
912 ;; 1023 ;;
918 local desktop_name="${PN}-${SLOT}" 1029 local desktop_name="${PN}-${SLOT}"
919 fi 1030 fi
920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1031 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1032 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
922 1033
1034 # Don't append another ";" when a valid category value is provided.
1035 type=${type%;}${type:+;}
1036
1037 eshopts_push -s extglob
1038 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1039 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1040 ewarn "allowed in .desktop files if the value is not an absolute path."
1041 icon=${icon%.@(xpm|png|svg)}
1042 fi
1043 eshopts_pop
1044
923 cat <<-EOF > "${desktop}" 1045 cat <<-EOF > "${desktop}"
924 [Desktop Entry] 1046 [Desktop Entry]
925 Version=1.0
926 Name=${name} 1047 Name=${name}
927 Type=Application 1048 Type=Application
928 Comment=${DESCRIPTION} 1049 Comment=${DESCRIPTION}
929 Exec=${exec} 1050 Exec=${exec}
930 TryExec=${exec%% *} 1051 TryExec=${exec%% *}
931 Icon=${icon} 1052 Icon=${icon}
932 Categories=${type}; 1053 Categories=${type}
933 EOF 1054 EOF
934 1055
935 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1056 if [[ ${fields:-=} != *=* ]] ; then
1057 # 5th arg used to be value to Path=
1058 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1059 fields="Path=${fields}"
1060 fi
1061 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
936 1062
937 ( 1063 (
938 # wrap the env here so that the 'insinto' call 1064 # wrap the env here so that the 'insinto' call
939 # doesn't corrupt the env of the caller 1065 # doesn't corrupt the env of the caller
940 insinto /usr/share/applications 1066 insinto /usr/share/applications
941 doins "${desktop}" 1067 doins "${desktop}"
942 ) 1068 ) || die "installing desktop file failed"
943} 1069}
944 1070
945# @FUNCTION: validate_desktop_entries 1071# @FUNCTION: validate_desktop_entries
946# @USAGE: [directories] 1072# @USAGE: [directories]
947# @MAINTAINER: 1073# @MAINTAINER:
1226 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1352 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1227 1353
1228 local shrtsrc=$(basename "${src}") 1354 local shrtsrc=$(basename "${src}")
1229 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1355 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1230 if [[ -z ${skip} ]] ; then 1356 if [[ -z ${skip} ]] ; then
1231 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1357 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1232 local skip=0 1358 local skip=0
1233 exe=tail 1359 exe=tail
1234 case ${ver} in 1360 case ${ver} in
1235 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1361 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1236 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1362 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1238 2.0|2.0.1) 1364 2.0|2.0.1)
1239 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1365 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1240 ;; 1366 ;;
1241 2.1.1) 1367 2.1.1)
1242 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1368 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1243 let skip="skip + 1" 1369 (( skip++ ))
1244 ;; 1370 ;;
1245 2.1.2) 1371 2.1.2)
1246 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1372 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1247 let skip="skip + 1" 1373 (( skip++ ))
1248 ;; 1374 ;;
1249 2.1.3) 1375 2.1.3)
1250 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1376 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1251 let skip="skip + 1" 1377 (( skip++ ))
1252 ;; 1378 ;;
1253 2.1.4|2.1.5) 1379 2.1.4|2.1.5)
1254 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1380 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1255 skip=$(head -n ${skip} "${src}" | wc -c) 1381 skip=$(head -n ${skip} "${src}" | wc -c)
1256 exe="dd" 1382 exe="dd"
1265 esac 1391 esac
1266 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1392 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1267 fi 1393 fi
1268 case ${exe} in 1394 case ${exe} in
1269 tail) exe="tail -n +${skip} '${src}'";; 1395 tail) exe="tail -n +${skip} '${src}'";;
1270 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1396 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1271 *) die "makeself cant handle exe '${exe}'" 1397 *) die "makeself cant handle exe '${exe}'"
1272 esac 1398 esac
1273 1399
1274 # lets grab the first few bytes of the file to figure out what kind of archive it is 1400 # lets grab the first few bytes of the file to figure out what kind of archive it is
1275 local tmpfile=$(emktemp) 1401 local filetype tmpfile=$(emktemp)
1276 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1402 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1277 local filetype=$(file -b "${tmpfile}") 1403 filetype=$(file -b "${tmpfile}") || die
1278 case ${filetype} in 1404 case ${filetype} in
1279 *tar\ archive*) 1405 *tar\ archive*)
1280 eval ${exe} | tar --no-same-owner -xf - 1406 eval ${exe} | tar --no-same-owner -xf -
1281 ;; 1407 ;;
1282 bzip2*) 1408 bzip2*)
1312 lic="${PWD}/${lic}" 1438 lic="${PWD}/${lic}"
1313 elif [ -e "${lic}" ] ; then 1439 elif [ -e "${lic}" ] ; then
1314 lic="${lic}" 1440 lic="${lic}"
1315 fi 1441 fi
1316 fi 1442 fi
1317 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1318 local l="`basename ${lic}`" 1443 local l="`basename ${lic}`"
1319 1444
1320 # here is where we check for the licenses the user already 1445 # 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 1446 # accepted ... if we don't find a match, we make the user accept
1322 local shopts=$-
1323 local alic 1447 local alic
1324 set -o noglob #so that bash doesn't expand "*" 1448 eshopts_push -o noglob # so that bash doesn't expand "*"
1325 for alic in ${ACCEPT_LICENSE} ; do 1449 for alic in ${ACCEPT_LICENSE} ; do
1326 if [[ ${alic} == ${l} ]]; then 1450 if [[ ${alic} == ${l} ]]; then
1327 set +o noglob; set -${shopts} #reset old shell opts 1451 eshopts_pop
1328 return 0 1452 return 0
1329 fi 1453 fi
1330 done 1454 done
1331 set +o noglob; set -$shopts #reset old shell opts 1455 eshopts_pop
1456 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1332 1457
1333 local licmsg=$(emktemp) 1458 local licmsg=$(emktemp)
1334 cat <<-EOF > ${licmsg} 1459 cat <<-EOF > ${licmsg}
1335 ********************************************************** 1460 **********************************************************
1336 The following license outlines the terms of use of this 1461 The following license outlines the terms of use of this
1409 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1534 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1410 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1535 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1411 export CDROM_SET=-1 1536 export CDROM_SET=-1
1412 for f in ${CDROM_CHECK_1//:/ } ; do 1537 for f in ${CDROM_CHECK_1//:/ } ; do
1413 ((++CDROM_SET)) 1538 ((++CDROM_SET))
1414 [[ -e ${CD_ROOT}/${f} ]] && break 1539 [[ -e ${CDROM_ROOT}/${f} ]] && break
1415 done 1540 done
1416 export CDROM_MATCH=${f} 1541 export CDROM_MATCH=${f}
1417 return 1542 return
1418 fi 1543 fi
1419 1544
1593 else 1718 else
1594 newls="" 1719 newls=""
1595 fi 1720 fi
1596 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1721 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1597 if [[ ${op} == "-i" ]] ; then 1722 if [[ ${op} == "-i" ]] ; then
1598 hasq ${f} ${ls} && newls="${newls} ${f}" 1723 has ${f} ${ls} && newls="${newls} ${f}"
1599 else 1724 else
1600 hasq ${f} ${ls} || newls="${newls} ${f}" 1725 has ${f} ${ls} || newls="${newls} ${f}"
1601 fi 1726 fi
1602 done 1727 done
1603 ls=${newls} 1728 ls=${newls}
1604 done 1729 done
1605 else 1730 else
1607 fi 1732 fi
1608 1733
1609 nols="" 1734 nols=""
1610 newls="" 1735 newls=""
1611 for f in ${LINGUAS} ; do 1736 for f in ${LINGUAS} ; do
1612 if hasq ${f} ${ls} ; then 1737 if has ${f} ${ls} ; then
1613 newls="${newls} ${f}" 1738 newls="${newls} ${f}"
1614 else 1739 else
1615 nols="${nols} ${f}" 1740 nols="${nols} ${f}"
1616 fi 1741 fi
1617 done 1742 done
1618 [[ -n ${nols} ]] \ 1743 [[ -n ${nols} ]] \
1619 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1744 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1620 export LINGUAS=${newls:1} 1745 export LINGUAS=${newls:1}
1621} 1746}
1622 1747
1623# @FUNCTION: preserve_old_lib 1748# @FUNCTION: preserve_old_lib
1624# @USAGE: <libs to preserve> [more libs] 1749# @USAGE: <libs to preserve> [more libs]
1672 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1797 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1673 ewarn "in order to remove these old dependencies. If you do not have this" 1798 ewarn "in order to remove these old dependencies. If you do not have this"
1674 ewarn "helper program, simply emerge the 'gentoolkit' package." 1799 ewarn "helper program, simply emerge the 'gentoolkit' package."
1675 ewarn 1800 ewarn
1676 fi 1801 fi
1802 # temp hack for #348634 #357225
1803 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1677 ewarn " # revdep-rebuild --library ${lib##*/}" 1804 ewarn " # revdep-rebuild --library '${lib}'"
1678 done 1805 done
1679 if [[ ${notice} -eq 1 ]] ; then 1806 if [[ ${notice} -eq 1 ]] ; then
1680 ewarn 1807 ewarn
1681 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1808 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1682 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1809 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1687} 1814}
1688 1815
1689# @FUNCTION: built_with_use 1816# @FUNCTION: built_with_use
1690# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1817# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1691# @DESCRIPTION: 1818# @DESCRIPTION:
1819#
1820# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1821#
1692# A temporary hack until portage properly supports DEPENDing on USE 1822# A temporary hack until portage properly supports DEPENDing on USE
1693# flags being enabled in packages. This will check to see if the specified 1823# flags being enabled in packages. This will check to see if the specified
1694# DEPEND atom was built with the specified list of USE flags. The 1824# DEPEND atom was built with the specified list of USE flags. The
1695# --missing option controls the behavior if called on a package that does 1825# --missing option controls the behavior if called on a package that does
1696# not actually support the defined USE flags (aka listed in IUSE). 1826# not actually support the defined USE flags (aka listed in IUSE).
1825 else 1955 else
1826 newbin "${tmpwrapper}" "${wrapper}" || die 1956 newbin "${tmpwrapper}" "${wrapper}" || die
1827 fi 1957 fi
1828} 1958}
1829 1959
1830# @FUNCTION: prepalldocs 1960# @FUNCTION: path_exists
1831# @USAGE: 1961# @USAGE: [-a|-o] <paths>
1832# @DESCRIPTION: 1962# @DESCRIPTION:
1833# Compress files in /usr/share/doc which are not already 1963# Check if the specified paths exist. Works for all types of paths
1834# compressed, excluding /usr/share/doc/${PF}/html. 1964# (files/dirs/etc...). The -a and -o flags control the requirements
1835# Uses the ecompressdir to do the compression. 1965# of the paths. They correspond to "and" and "or" logic. So the -a
1836# 2009-02-18 by betelgeuse: 1966# flag means all the paths must exist while the -o flag means at least
1837# Commented because ecompressdir is even more internal to 1967# one of the paths must exist. The default behavior is "and". If no
1838# Portage than prepalldocs (it's not even mentioned in man 5 1968# paths are specified, then the return value is "false".
1839# ebuild). Please submit a better version for review to gentoo-dev 1969path_exists() {
1840# if you want prepalldocs here. 1970 local opt=$1
1841#prepalldocs() { 1971 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1842# if [[ -n $1 ]] ; then
1843# ewarn "prepalldocs: invalid usage; takes no arguments"
1844# fi
1845 1972
1846# cd "${D}" 1973 # no paths -> return false
1847# [[ -d usr/share/doc ]] || return 0 1974 # same behavior as: [[ -e "" ]]
1975 [[ $# -eq 0 ]] && return 1
1848 1976
1849# find usr/share/doc -exec gzip {} + 1977 local p r=0
1850# ecompressdir --ignore /usr/share/doc/${PF}/html 1978 for p in "$@" ; do
1851# ecompressdir --queue /usr/share/doc 1979 [[ -e ${p} ]]
1852#} 1980 : $(( r += $? ))
1981 done
1982
1983 case ${opt} in
1984 -a) return $(( r != 0 )) ;;
1985 -o) return $(( r == $# )) ;;
1986 esac
1987}

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

  ViewVC Help
Powered by ViewVC 1.1.20