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

Diff of /eclass/eutils.eclass

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

Revision 1.319 Revision 1.361
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.319 2009/09/12 14:37:51 grobian Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.361 2011/08/08 02:01:40 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 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
386 ret=$?
387 echo
388 echo "patch program exited with status ${ret}"
389 exit ${ret}
390 ) >> "${STDERR_TARGET}"
391
392 if [ $? -eq 0 ] ; then
393 (
394 _epatch_draw_line "***** ${patchname} *****"
395 echo
396 echo "ACTUALLY APPLYING ${patchname} ..."
397 echo
398 _epatch_draw_line "***** ${patchname} *****"
399 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
400 ret=$?
401 echo
402 echo "patch program exited with status ${ret}"
403 exit ${ret}
404 ) >> "${STDERR_TARGET}"
405
406 if [ $? -ne 0 ] ; then
407 echo
408 eerror "A dry-run of patch command succeeded, but actually"
409 eerror "applying the patch failed!"
410 #die "Real world sux compared to the dreamworld!"
411 count=5
412 fi
413 break
414 fi
415
416 : $(( count++ ))
417 done
418
419 # if we had to decompress the patch, delete the temp one
420 if [[ -n ${PIPE_CMD} ]] ; then
421 rm -f "${PATCH_TARGET}"
422 fi
423
424 if [[ ${count} -ge 5 ]] ; then
425 echo
426 eerror "Failed Patch: ${patchname} !"
427 eerror " ( ${PATCH_TARGET} )"
177 eerror 428 eerror
178 eerror " ${EPATCH_SOURCE}" 429 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 430 eerror
431 eerror " ${STDERR_TARGET}"
180 echo 432 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 xz)
189 PIPE_CMD="xz -dc"
190 PATCH_SUFFIX="xz"
191 ;;
192 lzma)
193 PIPE_CMD="lzma -dc"
194 PATCH_SUFFIX="lzma"
195 ;;
196 bz2)
197 PIPE_CMD="bzip2 -dc"
198 PATCH_SUFFIX="bz2"
199 ;;
200 gz|Z|z)
201 PIPE_CMD="gzip -dc"
202 PATCH_SUFFIX="gz"
203 ;;
204 ZIP|zip)
205 PIPE_CMD="unzip -p"
206 PATCH_SUFFIX="zip"
207 ;;
208 *)
209 PIPE_CMD="cat"
210 PATCH_SUFFIX="patch"
211 ;;
212 esac
213
214 if [ "${SINGLE_PATCH}" = "no" ]
215 then
216 einfo "${EPATCH_MULTI_MSG}"
217 fi
218 for x in ${EPATCH_SOURCE}
219 do
220 # New ARCH dependant patch naming scheme ...
221 #
222 # ???_arch_foo.patch
223 #
224 if [ -f ${x} ] && \
225 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
226 [ "${EPATCH_FORCE}" = "yes" ])
227 then
228 local count=0
229 local popts="${EPATCH_OPTS}"
230 local patchname=${x##*/}
231
232 if [ -n "${EPATCH_EXCLUDE}" ]
233 then
234 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
235 then
236 continue
237 fi
238 fi
239
240 if [ "${SINGLE_PATCH}" = "yes" ]
241 then
242 if [ -n "${EPATCH_SINGLE_MSG}" ]
243 then
244 einfo "${EPATCH_SINGLE_MSG}"
245 else
246 einfo "Applying ${patchname} ..."
247 fi
248 else
249 einfo " ${patchname} ..."
250 fi
251
252 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
253 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254
255 # Decompress the patch if need be
256 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
257 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
259
260 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
261 echo
262 eerror "Could not extract patch!"
263 #die "Could not extract patch!"
264 count=5
265 break
266 fi
267 else
268 PATCH_TARGET="${x}"
269 fi
270
271 # Check for absolute paths in patches. If sandbox is disabled,
272 # people could (accidently) patch files in the root filesystem.
273 # Or trigger other unpleasantries #237667. So disallow -p0 on
274 # such patches.
275 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
276 if [[ -n ${abs_paths} ]] ; then
277 count=1
278 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 fi
281
282 # Allow for prefix to differ ... im lazy, so shoot me :/
283 while [ "${count}" -lt 5 ]
284 do
285 # Generate some useful debug info ...
286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288
289 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291
292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294
295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
296 then
297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
302
303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
305
306 if [ "$?" -ne 0 ]
307 then
308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
309 echo
310 eerror "A dry-run of patch command succeeded, but actually"
311 eerror "applying the patch failed!"
312 #die "Real world sux compared to the dreamworld!"
313 count=5
314 fi
315
316 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317
318 break
319 fi
320
321 count=$((count + 1))
322 done
323
324 if [ "${PATCH_SUFFIX}" != "patch" ]
325 then
326 rm -f ${PATCH_TARGET}
327 fi
328
329 if [ "${count}" -eq 5 ]
330 then
331 echo
332 eerror "Failed Patch: ${patchname} !"
333 eerror " ( ${PATCH_TARGET} )"
334 eerror
335 eerror "Include in your bugreport the contents of:"
336 eerror
337 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
338 echo
339 die "Failed Patch: ${patchname}!" 433 die "Failed Patch: ${patchname}!"
340 fi 434 fi
341 435
342 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 436 # if everything worked, delete the patch log
343 437 rm -f "${STDERR_TARGET}"
344 eend 0 438 eend 0
345 fi
346 done 439 done
347 if [ "${SINGLE_PATCH}" = "no" ] 440
348 then 441 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
349 einfo "Done with patching" 442 : # everything worked
350 fi
351} 443}
444
445# @FUNCTION: epatch_user
446# @USAGE:
447# @DESCRIPTION:
448# Applies user-provided patches to the source tree. The patches are
449# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
450# of these three directories to exist will be the one to use, ignoring
451# any more general directories which might exist as well.
452#
453# User patches are intended for quick testing of patches without ebuild
454# modifications, as well as for permanent customizations a user might
455# desire. Obviously, there can be no official support for arbitrarily
456# patched ebuilds. So whenever a build log in a bug report mentions that
457# user patches were applied, the user should be asked to reproduce the
458# problem without these.
459#
460# Not all ebuilds do call this function, so placing patches in the
461# stated directory might or might not work, depending on the package and
462# the eclasses it inherits and uses. It is safe to call the function
463# repeatedly, so it is always possible to add a call at the ebuild
464# level. The first call is the time when the patches will be
465# applied.
466#
467# Ideally, this function should be called after gentoo-specific patches
468# have been applied, so that their code can be modified as well, but
469# before calls to e.g. eautoreconf, as the user patches might affect
470# autotool input files as well.
352epatch_user() { 471epatch_user() {
353 [[ $# -ne 0 ]] && die "epatch_user takes no options" 472 [[ $# -ne 0 ]] && die "epatch_user takes no options"
354 473
474 # Allow multiple calls to this function; ignore all but the first
475 local applied="${T}/epach_user.applied"
476 [[ -e ${applied} ]] && return 2
477
355 # don't clobber any EPATCH vars that the parent might want 478 # don't clobber any EPATCH vars that the parent might want
356 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches 479 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
357 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 480 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
358 EPATCH_SOURCE=${base}/${CTARGET}/${check} 481 EPATCH_SOURCE=${base}/${CTARGET}/${check}
359 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} 482 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
360 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} 483 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
361 if [[ -d ${EPATCH_SOURCE} ]] ; then 484 if [[ -d ${EPATCH_SOURCE} ]] ; then
362 EPATCH_SOURCE=${EPATCH_SOURCE} \ 485 EPATCH_SOURCE=${EPATCH_SOURCE} \
363 EPATCH_SUFFIX="patch" \ 486 EPATCH_SUFFIX="patch" \
364 EPATCH_FORCE="yes" \ 487 EPATCH_FORCE="yes" \
365 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 488 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
366 epatch 489 epatch
367 break 490 echo "${EPATCH_SOURCE}" > "${applied}"
491 return 0
368 fi 492 fi
369 done 493 done
494 echo "none" > "${applied}"
495 return 1
370} 496}
371 497
372# @FUNCTION: emktemp 498# @FUNCTION: emktemp
373# @USAGE: [temp dir] 499# @USAGE: [temp dir]
374# @DESCRIPTION: 500# @DESCRIPTION:
418egetent() { 544egetent() {
419 case ${CHOST} in 545 case ${CHOST} in
420 *-darwin[678]) 546 *-darwin[678])
421 case "$2" in 547 case "$2" in
422 *[!0-9]*) # Non numeric 548 *[!0-9]*) # Non numeric
423 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 549 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
424 ;; 550 ;;
425 *) # Numeric 551 *) # Numeric
426 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 552 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
427 ;; 553 ;;
428 esac 554 esac
646 fi 772 fi
647 ;; 773 ;;
648 774
649 *) 775 *)
650 if [[ -z $@ ]] ; then 776 if [[ -z $@ ]] ; then
651 useradd ${opts} ${euser} \ 777 useradd -r ${opts} \
652 -c "added by portage for ${PN}" \ 778 -c "added by portage for ${PN}" \
779 ${euser} \
653 || die "enewuser failed" 780 || die "enewuser failed"
654 else 781 else
655 einfo " - Extra: $@" 782 einfo " - Extra: $@"
656 useradd ${opts} ${euser} "$@" \ 783 useradd -r ${opts} "$@" \
784 ${euser} \
657 || die "enewuser failed" 785 || die "enewuser failed"
658 fi 786 fi
659 ;; 787 ;;
660 esac 788 esac
661 789
773 esac 901 esac
774 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 902 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
775 ;; 903 ;;
776 904
777 *) 905 *)
906 # We specify -r so that we get a GID in the system range from login.defs
778 groupadd ${opts} ${egroup} || die "enewgroup failed" 907 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
779 ;; 908 ;;
780 esac 909 esac
781 export SANDBOX_ON="${oldsandbox}" 910 export SANDBOX_ON="${oldsandbox}"
782} 911}
783 912
794 923
795# Make a desktop file ! 924# Make a desktop file !
796# Great for making those icons in kde/gnome startmenu ! 925# Great for making those icons in kde/gnome startmenu !
797# Amaze your friends ! Get the women ! Join today ! 926# Amaze your friends ! Get the women ! Join today !
798# 927#
799# make_desktop_entry(<command>, [name], [icon], [type], [path]) 928# make_desktop_entry(<command>, [name], [icon], [type], [fields])
800# 929#
801# binary: what command does the app run with ? 930# binary: what command does the app run with ?
802# name: the name that will show up in the menu 931# name: the name that will show up in the menu
803# icon: give your little like a pretty little icon ... 932# icon: give your little like a pretty little icon ...
804# this can be relative (to /usr/share/pixmaps) or 933# this can be relative (to /usr/share/pixmaps) or
805# a full path to an icon 934# a full path to an icon
806# type: what kind of application is this ? for categories: 935# type: what kind of application is this ? for categories:
807# http://standards.freedesktop.org/menu-spec/latest/apa.html 936# http://standards.freedesktop.org/menu-spec/latest/apa.html
808# path: if your app needs to startup in a specific dir 937# fields: extra fields to append to the desktop file; a printf string
809make_desktop_entry() { 938make_desktop_entry() {
810 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 939 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
811 940
812 local exec=${1} 941 local exec=${1}
813 local name=${2:-${PN}} 942 local name=${2:-${PN}}
814 local icon=${3:-${PN}} 943 local icon=${3:-${PN}}
815 local type=${4} 944 local type=${4}
816 local path=${5} 945 local fields=${5}
817 946
818 if [[ -z ${type} ]] ; then 947 if [[ -z ${type} ]] ; then
819 local catmaj=${CATEGORY%%-*} 948 local catmaj=${CATEGORY%%-*}
820 local catmin=${CATEGORY##*-} 949 local catmin=${CATEGORY##*-}
821 case ${catmaj} in 950 case ${catmaj} in
822 app) 951 app)
823 case ${catmin} in 952 case ${catmin} in
824 accessibility) type=Accessibility;; 953 accessibility) type=Accessibility;;
825 admin) type=System;; 954 admin) type=System;;
826 antivirus) type=System;; 955 antivirus) type=System;;
827 arch) type=Archiving;; 956 arch) type=Archiving;;
828 backup) type=Archiving;; 957 backup) type=Archiving;;
829 cdr) type=DiscBurning;; 958 cdr) type=DiscBurning;;
830 dicts) type=Dictionary;; 959 dicts) type=Dictionary;;
831 doc) type=Documentation;; 960 doc) type=Documentation;;
832 editors) type=TextEditor;; 961 editors) type=TextEditor;;
833 emacs) type=TextEditor;; 962 emacs) type=TextEditor;;
834 emulation) type=Emulator;; 963 emulation) type=Emulator;;
835 laptop) type=HardwareSettings;; 964 laptop) type=HardwareSettings;;
836 office) type=Office;; 965 office) type=Office;;
837 pda) type=PDA;; 966 pda) type=PDA;;
838 vim) type=TextEditor;; 967 vim) type=TextEditor;;
839 xemacs) type=TextEditor;; 968 xemacs) type=TextEditor;;
840 *) type=;;
841 esac 969 esac
842 ;; 970 ;;
843 971
844 dev) 972 dev)
845 type="Development" 973 type="Development"
846 ;; 974 ;;
847 975
848 games) 976 games)
849 case ${catmin} in 977 case ${catmin} in
850 action|fps) type=ActionGame;; 978 action|fps) type=ActionGame;;
851 arcade) type=ArcadeGame;; 979 arcade) type=ArcadeGame;;
852 board) type=BoardGame;; 980 board) type=BoardGame;;
853 emulation) type=Emulator;; 981 emulation) type=Emulator;;
854 kids) type=KidsGame;; 982 kids) type=KidsGame;;
855 puzzle) type=LogicGame;; 983 puzzle) type=LogicGame;;
856 roguelike) type=RolePlaying;; 984 roguelike) type=RolePlaying;;
857 rpg) type=RolePlaying;; 985 rpg) type=RolePlaying;;
858 simulation) type=Simulation;; 986 simulation) type=Simulation;;
859 sports) type=SportsGame;; 987 sports) type=SportsGame;;
860 strategy) type=StrategyGame;; 988 strategy) type=StrategyGame;;
861 *) type=;;
862 esac 989 esac
863 type="Game;${type}" 990 type="Game;${type}"
864 ;; 991 ;;
865 992
866 gnome) 993 gnome)
875 type="Network;Email" 1002 type="Network;Email"
876 ;; 1003 ;;
877 1004
878 media) 1005 media)
879 case ${catmin} in 1006 case ${catmin} in
1007 gfx)
880 gfx) type=Graphics;; 1008 type=Graphics
1009 ;;
1010 *)
1011 case ${catmin} in
881 radio) type=Tuner;; 1012 radio) type=Tuner;;
882 sound) type=Audio;; 1013 sound) type=Audio;;
883 tv) type=TV;; 1014 tv) type=TV;;
884 video) type=Video;; 1015 video) type=Video;;
885 *) type=;; 1016 esac
1017 type="AudioVideo;${type}"
1018 ;;
886 esac 1019 esac
887 type="AudioVideo;${type}"
888 ;; 1020 ;;
889 1021
890 net) 1022 net)
891 case ${catmin} in 1023 case ${catmin} in
892 dialup) type=Dialup;; 1024 dialup) type=Dialup;;
893 ftp) type=FileTransfer;; 1025 ftp) type=FileTransfer;;
894 im) type=InstantMessaging;; 1026 im) type=InstantMessaging;;
895 irc) type=IRCClient;; 1027 irc) type=IRCClient;;
896 mail) type=Email;; 1028 mail) type=Email;;
897 news) type=News;; 1029 news) type=News;;
898 nntp) type=News;; 1030 nntp) type=News;;
899 p2p) type=FileTransfer;; 1031 p2p) type=FileTransfer;;
900 *) type=;; 1032 voip) type=Telephony;;
901 esac 1033 esac
902 type="Network;${type}" 1034 type="Network;${type}"
903 ;; 1035 ;;
904 1036
905 sci) 1037 sci)
906 case ${catmin} in 1038 case ${catmin} in
907 astro*) type=Astronomy;; 1039 astro*) type=Astronomy;;
908 bio*) type=Biology;; 1040 bio*) type=Biology;;
909 calc*) type=Calculator;; 1041 calc*) type=Calculator;;
910 chem*) type=Chemistry;; 1042 chem*) type=Chemistry;;
911 elec*) type=Electronics;; 1043 elec*) type=Electronics;;
912 geo*) type=Geology;; 1044 geo*) type=Geology;;
913 math*) type=Math;; 1045 math*) type=Math;;
914 physics) type=Physics;; 1046 physics) type=Physics;;
915 visual*) type=DataVisualization;; 1047 visual*) type=DataVisualization;;
916 *) type=;;
917 esac 1048 esac
918 type="Science;${type}" 1049 type="Education;Science;${type}"
919 ;; 1050 ;;
920 1051
921 sys) 1052 sys)
922 type="System" 1053 type="System"
923 ;; 1054 ;;
924 1055
925 www) 1056 www)
926 case ${catmin} in 1057 case ${catmin} in
927 client) type=WebBrowser;; 1058 client) type=WebBrowser;;
928 *) type=;;
929 esac 1059 esac
930 type="Network" 1060 type="Network;${type}"
931 ;; 1061 ;;
932 1062
933 *) 1063 *)
934 type= 1064 type=
935 ;; 1065 ;;
941 local desktop_name="${PN}-${SLOT}" 1071 local desktop_name="${PN}-${SLOT}"
942 fi 1072 fi
943 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1073 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
944 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1074 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
945 1075
1076 # Don't append another ";" when a valid category value is provided.
1077 type=${type%;}${type:+;}
1078
1079 eshopts_push -s extglob
1080 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1081 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1082 ewarn "allowed in .desktop files if the value is not an absolute path."
1083 icon=${icon%.@(xpm|png|svg)}
1084 fi
1085 eshopts_pop
1086
946 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
947 [Desktop Entry] 1088 [Desktop Entry]
948 Version=1.0
949 Name=${name} 1089 Name=${name}
950 Type=Application 1090 Type=Application
951 Comment=${DESCRIPTION} 1091 Comment=${DESCRIPTION}
952 Exec=${exec} 1092 Exec=${exec}
953 TryExec=${exec%% *} 1093 TryExec=${exec%% *}
954 Icon=${icon} 1094 Icon=${icon}
955 Categories=${type}; 1095 Categories=${type}
956 EOF 1096 EOF
957 1097
958 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1098 if [[ ${fields:-=} != *=* ]] ; then
1099 # 5th arg used to be value to Path=
1100 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1101 fields="Path=${fields}"
1102 fi
1103 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
959 1104
960 ( 1105 (
961 # wrap the env here so that the 'insinto' call 1106 # wrap the env here so that the 'insinto' call
962 # doesn't corrupt the env of the caller 1107 # doesn't corrupt the env of the caller
963 insinto /usr/share/applications 1108 insinto /usr/share/applications
964 doins "${desktop}" 1109 doins "${desktop}"
965 ) 1110 ) || die "installing desktop file failed"
966} 1111}
967 1112
968# @FUNCTION: validate_desktop_entries 1113# @FUNCTION: validate_desktop_entries
969# @USAGE: [directories] 1114# @USAGE: [directories]
970# @MAINTAINER: 1115# @MAINTAINER:
1249 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1394 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1250 1395
1251 local shrtsrc=$(basename "${src}") 1396 local shrtsrc=$(basename "${src}")
1252 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1397 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1253 if [[ -z ${skip} ]] ; then 1398 if [[ -z ${skip} ]] ; then
1254 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1399 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1255 local skip=0 1400 local skip=0
1256 exe=tail 1401 exe=tail
1257 case ${ver} in 1402 case ${ver} in
1258 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1403 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1259 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1404 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1261 2.0|2.0.1) 1406 2.0|2.0.1)
1262 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1407 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1263 ;; 1408 ;;
1264 2.1.1) 1409 2.1.1)
1265 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1410 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1266 let skip="skip + 1" 1411 (( skip++ ))
1267 ;; 1412 ;;
1268 2.1.2) 1413 2.1.2)
1269 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1414 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1270 let skip="skip + 1" 1415 (( skip++ ))
1271 ;; 1416 ;;
1272 2.1.3) 1417 2.1.3)
1273 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1418 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1274 let skip="skip + 1" 1419 (( skip++ ))
1275 ;; 1420 ;;
1276 2.1.4|2.1.5) 1421 2.1.4|2.1.5)
1277 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1422 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1278 skip=$(head -n ${skip} "${src}" | wc -c) 1423 skip=$(head -n ${skip} "${src}" | wc -c)
1279 exe="dd" 1424 exe="dd"
1288 esac 1433 esac
1289 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1434 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1290 fi 1435 fi
1291 case ${exe} in 1436 case ${exe} in
1292 tail) exe="tail -n +${skip} '${src}'";; 1437 tail) exe="tail -n +${skip} '${src}'";;
1293 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1438 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1294 *) die "makeself cant handle exe '${exe}'" 1439 *) die "makeself cant handle exe '${exe}'"
1295 esac 1440 esac
1296 1441
1297 # lets grab the first few bytes of the file to figure out what kind of archive it is 1442 # lets grab the first few bytes of the file to figure out what kind of archive it is
1298 local tmpfile=$(emktemp) 1443 local filetype tmpfile=$(emktemp)
1299 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1444 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1300 local filetype=$(file -b "${tmpfile}") 1445 filetype=$(file -b "${tmpfile}") || die
1301 case ${filetype} in 1446 case ${filetype} in
1302 *tar\ archive*) 1447 *tar\ archive*)
1303 eval ${exe} | tar --no-same-owner -xf - 1448 eval ${exe} | tar --no-same-owner -xf -
1304 ;; 1449 ;;
1305 bzip2*) 1450 bzip2*)
1335 lic="${PWD}/${lic}" 1480 lic="${PWD}/${lic}"
1336 elif [ -e "${lic}" ] ; then 1481 elif [ -e "${lic}" ] ; then
1337 lic="${lic}" 1482 lic="${lic}"
1338 fi 1483 fi
1339 fi 1484 fi
1340 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1341 local l="`basename ${lic}`" 1485 local l="`basename ${lic}`"
1342 1486
1343 # here is where we check for the licenses the user already 1487 # here is where we check for the licenses the user already
1344 # accepted ... if we don't find a match, we make the user accept 1488 # accepted ... if we don't find a match, we make the user accept
1345 local shopts=$-
1346 local alic 1489 local alic
1347 set -o noglob #so that bash doesn't expand "*" 1490 eshopts_push -o noglob # so that bash doesn't expand "*"
1348 for alic in ${ACCEPT_LICENSE} ; do 1491 for alic in ${ACCEPT_LICENSE} ; do
1349 if [[ ${alic} == ${l} ]]; then 1492 if [[ ${alic} == ${l} ]]; then
1350 set +o noglob; set -${shopts} #reset old shell opts 1493 eshopts_pop
1351 return 0 1494 return 0
1352 fi 1495 fi
1353 done 1496 done
1354 set +o noglob; set -$shopts #reset old shell opts 1497 eshopts_pop
1498 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1355 1499
1356 local licmsg=$(emktemp) 1500 local licmsg=$(emktemp)
1357 cat <<-EOF > ${licmsg} 1501 cat <<-EOF > ${licmsg}
1358 ********************************************************** 1502 **********************************************************
1359 The following license outlines the terms of use of this 1503 The following license outlines the terms of use of this
1432 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1576 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1577 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1434 export CDROM_SET=-1 1578 export CDROM_SET=-1
1435 for f in ${CDROM_CHECK_1//:/ } ; do 1579 for f in ${CDROM_CHECK_1//:/ } ; do
1436 ((++CDROM_SET)) 1580 ((++CDROM_SET))
1437 [[ -e ${CD_ROOT}/${f} ]] && break 1581 [[ -e ${CDROM_ROOT}/${f} ]] && break
1438 done 1582 done
1439 export CDROM_MATCH=${f} 1583 export CDROM_MATCH=${f}
1440 return 1584 return
1441 fi 1585 fi
1442 1586
1616 else 1760 else
1617 newls="" 1761 newls=""
1618 fi 1762 fi
1619 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1763 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1620 if [[ ${op} == "-i" ]] ; then 1764 if [[ ${op} == "-i" ]] ; then
1621 hasq ${f} ${ls} && newls="${newls} ${f}" 1765 has ${f} ${ls} && newls="${newls} ${f}"
1622 else 1766 else
1623 hasq ${f} ${ls} || newls="${newls} ${f}" 1767 has ${f} ${ls} || newls="${newls} ${f}"
1624 fi 1768 fi
1625 done 1769 done
1626 ls=${newls} 1770 ls=${newls}
1627 done 1771 done
1628 else 1772 else
1630 fi 1774 fi
1631 1775
1632 nols="" 1776 nols=""
1633 newls="" 1777 newls=""
1634 for f in ${LINGUAS} ; do 1778 for f in ${LINGUAS} ; do
1635 if hasq ${f} ${ls} ; then 1779 if has ${f} ${ls} ; then
1636 newls="${newls} ${f}" 1780 newls="${newls} ${f}"
1637 else 1781 else
1638 nols="${nols} ${f}" 1782 nols="${nols} ${f}"
1639 fi 1783 fi
1640 done 1784 done
1695 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1839 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1696 ewarn "in order to remove these old dependencies. If you do not have this" 1840 ewarn "in order to remove these old dependencies. If you do not have this"
1697 ewarn "helper program, simply emerge the 'gentoolkit' package." 1841 ewarn "helper program, simply emerge the 'gentoolkit' package."
1698 ewarn 1842 ewarn
1699 fi 1843 fi
1844 # temp hack for #348634 #357225
1845 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1700 ewarn " # revdep-rebuild --library ${lib##*/}" 1846 ewarn " # revdep-rebuild --library '${lib}'"
1701 done 1847 done
1702 if [[ ${notice} -eq 1 ]] ; then 1848 if [[ ${notice} -eq 1 ]] ; then
1703 ewarn 1849 ewarn
1704 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1850 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1705 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1851 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1710} 1856}
1711 1857
1712# @FUNCTION: built_with_use 1858# @FUNCTION: built_with_use
1713# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1859# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1714# @DESCRIPTION: 1860# @DESCRIPTION:
1861#
1862# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1863#
1715# A temporary hack until portage properly supports DEPENDing on USE 1864# A temporary hack until portage properly supports DEPENDing on USE
1716# flags being enabled in packages. This will check to see if the specified 1865# flags being enabled in packages. This will check to see if the specified
1717# DEPEND atom was built with the specified list of USE flags. The 1866# DEPEND atom was built with the specified list of USE flags. The
1718# --missing option controls the behavior if called on a package that does 1867# --missing option controls the behavior if called on a package that does
1719# not actually support the defined USE flags (aka listed in IUSE). 1868# not actually support the defined USE flags (aka listed in IUSE).
1848 else 1997 else
1849 newbin "${tmpwrapper}" "${wrapper}" || die 1998 newbin "${tmpwrapper}" "${wrapper}" || die
1850 fi 1999 fi
1851} 2000}
1852 2001
1853# @FUNCTION: prepalldocs 2002# @FUNCTION: path_exists
1854# @USAGE: 2003# @USAGE: [-a|-o] <paths>
1855# @DESCRIPTION: 2004# @DESCRIPTION:
1856# Compress files in /usr/share/doc which are not already 2005# Check if the specified paths exist. Works for all types of paths
1857# compressed, excluding /usr/share/doc/${PF}/html. 2006# (files/dirs/etc...). The -a and -o flags control the requirements
1858# Uses the ecompressdir to do the compression. 2007# of the paths. They correspond to "and" and "or" logic. So the -a
1859# 2009-02-18 by betelgeuse: 2008# flag means all the paths must exist while the -o flag means at least
1860# Commented because ecompressdir is even more internal to 2009# one of the paths must exist. The default behavior is "and". If no
1861# Portage than prepalldocs (it's not even mentioned in man 5 2010# paths are specified, then the return value is "false".
1862# ebuild). Please submit a better version for review to gentoo-dev 2011path_exists() {
1863# if you want prepalldocs here. 2012 local opt=$1
1864#prepalldocs() { 2013 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1865# if [[ -n $1 ]] ; then
1866# ewarn "prepalldocs: invalid usage; takes no arguments"
1867# fi
1868 2014
1869# cd "${D}" 2015 # no paths -> return false
1870# [[ -d usr/share/doc ]] || return 0 2016 # same behavior as: [[ -e "" ]]
2017 [[ $# -eq 0 ]] && return 1
1871 2018
1872# find usr/share/doc -exec gzip {} + 2019 local p r=0
1873# ecompressdir --ignore /usr/share/doc/${PF}/html 2020 for p in "$@" ; do
1874# ecompressdir --queue /usr/share/doc 2021 [[ -e ${p} ]]
1875#} 2022 : $(( r += $? ))
2023 done
2024
2025 case ${opt} in
2026 -a) return $(( r != 0 )) ;;
2027 -o) return $(( r == $# )) ;;
2028 esac
2029}

Legend:
Removed from v.1.319  
changed lines
  Added in v.1.361

  ViewVC Help
Powered by ViewVC 1.1.20