/[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.348
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.294 2008/01/14 04:52:35 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.348 2010/07/11 17:29:10 betelgeuse 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# ${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 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} ]]
142 then 297 then
143 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
144 else 323 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 324 einfo " ${patchname} ..."
146 fi 325 fi
147 else 326
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 327 # most of the time, there will only be one run per unique name,
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 328 # but if there are more, make sure we get unique log filenames
150 then 329 local STDERR_TARGET="${T}/${patchname}.out"
151 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
152 fi 349 fi
350 else
351 PATCH_TARGET=${x}
352 fi
153 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} *****"
154 echo 369 echo
155 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} )"
156 eerror 407 eerror
157 eerror " ${EPATCH_SOURCE}" 408 eerror "Include in your bugreport the contents of:"
158 eerror " ( ${EPATCH_SOURCE##*/} )" 409 eerror
410 eerror " ${STDERR_TARGET}"
159 echo 411 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}!" 412 die "Failed Patch: ${patchname}!"
304 fi 413 fi
305 414
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 415 # if everything worked, delete the patch log
307 416 rm -f "${STDERR_TARGET}"
308 eend 0 417 eend 0
309 fi
310 done 418 done
311 if [ "${SINGLE_PATCH}" = "no" ] 419
312 then 420 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 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 break
314 fi 439 fi
440 done
315} 441}
316 442
317# @FUNCTION: emktemp 443# @FUNCTION: emktemp
318# @USAGE: [temp dir] 444# @USAGE: [temp dir]
319# @DESCRIPTION: 445# @DESCRIPTION:
355# base-system@gentoo.org (Linux) 481# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 482# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 483# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 484# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 485# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 486# Small wrapper for getent (Linux),
487# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 488# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 489egetent() {
363 case ${CHOST} in 490 case ${CHOST} in
364 *-darwin*) 491 *-darwin[678])
365 case "$2" in 492 case "$2" in
366 *[!0-9]*) # Non numeric 493 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 494 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
368 ;; 495 ;;
369 *) # Numeric 496 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 497 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
498 ;;
499 esac
500 ;;
501 *-darwin*)
502 local mytype=$1
503 [[ "passwd" == $mytype ]] && mytype="Users"
504 [[ "group" == $mytype ]] && mytype="Groups"
505 case "$2" in
506 *[!0-9]*) # Non numeric
507 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
508 ;;
509 *) # Numeric
510 local mykey="UniqueID"
511 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
512 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 513 ;;
372 esac 514 esac
373 ;; 515 ;;
374 *-freebsd*|*-dragonfly*) 516 *-freebsd*|*-dragonfly*)
375 local opts action="user" 517 local opts action="user"
575 fi 717 fi
576 ;; 718 ;;
577 719
578 *) 720 *)
579 if [[ -z $@ ]] ; then 721 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 722 useradd -r ${opts} \
581 -c "added by portage for ${PN}" \ 723 -c "added by portage for ${PN}" \
724 ${euser} \
582 || die "enewuser failed" 725 || die "enewuser failed"
583 else 726 else
584 einfo " - Extra: $@" 727 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 728 useradd -r ${opts} "$@" \
729 ${euser} \
586 || die "enewuser failed" 730 || die "enewuser failed"
587 fi 731 fi
588 ;; 732 ;;
589 esac 733 esac
590 734
702 esac 846 esac
703 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 847 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
704 ;; 848 ;;
705 849
706 *) 850 *)
851 # We specify -r so that we get a GID in the system range from login.defs
707 groupadd ${opts} ${egroup} || die "enewgroup failed" 852 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
708 ;; 853 ;;
709 esac 854 esac
710 export SANDBOX_ON="${oldsandbox}" 855 export SANDBOX_ON="${oldsandbox}"
711} 856}
712 857
723 868
724# Make a desktop file ! 869# Make a desktop file !
725# Great for making those icons in kde/gnome startmenu ! 870# Great for making those icons in kde/gnome startmenu !
726# Amaze your friends ! Get the women ! Join today ! 871# Amaze your friends ! Get the women ! Join today !
727# 872#
728# make_desktop_entry(<command>, [name], [icon], [type], [path]) 873# make_desktop_entry(<command>, [name], [icon], [type], [fields])
729# 874#
730# binary: what command does the app run with ? 875# binary: what command does the app run with ?
731# name: the name that will show up in the menu 876# name: the name that will show up in the menu
732# icon: give your little like a pretty little icon ... 877# icon: give your little like a pretty little icon ...
733# this can be relative (to /usr/share/pixmaps) or 878# this can be relative (to /usr/share/pixmaps) or
734# a full path to an icon 879# a full path to an icon
735# type: what kind of application is this ? for categories: 880# type: what kind of application is this ? for categories:
736# http://standards.freedesktop.org/menu-spec/latest/apa.html 881# http://standards.freedesktop.org/menu-spec/latest/apa.html
737# path: if your app needs to startup in a specific dir 882# fields: extra fields to append to the desktop file; a printf string
738make_desktop_entry() { 883make_desktop_entry() {
739 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 884 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
740 885
741 local exec=${1} 886 local exec=${1}
742 local name=${2:-${PN}} 887 local name=${2:-${PN}}
743 local icon=${3:-${PN}} 888 local icon=${3:-${PN}}
744 local type=${4} 889 local type=${4}
745 local path=${5} 890 local fields=${5}
746 891
747 if [[ -z ${type} ]] ; then 892 if [[ -z ${type} ]] ; then
748 local catmaj=${CATEGORY%%-*} 893 local catmaj=${CATEGORY%%-*}
749 local catmin=${CATEGORY##*-} 894 local catmin=${CATEGORY##*-}
750 case ${catmaj} in 895 case ${catmaj} in
751 app) 896 app)
752 case ${catmin} in 897 case ${catmin} in
753 accessibility) type=Accessibility;; 898 accessibility) type=Accessibility;;
754 admin) type=System;; 899 admin) type=System;;
755 antivirus) type=System;; 900 antivirus) type=System;;
756 arch) type=Archiving;; 901 arch) type=Archiving;;
757 backup) type=Archiving;; 902 backup) type=Archiving;;
758 cdr) type=DiscBurning;; 903 cdr) type=DiscBurning;;
759 dicts) type=Dictionary;; 904 dicts) type=Dictionary;;
760 doc) type=Documentation;; 905 doc) type=Documentation;;
761 editors) type=TextEditor;; 906 editors) type=TextEditor;;
762 emacs) type=TextEditor;; 907 emacs) type=TextEditor;;
763 emulation) type=Emulator;; 908 emulation) type=Emulator;;
764 laptop) type=HardwareSettings;; 909 laptop) type=HardwareSettings;;
765 office) type=Office;; 910 office) type=Office;;
766 pda) type=PDA;; 911 pda) type=PDA;;
767 vim) type=TextEditor;; 912 vim) type=TextEditor;;
768 xemacs) type=TextEditor;; 913 xemacs) type=TextEditor;;
769 *) type=;;
770 esac 914 esac
771 ;; 915 ;;
772 916
773 dev) 917 dev)
774 type="Development" 918 type="Development"
775 ;; 919 ;;
776 920
777 games) 921 games)
778 case ${catmin} in 922 case ${catmin} in
779 action|fps) type=ActionGame;; 923 action|fps) type=ActionGame;;
780 arcade) type=ArcadeGame;; 924 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 925 board) type=BoardGame;;
782 emulation) type=Emulator;; 926 emulation) type=Emulator;;
783 kids) type=KidsGame;; 927 kids) type=KidsGame;;
784 puzzle) type=LogicGame;; 928 puzzle) type=LogicGame;;
785 roguelike) type=RolePlaying;; 929 roguelike) type=RolePlaying;;
786 rpg) type=RolePlaying;; 930 rpg) type=RolePlaying;;
787 simulation) type=Simulation;; 931 simulation) type=Simulation;;
788 sports) type=SportsGame;; 932 sports) type=SportsGame;;
789 strategy) type=StrategyGame;; 933 strategy) type=StrategyGame;;
790 *) type=;;
791 esac 934 esac
792 type="Game;${type}" 935 type="Game;${type}"
793 ;; 936 ;;
794 937
795 gnome) 938 gnome)
804 type="Network;Email" 947 type="Network;Email"
805 ;; 948 ;;
806 949
807 media) 950 media)
808 case ${catmin} in 951 case ${catmin} in
952 gfx)
809 gfx) type=Graphics;; 953 type=Graphics
954 ;;
955 *)
956 case ${catmin} in
810 radio) type=Tuner;; 957 radio) type=Tuner;;
811 sound) type=Audio;; 958 sound) type=Audio;;
812 tv) type=TV;; 959 tv) type=TV;;
813 video) type=Video;; 960 video) type=Video;;
814 *) type=;; 961 esac
962 type="AudioVideo;${type}"
963 ;;
815 esac 964 esac
816 type="AudioVideo;${type}"
817 ;; 965 ;;
818 966
819 net) 967 net)
820 case ${catmin} in 968 case ${catmin} in
821 dialup) type=Dialup;; 969 dialup) type=Dialup;;
822 ftp) type=FileTransfer;; 970 ftp) type=FileTransfer;;
823 im) type=InstantMessaging;; 971 im) type=InstantMessaging;;
824 irc) type=IRCClient;; 972 irc) type=IRCClient;;
825 mail) type=Email;; 973 mail) type=Email;;
826 news) type=News;; 974 news) type=News;;
827 nntp) type=News;; 975 nntp) type=News;;
828 p2p) type=FileTransfer;; 976 p2p) type=FileTransfer;;
829 *) type=;; 977 voip) type=Telephony;;
830 esac 978 esac
831 type="Network;${type}" 979 type="Network;${type}"
832 ;; 980 ;;
833 981
834 sci) 982 sci)
835 case ${catmin} in 983 case ${catmin} in
836 astro*) type=Astronomy;; 984 astro*) type=Astronomy;;
837 bio*) type=Biology;; 985 bio*) type=Biology;;
838 calc*) type=Calculator;; 986 calc*) type=Calculator;;
839 chem*) type=Chemistry;; 987 chem*) type=Chemistry;;
840 elec*) type=Electronics;; 988 elec*) type=Electronics;;
841 geo*) type=Geology;; 989 geo*) type=Geology;;
842 math*) type=Math;; 990 math*) type=Math;;
843 physics) type=Physics;; 991 physics) type=Physics;;
844 visual*) type=DataVisualization;; 992 visual*) type=DataVisualization;;
845 *) type=;;
846 esac 993 esac
847 type="Science;${type}" 994 type="Education;Science;${type}"
848 ;; 995 ;;
849 996
850 sys) 997 sys)
851 type="System" 998 type="System"
852 ;; 999 ;;
853 1000
854 www) 1001 www)
855 case ${catmin} in 1002 case ${catmin} in
856 client) type=WebBrowser;; 1003 client) type=WebBrowser;;
857 *) type=;;
858 esac 1004 esac
859 type="Network" 1005 type="Network;${type}"
860 ;; 1006 ;;
861 1007
862 *) 1008 *)
863 type= 1009 type=
864 ;; 1010 ;;
870 local desktop_name="${PN}-${SLOT}" 1016 local desktop_name="${PN}-${SLOT}"
871 fi 1017 fi
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1018 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1019 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 1020
1021 # Don't append another ";" when a valid category value is provided.
1022 type=${type%;}${type:+;}
1023
1024 eshopts_push -s extglob
1025 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1026 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1027 ewarn "allowed in .desktop files if the value is not an absolute path."
1028 icon=${icon%.@(xpm|png|svg)}
1029 fi
1030 eshopts_pop
1031
875 cat <<-EOF > "${desktop}" 1032 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 1033 [Desktop Entry]
877 Version=1.0
878 Name=${name} 1034 Name=${name}
879 Type=Application 1035 Type=Application
880 Comment=${DESCRIPTION} 1036 Comment=${DESCRIPTION}
881 Exec=${exec} 1037 Exec=${exec}
882 TryExec=${exec%% *} 1038 TryExec=${exec%% *}
883 Icon=${icon} 1039 Icon=${icon}
884 Categories=${type}; 1040 Categories=${type}
885 EOF 1041 EOF
886 1042
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1043 if [[ ${fields:-=} != *=* ]] ; then
1044 # 5th arg used to be value to Path=
1045 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1046 fields="Path=${fields}"
1047 fi
1048 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
888 1049
889 ( 1050 (
890 # wrap the env here so that the 'insinto' call 1051 # wrap the env here so that the 'insinto' call
891 # doesn't corrupt the env of the caller 1052 # doesn't corrupt the env of the caller
892 insinto /usr/share/applications 1053 insinto /usr/share/applications
893 doins "${desktop}" 1054 doins "${desktop}"
894 ) 1055 ) || die "installing desktop file failed"
895} 1056}
896 1057
897# @FUNCTION: validate_desktop_entries 1058# @FUNCTION: validate_desktop_entries
898# @USAGE: [directories] 1059# @USAGE: [directories]
899# @MAINTAINER: 1060# @MAINTAINER:
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1082 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1083 fi
923} 1084}
924 1085
925# @FUNCTION: make_session_desktop 1086# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1087# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1088# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1089# 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. 1090# Window Manager. The command is the name of the Window Manager.
1091#
1092# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1093make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1094 [[ -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 1095 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1096
934 local title=$1 1097 local title=$1
935 local command=$2 1098 local command=$2
936 local desktop=${T}/${wm}.desktop 1099 local desktop=${T}/${wm:-${PN}}.desktop
1100 shift 2
937 1101
938 cat <<-EOF > "${desktop}" 1102 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1103 [Desktop Entry]
940 Name=${title} 1104 Name=${title}
941 Comment=This session logs you into ${title} 1105 Comment=This session logs you into ${title}
942 Exec=${command} 1106 Exec=${command} $*
943 TryExec=${command} 1107 TryExec=${command}
944 Type=Application 1108 Type=XSession
945 EOF 1109 EOF
946 1110
947 ( 1111 (
948 # wrap the env here so that the 'insinto' call 1112 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1113 # doesn't corrupt the env of the caller
1175 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1339 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1176 1340
1177 local shrtsrc=$(basename "${src}") 1341 local shrtsrc=$(basename "${src}")
1178 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1342 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1179 if [[ -z ${skip} ]] ; then 1343 if [[ -z ${skip} ]] ; then
1180 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1344 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1345 local skip=0
1182 exe=tail 1346 exe=tail
1183 case ${ver} in 1347 case ${ver} in
1184 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1348 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) 1349 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1187 2.0|2.0.1) 1351 2.0|2.0.1)
1188 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1352 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1189 ;; 1353 ;;
1190 2.1.1) 1354 2.1.1)
1191 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1355 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1192 let skip="skip + 1" 1356 (( skip++ ))
1193 ;; 1357 ;;
1194 2.1.2) 1358 2.1.2)
1195 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1359 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1196 let skip="skip + 1" 1360 (( skip++ ))
1197 ;; 1361 ;;
1198 2.1.3) 1362 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1363 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1364 (( skip++ ))
1201 ;; 1365 ;;
1202 2.1.4|2.1.5) 1366 2.1.4|2.1.5)
1203 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1367 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1368 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1369 exe="dd"
1214 esac 1378 esac
1215 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1379 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1216 fi 1380 fi
1217 case ${exe} in 1381 case ${exe} in
1218 tail) exe="tail -n +${skip} '${src}'";; 1382 tail) exe="tail -n +${skip} '${src}'";;
1219 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1383 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1220 *) die "makeself cant handle exe '${exe}'" 1384 *) die "makeself cant handle exe '${exe}'"
1221 esac 1385 esac
1222 1386
1223 # lets grab the first few bytes of the file to figure out what kind of archive it is 1387 # lets grab the first few bytes of the file to figure out what kind of archive it is
1224 local tmpfile=$(emktemp) 1388 local tmpfile=$(emktemp)
1261 lic="${PWD}/${lic}" 1425 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1426 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1427 lic="${lic}"
1264 fi 1428 fi
1265 fi 1429 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1430 local l="`basename ${lic}`"
1268 1431
1269 # here is where we check for the licenses the user already 1432 # 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 1433 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1434 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1435 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1436 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1437 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1438 eshopts_pop
1277 return 0 1439 return 0
1278 fi 1440 fi
1279 done 1441 done
1280 set +o noglob; set -$shopts #reset old shell opts 1442 eshopts_pop
1443 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1444
1282 local licmsg=$(emktemp) 1445 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1446 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1447 **********************************************************
1285 The following license outlines the terms of use of this 1448 The following license outlines the terms of use of this
1358 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1521 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1522 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1360 export CDROM_SET=-1 1523 export CDROM_SET=-1
1361 for f in ${CDROM_CHECK_1//:/ } ; do 1524 for f in ${CDROM_CHECK_1//:/ } ; do
1362 ((++CDROM_SET)) 1525 ((++CDROM_SET))
1363 [[ -e ${CD_ROOT}/${f} ]] && break 1526 [[ -e ${CDROM_ROOT}/${f} ]] && break
1364 done 1527 done
1365 export CDROM_MATCH=${f} 1528 export CDROM_MATCH=${f}
1366 return 1529 return
1367 fi 1530 fi
1368 1531
1454# displayed and we'll hang out here until: 1617# displayed and we'll hang out here until:
1455# (1) the file is found on a mounted cdrom 1618# (1) the file is found on a mounted cdrom
1456# (2) the user hits CTRL+C 1619# (2) the user hits CTRL+C
1457_cdrom_locate_file_on_cd() { 1620_cdrom_locate_file_on_cd() {
1458 local mline="" 1621 local mline=""
1459 local showedmsg=0 1622 local showedmsg=0 showjolietmsg=0
1460 1623
1461 while [[ -z ${CDROM_ROOT} ]] ; do 1624 while [[ -z ${CDROM_ROOT} ]] ; do
1462 local i=0 1625 local i=0
1463 local -a cdset=(${*//:/ }) 1626 local -a cdset=(${*//:/ })
1464 if [[ -n ${CDROM_SET} ]] ; then 1627 if [[ -n ${CDROM_SET} ]] ; then
1505 showedmsg=1 1668 showedmsg=1
1506 fi 1669 fi
1507 einfo "Press return to scan for the cd again" 1670 einfo "Press return to scan for the cd again"
1508 einfo "or hit CTRL+C to abort the emerge." 1671 einfo "or hit CTRL+C to abort the emerge."
1509 echo 1672 echo
1673 if [[ ${showjolietmsg} -eq 0 ]] ; then
1674 showjolietmsg=1
1675 else
1510 einfo "If you are having trouble with the detection" 1676 ewarn "If you are having trouble with the detection"
1511 einfo "of your CD, it is possible that you do not have" 1677 ewarn "of your CD, it is possible that you do not have"
1512 einfo "Joliet support enabled in your kernel. Please" 1678 ewarn "Joliet support enabled in your kernel. Please"
1513 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1679 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1680 ebeep 5
1681 fi
1514 read || die "something is screwed with your system" 1682 read || die "something is screwed with your system"
1515 done 1683 done
1516} 1684}
1517 1685
1518# @FUNCTION: strip-linguas 1686# @FUNCTION: strip-linguas
1527# of the lists. 1695# of the lists.
1528strip-linguas() { 1696strip-linguas() {
1529 local ls newls nols 1697 local ls newls nols
1530 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1698 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1531 local op=$1; shift 1699 local op=$1; shift
1532 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1700 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1533 local d f 1701 local d f
1534 for d in "$@" ; do 1702 for d in "$@" ; do
1535 if [[ ${op} == "-u" ]] ; then 1703 if [[ ${op} == "-u" ]] ; then
1536 newls=${ls} 1704 newls=${ls}
1537 else 1705 else
1538 newls="" 1706 newls=""
1539 fi 1707 fi
1540 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1708 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1541 if [[ ${op} == "-i" ]] ; then 1709 if [[ ${op} == "-i" ]] ; then
1542 hasq ${f} ${ls} && newls="${newls} ${f}" 1710 hasq ${f} ${ls} && newls="${newls} ${f}"
1543 else 1711 else
1544 hasq ${f} ${ls} || newls="${newls} ${f}" 1712 hasq ${f} ${ls} || newls="${newls} ${f}"
1545 fi 1713 fi
1558 else 1726 else
1559 nols="${nols} ${f}" 1727 nols="${nols} ${f}"
1560 fi 1728 fi
1561 done 1729 done
1562 [[ -n ${nols} ]] \ 1730 [[ -n ${nols} ]] \
1563 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1731 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1564 export LINGUAS=${newls:1} 1732 export LINGUAS=${newls:1}
1565} 1733}
1566 1734
1567# @FUNCTION: preserve_old_lib 1735# @FUNCTION: preserve_old_lib
1568# @USAGE: <libs to preserve> [more libs] 1736# @USAGE: <libs to preserve> [more libs]
1578 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1746 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1579 die "Invalid preserve_old_lib() usage" 1747 die "Invalid preserve_old_lib() usage"
1580 fi 1748 fi
1581 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1749 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1582 1750
1751 # let portage worry about it
1752 has preserve-libs ${FEATURES} && return 0
1753
1583 local lib dir 1754 local lib dir
1584 for lib in "$@" ; do 1755 for lib in "$@" ; do
1585 [[ -e ${ROOT}/${lib} ]] || continue 1756 [[ -e ${ROOT}/${lib} ]] || continue
1586 dir=${lib%/*} 1757 dir=${lib%/*}
1587 dodir ${dir} || die "dodir ${dir} failed" 1758 dodir ${dir} || die "dodir ${dir} failed"
1597preserve_old_lib_notify() { 1768preserve_old_lib_notify() {
1598 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1769 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1599 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1770 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1600 die "Invalid preserve_old_lib_notify() usage" 1771 die "Invalid preserve_old_lib_notify() usage"
1601 fi 1772 fi
1773
1774 # let portage worry about it
1775 has preserve-libs ${FEATURES} && return 0
1602 1776
1603 local lib notice=0 1777 local lib notice=0
1604 for lib in "$@" ; do 1778 for lib in "$@" ; do
1605 [[ -e ${ROOT}/${lib} ]] || continue 1779 [[ -e ${ROOT}/${lib} ]] || continue
1606 if [[ ${notice} -eq 0 ]] ; then 1780 if [[ ${notice} -eq 0 ]] ; then
1615 ewarn " # revdep-rebuild --library ${lib##*/}" 1789 ewarn " # revdep-rebuild --library ${lib##*/}"
1616 done 1790 done
1617 if [[ ${notice} -eq 1 ]] ; then 1791 if [[ ${notice} -eq 1 ]] ; then
1618 ewarn 1792 ewarn
1619 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1793 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1620 ewarn "delete the old libraries." 1794 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1795 for lib in "$@" ; do
1796 ewarn " # rm '${lib}'"
1797 done
1621 fi 1798 fi
1622} 1799}
1623 1800
1624# @FUNCTION: built_with_use 1801# @FUNCTION: built_with_use
1625# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1802# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1626# @DESCRIPTION: 1803# @DESCRIPTION:
1804#
1805# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1806#
1627# A temporary hack until portage properly supports DEPENDing on USE 1807# A temporary hack until portage properly supports DEPENDing on USE
1628# flags being enabled in packages. This will check to see if the specified 1808# 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 1809# 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 1810# --missing option controls the behavior if called on a package that does
1631# not actually support the defined USE flags (aka listed in IUSE). 1811# 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 1812# 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" 1813# 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 1814# 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 1815# 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 1816# 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 1817# means the USE flag we're checking is hidden expanded, so it won't be found
1638# in IUSE like normal USE flags. 1818# in IUSE like normal USE flags.
1639# 1819#
1640# Remember that this function isn't terribly intelligent so order of optional 1820# 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";; 1855 die) die "Unable to determine what USE flags $PKG was built with";;
1676 esac 1856 esac
1677 fi 1857 fi
1678 1858
1679 if [[ ${hidden} == "no" ]] ; then 1859 if [[ ${hidden} == "no" ]] ; then
1680 local IUSE_BUILT=$(<${IUSEFILE}) 1860 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1681 # Don't check USE_EXPAND #147237 1861 # Don't check USE_EXPAND #147237
1682 local expand 1862 local expand
1683 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1863 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1684 if [[ $1 == ${expand}_* ]] ; then 1864 if [[ $1 == ${expand}_* ]] ; then
1685 expand="" 1865 expand=""
1686 break 1866 break
1687 fi 1867 fi
1688 done 1868 done
1689 if [[ -n ${expand} ]] ; then 1869 if [[ -n ${expand} ]] ; then
1690 if ! has $1 ${IUSE_BUILT} ; then 1870 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1691 case ${missing_action} in 1871 case ${missing_action} in
1692 true) return 0;; 1872 true) return 0;;
1693 false) return 1;; 1873 false) return 1;;
1694 die) die "$PKG does not actually support the $1 USE flag!";; 1874 die) die "$PKG does not actually support the $1 USE flag!";;
1695 esac 1875 esac
1726 done 1906 done
1727 eend 0 1907 eend 0
1728} 1908}
1729 1909
1730# @FUNCTION: make_wrapper 1910# @FUNCTION: make_wrapper
1731# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1911# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1732# @DESCRIPTION: 1912# @DESCRIPTION:
1733# Create a shell wrapper script named wrapper in installpath 1913# Create a shell wrapper script named wrapper in installpath
1734# (defaults to the bindir) to execute target (default of wrapper) by 1914# (defaults to the bindir) to execute target (default of wrapper) by
1735# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1915# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1736# libpaths followed by optionally changing directory to chdir. 1916# libpaths followed by optionally changing directory to chdir.
1759 ) || die 1939 ) || die
1760 else 1940 else
1761 newbin "${tmpwrapper}" "${wrapper}" || die 1941 newbin "${tmpwrapper}" "${wrapper}" || die
1762 fi 1942 fi
1763} 1943}
1944
1945# @FUNCTION: prepalldocs
1946# @USAGE:
1947# @DESCRIPTION:
1948# Compress files in /usr/share/doc which are not already
1949# compressed, excluding /usr/share/doc/${PF}/html.
1950# Uses the ecompressdir to do the compression.
1951# 2009-02-18 by betelgeuse:
1952# Commented because ecompressdir is even more internal to
1953# Portage than prepalldocs (it's not even mentioned in man 5
1954# ebuild). Please submit a better version for review to gentoo-dev
1955# if you want prepalldocs here.
1956#prepalldocs() {
1957# if [[ -n $1 ]] ; then
1958# ewarn "prepalldocs: invalid usage; takes no arguments"
1959# fi
1960
1961# cd "${D}"
1962# [[ -d usr/share/doc ]] || return 0
1963
1964# find usr/share/doc -exec gzip {} +
1965# ecompressdir --ignore /usr/share/doc/${PF}/html
1966# ecompressdir --queue /usr/share/doc
1967#}

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

  ViewVC Help
Powered by ViewVC 1.1.20