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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.306  
changed lines
  Added in v.1.349

  ViewVC Help
Powered by ViewVC 1.1.20