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

Diff of /eclass/eutils.eclass

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

Revision 1.297 Revision 1.363
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.297 2008/02/15 07:43:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
52# Default directory where patches are located 54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
70# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
71# profile.
72if ! declare -F eqawarn >/dev/null ; then
73 eqawarn() {
74 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
75 }
76fi
77
78# @FUNCTION: ecvs_clean
79# @USAGE: [list of dirs]
80# @DESCRIPTION:
81# Remove CVS directories recursiveley. Useful when a source tarball contains
82# internal CVS directories. Defaults to $PWD.
83ecvs_clean() {
84 [[ -z $* ]] && set -- .
85 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
86 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
87}
88
89# @FUNCTION: esvn_clean
90# @USAGE: [list of dirs]
91# @DESCRIPTION:
92# Remove .svn directories recursiveley. Useful when a source tarball contains
93# internal Subversion directories. Defaults to $PWD.
94esvn_clean() {
95 [[ -z $* ]] && set -- .
96 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
97}
98
99# @FUNCTION: eshopts_push
100# @USAGE: [options to `set` or `shopt`]
101# @DESCRIPTION:
102# Often times code will want to enable a shell option to change code behavior.
103# Since changing shell options can easily break other pieces of code (which
104# assume the default state), eshopts_push is used to (1) push the current shell
105# options onto a stack and (2) pass the specified arguments to set.
106#
107# If the first argument is '-s' or '-u', we assume you want to call `shopt`
108# rather than `set` as there are some options only available via that.
109#
110# A common example is to disable shell globbing so that special meaning/care
111# may be used with variables/arguments to custom functions. That would be:
112# @CODE
113# eshopts_push -o noglob
114# for x in ${foo} ; do
115# if ...some check... ; then
116# eshopts_pop
117# return 0
118# fi
119# done
120# eshopts_pop
121# @CODE
122eshopts_push() {
123 # have to assume __ESHOPTS_SAVE__ isn't screwed with
124 # as a `declare -a` here will reset its value
125 local i=${#__ESHOPTS_SAVE__[@]}
126 if [[ $1 == -[su] ]] ; then
127 __ESHOPTS_SAVE__[$i]=$(shopt -p)
128 [[ $# -eq 0 ]] && return 0
129 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
130 else
131 __ESHOPTS_SAVE__[$i]=$-
132 [[ $# -eq 0 ]] && return 0
133 set "$@" || die "eshopts_push: bad options to set: $*"
134 fi
135}
136
137# @FUNCTION: eshopts_pop
138# @USAGE:
139# @DESCRIPTION:
140# Restore the shell options to the state saved with the corresponding
141# eshopts_push call. See that function for more details.
142eshopts_pop() {
143 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
144 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
145 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
146 local s=${__ESHOPTS_SAVE__[$i]}
147 unset __ESHOPTS_SAVE__[$i]
148 if [[ ${s} == "shopt -"* ]] ; then
149 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
150 else
151 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
152 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
153 fi
154}
155
156# @VARIABLE: EPATCH_SOURCE
157# @DESCRIPTION:
158# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 159EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 160# @VARIABLE: EPATCH_SUFFIX
161# @DESCRIPTION:
162# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 163EPATCH_SUFFIX="patch.bz2"
164# @VARIABLE: EPATCH_OPTS
165# @DESCRIPTION:
56# Default options for patch 166# Default options for patch:
167# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 168# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 169# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 170# -E - automatically remove empty files
171# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 172EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
173# @VARIABLE: EPATCH_EXCLUDE
174# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 175# List of patches not to apply. Note this is only file names,
62# and not the full path .. 176# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 177EPATCH_EXCLUDE=""
178# @VARIABLE: EPATCH_SINGLE_MSG
179# @DESCRIPTION:
64# Change the printed message for a single patch. 180# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 181EPATCH_SINGLE_MSG=""
182# @VARIABLE: EPATCH_MULTI_MSG
183# @DESCRIPTION:
66# Change the printed message for multiple patches. 184# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 185EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 186# @VARIABLE: EPATCH_FORCE
69# 187# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 188# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 189# arch naming style.
72EPATCH_FORCE="no" 190EPATCH_FORCE="no"
73 191
74# This function is for bulk patching, or in theory for just one 192# @FUNCTION: epatch
75# or two patches. 193# @USAGE: [patches] [dirs of patches]
194# @DESCRIPTION:
195# epatch is designed to greatly simplify the application of patches. It can
196# process patch files directly, or directories of patches. The patches may be
197# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
198# the -p option as epatch will automatically attempt -p0 to -p5 until things
199# apply successfully.
76# 200#
77# It should work with .bz2, .gz, .zip and plain text patches. 201# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 202# specified by EPATCH_SOURCE.
79# 203#
80# You do not have to specify '-p' option to patch, as it will 204# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 205# @CODE
82# 206# if ${EPATCH_FORCE} != "yes"
83# Above EPATCH_* variables can be used to control various defaults,
84# bug they should be left as is to ensure an ebuild can rely on
85# them for.
86#
87# Patches are applied in current directory.
88#
89# Bulk Patches should preferibly have the form of:
90#
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
208# else
209# *.${EPATCH_SUFFIX}
210# @CODE
211# The leading ?? are typically numbers used to force consistent patch ordering.
212# The arch field is used to apply patches only for the host architecture with
213# the special value of "all" means apply for everyone. Note that using values
214# other than "all" is highly discouraged -- you should apply patches all the
215# time and let architecture details be detected at configure/compile time.
92# 216#
93# For example: 217# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
218# for patches to apply.
94# 219#
95# 01_all_misc-fix.patch.bz2 220# Refer to the other EPATCH_xxx variables for more customization of behavior.
96# 02_sparc_another-fix.patch.bz2
97#
98# This ensures that there are a set order, and you can have ARCH
99# specific patches.
100#
101# If you however give an argument to epatch(), it will treat it as a
102# single patch that need to be applied if its a file. If on the other
103# hand its a directory, it will set EPATCH_SOURCE to this.
104#
105# <azarah@gentoo.org> (10 Nov 2002)
106#
107epatch() { 221epatch() {
108 _epatch_draw_line() { 222 _epatch_draw_line() {
223 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 224 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 225 echo "${1//?/=}"
111 } 226 }
112 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
113 local PIPE_CMD=""
114 local STDERR_TARGET="${T}/$$.out"
115 local PATCH_TARGET="${T}/$$.patch"
116 local PATCH_SUFFIX=""
117 local SINGLE_PATCH="no"
118 local x=""
119 227
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 228 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 229
122 if [ "$#" -gt 1 ] 230 # Let the rest of the code process one user arg at a time --
123 then 231 # each arg may expand into multiple patches, and each arg may
232 # need to start off with the default global EPATCH_xxx values
233 if [[ $# -gt 1 ]] ; then
124 local m="" 234 local m
125 for m in "$@" ; do 235 for m in "$@" ; do
126 epatch "${m}" 236 epatch "${m}"
127 done 237 done
128 return 0 238 return 0
129 fi 239 fi
130 240
131 if [ -n "$1" -a -f "$1" ] 241 local SINGLE_PATCH="no"
132 then 242 # no args means process ${EPATCH_SOURCE}
243 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
244
245 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 246 SINGLE_PATCH="yes"
134 247 set -- "$1"
135 local EPATCH_SOURCE="$1" 248 # Use the suffix from the single patch (localize it); the code
249 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 250 local EPATCH_SUFFIX=$1
137 251
138 elif [ -n "$1" -a -d "$1" ] 252 elif [[ -d $1 ]] ; then
139 then 253 # Some people like to make dirs of patches w/out suffixes (vim)
140 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 254 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 255
256 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
257 # Re-use EPATCH_SOURCE as a search dir
258 epatch "${EPATCH_SOURCE}/$1"
259 return $?
260
261 else
262 # sanity check ... if it isn't a dir or file, wtf man ?
263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
264 echo
265 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
266 eerror
267 eerror " ${EPATCH_SOURCE}"
268 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo
270 die "Cannot find \$EPATCH_SOURCE!"
271 fi
272
273 local PIPE_CMD
274 case ${EPATCH_SUFFIX##*\.} in
275 xz) PIPE_CMD="xz -dc" ;;
276 lzma) PIPE_CMD="lzma -dc" ;;
277 bz2) PIPE_CMD="bzip2 -dc" ;;
278 gz|Z|z) PIPE_CMD="gzip -dc" ;;
279 ZIP|zip) PIPE_CMD="unzip -p" ;;
280 *) ;;
281 esac
282
283 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
284
285 local x
286 for x in "$@" ; do
287 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
288 # didn't match anything, ignore continue on
289 [[ ! -f ${x} ]] && continue
290
291 local patchname=${x##*/}
292
293 # Apply single patches, or forced sets of patches, or
294 # patches with ARCH dependant names.
295 # ???_arch_foo.patch
296 # Else, skip this input altogether
297 local a=${patchname#*_} # strip the ???_
298 a=${a%%_*} # strip the _foo.patch
299 if ! [[ ${SINGLE_PATCH} == "yes" || \
300 ${EPATCH_FORCE} == "yes" || \
301 ${a} == all || \
302 ${a} == ${ARCH} ]]
142 then 303 then
143 local EPATCH_SOURCE="$1/*" 304 continue
305 fi
306
307 # Let people filter things dynamically
308 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
309 # let people use globs in the exclude
310 eshopts_push -o noglob
311
312 local ex
313 for ex in ${EPATCH_EXCLUDE} ; do
314 if [[ ${patchname} == ${ex} ]] ; then
315 eshopts_pop
316 continue 2
317 fi
318 done
319
320 eshopts_pop
321 fi
322
323 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
324 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
325 einfo "${EPATCH_SINGLE_MSG}"
326 else
327 einfo "Applying ${patchname} ..."
328 fi
144 else 329 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 330 einfo " ${patchname} ..."
146 fi 331 fi
147 else 332
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 333 # most of the time, there will only be one run per unique name,
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 334 # but if there are more, make sure we get unique log filenames
150 then 335 local STDERR_TARGET="${T}/${patchname}.out"
151 EPATCH_SOURCE="$1" 336 if [[ -e ${STDERR_TARGET} ]] ; then
337 STDERR_TARGET="${T}/${patchname}-$$.out"
338 fi
339
340 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
341
342 # Decompress the patch if need be
343 local count=0
344 local PATCH_TARGET
345 if [[ -n ${PIPE_CMD} ]] ; then
346 PATCH_TARGET="${T}/$$.patch"
347 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
348
349 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
350 echo
351 eerror "Could not extract patch!"
352 #die "Could not extract patch!"
353 count=5
354 break
152 fi 355 fi
356 else
357 PATCH_TARGET=${x}
358 fi
153 359
360 # Check for absolute paths in patches. If sandbox is disabled,
361 # people could (accidently) patch files in the root filesystem.
362 # Or trigger other unpleasantries #237667. So disallow -p0 on
363 # such patches.
364 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
365 if [[ -n ${abs_paths} ]] ; then
366 count=1
367 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
368 fi
369 # Similar reason, but with relative paths.
370 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
371 if [[ -n ${rel_paths} ]] ; then
372 eqawarn "QA Notice: Your patch uses relative paths '../'."
373 eqawarn " In the future this will cause a failure."
374 eqawarn "${rel_paths}"
375 fi
376
377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
378 while [[ ${count} -lt 5 ]] ; do
379 # Generate some useful debug info ...
380 (
381 _epatch_draw_line "***** ${patchname} *****"
154 echo 382 echo
155 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
384 echo
385 _epatch_draw_line "***** ${patchname} *****"
386 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
387 ret=$?
388 echo
389 echo "patch program exited with status ${ret}"
390 exit ${ret}
391 ) >> "${STDERR_TARGET}"
392
393 if [ $? -eq 0 ] ; then
394 (
395 _epatch_draw_line "***** ${patchname} *****"
396 echo
397 echo "ACTUALLY APPLYING ${patchname} ..."
398 echo
399 _epatch_draw_line "***** ${patchname} *****"
400 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
401 ret=$?
402 echo
403 echo "patch program exited with status ${ret}"
404 exit ${ret}
405 ) >> "${STDERR_TARGET}"
406
407 if [ $? -ne 0 ] ; then
408 echo
409 eerror "A dry-run of patch command succeeded, but actually"
410 eerror "applying the patch failed!"
411 #die "Real world sux compared to the dreamworld!"
412 count=5
413 fi
414 break
415 fi
416
417 : $(( count++ ))
418 done
419
420 # if we had to decompress the patch, delete the temp one
421 if [[ -n ${PIPE_CMD} ]] ; then
422 rm -f "${PATCH_TARGET}"
423 fi
424
425 if [[ ${count} -ge 5 ]] ; then
426 echo
427 eerror "Failed Patch: ${patchname} !"
428 eerror " ( ${PATCH_TARGET} )"
156 eerror 429 eerror
157 eerror " ${EPATCH_SOURCE}" 430 eerror "Include in your bugreport the contents of:"
158 eerror " ( ${EPATCH_SOURCE##*/} )" 431 eerror
432 eerror " ${STDERR_TARGET}"
159 echo 433 echo
160 die "Cannot find \$EPATCH_SOURCE!"
161 fi
162
163 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
164 fi
165
166 case ${EPATCH_SUFFIX##*\.} in
167 bz2)
168 PIPE_CMD="bzip2 -dc"
169 PATCH_SUFFIX="bz2"
170 ;;
171 gz|Z|z)
172 PIPE_CMD="gzip -dc"
173 PATCH_SUFFIX="gz"
174 ;;
175 ZIP|zip)
176 PIPE_CMD="unzip -p"
177 PATCH_SUFFIX="zip"
178 ;;
179 *)
180 PIPE_CMD="cat"
181 PATCH_SUFFIX="patch"
182 ;;
183 esac
184
185 if [ "${SINGLE_PATCH}" = "no" ]
186 then
187 einfo "${EPATCH_MULTI_MSG}"
188 fi
189 for x in ${EPATCH_SOURCE}
190 do
191 # New ARCH dependant patch naming scheme ...
192 #
193 # ???_arch_foo.patch
194 #
195 if [ -f ${x} ] && \
196 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
197 [ "${EPATCH_FORCE}" = "yes" ])
198 then
199 local count=0
200 local popts="${EPATCH_OPTS}"
201 local patchname=${x##*/}
202
203 if [ -n "${EPATCH_EXCLUDE}" ]
204 then
205 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
206 then
207 continue
208 fi
209 fi
210
211 if [ "${SINGLE_PATCH}" = "yes" ]
212 then
213 if [ -n "${EPATCH_SINGLE_MSG}" ]
214 then
215 einfo "${EPATCH_SINGLE_MSG}"
216 else
217 einfo "Applying ${patchname} ..."
218 fi
219 else
220 einfo " ${patchname} ..."
221 fi
222
223 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
224 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225
226 # Allow for prefix to differ ... im lazy, so shoot me :/
227 while [ "${count}" -lt 5 ]
228 do
229 # Generate some useful debug info ...
230 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
231 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232
233 if [ "${PATCH_SUFFIX}" != "patch" ]
234 then
235 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
236 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 else
238 PATCH_TARGET="${x}"
239 fi
240
241 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
242 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243
244 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246
247 if [ "${PATCH_SUFFIX}" != "patch" ]
248 then
249 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
250 then
251 echo
252 eerror "Could not extract patch!"
253 #die "Could not extract patch!"
254 count=5
255 break
256 fi
257 fi
258
259 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
260 then
261 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266
267 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
268 _epatch_assert
269
270 if [ "$?" -ne 0 ]
271 then
272 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo
274 eerror "A dry-run of patch command succeeded, but actually"
275 eerror "applying the patch failed!"
276 #die "Real world sux compared to the dreamworld!"
277 count=5
278 fi
279
280 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
281
282 break
283 fi
284
285 count=$((count + 1))
286 done
287
288 if [ "${PATCH_SUFFIX}" != "patch" ]
289 then
290 rm -f ${PATCH_TARGET}
291 fi
292
293 if [ "${count}" -eq 5 ]
294 then
295 echo
296 eerror "Failed Patch: ${patchname} !"
297 eerror " ( ${PATCH_TARGET} )"
298 eerror
299 eerror "Include in your bugreport the contents of:"
300 eerror
301 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
302 echo
303 die "Failed Patch: ${patchname}!" 434 die "Failed Patch: ${patchname}!"
304 fi 435 fi
305 436
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 437 # if everything worked, delete the patch log
307 438 rm -f "${STDERR_TARGET}"
308 eend 0 439 eend 0
309 fi
310 done 440 done
311 if [ "${SINGLE_PATCH}" = "no" ] 441
312 then 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 einfo "Done with patching" 443 : # everything worked
444}
445
446# @FUNCTION: epatch_user
447# @USAGE:
448# @DESCRIPTION:
449# Applies user-provided patches to the source tree. The patches are
450# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
451# of these three directories to exist will be the one to use, ignoring
452# any more general directories which might exist as well.
453#
454# User patches are intended for quick testing of patches without ebuild
455# modifications, as well as for permanent customizations a user might
456# desire. Obviously, there can be no official support for arbitrarily
457# patched ebuilds. So whenever a build log in a bug report mentions that
458# user patches were applied, the user should be asked to reproduce the
459# problem without these.
460#
461# Not all ebuilds do call this function, so placing patches in the
462# stated directory might or might not work, depending on the package and
463# the eclasses it inherits and uses. It is safe to call the function
464# repeatedly, so it is always possible to add a call at the ebuild
465# level. The first call is the time when the patches will be
466# applied.
467#
468# Ideally, this function should be called after gentoo-specific patches
469# have been applied, so that their code can be modified as well, but
470# before calls to e.g. eautoreconf, as the user patches might affect
471# autotool input files as well.
472epatch_user() {
473 [[ $# -ne 0 ]] && die "epatch_user takes no options"
474
475 # Allow multiple calls to this function; ignore all but the first
476 local applied="${T}/epatch_user.applied"
477 [[ -e ${applied} ]] && return 2
478
479 # don't clobber any EPATCH vars that the parent might want
480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
483 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
484 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
485 if [[ -d ${EPATCH_SOURCE} ]] ; then
486 EPATCH_SOURCE=${EPATCH_SOURCE} \
487 EPATCH_SUFFIX="patch" \
488 EPATCH_FORCE="yes" \
489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
490 epatch
491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
314 fi 493 fi
494 done
495 echo "none" > "${applied}"
496 return 1
315} 497}
316 498
317# @FUNCTION: emktemp 499# @FUNCTION: emktemp
318# @USAGE: [temp dir] 500# @USAGE: [temp dir]
319# @DESCRIPTION: 501# @DESCRIPTION:
355# base-system@gentoo.org (Linux) 537# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 538# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 539# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 540# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 541# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 542# Small wrapper for getent (Linux),
543# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 544# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 545egetent() {
363 case ${CHOST} in 546 case ${CHOST} in
364 *-darwin*) 547 *-darwin[678])
365 case "$2" in 548 case "$2" in
366 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
368 ;; 551 ;;
369 *) # Numeric 552 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
554 ;;
555 esac
556 ;;
557 *-darwin*)
558 local mytype=$1
559 [[ "passwd" == $mytype ]] && mytype="Users"
560 [[ "group" == $mytype ]] && mytype="Groups"
561 case "$2" in
562 *[!0-9]*) # Non numeric
563 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
564 ;;
565 *) # Numeric
566 local mykey="UniqueID"
567 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
568 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 569 ;;
372 esac 570 esac
373 ;; 571 ;;
374 *-freebsd*|*-dragonfly*) 572 *-freebsd*|*-dragonfly*)
375 local opts action="user" 573 local opts action="user"
575 fi 773 fi
576 ;; 774 ;;
577 775
578 *) 776 *)
579 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 778 useradd -r ${opts} \
581 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
780 ${euser} \
582 || die "enewuser failed" 781 || die "enewuser failed"
583 else 782 else
584 einfo " - Extra: $@" 783 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 784 useradd -r ${opts} "$@" \
785 ${euser} \
586 || die "enewuser failed" 786 || die "enewuser failed"
587 fi 787 fi
588 ;; 788 ;;
589 esac 789 esac
590 790
702 esac 902 esac
703 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
704 ;; 904 ;;
705 905
706 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
707 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
708 ;; 909 ;;
709 esac 910 esac
710 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
711} 912}
712 913
723 924
724# Make a desktop file ! 925# Make a desktop file !
725# Great for making those icons in kde/gnome startmenu ! 926# Great for making those icons in kde/gnome startmenu !
726# Amaze your friends ! Get the women ! Join today ! 927# Amaze your friends ! Get the women ! Join today !
727# 928#
728# make_desktop_entry(<command>, [name], [icon], [type], [path]) 929# make_desktop_entry(<command>, [name], [icon], [type], [fields])
729# 930#
730# binary: what command does the app run with ? 931# binary: what command does the app run with ?
731# name: the name that will show up in the menu 932# name: the name that will show up in the menu
732# icon: give your little like a pretty little icon ... 933# icon: give your little like a pretty little icon ...
733# this can be relative (to /usr/share/pixmaps) or 934# this can be relative (to /usr/share/pixmaps) or
734# a full path to an icon 935# a full path to an icon
735# type: what kind of application is this ? for categories: 936# type: what kind of application is this ? for categories:
736# http://standards.freedesktop.org/menu-spec/latest/apa.html 937# http://standards.freedesktop.org/menu-spec/latest/apa.html
737# path: if your app needs to startup in a specific dir 938# fields: extra fields to append to the desktop file; a printf string
738make_desktop_entry() { 939make_desktop_entry() {
739 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 940 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
740 941
741 local exec=${1} 942 local exec=${1}
742 local name=${2:-${PN}} 943 local name=${2:-${PN}}
743 local icon=${3:-${PN}} 944 local icon=${3:-${PN}}
744 local type=${4} 945 local type=${4}
745 local path=${5} 946 local fields=${5}
746 947
747 if [[ -z ${type} ]] ; then 948 if [[ -z ${type} ]] ; then
748 local catmaj=${CATEGORY%%-*} 949 local catmaj=${CATEGORY%%-*}
749 local catmin=${CATEGORY##*-} 950 local catmin=${CATEGORY##*-}
750 case ${catmaj} in 951 case ${catmaj} in
751 app) 952 app)
752 case ${catmin} in 953 case ${catmin} in
753 accessibility) type=Accessibility;; 954 accessibility) type=Accessibility;;
754 admin) type=System;; 955 admin) type=System;;
755 antivirus) type=System;; 956 antivirus) type=System;;
756 arch) type=Archiving;; 957 arch) type=Archiving;;
757 backup) type=Archiving;; 958 backup) type=Archiving;;
758 cdr) type=DiscBurning;; 959 cdr) type=DiscBurning;;
759 dicts) type=Dictionary;; 960 dicts) type=Dictionary;;
760 doc) type=Documentation;; 961 doc) type=Documentation;;
761 editors) type=TextEditor;; 962 editors) type=TextEditor;;
762 emacs) type=TextEditor;; 963 emacs) type=TextEditor;;
763 emulation) type=Emulator;; 964 emulation) type=Emulator;;
764 laptop) type=HardwareSettings;; 965 laptop) type=HardwareSettings;;
765 office) type=Office;; 966 office) type=Office;;
766 pda) type=PDA;; 967 pda) type=PDA;;
767 vim) type=TextEditor;; 968 vim) type=TextEditor;;
768 xemacs) type=TextEditor;; 969 xemacs) type=TextEditor;;
769 *) type=;;
770 esac 970 esac
771 ;; 971 ;;
772 972
773 dev) 973 dev)
774 type="Development" 974 type="Development"
775 ;; 975 ;;
776 976
777 games) 977 games)
778 case ${catmin} in 978 case ${catmin} in
779 action|fps) type=ActionGame;; 979 action|fps) type=ActionGame;;
780 arcade) type=ArcadeGame;; 980 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 981 board) type=BoardGame;;
782 emulation) type=Emulator;; 982 emulation) type=Emulator;;
783 kids) type=KidsGame;; 983 kids) type=KidsGame;;
784 puzzle) type=LogicGame;; 984 puzzle) type=LogicGame;;
785 roguelike) type=RolePlaying;; 985 roguelike) type=RolePlaying;;
786 rpg) type=RolePlaying;; 986 rpg) type=RolePlaying;;
787 simulation) type=Simulation;; 987 simulation) type=Simulation;;
788 sports) type=SportsGame;; 988 sports) type=SportsGame;;
789 strategy) type=StrategyGame;; 989 strategy) type=StrategyGame;;
790 *) type=;;
791 esac 990 esac
792 type="Game;${type}" 991 type="Game;${type}"
793 ;; 992 ;;
794 993
795 gnome) 994 gnome)
804 type="Network;Email" 1003 type="Network;Email"
805 ;; 1004 ;;
806 1005
807 media) 1006 media)
808 case ${catmin} in 1007 case ${catmin} in
1008 gfx)
809 gfx) type=Graphics;; 1009 type=Graphics
1010 ;;
1011 *)
1012 case ${catmin} in
810 radio) type=Tuner;; 1013 radio) type=Tuner;;
811 sound) type=Audio;; 1014 sound) type=Audio;;
812 tv) type=TV;; 1015 tv) type=TV;;
813 video) type=Video;; 1016 video) type=Video;;
814 *) type=;; 1017 esac
1018 type="AudioVideo;${type}"
1019 ;;
815 esac 1020 esac
816 type="AudioVideo;${type}"
817 ;; 1021 ;;
818 1022
819 net) 1023 net)
820 case ${catmin} in 1024 case ${catmin} in
821 dialup) type=Dialup;; 1025 dialup) type=Dialup;;
822 ftp) type=FileTransfer;; 1026 ftp) type=FileTransfer;;
823 im) type=InstantMessaging;; 1027 im) type=InstantMessaging;;
824 irc) type=IRCClient;; 1028 irc) type=IRCClient;;
825 mail) type=Email;; 1029 mail) type=Email;;
826 news) type=News;; 1030 news) type=News;;
827 nntp) type=News;; 1031 nntp) type=News;;
828 p2p) type=FileTransfer;; 1032 p2p) type=FileTransfer;;
829 *) type=;; 1033 voip) type=Telephony;;
830 esac 1034 esac
831 type="Network;${type}" 1035 type="Network;${type}"
832 ;; 1036 ;;
833 1037
834 sci) 1038 sci)
835 case ${catmin} in 1039 case ${catmin} in
836 astro*) type=Astronomy;; 1040 astro*) type=Astronomy;;
837 bio*) type=Biology;; 1041 bio*) type=Biology;;
838 calc*) type=Calculator;; 1042 calc*) type=Calculator;;
839 chem*) type=Chemistry;; 1043 chem*) type=Chemistry;;
840 elec*) type=Electronics;; 1044 elec*) type=Electronics;;
841 geo*) type=Geology;; 1045 geo*) type=Geology;;
842 math*) type=Math;; 1046 math*) type=Math;;
843 physics) type=Physics;; 1047 physics) type=Physics;;
844 visual*) type=DataVisualization;; 1048 visual*) type=DataVisualization;;
845 *) type=;;
846 esac 1049 esac
847 type="Science;${type}" 1050 type="Education;Science;${type}"
848 ;; 1051 ;;
849 1052
850 sys) 1053 sys)
851 type="System" 1054 type="System"
852 ;; 1055 ;;
853 1056
854 www) 1057 www)
855 case ${catmin} in 1058 case ${catmin} in
856 client) type=WebBrowser;; 1059 client) type=WebBrowser;;
857 *) type=;;
858 esac 1060 esac
859 type="Network" 1061 type="Network;${type}"
860 ;; 1062 ;;
861 1063
862 *) 1064 *)
863 type= 1065 type=
864 ;; 1066 ;;
870 local desktop_name="${PN}-${SLOT}" 1072 local desktop_name="${PN}-${SLOT}"
871 fi 1073 fi
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1074 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1075 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 1076
1077 # Don't append another ";" when a valid category value is provided.
1078 type=${type%;}${type:+;}
1079
1080 eshopts_push -s extglob
1081 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1082 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1083 ewarn "allowed in .desktop files if the value is not an absolute path."
1084 icon=${icon%.@(xpm|png|svg)}
1085 fi
1086 eshopts_pop
1087
875 cat <<-EOF > "${desktop}" 1088 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 1089 [Desktop Entry]
877 Version=1.0
878 Name=${name} 1090 Name=${name}
879 Type=Application 1091 Type=Application
880 Comment=${DESCRIPTION} 1092 Comment=${DESCRIPTION}
881 Exec=${exec} 1093 Exec=${exec}
882 TryExec=${exec%% *} 1094 TryExec=${exec%% *}
883 Icon=${icon} 1095 Icon=${icon}
884 Categories=${type}; 1096 Categories=${type}
885 EOF 1097 EOF
886 1098
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1099 if [[ ${fields:-=} != *=* ]] ; then
1100 # 5th arg used to be value to Path=
1101 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1102 fields="Path=${fields}"
1103 fi
1104 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
888 1105
889 ( 1106 (
890 # wrap the env here so that the 'insinto' call 1107 # wrap the env here so that the 'insinto' call
891 # doesn't corrupt the env of the caller 1108 # doesn't corrupt the env of the caller
892 insinto /usr/share/applications 1109 insinto /usr/share/applications
893 doins "${desktop}" 1110 doins "${desktop}"
894 ) 1111 ) || die "installing desktop file failed"
895} 1112}
896 1113
897# @FUNCTION: validate_desktop_entries 1114# @FUNCTION: validate_desktop_entries
898# @USAGE: [directories] 1115# @USAGE: [directories]
899# @MAINTAINER: 1116# @MAINTAINER:
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1138 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1139 fi
923} 1140}
924 1141
925# @FUNCTION: make_session_desktop 1142# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1143# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1144# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1145# Make a GDM/KDM Session file. The title is the file to execute to start the
929# Window Manager. The command is the name of the Window Manager. 1146# Window Manager. The command is the name of the Window Manager.
1147#
1148# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1149make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1150 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
932 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1151 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1152
934 local title=$1 1153 local title=$1
935 local command=$2 1154 local command=$2
936 local desktop=${T}/${wm}.desktop 1155 local desktop=${T}/${wm:-${PN}}.desktop
1156 shift 2
937 1157
938 cat <<-EOF > "${desktop}" 1158 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1159 [Desktop Entry]
940 Name=${title} 1160 Name=${title}
941 Comment=This session logs you into ${title} 1161 Comment=This session logs you into ${title}
942 Exec=${command} 1162 Exec=${command} $*
943 TryExec=${command} 1163 TryExec=${command}
944 Type=Application 1164 Type=XSession
945 EOF 1165 EOF
946 1166
947 ( 1167 (
948 # wrap the env here so that the 'insinto' call 1168 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1169 # doesn't corrupt the env of the caller
1175 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1395 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1176 1396
1177 local shrtsrc=$(basename "${src}") 1397 local shrtsrc=$(basename "${src}")
1178 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1398 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1179 if [[ -z ${skip} ]] ; then 1399 if [[ -z ${skip} ]] ; then
1180 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1400 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1401 local skip=0
1182 exe=tail 1402 exe=tail
1183 case ${ver} in 1403 case ${ver} in
1184 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1404 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1185 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1405 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1187 2.0|2.0.1) 1407 2.0|2.0.1)
1188 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1408 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1189 ;; 1409 ;;
1190 2.1.1) 1410 2.1.1)
1191 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1411 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1192 let skip="skip + 1" 1412 (( skip++ ))
1193 ;; 1413 ;;
1194 2.1.2) 1414 2.1.2)
1195 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1415 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1196 let skip="skip + 1" 1416 (( skip++ ))
1197 ;; 1417 ;;
1198 2.1.3) 1418 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1419 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1420 (( skip++ ))
1201 ;; 1421 ;;
1202 2.1.4|2.1.5) 1422 2.1.4|2.1.5)
1203 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1423 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1424 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1425 exe="dd"
1214 esac 1434 esac
1215 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1435 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1216 fi 1436 fi
1217 case ${exe} in 1437 case ${exe} in
1218 tail) exe="tail -n +${skip} '${src}'";; 1438 tail) exe="tail -n +${skip} '${src}'";;
1219 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1439 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1220 *) die "makeself cant handle exe '${exe}'" 1440 *) die "makeself cant handle exe '${exe}'"
1221 esac 1441 esac
1222 1442
1223 # lets grab the first few bytes of the file to figure out what kind of archive it is 1443 # lets grab the first few bytes of the file to figure out what kind of archive it is
1224 local tmpfile=$(emktemp) 1444 local filetype tmpfile=$(emktemp)
1225 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1445 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1226 local filetype=$(file -b "${tmpfile}") 1446 filetype=$(file -b "${tmpfile}") || die
1227 case ${filetype} in 1447 case ${filetype} in
1228 *tar\ archive*) 1448 *tar\ archive*)
1229 eval ${exe} | tar --no-same-owner -xf - 1449 eval ${exe} | tar --no-same-owner -xf -
1230 ;; 1450 ;;
1231 bzip2*) 1451 bzip2*)
1261 lic="${PWD}/${lic}" 1481 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1482 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1483 lic="${lic}"
1264 fi 1484 fi
1265 fi 1485 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1486 local l="`basename ${lic}`"
1268 1487
1269 # here is where we check for the licenses the user already 1488 # here is where we check for the licenses the user already
1270 # accepted ... if we don't find a match, we make the user accept 1489 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1490 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1491 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1492 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1493 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1494 eshopts_pop
1277 return 0 1495 return 0
1278 fi 1496 fi
1279 done 1497 done
1280 set +o noglob; set -$shopts #reset old shell opts 1498 eshopts_pop
1499 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1500
1282 local licmsg=$(emktemp) 1501 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1502 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1503 **********************************************************
1285 The following license outlines the terms of use of this 1504 The following license outlines the terms of use of this
1358 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1577 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1578 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1360 export CDROM_SET=-1 1579 export CDROM_SET=-1
1361 for f in ${CDROM_CHECK_1//:/ } ; do 1580 for f in ${CDROM_CHECK_1//:/ } ; do
1362 ((++CDROM_SET)) 1581 ((++CDROM_SET))
1363 [[ -e ${CD_ROOT}/${f} ]] && break 1582 [[ -e ${CDROM_ROOT}/${f} ]] && break
1364 done 1583 done
1365 export CDROM_MATCH=${f} 1584 export CDROM_MATCH=${f}
1366 return 1585 return
1367 fi 1586 fi
1368 1587
1532# of the lists. 1751# of the lists.
1533strip-linguas() { 1752strip-linguas() {
1534 local ls newls nols 1753 local ls newls nols
1535 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1754 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1536 local op=$1; shift 1755 local op=$1; shift
1537 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1756 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1538 local d f 1757 local d f
1539 for d in "$@" ; do 1758 for d in "$@" ; do
1540 if [[ ${op} == "-u" ]] ; then 1759 if [[ ${op} == "-u" ]] ; then
1541 newls=${ls} 1760 newls=${ls}
1542 else 1761 else
1543 newls="" 1762 newls=""
1544 fi 1763 fi
1545 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1764 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1546 if [[ ${op} == "-i" ]] ; then 1765 if [[ ${op} == "-i" ]] ; then
1547 hasq ${f} ${ls} && newls="${newls} ${f}" 1766 has ${f} ${ls} && newls="${newls} ${f}"
1548 else 1767 else
1549 hasq ${f} ${ls} || newls="${newls} ${f}" 1768 has ${f} ${ls} || newls="${newls} ${f}"
1550 fi 1769 fi
1551 done 1770 done
1552 ls=${newls} 1771 ls=${newls}
1553 done 1772 done
1554 else 1773 else
1556 fi 1775 fi
1557 1776
1558 nols="" 1777 nols=""
1559 newls="" 1778 newls=""
1560 for f in ${LINGUAS} ; do 1779 for f in ${LINGUAS} ; do
1561 if hasq ${f} ${ls} ; then 1780 if has ${f} ${ls} ; then
1562 newls="${newls} ${f}" 1781 newls="${newls} ${f}"
1563 else 1782 else
1564 nols="${nols} ${f}" 1783 nols="${nols} ${f}"
1565 fi 1784 fi
1566 done 1785 done
1567 [[ -n ${nols} ]] \ 1786 [[ -n ${nols} ]] \
1568 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1787 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1569 export LINGUAS=${newls:1} 1788 export LINGUAS=${newls:1}
1570} 1789}
1571 1790
1572# @FUNCTION: preserve_old_lib 1791# @FUNCTION: preserve_old_lib
1573# @USAGE: <libs to preserve> [more libs] 1792# @USAGE: <libs to preserve> [more libs]
1621 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1840 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1622 ewarn "in order to remove these old dependencies. If you do not have this" 1841 ewarn "in order to remove these old dependencies. If you do not have this"
1623 ewarn "helper program, simply emerge the 'gentoolkit' package." 1842 ewarn "helper program, simply emerge the 'gentoolkit' package."
1624 ewarn 1843 ewarn
1625 fi 1844 fi
1845 # temp hack for #348634 #357225
1846 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1626 ewarn " # revdep-rebuild --library ${lib##*/}" 1847 ewarn " # revdep-rebuild --library '${lib}'"
1627 done 1848 done
1628 if [[ ${notice} -eq 1 ]] ; then 1849 if [[ ${notice} -eq 1 ]] ; then
1629 ewarn 1850 ewarn
1630 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1851 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1631 ewarn "delete the old libraries." 1852 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1853 for lib in "$@" ; do
1854 ewarn " # rm '${lib}'"
1855 done
1632 fi 1856 fi
1633} 1857}
1634 1858
1635# @FUNCTION: built_with_use 1859# @FUNCTION: built_with_use
1636# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1860# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1637# @DESCRIPTION: 1861# @DESCRIPTION:
1862#
1863# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1864#
1638# A temporary hack until portage properly supports DEPENDing on USE 1865# A temporary hack until portage properly supports DEPENDing on USE
1639# flags being enabled in packages. This will check to see if the specified 1866# flags being enabled in packages. This will check to see if the specified
1640# DEPEND atom was built with the specified list of USE flags. The 1867# DEPEND atom was built with the specified list of USE flags. The
1641# --missing option controls the behavior if called on a package that does 1868# --missing option controls the behavior if called on a package that does
1642# not actually support the defined USE flags (aka listed in IUSE). 1869# not actually support the defined USE flags (aka listed in IUSE).
1643# The default is to abort (call die). The -a and -o flags control 1870# The default is to abort (call die). The -a and -o flags control
1644# the requirements of the USE flags. They correspond to "and" and "or" 1871# the requirements of the USE flags. They correspond to "and" and "or"
1645# logic. So the -a flag means all listed USE flags must be enabled 1872# logic. So the -a flag means all listed USE flags must be enabled
1646# while the -o flag means at least one of the listed fIUSE flags must be 1873# while the -o flag means at least one of the listed IUSE flags must be
1647# enabled. The --hidden option is really for internal use only as it 1874# enabled. The --hidden option is really for internal use only as it
1648# means the USE flag we're checking is hidden expanded, so it won't be found 1875# means the USE flag we're checking is hidden expanded, so it won't be found
1649# in IUSE like normal USE flags. 1876# in IUSE like normal USE flags.
1650# 1877#
1651# Remember that this function isn't terribly intelligent so order of optional 1878# Remember that this function isn't terribly intelligent so order of optional
1686 die) die "Unable to determine what USE flags $PKG was built with";; 1913 die) die "Unable to determine what USE flags $PKG was built with";;
1687 esac 1914 esac
1688 fi 1915 fi
1689 1916
1690 if [[ ${hidden} == "no" ]] ; then 1917 if [[ ${hidden} == "no" ]] ; then
1691 local IUSE_BUILT=$(<${IUSEFILE}) 1918 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1692 # Don't check USE_EXPAND #147237 1919 # Don't check USE_EXPAND #147237
1693 local expand 1920 local expand
1694 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1921 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1695 if [[ $1 == ${expand}_* ]] ; then 1922 if [[ $1 == ${expand}_* ]] ; then
1696 expand="" 1923 expand=""
1697 break 1924 break
1698 fi 1925 fi
1699 done 1926 done
1700 if [[ -n ${expand} ]] ; then 1927 if [[ -n ${expand} ]] ; then
1701 if ! has $1 ${IUSE_BUILT} ; then 1928 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1702 case ${missing_action} in 1929 case ${missing_action} in
1703 true) return 0;; 1930 true) return 0;;
1704 false) return 1;; 1931 false) return 1;;
1705 die) die "$PKG does not actually support the $1 USE flag!";; 1932 die) die "$PKG does not actually support the $1 USE flag!";;
1706 esac 1933 esac
1770 ) || die 1997 ) || die
1771 else 1998 else
1772 newbin "${tmpwrapper}" "${wrapper}" || die 1999 newbin "${tmpwrapper}" "${wrapper}" || die
1773 fi 2000 fi
1774} 2001}
2002
2003# @FUNCTION: path_exists
2004# @USAGE: [-a|-o] <paths>
2005# @DESCRIPTION:
2006# Check if the specified paths exist. Works for all types of paths
2007# (files/dirs/etc...). The -a and -o flags control the requirements
2008# of the paths. They correspond to "and" and "or" logic. So the -a
2009# flag means all the paths must exist while the -o flag means at least
2010# one of the paths must exist. The default behavior is "and". If no
2011# paths are specified, then the return value is "false".
2012path_exists() {
2013 local opt=$1
2014 [[ ${opt} == -[ao] ]] && shift || opt="-a"
2015
2016 # no paths -> return false
2017 # same behavior as: [[ -e "" ]]
2018 [[ $# -eq 0 ]] && return 1
2019
2020 local p r=0
2021 for p in "$@" ; do
2022 [[ -e ${p} ]]
2023 : $(( r += $? ))
2024 done
2025
2026 case ${opt} in
2027 -a) return $(( r != 0 )) ;;
2028 -o) return $(( r == $# )) ;;
2029 esac
2030}

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

  ViewVC Help
Powered by ViewVC 1.1.20