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

Diff of /eclass/eutils.eclass

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

Revision 1.304 Revision 1.342
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.304 2008/09/20 18:45:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.342 2010/04/19 19:54:47 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
… …
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
… …
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
52# @FUNCTION: ecvs_clean 66# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 67# @USAGE: [list of dirs]
54# @DESCRIPTION: 68# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 69# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 70# internal CVS directories. Defaults to $PWD.
… …
68esvn_clean() { 82esvn_clean() {
69 [[ -z $* ]] && set -- . 83 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 84 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 85}
72 86
73# Default directory where patches are located 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.
74EPATCH_SOURCE="${WORKDIR}/patch" 147EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 148# @VARIABLE: EPATCH_SUFFIX
149# @DESCRIPTION:
150# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 151EPATCH_SUFFIX="patch.bz2"
152# @VARIABLE: EPATCH_OPTS
153# @DESCRIPTION:
77# Default options for patch 154# Default options for patch:
155# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 156# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 157# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 158# -E - automatically remove empty files
159# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 160EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
161# @VARIABLE: EPATCH_EXCLUDE
162# @DESCRIPTION:
82# 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,
83# and not the full path .. 164# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 165EPATCH_EXCLUDE=""
166# @VARIABLE: EPATCH_SINGLE_MSG
167# @DESCRIPTION:
85# Change the printed message for a single patch. 168# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 169EPATCH_SINGLE_MSG=""
170# @VARIABLE: EPATCH_MULTI_MSG
171# @DESCRIPTION:
87# Change the printed message for multiple patches. 172# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 173EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 174# @VARIABLE: EPATCH_FORCE
90# 175# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 176# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 177# arch naming style.
93EPATCH_FORCE="no" 178EPATCH_FORCE="no"
94 179
95# This function is for bulk patching, or in theory for just one 180# @FUNCTION: epatch
96# 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.
97# 188#
98# 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
99# Currently all patches should be the same format. 190# specified by EPATCH_SOURCE.
100# 191#
101# You do not have to specify '-p' option to patch, as it will 192# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 193# @CODE
103# 194# ${EPATCH_FORCE} == "yes"
104# Above EPATCH_* variables can be used to control various defaults,
105# bug they should be left as is to ensure an ebuild can rely on
106# them for.
107#
108# Patches are applied in current directory.
109#
110# Bulk Patches should preferibly have the form of:
111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 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.
113# 204#
114# For example: 205# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
206# for patches to apply.
115# 207#
116# 01_all_misc-fix.patch.bz2 208# Refer to the other EPATCH_xxx variables for more customization of behavior.
117# 02_sparc_another-fix.patch.bz2
118#
119# This ensures that there are a set order, and you can have ARCH
120# specific patches.
121#
122# If you however give an argument to epatch(), it will treat it as a
123# single patch that need to be applied if its a file. If on the other
124# hand its a directory, it will set EPATCH_SOURCE to this.
125#
126# <azarah@gentoo.org> (10 Nov 2002)
127#
128epatch() { 209epatch() {
129 _epatch_draw_line() { 210 _epatch_draw_line() {
211 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 212 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 213 echo "${1//?/=}"
132 } 214 }
133 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
134 local PIPE_CMD=""
135 local STDERR_TARGET="${T}/$$.out"
136 local PATCH_TARGET="${T}/$$.patch"
137 local PATCH_SUFFIX=""
138 local SINGLE_PATCH="no"
139 local x=""
140 215
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 216 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 217
143 if [ "$#" -gt 1 ] 218 # Let the rest of the code process one user arg at a time --
144 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
145 local m="" 222 local m
146 for m in "$@" ; do 223 for m in "$@" ; do
147 epatch "${m}" 224 epatch "${m}"
148 done 225 done
149 return 0 226 return 0
150 fi 227 fi
151 228
152 if [ -n "$1" -a -f "$1" ] 229 local SINGLE_PATCH="no"
153 then 230 # no args means process ${EPATCH_SOURCE}
231 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
232
233 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 234 SINGLE_PATCH="yes"
155 235 set -- "$1"
156 local EPATCH_SOURCE="$1" 236 # Use the suffix from the single patch (localize it); the code
237 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 238 local EPATCH_SUFFIX=$1
158 239
159 elif [ -n "$1" -a -d "$1" ] 240 elif [[ -d $1 ]] ; then
160 then 241 # Some people like to make dirs of patches w/out suffixes (vim)
161 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 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} ]]
163 then 286 then
164 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
165 else 312 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 313 einfo " ${patchname} ..."
167 fi 314 fi
168 else 315
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 316 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 317 # but if there are more, make sure we get unique log filenames
171 then 318 local STDERR_TARGET="${T}/${patchname}.out"
172 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
173 fi 338 fi
339 else
340 PATCH_TARGET=${x}
341 fi
174 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} *****"
175 echo 358 echo
176 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} )"
177 eerror 396 eerror
178 eerror " ${EPATCH_SOURCE}" 397 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 398 eerror
399 eerror " ${STDERR_TARGET}"
180 echo 400 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
192 bz2)
193 PIPE_CMD="bzip2 -dc"
194 PATCH_SUFFIX="bz2"
195 ;;
196 gz|Z|z)
197 PIPE_CMD="gzip -dc"
198 PATCH_SUFFIX="gz"
199 ;;
200 ZIP|zip)
201 PIPE_CMD="unzip -p"
202 PATCH_SUFFIX="zip"
203 ;;
204 *)
205 PIPE_CMD="cat"
206 PATCH_SUFFIX="patch"
207 ;;
208 esac
209
210 if [ "${SINGLE_PATCH}" = "no" ]
211 then
212 einfo "${EPATCH_MULTI_MSG}"
213 fi
214 for x in ${EPATCH_SOURCE}
215 do
216 # New ARCH dependant patch naming scheme ...
217 #
218 # ???_arch_foo.patch
219 #
220 if [ -f ${x} ] && \
221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
222 [ "${EPATCH_FORCE}" = "yes" ])
223 then
224 local count=0
225 local popts="${EPATCH_OPTS}"
226 local patchname=${x##*/}
227
228 if [ -n "${EPATCH_EXCLUDE}" ]
229 then
230 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
231 then
232 continue
233 fi
234 fi
235
236 if [ "${SINGLE_PATCH}" = "yes" ]
237 then
238 if [ -n "${EPATCH_SINGLE_MSG}" ]
239 then
240 einfo "${EPATCH_SINGLE_MSG}"
241 else
242 einfo "Applying ${patchname} ..."
243 fi
244 else
245 einfo " ${patchname} ..."
246 fi
247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Allow for prefix to differ ... im lazy, so shoot me :/
268 while [ "${count}" -lt 5 ]
269 do
270 # Generate some useful debug info ...
271 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273
274 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276
277 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279
280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
281 then
282 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
287
288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
289 _epatch_assert
290
291 if [ "$?" -ne 0 ]
292 then
293 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 echo
295 eerror "A dry-run of patch command succeeded, but actually"
296 eerror "applying the patch failed!"
297 #die "Real world sux compared to the dreamworld!"
298 count=5
299 fi
300
301 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
302
303 break
304 fi
305
306 count=$((count + 1))
307 done
308
309 if [ "${PATCH_SUFFIX}" != "patch" ]
310 then
311 rm -f ${PATCH_TARGET}
312 fi
313
314 if [ "${count}" -eq 5 ]
315 then
316 echo
317 eerror "Failed Patch: ${patchname} !"
318 eerror " ( ${PATCH_TARGET} )"
319 eerror
320 eerror "Include in your bugreport the contents of:"
321 eerror
322 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
323 echo
324 die "Failed Patch: ${patchname}!" 401 die "Failed Patch: ${patchname}!"
325 fi 402 fi
326 403
327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 404 # if everything worked, delete the patch log
328 405 rm -f "${STDERR_TARGET}"
329 eend 0 406 eend 0
330 fi
331 done 407 done
332 if [ "${SINGLE_PATCH}" = "no" ] 408
333 then 409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
334 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
335 fi 428 fi
429 done
336} 430}
337 431
338# @FUNCTION: emktemp 432# @FUNCTION: emktemp
339# @USAGE: [temp dir] 433# @USAGE: [temp dir]
340# @DESCRIPTION: 434# @DESCRIPTION:
… …
376# base-system@gentoo.org (Linux) 470# base-system@gentoo.org (Linux)
377# Joe Jezak <josejx@gmail.com> (OS X) 471# Joe Jezak <josejx@gmail.com> (OS X)
378# usata@gentoo.org (OS X) 472# usata@gentoo.org (OS X)
379# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 473# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
380# @DESCRIPTION: 474# @DESCRIPTION:
381# 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),
382# and pw (FreeBSD) used in enewuser()/enewgroup() 477# and pw (FreeBSD) used in enewuser()/enewgroup()
383egetent() { 478egetent() {
384 case ${CHOST} in 479 case ${CHOST} in
385 *-darwin*) 480 *-darwin[678])
386 case "$2" in 481 case "$2" in
387 *[!0-9]*) # Non numeric 482 *[!0-9]*) # Non numeric
388 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
389 ;; 484 ;;
390 *) # Numeric 485 *) # Numeric
391 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
392 ;; 502 ;;
393 esac 503 esac
394 ;; 504 ;;
395 *-freebsd*|*-dragonfly*) 505 *-freebsd*|*-dragonfly*)
396 local opts action="user" 506 local opts action="user"
… …
596 fi 706 fi
597 ;; 707 ;;
598 708
599 *) 709 *)
600 if [[ -z $@ ]] ; then 710 if [[ -z $@ ]] ; then
601 useradd ${opts} ${euser} \ 711 useradd ${opts} \
602 -c "added by portage for ${PN}" \ 712 -c "added by portage for ${PN}" \
713 ${euser} \
603 || die "enewuser failed" 714 || die "enewuser failed"
604 else 715 else
605 einfo " - Extra: $@" 716 einfo " - Extra: $@"
606 useradd ${opts} ${euser} "$@" \ 717 useradd ${opts} "$@" \
718 ${euser} \
607 || die "enewuser failed" 719 || die "enewuser failed"
608 fi 720 fi
609 ;; 721 ;;
610 esac 722 esac
611 723
… …
744 856
745# Make a desktop file ! 857# Make a desktop file !
746# Great for making those icons in kde/gnome startmenu ! 858# Great for making those icons in kde/gnome startmenu !
747# Amaze your friends ! Get the women ! Join today ! 859# Amaze your friends ! Get the women ! Join today !
748# 860#
749# make_desktop_entry(<command>, [name], [icon], [type], [path]) 861# make_desktop_entry(<command>, [name], [icon], [type], [fields])
750# 862#
751# binary: what command does the app run with ? 863# binary: what command does the app run with ?
752# name: the name that will show up in the menu 864# name: the name that will show up in the menu
753# icon: give your little like a pretty little icon ... 865# icon: give your little like a pretty little icon ...
754# this can be relative (to /usr/share/pixmaps) or 866# this can be relative (to /usr/share/pixmaps) or
755# a full path to an icon 867# a full path to an icon
756# type: what kind of application is this ? for categories: 868# type: what kind of application is this ? for categories:
757# http://standards.freedesktop.org/menu-spec/latest/apa.html 869# http://standards.freedesktop.org/menu-spec/latest/apa.html
758# path: if your app needs to startup in a specific dir 870# fields: extra fields to append to the desktop file; a printf string
759make_desktop_entry() { 871make_desktop_entry() {
760 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 872 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
761 873
762 local exec=${1} 874 local exec=${1}
763 local name=${2:-${PN}} 875 local name=${2:-${PN}}
764 local icon=${3:-${PN}} 876 local icon=${3:-${PN}}
765 local type=${4} 877 local type=${4}
766 local path=${5} 878 local fields=${5}
767 879
768 if [[ -z ${type} ]] ; then 880 if [[ -z ${type} ]] ; then
769 local catmaj=${CATEGORY%%-*} 881 local catmaj=${CATEGORY%%-*}
770 local catmin=${CATEGORY##*-} 882 local catmin=${CATEGORY##*-}
771 case ${catmaj} in 883 case ${catmaj} in
772 app) 884 app)
773 case ${catmin} in 885 case ${catmin} in
774 accessibility) type=Accessibility;; 886 accessibility) type=Accessibility;;
775 admin) type=System;; 887 admin) type=System;;
776 antivirus) type=System;; 888 antivirus) type=System;;
777 arch) type=Archiving;; 889 arch) type=Archiving;;
778 backup) type=Archiving;; 890 backup) type=Archiving;;
779 cdr) type=DiscBurning;; 891 cdr) type=DiscBurning;;
780 dicts) type=Dictionary;; 892 dicts) type=Dictionary;;
781 doc) type=Documentation;; 893 doc) type=Documentation;;
782 editors) type=TextEditor;; 894 editors) type=TextEditor;;
783 emacs) type=TextEditor;; 895 emacs) type=TextEditor;;
784 emulation) type=Emulator;; 896 emulation) type=Emulator;;
785 laptop) type=HardwareSettings;; 897 laptop) type=HardwareSettings;;
786 office) type=Office;; 898 office) type=Office;;
787 pda) type=PDA;; 899 pda) type=PDA;;
788 vim) type=TextEditor;; 900 vim) type=TextEditor;;
789 xemacs) type=TextEditor;; 901 xemacs) type=TextEditor;;
790 *) type=;;
791 esac 902 esac
792 ;; 903 ;;
793 904
794 dev) 905 dev)
795 type="Development" 906 type="Development"
796 ;; 907 ;;
797 908
798 games) 909 games)
799 case ${catmin} in 910 case ${catmin} in
800 action|fps) type=ActionGame;; 911 action|fps) type=ActionGame;;
801 arcade) type=ArcadeGame;; 912 arcade) type=ArcadeGame;;
802 board) type=BoardGame;; 913 board) type=BoardGame;;
803 emulation) type=Emulator;; 914 emulation) type=Emulator;;
804 kids) type=KidsGame;; 915 kids) type=KidsGame;;
805 puzzle) type=LogicGame;; 916 puzzle) type=LogicGame;;
806 roguelike) type=RolePlaying;; 917 roguelike) type=RolePlaying;;
807 rpg) type=RolePlaying;; 918 rpg) type=RolePlaying;;
808 simulation) type=Simulation;; 919 simulation) type=Simulation;;
809 sports) type=SportsGame;; 920 sports) type=SportsGame;;
810 strategy) type=StrategyGame;; 921 strategy) type=StrategyGame;;
811 *) type=;;
812 esac 922 esac
813 type="Game;${type}" 923 type="Game;${type}"
814 ;; 924 ;;
815 925
816 gnome) 926 gnome)
… …
825 type="Network;Email" 935 type="Network;Email"
826 ;; 936 ;;
827 937
828 media) 938 media)
829 case ${catmin} in 939 case ${catmin} in
940 gfx)
830 gfx) type=Graphics;; 941 type=Graphics
942 ;;
943 *)
944 case ${catmin} in
831 radio) type=Tuner;; 945 radio) type=Tuner;;
832 sound) type=Audio;; 946 sound) type=Audio;;
833 tv) type=TV;; 947 tv) type=TV;;
834 video) type=Video;; 948 video) type=Video;;
835 *) type=;; 949 esac
950 type="AudioVideo;${type}"
951 ;;
836 esac 952 esac
837 type="AudioVideo;${type}"
838 ;; 953 ;;
839 954
840 net) 955 net)
841 case ${catmin} in 956 case ${catmin} in
842 dialup) type=Dialup;; 957 dialup) type=Dialup;;
843 ftp) type=FileTransfer;; 958 ftp) type=FileTransfer;;
844 im) type=InstantMessaging;; 959 im) type=InstantMessaging;;
845 irc) type=IRCClient;; 960 irc) type=IRCClient;;
846 mail) type=Email;; 961 mail) type=Email;;
847 news) type=News;; 962 news) type=News;;
848 nntp) type=News;; 963 nntp) type=News;;
849 p2p) type=FileTransfer;; 964 p2p) type=FileTransfer;;
850 *) type=;; 965 voip) type=Telephony;;
851 esac 966 esac
852 type="Network;${type}" 967 type="Network;${type}"
853 ;; 968 ;;
854 969
855 sci) 970 sci)
856 case ${catmin} in 971 case ${catmin} in
857 astro*) type=Astronomy;; 972 astro*) type=Astronomy;;
858 bio*) type=Biology;; 973 bio*) type=Biology;;
859 calc*) type=Calculator;; 974 calc*) type=Calculator;;
860 chem*) type=Chemistry;; 975 chem*) type=Chemistry;;
861 elec*) type=Electronics;; 976 elec*) type=Electronics;;
862 geo*) type=Geology;; 977 geo*) type=Geology;;
863 math*) type=Math;; 978 math*) type=Math;;
864 physics) type=Physics;; 979 physics) type=Physics;;
865 visual*) type=DataVisualization;; 980 visual*) type=DataVisualization;;
866 *) type=;;
867 esac 981 esac
868 type="Science;${type}" 982 type="Education;Science;${type}"
869 ;; 983 ;;
870 984
871 sys) 985 sys)
872 type="System" 986 type="System"
873 ;; 987 ;;
874 988
875 www) 989 www)
876 case ${catmin} in 990 case ${catmin} in
877 client) type=WebBrowser;; 991 client) type=WebBrowser;;
878 *) type=;;
879 esac 992 esac
880 type="Network" 993 type="Network;${type}"
881 ;; 994 ;;
882 995
883 *) 996 *)
884 type= 997 type=
885 ;; 998 ;;
… …
891 local desktop_name="${PN}-${SLOT}" 1004 local desktop_name="${PN}-${SLOT}"
892 fi 1005 fi
893 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1006 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1007 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 1008
1009 # Don't append another ";" when a valid category value is provided.
1010 type=${type%;}${type:+;}
1011
1012 eshopts_push -s extglob
1013 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1014 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1015 ewarn "allowed in .desktop files if the value is not an absolute path."
1016 icon=${icon%.@(xpm|png|svg)}
1017 fi
1018 eshopts_pop
1019
896 cat <<-EOF > "${desktop}" 1020 cat <<-EOF > "${desktop}"
897 [Desktop Entry] 1021 [Desktop Entry]
898 Version=1.0
899 Name=${name} 1022 Name=${name}
900 Type=Application 1023 Type=Application
901 Comment=${DESCRIPTION} 1024 Comment=${DESCRIPTION}
902 Exec=${exec} 1025 Exec=${exec}
903 TryExec=${exec%% *} 1026 TryExec=${exec%% *}
904 Icon=${icon} 1027 Icon=${icon}
905 Categories=${type}; 1028 Categories=${type}
906 EOF 1029 EOF
907 1030
908 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1031 if [[ ${fields:-=} != *=* ]] ; then
1032 # 5th arg used to be value to Path=
1033 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1034 fields="Path=${fields}"
1035 fi
1036 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
909 1037
910 ( 1038 (
911 # wrap the env here so that the 'insinto' call 1039 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller 1040 # doesn't corrupt the env of the caller
913 insinto /usr/share/applications 1041 insinto /usr/share/applications
914 doins "${desktop}" 1042 doins "${desktop}"
915 ) 1043 ) || die "installing desktop file failed"
916} 1044}
917 1045
918# @FUNCTION: validate_desktop_entries 1046# @FUNCTION: validate_desktop_entries
919# @USAGE: [directories] 1047# @USAGE: [directories]
920# @MAINTAINER: 1048# @MAINTAINER:
… …
942 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1070 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
943 fi 1071 fi
944} 1072}
945 1073
946# @FUNCTION: make_session_desktop 1074# @FUNCTION: make_session_desktop
947# @USAGE: <title> <command> 1075# @USAGE: <title> <command> [command args...]
948# @DESCRIPTION: 1076# @DESCRIPTION:
949# Make a GDM/KDM Session file. The title is the file to execute to start the 1077# Make a GDM/KDM Session file. The title is the file to execute to start the
950# Window Manager. The command is the name of the Window Manager. 1078# Window Manager. The command is the name of the Window Manager.
1079#
1080# You can set the name of the file via the ${wm} variable.
951make_session_desktop() { 1081make_session_desktop() {
952 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1082 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
953 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1083 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
954 1084
955 local title=$1 1085 local title=$1
956 local command=$2 1086 local command=$2
957 local desktop=${T}/${wm}.desktop 1087 local desktop=${T}/${wm:-${PN}}.desktop
1088 shift 2
958 1089
959 cat <<-EOF > "${desktop}" 1090 cat <<-EOF > "${desktop}"
960 [Desktop Entry] 1091 [Desktop Entry]
961 Name=${title} 1092 Name=${title}
962 Comment=This session logs you into ${title} 1093 Comment=This session logs you into ${title}
963 Exec=${command} 1094 Exec=${command} $*
964 TryExec=${command} 1095 TryExec=${command}
965 Type=Application 1096 Type=XSession
966 EOF 1097 EOF
967 1098
968 ( 1099 (
969 # wrap the env here so that the 'insinto' call 1100 # wrap the env here so that the 'insinto' call
970 # doesn't corrupt the env of the caller 1101 # doesn't corrupt the env of the caller
… …
1282 lic="${PWD}/${lic}" 1413 lic="${PWD}/${lic}"
1283 elif [ -e "${lic}" ] ; then 1414 elif [ -e "${lic}" ] ; then
1284 lic="${lic}" 1415 lic="${lic}"
1285 fi 1416 fi
1286 fi 1417 fi
1287 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1288 local l="`basename ${lic}`" 1418 local l="`basename ${lic}`"
1289 1419
1290 # here is where we check for the licenses the user already 1420 # here is where we check for the licenses the user already
1291 # accepted ... if we don't find a match, we make the user accept 1421 # accepted ... if we don't find a match, we make the user accept
1292 local shopts=$-
1293 local alic 1422 local alic
1294 set -o noglob #so that bash doesn't expand "*" 1423 eshopts_push -o noglob # so that bash doesn't expand "*"
1295 for alic in ${ACCEPT_LICENSE} ; do 1424 for alic in ${ACCEPT_LICENSE} ; do
1296 if [[ ${alic} == ${l} ]]; then 1425 if [[ ${alic} == ${l} ]]; then
1297 set +o noglob; set -${shopts} #reset old shell opts 1426 eshopts_pop
1298 return 0 1427 return 0
1299 fi 1428 fi
1300 done 1429 done
1301 set +o noglob; set -$shopts #reset old shell opts 1430 eshopts_pop
1431 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1302 1432
1303 local licmsg=$(emktemp) 1433 local licmsg=$(emktemp)
1304 cat <<-EOF > ${licmsg} 1434 cat <<-EOF > ${licmsg}
1305 ********************************************************** 1435 **********************************************************
1306 The following license outlines the terms of use of this 1436 The following license outlines the terms of use of this
… …
1553# of the lists. 1683# of the lists.
1554strip-linguas() { 1684strip-linguas() {
1555 local ls newls nols 1685 local ls newls nols
1556 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1686 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1557 local op=$1; shift 1687 local op=$1; shift
1558 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1688 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1559 local d f 1689 local d f
1560 for d in "$@" ; do 1690 for d in "$@" ; do
1561 if [[ ${op} == "-u" ]] ; then 1691 if [[ ${op} == "-u" ]] ; then
1562 newls=${ls} 1692 newls=${ls}
1563 else 1693 else
1564 newls="" 1694 newls=""
1565 fi 1695 fi
1566 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1696 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1567 if [[ ${op} == "-i" ]] ; then 1697 if [[ ${op} == "-i" ]] ; then
1568 hasq ${f} ${ls} && newls="${newls} ${f}" 1698 hasq ${f} ${ls} && newls="${newls} ${f}"
1569 else 1699 else
1570 hasq ${f} ${ls} || newls="${newls} ${f}" 1700 hasq ${f} ${ls} || newls="${newls} ${f}"
1571 fi 1701 fi
… …
1584 else 1714 else
1585 nols="${nols} ${f}" 1715 nols="${nols} ${f}"
1586 fi 1716 fi
1587 done 1717 done
1588 [[ -n ${nols} ]] \ 1718 [[ -n ${nols} ]] \
1589 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1719 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1590 export LINGUAS=${newls:1} 1720 export LINGUAS=${newls:1}
1591} 1721}
1592 1722
1593# @FUNCTION: preserve_old_lib 1723# @FUNCTION: preserve_old_lib
1594# @USAGE: <libs to preserve> [more libs] 1724# @USAGE: <libs to preserve> [more libs]
… …
1657} 1787}
1658 1788
1659# @FUNCTION: built_with_use 1789# @FUNCTION: built_with_use
1660# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1790# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1661# @DESCRIPTION: 1791# @DESCRIPTION:
1792#
1793# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1794#
1662# A temporary hack until portage properly supports DEPENDing on USE 1795# A temporary hack until portage properly supports DEPENDing on USE
1663# flags being enabled in packages. This will check to see if the specified 1796# flags being enabled in packages. This will check to see if the specified
1664# DEPEND atom was built with the specified list of USE flags. The 1797# DEPEND atom was built with the specified list of USE flags. The
1665# --missing option controls the behavior if called on a package that does 1798# --missing option controls the behavior if called on a package that does
1666# not actually support the defined USE flags (aka listed in IUSE). 1799# not actually support the defined USE flags (aka listed in IUSE).
… …
1794 ) || die 1927 ) || die
1795 else 1928 else
1796 newbin "${tmpwrapper}" "${wrapper}" || die 1929 newbin "${tmpwrapper}" "${wrapper}" || die
1797 fi 1930 fi
1798} 1931}
1932
1933# @FUNCTION: prepalldocs
1934# @USAGE:
1935# @DESCRIPTION:
1936# Compress files in /usr/share/doc which are not already
1937# compressed, excluding /usr/share/doc/${PF}/html.
1938# Uses the ecompressdir to do the compression.
1939# 2009-02-18 by betelgeuse:
1940# Commented because ecompressdir is even more internal to
1941# Portage than prepalldocs (it's not even mentioned in man 5
1942# ebuild). Please submit a better version for review to gentoo-dev
1943# if you want prepalldocs here.
1944#prepalldocs() {
1945# if [[ -n $1 ]] ; then
1946# ewarn "prepalldocs: invalid usage; takes no arguments"
1947# fi
1948
1949# cd "${D}"
1950# [[ -d usr/share/doc ]] || return 0
1951
1952# find usr/share/doc -exec gzip {} +
1953# ecompressdir --ignore /usr/share/doc/${PF}/html
1954# ecompressdir --queue /usr/share/doc
1955#}
Legend:
Removed from v.1.304  
changed lines
  Added in v.1.342
  ViewVC Help
Powered by ViewVC 1.1.20