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

Diff of /eclass/eutils.eclass

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

Revision 1.292 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.292 2007/10/14 21:55: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" ] 318 # most of the time, there will only be one run per unique name,
149 then 319 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 320 local STDERR_TARGET="${T}/${patchname}.out"
151 then 321 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 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
153 fi 340 fi
341 else
342 PATCH_TARGET=${x}
343 fi
154 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} *****"
155 echo 360 echo
156 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} )"
157 eerror 398 eerror
158 eerror " ${EPATCH_SOURCE}" 399 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 400 eerror
401 eerror " ${STDERR_TARGET}"
160 echo 402 echo
161 die "Cannot find \$EPATCH_SOURCE!"
162 fi
163
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi
166
167 case ${EPATCH_SUFFIX##*\.} in
168 bz2)
169 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2"
171 ;;
172 gz|Z|z)
173 PIPE_CMD="gzip -dc"
174 PATCH_SUFFIX="gz"
175 ;;
176 ZIP|zip)
177 PIPE_CMD="unzip -p"
178 PATCH_SUFFIX="zip"
179 ;;
180 *)
181 PIPE_CMD="cat"
182 PATCH_SUFFIX="patch"
183 ;;
184 esac
185
186 if [ "${SINGLE_PATCH}" = "no" ]
187 then
188 einfo "${EPATCH_MULTI_MSG}"
189 fi
190 for x in ${EPATCH_SOURCE}
191 do
192 # New ARCH dependant patch naming scheme ...
193 #
194 # ???_arch_foo.patch
195 #
196 if [ -f ${x} ] && \
197 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
198 [ "${EPATCH_FORCE}" = "yes" ])
199 then
200 local count=0
201 local popts="${EPATCH_OPTS}"
202 local patchname=${x##*/}
203
204 if [ -n "${EPATCH_EXCLUDE}" ]
205 then
206 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
207 then
208 continue
209 fi
210 fi
211
212 if [ "${SINGLE_PATCH}" = "yes" ]
213 then
214 if [ -n "${EPATCH_SINGLE_MSG}" ]
215 then
216 einfo "${EPATCH_SINGLE_MSG}"
217 else
218 einfo "Applying ${patchname} ..."
219 fi
220 else
221 einfo " ${patchname} ..."
222 fi
223
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226
227 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ]
229 do
230 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233
234 if [ "${PATCH_SUFFIX}" != "patch" ]
235 then
236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
238 else
239 PATCH_TARGET="${x}"
240 fi
241
242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
247
248 if [ "${PATCH_SUFFIX}" != "patch" ]
249 then
250 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
251 then
252 echo
253 eerror "Could not extract patch!"
254 #die "Could not extract patch!"
255 count=5
256 break
257 fi
258 fi
259
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
267
268 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
269 _epatch_assert
270
271 if [ "$?" -ne 0 ]
272 then
273 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo
275 eerror "A dry-run of patch command succeeded, but actually"
276 eerror "applying the patch failed!"
277 #die "Real world sux compared to the dreamworld!"
278 count=5
279 fi
280
281 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
282
283 break
284 fi
285
286 count=$((count + 1))
287 done
288
289 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then
291 rm -f ${PATCH_TARGET}
292 fi
293
294 if [ "${count}" -eq 5 ]
295 then
296 echo
297 eerror "Failed Patch: ${patchname} !"
298 eerror " ( ${PATCH_TARGET} )"
299 eerror
300 eerror "Include in your bugreport the contents of:"
301 eerror
302 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
303 echo
304 die "Failed Patch: ${patchname}!" 403 die "Failed Patch: ${patchname}!"
305 fi 404 fi
306 405
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 406 # if everything worked, delete the patch log
308 407 rm -f "${STDERR_TARGET}"
309 eend 0 408 eend 0
310 fi
311 done 409 done
312 if [ "${SINGLE_PATCH}" = "no" ] 410
313 then 411 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 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
315 fi 430 fi
431 done
316} 432}
317 433
318# @FUNCTION: emktemp 434# @FUNCTION: emktemp
319# @USAGE: [temp dir] 435# @USAGE: [temp dir]
320# @DESCRIPTION: 436# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 472# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 473# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 474# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 475# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 476# @DESCRIPTION:
361# 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),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 479# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 480egetent() {
364 case ${CHOST} in 481 case ${CHOST} in
365 *-darwin*) 482 *-darwin[678])
366 case "$2" in 483 case "$2" in
367 *[!0-9]*) # Non numeric 484 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 486 ;;
370 *) # Numeric 487 *) # Numeric
371 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
372 ;; 504 ;;
373 esac 505 esac
374 ;; 506 ;;
375 *-freebsd*|*-dragonfly*) 507 *-freebsd*|*-dragonfly*)
376 local opts action="user" 508 local opts action="user"
576 fi 708 fi
577 ;; 709 ;;
578 710
579 *) 711 *)
580 if [[ -z $@ ]] ; then 712 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 713 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 714 -c "added by portage for ${PN}" \
715 ${euser} \
583 || die "enewuser failed" 716 || die "enewuser failed"
584 else 717 else
585 einfo " - Extra: $@" 718 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 719 useradd ${opts} "$@" \
720 ${euser} \
587 || die "enewuser failed" 721 || die "enewuser failed"
588 fi 722 fi
589 ;; 723 ;;
590 esac 724 esac
591 725
739make_desktop_entry() { 873make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 874 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 875
742 local exec=${1} 876 local exec=${1}
743 local name=${2:-${PN}} 877 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 878 local icon=${3:-${PN}}
745 local type=${4} 879 local type=${4}
746 local path=${5} 880 local path=${5}
747 881
748 if [[ -z ${type} ]] ; then 882 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 883 local catmaj=${CATEGORY%%-*}
825 irc) type=IRCClient;; 959 irc) type=IRCClient;;
826 mail) type=Email;; 960 mail) type=Email;;
827 news) type=News;; 961 news) type=News;;
828 nntp) type=News;; 962 nntp) type=News;;
829 p2p) type=FileTransfer;; 963 p2p) type=FileTransfer;;
964 voip) type=Telephony;;
830 *) type=;; 965 *) type=;;
831 esac 966 esac
832 type="Network;${type}" 967 type="Network;${type}"
833 ;; 968 ;;
834 969
843 math*) type=Math;; 978 math*) type=Math;;
844 physics) type=Physics;; 979 physics) type=Physics;;
845 visual*) type=DataVisualization;; 980 visual*) type=DataVisualization;;
846 *) type=;; 981 *) type=;;
847 esac 982 esac
848 type="Science;${type}" 983 type="Education;Science;${type}"
849 ;; 984 ;;
850 985
851 sys) 986 sys)
852 type="System" 987 type="System"
853 ;; 988 ;;
855 www) 990 www)
856 case ${catmin} in 991 case ${catmin} in
857 client) type=WebBrowser;; 992 client) type=WebBrowser;;
858 *) type=;; 993 *) type=;;
859 esac 994 esac
860 type="Network" 995 type="Network;${type}"
861 ;; 996 ;;
862 997
863 *) 998 *)
864 type= 999 type=
865 ;; 1000 ;;
871 local desktop_name="${PN}-${SLOT}" 1006 local desktop_name="${PN}-${SLOT}"
872 fi 1007 fi
873 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"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1009 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 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
876 cat <<-EOF > "${desktop}" 1022 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 1023 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 1024 Name=${name}
881 Type=Application 1025 Type=Application
882 Comment=${DESCRIPTION} 1026 Comment=${DESCRIPTION}
883 Exec=${exec} 1027 Exec=${exec}
884 TryExec=${exec%% *} 1028 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 1029 Icon=${icon}
887 Categories=${type}; 1030 Categories=${type}
888 EOF 1031 EOF
1032
1033 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 1034
890 ( 1035 (
891 # wrap the env here so that the 'insinto' call 1036 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1037 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1038 insinto /usr/share/applications
922 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."
923 fi 1068 fi
924} 1069}
925 1070
926# @FUNCTION: make_session_desktop 1071# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1072# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1073# @DESCRIPTION:
929# 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
930# 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.
931make_session_desktop() { 1078make_session_desktop() {
932 [[ -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
933 [[ -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
934 1081
935 local title=$1 1082 local title=$1
936 local command=$2 1083 local command=$2
937 local desktop=${T}/${wm}.desktop 1084 local desktop=${T}/${wm:-${PN}}.desktop
1085 shift 2
938 1086
939 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1088 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1089 Name=${title}
943 Comment=This session logs you into ${title} 1090 Comment=This session logs you into ${title}
944 Exec=${command} 1091 Exec=${command} $*
945 TryExec=${command} 1092 TryExec=${command}
946 Type=Application 1093 Type=XSession
947 EOF 1094 EOF
948 1095
949 ( 1096 (
950 # wrap the env here so that the 'insinto' call 1097 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1098 # doesn't corrupt the env of the caller
1263 lic="${PWD}/${lic}" 1410 lic="${PWD}/${lic}"
1264 elif [ -e "${lic}" ] ; then 1411 elif [ -e "${lic}" ] ; then
1265 lic="${lic}" 1412 lic="${lic}"
1266 fi 1413 fi
1267 fi 1414 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1415 local l="`basename ${lic}`"
1270 1416
1271 # here is where we check for the licenses the user already 1417 # here is where we check for the licenses the user already
1272 # accepted ... if we don't find a match, we make the user accept 1418 # accepted ... if we don't find a match, we make the user accept
1273 local shopts=$-
1274 local alic 1419 local alic
1275 set -o noglob #so that bash doesn't expand "*" 1420 eshopts_push -o noglob # so that bash doesn't expand "*"
1276 for alic in ${ACCEPT_LICENSE} ; do 1421 for alic in ${ACCEPT_LICENSE} ; do
1277 if [[ ${alic} == ${l} ]]; then 1422 if [[ ${alic} == ${l} ]]; then
1278 set +o noglob; set -${shopts} #reset old shell opts 1423 eshopts_pop
1279 return 0 1424 return 0
1280 fi 1425 fi
1281 done 1426 done
1282 set +o noglob; set -$shopts #reset old shell opts 1427 eshopts_pop
1428 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1283 1429
1284 local licmsg=$(emktemp) 1430 local licmsg=$(emktemp)
1285 cat <<-EOF > ${licmsg} 1431 cat <<-EOF > ${licmsg}
1286 ********************************************************** 1432 **********************************************************
1287 The following license outlines the terms of use of this 1433 The following license outlines the terms of use of this
1456# displayed and we'll hang out here until: 1602# displayed and we'll hang out here until:
1457# (1) the file is found on a mounted cdrom 1603# (1) the file is found on a mounted cdrom
1458# (2) the user hits CTRL+C 1604# (2) the user hits CTRL+C
1459_cdrom_locate_file_on_cd() { 1605_cdrom_locate_file_on_cd() {
1460 local mline="" 1606 local mline=""
1461 local showedmsg=0 1607 local showedmsg=0 showjolietmsg=0
1462 1608
1463 while [[ -z ${CDROM_ROOT} ]] ; do 1609 while [[ -z ${CDROM_ROOT} ]] ; do
1464 local i=0 1610 local i=0
1465 local -a cdset=(${*//:/ }) 1611 local -a cdset=(${*//:/ })
1466 if [[ -n ${CDROM_SET} ]] ; then 1612 if [[ -n ${CDROM_SET} ]] ; then
1507 showedmsg=1 1653 showedmsg=1
1508 fi 1654 fi
1509 einfo "Press return to scan for the cd again" 1655 einfo "Press return to scan for the cd again"
1510 einfo "or hit CTRL+C to abort the emerge." 1656 einfo "or hit CTRL+C to abort the emerge."
1511 echo 1657 echo
1658 if [[ ${showjolietmsg} -eq 0 ]] ; then
1659 showjolietmsg=1
1660 else
1512 einfo "If you are having trouble with the detection" 1661 ewarn "If you are having trouble with the detection"
1513 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"
1514 einfo "Joliet support enabled in your kernel. Please" 1663 ewarn "Joliet support enabled in your kernel. Please"
1515 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
1516 read || die "something is screwed with your system" 1667 read || die "something is screwed with your system"
1517 done 1668 done
1518} 1669}
1519 1670
1520# @FUNCTION: strip-linguas 1671# @FUNCTION: strip-linguas
1529# of the lists. 1680# of the lists.
1530strip-linguas() { 1681strip-linguas() {
1531 local ls newls nols 1682 local ls newls nols
1532 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1683 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1533 local op=$1; shift 1684 local op=$1; shift
1534 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1685 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1535 local d f 1686 local d f
1536 for d in "$@" ; do 1687 for d in "$@" ; do
1537 if [[ ${op} == "-u" ]] ; then 1688 if [[ ${op} == "-u" ]] ; then
1538 newls=${ls} 1689 newls=${ls}
1539 else 1690 else
1540 newls="" 1691 newls=""
1541 fi 1692 fi
1542 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1543 if [[ ${op} == "-i" ]] ; then 1694 if [[ ${op} == "-i" ]] ; then
1544 hasq ${f} ${ls} && newls="${newls} ${f}" 1695 hasq ${f} ${ls} && newls="${newls} ${f}"
1545 else 1696 else
1546 hasq ${f} ${ls} || newls="${newls} ${f}" 1697 hasq ${f} ${ls} || newls="${newls} ${f}"
1547 fi 1698 fi
1560 else 1711 else
1561 nols="${nols} ${f}" 1712 nols="${nols} ${f}"
1562 fi 1713 fi
1563 done 1714 done
1564 [[ -n ${nols} ]] \ 1715 [[ -n ${nols} ]] \
1565 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1716 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1566 export LINGUAS=${newls:1} 1717 export LINGUAS=${newls:1}
1567} 1718}
1568 1719
1569# @FUNCTION: preserve_old_lib 1720# @FUNCTION: preserve_old_lib
1570# @USAGE: <libs to preserve> [more libs] 1721# @USAGE: <libs to preserve> [more libs]
1580 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1731 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1581 die "Invalid preserve_old_lib() usage" 1732 die "Invalid preserve_old_lib() usage"
1582 fi 1733 fi
1583 [[ -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]"
1584 1735
1736 # let portage worry about it
1737 has preserve-libs ${FEATURES} && return 0
1738
1585 local lib dir 1739 local lib dir
1586 for lib in "$@" ; do 1740 for lib in "$@" ; do
1587 [[ -e ${ROOT}/${lib} ]] || continue 1741 [[ -e ${ROOT}/${lib} ]] || continue
1588 dir=${lib%/*} 1742 dir=${lib%/*}
1589 dodir ${dir} || die "dodir ${dir} failed" 1743 dodir ${dir} || die "dodir ${dir} failed"
1599preserve_old_lib_notify() { 1753preserve_old_lib_notify() {
1600 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1754 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1601 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"
1602 die "Invalid preserve_old_lib_notify() usage" 1756 die "Invalid preserve_old_lib_notify() usage"
1603 fi 1757 fi
1758
1759 # let portage worry about it
1760 has preserve-libs ${FEATURES} && return 0
1604 1761
1605 local lib notice=0 1762 local lib notice=0
1606 for lib in "$@" ; do 1763 for lib in "$@" ; do
1607 [[ -e ${ROOT}/${lib} ]] || continue 1764 [[ -e ${ROOT}/${lib} ]] || continue
1608 if [[ ${notice} -eq 0 ]] ; then 1765 if [[ ${notice} -eq 0 ]] ; then
1617 ewarn " # revdep-rebuild --library ${lib##*/}" 1774 ewarn " # revdep-rebuild --library ${lib##*/}"
1618 done 1775 done
1619 if [[ ${notice} -eq 1 ]] ; then 1776 if [[ ${notice} -eq 1 ]] ; then
1620 ewarn 1777 ewarn
1621 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"
1622 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
1623 fi 1783 fi
1624} 1784}
1625 1785
1626# @FUNCTION: built_with_use 1786# @FUNCTION: built_with_use
1627# @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>
1628# @DESCRIPTION: 1788# @DESCRIPTION:
1789#
1790# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1791#
1629# A temporary hack until portage properly supports DEPENDing on USE 1792# A temporary hack until portage properly supports DEPENDing on USE
1630# 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
1631# 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
1632# --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
1633# not actually support the defined USE flags (aka listed in IUSE). 1796# not actually support the defined USE flags (aka listed in IUSE).
1634# 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
1635# 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"
1636# 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
1637# 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
1638# 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
1639# 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
1640# in IUSE like normal USE flags. 1803# in IUSE like normal USE flags.
1641# 1804#
1642# 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
1677 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";;
1678 esac 1841 esac
1679 fi 1842 fi
1680 1843
1681 if [[ ${hidden} == "no" ]] ; then 1844 if [[ ${hidden} == "no" ]] ; then
1682 local IUSE_BUILT=$(<${IUSEFILE}) 1845 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1683 # Don't check USE_EXPAND #147237 1846 # Don't check USE_EXPAND #147237
1684 local expand 1847 local expand
1685 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1848 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1686 if [[ $1 == ${expand}_* ]] ; then 1849 if [[ $1 == ${expand}_* ]] ; then
1687 expand="" 1850 expand=""
1688 break 1851 break
1689 fi 1852 fi
1690 done 1853 done
1691 if [[ -n ${expand} ]] ; then 1854 if [[ -n ${expand} ]] ; then
1692 if ! has $1 ${IUSE_BUILT} ; then 1855 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1693 case ${missing_action} in 1856 case ${missing_action} in
1694 true) return 0;; 1857 true) return 0;;
1695 false) return 1;; 1858 false) return 1;;
1696 die) die "$PKG does not actually support the $1 USE flag!";; 1859 die) die "$PKG does not actually support the $1 USE flag!";;
1697 esac 1860 esac
1721epunt_cxx() { 1884epunt_cxx() {
1722 local dir=$1 1885 local dir=$1
1723 [[ -z ${dir} ]] && dir=${S} 1886 [[ -z ${dir} ]] && dir=${S}
1724 ebegin "Removing useless C++ checks" 1887 ebegin "Removing useless C++ checks"
1725 local f 1888 local f
1726 for f in $(find ${dir} -name configure) ; do 1889 find "${dir}" -name configure | while read f ; do
1727 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1890 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1728 done 1891 done
1729 eend 0 1892 eend 0
1730} 1893}
1731 1894
1732# @FUNCTION: make_wrapper 1895# @FUNCTION: make_wrapper
1733# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1896# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1734# @DESCRIPTION: 1897# @DESCRIPTION:
1735# Create a shell wrapper script named wrapper in installpath 1898# Create a shell wrapper script named wrapper in installpath
1736# (defaults to the bindir) to execute target (default of wrapper) by 1899# (defaults to the bindir) to execute target (default of wrapper) by
1737# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1900# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1738# libpaths followed by optionally changing directory to chdir. 1901# libpaths followed by optionally changing directory to chdir.
1761 ) || die 1924 ) || die
1762 else 1925 else
1763 newbin "${tmpwrapper}" "${wrapper}" || die 1926 newbin "${tmpwrapper}" "${wrapper}" || die
1764 fi 1927 fi
1765} 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.292  
changed lines
  Added in v.1.334

  ViewVC Help
Powered by ViewVC 1.1.20