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

Diff of /eclass/eutils.eclass

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

Revision 1.284 Revision 1.335
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.284 2007/06/21 04:44:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.335 2010/02/26 05:17:24 halcy0n 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
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement 10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions 11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common 12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing. 13# home rather than having multiple ebuilds implementing the same thing.
14# 14#
15# Due to the nature of this eclass, some functions may have maintainers 15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass! 16# different from the overall eclass!
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21
22if has "${EAPI:-0}" 0 1 2; then
21 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%%-*}
… …
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1007 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1008 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 1009
876 cat <<-EOF > "${desktop}" 1010 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 1011 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 1012 Name=${name}
881 Type=Application 1013 Type=Application
882 Comment=${DESCRIPTION} 1014 Comment=${DESCRIPTION}
883 Exec=${exec} 1015 Exec=${exec}
884 TryExec=${exec%% *} 1016 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 1017 Icon=${icon}
887 Categories=${type}; 1018 Categories=${type};
888 EOF 1019 EOF
1020
1021 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 1022
890 ( 1023 (
891 # wrap the env here so that the 'insinto' call 1024 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1025 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1026 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." 1055 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1056 fi
924} 1057}
925 1058
926# @FUNCTION: make_session_desktop 1059# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1060# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1061# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1062# 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. 1063# Window Manager. The command is the name of the Window Manager.
1064#
1065# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1066make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1067 [[ -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 1068 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1069
935 local title=$1 1070 local title=$1
936 local command=$2 1071 local command=$2
937 local desktop=${T}/${wm}.desktop 1072 local desktop=${T}/${wm:-${PN}}.desktop
1073 shift 2
938 1074
939 cat <<-EOF > "${desktop}" 1075 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1076 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1077 Name=${title}
943 Comment=This session logs you into ${title} 1078 Comment=This session logs you into ${title}
944 Exec=${command} 1079 Exec=${command} $*
945 TryExec=${command} 1080 TryExec=${command}
946 Type=Application 1081 Type=XSession
947 EOF 1082 EOF
948 1083
949 ( 1084 (
950 # wrap the env here so that the 'insinto' call 1085 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1086 # doesn't corrupt the env of the caller
… …
972 elif [[ -d ${i} ]] ; then 1107 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 1108 for j in "${i}"/*.desktop ; do
974 doins "${j}" 1109 doins "${j}"
975 ((ret+=$?)) 1110 ((ret+=$?))
976 done 1111 done
1112 else
1113 ((++ret))
977 fi 1114 fi
978 done 1115 done
979 exit ${ret} 1116 exit ${ret}
980 ) 1117 )
981} 1118}
… …
1011 elif [[ -d ${i} ]] ; then 1148 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 1149 for j in "${i}"/*.png ; do
1013 doins "${j}" 1150 doins "${j}"
1014 ((ret+=$?)) 1151 ((ret+=$?))
1015 done 1152 done
1153 else
1154 ((++ret))
1016 fi 1155 fi
1017 done 1156 done
1018 exit ${ret} 1157 exit ${ret}
1019 ) 1158 )
1020} 1159}
… …
1055# @DESCRIPTION: 1194# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 1195# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 1196# They're self-unpacking programs with the binary package stuffed in
1058# the middle of the archive. Valve seems to use it a lot ... too bad 1197# the middle of the archive. Valve seems to use it a lot ... too bad
1059# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1198# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 1199#
1061# You have to specify the off_t size ... I have no idea how to extract that 1200# You have to specify the off_t size ... I have no idea how to extract that
1062# information out of the binary executable myself. Basically you pass in 1201# information out of the binary executable myself. Basically you pass in
1063# the size of the off_t type (in bytes) on the machine that built the pdv 1202# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 1203# archive.
1065# 1204#
1066# One way to determine this is by running the following commands: 1205# One way to determine this is by running the following commands:
1206#
1207# @CODE
1067# strings <pdv archive> | grep lseek 1208# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 1209# strace -elseek <pdv archive>
1210# @CODE
1211#
1069# Basically look for the first lseek command (we do the strings/grep because 1212# Basically look for the first lseek command (we do the strings/grep because
1070# sometimes the function call is _llseek or something) and steal the 2nd 1213# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 1214# parameter. Here is an example:
1215#
1216# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1217# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 1218# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1219# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 1220# lseek(3, -4, SEEK_END) = 2981250
1221# @CODE
1222#
1076# Thus we would pass in the value of '4' as the second parameter. 1223# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 1224unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 1225 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 1226 local sizeoff_t=$2
1080 1227
… …
1150# @DESCRIPTION: 1297# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1298# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1299# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1300# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1301# many other game companies.
1155# 1302#
1156# If the file is not specified, then ${A} is used. If the 1303# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1304# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1305# the proper offset from the script itself.
1159unpack_makeself() { 1306unpack_makeself() {
1160 local src_input=${1:-${A}} 1307 local src_input=${1:-${A}}
… …
1251 lic="${PWD}/${lic}" 1398 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1399 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1400 lic="${lic}"
1254 fi 1401 fi
1255 fi 1402 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1403 local l="`basename ${lic}`"
1258 1404
1259 # here is where we check for the licenses the user already 1405 # here is where we check for the licenses the user already
1260 # accepted ... if we don't find a match, we make the user accept 1406 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1407 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1408 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1409 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1410 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1411 eshopts_pop
1267 return 0 1412 return 0
1268 fi 1413 fi
1269 done 1414 done
1270 set +o noglob; set -$shopts #reset old shell opts 1415 eshopts_pop
1416 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1417
1272 local licmsg=$(emktemp) 1418 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1419 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1420 **********************************************************
1275 The following license outlines the terms of use of this 1421 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1422 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1423 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1424 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1425 **********************************************************
1280 1426
1281 EOF 1427 EOF
1282 cat ${lic} >> ${licmsg} 1428 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1429 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1284 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1430 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1431 read alic
… …
1298# @FUNCTION: cdrom_get_cds 1444# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1445# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1446# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1447# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1448# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1449#
1304# With these cdrom functions we handle all the user interaction and 1450# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1451# standardize everything. All you have to do is call cdrom_get_cds()
1306# and when the function returns, you can assume that the cd has been 1452# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1453# found at CDROM_ROOT.
1308# 1454#
1309# The function will attempt to locate a cd based upon a file that is on 1455# The function will attempt to locate a cd based upon a file that is on
1310# the cd. The more files you give this function, the more cds 1456# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1457# the cdrom functions will handle.
1312# 1458#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1459# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1314# etc... If you want to give the cds better names, then just export 1460# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1461# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1316# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can 1462# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1463# also use the CDROM_NAME_SET bash array.
1318# 1464#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1465# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1466cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1467 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1468 # the # of files they gave us
1323 local cdcnt=0 1469 local cdcnt=0
… …
1444# displayed and we'll hang out here until: 1590# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1591# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1592# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1593_cdrom_locate_file_on_cd() {
1448 local mline="" 1594 local mline=""
1449 local showedmsg=0 1595 local showedmsg=0 showjolietmsg=0
1450 1596
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1597 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1598 local i=0
1453 local -a cdset=(${*//:/ }) 1599 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1600 if [[ -n ${CDROM_SET} ]] ; then
… …
1463 while read point node fs foo ; do 1609 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1610 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1611 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1612 && continue
1467 point=${point//\040/ } 1613 point=${point//\040/ }
1614 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1615 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1616 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1617 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1618 export CDROM_MATCH=${cdset[${i}]}
1472 return 1619 return
… …
1494 showedmsg=1 1641 showedmsg=1
1495 fi 1642 fi
1496 einfo "Press return to scan for the cd again" 1643 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1644 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1645 echo
1646 if [[ ${showjolietmsg} -eq 0 ]] ; then
1647 showjolietmsg=1
1648 else
1499 einfo "If you are having trouble with the detection" 1649 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1650 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1651 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1652 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1653 ebeep 5
1654 fi
1503 read || die "something is screwed with your system" 1655 read || die "something is screwed with your system"
1504 done 1656 done
1505} 1657}
1506 1658
1659# @FUNCTION: strip-linguas
1660# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1661# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1662# Make sure that LINGUAS only contains languages that
1508# a package can support 1663# a package can support. The first form allows you to
1509# 1664# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1665# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1666# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1667# files found in all the directories and uses the union
1513# 1668# of the lists.
1514# The first form allows you to specify a list of LINGUAS.
1515# The -i builds a list of po files found in all the
1516# directories and uses the intersection of the lists.
1517# The -u builds a list of po files found in all the
1518# directories and uses the union of the lists.
1519strip-linguas() { 1669strip-linguas() {
1520 local ls newls nols 1670 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1671 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1672 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1673 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1674 local d f
1525 for d in "$@" ; do 1675 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1676 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1677 newls=${ls}
1528 else 1678 else
1529 newls="" 1679 newls=""
1530 fi 1680 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1681 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1682 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1683 hasq ${f} ${ls} && newls="${newls} ${f}"
1534 else 1684 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1685 hasq ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1686 fi
… …
1549 else 1699 else
1550 nols="${nols} ${f}" 1700 nols="${nols} ${f}"
1551 fi 1701 fi
1552 done 1702 done
1553 [[ -n ${nols} ]] \ 1703 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1704 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1705 export LINGUAS=${newls:1}
1556}
1557
1558# @FUNCTION: set_arch_to_kernel
1559# @DESCRIPTION:
1560# Set the env ARCH to match what the kernel expects.
1561set_arch_to_kernel() {
1562 i=10
1563 while ((i--)) ; do
1564 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1565 done
1566 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1567 case ${ARCH} in
1568 x86) export ARCH="i386";;
1569 amd64) export ARCH="x86_64";;
1570 hppa) export ARCH="parisc";;
1571 mips) export ARCH="mips";;
1572 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1573 *) export ARCH="${ARCH}";;
1574 esac
1575}
1576
1577# @FUNCTION: set_arch_to_portage
1578# @DESCRIPTION:
1579# Set the env ARCH to match what portage expects.
1580set_arch_to_portage() {
1581 i=10
1582 while ((i--)) ; do
1583 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1584 done
1585 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1586} 1706}
1587 1707
1588# @FUNCTION: preserve_old_lib 1708# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1709# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1710# @DESCRIPTION:
… …
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1719 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1720 die "Invalid preserve_old_lib() usage"
1601 fi 1721 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1722 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1723
1724 # let portage worry about it
1725 has preserve-libs ${FEATURES} && return 0
1726
1604 local lib dir 1727 local lib dir
1605 for lib in "$@" ; do 1728 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1729 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1730 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1731 dodir ${dir} || die "dodir ${dir} failed"
… …
1618preserve_old_lib_notify() { 1741preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1742 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1743 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1744 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1745 fi
1746
1747 # let portage worry about it
1748 has preserve-libs ${FEATURES} && return 0
1623 1749
1624 local lib notice=0 1750 local lib notice=0
1625 for lib in "$@" ; do 1751 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1752 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1753 if [[ ${notice} -eq 0 ]] ; then
… …
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1759 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1760 ewarn
1635 fi 1761 fi
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1762 ewarn " # revdep-rebuild --library ${lib##*/}"
1637 done 1763 done
1764 if [[ ${notice} -eq 1 ]] ; then
1765 ewarn
1766 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1767 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1768 for lib in "$@" ; do
1769 ewarn " # rm '${lib}'"
1770 done
1771 fi
1638} 1772}
1639 1773
1640# @FUNCTION: built_with_use 1774# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1775# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1776# @DESCRIPTION:
1777#
1778# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1779#
1643# A temporary hack until portage properly supports DEPENDing on USE 1780# A temporary hack until portage properly supports DEPENDing on USE
1644# flags being enabled in packages. This will check to see if the specified 1781# flags being enabled in packages. This will check to see if the specified
1645# DEPEND atom was built with the specified list of USE flags. The 1782# DEPEND atom was built with the specified list of USE flags. The
1646# --missing option controls the behavior if called on a package that does 1783# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1784# not actually support the defined USE flags (aka listed in IUSE).
1648# The default is to abort (call die). The -a and -o flags control 1785# The default is to abort (call die). The -a and -o flags control
1649# the requirements of the USE flags. They correspond to "and" and "or" 1786# the requirements of the USE flags. They correspond to "and" and "or"
1650# logic. So the -a flag means all listed USE flags must be enabled 1787# logic. So the -a flag means all listed USE flags must be enabled
1651# while the -o flag means at least one of the listed fIUSE flags must be 1788# while the -o flag means at least one of the listed IUSE flags must be
1652# enabled. The --hidden option is really for internal use only as it 1789# enabled. The --hidden option is really for internal use only as it
1653# means the USE flag we're checking is hidden expanded, so it won't be found 1790# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1791# in IUSE like normal USE flags.
1655# 1792#
1656# Remember that this function isn't terribly intelligent so order of optional 1793# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1794# flags matter.
1658built_with_use() { 1795built_with_use() {
1659 local hidden="no" 1796 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1797 if [[ $1 == "--hidden" ]] ; then
… …
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1828 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1829 esac
1693 fi 1830 fi
1694 1831
1695 if [[ ${hidden} == "no" ]] ; then 1832 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1833 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1834 # Don't check USE_EXPAND #147237
1698 local expand 1835 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1836 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1837 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1838 expand=""
1702 break 1839 break
1703 fi 1840 fi
1704 done 1841 done
1705 if [[ -n ${expand} ]] ; then 1842 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1843 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1844 case ${missing_action} in
1708 true) return 0;; 1845 true) return 0;;
1709 false) return 1;; 1846 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1847 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1848 esac
… …
1723 shift 1860 shift
1724 done 1861 done
1725 [[ ${opt} = "-a" ]] 1862 [[ ${opt} = "-a" ]]
1726} 1863}
1727 1864
1728# @DESCRIPTION: epunt_cxx 1865# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1866# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1867# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1868# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1869# detected. If dir is not specified, then it defaults to ${S}.
1733# 1870#
… …
1735epunt_cxx() { 1872epunt_cxx() {
1736 local dir=$1 1873 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1874 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1875 ebegin "Removing useless C++ checks"
1739 local f 1876 local f
1740 for f in $(find ${dir} -name configure) ; do 1877 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1878 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1879 done
1743 eend 0 1880 eend 0
1744} 1881}
1745 1882
1746# @FUNCTION: make_wrapper 1883# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1884# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1885# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1886# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1887# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1888# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1889# libpaths followed by optionally changing directory to chdir.
… …
1775 ) || die 1912 ) || die
1776 else 1913 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1914 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1915 fi
1779} 1916}
1917
1918# @FUNCTION: prepalldocs
1919# @USAGE:
1920# @DESCRIPTION:
1921# Compress files in /usr/share/doc which are not already
1922# compressed, excluding /usr/share/doc/${PF}/html.
1923# Uses the ecompressdir to do the compression.
1924# 2009-02-18 by betelgeuse:
1925# Commented because ecompressdir is even more internal to
1926# Portage than prepalldocs (it's not even mentioned in man 5
1927# ebuild). Please submit a better version for review to gentoo-dev
1928# if you want prepalldocs here.
1929#prepalldocs() {
1930# if [[ -n $1 ]] ; then
1931# ewarn "prepalldocs: invalid usage; takes no arguments"
1932# fi
1933
1934# cd "${D}"
1935# [[ -d usr/share/doc ]] || return 0
1936
1937# find usr/share/doc -exec gzip {} +
1938# ecompressdir --ignore /usr/share/doc/${PF}/html
1939# ecompressdir --queue /usr/share/doc
1940#}
Legend:
Removed from v.1.284  
changed lines
  Added in v.1.335
  ViewVC Help
Powered by ViewVC 1.1.20