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

Diff of /eclass/eutils.eclass

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

Revision 1.318 Revision 1.363
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.318 2009/08/26 21:47:56 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny 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 ewarn for package managers that don't provide eqawarn and use the PM
70# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
71# profile.
72if ! declare -F eqawarn >/dev/null ; then
73 eqawarn() {
74 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
75 }
76fi
77
52# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
54# @DESCRIPTION: 80# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 81# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 82# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 94esvn_clean() {
69 [[ -z $* ]] && set -- . 95 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 96 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 97}
72 98
73# Default directory where patches are located 99# @FUNCTION: eshopts_push
100# @USAGE: [options to `set` or `shopt`]
101# @DESCRIPTION:
102# Often times code will want to enable a shell option to change code behavior.
103# Since changing shell options can easily break other pieces of code (which
104# assume the default state), eshopts_push is used to (1) push the current shell
105# options onto a stack and (2) pass the specified arguments to set.
106#
107# If the first argument is '-s' or '-u', we assume you want to call `shopt`
108# rather than `set` as there are some options only available via that.
109#
110# A common example is to disable shell globbing so that special meaning/care
111# may be used with variables/arguments to custom functions. That would be:
112# @CODE
113# eshopts_push -o noglob
114# for x in ${foo} ; do
115# if ...some check... ; then
116# eshopts_pop
117# return 0
118# fi
119# done
120# eshopts_pop
121# @CODE
122eshopts_push() {
123 # have to assume __ESHOPTS_SAVE__ isn't screwed with
124 # as a `declare -a` here will reset its value
125 local i=${#__ESHOPTS_SAVE__[@]}
126 if [[ $1 == -[su] ]] ; then
127 __ESHOPTS_SAVE__[$i]=$(shopt -p)
128 [[ $# -eq 0 ]] && return 0
129 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
130 else
131 __ESHOPTS_SAVE__[$i]=$-
132 [[ $# -eq 0 ]] && return 0
133 set "$@" || die "eshopts_push: bad options to set: $*"
134 fi
135}
136
137# @FUNCTION: eshopts_pop
138# @USAGE:
139# @DESCRIPTION:
140# Restore the shell options to the state saved with the corresponding
141# eshopts_push call. See that function for more details.
142eshopts_pop() {
143 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
144 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
145 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
146 local s=${__ESHOPTS_SAVE__[$i]}
147 unset __ESHOPTS_SAVE__[$i]
148 if [[ ${s} == "shopt -"* ]] ; then
149 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
150 else
151 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
152 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
153 fi
154}
155
156# @VARIABLE: EPATCH_SOURCE
157# @DESCRIPTION:
158# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 159EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 160# @VARIABLE: EPATCH_SUFFIX
161# @DESCRIPTION:
162# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 163EPATCH_SUFFIX="patch.bz2"
164# @VARIABLE: EPATCH_OPTS
165# @DESCRIPTION:
77# Default options for patch 166# Default options for patch:
167# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 168# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 169# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 170# -E - automatically remove empty files
171# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 172EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
173# @VARIABLE: EPATCH_EXCLUDE
174# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 175# List of patches not to apply. Note this is only file names,
83# and not the full path .. 176# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 177EPATCH_EXCLUDE=""
178# @VARIABLE: EPATCH_SINGLE_MSG
179# @DESCRIPTION:
85# Change the printed message for a single patch. 180# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 181EPATCH_SINGLE_MSG=""
182# @VARIABLE: EPATCH_MULTI_MSG
183# @DESCRIPTION:
87# Change the printed message for multiple patches. 184# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 185EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 186# @VARIABLE: EPATCH_FORCE
90# 187# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 188# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 189# arch naming style.
93EPATCH_FORCE="no" 190EPATCH_FORCE="no"
94 191
95# This function is for bulk patching, or in theory for just one 192# @FUNCTION: epatch
96# or two patches. 193# @USAGE: [patches] [dirs of patches]
194# @DESCRIPTION:
195# epatch is designed to greatly simplify the application of patches. It can
196# process patch files directly, or directories of patches. The patches may be
197# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
198# the -p option as epatch will automatically attempt -p0 to -p5 until things
199# apply successfully.
97# 200#
98# It should work with .bz2, .gz, .zip and plain text patches. 201# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 202# specified by EPATCH_SOURCE.
100# 203#
101# You do not have to specify '-p' option to patch, as it will 204# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 205# @CODE
103# 206# 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} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
208# else
209# *.${EPATCH_SUFFIX}
210# @CODE
211# The leading ?? are typically numbers used to force consistent patch ordering.
212# The arch field is used to apply patches only for the host architecture with
213# the special value of "all" means apply for everyone. Note that using values
214# other than "all" is highly discouraged -- you should apply patches all the
215# time and let architecture details be detected at configure/compile time.
113# 216#
114# For example: 217# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
218# for patches to apply.
115# 219#
116# 01_all_misc-fix.patch.bz2 220# 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() { 221epatch() {
129 _epatch_draw_line() { 222 _epatch_draw_line() {
223 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 224 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 225 echo "${1//?/=}"
132 } 226 }
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 227
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 228 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 229
143 if [ "$#" -gt 1 ] 230 # Let the rest of the code process one user arg at a time --
144 then 231 # each arg may expand into multiple patches, and each arg may
232 # need to start off with the default global EPATCH_xxx values
233 if [[ $# -gt 1 ]] ; then
145 local m="" 234 local m
146 for m in "$@" ; do 235 for m in "$@" ; do
147 epatch "${m}" 236 epatch "${m}"
148 done 237 done
149 return 0 238 return 0
150 fi 239 fi
151 240
152 if [ -n "$1" -a -f "$1" ] 241 local SINGLE_PATCH="no"
153 then 242 # no args means process ${EPATCH_SOURCE}
243 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
244
245 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 246 SINGLE_PATCH="yes"
155 247 set -- "$1"
156 local EPATCH_SOURCE="$1" 248 # Use the suffix from the single patch (localize it); the code
249 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 250 local EPATCH_SUFFIX=$1
158 251
159 elif [ -n "$1" -a -d "$1" ] 252 elif [[ -d $1 ]] ; then
160 then 253 # 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 ... 254 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 255
256 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
257 # Re-use EPATCH_SOURCE as a search dir
258 epatch "${EPATCH_SOURCE}/$1"
259 return $?
260
261 else
262 # sanity check ... if it isn't a dir or file, wtf man ?
263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
264 echo
265 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
266 eerror
267 eerror " ${EPATCH_SOURCE}"
268 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo
270 die "Cannot find \$EPATCH_SOURCE!"
271 fi
272
273 local PIPE_CMD
274 case ${EPATCH_SUFFIX##*\.} in
275 xz) PIPE_CMD="xz -dc" ;;
276 lzma) PIPE_CMD="lzma -dc" ;;
277 bz2) PIPE_CMD="bzip2 -dc" ;;
278 gz|Z|z) PIPE_CMD="gzip -dc" ;;
279 ZIP|zip) PIPE_CMD="unzip -p" ;;
280 *) ;;
281 esac
282
283 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
284
285 local x
286 for x in "$@" ; do
287 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
288 # didn't match anything, ignore continue on
289 [[ ! -f ${x} ]] && continue
290
291 local patchname=${x##*/}
292
293 # Apply single patches, or forced sets of patches, or
294 # patches with ARCH dependant names.
295 # ???_arch_foo.patch
296 # Else, skip this input altogether
297 local a=${patchname#*_} # strip the ???_
298 a=${a%%_*} # strip the _foo.patch
299 if ! [[ ${SINGLE_PATCH} == "yes" || \
300 ${EPATCH_FORCE} == "yes" || \
301 ${a} == all || \
302 ${a} == ${ARCH} ]]
163 then 303 then
164 local EPATCH_SOURCE="$1/*" 304 continue
305 fi
306
307 # Let people filter things dynamically
308 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
309 # let people use globs in the exclude
310 eshopts_push -o noglob
311
312 local ex
313 for ex in ${EPATCH_EXCLUDE} ; do
314 if [[ ${patchname} == ${ex} ]] ; then
315 eshopts_pop
316 continue 2
317 fi
318 done
319
320 eshopts_pop
321 fi
322
323 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
324 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
325 einfo "${EPATCH_SINGLE_MSG}"
326 else
327 einfo "Applying ${patchname} ..."
328 fi
165 else 329 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 330 einfo " ${patchname} ..."
167 fi 331 fi
168 else 332
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 333 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 334 # but if there are more, make sure we get unique log filenames
171 then 335 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 336 if [[ -e ${STDERR_TARGET} ]] ; then
337 STDERR_TARGET="${T}/${patchname}-$$.out"
338 fi
339
340 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
341
342 # Decompress the patch if need be
343 local count=0
344 local PATCH_TARGET
345 if [[ -n ${PIPE_CMD} ]] ; then
346 PATCH_TARGET="${T}/$$.patch"
347 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
348
349 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
350 echo
351 eerror "Could not extract patch!"
352 #die "Could not extract patch!"
353 count=5
354 break
173 fi 355 fi
356 else
357 PATCH_TARGET=${x}
358 fi
174 359
360 # Check for absolute paths in patches. If sandbox is disabled,
361 # people could (accidently) patch files in the root filesystem.
362 # Or trigger other unpleasantries #237667. So disallow -p0 on
363 # such patches.
364 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
365 if [[ -n ${abs_paths} ]] ; then
366 count=1
367 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
368 fi
369 # Similar reason, but with relative paths.
370 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
371 if [[ -n ${rel_paths} ]] ; then
372 eqawarn "QA Notice: Your patch uses relative paths '../'."
373 eqawarn " In the future this will cause a failure."
374 eqawarn "${rel_paths}"
375 fi
376
377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
378 while [[ ${count} -lt 5 ]] ; do
379 # Generate some useful debug info ...
380 (
381 _epatch_draw_line "***** ${patchname} *****"
175 echo 382 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
384 echo
385 _epatch_draw_line "***** ${patchname} *****"
386 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
387 ret=$?
388 echo
389 echo "patch program exited with status ${ret}"
390 exit ${ret}
391 ) >> "${STDERR_TARGET}"
392
393 if [ $? -eq 0 ] ; then
394 (
395 _epatch_draw_line "***** ${patchname} *****"
396 echo
397 echo "ACTUALLY APPLYING ${patchname} ..."
398 echo
399 _epatch_draw_line "***** ${patchname} *****"
400 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
401 ret=$?
402 echo
403 echo "patch program exited with status ${ret}"
404 exit ${ret}
405 ) >> "${STDERR_TARGET}"
406
407 if [ $? -ne 0 ] ; then
408 echo
409 eerror "A dry-run of patch command succeeded, but actually"
410 eerror "applying the patch failed!"
411 #die "Real world sux compared to the dreamworld!"
412 count=5
413 fi
414 break
415 fi
416
417 : $(( count++ ))
418 done
419
420 # if we had to decompress the patch, delete the temp one
421 if [[ -n ${PIPE_CMD} ]] ; then
422 rm -f "${PATCH_TARGET}"
423 fi
424
425 if [[ ${count} -ge 5 ]] ; then
426 echo
427 eerror "Failed Patch: ${patchname} !"
428 eerror " ( ${PATCH_TARGET} )"
177 eerror 429 eerror
178 eerror " ${EPATCH_SOURCE}" 430 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 431 eerror
432 eerror " ${STDERR_TARGET}"
180 echo 433 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}!" 434 die "Failed Patch: ${patchname}!"
340 fi 435 fi
341 436
342 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 437 # if everything worked, delete the patch log
343 438 rm -f "${STDERR_TARGET}"
344 eend 0 439 eend 0
345 fi
346 done 440 done
347 if [ "${SINGLE_PATCH}" = "no" ] 441
348 then 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
349 einfo "Done with patching" 443 : # everything worked
350 fi
351} 444}
445
446# @FUNCTION: epatch_user
447# @USAGE:
448# @DESCRIPTION:
449# Applies user-provided patches to the source tree. The patches are
450# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
451# of these three directories to exist will be the one to use, ignoring
452# any more general directories which might exist as well.
453#
454# User patches are intended for quick testing of patches without ebuild
455# modifications, as well as for permanent customizations a user might
456# desire. Obviously, there can be no official support for arbitrarily
457# patched ebuilds. So whenever a build log in a bug report mentions that
458# user patches were applied, the user should be asked to reproduce the
459# problem without these.
460#
461# Not all ebuilds do call this function, so placing patches in the
462# stated directory might or might not work, depending on the package and
463# the eclasses it inherits and uses. It is safe to call the function
464# repeatedly, so it is always possible to add a call at the ebuild
465# level. The first call is the time when the patches will be
466# applied.
467#
468# Ideally, this function should be called after gentoo-specific patches
469# have been applied, so that their code can be modified as well, but
470# before calls to e.g. eautoreconf, as the user patches might affect
471# autotool input files as well.
352epatch_user() { 472epatch_user() {
353 [[ $# -ne 0 ]] && die "epatch_user takes no options" 473 [[ $# -ne 0 ]] && die "epatch_user takes no options"
354 474
475 # Allow multiple calls to this function; ignore all but the first
476 local applied="${T}/epatch_user.applied"
477 [[ -e ${applied} ]] && return 2
478
355 # don't clobber any EPATCH vars that the parent might want 479 # don't clobber any EPATCH vars that the parent might want
356 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches 480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
357 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
358 EPATCH_SOURCE=${base}/${CTARGET}/${check} 482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
359 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} 483 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
360 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} 484 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
361 if [[ -d ${EPATCH_SOURCE} ]] ; then 485 if [[ -d ${EPATCH_SOURCE} ]] ; then
362 EPATCH_SOURCE=${EPATCH_SOURCE} \ 486 EPATCH_SOURCE=${EPATCH_SOURCE} \
363 EPATCH_SUFFIX="patch" \ 487 EPATCH_SUFFIX="patch" \
364 EPATCH_FORCE="yes" \ 488 EPATCH_FORCE="yes" \
365 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
366 epatch 490 epatch
367 break 491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
368 fi 493 fi
369 done 494 done
495 echo "none" > "${applied}"
496 return 1
370} 497}
371 498
372# @FUNCTION: emktemp 499# @FUNCTION: emktemp
373# @USAGE: [temp dir] 500# @USAGE: [temp dir]
374# @DESCRIPTION: 501# @DESCRIPTION:
415# Small wrapper for getent (Linux), 542# Small wrapper for getent (Linux),
416# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), 543# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
417# and pw (FreeBSD) used in enewuser()/enewgroup() 544# and pw (FreeBSD) used in enewuser()/enewgroup()
418egetent() { 545egetent() {
419 case ${CHOST} in 546 case ${CHOST} in
547 *-darwin[678])
548 case "$2" in
549 *[!0-9]*) # Non numeric
550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
551 ;;
552 *) # Numeric
553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
554 ;;
555 esac
556 ;;
420 *-darwin9) 557 *-darwin*)
421 local mytype=$1 558 local mytype=$1
422 [[ "passwd" == $mytype ]] && mytype="Users" 559 [[ "passwd" == $mytype ]] && mytype="Users"
423 [[ "group" == $mytype ]] && mytype="Groups" 560 [[ "group" == $mytype ]] && mytype="Groups"
424 case "$2" in 561 case "$2" in
425 *[!0-9]*) # Non numeric 562 *[!0-9]*) # Non numeric
427 ;; 564 ;;
428 *) # Numeric 565 *) # Numeric
429 local mykey="UniqueID" 566 local mykey="UniqueID"
430 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID" 567 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
431 dscl . -search /$mytype $mykey $2 2>/dev/null 568 dscl . -search /$mytype $mykey $2 2>/dev/null
432 ;;
433 esac
434 ;;
435 *-darwin*)
436 case "$2" in
437 *[!0-9]*) # Non numeric
438 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
439 ;;
440 *) # Numeric
441 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
442 ;; 569 ;;
443 esac 570 esac
444 ;; 571 ;;
445 *-freebsd*|*-dragonfly*) 572 *-freebsd*|*-dragonfly*)
446 local opts action="user" 573 local opts action="user"
646 fi 773 fi
647 ;; 774 ;;
648 775
649 *) 776 *)
650 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
651 useradd ${opts} ${euser} \ 778 useradd -r ${opts} \
652 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
780 ${euser} \
653 || die "enewuser failed" 781 || die "enewuser failed"
654 else 782 else
655 einfo " - Extra: $@" 783 einfo " - Extra: $@"
656 useradd ${opts} ${euser} "$@" \ 784 useradd -r ${opts} "$@" \
785 ${euser} \
657 || die "enewuser failed" 786 || die "enewuser failed"
658 fi 787 fi
659 ;; 788 ;;
660 esac 789 esac
661 790
773 esac 902 esac
774 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
775 ;; 904 ;;
776 905
777 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
778 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
779 ;; 909 ;;
780 esac 910 esac
781 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
782} 912}
783 913
794 924
795# Make a desktop file ! 925# Make a desktop file !
796# Great for making those icons in kde/gnome startmenu ! 926# Great for making those icons in kde/gnome startmenu !
797# Amaze your friends ! Get the women ! Join today ! 927# Amaze your friends ! Get the women ! Join today !
798# 928#
799# make_desktop_entry(<command>, [name], [icon], [type], [path]) 929# make_desktop_entry(<command>, [name], [icon], [type], [fields])
800# 930#
801# binary: what command does the app run with ? 931# binary: what command does the app run with ?
802# name: the name that will show up in the menu 932# name: the name that will show up in the menu
803# icon: give your little like a pretty little icon ... 933# icon: give your little like a pretty little icon ...
804# this can be relative (to /usr/share/pixmaps) or 934# this can be relative (to /usr/share/pixmaps) or
805# a full path to an icon 935# a full path to an icon
806# type: what kind of application is this ? for categories: 936# type: what kind of application is this ? for categories:
807# http://standards.freedesktop.org/menu-spec/latest/apa.html 937# http://standards.freedesktop.org/menu-spec/latest/apa.html
808# path: if your app needs to startup in a specific dir 938# fields: extra fields to append to the desktop file; a printf string
809make_desktop_entry() { 939make_desktop_entry() {
810 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 940 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
811 941
812 local exec=${1} 942 local exec=${1}
813 local name=${2:-${PN}} 943 local name=${2:-${PN}}
814 local icon=${3:-${PN}} 944 local icon=${3:-${PN}}
815 local type=${4} 945 local type=${4}
816 local path=${5} 946 local fields=${5}
817 947
818 if [[ -z ${type} ]] ; then 948 if [[ -z ${type} ]] ; then
819 local catmaj=${CATEGORY%%-*} 949 local catmaj=${CATEGORY%%-*}
820 local catmin=${CATEGORY##*-} 950 local catmin=${CATEGORY##*-}
821 case ${catmaj} in 951 case ${catmaj} in
822 app) 952 app)
823 case ${catmin} in 953 case ${catmin} in
824 accessibility) type=Accessibility;; 954 accessibility) type=Accessibility;;
825 admin) type=System;; 955 admin) type=System;;
826 antivirus) type=System;; 956 antivirus) type=System;;
827 arch) type=Archiving;; 957 arch) type=Archiving;;
828 backup) type=Archiving;; 958 backup) type=Archiving;;
829 cdr) type=DiscBurning;; 959 cdr) type=DiscBurning;;
830 dicts) type=Dictionary;; 960 dicts) type=Dictionary;;
831 doc) type=Documentation;; 961 doc) type=Documentation;;
832 editors) type=TextEditor;; 962 editors) type=TextEditor;;
833 emacs) type=TextEditor;; 963 emacs) type=TextEditor;;
834 emulation) type=Emulator;; 964 emulation) type=Emulator;;
835 laptop) type=HardwareSettings;; 965 laptop) type=HardwareSettings;;
836 office) type=Office;; 966 office) type=Office;;
837 pda) type=PDA;; 967 pda) type=PDA;;
838 vim) type=TextEditor;; 968 vim) type=TextEditor;;
839 xemacs) type=TextEditor;; 969 xemacs) type=TextEditor;;
840 *) type=;;
841 esac 970 esac
842 ;; 971 ;;
843 972
844 dev) 973 dev)
845 type="Development" 974 type="Development"
846 ;; 975 ;;
847 976
848 games) 977 games)
849 case ${catmin} in 978 case ${catmin} in
850 action|fps) type=ActionGame;; 979 action|fps) type=ActionGame;;
851 arcade) type=ArcadeGame;; 980 arcade) type=ArcadeGame;;
852 board) type=BoardGame;; 981 board) type=BoardGame;;
853 emulation) type=Emulator;; 982 emulation) type=Emulator;;
854 kids) type=KidsGame;; 983 kids) type=KidsGame;;
855 puzzle) type=LogicGame;; 984 puzzle) type=LogicGame;;
856 roguelike) type=RolePlaying;; 985 roguelike) type=RolePlaying;;
857 rpg) type=RolePlaying;; 986 rpg) type=RolePlaying;;
858 simulation) type=Simulation;; 987 simulation) type=Simulation;;
859 sports) type=SportsGame;; 988 sports) type=SportsGame;;
860 strategy) type=StrategyGame;; 989 strategy) type=StrategyGame;;
861 *) type=;;
862 esac 990 esac
863 type="Game;${type}" 991 type="Game;${type}"
864 ;; 992 ;;
865 993
866 gnome) 994 gnome)
875 type="Network;Email" 1003 type="Network;Email"
876 ;; 1004 ;;
877 1005
878 media) 1006 media)
879 case ${catmin} in 1007 case ${catmin} in
1008 gfx)
880 gfx) type=Graphics;; 1009 type=Graphics
1010 ;;
1011 *)
1012 case ${catmin} in
881 radio) type=Tuner;; 1013 radio) type=Tuner;;
882 sound) type=Audio;; 1014 sound) type=Audio;;
883 tv) type=TV;; 1015 tv) type=TV;;
884 video) type=Video;; 1016 video) type=Video;;
885 *) type=;; 1017 esac
1018 type="AudioVideo;${type}"
1019 ;;
886 esac 1020 esac
887 type="AudioVideo;${type}"
888 ;; 1021 ;;
889 1022
890 net) 1023 net)
891 case ${catmin} in 1024 case ${catmin} in
892 dialup) type=Dialup;; 1025 dialup) type=Dialup;;
893 ftp) type=FileTransfer;; 1026 ftp) type=FileTransfer;;
894 im) type=InstantMessaging;; 1027 im) type=InstantMessaging;;
895 irc) type=IRCClient;; 1028 irc) type=IRCClient;;
896 mail) type=Email;; 1029 mail) type=Email;;
897 news) type=News;; 1030 news) type=News;;
898 nntp) type=News;; 1031 nntp) type=News;;
899 p2p) type=FileTransfer;; 1032 p2p) type=FileTransfer;;
900 *) type=;; 1033 voip) type=Telephony;;
901 esac 1034 esac
902 type="Network;${type}" 1035 type="Network;${type}"
903 ;; 1036 ;;
904 1037
905 sci) 1038 sci)
906 case ${catmin} in 1039 case ${catmin} in
907 astro*) type=Astronomy;; 1040 astro*) type=Astronomy;;
908 bio*) type=Biology;; 1041 bio*) type=Biology;;
909 calc*) type=Calculator;; 1042 calc*) type=Calculator;;
910 chem*) type=Chemistry;; 1043 chem*) type=Chemistry;;
911 elec*) type=Electronics;; 1044 elec*) type=Electronics;;
912 geo*) type=Geology;; 1045 geo*) type=Geology;;
913 math*) type=Math;; 1046 math*) type=Math;;
914 physics) type=Physics;; 1047 physics) type=Physics;;
915 visual*) type=DataVisualization;; 1048 visual*) type=DataVisualization;;
916 *) type=;;
917 esac 1049 esac
918 type="Science;${type}" 1050 type="Education;Science;${type}"
919 ;; 1051 ;;
920 1052
921 sys) 1053 sys)
922 type="System" 1054 type="System"
923 ;; 1055 ;;
924 1056
925 www) 1057 www)
926 case ${catmin} in 1058 case ${catmin} in
927 client) type=WebBrowser;; 1059 client) type=WebBrowser;;
928 *) type=;;
929 esac 1060 esac
930 type="Network" 1061 type="Network;${type}"
931 ;; 1062 ;;
932 1063
933 *) 1064 *)
934 type= 1065 type=
935 ;; 1066 ;;
941 local desktop_name="${PN}-${SLOT}" 1072 local desktop_name="${PN}-${SLOT}"
942 fi 1073 fi
943 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1074 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
944 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1075 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
945 1076
1077 # Don't append another ";" when a valid category value is provided.
1078 type=${type%;}${type:+;}
1079
1080 eshopts_push -s extglob
1081 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1082 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1083 ewarn "allowed in .desktop files if the value is not an absolute path."
1084 icon=${icon%.@(xpm|png|svg)}
1085 fi
1086 eshopts_pop
1087
946 cat <<-EOF > "${desktop}" 1088 cat <<-EOF > "${desktop}"
947 [Desktop Entry] 1089 [Desktop Entry]
948 Version=1.0
949 Name=${name} 1090 Name=${name}
950 Type=Application 1091 Type=Application
951 Comment=${DESCRIPTION} 1092 Comment=${DESCRIPTION}
952 Exec=${exec} 1093 Exec=${exec}
953 TryExec=${exec%% *} 1094 TryExec=${exec%% *}
954 Icon=${icon} 1095 Icon=${icon}
955 Categories=${type}; 1096 Categories=${type}
956 EOF 1097 EOF
957 1098
958 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1099 if [[ ${fields:-=} != *=* ]] ; then
1100 # 5th arg used to be value to Path=
1101 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1102 fields="Path=${fields}"
1103 fi
1104 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
959 1105
960 ( 1106 (
961 # wrap the env here so that the 'insinto' call 1107 # wrap the env here so that the 'insinto' call
962 # doesn't corrupt the env of the caller 1108 # doesn't corrupt the env of the caller
963 insinto /usr/share/applications 1109 insinto /usr/share/applications
964 doins "${desktop}" 1110 doins "${desktop}"
965 ) 1111 ) || die "installing desktop file failed"
966} 1112}
967 1113
968# @FUNCTION: validate_desktop_entries 1114# @FUNCTION: validate_desktop_entries
969# @USAGE: [directories] 1115# @USAGE: [directories]
970# @MAINTAINER: 1116# @MAINTAINER:
1249 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1395 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1250 1396
1251 local shrtsrc=$(basename "${src}") 1397 local shrtsrc=$(basename "${src}")
1252 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1398 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1253 if [[ -z ${skip} ]] ; then 1399 if [[ -z ${skip} ]] ; then
1254 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1400 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1255 local skip=0 1401 local skip=0
1256 exe=tail 1402 exe=tail
1257 case ${ver} in 1403 case ${ver} in
1258 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1404 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) 1405 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1261 2.0|2.0.1) 1407 2.0|2.0.1)
1262 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1408 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1263 ;; 1409 ;;
1264 2.1.1) 1410 2.1.1)
1265 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1411 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1266 let skip="skip + 1" 1412 (( skip++ ))
1267 ;; 1413 ;;
1268 2.1.2) 1414 2.1.2)
1269 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1415 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1270 let skip="skip + 1" 1416 (( skip++ ))
1271 ;; 1417 ;;
1272 2.1.3) 1418 2.1.3)
1273 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1419 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1274 let skip="skip + 1" 1420 (( skip++ ))
1275 ;; 1421 ;;
1276 2.1.4|2.1.5) 1422 2.1.4|2.1.5)
1277 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1423 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1278 skip=$(head -n ${skip} "${src}" | wc -c) 1424 skip=$(head -n ${skip} "${src}" | wc -c)
1279 exe="dd" 1425 exe="dd"
1288 esac 1434 esac
1289 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1435 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1290 fi 1436 fi
1291 case ${exe} in 1437 case ${exe} in
1292 tail) exe="tail -n +${skip} '${src}'";; 1438 tail) exe="tail -n +${skip} '${src}'";;
1293 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1439 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1294 *) die "makeself cant handle exe '${exe}'" 1440 *) die "makeself cant handle exe '${exe}'"
1295 esac 1441 esac
1296 1442
1297 # lets grab the first few bytes of the file to figure out what kind of archive it is 1443 # lets grab the first few bytes of the file to figure out what kind of archive it is
1298 local tmpfile=$(emktemp) 1444 local filetype tmpfile=$(emktemp)
1299 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1445 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1300 local filetype=$(file -b "${tmpfile}") 1446 filetype=$(file -b "${tmpfile}") || die
1301 case ${filetype} in 1447 case ${filetype} in
1302 *tar\ archive*) 1448 *tar\ archive*)
1303 eval ${exe} | tar --no-same-owner -xf - 1449 eval ${exe} | tar --no-same-owner -xf -
1304 ;; 1450 ;;
1305 bzip2*) 1451 bzip2*)
1335 lic="${PWD}/${lic}" 1481 lic="${PWD}/${lic}"
1336 elif [ -e "${lic}" ] ; then 1482 elif [ -e "${lic}" ] ; then
1337 lic="${lic}" 1483 lic="${lic}"
1338 fi 1484 fi
1339 fi 1485 fi
1340 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1341 local l="`basename ${lic}`" 1486 local l="`basename ${lic}`"
1342 1487
1343 # here is where we check for the licenses the user already 1488 # 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 1489 # accepted ... if we don't find a match, we make the user accept
1345 local shopts=$-
1346 local alic 1490 local alic
1347 set -o noglob #so that bash doesn't expand "*" 1491 eshopts_push -o noglob # so that bash doesn't expand "*"
1348 for alic in ${ACCEPT_LICENSE} ; do 1492 for alic in ${ACCEPT_LICENSE} ; do
1349 if [[ ${alic} == ${l} ]]; then 1493 if [[ ${alic} == ${l} ]]; then
1350 set +o noglob; set -${shopts} #reset old shell opts 1494 eshopts_pop
1351 return 0 1495 return 0
1352 fi 1496 fi
1353 done 1497 done
1354 set +o noglob; set -$shopts #reset old shell opts 1498 eshopts_pop
1499 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1355 1500
1356 local licmsg=$(emktemp) 1501 local licmsg=$(emktemp)
1357 cat <<-EOF > ${licmsg} 1502 cat <<-EOF > ${licmsg}
1358 ********************************************************** 1503 **********************************************************
1359 The following license outlines the terms of use of this 1504 The following license outlines the terms of use of this
1432 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1577 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1578 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1434 export CDROM_SET=-1 1579 export CDROM_SET=-1
1435 for f in ${CDROM_CHECK_1//:/ } ; do 1580 for f in ${CDROM_CHECK_1//:/ } ; do
1436 ((++CDROM_SET)) 1581 ((++CDROM_SET))
1437 [[ -e ${CD_ROOT}/${f} ]] && break 1582 [[ -e ${CDROM_ROOT}/${f} ]] && break
1438 done 1583 done
1439 export CDROM_MATCH=${f} 1584 export CDROM_MATCH=${f}
1440 return 1585 return
1441 fi 1586 fi
1442 1587
1616 else 1761 else
1617 newls="" 1762 newls=""
1618 fi 1763 fi
1619 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1764 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1620 if [[ ${op} == "-i" ]] ; then 1765 if [[ ${op} == "-i" ]] ; then
1621 hasq ${f} ${ls} && newls="${newls} ${f}" 1766 has ${f} ${ls} && newls="${newls} ${f}"
1622 else 1767 else
1623 hasq ${f} ${ls} || newls="${newls} ${f}" 1768 has ${f} ${ls} || newls="${newls} ${f}"
1624 fi 1769 fi
1625 done 1770 done
1626 ls=${newls} 1771 ls=${newls}
1627 done 1772 done
1628 else 1773 else
1630 fi 1775 fi
1631 1776
1632 nols="" 1777 nols=""
1633 newls="" 1778 newls=""
1634 for f in ${LINGUAS} ; do 1779 for f in ${LINGUAS} ; do
1635 if hasq ${f} ${ls} ; then 1780 if has ${f} ${ls} ; then
1636 newls="${newls} ${f}" 1781 newls="${newls} ${f}"
1637 else 1782 else
1638 nols="${nols} ${f}" 1783 nols="${nols} ${f}"
1639 fi 1784 fi
1640 done 1785 done
1695 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1840 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" 1841 ewarn "in order to remove these old dependencies. If you do not have this"
1697 ewarn "helper program, simply emerge the 'gentoolkit' package." 1842 ewarn "helper program, simply emerge the 'gentoolkit' package."
1698 ewarn 1843 ewarn
1699 fi 1844 fi
1845 # temp hack for #348634 #357225
1846 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1700 ewarn " # revdep-rebuild --library ${lib##*/}" 1847 ewarn " # revdep-rebuild --library '${lib}'"
1701 done 1848 done
1702 if [[ ${notice} -eq 1 ]] ; then 1849 if [[ ${notice} -eq 1 ]] ; then
1703 ewarn 1850 ewarn
1704 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1851 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:" 1852 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1710} 1857}
1711 1858
1712# @FUNCTION: built_with_use 1859# @FUNCTION: built_with_use
1713# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1860# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1714# @DESCRIPTION: 1861# @DESCRIPTION:
1862#
1863# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1864#
1715# A temporary hack until portage properly supports DEPENDing on USE 1865# A temporary hack until portage properly supports DEPENDing on USE
1716# flags being enabled in packages. This will check to see if the specified 1866# 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 1867# 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 1868# --missing option controls the behavior if called on a package that does
1719# not actually support the defined USE flags (aka listed in IUSE). 1869# not actually support the defined USE flags (aka listed in IUSE).
1848 else 1998 else
1849 newbin "${tmpwrapper}" "${wrapper}" || die 1999 newbin "${tmpwrapper}" "${wrapper}" || die
1850 fi 2000 fi
1851} 2001}
1852 2002
1853# @FUNCTION: prepalldocs 2003# @FUNCTION: path_exists
1854# @USAGE: 2004# @USAGE: [-a|-o] <paths>
1855# @DESCRIPTION: 2005# @DESCRIPTION:
1856# Compress files in /usr/share/doc which are not already 2006# Check if the specified paths exist. Works for all types of paths
1857# compressed, excluding /usr/share/doc/${PF}/html. 2007# (files/dirs/etc...). The -a and -o flags control the requirements
1858# Uses the ecompressdir to do the compression. 2008# of the paths. They correspond to "and" and "or" logic. So the -a
1859# 2009-02-18 by betelgeuse: 2009# flag means all the paths must exist while the -o flag means at least
1860# Commented because ecompressdir is even more internal to 2010# 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 2011# paths are specified, then the return value is "false".
1862# ebuild). Please submit a better version for review to gentoo-dev 2012path_exists() {
1863# if you want prepalldocs here. 2013 local opt=$1
1864#prepalldocs() { 2014 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1865# if [[ -n $1 ]] ; then
1866# ewarn "prepalldocs: invalid usage; takes no arguments"
1867# fi
1868 2015
1869# cd "${D}" 2016 # no paths -> return false
1870# [[ -d usr/share/doc ]] || return 0 2017 # same behavior as: [[ -e "" ]]
2018 [[ $# -eq 0 ]] && return 1
1871 2019
1872# find usr/share/doc -exec gzip {} + 2020 local p r=0
1873# ecompressdir --ignore /usr/share/doc/${PF}/html 2021 for p in "$@" ; do
1874# ecompressdir --queue /usr/share/doc 2022 [[ -e ${p} ]]
1875#} 2023 : $(( r += $? ))
2024 done
2025
2026 case ${opt} in
2027 -a) return $(( r != 0 )) ;;
2028 -o) return $(( r == $# )) ;;
2029 esac
2030}

Legend:
Removed from v.1.318  
changed lines
  Added in v.1.363

  ViewVC Help
Powered by ViewVC 1.1.20