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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20