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

Diff of /eclass/eutils.eclass

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

Revision 1.291 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.291 2007/10/10 20:34:08 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" ] 333 # most of the time, there will only be one run per unique name,
149 then 334 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 335 local STDERR_TARGET="${T}/${patchname}.out"
151 then 336 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 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
153 fi 355 fi
356 else
357 PATCH_TARGET=${x}
358 fi
154 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} *****"
155 echo 382 echo
156 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} )"
157 eerror 429 eerror
158 eerror " ${EPATCH_SOURCE}" 430 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 431 eerror
432 eerror " ${STDERR_TARGET}"
160 echo 433 echo
161 die "Cannot find \$EPATCH_SOURCE!"
162 fi
163
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi
166
167 case ${EPATCH_SUFFIX##*\.} in
168 bz2)
169 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2"
171 ;;
172 gz|Z|z)
173 PIPE_CMD="gzip -dc"
174 PATCH_SUFFIX="gz"
175 ;;
176 ZIP|zip)
177 PIPE_CMD="unzip -p"
178 PATCH_SUFFIX="zip"
179 ;;
180 *)
181 PIPE_CMD="cat"
182 PATCH_SUFFIX="patch"
183 ;;
184 esac
185
186 if [ "${SINGLE_PATCH}" = "no" ]
187 then
188 einfo "${EPATCH_MULTI_MSG}"
189 fi
190 for x in ${EPATCH_SOURCE}
191 do
192 # New ARCH dependant patch naming scheme ...
193 #
194 # ???_arch_foo.patch
195 #
196 if [ -f ${x} ] && \
197 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
198 [ "${EPATCH_FORCE}" = "yes" ])
199 then
200 local count=0
201 local popts="${EPATCH_OPTS}"
202 local patchname=${x##*/}
203
204 if [ -n "${EPATCH_EXCLUDE}" ]
205 then
206 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
207 then
208 continue
209 fi
210 fi
211
212 if [ "${SINGLE_PATCH}" = "yes" ]
213 then
214 if [ -n "${EPATCH_SINGLE_MSG}" ]
215 then
216 einfo "${EPATCH_SINGLE_MSG}"
217 else
218 einfo "Applying ${patchname} ..."
219 fi
220 else
221 einfo " ${patchname} ..."
222 fi
223
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226
227 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ]
229 do
230 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233
234 if [ "${PATCH_SUFFIX}" != "patch" ]
235 then
236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
238 else
239 PATCH_TARGET="${x}"
240 fi
241
242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
247
248 if [ "${PATCH_SUFFIX}" != "patch" ]
249 then
250 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
251 then
252 echo
253 eerror "Could not extract patch!"
254 #die "Could not extract patch!"
255 count=5
256 break
257 fi
258 fi
259
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
267
268 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
269 _epatch_assert
270
271 if [ "$?" -ne 0 ]
272 then
273 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo
275 eerror "A dry-run of patch command succeeded, but actually"
276 eerror "applying the patch failed!"
277 #die "Real world sux compared to the dreamworld!"
278 count=5
279 fi
280
281 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
282
283 break
284 fi
285
286 count=$((count + 1))
287 done
288
289 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then
291 rm -f ${PATCH_TARGET}
292 fi
293
294 if [ "${count}" -eq 5 ]
295 then
296 echo
297 eerror "Failed Patch: ${patchname} !"
298 eerror " ( ${PATCH_TARGET} )"
299 eerror
300 eerror "Include in your bugreport the contents of:"
301 eerror
302 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
303 echo
304 die "Failed Patch: ${patchname}!" 434 die "Failed Patch: ${patchname}!"
305 fi 435 fi
306 436
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 437 # if everything worked, delete the patch log
308 438 rm -f "${STDERR_TARGET}"
309 eend 0 439 eend 0
310 fi
311 done 440 done
312 if [ "${SINGLE_PATCH}" = "no" ] 441
313 then 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 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
315 fi 493 fi
494 done
495 echo "none" > "${applied}"
496 return 1
316} 497}
317 498
318# @FUNCTION: emktemp 499# @FUNCTION: emktemp
319# @USAGE: [temp dir] 500# @USAGE: [temp dir]
320# @DESCRIPTION: 501# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 537# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 538# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 539# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 540# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 541# @DESCRIPTION:
361# 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),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 544# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 545egetent() {
364 case ${CHOST} in 546 case ${CHOST} in
365 *-darwin*) 547 *-darwin[678])
366 case "$2" in 548 case "$2" in
367 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
369 ;; 551 ;;
370 *) # Numeric 552 *) # Numeric
371 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
372 ;; 569 ;;
373 esac 570 esac
374 ;; 571 ;;
375 *-freebsd*|*-dragonfly*) 572 *-freebsd*|*-dragonfly*)
376 local opts action="user" 573 local opts action="user"
576 fi 773 fi
577 ;; 774 ;;
578 775
579 *) 776 *)
580 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 778 useradd -r ${opts} \
582 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
780 ${euser} \
583 || die "enewuser failed" 781 || die "enewuser failed"
584 else 782 else
585 einfo " - Extra: $@" 783 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 784 useradd -r ${opts} "$@" \
785 ${euser} \
587 || die "enewuser failed" 786 || die "enewuser failed"
588 fi 787 fi
589 ;; 788 ;;
590 esac 789 esac
591 790
703 esac 902 esac
704 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
705 ;; 904 ;;
706 905
707 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
708 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
709 ;; 909 ;;
710 esac 910 esac
711 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
712} 912}
713 913
724 924
725# Make a desktop file ! 925# Make a desktop file !
726# Great for making those icons in kde/gnome startmenu ! 926# Great for making those icons in kde/gnome startmenu !
727# Amaze your friends ! Get the women ! Join today ! 927# Amaze your friends ! Get the women ! Join today !
728# 928#
729# make_desktop_entry(<command>, [name], [icon], [type], [path]) 929# make_desktop_entry(<command>, [name], [icon], [type], [fields])
730# 930#
731# binary: what command does the app run with ? 931# binary: what command does the app run with ?
732# name: the name that will show up in the menu 932# name: the name that will show up in the menu
733# icon: give your little like a pretty little icon ... 933# icon: give your little like a pretty little icon ...
734# this can be relative (to /usr/share/pixmaps) or 934# this can be relative (to /usr/share/pixmaps) or
735# a full path to an icon 935# a full path to an icon
736# type: what kind of application is this ? for categories: 936# type: what kind of application is this ? for categories:
737# http://standards.freedesktop.org/menu-spec/latest/apa.html 937# http://standards.freedesktop.org/menu-spec/latest/apa.html
738# path: if your app needs to startup in a specific dir 938# fields: extra fields to append to the desktop file; a printf string
739make_desktop_entry() { 939make_desktop_entry() {
740 [[ -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"
741 941
742 local exec=${1} 942 local exec=${1}
743 local name=${2:-${PN}} 943 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 944 local icon=${3:-${PN}}
745 local type=${4} 945 local type=${4}
746 local path=${5} 946 local fields=${5}
747 947
748 if [[ -z ${type} ]] ; then 948 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 949 local catmaj=${CATEGORY%%-*}
750 local catmin=${CATEGORY##*-} 950 local catmin=${CATEGORY##*-}
751 case ${catmaj} in 951 case ${catmaj} in
752 app) 952 app)
753 case ${catmin} in 953 case ${catmin} in
754 accessibility) type=Accessibility;; 954 accessibility) type=Accessibility;;
755 admin) type=System;; 955 admin) type=System;;
756 antivirus) type=System;; 956 antivirus) type=System;;
757 arch) type=Archiving;; 957 arch) type=Archiving;;
758 backup) type=Archiving;; 958 backup) type=Archiving;;
759 cdr) type=DiscBurning;; 959 cdr) type=DiscBurning;;
760 dicts) type=Dictionary;; 960 dicts) type=Dictionary;;
761 doc) type=Documentation;; 961 doc) type=Documentation;;
762 editors) type=TextEditor;; 962 editors) type=TextEditor;;
763 emacs) type=TextEditor;; 963 emacs) type=TextEditor;;
764 emulation) type=Emulator;; 964 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;; 965 laptop) type=HardwareSettings;;
766 office) type=Office;; 966 office) type=Office;;
767 pda) type=PDA;; 967 pda) type=PDA;;
768 vim) type=TextEditor;; 968 vim) type=TextEditor;;
769 xemacs) type=TextEditor;; 969 xemacs) type=TextEditor;;
770 *) type=;;
771 esac 970 esac
772 ;; 971 ;;
773 972
774 dev) 973 dev)
775 type="Development" 974 type="Development"
776 ;; 975 ;;
777 976
778 games) 977 games)
779 case ${catmin} in 978 case ${catmin} in
780 action|fps) type=ActionGame;; 979 action|fps) type=ActionGame;;
781 arcade) type=ArcadeGame;; 980 arcade) type=ArcadeGame;;
782 board) type=BoardGame;; 981 board) type=BoardGame;;
783 emulation) type=Emulator;; 982 emulation) type=Emulator;;
784 kids) type=KidsGame;; 983 kids) type=KidsGame;;
785 puzzle) type=LogicGame;; 984 puzzle) type=LogicGame;;
786 roguelike) type=RolePlaying;; 985 roguelike) type=RolePlaying;;
787 rpg) type=RolePlaying;; 986 rpg) type=RolePlaying;;
788 simulation) type=Simulation;; 987 simulation) type=Simulation;;
789 sports) type=SportsGame;; 988 sports) type=SportsGame;;
790 strategy) type=StrategyGame;; 989 strategy) type=StrategyGame;;
791 *) type=;;
792 esac 990 esac
793 type="Game;${type}" 991 type="Game;${type}"
794 ;; 992 ;;
795 993
796 gnome) 994 gnome)
805 type="Network;Email" 1003 type="Network;Email"
806 ;; 1004 ;;
807 1005
808 media) 1006 media)
809 case ${catmin} in 1007 case ${catmin} in
1008 gfx)
810 gfx) type=Graphics;; 1009 type=Graphics
1010 ;;
1011 *)
1012 case ${catmin} in
811 radio) type=Tuner;; 1013 radio) type=Tuner;;
812 sound) type=Audio;; 1014 sound) type=Audio;;
813 tv) type=TV;; 1015 tv) type=TV;;
814 video) type=Video;; 1016 video) type=Video;;
815 *) type=;; 1017 esac
1018 type="AudioVideo;${type}"
1019 ;;
816 esac 1020 esac
817 type="AudioVideo;${type}"
818 ;; 1021 ;;
819 1022
820 net) 1023 net)
821 case ${catmin} in 1024 case ${catmin} in
822 dialup) type=Dialup;; 1025 dialup) type=Dialup;;
823 ftp) type=FileTransfer;; 1026 ftp) type=FileTransfer;;
824 im) type=InstantMessaging;; 1027 im) type=InstantMessaging;;
825 irc) type=IRCClient;; 1028 irc) type=IRCClient;;
826 mail) type=Email;; 1029 mail) type=Email;;
827 news) type=News;; 1030 news) type=News;;
828 nntp) type=News;; 1031 nntp) type=News;;
829 p2p) type=FileTransfer;; 1032 p2p) type=FileTransfer;;
830 *) type=;; 1033 voip) type=Telephony;;
831 esac 1034 esac
832 type="Network;${type}" 1035 type="Network;${type}"
833 ;; 1036 ;;
834 1037
835 sci) 1038 sci)
836 case ${catmin} in 1039 case ${catmin} in
837 astro*) type=Astronomy;; 1040 astro*) type=Astronomy;;
838 bio*) type=Biology;; 1041 bio*) type=Biology;;
839 calc*) type=Calculator;; 1042 calc*) type=Calculator;;
840 chem*) type=Chemistry;; 1043 chem*) type=Chemistry;;
841 elec*) type=Electronics;; 1044 elec*) type=Electronics;;
842 geo*) type=Geology;; 1045 geo*) type=Geology;;
843 math*) type=Math;; 1046 math*) type=Math;;
844 physics) type=Physics;; 1047 physics) type=Physics;;
845 visual*) type=DataVisualization;; 1048 visual*) type=DataVisualization;;
846 *) type=;;
847 esac 1049 esac
848 type="Science;${type}" 1050 type="Education;Science;${type}"
849 ;; 1051 ;;
850 1052
851 sys) 1053 sys)
852 type="System" 1054 type="System"
853 ;; 1055 ;;
854 1056
855 www) 1057 www)
856 case ${catmin} in 1058 case ${catmin} in
857 client) type=WebBrowser;; 1059 client) type=WebBrowser;;
858 *) type=;;
859 esac 1060 esac
860 type="Network" 1061 type="Network;${type}"
861 ;; 1062 ;;
862 1063
863 *) 1064 *)
864 type= 1065 type=
865 ;; 1066 ;;
871 local desktop_name="${PN}-${SLOT}" 1072 local desktop_name="${PN}-${SLOT}"
872 fi 1073 fi
873 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"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1075 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 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
876 cat <<-EOF > "${desktop}" 1088 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 1089 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 1090 Name=${name}
881 Type=Application 1091 Type=Application
882 Comment=${DESCRIPTION} 1092 Comment=${DESCRIPTION}
883 Exec=${exec} 1093 Exec=${exec}
884 TryExec=${exec%% *} 1094 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 1095 Icon=${icon}
887 Categories=${type}; 1096 Categories=${type}
888 EOF 1097 EOF
1098
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}"
889 1105
890 ( 1106 (
891 # wrap the env here so that the 'insinto' call 1107 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1108 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1109 insinto /usr/share/applications
894 doins "${desktop}" 1110 doins "${desktop}"
895 ) 1111 ) || die "installing desktop file failed"
896} 1112}
897 1113
898# @FUNCTION: validate_desktop_entries 1114# @FUNCTION: validate_desktop_entries
899# @USAGE: [directories] 1115# @USAGE: [directories]
900# @MAINTAINER: 1116# @MAINTAINER:
922 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."
923 fi 1139 fi
924} 1140}
925 1141
926# @FUNCTION: make_session_desktop 1142# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1143# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1144# @DESCRIPTION:
929# 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
930# 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.
931make_session_desktop() { 1149make_session_desktop() {
932 [[ -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
933 [[ -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
934 1152
935 local title=$1 1153 local title=$1
936 local command=$2 1154 local command=$2
937 local desktop=${T}/${wm}.desktop 1155 local desktop=${T}/${wm:-${PN}}.desktop
1156 shift 2
938 1157
939 cat <<-EOF > "${desktop}" 1158 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1159 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1160 Name=${title}
943 Comment=This session logs you into ${title} 1161 Comment=This session logs you into ${title}
944 Exec=${command} 1162 Exec=${command} $*
945 TryExec=${command} 1163 TryExec=${command}
946 Type=Application 1164 Type=XSession
947 EOF 1165 EOF
948 1166
949 ( 1167 (
950 # wrap the env here so that the 'insinto' call 1168 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1169 # doesn't corrupt the env of the caller
1177 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1395 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1178 1396
1179 local shrtsrc=$(basename "${src}") 1397 local shrtsrc=$(basename "${src}")
1180 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1398 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1181 if [[ -z ${skip} ]] ; then 1399 if [[ -z ${skip} ]] ; then
1182 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1400 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1183 local skip=0 1401 local skip=0
1184 exe=tail 1402 exe=tail
1185 case ${ver} in 1403 case ${ver} in
1186 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
1187 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1405 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1189 2.0|2.0.1) 1407 2.0|2.0.1)
1190 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1408 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1191 ;; 1409 ;;
1192 2.1.1) 1410 2.1.1)
1193 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1411 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1194 let skip="skip + 1" 1412 (( skip++ ))
1195 ;; 1413 ;;
1196 2.1.2) 1414 2.1.2)
1197 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1415 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1198 let skip="skip + 1" 1416 (( skip++ ))
1199 ;; 1417 ;;
1200 2.1.3) 1418 2.1.3)
1201 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1419 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1202 let skip="skip + 1" 1420 (( skip++ ))
1203 ;; 1421 ;;
1204 2.1.4|2.1.5) 1422 2.1.4|2.1.5)
1205 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)
1206 skip=$(head -n ${skip} "${src}" | wc -c) 1424 skip=$(head -n ${skip} "${src}" | wc -c)
1207 exe="dd" 1425 exe="dd"
1216 esac 1434 esac
1217 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1435 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1218 fi 1436 fi
1219 case ${exe} in 1437 case ${exe} in
1220 tail) exe="tail -n +${skip} '${src}'";; 1438 tail) exe="tail -n +${skip} '${src}'";;
1221 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1439 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1222 *) die "makeself cant handle exe '${exe}'" 1440 *) die "makeself cant handle exe '${exe}'"
1223 esac 1441 esac
1224 1442
1225 # 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
1226 local tmpfile=$(emktemp) 1444 local filetype tmpfile=$(emktemp)
1227 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1445 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1228 local filetype=$(file -b "${tmpfile}") 1446 filetype=$(file -b "${tmpfile}") || die
1229 case ${filetype} in 1447 case ${filetype} in
1230 *tar\ archive*) 1448 *tar\ archive*)
1231 eval ${exe} | tar --no-same-owner -xf - 1449 eval ${exe} | tar --no-same-owner -xf -
1232 ;; 1450 ;;
1233 bzip2*) 1451 bzip2*)
1263 lic="${PWD}/${lic}" 1481 lic="${PWD}/${lic}"
1264 elif [ -e "${lic}" ] ; then 1482 elif [ -e "${lic}" ] ; then
1265 lic="${lic}" 1483 lic="${lic}"
1266 fi 1484 fi
1267 fi 1485 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1486 local l="`basename ${lic}`"
1270 1487
1271 # here is where we check for the licenses the user already 1488 # here is where we check for the licenses the user already
1272 # 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
1273 local shopts=$-
1274 local alic 1490 local alic
1275 set -o noglob #so that bash doesn't expand "*" 1491 eshopts_push -o noglob # so that bash doesn't expand "*"
1276 for alic in ${ACCEPT_LICENSE} ; do 1492 for alic in ${ACCEPT_LICENSE} ; do
1277 if [[ ${alic} == ${l} ]]; then 1493 if [[ ${alic} == ${l} ]]; then
1278 set +o noglob; set -${shopts} #reset old shell opts 1494 eshopts_pop
1279 return 0 1495 return 0
1280 fi 1496 fi
1281 done 1497 done
1282 set +o noglob; set -$shopts #reset old shell opts 1498 eshopts_pop
1499 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1283 1500
1284 local licmsg=$(emktemp) 1501 local licmsg=$(emktemp)
1285 cat <<-EOF > ${licmsg} 1502 cat <<-EOF > ${licmsg}
1286 ********************************************************** 1503 **********************************************************
1287 The following license outlines the terms of use of this 1504 The following license outlines the terms of use of this
1360 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1577 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1578 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1362 export CDROM_SET=-1 1579 export CDROM_SET=-1
1363 for f in ${CDROM_CHECK_1//:/ } ; do 1580 for f in ${CDROM_CHECK_1//:/ } ; do
1364 ((++CDROM_SET)) 1581 ((++CDROM_SET))
1365 [[ -e ${CD_ROOT}/${f} ]] && break 1582 [[ -e ${CDROM_ROOT}/${f} ]] && break
1366 done 1583 done
1367 export CDROM_MATCH=${f} 1584 export CDROM_MATCH=${f}
1368 return 1585 return
1369 fi 1586 fi
1370 1587
1456# displayed and we'll hang out here until: 1673# displayed and we'll hang out here until:
1457# (1) the file is found on a mounted cdrom 1674# (1) the file is found on a mounted cdrom
1458# (2) the user hits CTRL+C 1675# (2) the user hits CTRL+C
1459_cdrom_locate_file_on_cd() { 1676_cdrom_locate_file_on_cd() {
1460 local mline="" 1677 local mline=""
1461 local showedmsg=0 1678 local showedmsg=0 showjolietmsg=0
1462 1679
1463 while [[ -z ${CDROM_ROOT} ]] ; do 1680 while [[ -z ${CDROM_ROOT} ]] ; do
1464 local i=0 1681 local i=0
1465 local -a cdset=(${*//:/ }) 1682 local -a cdset=(${*//:/ })
1466 if [[ -n ${CDROM_SET} ]] ; then 1683 if [[ -n ${CDROM_SET} ]] ; then
1475 while read point node fs foo ; do 1692 while read point node fs foo ; do
1476 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1693 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1477 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1694 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1478 && continue 1695 && continue
1479 point=${point//\040/ } 1696 point=${point//\040/ }
1697 [[ ! -d ${point}/${dir} ]] && continue
1480 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1698 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1481 export CDROM_ROOT=${point} 1699 export CDROM_ROOT=${point}
1482 export CDROM_SET=${i} 1700 export CDROM_SET=${i}
1483 export CDROM_MATCH=${cdset[${i}]} 1701 export CDROM_MATCH=${cdset[${i}]}
1484 return 1702 return
1506 showedmsg=1 1724 showedmsg=1
1507 fi 1725 fi
1508 einfo "Press return to scan for the cd again" 1726 einfo "Press return to scan for the cd again"
1509 einfo "or hit CTRL+C to abort the emerge." 1727 einfo "or hit CTRL+C to abort the emerge."
1510 echo 1728 echo
1729 if [[ ${showjolietmsg} -eq 0 ]] ; then
1730 showjolietmsg=1
1731 else
1511 einfo "If you are having trouble with the detection" 1732 ewarn "If you are having trouble with the detection"
1512 einfo "of your CD, it is possible that you do not have" 1733 ewarn "of your CD, it is possible that you do not have"
1513 einfo "Joliet support enabled in your kernel. Please" 1734 ewarn "Joliet support enabled in your kernel. Please"
1514 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1735 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1736 ebeep 5
1737 fi
1515 read || die "something is screwed with your system" 1738 read || die "something is screwed with your system"
1516 done 1739 done
1517} 1740}
1518 1741
1519# @FUNCTION: strip-linguas 1742# @FUNCTION: strip-linguas
1528# of the lists. 1751# of the lists.
1529strip-linguas() { 1752strip-linguas() {
1530 local ls newls nols 1753 local ls newls nols
1531 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1754 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1532 local op=$1; shift 1755 local op=$1; shift
1533 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1756 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1534 local d f 1757 local d f
1535 for d in "$@" ; do 1758 for d in "$@" ; do
1536 if [[ ${op} == "-u" ]] ; then 1759 if [[ ${op} == "-u" ]] ; then
1537 newls=${ls} 1760 newls=${ls}
1538 else 1761 else
1539 newls="" 1762 newls=""
1540 fi 1763 fi
1541 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1764 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1542 if [[ ${op} == "-i" ]] ; then 1765 if [[ ${op} == "-i" ]] ; then
1543 hasq ${f} ${ls} && newls="${newls} ${f}" 1766 has ${f} ${ls} && newls="${newls} ${f}"
1544 else 1767 else
1545 hasq ${f} ${ls} || newls="${newls} ${f}" 1768 has ${f} ${ls} || newls="${newls} ${f}"
1546 fi 1769 fi
1547 done 1770 done
1548 ls=${newls} 1771 ls=${newls}
1549 done 1772 done
1550 else 1773 else
1552 fi 1775 fi
1553 1776
1554 nols="" 1777 nols=""
1555 newls="" 1778 newls=""
1556 for f in ${LINGUAS} ; do 1779 for f in ${LINGUAS} ; do
1557 if hasq ${f} ${ls} ; then 1780 if has ${f} ${ls} ; then
1558 newls="${newls} ${f}" 1781 newls="${newls} ${f}"
1559 else 1782 else
1560 nols="${nols} ${f}" 1783 nols="${nols} ${f}"
1561 fi 1784 fi
1562 done 1785 done
1563 [[ -n ${nols} ]] \ 1786 [[ -n ${nols} ]] \
1564 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1787 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1565 export LINGUAS=${newls:1} 1788 export LINGUAS=${newls:1}
1566} 1789}
1567 1790
1568# @FUNCTION: preserve_old_lib 1791# @FUNCTION: preserve_old_lib
1569# @USAGE: <libs to preserve> [more libs] 1792# @USAGE: <libs to preserve> [more libs]
1579 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1802 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1580 die "Invalid preserve_old_lib() usage" 1803 die "Invalid preserve_old_lib() usage"
1581 fi 1804 fi
1582 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1805 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1583 1806
1807 # let portage worry about it
1808 has preserve-libs ${FEATURES} && return 0
1809
1584 local lib dir 1810 local lib dir
1585 for lib in "$@" ; do 1811 for lib in "$@" ; do
1586 [[ -e ${ROOT}/${lib} ]] || continue 1812 [[ -e ${ROOT}/${lib} ]] || continue
1587 dir=${lib%/*} 1813 dir=${lib%/*}
1588 dodir ${dir} || die "dodir ${dir} failed" 1814 dodir ${dir} || die "dodir ${dir} failed"
1598preserve_old_lib_notify() { 1824preserve_old_lib_notify() {
1599 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1825 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1600 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1826 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1601 die "Invalid preserve_old_lib_notify() usage" 1827 die "Invalid preserve_old_lib_notify() usage"
1602 fi 1828 fi
1829
1830 # let portage worry about it
1831 has preserve-libs ${FEATURES} && return 0
1603 1832
1604 local lib notice=0 1833 local lib notice=0
1605 for lib in "$@" ; do 1834 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1835 [[ -e ${ROOT}/${lib} ]] || continue
1607 if [[ ${notice} -eq 0 ]] ; then 1836 if [[ ${notice} -eq 0 ]] ; then
1611 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"
1612 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"
1613 ewarn "helper program, simply emerge the 'gentoolkit' package." 1842 ewarn "helper program, simply emerge the 'gentoolkit' package."
1614 ewarn 1843 ewarn
1615 fi 1844 fi
1845 # temp hack for #348634 #357225
1846 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1616 ewarn " # revdep-rebuild --library ${lib##*/}" 1847 ewarn " # revdep-rebuild --library '${lib}'"
1617 done 1848 done
1618 if [[ ${notice} -eq 1 ]] ; then 1849 if [[ ${notice} -eq 1 ]] ; then
1619 ewarn 1850 ewarn
1620 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"
1621 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
1622 fi 1856 fi
1623} 1857}
1624 1858
1625# @FUNCTION: built_with_use 1859# @FUNCTION: built_with_use
1626# @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>
1627# @DESCRIPTION: 1861# @DESCRIPTION:
1862#
1863# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1864#
1628# A temporary hack until portage properly supports DEPENDing on USE 1865# A temporary hack until portage properly supports DEPENDing on USE
1629# 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
1630# 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
1631# --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
1632# not actually support the defined USE flags (aka listed in IUSE). 1869# not actually support the defined USE flags (aka listed in IUSE).
1633# 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
1634# 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"
1635# 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
1636# 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
1637# 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
1638# 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
1639# in IUSE like normal USE flags. 1876# in IUSE like normal USE flags.
1640# 1877#
1641# 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
1676 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";;
1677 esac 1914 esac
1678 fi 1915 fi
1679 1916
1680 if [[ ${hidden} == "no" ]] ; then 1917 if [[ ${hidden} == "no" ]] ; then
1681 local IUSE_BUILT=$(<${IUSEFILE}) 1918 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1682 # Don't check USE_EXPAND #147237 1919 # Don't check USE_EXPAND #147237
1683 local expand 1920 local expand
1684 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1921 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1685 if [[ $1 == ${expand}_* ]] ; then 1922 if [[ $1 == ${expand}_* ]] ; then
1686 expand="" 1923 expand=""
1687 break 1924 break
1688 fi 1925 fi
1689 done 1926 done
1690 if [[ -n ${expand} ]] ; then 1927 if [[ -n ${expand} ]] ; then
1691 if ! has $1 ${IUSE_BUILT} ; then 1928 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1692 case ${missing_action} in 1929 case ${missing_action} in
1693 true) return 0;; 1930 true) return 0;;
1694 false) return 1;; 1931 false) return 1;;
1695 die) die "$PKG does not actually support the $1 USE flag!";; 1932 die) die "$PKG does not actually support the $1 USE flag!";;
1696 esac 1933 esac
1720epunt_cxx() { 1957epunt_cxx() {
1721 local dir=$1 1958 local dir=$1
1722 [[ -z ${dir} ]] && dir=${S} 1959 [[ -z ${dir} ]] && dir=${S}
1723 ebegin "Removing useless C++ checks" 1960 ebegin "Removing useless C++ checks"
1724 local f 1961 local f
1725 for f in $(find ${dir} -name configure) ; do 1962 find "${dir}" -name configure | while read f ; do
1726 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1963 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1727 done 1964 done
1728 eend 0 1965 eend 0
1729} 1966}
1730 1967
1731# @FUNCTION: make_wrapper 1968# @FUNCTION: make_wrapper
1732# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1969# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1733# @DESCRIPTION: 1970# @DESCRIPTION:
1734# Create a shell wrapper script named wrapper in installpath 1971# Create a shell wrapper script named wrapper in installpath
1735# (defaults to the bindir) to execute target (default of wrapper) by 1972# (defaults to the bindir) to execute target (default of wrapper) by
1736# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1973# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1737# libpaths followed by optionally changing directory to chdir. 1974# libpaths followed by optionally changing directory to chdir.
1760 ) || die 1997 ) || die
1761 else 1998 else
1762 newbin "${tmpwrapper}" "${wrapper}" || die 1999 newbin "${tmpwrapper}" "${wrapper}" || die
1763 fi 2000 fi
1764} 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.291  
changed lines
  Added in v.1.363

  ViewVC Help
Powered by ViewVC 1.1.20