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

Diff of /eclass/eutils.eclass

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

Revision 1.305 Revision 1.354
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2009 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.305 2008/09/20 18:55:07 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.354 2011/02/25 21:58:19 ulm 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 else
256 # sanity check ... if it isn't a dir or file, wtf man ?
257 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
258 echo
259 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
260 eerror
261 eerror " ${EPATCH_SOURCE}"
262 eerror " ( ${EPATCH_SOURCE##*/} )"
263 echo
264 die "Cannot find \$EPATCH_SOURCE!"
265 fi
266
267 local PIPE_CMD
268 case ${EPATCH_SUFFIX##*\.} in
269 xz) PIPE_CMD="xz -dc" ;;
270 lzma) PIPE_CMD="lzma -dc" ;;
271 bz2) PIPE_CMD="bzip2 -dc" ;;
272 gz|Z|z) PIPE_CMD="gzip -dc" ;;
273 ZIP|zip) PIPE_CMD="unzip -p" ;;
274 *) ;;
275 esac
276
277 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
278
279 local x
280 for x in "$@" ; do
281 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
282 # didn't match anything, ignore continue on
283 [[ ! -f ${x} ]] && continue
284
285 local patchname=${x##*/}
286
287 # Apply single patches, or forced sets of patches, or
288 # patches with ARCH dependant names.
289 # ???_arch_foo.patch
290 # Else, skip this input altogether
291 local a=${patchname#*_} # strip the ???_
292 a=${a%%_*} # strip the _foo.patch
293 if ! [[ ${SINGLE_PATCH} == "yes" || \
294 ${EPATCH_FORCE} == "yes" || \
295 ${a} == all || \
296 ${a} == ${ARCH} ]]
163 then 297 then
164 local EPATCH_SOURCE="$1/*" 298 continue
299 fi
300
301 # Let people filter things dynamically
302 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
303 # let people use globs in the exclude
304 eshopts_push -o noglob
305
306 local ex
307 for ex in ${EPATCH_EXCLUDE} ; do
308 if [[ ${patchname} == ${ex} ]] ; then
309 eshopts_pop
310 continue 2
311 fi
312 done
313
314 eshopts_pop
315 fi
316
317 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
318 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
319 einfo "${EPATCH_SINGLE_MSG}"
320 else
321 einfo "Applying ${patchname} ..."
322 fi
165 else 323 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 324 einfo " ${patchname} ..."
167 fi 325 fi
168 else 326
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 327 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 328 # but if there are more, make sure we get unique log filenames
171 then 329 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 330 if [[ -e ${STDERR_TARGET} ]] ; then
331 STDERR_TARGET="${T}/${patchname}-$$.out"
332 fi
333
334 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
335
336 # Decompress the patch if need be
337 local count=0
338 local PATCH_TARGET
339 if [[ -n ${PIPE_CMD} ]] ; then
340 PATCH_TARGET="${T}/$$.patch"
341 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
342
343 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
344 echo
345 eerror "Could not extract patch!"
346 #die "Could not extract patch!"
347 count=5
348 break
173 fi 349 fi
350 else
351 PATCH_TARGET=${x}
352 fi
174 353
354 # Check for absolute paths in patches. If sandbox is disabled,
355 # people could (accidently) patch files in the root filesystem.
356 # Or trigger other unpleasantries #237667. So disallow -p0 on
357 # such patches.
358 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
359 if [[ -n ${abs_paths} ]] ; then
360 count=1
361 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
362 fi
363 # Similar reason, but with relative paths.
364 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
365 if [[ -n ${rel_paths} ]] ; then
366 eqawarn "QA Notice: Your patch uses relative paths '../'."
367 eqawarn " In the future this will cause a failure."
368 eqawarn "${rel_paths}"
369 fi
370
371 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
372 while [[ ${count} -lt 5 ]] ; do
373 # Generate some useful debug info ...
374 (
375 _epatch_draw_line "***** ${patchname} *****"
175 echo 376 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 377 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
378 echo
379 _epatch_draw_line "***** ${patchname} *****"
380 ) >> "${STDERR_TARGET}"
381
382 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
383 (
384 _epatch_draw_line "***** ${patchname} *****"
385 echo
386 echo "ACTUALLY APPLYING ${patchname} ..."
387 echo
388 _epatch_draw_line "***** ${patchname} *****"
389 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
390 ) >> "${STDERR_TARGET}"
391
392 if [ $? -ne 0 ] ; then
393 echo
394 eerror "A dry-run of patch command succeeded, but actually"
395 eerror "applying the patch failed!"
396 #die "Real world sux compared to the dreamworld!"
397 count=5
398 fi
399 break
400 fi
401
402 : $(( count++ ))
403 done
404
405 # if we had to decompress the patch, delete the temp one
406 if [[ -n ${PIPE_CMD} ]] ; then
407 rm -f "${PATCH_TARGET}"
408 fi
409
410 if [[ ${count} -ge 5 ]] ; then
411 echo
412 eerror "Failed Patch: ${patchname} !"
413 eerror " ( ${PATCH_TARGET} )"
177 eerror 414 eerror
178 eerror " ${EPATCH_SOURCE}" 415 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 416 eerror
417 eerror " ${STDERR_TARGET}"
180 echo 418 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
192 bz2)
193 PIPE_CMD="bzip2 -dc"
194 PATCH_SUFFIX="bz2"
195 ;;
196 gz|Z|z)
197 PIPE_CMD="gzip -dc"
198 PATCH_SUFFIX="gz"
199 ;;
200 ZIP|zip)
201 PIPE_CMD="unzip -p"
202 PATCH_SUFFIX="zip"
203 ;;
204 *)
205 PIPE_CMD="cat"
206 PATCH_SUFFIX="patch"
207 ;;
208 esac
209
210 if [ "${SINGLE_PATCH}" = "no" ]
211 then
212 einfo "${EPATCH_MULTI_MSG}"
213 fi
214 for x in ${EPATCH_SOURCE}
215 do
216 # New ARCH dependant patch naming scheme ...
217 #
218 # ???_arch_foo.patch
219 #
220 if [ -f ${x} ] && \
221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
222 [ "${EPATCH_FORCE}" = "yes" ])
223 then
224 local count=0
225 local popts="${EPATCH_OPTS}"
226 local patchname=${x##*/}
227
228 if [ -n "${EPATCH_EXCLUDE}" ]
229 then
230 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
231 then
232 continue
233 fi
234 fi
235
236 if [ "${SINGLE_PATCH}" = "yes" ]
237 then
238 if [ -n "${EPATCH_SINGLE_MSG}" ]
239 then
240 einfo "${EPATCH_SINGLE_MSG}"
241 else
242 einfo "Applying ${patchname} ..."
243 fi
244 else
245 einfo " ${patchname} ..."
246 fi
247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Check for absolute paths in patches. If sandbox is disabled,
268 # people could (accidently) patch files in the root filesystem.
269 # Or trigger other unpleasantries #237667.
270 if egrep -q '^[-+]{3} /' "${PATCH_TARGET}" ; then
271 ewarn "Absolute paths found in ${patchname}! Please remove them!"
272 fi
273
274 # Allow for prefix to differ ... im lazy, so shoot me :/
275 while [ "${count}" -lt 5 ]
276 do
277 # Generate some useful debug info ...
278 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280
281 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283
284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
285 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286
287 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
288 then
289 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
291 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
293 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
294
295 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
296 _epatch_assert
297
298 if [ "$?" -ne 0 ]
299 then
300 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo
302 eerror "A dry-run of patch command succeeded, but actually"
303 eerror "applying the patch failed!"
304 #die "Real world sux compared to the dreamworld!"
305 count=5
306 fi
307
308 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
309
310 break
311 fi
312
313 count=$((count + 1))
314 done
315
316 if [ "${PATCH_SUFFIX}" != "patch" ]
317 then
318 rm -f ${PATCH_TARGET}
319 fi
320
321 if [ "${count}" -eq 5 ]
322 then
323 echo
324 eerror "Failed Patch: ${patchname} !"
325 eerror " ( ${PATCH_TARGET} )"
326 eerror
327 eerror "Include in your bugreport the contents of:"
328 eerror
329 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
330 echo
331 die "Failed Patch: ${patchname}!" 419 die "Failed Patch: ${patchname}!"
332 fi 420 fi
333 421
334 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 422 # if everything worked, delete the patch log
335 423 rm -f "${STDERR_TARGET}"
336 eend 0 424 eend 0
337 fi
338 done 425 done
339 if [ "${SINGLE_PATCH}" = "no" ] 426
340 then 427 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
341 einfo "Done with patching" 428 : # everything worked
429}
430epatch_user() {
431 [[ $# -ne 0 ]] && die "epatch_user takes no options"
432
433 # don't clobber any EPATCH vars that the parent might want
434 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
435 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
436 EPATCH_SOURCE=${base}/${CTARGET}/${check}
437 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
438 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
439 if [[ -d ${EPATCH_SOURCE} ]] ; then
440 EPATCH_SOURCE=${EPATCH_SOURCE} \
441 EPATCH_SUFFIX="patch" \
442 EPATCH_FORCE="yes" \
443 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
444 epatch
445 return 0
342 fi 446 fi
447 done
448 return 1
343} 449}
344 450
345# @FUNCTION: emktemp 451# @FUNCTION: emktemp
346# @USAGE: [temp dir] 452# @USAGE: [temp dir]
347# @DESCRIPTION: 453# @DESCRIPTION:
383# base-system@gentoo.org (Linux) 489# base-system@gentoo.org (Linux)
384# Joe Jezak <josejx@gmail.com> (OS X) 490# Joe Jezak <josejx@gmail.com> (OS X)
385# usata@gentoo.org (OS X) 491# usata@gentoo.org (OS X)
386# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 492# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
387# @DESCRIPTION: 493# @DESCRIPTION:
388# Small wrapper for getent (Linux), nidump (Mac OS X), 494# Small wrapper for getent (Linux),
495# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
389# and pw (FreeBSD) used in enewuser()/enewgroup() 496# and pw (FreeBSD) used in enewuser()/enewgroup()
390egetent() { 497egetent() {
391 case ${CHOST} in 498 case ${CHOST} in
392 *-darwin*) 499 *-darwin[678])
393 case "$2" in 500 case "$2" in
394 *[!0-9]*) # Non numeric 501 *[!0-9]*) # Non numeric
395 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 502 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
396 ;; 503 ;;
397 *) # Numeric 504 *) # Numeric
398 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 505 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
506 ;;
507 esac
508 ;;
509 *-darwin*)
510 local mytype=$1
511 [[ "passwd" == $mytype ]] && mytype="Users"
512 [[ "group" == $mytype ]] && mytype="Groups"
513 case "$2" in
514 *[!0-9]*) # Non numeric
515 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
516 ;;
517 *) # Numeric
518 local mykey="UniqueID"
519 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
520 dscl . -search /$mytype $mykey $2 2>/dev/null
399 ;; 521 ;;
400 esac 522 esac
401 ;; 523 ;;
402 *-freebsd*|*-dragonfly*) 524 *-freebsd*|*-dragonfly*)
403 local opts action="user" 525 local opts action="user"
603 fi 725 fi
604 ;; 726 ;;
605 727
606 *) 728 *)
607 if [[ -z $@ ]] ; then 729 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 730 useradd -r ${opts} \
609 -c "added by portage for ${PN}" \ 731 -c "added by portage for ${PN}" \
732 ${euser} \
610 || die "enewuser failed" 733 || die "enewuser failed"
611 else 734 else
612 einfo " - Extra: $@" 735 einfo " - Extra: $@"
613 useradd ${opts} ${euser} "$@" \ 736 useradd -r ${opts} "$@" \
737 ${euser} \
614 || die "enewuser failed" 738 || die "enewuser failed"
615 fi 739 fi
616 ;; 740 ;;
617 esac 741 esac
618 742
730 esac 854 esac
731 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 855 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
732 ;; 856 ;;
733 857
734 *) 858 *)
859 # We specify -r so that we get a GID in the system range from login.defs
735 groupadd ${opts} ${egroup} || die "enewgroup failed" 860 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
736 ;; 861 ;;
737 esac 862 esac
738 export SANDBOX_ON="${oldsandbox}" 863 export SANDBOX_ON="${oldsandbox}"
739} 864}
740 865
751 876
752# Make a desktop file ! 877# Make a desktop file !
753# Great for making those icons in kde/gnome startmenu ! 878# Great for making those icons in kde/gnome startmenu !
754# Amaze your friends ! Get the women ! Join today ! 879# Amaze your friends ! Get the women ! Join today !
755# 880#
756# make_desktop_entry(<command>, [name], [icon], [type], [path]) 881# make_desktop_entry(<command>, [name], [icon], [type], [fields])
757# 882#
758# binary: what command does the app run with ? 883# binary: what command does the app run with ?
759# name: the name that will show up in the menu 884# name: the name that will show up in the menu
760# icon: give your little like a pretty little icon ... 885# icon: give your little like a pretty little icon ...
761# this can be relative (to /usr/share/pixmaps) or 886# this can be relative (to /usr/share/pixmaps) or
762# a full path to an icon 887# a full path to an icon
763# type: what kind of application is this ? for categories: 888# type: what kind of application is this ? for categories:
764# http://standards.freedesktop.org/menu-spec/latest/apa.html 889# http://standards.freedesktop.org/menu-spec/latest/apa.html
765# path: if your app needs to startup in a specific dir 890# fields: extra fields to append to the desktop file; a printf string
766make_desktop_entry() { 891make_desktop_entry() {
767 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 892 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
768 893
769 local exec=${1} 894 local exec=${1}
770 local name=${2:-${PN}} 895 local name=${2:-${PN}}
771 local icon=${3:-${PN}} 896 local icon=${3:-${PN}}
772 local type=${4} 897 local type=${4}
773 local path=${5} 898 local fields=${5}
774 899
775 if [[ -z ${type} ]] ; then 900 if [[ -z ${type} ]] ; then
776 local catmaj=${CATEGORY%%-*} 901 local catmaj=${CATEGORY%%-*}
777 local catmin=${CATEGORY##*-} 902 local catmin=${CATEGORY##*-}
778 case ${catmaj} in 903 case ${catmaj} in
779 app) 904 app)
780 case ${catmin} in 905 case ${catmin} in
781 accessibility) type=Accessibility;; 906 accessibility) type=Accessibility;;
782 admin) type=System;; 907 admin) type=System;;
783 antivirus) type=System;; 908 antivirus) type=System;;
784 arch) type=Archiving;; 909 arch) type=Archiving;;
785 backup) type=Archiving;; 910 backup) type=Archiving;;
786 cdr) type=DiscBurning;; 911 cdr) type=DiscBurning;;
787 dicts) type=Dictionary;; 912 dicts) type=Dictionary;;
788 doc) type=Documentation;; 913 doc) type=Documentation;;
789 editors) type=TextEditor;; 914 editors) type=TextEditor;;
790 emacs) type=TextEditor;; 915 emacs) type=TextEditor;;
791 emulation) type=Emulator;; 916 emulation) type=Emulator;;
792 laptop) type=HardwareSettings;; 917 laptop) type=HardwareSettings;;
793 office) type=Office;; 918 office) type=Office;;
794 pda) type=PDA;; 919 pda) type=PDA;;
795 vim) type=TextEditor;; 920 vim) type=TextEditor;;
796 xemacs) type=TextEditor;; 921 xemacs) type=TextEditor;;
797 *) type=;;
798 esac 922 esac
799 ;; 923 ;;
800 924
801 dev) 925 dev)
802 type="Development" 926 type="Development"
803 ;; 927 ;;
804 928
805 games) 929 games)
806 case ${catmin} in 930 case ${catmin} in
807 action|fps) type=ActionGame;; 931 action|fps) type=ActionGame;;
808 arcade) type=ArcadeGame;; 932 arcade) type=ArcadeGame;;
809 board) type=BoardGame;; 933 board) type=BoardGame;;
810 emulation) type=Emulator;; 934 emulation) type=Emulator;;
811 kids) type=KidsGame;; 935 kids) type=KidsGame;;
812 puzzle) type=LogicGame;; 936 puzzle) type=LogicGame;;
813 roguelike) type=RolePlaying;; 937 roguelike) type=RolePlaying;;
814 rpg) type=RolePlaying;; 938 rpg) type=RolePlaying;;
815 simulation) type=Simulation;; 939 simulation) type=Simulation;;
816 sports) type=SportsGame;; 940 sports) type=SportsGame;;
817 strategy) type=StrategyGame;; 941 strategy) type=StrategyGame;;
818 *) type=;;
819 esac 942 esac
820 type="Game;${type}" 943 type="Game;${type}"
821 ;; 944 ;;
822 945
823 gnome) 946 gnome)
832 type="Network;Email" 955 type="Network;Email"
833 ;; 956 ;;
834 957
835 media) 958 media)
836 case ${catmin} in 959 case ${catmin} in
960 gfx)
837 gfx) type=Graphics;; 961 type=Graphics
962 ;;
963 *)
964 case ${catmin} in
838 radio) type=Tuner;; 965 radio) type=Tuner;;
839 sound) type=Audio;; 966 sound) type=Audio;;
840 tv) type=TV;; 967 tv) type=TV;;
841 video) type=Video;; 968 video) type=Video;;
842 *) type=;; 969 esac
970 type="AudioVideo;${type}"
971 ;;
843 esac 972 esac
844 type="AudioVideo;${type}"
845 ;; 973 ;;
846 974
847 net) 975 net)
848 case ${catmin} in 976 case ${catmin} in
849 dialup) type=Dialup;; 977 dialup) type=Dialup;;
850 ftp) type=FileTransfer;; 978 ftp) type=FileTransfer;;
851 im) type=InstantMessaging;; 979 im) type=InstantMessaging;;
852 irc) type=IRCClient;; 980 irc) type=IRCClient;;
853 mail) type=Email;; 981 mail) type=Email;;
854 news) type=News;; 982 news) type=News;;
855 nntp) type=News;; 983 nntp) type=News;;
856 p2p) type=FileTransfer;; 984 p2p) type=FileTransfer;;
857 *) type=;; 985 voip) type=Telephony;;
858 esac 986 esac
859 type="Network;${type}" 987 type="Network;${type}"
860 ;; 988 ;;
861 989
862 sci) 990 sci)
863 case ${catmin} in 991 case ${catmin} in
864 astro*) type=Astronomy;; 992 astro*) type=Astronomy;;
865 bio*) type=Biology;; 993 bio*) type=Biology;;
866 calc*) type=Calculator;; 994 calc*) type=Calculator;;
867 chem*) type=Chemistry;; 995 chem*) type=Chemistry;;
868 elec*) type=Electronics;; 996 elec*) type=Electronics;;
869 geo*) type=Geology;; 997 geo*) type=Geology;;
870 math*) type=Math;; 998 math*) type=Math;;
871 physics) type=Physics;; 999 physics) type=Physics;;
872 visual*) type=DataVisualization;; 1000 visual*) type=DataVisualization;;
873 *) type=;;
874 esac 1001 esac
875 type="Science;${type}" 1002 type="Education;Science;${type}"
876 ;; 1003 ;;
877 1004
878 sys) 1005 sys)
879 type="System" 1006 type="System"
880 ;; 1007 ;;
881 1008
882 www) 1009 www)
883 case ${catmin} in 1010 case ${catmin} in
884 client) type=WebBrowser;; 1011 client) type=WebBrowser;;
885 *) type=;;
886 esac 1012 esac
887 type="Network" 1013 type="Network;${type}"
888 ;; 1014 ;;
889 1015
890 *) 1016 *)
891 type= 1017 type=
892 ;; 1018 ;;
898 local desktop_name="${PN}-${SLOT}" 1024 local desktop_name="${PN}-${SLOT}"
899 fi 1025 fi
900 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1026 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
901 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1027 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
902 1028
1029 # Don't append another ";" when a valid category value is provided.
1030 type=${type%;}${type:+;}
1031
1032 eshopts_push -s extglob
1033 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1034 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1035 ewarn "allowed in .desktop files if the value is not an absolute path."
1036 icon=${icon%.@(xpm|png|svg)}
1037 fi
1038 eshopts_pop
1039
903 cat <<-EOF > "${desktop}" 1040 cat <<-EOF > "${desktop}"
904 [Desktop Entry] 1041 [Desktop Entry]
905 Version=1.0
906 Name=${name} 1042 Name=${name}
907 Type=Application 1043 Type=Application
908 Comment=${DESCRIPTION} 1044 Comment=${DESCRIPTION}
909 Exec=${exec} 1045 Exec=${exec}
910 TryExec=${exec%% *} 1046 TryExec=${exec%% *}
911 Icon=${icon} 1047 Icon=${icon}
912 Categories=${type}; 1048 Categories=${type}
913 EOF 1049 EOF
914 1050
915 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1051 if [[ ${fields:-=} != *=* ]] ; then
1052 # 5th arg used to be value to Path=
1053 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1054 fields="Path=${fields}"
1055 fi
1056 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
916 1057
917 ( 1058 (
918 # wrap the env here so that the 'insinto' call 1059 # wrap the env here so that the 'insinto' call
919 # doesn't corrupt the env of the caller 1060 # doesn't corrupt the env of the caller
920 insinto /usr/share/applications 1061 insinto /usr/share/applications
921 doins "${desktop}" 1062 doins "${desktop}"
922 ) 1063 ) || die "installing desktop file failed"
923} 1064}
924 1065
925# @FUNCTION: validate_desktop_entries 1066# @FUNCTION: validate_desktop_entries
926# @USAGE: [directories] 1067# @USAGE: [directories]
927# @MAINTAINER: 1068# @MAINTAINER:
949 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1090 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
950 fi 1091 fi
951} 1092}
952 1093
953# @FUNCTION: make_session_desktop 1094# @FUNCTION: make_session_desktop
954# @USAGE: <title> <command> 1095# @USAGE: <title> <command> [command args...]
955# @DESCRIPTION: 1096# @DESCRIPTION:
956# Make a GDM/KDM Session file. The title is the file to execute to start the 1097# Make a GDM/KDM Session file. The title is the file to execute to start the
957# Window Manager. The command is the name of the Window Manager. 1098# Window Manager. The command is the name of the Window Manager.
1099#
1100# You can set the name of the file via the ${wm} variable.
958make_session_desktop() { 1101make_session_desktop() {
959 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1102 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
960 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1103 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
961 1104
962 local title=$1 1105 local title=$1
963 local command=$2 1106 local command=$2
964 local desktop=${T}/${wm}.desktop 1107 local desktop=${T}/${wm:-${PN}}.desktop
1108 shift 2
965 1109
966 cat <<-EOF > "${desktop}" 1110 cat <<-EOF > "${desktop}"
967 [Desktop Entry] 1111 [Desktop Entry]
968 Name=${title} 1112 Name=${title}
969 Comment=This session logs you into ${title} 1113 Comment=This session logs you into ${title}
970 Exec=${command} 1114 Exec=${command} $*
971 TryExec=${command} 1115 TryExec=${command}
972 Type=Application 1116 Type=XSession
973 EOF 1117 EOF
974 1118
975 ( 1119 (
976 # wrap the env here so that the 'insinto' call 1120 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller 1121 # doesn't corrupt the env of the caller
1203 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1347 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1204 1348
1205 local shrtsrc=$(basename "${src}") 1349 local shrtsrc=$(basename "${src}")
1206 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1350 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1207 if [[ -z ${skip} ]] ; then 1351 if [[ -z ${skip} ]] ; then
1208 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1352 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1209 local skip=0 1353 local skip=0
1210 exe=tail 1354 exe=tail
1211 case ${ver} in 1355 case ${ver} in
1212 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1356 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1213 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1357 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1215 2.0|2.0.1) 1359 2.0|2.0.1)
1216 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1360 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1217 ;; 1361 ;;
1218 2.1.1) 1362 2.1.1)
1219 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1363 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1220 let skip="skip + 1" 1364 (( skip++ ))
1221 ;; 1365 ;;
1222 2.1.2) 1366 2.1.2)
1223 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1367 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1224 let skip="skip + 1" 1368 (( skip++ ))
1225 ;; 1369 ;;
1226 2.1.3) 1370 2.1.3)
1227 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1371 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1228 let skip="skip + 1" 1372 (( skip++ ))
1229 ;; 1373 ;;
1230 2.1.4|2.1.5) 1374 2.1.4|2.1.5)
1231 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1375 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1232 skip=$(head -n ${skip} "${src}" | wc -c) 1376 skip=$(head -n ${skip} "${src}" | wc -c)
1233 exe="dd" 1377 exe="dd"
1242 esac 1386 esac
1243 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1387 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1244 fi 1388 fi
1245 case ${exe} in 1389 case ${exe} in
1246 tail) exe="tail -n +${skip} '${src}'";; 1390 tail) exe="tail -n +${skip} '${src}'";;
1247 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1391 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1248 *) die "makeself cant handle exe '${exe}'" 1392 *) die "makeself cant handle exe '${exe}'"
1249 esac 1393 esac
1250 1394
1251 # lets grab the first few bytes of the file to figure out what kind of archive it is 1395 # lets grab the first few bytes of the file to figure out what kind of archive it is
1252 local tmpfile=$(emktemp) 1396 local tmpfile=$(emktemp)
1289 lic="${PWD}/${lic}" 1433 lic="${PWD}/${lic}"
1290 elif [ -e "${lic}" ] ; then 1434 elif [ -e "${lic}" ] ; then
1291 lic="${lic}" 1435 lic="${lic}"
1292 fi 1436 fi
1293 fi 1437 fi
1294 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1295 local l="`basename ${lic}`" 1438 local l="`basename ${lic}`"
1296 1439
1297 # here is where we check for the licenses the user already 1440 # here is where we check for the licenses the user already
1298 # accepted ... if we don't find a match, we make the user accept 1441 # accepted ... if we don't find a match, we make the user accept
1299 local shopts=$-
1300 local alic 1442 local alic
1301 set -o noglob #so that bash doesn't expand "*" 1443 eshopts_push -o noglob # so that bash doesn't expand "*"
1302 for alic in ${ACCEPT_LICENSE} ; do 1444 for alic in ${ACCEPT_LICENSE} ; do
1303 if [[ ${alic} == ${l} ]]; then 1445 if [[ ${alic} == ${l} ]]; then
1304 set +o noglob; set -${shopts} #reset old shell opts 1446 eshopts_pop
1305 return 0 1447 return 0
1306 fi 1448 fi
1307 done 1449 done
1308 set +o noglob; set -$shopts #reset old shell opts 1450 eshopts_pop
1451 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1309 1452
1310 local licmsg=$(emktemp) 1453 local licmsg=$(emktemp)
1311 cat <<-EOF > ${licmsg} 1454 cat <<-EOF > ${licmsg}
1312 ********************************************************** 1455 **********************************************************
1313 The following license outlines the terms of use of this 1456 The following license outlines the terms of use of this
1386 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1529 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1387 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1530 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1388 export CDROM_SET=-1 1531 export CDROM_SET=-1
1389 for f in ${CDROM_CHECK_1//:/ } ; do 1532 for f in ${CDROM_CHECK_1//:/ } ; do
1390 ((++CDROM_SET)) 1533 ((++CDROM_SET))
1391 [[ -e ${CD_ROOT}/${f} ]] && break 1534 [[ -e ${CDROM_ROOT}/${f} ]] && break
1392 done 1535 done
1393 export CDROM_MATCH=${f} 1536 export CDROM_MATCH=${f}
1394 return 1537 return
1395 fi 1538 fi
1396 1539
1560# of the lists. 1703# of the lists.
1561strip-linguas() { 1704strip-linguas() {
1562 local ls newls nols 1705 local ls newls nols
1563 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1706 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1564 local op=$1; shift 1707 local op=$1; shift
1565 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1708 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1566 local d f 1709 local d f
1567 for d in "$@" ; do 1710 for d in "$@" ; do
1568 if [[ ${op} == "-u" ]] ; then 1711 if [[ ${op} == "-u" ]] ; then
1569 newls=${ls} 1712 newls=${ls}
1570 else 1713 else
1571 newls="" 1714 newls=""
1572 fi 1715 fi
1573 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1716 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1574 if [[ ${op} == "-i" ]] ; then 1717 if [[ ${op} == "-i" ]] ; then
1575 hasq ${f} ${ls} && newls="${newls} ${f}" 1718 hasq ${f} ${ls} && newls="${newls} ${f}"
1576 else 1719 else
1577 hasq ${f} ${ls} || newls="${newls} ${f}" 1720 hasq ${f} ${ls} || newls="${newls} ${f}"
1578 fi 1721 fi
1591 else 1734 else
1592 nols="${nols} ${f}" 1735 nols="${nols} ${f}"
1593 fi 1736 fi
1594 done 1737 done
1595 [[ -n ${nols} ]] \ 1738 [[ -n ${nols} ]] \
1596 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1739 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1597 export LINGUAS=${newls:1} 1740 export LINGUAS=${newls:1}
1598} 1741}
1599 1742
1600# @FUNCTION: preserve_old_lib 1743# @FUNCTION: preserve_old_lib
1601# @USAGE: <libs to preserve> [more libs] 1744# @USAGE: <libs to preserve> [more libs]
1649 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1792 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1650 ewarn "in order to remove these old dependencies. If you do not have this" 1793 ewarn "in order to remove these old dependencies. If you do not have this"
1651 ewarn "helper program, simply emerge the 'gentoolkit' package." 1794 ewarn "helper program, simply emerge the 'gentoolkit' package."
1652 ewarn 1795 ewarn
1653 fi 1796 fi
1654 ewarn " # revdep-rebuild --library ${lib##*/}" 1797 ewarn " # revdep-rebuild --library '${lib}'"
1655 done 1798 done
1656 if [[ ${notice} -eq 1 ]] ; then 1799 if [[ ${notice} -eq 1 ]] ; then
1657 ewarn 1800 ewarn
1658 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1801 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1659 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1802 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1664} 1807}
1665 1808
1666# @FUNCTION: built_with_use 1809# @FUNCTION: built_with_use
1667# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1810# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1668# @DESCRIPTION: 1811# @DESCRIPTION:
1812#
1813# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1814#
1669# A temporary hack until portage properly supports DEPENDing on USE 1815# A temporary hack until portage properly supports DEPENDing on USE
1670# flags being enabled in packages. This will check to see if the specified 1816# flags being enabled in packages. This will check to see if the specified
1671# DEPEND atom was built with the specified list of USE flags. The 1817# DEPEND atom was built with the specified list of USE flags. The
1672# --missing option controls the behavior if called on a package that does 1818# --missing option controls the behavior if called on a package that does
1673# not actually support the defined USE flags (aka listed in IUSE). 1819# not actually support the defined USE flags (aka listed in IUSE).
1801 ) || die 1947 ) || die
1802 else 1948 else
1803 newbin "${tmpwrapper}" "${wrapper}" || die 1949 newbin "${tmpwrapper}" "${wrapper}" || die
1804 fi 1950 fi
1805} 1951}
1952
1953# @FUNCTION: path_exists
1954# @USAGE: [-a|-o] <paths>
1955# @DESCRIPTION:
1956# Check if the specified paths exist. Works for all types of paths
1957# (files/dirs/etc...). The -a and -o flags control the requirements
1958# of the paths. They correspond to "and" and "or" logic. So the -a
1959# flag means all the paths must exist while the -o flag means at least
1960# one of the paths must exist. The default behavior is "and". If no
1961# paths are specified, then the return value is "false".
1962path_exists() {
1963 local opt=$1
1964 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1965
1966 # no paths -> return false
1967 # same behavior as: [[ -e "" ]]
1968 [[ $# -eq 0 ]] && return 1
1969
1970 local p r=0
1971 for p in "$@" ; do
1972 [[ -e ${p} ]]
1973 : $(( r += $? ))
1974 done
1975
1976 case ${opt} in
1977 -a) return $(( r != 0 )) ;;
1978 -o) return $(( r == $# )) ;;
1979 esac
1980}

Legend:
Removed from v.1.305  
changed lines
  Added in v.1.354

  ViewVC Help
Powered by ViewVC 1.1.20