/[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.338
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.338 2010/03/07 02:52:25 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
52# Default directory where patches are located 54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: ecvs_clean
67# @USAGE: [list of dirs]
68# @DESCRIPTION:
69# Remove CVS directories recursiveley. Useful when a source tarball contains
70# internal CVS directories. Defaults to $PWD.
71ecvs_clean() {
72 [[ -z $* ]] && set -- .
73 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
74 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
75}
76
77# @FUNCTION: esvn_clean
78# @USAGE: [list of dirs]
79# @DESCRIPTION:
80# Remove .svn directories recursiveley. Useful when a source tarball contains
81# internal Subversion directories. Defaults to $PWD.
82esvn_clean() {
83 [[ -z $* ]] && set -- .
84 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
85}
86
87# @FUNCTION: eshopts_push
88# @USAGE: [options to `set` or `shopt`]
89# @DESCRIPTION:
90# Often times code will want to enable a shell option to change code behavior.
91# Since changing shell options can easily break other pieces of code (which
92# assume the default state), eshopts_push is used to (1) push the current shell
93# options onto a stack and (2) pass the specified arguments to set.
94#
95# If the first argument is '-s' or '-u', we assume you want to call `shopt`
96# rather than `set` as there are some options only available via that.
97#
98# A common example is to disable shell globbing so that special meaning/care
99# may be used with variables/arguments to custom functions. That would be:
100# @CODE
101# eshopts_push -o noglob
102# for x in ${foo} ; do
103# if ...some check... ; then
104# eshopts_pop
105# return 0
106# fi
107# done
108# eshopts_pop
109# @CODE
110eshopts_push() {
111 # have to assume __ESHOPTS_SAVE__ isn't screwed with
112 # as a `declare -a` here will reset its value
113 local i=${#__ESHOPTS_SAVE__[@]}
114 if [[ $1 == -[su] ]] ; then
115 __ESHOPTS_SAVE__[$i]=$(shopt -p)
116 [[ $# -eq 0 ]] && return 0
117 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
118 else
119 __ESHOPTS_SAVE__[$i]=$-
120 [[ $# -eq 0 ]] && return 0
121 set "$@" || die "eshopts_push: bad options to set: $*"
122 fi
123}
124
125# @FUNCTION: eshopts_pop
126# @USAGE:
127# @DESCRIPTION:
128# Restore the shell options to the state saved with the corresponding
129# eshopts_push call. See that function for more details.
130eshopts_pop() {
131 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
132 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
133 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
134 local s=${__ESHOPTS_SAVE__[$i]}
135 unset __ESHOPTS_SAVE__[$i]
136 if [[ ${s} == "shopt -"* ]] ; then
137 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
138 else
139 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
140 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
141 fi
142}
143
144# @VARIABLE: EPATCH_SOURCE
145# @DESCRIPTION:
146# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 147EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 148# @VARIABLE: EPATCH_SUFFIX
149# @DESCRIPTION:
150# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 151EPATCH_SUFFIX="patch.bz2"
152# @VARIABLE: EPATCH_OPTS
153# @DESCRIPTION:
56# Default options for patch 154# Default options for patch:
155# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 156# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 157# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 158# -E - automatically remove empty files
159# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 160EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
161# @VARIABLE: EPATCH_EXCLUDE
162# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 163# List of patches not to apply. Note this is only file names,
62# and not the full path .. 164# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 165EPATCH_EXCLUDE=""
166# @VARIABLE: EPATCH_SINGLE_MSG
167# @DESCRIPTION:
64# Change the printed message for a single patch. 168# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 169EPATCH_SINGLE_MSG=""
170# @VARIABLE: EPATCH_MULTI_MSG
171# @DESCRIPTION:
66# Change the printed message for multiple patches. 172# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 173EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 174# @VARIABLE: EPATCH_FORCE
69# 175# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 176# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 177# arch naming style.
72EPATCH_FORCE="no" 178EPATCH_FORCE="no"
73 179
74# This function is for bulk patching, or in theory for just one 180# @FUNCTION: epatch
75# or two patches. 181# @USAGE: [patches] [dirs of patches]
182# @DESCRIPTION:
183# epatch is designed to greatly simplify the application of patches. It can
184# process patch files directly, or directories of patches. The patches may be
185# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
186# the -p option as epatch will automatically attempt -p0 to -p5 until things
187# apply successfully.
76# 188#
77# It should work with .bz2, .gz, .zip and plain text patches. 189# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 190# specified by EPATCH_SOURCE.
79# 191#
80# You do not have to specify '-p' option to patch, as it will 192# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 193# @CODE
82# 194# ${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} 195# ??_${ARCH}_foo.${EPATCH_SUFFIX}
196# else
197# *.${EPATCH_SUFFIX}
198# @CODE
199# The leading ?? are typically numbers used to force consistent patch ordering.
200# The arch field is used to apply patches only for the host architecture with
201# the special value of "all" means apply for everyone. Note that using values
202# other than "all" is highly discouraged -- you should apply patches all the
203# time and let architecture details be detected at configure/compile time.
92# 204#
93# For example: 205# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
206# for patches to apply.
94# 207#
95# 01_all_misc-fix.patch.bz2 208# 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() { 209epatch() {
108 _epatch_draw_line() { 210 _epatch_draw_line() {
211 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 212 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 213 echo "${1//?/=}"
111 } 214 }
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 215
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 216 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 217
122 if [ "$#" -gt 1 ] 218 # Let the rest of the code process one user arg at a time --
123 then 219 # each arg may expand into multiple patches, and each arg may
220 # need to start off with the default global EPATCH_xxx values
221 if [[ $# -gt 1 ]] ; then
124 local m="" 222 local m
125 for m in "$@" ; do 223 for m in "$@" ; do
126 epatch "${m}" 224 epatch "${m}"
127 done 225 done
128 return 0 226 return 0
129 fi 227 fi
130 228
131 if [ -n "$1" -a -f "$1" ] 229 local SINGLE_PATCH="no"
132 then 230 # no args means process ${EPATCH_SOURCE}
231 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
232
233 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 234 SINGLE_PATCH="yes"
134 235 set -- "$1"
135 local EPATCH_SOURCE="$1" 236 # Use the suffix from the single patch (localize it); the code
237 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 238 local EPATCH_SUFFIX=$1
137 239
138 elif [ -n "$1" -a -d "$1" ] 240 elif [[ -d $1 ]] ; then
139 then 241 # 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 ... 242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 243
244 else
245 # sanity check ... if it isn't a dir or file, wtf man ?
246 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
247 echo
248 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
249 eerror
250 eerror " ${EPATCH_SOURCE}"
251 eerror " ( ${EPATCH_SOURCE##*/} )"
252 echo
253 die "Cannot find \$EPATCH_SOURCE!"
254 fi
255
256 local PIPE_CMD
257 case ${EPATCH_SUFFIX##*\.} in
258 xz) PIPE_CMD="xz -dc" ;;
259 lzma) PIPE_CMD="lzma -dc" ;;
260 bz2) PIPE_CMD="bzip2 -dc" ;;
261 gz|Z|z) PIPE_CMD="gzip -dc" ;;
262 ZIP|zip) PIPE_CMD="unzip -p" ;;
263 *) ;;
264 esac
265
266 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
267
268 local x
269 for x in "$@" ; do
270 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
271 # didn't match anything, ignore continue on
272 [[ ! -f ${x} ]] && continue
273
274 local patchname=${x##*/}
275
276 # Apply single patches, or forced sets of patches, or
277 # patches with ARCH dependant names.
278 # ???_arch_foo.patch
279 # Else, skip this input altogether
280 local a=${patchname#*_} # strip the ???_
281 a=${a%%_*} # strip the _foo.patch
282 if ! [[ ${SINGLE_PATCH} == "yes" || \
283 ${EPATCH_FORCE} == "yes" || \
284 ${a} == all || \
285 ${a} == ${ARCH} ]]
142 then 286 then
143 local EPATCH_SOURCE="$1/*" 287 continue
288 fi
289
290 # Let people filter things dynamically
291 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
292 # let people use globs in the exclude
293 eshopts_push -o noglob
294
295 local ex
296 for ex in ${EPATCH_EXCLUDE} ; do
297 if [[ ${patchname} == ${ex} ]] ; then
298 eshopts_pop
299 continue 2
300 fi
301 done
302
303 eshopts_pop
304 fi
305
306 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
307 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
308 einfo "${EPATCH_SINGLE_MSG}"
309 else
310 einfo "Applying ${patchname} ..."
311 fi
144 else 312 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 313 einfo " ${patchname} ..."
146 fi 314 fi
147 else 315
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 316 # most of the time, there will only be one run per unique name,
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 317 # but if there are more, make sure we get unique log filenames
150 then 318 local STDERR_TARGET="${T}/${patchname}.out"
151 EPATCH_SOURCE="$1" 319 if [[ -e ${STDERR_TARGET} ]] ; then
320 STDERR_TARGET="${T}/${patchname}-$$.out"
321 fi
322
323 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
324
325 # Decompress the patch if need be
326 local count=0
327 local PATCH_TARGET
328 if [[ -n ${PIPE_CMD} ]] ; then
329 PATCH_TARGET="${T}/$$.patch"
330 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
331
332 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
333 echo
334 eerror "Could not extract patch!"
335 #die "Could not extract patch!"
336 count=5
337 break
152 fi 338 fi
339 else
340 PATCH_TARGET=${x}
341 fi
153 342
343 # Check for absolute paths in patches. If sandbox is disabled,
344 # people could (accidently) patch files in the root filesystem.
345 # Or trigger other unpleasantries #237667. So disallow -p0 on
346 # such patches.
347 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
348 if [[ -n ${abs_paths} ]] ; then
349 count=1
350 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
351 fi
352
353 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
354 while [[ ${count} -lt 5 ]] ; do
355 # Generate some useful debug info ...
356 (
357 _epatch_draw_line "***** ${patchname} *****"
154 echo 358 echo
155 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 359 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
360 echo
361 _epatch_draw_line "***** ${patchname} *****"
362 ) >> "${STDERR_TARGET}"
363
364 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
365 (
366 _epatch_draw_line "***** ${patchname} *****"
367 echo
368 echo "ACTUALLY APPLYING ${patchname} ..."
369 echo
370 _epatch_draw_line "***** ${patchname} *****"
371 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
372 ) >> "${STDERR_TARGET}"
373
374 if [ $? -ne 0 ] ; then
375 echo
376 eerror "A dry-run of patch command succeeded, but actually"
377 eerror "applying the patch failed!"
378 #die "Real world sux compared to the dreamworld!"
379 count=5
380 fi
381 break
382 fi
383
384 : $(( count++ ))
385 done
386
387 # if we had to decompress the patch, delete the temp one
388 if [[ -n ${PIPE_CMD} ]] ; then
389 rm -f "${PATCH_TARGET}"
390 fi
391
392 if [[ ${count} -ge 5 ]] ; then
393 echo
394 eerror "Failed Patch: ${patchname} !"
395 eerror " ( ${PATCH_TARGET} )"
156 eerror 396 eerror
157 eerror " ${EPATCH_SOURCE}" 397 eerror "Include in your bugreport the contents of:"
158 eerror " ( ${EPATCH_SOURCE##*/} )" 398 eerror
399 eerror " ${STDERR_TARGET}"
159 echo 400 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}!" 401 die "Failed Patch: ${patchname}!"
304 fi 402 fi
305 403
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 404 # if everything worked, delete the patch log
307 405 rm -f "${STDERR_TARGET}"
308 eend 0 406 eend 0
309 fi
310 done 407 done
311 if [ "${SINGLE_PATCH}" = "no" ] 408
312 then 409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 einfo "Done with patching" 410 : # everything worked
411}
412epatch_user() {
413 [[ $# -ne 0 ]] && die "epatch_user takes no options"
414
415 # don't clobber any EPATCH vars that the parent might want
416 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
417 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
418 EPATCH_SOURCE=${base}/${CTARGET}/${check}
419 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
420 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
421 if [[ -d ${EPATCH_SOURCE} ]] ; then
422 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch
427 break
314 fi 428 fi
429 done
315} 430}
316 431
317# @FUNCTION: emktemp 432# @FUNCTION: emktemp
318# @USAGE: [temp dir] 433# @USAGE: [temp dir]
319# @DESCRIPTION: 434# @DESCRIPTION:
355# base-system@gentoo.org (Linux) 470# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 471# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 472# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 473# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 474# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 475# Small wrapper for getent (Linux),
476# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 477# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 478egetent() {
363 case ${CHOST} in 479 case ${CHOST} in
364 *-darwin*) 480 *-darwin[678])
365 case "$2" in 481 case "$2" in
366 *[!0-9]*) # Non numeric 482 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
368 ;; 484 ;;
369 *) # Numeric 485 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;;
488 esac
489 ;;
490 *-darwin*)
491 local mytype=$1
492 [[ "passwd" == $mytype ]] && mytype="Users"
493 [[ "group" == $mytype ]] && mytype="Groups"
494 case "$2" in
495 *[!0-9]*) # Non numeric
496 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
497 ;;
498 *) # Numeric
499 local mykey="UniqueID"
500 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
501 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 502 ;;
372 esac 503 esac
373 ;; 504 ;;
374 *-freebsd*|*-dragonfly*) 505 *-freebsd*|*-dragonfly*)
375 local opts action="user" 506 local opts action="user"
575 fi 706 fi
576 ;; 707 ;;
577 708
578 *) 709 *)
579 if [[ -z $@ ]] ; then 710 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 711 useradd ${opts} \
581 -c "added by portage for ${PN}" \ 712 -c "added by portage for ${PN}" \
713 ${euser} \
582 || die "enewuser failed" 714 || die "enewuser failed"
583 else 715 else
584 einfo " - Extra: $@" 716 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 717 useradd ${opts} "$@" \
718 ${euser} \
586 || die "enewuser failed" 719 || die "enewuser failed"
587 fi 720 fi
588 ;; 721 ;;
589 esac 722 esac
590 723
749 local catmin=${CATEGORY##*-} 882 local catmin=${CATEGORY##*-}
750 case ${catmaj} in 883 case ${catmaj} in
751 app) 884 app)
752 case ${catmin} in 885 case ${catmin} in
753 accessibility) type=Accessibility;; 886 accessibility) type=Accessibility;;
754 admin) type=System;; 887 admin) type=System;;
755 antivirus) type=System;; 888 antivirus) type=System;;
756 arch) type=Archiving;; 889 arch) type=Archiving;;
757 backup) type=Archiving;; 890 backup) type=Archiving;;
758 cdr) type=DiscBurning;; 891 cdr) type=DiscBurning;;
759 dicts) type=Dictionary;; 892 dicts) type=Dictionary;;
760 doc) type=Documentation;; 893 doc) type=Documentation;;
761 editors) type=TextEditor;; 894 editors) type=TextEditor;;
762 emacs) type=TextEditor;; 895 emacs) type=TextEditor;;
763 emulation) type=Emulator;; 896 emulation) type=Emulator;;
764 laptop) type=HardwareSettings;; 897 laptop) type=HardwareSettings;;
765 office) type=Office;; 898 office) type=Office;;
766 pda) type=PDA;; 899 pda) type=PDA;;
767 vim) type=TextEditor;; 900 vim) type=TextEditor;;
768 xemacs) type=TextEditor;; 901 xemacs) type=TextEditor;;
769 *) type=;;
770 esac 902 esac
771 ;; 903 ;;
772 904
773 dev) 905 dev)
774 type="Development" 906 type="Development"
775 ;; 907 ;;
776 908
777 games) 909 games)
778 case ${catmin} in 910 case ${catmin} in
779 action|fps) type=ActionGame;; 911 action|fps) type=ActionGame;;
780 arcade) type=ArcadeGame;; 912 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 913 board) type=BoardGame;;
782 emulation) type=Emulator;; 914 emulation) type=Emulator;;
783 kids) type=KidsGame;; 915 kids) type=KidsGame;;
784 puzzle) type=LogicGame;; 916 puzzle) type=LogicGame;;
785 roguelike) type=RolePlaying;; 917 roguelike) type=RolePlaying;;
786 rpg) type=RolePlaying;; 918 rpg) type=RolePlaying;;
787 simulation) type=Simulation;; 919 simulation) type=Simulation;;
788 sports) type=SportsGame;; 920 sports) type=SportsGame;;
789 strategy) type=StrategyGame;; 921 strategy) type=StrategyGame;;
790 *) type=;;
791 esac 922 esac
792 type="Game;${type}" 923 type="Game;${type}"
793 ;; 924 ;;
794 925
795 gnome) 926 gnome)
807 media) 938 media)
808 case ${catmin} in 939 case ${catmin} in
809 gfx) type=Graphics;; 940 gfx) type=Graphics;;
810 radio) type=Tuner;; 941 radio) type=Tuner;;
811 sound) type=Audio;; 942 sound) type=Audio;;
812 tv) type=TV;; 943 tv) type=TV;;
813 video) type=Video;; 944 video) type=Video;;
814 *) type=;;
815 esac 945 esac
816 type="AudioVideo;${type}" 946 type="AudioVideo;${type}"
817 ;; 947 ;;
818 948
819 net) 949 net)
820 case ${catmin} in 950 case ${catmin} in
821 dialup) type=Dialup;; 951 dialup) type=Dialup;;
822 ftp) type=FileTransfer;; 952 ftp) type=FileTransfer;;
823 im) type=InstantMessaging;; 953 im) type=InstantMessaging;;
824 irc) type=IRCClient;; 954 irc) type=IRCClient;;
825 mail) type=Email;; 955 mail) type=Email;;
826 news) type=News;; 956 news) type=News;;
827 nntp) type=News;; 957 nntp) type=News;;
828 p2p) type=FileTransfer;; 958 p2p) type=FileTransfer;;
829 *) type=;; 959 voip) type=Telephony;;
830 esac 960 esac
831 type="Network;${type}" 961 type="Network;${type}"
832 ;; 962 ;;
833 963
834 sci) 964 sci)
835 case ${catmin} in 965 case ${catmin} in
836 astro*) type=Astronomy;; 966 astro*) type=Astronomy;;
837 bio*) type=Biology;; 967 bio*) type=Biology;;
838 calc*) type=Calculator;; 968 calc*) type=Calculator;;
839 chem*) type=Chemistry;; 969 chem*) type=Chemistry;;
840 elec*) type=Electronics;; 970 elec*) type=Electronics;;
841 geo*) type=Geology;; 971 geo*) type=Geology;;
842 math*) type=Math;; 972 math*) type=Math;;
843 physics) type=Physics;; 973 physics) type=Physics;;
844 visual*) type=DataVisualization;; 974 visual*) type=DataVisualization;;
845 *) type=;;
846 esac 975 esac
847 type="Science;${type}" 976 type="Education;Science;${type}"
848 ;; 977 ;;
849 978
850 sys) 979 sys)
851 type="System" 980 type="System"
852 ;; 981 ;;
853 982
854 www) 983 www)
855 case ${catmin} in 984 case ${catmin} in
856 client) type=WebBrowser;; 985 client) type=WebBrowser;;
857 *) type=;;
858 esac 986 esac
859 type="Network" 987 type="Network;${type}"
860 ;; 988 ;;
861 989
862 *) 990 *)
863 type= 991 type=
864 ;; 992 ;;
870 local desktop_name="${PN}-${SLOT}" 998 local desktop_name="${PN}-${SLOT}"
871 fi 999 fi
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1000 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1001 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 1002
1003 # Don't append another ";" when a valid category value is provided.
1004 type=${type%;}${type:+;}
1005
1006 eshopts_push -s extglob
1007 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1008 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1009 ewarn "allowed in .desktop files if the value is not an absolute path."
1010 icon=${icon%.@(xpm|png|svg)}
1011 fi
1012 eshopts_pop
1013
875 cat <<-EOF > "${desktop}" 1014 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 1015 [Desktop Entry]
877 Version=1.0
878 Name=${name} 1016 Name=${name}
879 Type=Application 1017 Type=Application
880 Comment=${DESCRIPTION} 1018 Comment=${DESCRIPTION}
881 Exec=${exec} 1019 Exec=${exec}
882 TryExec=${exec%% *} 1020 TryExec=${exec%% *}
883 Icon=${icon} 1021 Icon=${icon}
884 Categories=${type}; 1022 Categories=${type}
885 EOF 1023 EOF
886 1024
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1025 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
888 1026
889 ( 1027 (
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1059 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1060 fi
923} 1061}
924 1062
925# @FUNCTION: make_session_desktop 1063# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1064# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1065# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1066# 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. 1067# Window Manager. The command is the name of the Window Manager.
1068#
1069# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1070make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1071 [[ -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 1072 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1073
934 local title=$1 1074 local title=$1
935 local command=$2 1075 local command=$2
936 local desktop=${T}/${wm}.desktop 1076 local desktop=${T}/${wm:-${PN}}.desktop
1077 shift 2
937 1078
938 cat <<-EOF > "${desktop}" 1079 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1080 [Desktop Entry]
940 Name=${title} 1081 Name=${title}
941 Comment=This session logs you into ${title} 1082 Comment=This session logs you into ${title}
942 Exec=${command} 1083 Exec=${command} $*
943 TryExec=${command} 1084 TryExec=${command}
944 Type=Application 1085 Type=XSession
945 EOF 1086 EOF
946 1087
947 ( 1088 (
948 # wrap the env here so that the 'insinto' call 1089 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1090 # doesn't corrupt the env of the caller
1261 lic="${PWD}/${lic}" 1402 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1403 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1404 lic="${lic}"
1264 fi 1405 fi
1265 fi 1406 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1407 local l="`basename ${lic}`"
1268 1408
1269 # here is where we check for the licenses the user already 1409 # 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 1410 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1411 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1412 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1413 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1414 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1415 eshopts_pop
1277 return 0 1416 return 0
1278 fi 1417 fi
1279 done 1418 done
1280 set +o noglob; set -$shopts #reset old shell opts 1419 eshopts_pop
1420 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1421
1282 local licmsg=$(emktemp) 1422 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1423 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1424 **********************************************************
1285 The following license outlines the terms of use of this 1425 The following license outlines the terms of use of this
1454# displayed and we'll hang out here until: 1594# displayed and we'll hang out here until:
1455# (1) the file is found on a mounted cdrom 1595# (1) the file is found on a mounted cdrom
1456# (2) the user hits CTRL+C 1596# (2) the user hits CTRL+C
1457_cdrom_locate_file_on_cd() { 1597_cdrom_locate_file_on_cd() {
1458 local mline="" 1598 local mline=""
1459 local showedmsg=0 1599 local showedmsg=0 showjolietmsg=0
1460 1600
1461 while [[ -z ${CDROM_ROOT} ]] ; do 1601 while [[ -z ${CDROM_ROOT} ]] ; do
1462 local i=0 1602 local i=0
1463 local -a cdset=(${*//:/ }) 1603 local -a cdset=(${*//:/ })
1464 if [[ -n ${CDROM_SET} ]] ; then 1604 if [[ -n ${CDROM_SET} ]] ; then
1505 showedmsg=1 1645 showedmsg=1
1506 fi 1646 fi
1507 einfo "Press return to scan for the cd again" 1647 einfo "Press return to scan for the cd again"
1508 einfo "or hit CTRL+C to abort the emerge." 1648 einfo "or hit CTRL+C to abort the emerge."
1509 echo 1649 echo
1650 if [[ ${showjolietmsg} -eq 0 ]] ; then
1651 showjolietmsg=1
1652 else
1510 einfo "If you are having trouble with the detection" 1653 ewarn "If you are having trouble with the detection"
1511 einfo "of your CD, it is possible that you do not have" 1654 ewarn "of your CD, it is possible that you do not have"
1512 einfo "Joliet support enabled in your kernel. Please" 1655 ewarn "Joliet support enabled in your kernel. Please"
1513 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1656 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1657 ebeep 5
1658 fi
1514 read || die "something is screwed with your system" 1659 read || die "something is screwed with your system"
1515 done 1660 done
1516} 1661}
1517 1662
1518# @FUNCTION: strip-linguas 1663# @FUNCTION: strip-linguas
1527# of the lists. 1672# of the lists.
1528strip-linguas() { 1673strip-linguas() {
1529 local ls newls nols 1674 local ls newls nols
1530 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1675 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1531 local op=$1; shift 1676 local op=$1; shift
1532 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1677 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1533 local d f 1678 local d f
1534 for d in "$@" ; do 1679 for d in "$@" ; do
1535 if [[ ${op} == "-u" ]] ; then 1680 if [[ ${op} == "-u" ]] ; then
1536 newls=${ls} 1681 newls=${ls}
1537 else 1682 else
1538 newls="" 1683 newls=""
1539 fi 1684 fi
1540 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1685 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1541 if [[ ${op} == "-i" ]] ; then 1686 if [[ ${op} == "-i" ]] ; then
1542 hasq ${f} ${ls} && newls="${newls} ${f}" 1687 hasq ${f} ${ls} && newls="${newls} ${f}"
1543 else 1688 else
1544 hasq ${f} ${ls} || newls="${newls} ${f}" 1689 hasq ${f} ${ls} || newls="${newls} ${f}"
1545 fi 1690 fi
1558 else 1703 else
1559 nols="${nols} ${f}" 1704 nols="${nols} ${f}"
1560 fi 1705 fi
1561 done 1706 done
1562 [[ -n ${nols} ]] \ 1707 [[ -n ${nols} ]] \
1563 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1708 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1564 export LINGUAS=${newls:1} 1709 export LINGUAS=${newls:1}
1565} 1710}
1566 1711
1567# @FUNCTION: preserve_old_lib 1712# @FUNCTION: preserve_old_lib
1568# @USAGE: <libs to preserve> [more libs] 1713# @USAGE: <libs to preserve> [more libs]
1578 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1723 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1579 die "Invalid preserve_old_lib() usage" 1724 die "Invalid preserve_old_lib() usage"
1580 fi 1725 fi
1581 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1726 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1582 1727
1728 # let portage worry about it
1729 has preserve-libs ${FEATURES} && return 0
1730
1583 local lib dir 1731 local lib dir
1584 for lib in "$@" ; do 1732 for lib in "$@" ; do
1585 [[ -e ${ROOT}/${lib} ]] || continue 1733 [[ -e ${ROOT}/${lib} ]] || continue
1586 dir=${lib%/*} 1734 dir=${lib%/*}
1587 dodir ${dir} || die "dodir ${dir} failed" 1735 dodir ${dir} || die "dodir ${dir} failed"
1597preserve_old_lib_notify() { 1745preserve_old_lib_notify() {
1598 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1746 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1599 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1747 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1600 die "Invalid preserve_old_lib_notify() usage" 1748 die "Invalid preserve_old_lib_notify() usage"
1601 fi 1749 fi
1750
1751 # let portage worry about it
1752 has preserve-libs ${FEATURES} && return 0
1602 1753
1603 local lib notice=0 1754 local lib notice=0
1604 for lib in "$@" ; do 1755 for lib in "$@" ; do
1605 [[ -e ${ROOT}/${lib} ]] || continue 1756 [[ -e ${ROOT}/${lib} ]] || continue
1606 if [[ ${notice} -eq 0 ]] ; then 1757 if [[ ${notice} -eq 0 ]] ; then
1615 ewarn " # revdep-rebuild --library ${lib##*/}" 1766 ewarn " # revdep-rebuild --library ${lib##*/}"
1616 done 1767 done
1617 if [[ ${notice} -eq 1 ]] ; then 1768 if [[ ${notice} -eq 1 ]] ; then
1618 ewarn 1769 ewarn
1619 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1770 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1620 ewarn "delete the old libraries." 1771 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1772 for lib in "$@" ; do
1773 ewarn " # rm '${lib}'"
1774 done
1621 fi 1775 fi
1622} 1776}
1623 1777
1624# @FUNCTION: built_with_use 1778# @FUNCTION: built_with_use
1625# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1779# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1626# @DESCRIPTION: 1780# @DESCRIPTION:
1781#
1782# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1783#
1627# A temporary hack until portage properly supports DEPENDing on USE 1784# A temporary hack until portage properly supports DEPENDing on USE
1628# flags being enabled in packages. This will check to see if the specified 1785# 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 1786# 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 1787# --missing option controls the behavior if called on a package that does
1631# not actually support the defined USE flags (aka listed in IUSE). 1788# 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 1789# 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" 1790# 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 1791# 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 1792# 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 1793# 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 1794# means the USE flag we're checking is hidden expanded, so it won't be found
1638# in IUSE like normal USE flags. 1795# in IUSE like normal USE flags.
1639# 1796#
1640# Remember that this function isn't terribly intelligent so order of optional 1797# 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";; 1832 die) die "Unable to determine what USE flags $PKG was built with";;
1676 esac 1833 esac
1677 fi 1834 fi
1678 1835
1679 if [[ ${hidden} == "no" ]] ; then 1836 if [[ ${hidden} == "no" ]] ; then
1680 local IUSE_BUILT=$(<${IUSEFILE}) 1837 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1681 # Don't check USE_EXPAND #147237 1838 # Don't check USE_EXPAND #147237
1682 local expand 1839 local expand
1683 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1840 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1684 if [[ $1 == ${expand}_* ]] ; then 1841 if [[ $1 == ${expand}_* ]] ; then
1685 expand="" 1842 expand=""
1686 break 1843 break
1687 fi 1844 fi
1688 done 1845 done
1689 if [[ -n ${expand} ]] ; then 1846 if [[ -n ${expand} ]] ; then
1690 if ! has $1 ${IUSE_BUILT} ; then 1847 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1691 case ${missing_action} in 1848 case ${missing_action} in
1692 true) return 0;; 1849 true) return 0;;
1693 false) return 1;; 1850 false) return 1;;
1694 die) die "$PKG does not actually support the $1 USE flag!";; 1851 die) die "$PKG does not actually support the $1 USE flag!";;
1695 esac 1852 esac
1726 done 1883 done
1727 eend 0 1884 eend 0
1728} 1885}
1729 1886
1730# @FUNCTION: make_wrapper 1887# @FUNCTION: make_wrapper
1731# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1888# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1732# @DESCRIPTION: 1889# @DESCRIPTION:
1733# Create a shell wrapper script named wrapper in installpath 1890# Create a shell wrapper script named wrapper in installpath
1734# (defaults to the bindir) to execute target (default of wrapper) by 1891# (defaults to the bindir) to execute target (default of wrapper) by
1735# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1892# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1736# libpaths followed by optionally changing directory to chdir. 1893# libpaths followed by optionally changing directory to chdir.
1759 ) || die 1916 ) || die
1760 else 1917 else
1761 newbin "${tmpwrapper}" "${wrapper}" || die 1918 newbin "${tmpwrapper}" "${wrapper}" || die
1762 fi 1919 fi
1763} 1920}
1921
1922# @FUNCTION: prepalldocs
1923# @USAGE:
1924# @DESCRIPTION:
1925# Compress files in /usr/share/doc which are not already
1926# compressed, excluding /usr/share/doc/${PF}/html.
1927# Uses the ecompressdir to do the compression.
1928# 2009-02-18 by betelgeuse:
1929# Commented because ecompressdir is even more internal to
1930# Portage than prepalldocs (it's not even mentioned in man 5
1931# ebuild). Please submit a better version for review to gentoo-dev
1932# if you want prepalldocs here.
1933#prepalldocs() {
1934# if [[ -n $1 ]] ; then
1935# ewarn "prepalldocs: invalid usage; takes no arguments"
1936# fi
1937
1938# cd "${D}"
1939# [[ -d usr/share/doc ]] || return 0
1940
1941# find usr/share/doc -exec gzip {} +
1942# ecompressdir --ignore /usr/share/doc/${PF}/html
1943# ecompressdir --queue /usr/share/doc
1944#}

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

  ViewVC Help
Powered by ViewVC 1.1.20