/[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.334
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.334 2010/02/26 03:15:26 abcd 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 [[ $(type -t eqawarn) == function ]] && \
58 eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
59}
60
61epause() {
62 [[ $(type -t eqawarn) == function ]] && \
63 eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
64}
65
66fi
67
68# @FUNCTION: ecvs_clean
69# @USAGE: [list of dirs]
70# @DESCRIPTION:
71# Remove CVS directories recursiveley. Useful when a source tarball contains
72# internal CVS directories. Defaults to $PWD.
73ecvs_clean() {
74 [[ -z $* ]] && set -- .
75 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
76 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
77}
78
79# @FUNCTION: esvn_clean
80# @USAGE: [list of dirs]
81# @DESCRIPTION:
82# Remove .svn directories recursiveley. Useful when a source tarball contains
83# internal Subversion directories. Defaults to $PWD.
84esvn_clean() {
85 [[ -z $* ]] && set -- .
86 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
87}
88
89# @FUNCTION: eshopts_push
90# @USAGE: [options to `set` or `shopt`]
91# @DESCRIPTION:
92# Often times code will want to enable a shell option to change code behavior.
93# Since changing shell options can easily break other pieces of code (which
94# assume the default state), eshopts_push is used to (1) push the current shell
95# options onto a stack and (2) pass the specified arguments to set.
96#
97# If the first argument is '-s' or '-u', we assume you want to call `shopt`
98# rather than `set` as there are some options only available via that.
99#
100# A common example is to disable shell globbing so that special meaning/care
101# may be used with variables/arguments to custom functions. That would be:
102# @CODE
103# eshopts_push -o noglob
104# for x in ${foo} ; do
105# if ...some check... ; then
106# eshopts_pop
107# return 0
108# fi
109# done
110# eshopts_pop
111# @CODE
112eshopts_push() {
113 # have to assume __ESHOPTS_SAVE__ isn't screwed with
114 # as a `declare -a` here will reset its value
115 local i=${#__ESHOPTS_SAVE__[@]}
116 if [[ $1 == -[su] ]] ; then
117 __ESHOPTS_SAVE__[$i]=$(shopt -p)
118 [[ $# -eq 0 ]] && return 0
119 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
120 else
121 __ESHOPTS_SAVE__[$i]=$-
122 [[ $# -eq 0 ]] && return 0
123 set "$@" || die "eshopts_push: bad options to set: $*"
124 fi
125}
126
127# @FUNCTION: eshopts_pop
128# @USAGE:
129# @DESCRIPTION:
130# Restore the shell options to the state saved with the corresponding
131# eshopts_push call. See that function for more details.
132eshopts_pop() {
133 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
134 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
135 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
136 local s=${__ESHOPTS_SAVE__[$i]}
137 unset __ESHOPTS_SAVE__[$i]
138 if [[ ${s} == "shopt -"* ]] ; then
139 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
140 else
141 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
142 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
143 fi
144}
145
146# @VARIABLE: EPATCH_SOURCE
147# @DESCRIPTION:
148# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 149EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 150# @VARIABLE: EPATCH_SUFFIX
151# @DESCRIPTION:
152# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 153EPATCH_SUFFIX="patch.bz2"
154# @VARIABLE: EPATCH_OPTS
155# @DESCRIPTION:
56# Default options for patch 156# Default options for patch:
157# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 158# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 159# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 160# -E - automatically remove empty files
161# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 162EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
163# @VARIABLE: EPATCH_EXCLUDE
164# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 165# List of patches not to apply. Note this is only file names,
62# and not the full path .. 166# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 167EPATCH_EXCLUDE=""
168# @VARIABLE: EPATCH_SINGLE_MSG
169# @DESCRIPTION:
64# Change the printed message for a single patch. 170# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 171EPATCH_SINGLE_MSG=""
172# @VARIABLE: EPATCH_MULTI_MSG
173# @DESCRIPTION:
66# Change the printed message for multiple patches. 174# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 175EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 176# @VARIABLE: EPATCH_FORCE
69# 177# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 178# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 179# arch naming style.
72EPATCH_FORCE="no" 180EPATCH_FORCE="no"
73 181
74# This function is for bulk patching, or in theory for just one 182# @FUNCTION: epatch
75# or two patches. 183# @USAGE: [patches] [dirs of patches]
184# @DESCRIPTION:
185# epatch is designed to greatly simplify the application of patches. It can
186# process patch files directly, or directories of patches. The patches may be
187# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
188# the -p option as epatch will automatically attempt -p0 to -p5 until things
189# apply successfully.
76# 190#
77# It should work with .bz2, .gz, .zip and plain text patches. 191# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 192# specified by EPATCH_SOURCE.
79# 193#
80# You do not have to specify '-p' option to patch, as it will 194# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 195# @CODE
82# 196# ${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} 197# ??_${ARCH}_foo.${EPATCH_SUFFIX}
198# else
199# *.${EPATCH_SUFFIX}
200# @CODE
201# The leading ?? are typically numbers used to force consistent patch ordering.
202# The arch field is used to apply patches only for the host architecture with
203# the special value of "all" means apply for everyone. Note that using values
204# other than "all" is highly discouraged -- you should apply patches all the
205# time and let architecture details be detected at configure/compile time.
92# 206#
93# For example: 207# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
208# for patches to apply.
94# 209#
95# 01_all_misc-fix.patch.bz2 210# 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() { 211epatch() {
108 _epatch_draw_line() { 212 _epatch_draw_line() {
213 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 214 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 215 echo "${1//?/=}"
111 } 216 }
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 217
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 218 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 219
122 if [ "$#" -gt 1 ] 220 # Let the rest of the code process one user arg at a time --
123 then 221 # each arg may expand into multiple patches, and each arg may
222 # need to start off with the default global EPATCH_xxx values
223 if [[ $# -gt 1 ]] ; then
124 local m="" 224 local m
125 for m in "$@" ; do 225 for m in "$@" ; do
126 epatch "${m}" 226 epatch "${m}"
127 done 227 done
128 return 0 228 return 0
129 fi 229 fi
130 230
131 if [ -n "$1" -a -f "$1" ] 231 local SINGLE_PATCH="no"
132 then 232 # no args means process ${EPATCH_SOURCE}
233 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
234
235 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 236 SINGLE_PATCH="yes"
134 237 set -- "$1"
135 local EPATCH_SOURCE="$1" 238 # Use the suffix from the single patch (localize it); the code
239 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 240 local EPATCH_SUFFIX=$1
137 241
138 elif [ -n "$1" -a -d "$1" ] 242 elif [[ -d $1 ]] ; then
139 then 243 # 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 ... 244 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 245
246 else
247 # sanity check ... if it isn't a dir or file, wtf man ?
248 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
249 echo
250 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
251 eerror
252 eerror " ${EPATCH_SOURCE}"
253 eerror " ( ${EPATCH_SOURCE##*/} )"
254 echo
255 die "Cannot find \$EPATCH_SOURCE!"
256 fi
257
258 local PIPE_CMD
259 case ${EPATCH_SUFFIX##*\.} in
260 xz) PIPE_CMD="xz -dc" ;;
261 lzma) PIPE_CMD="lzma -dc" ;;
262 bz2) PIPE_CMD="bzip2 -dc" ;;
263 gz|Z|z) PIPE_CMD="gzip -dc" ;;
264 ZIP|zip) PIPE_CMD="unzip -p" ;;
265 *) ;;
266 esac
267
268 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
269
270 local x
271 for x in "$@" ; do
272 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
273 # didn't match anything, ignore continue on
274 [[ ! -f ${x} ]] && continue
275
276 local patchname=${x##*/}
277
278 # Apply single patches, or forced sets of patches, or
279 # patches with ARCH dependant names.
280 # ???_arch_foo.patch
281 # Else, skip this input altogether
282 local a=${patchname#*_} # strip the ???_
283 a=${a%%_*} # strip the _foo.patch
284 if ! [[ ${SINGLE_PATCH} == "yes" || \
285 ${EPATCH_FORCE} == "yes" || \
286 ${a} == all || \
287 ${a} == ${ARCH} ]]
142 then 288 then
143 local EPATCH_SOURCE="$1/*" 289 continue
290 fi
291
292 # Let people filter things dynamically
293 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
294 # let people use globs in the exclude
295 eshopts_push -o noglob
296
297 local ex
298 for ex in ${EPATCH_EXCLUDE} ; do
299 if [[ ${patchname} == ${ex} ]] ; then
300 eshopts_pop
301 continue 2
302 fi
303 done
304
305 eshopts_pop
306 fi
307
308 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
309 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
310 einfo "${EPATCH_SINGLE_MSG}"
311 else
312 einfo "Applying ${patchname} ..."
313 fi
144 else 314 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 315 einfo " ${patchname} ..."
146 fi 316 fi
147 else 317
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 318 # most of the time, there will only be one run per unique name,
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 319 # but if there are more, make sure we get unique log filenames
150 then 320 local STDERR_TARGET="${T}/${patchname}.out"
151 EPATCH_SOURCE="$1" 321 if [[ -e ${STDERR_TARGET} ]] ; then
322 STDERR_TARGET="${T}/${patchname}-$$.out"
323 fi
324
325 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
326
327 # Decompress the patch if need be
328 local count=0
329 local PATCH_TARGET
330 if [[ -n ${PIPE_CMD} ]] ; then
331 PATCH_TARGET="${T}/$$.patch"
332 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
333
334 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
335 echo
336 eerror "Could not extract patch!"
337 #die "Could not extract patch!"
338 count=5
339 break
152 fi 340 fi
341 else
342 PATCH_TARGET=${x}
343 fi
153 344
345 # Check for absolute paths in patches. If sandbox is disabled,
346 # people could (accidently) patch files in the root filesystem.
347 # Or trigger other unpleasantries #237667. So disallow -p0 on
348 # such patches.
349 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
350 if [[ -n ${abs_paths} ]] ; then
351 count=1
352 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
353 fi
354
355 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
356 while [[ ${count} -lt 5 ]] ; do
357 # Generate some useful debug info ...
358 (
359 _epatch_draw_line "***** ${patchname} *****"
154 echo 360 echo
155 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 361 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
362 echo
363 _epatch_draw_line "***** ${patchname} *****"
364 ) >> "${STDERR_TARGET}"
365
366 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
367 (
368 _epatch_draw_line "***** ${patchname} *****"
369 echo
370 echo "ACTUALLY APPLYING ${patchname} ..."
371 echo
372 _epatch_draw_line "***** ${patchname} *****"
373 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
374 ) >> "${STDERR_TARGET}"
375
376 if [ $? -ne 0 ] ; then
377 echo
378 eerror "A dry-run of patch command succeeded, but actually"
379 eerror "applying the patch failed!"
380 #die "Real world sux compared to the dreamworld!"
381 count=5
382 fi
383 break
384 fi
385
386 : $(( count++ ))
387 done
388
389 # if we had to decompress the patch, delete the temp one
390 if [[ -n ${PIPE_CMD} ]] ; then
391 rm -f "${PATCH_TARGET}"
392 fi
393
394 if [[ ${count} -ge 5 ]] ; then
395 echo
396 eerror "Failed Patch: ${patchname} !"
397 eerror " ( ${PATCH_TARGET} )"
156 eerror 398 eerror
157 eerror " ${EPATCH_SOURCE}" 399 eerror "Include in your bugreport the contents of:"
158 eerror " ( ${EPATCH_SOURCE##*/} )" 400 eerror
401 eerror " ${STDERR_TARGET}"
159 echo 402 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}!" 403 die "Failed Patch: ${patchname}!"
304 fi 404 fi
305 405
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 406 # if everything worked, delete the patch log
307 407 rm -f "${STDERR_TARGET}"
308 eend 0 408 eend 0
309 fi
310 done 409 done
311 if [ "${SINGLE_PATCH}" = "no" ] 410
312 then 411 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 einfo "Done with patching" 412 : # everything worked
413}
414epatch_user() {
415 [[ $# -ne 0 ]] && die "epatch_user takes no options"
416
417 # don't clobber any EPATCH vars that the parent might want
418 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
419 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
420 EPATCH_SOURCE=${base}/${CTARGET}/${check}
421 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
422 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
423 if [[ -d ${EPATCH_SOURCE} ]] ; then
424 EPATCH_SOURCE=${EPATCH_SOURCE} \
425 EPATCH_SUFFIX="patch" \
426 EPATCH_FORCE="yes" \
427 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
428 epatch
429 break
314 fi 430 fi
431 done
315} 432}
316 433
317# @FUNCTION: emktemp 434# @FUNCTION: emktemp
318# @USAGE: [temp dir] 435# @USAGE: [temp dir]
319# @DESCRIPTION: 436# @DESCRIPTION:
… …
355# base-system@gentoo.org (Linux) 472# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 473# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 474# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 475# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 476# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 477# Small wrapper for getent (Linux),
478# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 479# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 480egetent() {
363 case ${CHOST} in 481 case ${CHOST} in
364 *-darwin*) 482 *-darwin[678])
365 case "$2" in 483 case "$2" in
366 *[!0-9]*) # Non numeric 484 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
368 ;; 486 ;;
369 *) # Numeric 487 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 488 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
489 ;;
490 esac
491 ;;
492 *-darwin*)
493 local mytype=$1
494 [[ "passwd" == $mytype ]] && mytype="Users"
495 [[ "group" == $mytype ]] && mytype="Groups"
496 case "$2" in
497 *[!0-9]*) # Non numeric
498 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
499 ;;
500 *) # Numeric
501 local mykey="UniqueID"
502 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
503 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 504 ;;
372 esac 505 esac
373 ;; 506 ;;
374 *-freebsd*|*-dragonfly*) 507 *-freebsd*|*-dragonfly*)
375 local opts action="user" 508 local opts action="user"
… …
575 fi 708 fi
576 ;; 709 ;;
577 710
578 *) 711 *)
579 if [[ -z $@ ]] ; then 712 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 713 useradd ${opts} \
581 -c "added by portage for ${PN}" \ 714 -c "added by portage for ${PN}" \
715 ${euser} \
582 || die "enewuser failed" 716 || die "enewuser failed"
583 else 717 else
584 einfo " - Extra: $@" 718 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 719 useradd ${opts} "$@" \
720 ${euser} \
586 || die "enewuser failed" 721 || die "enewuser failed"
587 fi 722 fi
588 ;; 723 ;;
589 esac 724 esac
590 725
… …
824 irc) type=IRCClient;; 959 irc) type=IRCClient;;
825 mail) type=Email;; 960 mail) type=Email;;
826 news) type=News;; 961 news) type=News;;
827 nntp) type=News;; 962 nntp) type=News;;
828 p2p) type=FileTransfer;; 963 p2p) type=FileTransfer;;
964 voip) type=Telephony;;
829 *) type=;; 965 *) type=;;
830 esac 966 esac
831 type="Network;${type}" 967 type="Network;${type}"
832 ;; 968 ;;
833 969
… …
842 math*) type=Math;; 978 math*) type=Math;;
843 physics) type=Physics;; 979 physics) type=Physics;;
844 visual*) type=DataVisualization;; 980 visual*) type=DataVisualization;;
845 *) type=;; 981 *) type=;;
846 esac 982 esac
847 type="Science;${type}" 983 type="Education;Science;${type}"
848 ;; 984 ;;
849 985
850 sys) 986 sys)
851 type="System" 987 type="System"
852 ;; 988 ;;
… …
854 www) 990 www)
855 case ${catmin} in 991 case ${catmin} in
856 client) type=WebBrowser;; 992 client) type=WebBrowser;;
857 *) type=;; 993 *) type=;;
858 esac 994 esac
859 type="Network" 995 type="Network;${type}"
860 ;; 996 ;;
861 997
862 *) 998 *)
863 type= 999 type=
864 ;; 1000 ;;
… …
870 local desktop_name="${PN}-${SLOT}" 1006 local desktop_name="${PN}-${SLOT}"
871 fi 1007 fi
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1008 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1009 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 1010
1011 # Don't append another ";" when a valid category value is provided.
1012 type=${type%;}${type:+;}
1013
1014 eshopts_push -s extglob
1015 if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then
1016 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1017 ewarn "allowed in .desktop files if the value is not an absolute path."
1018 icon=${icon%.@(xpm|png|svg)}
1019 fi
1020 eshopts_pop
1021
875 cat <<-EOF > "${desktop}" 1022 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 1023 [Desktop Entry]
877 Version=1.0
878 Name=${name} 1024 Name=${name}
879 Type=Application 1025 Type=Application
880 Comment=${DESCRIPTION} 1026 Comment=${DESCRIPTION}
881 Exec=${exec} 1027 Exec=${exec}
882 TryExec=${exec%% *} 1028 TryExec=${exec%% *}
883 Icon=${icon} 1029 Icon=${icon}
884 Categories=${type}; 1030 Categories=${type}
885 EOF 1031 EOF
886 1032
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1033 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
888 1034
889 ( 1035 (
… …
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1067 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1068 fi
923} 1069}
924 1070
925# @FUNCTION: make_session_desktop 1071# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1072# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1073# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1074# 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. 1075# Window Manager. The command is the name of the Window Manager.
1076#
1077# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1078make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1079 [[ -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 1080 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1081
934 local title=$1 1082 local title=$1
935 local command=$2 1083 local command=$2
936 local desktop=${T}/${wm}.desktop 1084 local desktop=${T}/${wm:-${PN}}.desktop
1085 shift 2
937 1086
938 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1088 [Desktop Entry]
940 Name=${title} 1089 Name=${title}
941 Comment=This session logs you into ${title} 1090 Comment=This session logs you into ${title}
942 Exec=${command} 1091 Exec=${command} $*
943 TryExec=${command} 1092 TryExec=${command}
944 Type=Application 1093 Type=XSession
945 EOF 1094 EOF
946 1095
947 ( 1096 (
948 # wrap the env here so that the 'insinto' call 1097 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1098 # doesn't corrupt the env of the caller
… …
1261 lic="${PWD}/${lic}" 1410 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1411 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1412 lic="${lic}"
1264 fi 1413 fi
1265 fi 1414 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1415 local l="`basename ${lic}`"
1268 1416
1269 # here is where we check for the licenses the user already 1417 # 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 1418 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1419 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1420 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1421 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1422 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1423 eshopts_pop
1277 return 0 1424 return 0
1278 fi 1425 fi
1279 done 1426 done
1280 set +o noglob; set -$shopts #reset old shell opts 1427 eshopts_pop
1428 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1429
1282 local licmsg=$(emktemp) 1430 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1431 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1432 **********************************************************
1285 The following license outlines the terms of use of this 1433 The following license outlines the terms of use of this
… …
1454# displayed and we'll hang out here until: 1602# displayed and we'll hang out here until:
1455# (1) the file is found on a mounted cdrom 1603# (1) the file is found on a mounted cdrom
1456# (2) the user hits CTRL+C 1604# (2) the user hits CTRL+C
1457_cdrom_locate_file_on_cd() { 1605_cdrom_locate_file_on_cd() {
1458 local mline="" 1606 local mline=""
1459 local showedmsg=0 1607 local showedmsg=0 showjolietmsg=0
1460 1608
1461 while [[ -z ${CDROM_ROOT} ]] ; do 1609 while [[ -z ${CDROM_ROOT} ]] ; do
1462 local i=0 1610 local i=0
1463 local -a cdset=(${*//:/ }) 1611 local -a cdset=(${*//:/ })
1464 if [[ -n ${CDROM_SET} ]] ; then 1612 if [[ -n ${CDROM_SET} ]] ; then
… …
1505 showedmsg=1 1653 showedmsg=1
1506 fi 1654 fi
1507 einfo "Press return to scan for the cd again" 1655 einfo "Press return to scan for the cd again"
1508 einfo "or hit CTRL+C to abort the emerge." 1656 einfo "or hit CTRL+C to abort the emerge."
1509 echo 1657 echo
1658 if [[ ${showjolietmsg} -eq 0 ]] ; then
1659 showjolietmsg=1
1660 else
1510 einfo "If you are having trouble with the detection" 1661 ewarn "If you are having trouble with the detection"
1511 einfo "of your CD, it is possible that you do not have" 1662 ewarn "of your CD, it is possible that you do not have"
1512 einfo "Joliet support enabled in your kernel. Please" 1663 ewarn "Joliet support enabled in your kernel. Please"
1513 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1664 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1665 ebeep 5
1666 fi
1514 read || die "something is screwed with your system" 1667 read || die "something is screwed with your system"
1515 done 1668 done
1516} 1669}
1517 1670
1518# @FUNCTION: strip-linguas 1671# @FUNCTION: strip-linguas
… …
1527# of the lists. 1680# of the lists.
1528strip-linguas() { 1681strip-linguas() {
1529 local ls newls nols 1682 local ls newls nols
1530 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1683 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1531 local op=$1; shift 1684 local op=$1; shift
1532 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1685 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1533 local d f 1686 local d f
1534 for d in "$@" ; do 1687 for d in "$@" ; do
1535 if [[ ${op} == "-u" ]] ; then 1688 if [[ ${op} == "-u" ]] ; then
1536 newls=${ls} 1689 newls=${ls}
1537 else 1690 else
1538 newls="" 1691 newls=""
1539 fi 1692 fi
1540 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1541 if [[ ${op} == "-i" ]] ; then 1694 if [[ ${op} == "-i" ]] ; then
1542 hasq ${f} ${ls} && newls="${newls} ${f}" 1695 hasq ${f} ${ls} && newls="${newls} ${f}"
1543 else 1696 else
1544 hasq ${f} ${ls} || newls="${newls} ${f}" 1697 hasq ${f} ${ls} || newls="${newls} ${f}"
1545 fi 1698 fi
… …
1558 else 1711 else
1559 nols="${nols} ${f}" 1712 nols="${nols} ${f}"
1560 fi 1713 fi
1561 done 1714 done
1562 [[ -n ${nols} ]] \ 1715 [[ -n ${nols} ]] \
1563 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1716 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1564 export LINGUAS=${newls:1} 1717 export LINGUAS=${newls:1}
1565} 1718}
1566 1719
1567# @FUNCTION: preserve_old_lib 1720# @FUNCTION: preserve_old_lib
1568# @USAGE: <libs to preserve> [more libs] 1721# @USAGE: <libs to preserve> [more libs]
… …
1578 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1731 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1579 die "Invalid preserve_old_lib() usage" 1732 die "Invalid preserve_old_lib() usage"
1580 fi 1733 fi
1581 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1734 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1582 1735
1736 # let portage worry about it
1737 has preserve-libs ${FEATURES} && return 0
1738
1583 local lib dir 1739 local lib dir
1584 for lib in "$@" ; do 1740 for lib in "$@" ; do
1585 [[ -e ${ROOT}/${lib} ]] || continue 1741 [[ -e ${ROOT}/${lib} ]] || continue
1586 dir=${lib%/*} 1742 dir=${lib%/*}
1587 dodir ${dir} || die "dodir ${dir} failed" 1743 dodir ${dir} || die "dodir ${dir} failed"
… …
1597preserve_old_lib_notify() { 1753preserve_old_lib_notify() {
1598 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1754 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1599 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1755 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1600 die "Invalid preserve_old_lib_notify() usage" 1756 die "Invalid preserve_old_lib_notify() usage"
1601 fi 1757 fi
1758
1759 # let portage worry about it
1760 has preserve-libs ${FEATURES} && return 0
1602 1761
1603 local lib notice=0 1762 local lib notice=0
1604 for lib in "$@" ; do 1763 for lib in "$@" ; do
1605 [[ -e ${ROOT}/${lib} ]] || continue 1764 [[ -e ${ROOT}/${lib} ]] || continue
1606 if [[ ${notice} -eq 0 ]] ; then 1765 if [[ ${notice} -eq 0 ]] ; then
… …
1615 ewarn " # revdep-rebuild --library ${lib##*/}" 1774 ewarn " # revdep-rebuild --library ${lib##*/}"
1616 done 1775 done
1617 if [[ ${notice} -eq 1 ]] ; then 1776 if [[ ${notice} -eq 1 ]] ; then
1618 ewarn 1777 ewarn
1619 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1778 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1620 ewarn "delete the old libraries." 1779 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1780 for lib in "$@" ; do
1781 ewarn " # rm '${lib}'"
1782 done
1621 fi 1783 fi
1622} 1784}
1623 1785
1624# @FUNCTION: built_with_use 1786# @FUNCTION: built_with_use
1625# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1787# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1626# @DESCRIPTION: 1788# @DESCRIPTION:
1789#
1790# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1791#
1627# A temporary hack until portage properly supports DEPENDing on USE 1792# A temporary hack until portage properly supports DEPENDing on USE
1628# flags being enabled in packages. This will check to see if the specified 1793# 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 1794# 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 1795# --missing option controls the behavior if called on a package that does
1631# not actually support the defined USE flags (aka listed in IUSE). 1796# 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 1797# 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" 1798# 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 1799# 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 1800# 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 1801# 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 1802# means the USE flag we're checking is hidden expanded, so it won't be found
1638# in IUSE like normal USE flags. 1803# in IUSE like normal USE flags.
1639# 1804#
1640# Remember that this function isn't terribly intelligent so order of optional 1805# 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";; 1840 die) die "Unable to determine what USE flags $PKG was built with";;
1676 esac 1841 esac
1677 fi 1842 fi
1678 1843
1679 if [[ ${hidden} == "no" ]] ; then 1844 if [[ ${hidden} == "no" ]] ; then
1680 local IUSE_BUILT=$(<${IUSEFILE}) 1845 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1681 # Don't check USE_EXPAND #147237 1846 # Don't check USE_EXPAND #147237
1682 local expand 1847 local expand
1683 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1848 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1684 if [[ $1 == ${expand}_* ]] ; then 1849 if [[ $1 == ${expand}_* ]] ; then
1685 expand="" 1850 expand=""
1686 break 1851 break
1687 fi 1852 fi
1688 done 1853 done
1689 if [[ -n ${expand} ]] ; then 1854 if [[ -n ${expand} ]] ; then
1690 if ! has $1 ${IUSE_BUILT} ; then 1855 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1691 case ${missing_action} in 1856 case ${missing_action} in
1692 true) return 0;; 1857 true) return 0;;
1693 false) return 1;; 1858 false) return 1;;
1694 die) die "$PKG does not actually support the $1 USE flag!";; 1859 die) die "$PKG does not actually support the $1 USE flag!";;
1695 esac 1860 esac
… …
1726 done 1891 done
1727 eend 0 1892 eend 0
1728} 1893}
1729 1894
1730# @FUNCTION: make_wrapper 1895# @FUNCTION: make_wrapper
1731# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1896# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1732# @DESCRIPTION: 1897# @DESCRIPTION:
1733# Create a shell wrapper script named wrapper in installpath 1898# Create a shell wrapper script named wrapper in installpath
1734# (defaults to the bindir) to execute target (default of wrapper) by 1899# (defaults to the bindir) to execute target (default of wrapper) by
1735# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1900# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1736# libpaths followed by optionally changing directory to chdir. 1901# libpaths followed by optionally changing directory to chdir.
… …
1759 ) || die 1924 ) || die
1760 else 1925 else
1761 newbin "${tmpwrapper}" "${wrapper}" || die 1926 newbin "${tmpwrapper}" "${wrapper}" || die
1762 fi 1927 fi
1763} 1928}
1929
1930# @FUNCTION: prepalldocs
1931# @USAGE:
1932# @DESCRIPTION:
1933# Compress files in /usr/share/doc which are not already
1934# compressed, excluding /usr/share/doc/${PF}/html.
1935# Uses the ecompressdir to do the compression.
1936# 2009-02-18 by betelgeuse:
1937# Commented because ecompressdir is even more internal to
1938# Portage than prepalldocs (it's not even mentioned in man 5
1939# ebuild). Please submit a better version for review to gentoo-dev
1940# if you want prepalldocs here.
1941#prepalldocs() {
1942# if [[ -n $1 ]] ; then
1943# ewarn "prepalldocs: invalid usage; takes no arguments"
1944# fi
1945
1946# cd "${D}"
1947# [[ -d usr/share/doc ]] || return 0
1948
1949# find usr/share/doc -exec gzip {} +
1950# ecompressdir --ignore /usr/share/doc/${PF}/html
1951# ecompressdir --queue /usr/share/doc
1952#}
Legend:
Removed from v.1.294  
changed lines
  Added in v.1.334
  ViewVC Help
Powered by ViewVC 1.1.13