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

Diff of /eclass/eutils.eclass

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

Revision 1.324 Revision 1.361
1# Copyright 1999-2009 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.324 2010/01/03 19:57:10 zmedico 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.
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# @FUNCTION: eshopts_push 98# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`] 99# @USAGE: [options to `set` or `shopt`]
75# @DESCRIPTION: 100# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior. 101# Often times code will want to enable a shell option to change code behavior.
77# Since changing shell options can easily break other pieces of code (which 102# Since changing shell options can easily break other pieces of code (which
78# assume the default state), eshopts_push is used to (1) push the current shell 103# assume the default state), eshopts_push is used to (1) push the current shell
79# options onto a stack and (2) pass the specified arguments to set. 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.
80# 108#
81# A common example is to disable shell globbing so that special meaning/care 109# A common example is to disable shell globbing so that special meaning/care
82# may be used with variables/arguments to custom functions. That would be: 110# may be used with variables/arguments to custom functions. That would be:
83# @CODE 111# @CODE
84# eshopts_push -o noglob 112# eshopts_push -o noglob
92# @CODE 120# @CODE
93eshopts_push() { 121eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with 122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value 123 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]} 124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
97 __ESHOPTS_SAVE__[$i]=$- 126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
98 [[ $# -eq 0 ]] && return 0 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
99 set "$@" || die "eshopts_push: bad options to set: $*" 132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
100} 134}
101 135
102# @FUNCTION: eshopts_pop 136# @FUNCTION: eshopts_pop
103# @USAGE: 137# @USAGE:
104# @DESCRIPTION: 138# @DESCRIPTION:
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments" 142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 )) 143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair" 144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]} 145 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __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
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-" 150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}" 151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
115} 153}
116 154
117# Default directory where patches are located 155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
118EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
120EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
121# Default options for patch 165# Default options for patch:
166# @CODE
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
124# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
125EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
126# 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,
127# and not the full path .. 175# and not the full path. Globs accepted.
128EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
129# Change the printed message for a single patch. 179# Change the printed message for a single patch.
130EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
131# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
133# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
134# 186# @DESCRIPTION:
135# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
136# 188# arch naming style.
137EPATCH_FORCE="no" 189EPATCH_FORCE="no"
138 190
139# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
140# 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.
141# 199#
142# 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
143# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
144# 202#
145# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
146# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
147# 205# if ${EPATCH_FORCE} != "yes"
148# Above EPATCH_* variables can be used to control various defaults,
149# bug they should be left as is to ensure an ebuild can rely on
150# them for.
151#
152# Patches are applied in current directory.
153#
154# Bulk Patches should preferably have the form of:
155#
156# ??_${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.
157# 215#
158# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
159# 218#
160# 01_all_misc-fix.patch.bz2 219# Refer to the other EPATCH_xxx variables for more customization of behavior.
161# 02_sparc_another-fix.patch.bz2
162#
163# This ensures that there are a set order, and you can have ARCH
164# specific patches.
165#
166# If you however give an argument to epatch(), it will treat it as a
167# single patch that need to be applied if its a file. If on the other
168# hand its a directory, it will set EPATCH_SOURCE to this.
169#
170# <azarah@gentoo.org> (10 Nov 2002)
171#
172epatch() { 220epatch() {
173 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
174 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
175 echo "${1//?/=}" 224 echo "${1//?/=}"
176 } 225 }
177 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
178 local PIPE_CMD=""
179 local STDERR_TARGET="${T}/$$.out"
180 local PATCH_TARGET="${T}/$$.patch"
181 local PATCH_SUFFIX=""
182 local SINGLE_PATCH="no"
183 local x=""
184 226
185 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
186 228
187 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
188 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
189 local m="" 233 local m
190 for m in "$@" ; do 234 for m in "$@" ; do
191 epatch "${m}" 235 epatch "${m}"
192 done 236 done
193 return 0 237 return 0
194 fi 238 fi
195 239
196 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
197 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
198 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
199 246 set -- "$1"
200 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
201 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
202 250
203 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
204 then 252 # Some people like to make dirs of patches w/out suffixes (vim)
205 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
206 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} ]]
207 then 302 then
208 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
209 else 328 else
210 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 329 einfo " ${patchname} ..."
211 fi 330 fi
212 else 331
213 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 332 # most of the time, there will only be one run per unique name,
214 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 333 # but if there are more, make sure we get unique log filenames
215 then 334 local STDERR_TARGET="${T}/${patchname}.out"
216 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
217 fi 354 fi
355 else
356 PATCH_TARGET=${x}
357 fi
218 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} *****"
219 echo 381 echo
220 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} )"
221 eerror 428 eerror
222 eerror " ${EPATCH_SOURCE}" 429 eerror "Include in your bugreport the contents of:"
223 eerror " ( ${EPATCH_SOURCE##*/} )" 430 eerror
431 eerror " ${STDERR_TARGET}"
224 echo 432 echo
225 die "Cannot find \$EPATCH_SOURCE!"
226 fi
227
228 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
229 fi
230
231 case ${EPATCH_SUFFIX##*\.} in
232 xz)
233 PIPE_CMD="xz -dc"
234 PATCH_SUFFIX="xz"
235 ;;
236 lzma)
237 PIPE_CMD="lzma -dc"
238 PATCH_SUFFIX="lzma"
239 ;;
240 bz2)
241 PIPE_CMD="bzip2 -dc"
242 PATCH_SUFFIX="bz2"
243 ;;
244 gz|Z|z)
245 PIPE_CMD="gzip -dc"
246 PATCH_SUFFIX="gz"
247 ;;
248 ZIP|zip)
249 PIPE_CMD="unzip -p"
250 PATCH_SUFFIX="zip"
251 ;;
252 *)
253 PIPE_CMD="cat"
254 PATCH_SUFFIX="patch"
255 ;;
256 esac
257
258 if [ "${SINGLE_PATCH}" = "no" ]
259 then
260 einfo "${EPATCH_MULTI_MSG}"
261 fi
262 for x in ${EPATCH_SOURCE}
263 do
264 # New ARCH dependant patch naming scheme ...
265 #
266 # ???_arch_foo.patch
267 #
268 if [ -f ${x} ] && \
269 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
270 [ "${EPATCH_FORCE}" = "yes" ])
271 then
272 local count=0
273 local popts="${EPATCH_OPTS}"
274 local patchname=${x##*/}
275
276 if [ -n "${EPATCH_EXCLUDE}" ]
277 then
278 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
279 then
280 continue
281 fi
282 fi
283
284 if [ "${SINGLE_PATCH}" = "yes" ]
285 then
286 if [ -n "${EPATCH_SINGLE_MSG}" ]
287 then
288 einfo "${EPATCH_SINGLE_MSG}"
289 else
290 einfo "Applying ${patchname} ..."
291 fi
292 else
293 einfo " ${patchname} ..."
294 fi
295
296 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298
299 # Decompress the patch if need be
300 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
301 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303
304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
305 echo
306 eerror "Could not extract patch!"
307 #die "Could not extract patch!"
308 count=5
309 break
310 fi
311 else
312 PATCH_TARGET="${x}"
313 fi
314
315 # Check for absolute paths in patches. If sandbox is disabled,
316 # people could (accidently) patch files in the root filesystem.
317 # Or trigger other unpleasantries #237667. So disallow -p0 on
318 # such patches.
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then
321 count=1
322 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 fi
325
326 # Allow for prefix to differ ... im lazy, so shoot me :/
327 while [ "${count}" -lt 5 ]
328 do
329 # Generate some useful debug info ...
330 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332
333 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335
336 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338
339 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
340 then
341 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
342 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
343 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
344 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
345 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
346
347 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
348 _epatch_assert
349
350 if [ "$?" -ne 0 ]
351 then
352 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
353 echo
354 eerror "A dry-run of patch command succeeded, but actually"
355 eerror "applying the patch failed!"
356 #die "Real world sux compared to the dreamworld!"
357 count=5
358 fi
359
360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361
362 break
363 fi
364
365 count=$((count + 1))
366 done
367
368 if [ "${PATCH_SUFFIX}" != "patch" ]
369 then
370 rm -f ${PATCH_TARGET}
371 fi
372
373 if [ "${count}" -eq 5 ]
374 then
375 echo
376 eerror "Failed Patch: ${patchname} !"
377 eerror " ( ${PATCH_TARGET} )"
378 eerror
379 eerror "Include in your bugreport the contents of:"
380 eerror
381 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
382 echo
383 die "Failed Patch: ${patchname}!" 433 die "Failed Patch: ${patchname}!"
384 fi 434 fi
385 435
386 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 436 # if everything worked, delete the patch log
387 437 rm -f "${STDERR_TARGET}"
388 eend 0 438 eend 0
389 fi
390 done 439 done
391 if [ "${SINGLE_PATCH}" = "no" ] 440
392 then 441 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
393 einfo "Done with patching" 442 : # everything worked
394 fi
395} 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.
396epatch_user() { 471epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options" 472 [[ $# -ne 0 ]] && die "epatch_user takes no options"
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
398 477
399 # don't clobber any EPATCH vars that the parent might want 478 # don't clobber any EPATCH vars that the parent might want
400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 479 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 480 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
402 EPATCH_SOURCE=${base}/${CTARGET}/${check} 481 EPATCH_SOURCE=${base}/${CTARGET}/${check}
406 EPATCH_SOURCE=${EPATCH_SOURCE} \ 485 EPATCH_SOURCE=${EPATCH_SOURCE} \
407 EPATCH_SUFFIX="patch" \ 486 EPATCH_SUFFIX="patch" \
408 EPATCH_FORCE="yes" \ 487 EPATCH_FORCE="yes" \
409 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 488 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
410 epatch 489 epatch
411 break 490 echo "${EPATCH_SOURCE}" > "${applied}"
491 return 0
412 fi 492 fi
413 done 493 done
494 echo "none" > "${applied}"
495 return 1
414} 496}
415 497
416# @FUNCTION: emktemp 498# @FUNCTION: emktemp
417# @USAGE: [temp dir] 499# @USAGE: [temp dir]
418# @DESCRIPTION: 500# @DESCRIPTION:
462egetent() { 544egetent() {
463 case ${CHOST} in 545 case ${CHOST} in
464 *-darwin[678]) 546 *-darwin[678])
465 case "$2" in 547 case "$2" in
466 *[!0-9]*) # Non numeric 548 *[!0-9]*) # Non numeric
467 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 549 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
468 ;; 550 ;;
469 *) # Numeric 551 *) # Numeric
470 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 552 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
471 ;; 553 ;;
472 esac 554 esac
690 fi 772 fi
691 ;; 773 ;;
692 774
693 *) 775 *)
694 if [[ -z $@ ]] ; then 776 if [[ -z $@ ]] ; then
695 useradd ${opts} \ 777 useradd -r ${opts} \
696 -c "added by portage for ${PN}" \ 778 -c "added by portage for ${PN}" \
697 ${euser} \ 779 ${euser} \
698 || die "enewuser failed" 780 || die "enewuser failed"
699 else 781 else
700 einfo " - Extra: $@" 782 einfo " - Extra: $@"
701 useradd ${opts} "$@" \ 783 useradd -r ${opts} "$@" \
702 ${euser} \ 784 ${euser} \
703 || die "enewuser failed" 785 || die "enewuser failed"
704 fi 786 fi
705 ;; 787 ;;
706 esac 788 esac
819 esac 901 esac
820 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 902 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
821 ;; 903 ;;
822 904
823 *) 905 *)
906 # We specify -r so that we get a GID in the system range from login.defs
824 groupadd ${opts} ${egroup} || die "enewgroup failed" 907 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
825 ;; 908 ;;
826 esac 909 esac
827 export SANDBOX_ON="${oldsandbox}" 910 export SANDBOX_ON="${oldsandbox}"
828} 911}
829 912
840 923
841# Make a desktop file ! 924# Make a desktop file !
842# Great for making those icons in kde/gnome startmenu ! 925# Great for making those icons in kde/gnome startmenu !
843# Amaze your friends ! Get the women ! Join today ! 926# Amaze your friends ! Get the women ! Join today !
844# 927#
845# make_desktop_entry(<command>, [name], [icon], [type], [path]) 928# make_desktop_entry(<command>, [name], [icon], [type], [fields])
846# 929#
847# binary: what command does the app run with ? 930# binary: what command does the app run with ?
848# name: the name that will show up in the menu 931# name: the name that will show up in the menu
849# icon: give your little like a pretty little icon ... 932# icon: give your little like a pretty little icon ...
850# this can be relative (to /usr/share/pixmaps) or 933# this can be relative (to /usr/share/pixmaps) or
851# a full path to an icon 934# a full path to an icon
852# type: what kind of application is this ? for categories: 935# type: what kind of application is this ? for categories:
853# http://standards.freedesktop.org/menu-spec/latest/apa.html 936# http://standards.freedesktop.org/menu-spec/latest/apa.html
854# path: if your app needs to startup in a specific dir 937# fields: extra fields to append to the desktop file; a printf string
855make_desktop_entry() { 938make_desktop_entry() {
856 [[ -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"
857 940
858 local exec=${1} 941 local exec=${1}
859 local name=${2:-${PN}} 942 local name=${2:-${PN}}
860 local icon=${3:-${PN}} 943 local icon=${3:-${PN}}
861 local type=${4} 944 local type=${4}
862 local path=${5} 945 local fields=${5}
863 946
864 if [[ -z ${type} ]] ; then 947 if [[ -z ${type} ]] ; then
865 local catmaj=${CATEGORY%%-*} 948 local catmaj=${CATEGORY%%-*}
866 local catmin=${CATEGORY##*-} 949 local catmin=${CATEGORY##*-}
867 case ${catmaj} in 950 case ${catmaj} in
868 app) 951 app)
869 case ${catmin} in 952 case ${catmin} in
870 accessibility) type=Accessibility;; 953 accessibility) type=Accessibility;;
871 admin) type=System;; 954 admin) type=System;;
872 antivirus) type=System;; 955 antivirus) type=System;;
873 arch) type=Archiving;; 956 arch) type=Archiving;;
874 backup) type=Archiving;; 957 backup) type=Archiving;;
875 cdr) type=DiscBurning;; 958 cdr) type=DiscBurning;;
876 dicts) type=Dictionary;; 959 dicts) type=Dictionary;;
877 doc) type=Documentation;; 960 doc) type=Documentation;;
878 editors) type=TextEditor;; 961 editors) type=TextEditor;;
879 emacs) type=TextEditor;; 962 emacs) type=TextEditor;;
880 emulation) type=Emulator;; 963 emulation) type=Emulator;;
881 laptop) type=HardwareSettings;; 964 laptop) type=HardwareSettings;;
882 office) type=Office;; 965 office) type=Office;;
883 pda) type=PDA;; 966 pda) type=PDA;;
884 vim) type=TextEditor;; 967 vim) type=TextEditor;;
885 xemacs) type=TextEditor;; 968 xemacs) type=TextEditor;;
886 *) type=;;
887 esac 969 esac
888 ;; 970 ;;
889 971
890 dev) 972 dev)
891 type="Development" 973 type="Development"
892 ;; 974 ;;
893 975
894 games) 976 games)
895 case ${catmin} in 977 case ${catmin} in
896 action|fps) type=ActionGame;; 978 action|fps) type=ActionGame;;
897 arcade) type=ArcadeGame;; 979 arcade) type=ArcadeGame;;
898 board) type=BoardGame;; 980 board) type=BoardGame;;
899 emulation) type=Emulator;; 981 emulation) type=Emulator;;
900 kids) type=KidsGame;; 982 kids) type=KidsGame;;
901 puzzle) type=LogicGame;; 983 puzzle) type=LogicGame;;
902 roguelike) type=RolePlaying;; 984 roguelike) type=RolePlaying;;
903 rpg) type=RolePlaying;; 985 rpg) type=RolePlaying;;
904 simulation) type=Simulation;; 986 simulation) type=Simulation;;
905 sports) type=SportsGame;; 987 sports) type=SportsGame;;
906 strategy) type=StrategyGame;; 988 strategy) type=StrategyGame;;
907 *) type=;;
908 esac 989 esac
909 type="Game;${type}" 990 type="Game;${type}"
910 ;; 991 ;;
911 992
912 gnome) 993 gnome)
921 type="Network;Email" 1002 type="Network;Email"
922 ;; 1003 ;;
923 1004
924 media) 1005 media)
925 case ${catmin} in 1006 case ${catmin} in
1007 gfx)
926 gfx) type=Graphics;; 1008 type=Graphics
1009 ;;
1010 *)
1011 case ${catmin} in
927 radio) type=Tuner;; 1012 radio) type=Tuner;;
928 sound) type=Audio;; 1013 sound) type=Audio;;
929 tv) type=TV;; 1014 tv) type=TV;;
930 video) type=Video;; 1015 video) type=Video;;
931 *) type=;; 1016 esac
1017 type="AudioVideo;${type}"
1018 ;;
932 esac 1019 esac
933 type="AudioVideo;${type}"
934 ;; 1020 ;;
935 1021
936 net) 1022 net)
937 case ${catmin} in 1023 case ${catmin} in
938 dialup) type=Dialup;; 1024 dialup) type=Dialup;;
939 ftp) type=FileTransfer;; 1025 ftp) type=FileTransfer;;
940 im) type=InstantMessaging;; 1026 im) type=InstantMessaging;;
941 irc) type=IRCClient;; 1027 irc) type=IRCClient;;
942 mail) type=Email;; 1028 mail) type=Email;;
943 news) type=News;; 1029 news) type=News;;
944 nntp) type=News;; 1030 nntp) type=News;;
945 p2p) type=FileTransfer;; 1031 p2p) type=FileTransfer;;
946 *) type=;; 1032 voip) type=Telephony;;
947 esac 1033 esac
948 type="Network;${type}" 1034 type="Network;${type}"
949 ;; 1035 ;;
950 1036
951 sci) 1037 sci)
952 case ${catmin} in 1038 case ${catmin} in
953 astro*) type=Astronomy;; 1039 astro*) type=Astronomy;;
954 bio*) type=Biology;; 1040 bio*) type=Biology;;
955 calc*) type=Calculator;; 1041 calc*) type=Calculator;;
956 chem*) type=Chemistry;; 1042 chem*) type=Chemistry;;
957 elec*) type=Electronics;; 1043 elec*) type=Electronics;;
958 geo*) type=Geology;; 1044 geo*) type=Geology;;
959 math*) type=Math;; 1045 math*) type=Math;;
960 physics) type=Physics;; 1046 physics) type=Physics;;
961 visual*) type=DataVisualization;; 1047 visual*) type=DataVisualization;;
962 *) type=;;
963 esac 1048 esac
964 type="Science;${type}" 1049 type="Education;Science;${type}"
965 ;; 1050 ;;
966 1051
967 sys) 1052 sys)
968 type="System" 1053 type="System"
969 ;; 1054 ;;
970 1055
971 www) 1056 www)
972 case ${catmin} in 1057 case ${catmin} in
973 client) type=WebBrowser;; 1058 client) type=WebBrowser;;
974 *) type=;;
975 esac 1059 esac
976 type="Network" 1060 type="Network;${type}"
977 ;; 1061 ;;
978 1062
979 *) 1063 *)
980 type= 1064 type=
981 ;; 1065 ;;
986 else 1070 else
987 local desktop_name="${PN}-${SLOT}" 1071 local desktop_name="${PN}-${SLOT}"
988 fi 1072 fi
989 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"
990 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1074 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
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
991 1086
992 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
993 [Desktop Entry] 1088 [Desktop Entry]
994 Name=${name} 1089 Name=${name}
995 Type=Application 1090 Type=Application
996 Comment=${DESCRIPTION} 1091 Comment=${DESCRIPTION}
997 Exec=${exec} 1092 Exec=${exec}
998 TryExec=${exec%% *} 1093 TryExec=${exec%% *}
999 Icon=${icon} 1094 Icon=${icon}
1000 Categories=${type}; 1095 Categories=${type}
1001 EOF 1096 EOF
1002 1097
1003 [[ ${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}"
1004 1104
1005 ( 1105 (
1006 # wrap the env here so that the 'insinto' call 1106 # wrap the env here so that the 'insinto' call
1007 # doesn't corrupt the env of the caller 1107 # doesn't corrupt the env of the caller
1008 insinto /usr/share/applications 1108 insinto /usr/share/applications
1009 doins "${desktop}" 1109 doins "${desktop}"
1010 ) 1110 ) || die "installing desktop file failed"
1011} 1111}
1012 1112
1013# @FUNCTION: validate_desktop_entries 1113# @FUNCTION: validate_desktop_entries
1014# @USAGE: [directories] 1114# @USAGE: [directories]
1015# @MAINTAINER: 1115# @MAINTAINER:
1294 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1394 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1295 1395
1296 local shrtsrc=$(basename "${src}") 1396 local shrtsrc=$(basename "${src}")
1297 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1397 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1298 if [[ -z ${skip} ]] ; then 1398 if [[ -z ${skip} ]] ; then
1299 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1399 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1300 local skip=0 1400 local skip=0
1301 exe=tail 1401 exe=tail
1302 case ${ver} in 1402 case ${ver} in
1303 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
1304 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1404 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1306 2.0|2.0.1) 1406 2.0|2.0.1)
1307 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1407 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1308 ;; 1408 ;;
1309 2.1.1) 1409 2.1.1)
1310 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1410 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1311 let skip="skip + 1" 1411 (( skip++ ))
1312 ;; 1412 ;;
1313 2.1.2) 1413 2.1.2)
1314 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1414 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1315 let skip="skip + 1" 1415 (( skip++ ))
1316 ;; 1416 ;;
1317 2.1.3) 1417 2.1.3)
1318 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1418 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1319 let skip="skip + 1" 1419 (( skip++ ))
1320 ;; 1420 ;;
1321 2.1.4|2.1.5) 1421 2.1.4|2.1.5)
1322 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)
1323 skip=$(head -n ${skip} "${src}" | wc -c) 1423 skip=$(head -n ${skip} "${src}" | wc -c)
1324 exe="dd" 1424 exe="dd"
1333 esac 1433 esac
1334 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1434 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1335 fi 1435 fi
1336 case ${exe} in 1436 case ${exe} in
1337 tail) exe="tail -n +${skip} '${src}'";; 1437 tail) exe="tail -n +${skip} '${src}'";;
1338 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1438 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1339 *) die "makeself cant handle exe '${exe}'" 1439 *) die "makeself cant handle exe '${exe}'"
1340 esac 1440 esac
1341 1441
1342 # 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
1343 local tmpfile=$(emktemp) 1443 local filetype tmpfile=$(emktemp)
1344 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1444 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1345 local filetype=$(file -b "${tmpfile}") 1445 filetype=$(file -b "${tmpfile}") || die
1346 case ${filetype} in 1446 case ${filetype} in
1347 *tar\ archive*) 1447 *tar\ archive*)
1348 eval ${exe} | tar --no-same-owner -xf - 1448 eval ${exe} | tar --no-same-owner -xf -
1349 ;; 1449 ;;
1350 bzip2*) 1450 bzip2*)
1476 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1576 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1477 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1577 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1478 export CDROM_SET=-1 1578 export CDROM_SET=-1
1479 for f in ${CDROM_CHECK_1//:/ } ; do 1579 for f in ${CDROM_CHECK_1//:/ } ; do
1480 ((++CDROM_SET)) 1580 ((++CDROM_SET))
1481 [[ -e ${CD_ROOT}/${f} ]] && break 1581 [[ -e ${CDROM_ROOT}/${f} ]] && break
1482 done 1582 done
1483 export CDROM_MATCH=${f} 1583 export CDROM_MATCH=${f}
1484 return 1584 return
1485 fi 1585 fi
1486 1586
1660 else 1760 else
1661 newls="" 1761 newls=""
1662 fi 1762 fi
1663 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1763 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1664 if [[ ${op} == "-i" ]] ; then 1764 if [[ ${op} == "-i" ]] ; then
1665 hasq ${f} ${ls} && newls="${newls} ${f}" 1765 has ${f} ${ls} && newls="${newls} ${f}"
1666 else 1766 else
1667 hasq ${f} ${ls} || newls="${newls} ${f}" 1767 has ${f} ${ls} || newls="${newls} ${f}"
1668 fi 1768 fi
1669 done 1769 done
1670 ls=${newls} 1770 ls=${newls}
1671 done 1771 done
1672 else 1772 else
1674 fi 1774 fi
1675 1775
1676 nols="" 1776 nols=""
1677 newls="" 1777 newls=""
1678 for f in ${LINGUAS} ; do 1778 for f in ${LINGUAS} ; do
1679 if hasq ${f} ${ls} ; then 1779 if has ${f} ${ls} ; then
1680 newls="${newls} ${f}" 1780 newls="${newls} ${f}"
1681 else 1781 else
1682 nols="${nols} ${f}" 1782 nols="${nols} ${f}"
1683 fi 1783 fi
1684 done 1784 done
1739 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"
1740 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"
1741 ewarn "helper program, simply emerge the 'gentoolkit' package." 1841 ewarn "helper program, simply emerge the 'gentoolkit' package."
1742 ewarn 1842 ewarn
1743 fi 1843 fi
1844 # temp hack for #348634 #357225
1845 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1744 ewarn " # revdep-rebuild --library ${lib##*/}" 1846 ewarn " # revdep-rebuild --library '${lib}'"
1745 done 1847 done
1746 if [[ ${notice} -eq 1 ]] ; then 1848 if [[ ${notice} -eq 1 ]] ; then
1747 ewarn 1849 ewarn
1748 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"
1749 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:"
1754} 1856}
1755 1857
1756# @FUNCTION: built_with_use 1858# @FUNCTION: built_with_use
1757# @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>
1758# @DESCRIPTION: 1860# @DESCRIPTION:
1861#
1862# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1863#
1759# A temporary hack until portage properly supports DEPENDing on USE 1864# A temporary hack until portage properly supports DEPENDing on USE
1760# 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
1761# 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
1762# --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
1763# not actually support the defined USE flags (aka listed in IUSE). 1868# not actually support the defined USE flags (aka listed in IUSE).
1892 else 1997 else
1893 newbin "${tmpwrapper}" "${wrapper}" || die 1998 newbin "${tmpwrapper}" "${wrapper}" || die
1894 fi 1999 fi
1895} 2000}
1896 2001
1897# @FUNCTION: prepalldocs 2002# @FUNCTION: path_exists
1898# @USAGE: 2003# @USAGE: [-a|-o] <paths>
1899# @DESCRIPTION: 2004# @DESCRIPTION:
1900# Compress files in /usr/share/doc which are not already 2005# Check if the specified paths exist. Works for all types of paths
1901# compressed, excluding /usr/share/doc/${PF}/html. 2006# (files/dirs/etc...). The -a and -o flags control the requirements
1902# Uses the ecompressdir to do the compression. 2007# of the paths. They correspond to "and" and "or" logic. So the -a
1903# 2009-02-18 by betelgeuse: 2008# flag means all the paths must exist while the -o flag means at least
1904# Commented because ecompressdir is even more internal to 2009# one of the paths must exist. The default behavior is "and". If no
1905# Portage than prepalldocs (it's not even mentioned in man 5 2010# paths are specified, then the return value is "false".
1906# ebuild). Please submit a better version for review to gentoo-dev 2011path_exists() {
1907# if you want prepalldocs here. 2012 local opt=$1
1908#prepalldocs() { 2013 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1909# if [[ -n $1 ]] ; then
1910# ewarn "prepalldocs: invalid usage; takes no arguments"
1911# fi
1912 2014
1913# cd "${D}" 2015 # no paths -> return false
1914# [[ -d usr/share/doc ]] || return 0 2016 # same behavior as: [[ -e "" ]]
2017 [[ $# -eq 0 ]] && return 1
1915 2018
1916# find usr/share/doc -exec gzip {} + 2019 local p r=0
1917# ecompressdir --ignore /usr/share/doc/${PF}/html 2020 for p in "$@" ; do
1918# ecompressdir --queue /usr/share/doc 2021 [[ -e ${p} ]]
1919#} 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.324  
changed lines
  Added in v.1.361

  ViewVC Help
Powered by ViewVC 1.1.20