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

Diff of /eclass/eutils.eclass

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

Revision 1.304 Revision 1.359
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.304 2008/09/20 18:45:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
75fi
76
52# @FUNCTION: ecvs_clean 77# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 78# @USAGE: [list of dirs]
54# @DESCRIPTION: 79# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 80# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 81# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 93esvn_clean() {
69 [[ -z $* ]] && set -- . 94 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 95 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 96}
72 97
73# Default directory where patches are located 98# @FUNCTION: eshopts_push
99# @USAGE: [options to `set` or `shopt`]
100# @DESCRIPTION:
101# Often times code will want to enable a shell option to change code behavior.
102# Since changing shell options can easily break other pieces of code (which
103# assume the default state), eshopts_push is used to (1) push the current shell
104# options onto a stack and (2) pass the specified arguments to set.
105#
106# If the first argument is '-s' or '-u', we assume you want to call `shopt`
107# rather than `set` as there are some options only available via that.
108#
109# A common example is to disable shell globbing so that special meaning/care
110# may be used with variables/arguments to custom functions. That would be:
111# @CODE
112# eshopts_push -o noglob
113# for x in ${foo} ; do
114# if ...some check... ; then
115# eshopts_pop
116# return 0
117# fi
118# done
119# eshopts_pop
120# @CODE
121eshopts_push() {
122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
123 # as a `declare -a` here will reset its value
124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
127 [[ $# -eq 0 ]] && return 0
128 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
129 else
130 __ESHOPTS_SAVE__[$i]=$-
131 [[ $# -eq 0 ]] && return 0
132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
134}
135
136# @FUNCTION: eshopts_pop
137# @USAGE:
138# @DESCRIPTION:
139# Restore the shell options to the state saved with the corresponding
140# eshopts_push call. See that function for more details.
141eshopts_pop() {
142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
145 local s=${__ESHOPTS_SAVE__[$i]}
146 unset __ESHOPTS_SAVE__[$i]
147 if [[ ${s} == "shopt -"* ]] ; then
148 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
149 else
150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
153}
154
155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
77# Default options for patch 165# Default options for patch:
166# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
82# List of patches not to apply. Not this is only file names, 174# List of patches not to apply. Note this is only file names,
83# and not the full path .. 175# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
85# Change the printed message for a single patch. 179# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
87# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
90# 186# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 188# arch naming style.
93EPATCH_FORCE="no" 189EPATCH_FORCE="no"
94 190
95# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
96# or two patches. 192# @USAGE: [patches] [dirs of patches]
193# @DESCRIPTION:
194# epatch is designed to greatly simplify the application of patches. It can
195# process patch files directly, or directories of patches. The patches may be
196# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
197# the -p option as epatch will automatically attempt -p0 to -p5 until things
198# apply successfully.
97# 199#
98# It should work with .bz2, .gz, .zip and plain text patches. 200# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
100# 202#
101# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
103# 205# if ${EPATCH_FORCE} != "yes"
104# Above EPATCH_* variables can be used to control various defaults,
105# bug they should be left as is to ensure an ebuild can rely on
106# them for.
107#
108# Patches are applied in current directory.
109#
110# Bulk Patches should preferibly have the form of:
111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
207# else
208# *.${EPATCH_SUFFIX}
209# @CODE
210# The leading ?? are typically numbers used to force consistent patch ordering.
211# The arch field is used to apply patches only for the host architecture with
212# the special value of "all" means apply for everyone. Note that using values
213# other than "all" is highly discouraged -- you should apply patches all the
214# time and let architecture details be detected at configure/compile time.
113# 215#
114# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
115# 218#
116# 01_all_misc-fix.patch.bz2 219# Refer to the other EPATCH_xxx variables for more customization of behavior.
117# 02_sparc_another-fix.patch.bz2
118#
119# This ensures that there are a set order, and you can have ARCH
120# specific patches.
121#
122# If you however give an argument to epatch(), it will treat it as a
123# single patch that need to be applied if its a file. If on the other
124# hand its a directory, it will set EPATCH_SOURCE to this.
125#
126# <azarah@gentoo.org> (10 Nov 2002)
127#
128epatch() { 220epatch() {
129 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 224 echo "${1//?/=}"
132 } 225 }
133 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
134 local PIPE_CMD=""
135 local STDERR_TARGET="${T}/$$.out"
136 local PATCH_TARGET="${T}/$$.patch"
137 local PATCH_SUFFIX=""
138 local SINGLE_PATCH="no"
139 local x=""
140 226
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 228
143 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
144 then 230 # each arg may expand into multiple patches, and each arg may
231 # need to start off with the default global EPATCH_xxx values
232 if [[ $# -gt 1 ]] ; then
145 local m="" 233 local m
146 for m in "$@" ; do 234 for m in "$@" ; do
147 epatch "${m}" 235 epatch "${m}"
148 done 236 done
149 return 0 237 return 0
150 fi 238 fi
151 239
152 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
153 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
155 246 set -- "$1"
156 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
158 250
159 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
160 then 252 # Some people like to make dirs of patches w/out suffixes (vim)
161 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 254
255 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
256 # Re-use EPATCH_SOURCE as a search dir
257 epatch "${EPATCH_SOURCE}/$1"
258 return $?
259
260 else
261 # sanity check ... if it isn't a dir or file, wtf man ?
262 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
263 echo
264 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
265 eerror
266 eerror " ${EPATCH_SOURCE}"
267 eerror " ( ${EPATCH_SOURCE##*/} )"
268 echo
269 die "Cannot find \$EPATCH_SOURCE!"
270 fi
271
272 local PIPE_CMD
273 case ${EPATCH_SUFFIX##*\.} in
274 xz) PIPE_CMD="xz -dc" ;;
275 lzma) PIPE_CMD="lzma -dc" ;;
276 bz2) PIPE_CMD="bzip2 -dc" ;;
277 gz|Z|z) PIPE_CMD="gzip -dc" ;;
278 ZIP|zip) PIPE_CMD="unzip -p" ;;
279 *) ;;
280 esac
281
282 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
283
284 local x
285 for x in "$@" ; do
286 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
287 # didn't match anything, ignore continue on
288 [[ ! -f ${x} ]] && continue
289
290 local patchname=${x##*/}
291
292 # Apply single patches, or forced sets of patches, or
293 # patches with ARCH dependant names.
294 # ???_arch_foo.patch
295 # Else, skip this input altogether
296 local a=${patchname#*_} # strip the ???_
297 a=${a%%_*} # strip the _foo.patch
298 if ! [[ ${SINGLE_PATCH} == "yes" || \
299 ${EPATCH_FORCE} == "yes" || \
300 ${a} == all || \
301 ${a} == ${ARCH} ]]
163 then 302 then
164 local EPATCH_SOURCE="$1/*" 303 continue
304 fi
305
306 # Let people filter things dynamically
307 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
308 # let people use globs in the exclude
309 eshopts_push -o noglob
310
311 local ex
312 for ex in ${EPATCH_EXCLUDE} ; do
313 if [[ ${patchname} == ${ex} ]] ; then
314 eshopts_pop
315 continue 2
316 fi
317 done
318
319 eshopts_pop
320 fi
321
322 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
323 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
324 einfo "${EPATCH_SINGLE_MSG}"
325 else
326 einfo "Applying ${patchname} ..."
327 fi
165 else 328 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 329 einfo " ${patchname} ..."
167 fi 330 fi
168 else 331
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 332 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 333 # but if there are more, make sure we get unique log filenames
171 then 334 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 335 if [[ -e ${STDERR_TARGET} ]] ; then
336 STDERR_TARGET="${T}/${patchname}-$$.out"
337 fi
338
339 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
340
341 # Decompress the patch if need be
342 local count=0
343 local PATCH_TARGET
344 if [[ -n ${PIPE_CMD} ]] ; then
345 PATCH_TARGET="${T}/$$.patch"
346 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
347
348 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
349 echo
350 eerror "Could not extract patch!"
351 #die "Could not extract patch!"
352 count=5
353 break
173 fi 354 fi
355 else
356 PATCH_TARGET=${x}
357 fi
174 358
359 # Check for absolute paths in patches. If sandbox is disabled,
360 # people could (accidently) patch files in the root filesystem.
361 # Or trigger other unpleasantries #237667. So disallow -p0 on
362 # such patches.
363 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
364 if [[ -n ${abs_paths} ]] ; then
365 count=1
366 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
367 fi
368 # Similar reason, but with relative paths.
369 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
370 if [[ -n ${rel_paths} ]] ; then
371 eqawarn "QA Notice: Your patch uses relative paths '../'."
372 eqawarn " In the future this will cause a failure."
373 eqawarn "${rel_paths}"
374 fi
375
376 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
377 while [[ ${count} -lt 5 ]] ; do
378 # Generate some useful debug info ...
379 (
380 _epatch_draw_line "***** ${patchname} *****"
175 echo 381 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
383 echo
384 _epatch_draw_line "***** ${patchname} *****"
385 ) >> "${STDERR_TARGET}"
386
387 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
388 (
389 _epatch_draw_line "***** ${patchname} *****"
390 echo
391 echo "ACTUALLY APPLYING ${patchname} ..."
392 echo
393 _epatch_draw_line "***** ${patchname} *****"
394 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
395 ) >> "${STDERR_TARGET}"
396
397 if [ $? -ne 0 ] ; then
398 echo
399 eerror "A dry-run of patch command succeeded, but actually"
400 eerror "applying the patch failed!"
401 #die "Real world sux compared to the dreamworld!"
402 count=5
403 fi
404 break
405 fi
406
407 : $(( count++ ))
408 done
409
410 # if we had to decompress the patch, delete the temp one
411 if [[ -n ${PIPE_CMD} ]] ; then
412 rm -f "${PATCH_TARGET}"
413 fi
414
415 if [[ ${count} -ge 5 ]] ; then
416 echo
417 eerror "Failed Patch: ${patchname} !"
418 eerror " ( ${PATCH_TARGET} )"
177 eerror 419 eerror
178 eerror " ${EPATCH_SOURCE}" 420 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 421 eerror
422 eerror " ${STDERR_TARGET}"
180 echo 423 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
192 bz2)
193 PIPE_CMD="bzip2 -dc"
194 PATCH_SUFFIX="bz2"
195 ;;
196 gz|Z|z)
197 PIPE_CMD="gzip -dc"
198 PATCH_SUFFIX="gz"
199 ;;
200 ZIP|zip)
201 PIPE_CMD="unzip -p"
202 PATCH_SUFFIX="zip"
203 ;;
204 *)
205 PIPE_CMD="cat"
206 PATCH_SUFFIX="patch"
207 ;;
208 esac
209
210 if [ "${SINGLE_PATCH}" = "no" ]
211 then
212 einfo "${EPATCH_MULTI_MSG}"
213 fi
214 for x in ${EPATCH_SOURCE}
215 do
216 # New ARCH dependant patch naming scheme ...
217 #
218 # ???_arch_foo.patch
219 #
220 if [ -f ${x} ] && \
221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
222 [ "${EPATCH_FORCE}" = "yes" ])
223 then
224 local count=0
225 local popts="${EPATCH_OPTS}"
226 local patchname=${x##*/}
227
228 if [ -n "${EPATCH_EXCLUDE}" ]
229 then
230 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
231 then
232 continue
233 fi
234 fi
235
236 if [ "${SINGLE_PATCH}" = "yes" ]
237 then
238 if [ -n "${EPATCH_SINGLE_MSG}" ]
239 then
240 einfo "${EPATCH_SINGLE_MSG}"
241 else
242 einfo "Applying ${patchname} ..."
243 fi
244 else
245 einfo " ${patchname} ..."
246 fi
247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Allow for prefix to differ ... im lazy, so shoot me :/
268 while [ "${count}" -lt 5 ]
269 do
270 # Generate some useful debug info ...
271 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273
274 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276
277 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279
280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
281 then
282 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
287
288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
289 _epatch_assert
290
291 if [ "$?" -ne 0 ]
292 then
293 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 echo
295 eerror "A dry-run of patch command succeeded, but actually"
296 eerror "applying the patch failed!"
297 #die "Real world sux compared to the dreamworld!"
298 count=5
299 fi
300
301 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
302
303 break
304 fi
305
306 count=$((count + 1))
307 done
308
309 if [ "${PATCH_SUFFIX}" != "patch" ]
310 then
311 rm -f ${PATCH_TARGET}
312 fi
313
314 if [ "${count}" -eq 5 ]
315 then
316 echo
317 eerror "Failed Patch: ${patchname} !"
318 eerror " ( ${PATCH_TARGET} )"
319 eerror
320 eerror "Include in your bugreport the contents of:"
321 eerror
322 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
323 echo
324 die "Failed Patch: ${patchname}!" 424 die "Failed Patch: ${patchname}!"
325 fi 425 fi
326 426
327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 427 # if everything worked, delete the patch log
328 428 rm -f "${STDERR_TARGET}"
329 eend 0 429 eend 0
330 fi
331 done 430 done
332 if [ "${SINGLE_PATCH}" = "no" ] 431
333 then 432 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
334 einfo "Done with patching" 433 : # everything worked
434}
435epatch_user() {
436 [[ $# -ne 0 ]] && die "epatch_user takes no options"
437
438 # don't clobber any EPATCH vars that the parent might want
439 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
440 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
441 EPATCH_SOURCE=${base}/${CTARGET}/${check}
442 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
443 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
444 if [[ -d ${EPATCH_SOURCE} ]] ; then
445 EPATCH_SOURCE=${EPATCH_SOURCE} \
446 EPATCH_SUFFIX="patch" \
447 EPATCH_FORCE="yes" \
448 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
449 epatch
450 return 0
335 fi 451 fi
452 done
453 return 1
336} 454}
337 455
338# @FUNCTION: emktemp 456# @FUNCTION: emktemp
339# @USAGE: [temp dir] 457# @USAGE: [temp dir]
340# @DESCRIPTION: 458# @DESCRIPTION:
376# base-system@gentoo.org (Linux) 494# base-system@gentoo.org (Linux)
377# Joe Jezak <josejx@gmail.com> (OS X) 495# Joe Jezak <josejx@gmail.com> (OS X)
378# usata@gentoo.org (OS X) 496# usata@gentoo.org (OS X)
379# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 497# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
380# @DESCRIPTION: 498# @DESCRIPTION:
381# Small wrapper for getent (Linux), nidump (Mac OS X), 499# Small wrapper for getent (Linux),
500# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
382# and pw (FreeBSD) used in enewuser()/enewgroup() 501# and pw (FreeBSD) used in enewuser()/enewgroup()
383egetent() { 502egetent() {
384 case ${CHOST} in 503 case ${CHOST} in
385 *-darwin*) 504 *-darwin[678])
386 case "$2" in 505 case "$2" in
387 *[!0-9]*) # Non numeric 506 *[!0-9]*) # Non numeric
388 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 507 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
389 ;; 508 ;;
390 *) # Numeric 509 *) # Numeric
391 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 510 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
511 ;;
512 esac
513 ;;
514 *-darwin*)
515 local mytype=$1
516 [[ "passwd" == $mytype ]] && mytype="Users"
517 [[ "group" == $mytype ]] && mytype="Groups"
518 case "$2" in
519 *[!0-9]*) # Non numeric
520 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
521 ;;
522 *) # Numeric
523 local mykey="UniqueID"
524 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
525 dscl . -search /$mytype $mykey $2 2>/dev/null
392 ;; 526 ;;
393 esac 527 esac
394 ;; 528 ;;
395 *-freebsd*|*-dragonfly*) 529 *-freebsd*|*-dragonfly*)
396 local opts action="user" 530 local opts action="user"
596 fi 730 fi
597 ;; 731 ;;
598 732
599 *) 733 *)
600 if [[ -z $@ ]] ; then 734 if [[ -z $@ ]] ; then
601 useradd ${opts} ${euser} \ 735 useradd -r ${opts} \
602 -c "added by portage for ${PN}" \ 736 -c "added by portage for ${PN}" \
737 ${euser} \
603 || die "enewuser failed" 738 || die "enewuser failed"
604 else 739 else
605 einfo " - Extra: $@" 740 einfo " - Extra: $@"
606 useradd ${opts} ${euser} "$@" \ 741 useradd -r ${opts} "$@" \
742 ${euser} \
607 || die "enewuser failed" 743 || die "enewuser failed"
608 fi 744 fi
609 ;; 745 ;;
610 esac 746 esac
611 747
723 esac 859 esac
724 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 860 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
725 ;; 861 ;;
726 862
727 *) 863 *)
864 # We specify -r so that we get a GID in the system range from login.defs
728 groupadd ${opts} ${egroup} || die "enewgroup failed" 865 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
729 ;; 866 ;;
730 esac 867 esac
731 export SANDBOX_ON="${oldsandbox}" 868 export SANDBOX_ON="${oldsandbox}"
732} 869}
733 870
744 881
745# Make a desktop file ! 882# Make a desktop file !
746# Great for making those icons in kde/gnome startmenu ! 883# Great for making those icons in kde/gnome startmenu !
747# Amaze your friends ! Get the women ! Join today ! 884# Amaze your friends ! Get the women ! Join today !
748# 885#
749# make_desktop_entry(<command>, [name], [icon], [type], [path]) 886# make_desktop_entry(<command>, [name], [icon], [type], [fields])
750# 887#
751# binary: what command does the app run with ? 888# binary: what command does the app run with ?
752# name: the name that will show up in the menu 889# name: the name that will show up in the menu
753# icon: give your little like a pretty little icon ... 890# icon: give your little like a pretty little icon ...
754# this can be relative (to /usr/share/pixmaps) or 891# this can be relative (to /usr/share/pixmaps) or
755# a full path to an icon 892# a full path to an icon
756# type: what kind of application is this ? for categories: 893# type: what kind of application is this ? for categories:
757# http://standards.freedesktop.org/menu-spec/latest/apa.html 894# http://standards.freedesktop.org/menu-spec/latest/apa.html
758# path: if your app needs to startup in a specific dir 895# fields: extra fields to append to the desktop file; a printf string
759make_desktop_entry() { 896make_desktop_entry() {
760 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 897 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
761 898
762 local exec=${1} 899 local exec=${1}
763 local name=${2:-${PN}} 900 local name=${2:-${PN}}
764 local icon=${3:-${PN}} 901 local icon=${3:-${PN}}
765 local type=${4} 902 local type=${4}
766 local path=${5} 903 local fields=${5}
767 904
768 if [[ -z ${type} ]] ; then 905 if [[ -z ${type} ]] ; then
769 local catmaj=${CATEGORY%%-*} 906 local catmaj=${CATEGORY%%-*}
770 local catmin=${CATEGORY##*-} 907 local catmin=${CATEGORY##*-}
771 case ${catmaj} in 908 case ${catmaj} in
772 app) 909 app)
773 case ${catmin} in 910 case ${catmin} in
774 accessibility) type=Accessibility;; 911 accessibility) type=Accessibility;;
775 admin) type=System;; 912 admin) type=System;;
776 antivirus) type=System;; 913 antivirus) type=System;;
777 arch) type=Archiving;; 914 arch) type=Archiving;;
778 backup) type=Archiving;; 915 backup) type=Archiving;;
779 cdr) type=DiscBurning;; 916 cdr) type=DiscBurning;;
780 dicts) type=Dictionary;; 917 dicts) type=Dictionary;;
781 doc) type=Documentation;; 918 doc) type=Documentation;;
782 editors) type=TextEditor;; 919 editors) type=TextEditor;;
783 emacs) type=TextEditor;; 920 emacs) type=TextEditor;;
784 emulation) type=Emulator;; 921 emulation) type=Emulator;;
785 laptop) type=HardwareSettings;; 922 laptop) type=HardwareSettings;;
786 office) type=Office;; 923 office) type=Office;;
787 pda) type=PDA;; 924 pda) type=PDA;;
788 vim) type=TextEditor;; 925 vim) type=TextEditor;;
789 xemacs) type=TextEditor;; 926 xemacs) type=TextEditor;;
790 *) type=;;
791 esac 927 esac
792 ;; 928 ;;
793 929
794 dev) 930 dev)
795 type="Development" 931 type="Development"
796 ;; 932 ;;
797 933
798 games) 934 games)
799 case ${catmin} in 935 case ${catmin} in
800 action|fps) type=ActionGame;; 936 action|fps) type=ActionGame;;
801 arcade) type=ArcadeGame;; 937 arcade) type=ArcadeGame;;
802 board) type=BoardGame;; 938 board) type=BoardGame;;
803 emulation) type=Emulator;; 939 emulation) type=Emulator;;
804 kids) type=KidsGame;; 940 kids) type=KidsGame;;
805 puzzle) type=LogicGame;; 941 puzzle) type=LogicGame;;
806 roguelike) type=RolePlaying;; 942 roguelike) type=RolePlaying;;
807 rpg) type=RolePlaying;; 943 rpg) type=RolePlaying;;
808 simulation) type=Simulation;; 944 simulation) type=Simulation;;
809 sports) type=SportsGame;; 945 sports) type=SportsGame;;
810 strategy) type=StrategyGame;; 946 strategy) type=StrategyGame;;
811 *) type=;;
812 esac 947 esac
813 type="Game;${type}" 948 type="Game;${type}"
814 ;; 949 ;;
815 950
816 gnome) 951 gnome)
825 type="Network;Email" 960 type="Network;Email"
826 ;; 961 ;;
827 962
828 media) 963 media)
829 case ${catmin} in 964 case ${catmin} in
965 gfx)
830 gfx) type=Graphics;; 966 type=Graphics
967 ;;
968 *)
969 case ${catmin} in
831 radio) type=Tuner;; 970 radio) type=Tuner;;
832 sound) type=Audio;; 971 sound) type=Audio;;
833 tv) type=TV;; 972 tv) type=TV;;
834 video) type=Video;; 973 video) type=Video;;
835 *) type=;; 974 esac
975 type="AudioVideo;${type}"
976 ;;
836 esac 977 esac
837 type="AudioVideo;${type}"
838 ;; 978 ;;
839 979
840 net) 980 net)
841 case ${catmin} in 981 case ${catmin} in
842 dialup) type=Dialup;; 982 dialup) type=Dialup;;
843 ftp) type=FileTransfer;; 983 ftp) type=FileTransfer;;
844 im) type=InstantMessaging;; 984 im) type=InstantMessaging;;
845 irc) type=IRCClient;; 985 irc) type=IRCClient;;
846 mail) type=Email;; 986 mail) type=Email;;
847 news) type=News;; 987 news) type=News;;
848 nntp) type=News;; 988 nntp) type=News;;
849 p2p) type=FileTransfer;; 989 p2p) type=FileTransfer;;
850 *) type=;; 990 voip) type=Telephony;;
851 esac 991 esac
852 type="Network;${type}" 992 type="Network;${type}"
853 ;; 993 ;;
854 994
855 sci) 995 sci)
856 case ${catmin} in 996 case ${catmin} in
857 astro*) type=Astronomy;; 997 astro*) type=Astronomy;;
858 bio*) type=Biology;; 998 bio*) type=Biology;;
859 calc*) type=Calculator;; 999 calc*) type=Calculator;;
860 chem*) type=Chemistry;; 1000 chem*) type=Chemistry;;
861 elec*) type=Electronics;; 1001 elec*) type=Electronics;;
862 geo*) type=Geology;; 1002 geo*) type=Geology;;
863 math*) type=Math;; 1003 math*) type=Math;;
864 physics) type=Physics;; 1004 physics) type=Physics;;
865 visual*) type=DataVisualization;; 1005 visual*) type=DataVisualization;;
866 *) type=;;
867 esac 1006 esac
868 type="Science;${type}" 1007 type="Education;Science;${type}"
869 ;; 1008 ;;
870 1009
871 sys) 1010 sys)
872 type="System" 1011 type="System"
873 ;; 1012 ;;
874 1013
875 www) 1014 www)
876 case ${catmin} in 1015 case ${catmin} in
877 client) type=WebBrowser;; 1016 client) type=WebBrowser;;
878 *) type=;;
879 esac 1017 esac
880 type="Network" 1018 type="Network;${type}"
881 ;; 1019 ;;
882 1020
883 *) 1021 *)
884 type= 1022 type=
885 ;; 1023 ;;
891 local desktop_name="${PN}-${SLOT}" 1029 local desktop_name="${PN}-${SLOT}"
892 fi 1030 fi
893 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1031 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1032 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 1033
1034 # Don't append another ";" when a valid category value is provided.
1035 type=${type%;}${type:+;}
1036
1037 eshopts_push -s extglob
1038 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1039 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1040 ewarn "allowed in .desktop files if the value is not an absolute path."
1041 icon=${icon%.@(xpm|png|svg)}
1042 fi
1043 eshopts_pop
1044
896 cat <<-EOF > "${desktop}" 1045 cat <<-EOF > "${desktop}"
897 [Desktop Entry] 1046 [Desktop Entry]
898 Version=1.0
899 Name=${name} 1047 Name=${name}
900 Type=Application 1048 Type=Application
901 Comment=${DESCRIPTION} 1049 Comment=${DESCRIPTION}
902 Exec=${exec} 1050 Exec=${exec}
903 TryExec=${exec%% *} 1051 TryExec=${exec%% *}
904 Icon=${icon} 1052 Icon=${icon}
905 Categories=${type}; 1053 Categories=${type}
906 EOF 1054 EOF
907 1055
908 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1056 if [[ ${fields:-=} != *=* ]] ; then
1057 # 5th arg used to be value to Path=
1058 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1059 fields="Path=${fields}"
1060 fi
1061 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
909 1062
910 ( 1063 (
911 # wrap the env here so that the 'insinto' call 1064 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller 1065 # doesn't corrupt the env of the caller
913 insinto /usr/share/applications 1066 insinto /usr/share/applications
914 doins "${desktop}" 1067 doins "${desktop}"
915 ) 1068 ) || die "installing desktop file failed"
916} 1069}
917 1070
918# @FUNCTION: validate_desktop_entries 1071# @FUNCTION: validate_desktop_entries
919# @USAGE: [directories] 1072# @USAGE: [directories]
920# @MAINTAINER: 1073# @MAINTAINER:
942 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1095 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
943 fi 1096 fi
944} 1097}
945 1098
946# @FUNCTION: make_session_desktop 1099# @FUNCTION: make_session_desktop
947# @USAGE: <title> <command> 1100# @USAGE: <title> <command> [command args...]
948# @DESCRIPTION: 1101# @DESCRIPTION:
949# Make a GDM/KDM Session file. The title is the file to execute to start the 1102# Make a GDM/KDM Session file. The title is the file to execute to start the
950# Window Manager. The command is the name of the Window Manager. 1103# Window Manager. The command is the name of the Window Manager.
1104#
1105# You can set the name of the file via the ${wm} variable.
951make_session_desktop() { 1106make_session_desktop() {
952 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1107 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
953 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1108 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
954 1109
955 local title=$1 1110 local title=$1
956 local command=$2 1111 local command=$2
957 local desktop=${T}/${wm}.desktop 1112 local desktop=${T}/${wm:-${PN}}.desktop
1113 shift 2
958 1114
959 cat <<-EOF > "${desktop}" 1115 cat <<-EOF > "${desktop}"
960 [Desktop Entry] 1116 [Desktop Entry]
961 Name=${title} 1117 Name=${title}
962 Comment=This session logs you into ${title} 1118 Comment=This session logs you into ${title}
963 Exec=${command} 1119 Exec=${command} $*
964 TryExec=${command} 1120 TryExec=${command}
965 Type=Application 1121 Type=XSession
966 EOF 1122 EOF
967 1123
968 ( 1124 (
969 # wrap the env here so that the 'insinto' call 1125 # wrap the env here so that the 'insinto' call
970 # doesn't corrupt the env of the caller 1126 # doesn't corrupt the env of the caller
1196 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1352 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1197 1353
1198 local shrtsrc=$(basename "${src}") 1354 local shrtsrc=$(basename "${src}")
1199 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1355 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1200 if [[ -z ${skip} ]] ; then 1356 if [[ -z ${skip} ]] ; then
1201 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1357 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1202 local skip=0 1358 local skip=0
1203 exe=tail 1359 exe=tail
1204 case ${ver} in 1360 case ${ver} in
1205 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1361 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1206 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1362 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1208 2.0|2.0.1) 1364 2.0|2.0.1)
1209 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1365 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1210 ;; 1366 ;;
1211 2.1.1) 1367 2.1.1)
1212 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1368 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1213 let skip="skip + 1" 1369 (( skip++ ))
1214 ;; 1370 ;;
1215 2.1.2) 1371 2.1.2)
1216 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1372 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1217 let skip="skip + 1" 1373 (( skip++ ))
1218 ;; 1374 ;;
1219 2.1.3) 1375 2.1.3)
1220 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1376 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1221 let skip="skip + 1" 1377 (( skip++ ))
1222 ;; 1378 ;;
1223 2.1.4|2.1.5) 1379 2.1.4|2.1.5)
1224 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1380 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1225 skip=$(head -n ${skip} "${src}" | wc -c) 1381 skip=$(head -n ${skip} "${src}" | wc -c)
1226 exe="dd" 1382 exe="dd"
1235 esac 1391 esac
1236 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1392 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1237 fi 1393 fi
1238 case ${exe} in 1394 case ${exe} in
1239 tail) exe="tail -n +${skip} '${src}'";; 1395 tail) exe="tail -n +${skip} '${src}'";;
1240 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1396 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1241 *) die "makeself cant handle exe '${exe}'" 1397 *) die "makeself cant handle exe '${exe}'"
1242 esac 1398 esac
1243 1399
1244 # lets grab the first few bytes of the file to figure out what kind of archive it is 1400 # lets grab the first few bytes of the file to figure out what kind of archive it is
1245 local tmpfile=$(emktemp) 1401 local filetype tmpfile=$(emktemp)
1246 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1402 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1247 local filetype=$(file -b "${tmpfile}") 1403 filetype=$(file -b "${tmpfile}") || die
1248 case ${filetype} in 1404 case ${filetype} in
1249 *tar\ archive*) 1405 *tar\ archive*)
1250 eval ${exe} | tar --no-same-owner -xf - 1406 eval ${exe} | tar --no-same-owner -xf -
1251 ;; 1407 ;;
1252 bzip2*) 1408 bzip2*)
1282 lic="${PWD}/${lic}" 1438 lic="${PWD}/${lic}"
1283 elif [ -e "${lic}" ] ; then 1439 elif [ -e "${lic}" ] ; then
1284 lic="${lic}" 1440 lic="${lic}"
1285 fi 1441 fi
1286 fi 1442 fi
1287 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1288 local l="`basename ${lic}`" 1443 local l="`basename ${lic}`"
1289 1444
1290 # here is where we check for the licenses the user already 1445 # here is where we check for the licenses the user already
1291 # accepted ... if we don't find a match, we make the user accept 1446 # accepted ... if we don't find a match, we make the user accept
1292 local shopts=$-
1293 local alic 1447 local alic
1294 set -o noglob #so that bash doesn't expand "*" 1448 eshopts_push -o noglob # so that bash doesn't expand "*"
1295 for alic in ${ACCEPT_LICENSE} ; do 1449 for alic in ${ACCEPT_LICENSE} ; do
1296 if [[ ${alic} == ${l} ]]; then 1450 if [[ ${alic} == ${l} ]]; then
1297 set +o noglob; set -${shopts} #reset old shell opts 1451 eshopts_pop
1298 return 0 1452 return 0
1299 fi 1453 fi
1300 done 1454 done
1301 set +o noglob; set -$shopts #reset old shell opts 1455 eshopts_pop
1456 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1302 1457
1303 local licmsg=$(emktemp) 1458 local licmsg=$(emktemp)
1304 cat <<-EOF > ${licmsg} 1459 cat <<-EOF > ${licmsg}
1305 ********************************************************** 1460 **********************************************************
1306 The following license outlines the terms of use of this 1461 The following license outlines the terms of use of this
1379 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1534 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1380 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1535 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1381 export CDROM_SET=-1 1536 export CDROM_SET=-1
1382 for f in ${CDROM_CHECK_1//:/ } ; do 1537 for f in ${CDROM_CHECK_1//:/ } ; do
1383 ((++CDROM_SET)) 1538 ((++CDROM_SET))
1384 [[ -e ${CD_ROOT}/${f} ]] && break 1539 [[ -e ${CDROM_ROOT}/${f} ]] && break
1385 done 1540 done
1386 export CDROM_MATCH=${f} 1541 export CDROM_MATCH=${f}
1387 return 1542 return
1388 fi 1543 fi
1389 1544
1553# of the lists. 1708# of the lists.
1554strip-linguas() { 1709strip-linguas() {
1555 local ls newls nols 1710 local ls newls nols
1556 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1711 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1557 local op=$1; shift 1712 local op=$1; shift
1558 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1713 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1559 local d f 1714 local d f
1560 for d in "$@" ; do 1715 for d in "$@" ; do
1561 if [[ ${op} == "-u" ]] ; then 1716 if [[ ${op} == "-u" ]] ; then
1562 newls=${ls} 1717 newls=${ls}
1563 else 1718 else
1564 newls="" 1719 newls=""
1565 fi 1720 fi
1566 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1721 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1567 if [[ ${op} == "-i" ]] ; then 1722 if [[ ${op} == "-i" ]] ; then
1568 hasq ${f} ${ls} && newls="${newls} ${f}" 1723 has ${f} ${ls} && newls="${newls} ${f}"
1569 else 1724 else
1570 hasq ${f} ${ls} || newls="${newls} ${f}" 1725 has ${f} ${ls} || newls="${newls} ${f}"
1571 fi 1726 fi
1572 done 1727 done
1573 ls=${newls} 1728 ls=${newls}
1574 done 1729 done
1575 else 1730 else
1577 fi 1732 fi
1578 1733
1579 nols="" 1734 nols=""
1580 newls="" 1735 newls=""
1581 for f in ${LINGUAS} ; do 1736 for f in ${LINGUAS} ; do
1582 if hasq ${f} ${ls} ; then 1737 if has ${f} ${ls} ; then
1583 newls="${newls} ${f}" 1738 newls="${newls} ${f}"
1584 else 1739 else
1585 nols="${nols} ${f}" 1740 nols="${nols} ${f}"
1586 fi 1741 fi
1587 done 1742 done
1588 [[ -n ${nols} ]] \ 1743 [[ -n ${nols} ]] \
1589 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1744 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1590 export LINGUAS=${newls:1} 1745 export LINGUAS=${newls:1}
1591} 1746}
1592 1747
1593# @FUNCTION: preserve_old_lib 1748# @FUNCTION: preserve_old_lib
1594# @USAGE: <libs to preserve> [more libs] 1749# @USAGE: <libs to preserve> [more libs]
1642 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1797 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1643 ewarn "in order to remove these old dependencies. If you do not have this" 1798 ewarn "in order to remove these old dependencies. If you do not have this"
1644 ewarn "helper program, simply emerge the 'gentoolkit' package." 1799 ewarn "helper program, simply emerge the 'gentoolkit' package."
1645 ewarn 1800 ewarn
1646 fi 1801 fi
1802 # temp hack for #348634 #357225
1803 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1647 ewarn " # revdep-rebuild --library ${lib##*/}" 1804 ewarn " # revdep-rebuild --library '${lib}'"
1648 done 1805 done
1649 if [[ ${notice} -eq 1 ]] ; then 1806 if [[ ${notice} -eq 1 ]] ; then
1650 ewarn 1807 ewarn
1651 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1808 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1652 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1809 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1657} 1814}
1658 1815
1659# @FUNCTION: built_with_use 1816# @FUNCTION: built_with_use
1660# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1817# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1661# @DESCRIPTION: 1818# @DESCRIPTION:
1819#
1820# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1821#
1662# A temporary hack until portage properly supports DEPENDing on USE 1822# A temporary hack until portage properly supports DEPENDing on USE
1663# flags being enabled in packages. This will check to see if the specified 1823# flags being enabled in packages. This will check to see if the specified
1664# DEPEND atom was built with the specified list of USE flags. The 1824# DEPEND atom was built with the specified list of USE flags. The
1665# --missing option controls the behavior if called on a package that does 1825# --missing option controls the behavior if called on a package that does
1666# not actually support the defined USE flags (aka listed in IUSE). 1826# not actually support the defined USE flags (aka listed in IUSE).
1794 ) || die 1954 ) || die
1795 else 1955 else
1796 newbin "${tmpwrapper}" "${wrapper}" || die 1956 newbin "${tmpwrapper}" "${wrapper}" || die
1797 fi 1957 fi
1798} 1958}
1959
1960# @FUNCTION: path_exists
1961# @USAGE: [-a|-o] <paths>
1962# @DESCRIPTION:
1963# Check if the specified paths exist. Works for all types of paths
1964# (files/dirs/etc...). The -a and -o flags control the requirements
1965# of the paths. They correspond to "and" and "or" logic. So the -a
1966# flag means all the paths must exist while the -o flag means at least
1967# one of the paths must exist. The default behavior is "and". If no
1968# paths are specified, then the return value is "false".
1969path_exists() {
1970 local opt=$1
1971 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1972
1973 # no paths -> return false
1974 # same behavior as: [[ -e "" ]]
1975 [[ $# -eq 0 ]] && return 1
1976
1977 local p r=0
1978 for p in "$@" ; do
1979 [[ -e ${p} ]]
1980 : $(( r += $? ))
1981 done
1982
1983 case ${opt} in
1984 -a) return $(( r != 0 )) ;;
1985 -o) return $(( r == $# )) ;;
1986 esac
1987}

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

  ViewVC Help
Powered by ViewVC 1.1.20