/[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.330
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.330 2010/02/15 02:10:39 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
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 54fi
55
56# @FUNCTION: ecvs_clean
57# @USAGE: [list of dirs]
58# @DESCRIPTION:
59# Remove CVS directories recursiveley. Useful when a source tarball contains
60# internal CVS directories. Defaults to $PWD.
61ecvs_clean() {
62 [[ -z $* ]] && set -- .
63 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
64 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
65}
66
67# @FUNCTION: esvn_clean
68# @USAGE: [list of dirs]
69# @DESCRIPTION:
70# Remove .svn directories recursiveley. Useful when a source tarball contains
71# internal Subversion directories. Defaults to $PWD.
72esvn_clean() {
73 [[ -z $* ]] && set -- .
74 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
75}
76
77# @FUNCTION: eshopts_push
78# @USAGE: [options to `set` or `shopt`]
79# @DESCRIPTION:
80# Often times code will want to enable a shell option to change code behavior.
81# Since changing shell options can easily break other pieces of code (which
82# assume the default state), eshopts_push is used to (1) push the current shell
83# options onto a stack and (2) pass the specified arguments to set.
84#
85# If the first argument is '-s' or '-u', we assume you want to call `shopt`
86# rather than `set` as there are some options only available via that.
87#
88# A common example is to disable shell globbing so that special meaning/care
89# may be used with variables/arguments to custom functions. That would be:
90# @CODE
91# eshopts_push -o noglob
92# for x in ${foo} ; do
93# if ...some check... ; then
94# eshopts_pop
95# return 0
96# fi
97# done
98# eshopts_pop
99# @CODE
100eshopts_push() {
101 # have to assume __ESHOPTS_SAVE__ isn't screwed with
102 # as a `declare -a` here will reset its value
103 local i=${#__ESHOPTS_SAVE__[@]}
104 if [[ $1 == -[su] ]] ; then
105 __ESHOPTS_SAVE__[$i]=$(shopt -p)
106 [[ $# -eq 0 ]] && return 0
107 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
108 else
109 __ESHOPTS_SAVE__[$i]=$-
110 [[ $# -eq 0 ]] && return 0
111 set "$@" || die "eshopts_push: bad options to set: $*"
112 fi
113}
114
115# @FUNCTION: eshopts_pop
116# @USAGE:
117# @DESCRIPTION:
118# Restore the shell options to the state saved with the corresponding
119# eshopts_push call. See that function for more details.
120eshopts_pop() {
121 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
122 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
123 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
124 local s=${__ESHOPTS_SAVE__[$i]}
125 unset __ESHOPTS_SAVE__[$i]
126 if [[ ${s} == "shopt -"* ]] ; then
127 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
128 else
129 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
130 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
131 fi
132}
133
134# @VARIABLE: EPATCH_SOURCE
135# @DESCRIPTION:
136# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 137EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 138# @VARIABLE: EPATCH_SUFFIX
139# @DESCRIPTION:
140# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 141EPATCH_SUFFIX="patch.bz2"
142# @VARIABLE: EPATCH_OPTS
143# @DESCRIPTION:
56# Default options for patch 144# Default options for patch:
145# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 146# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 147# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 148# -E - automatically remove empty files
149# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 150EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
151# @VARIABLE: EPATCH_EXCLUDE
152# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 153# List of patches not to apply. Note this is only file names,
62# and not the full path .. 154# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 155EPATCH_EXCLUDE=""
156# @VARIABLE: EPATCH_SINGLE_MSG
157# @DESCRIPTION:
64# Change the printed message for a single patch. 158# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 159EPATCH_SINGLE_MSG=""
160# @VARIABLE: EPATCH_MULTI_MSG
161# @DESCRIPTION:
66# Change the printed message for multiple patches. 162# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 163EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 164# @VARIABLE: EPATCH_FORCE
69# 165# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 166# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 167# arch naming style.
72EPATCH_FORCE="no" 168EPATCH_FORCE="no"
73 169
74# This function is for bulk patching, or in theory for just one 170# @FUNCTION: epatch
75# or two patches. 171# @USAGE: [patches] [dirs of patches]
172# @DESCRIPTION:
173# epatch is designed to greatly simplify the application of patches. It can
174# process patch files directly, or directories of patches. The patches may be
175# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
176# the -p option as epatch will automatically attempt -p0 to -p5 until things
177# apply successfully.
76# 178#
77# It should work with .bz2, .gz, .zip and plain text patches. 179# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 180# specified by EPATCH_SOURCE.
79# 181#
80# You do not have to specify '-p' option to patch, as it will 182# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 183# @CODE
82# 184# ${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} 185# ??_${ARCH}_foo.${EPATCH_SUFFIX}
186# else
187# *.${EPATCH_SUFFIX}
188# @CODE
189# The leading ?? are typically numbers used to force consistent patch ordering.
190# The arch field is used to apply patches only for the host architecture with
191# the special value of "all" means apply for everyone. Note that using values
192# other than "all" is highly discouraged -- you should apply patches all the
193# time and let architecture details be detected at configure/compile time.
92# 194#
93# For example: 195# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
196# for patches to apply.
94# 197#
95# 01_all_misc-fix.patch.bz2 198# 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() { 199epatch() {
108 _epatch_draw_line() { 200 _epatch_draw_line() {
201 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 202 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 203 echo "${1//?/=}"
111 } 204 }
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 205
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 206 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 207
122 if [ "$#" -gt 1 ] 208 # Let the rest of the code process one user arg at a time --
123 then 209 # each arg may expand into multiple patches, and each arg may
210 # need to start off with the default global EPATCH_xxx values
211 if [[ $# -gt 1 ]] ; then
124 local m="" 212 local m
125 for m in "$@" ; do 213 for m in "$@" ; do
126 epatch "${m}" 214 epatch "${m}"
127 done 215 done
128 return 0 216 return 0
129 fi 217 fi
130 218
131 if [ -n "$1" -a -f "$1" ] 219 local SINGLE_PATCH="no"
132 then 220 # no args means process ${EPATCH_SOURCE}
221 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
222
223 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 224 SINGLE_PATCH="yes"
134 225 set -- "$1"
135 local EPATCH_SOURCE="$1" 226 # Use the suffix from the single patch (localize it); the code
227 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 228 local EPATCH_SUFFIX=$1
137 229
138 elif [ -n "$1" -a -d "$1" ] 230 elif [[ -d $1 ]] ; then
139 then 231 # 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 ... 232 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 233
234 else
235 # sanity check ... if it isn't a dir or file, wtf man ?
236 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
237 echo
238 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
239 eerror
240 eerror " ${EPATCH_SOURCE}"
241 eerror " ( ${EPATCH_SOURCE##*/} )"
242 echo
243 die "Cannot find \$EPATCH_SOURCE!"
244 fi
245
246 local PIPE_CMD
247 case ${EPATCH_SUFFIX##*\.} in
248 xz) PIPE_CMD="xz -dc" ;;
249 lzma) PIPE_CMD="lzma -dc" ;;
250 bz2) PIPE_CMD="bzip2 -dc" ;;
251 gz|Z|z) PIPE_CMD="gzip -dc" ;;
252 ZIP|zip) PIPE_CMD="unzip -p" ;;
253 *) ;;
254 esac
255
256 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
257
258 local x
259 for x in "$@" ; do
260 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
261 # didn't match anything, ignore continue on
262 [[ ! -f ${x} ]] && continue
263
264 local patchname=${x##*/}
265
266 # Apply single patches, or forced sets of patches, or
267 # patches with ARCH dependant names.
268 # ???_arch_foo.patch
269 # Else, skip this input altogether
270 local a=${patchname#*_} # strip the ???_
271 a=${a%%_*} # strip the _foo.patch
272 if ! [[ ${SINGLE_PATCH} == "yes" || \
273 ${EPATCH_FORCE} == "yes" || \
274 ${a} == all || \
275 ${a} == ${ARCH} ]]
142 then 276 then
143 local EPATCH_SOURCE="$1/*" 277 continue
278 fi
279
280 # Let people filter things dynamically
281 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
282 # let people use globs in the exclude
283 eshopts_push -o noglob
284
285 local ex
286 for ex in ${EPATCH_EXCLUDE} ; do
287 if [[ ${patchname} == ${ex} ]] ; then
288 eshopts_pop
289 continue 2
290 fi
291 done
292
293 eshopts_pop
294 fi
295
296 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
297 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
298 einfo "${EPATCH_SINGLE_MSG}"
299 else
300 einfo "Applying ${patchname} ..."
301 fi
144 else 302 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 303 einfo " ${patchname} ..."
146 fi 304 fi
147 else 305
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 306 # most of the time, there will only be one run per unique name,
149 then 307 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 308 local STDERR_TARGET="${T}/${patchname}.out"
151 then 309 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 310 STDERR_TARGET="${T}/${patchname}-$$.out"
311 fi
312
313 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
314
315 # Decompress the patch if need be
316 local count=0
317 local PATCH_TARGET
318 if [[ -n ${PIPE_CMD} ]] ; then
319 PATCH_TARGET="${T}/$$.patch"
320 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
321
322 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
323 echo
324 eerror "Could not extract patch!"
325 #die "Could not extract patch!"
326 count=5
327 break
153 fi 328 fi
329 else
330 PATCH_TARGET=${x}
331 fi
154 332
333 # Check for absolute paths in patches. If sandbox is disabled,
334 # people could (accidently) patch files in the root filesystem.
335 # Or trigger other unpleasantries #237667. So disallow -p0 on
336 # such patches.
337 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
338 if [[ -n ${abs_paths} ]] ; then
339 count=1
340 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
341 fi
342
343 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
344 while [[ ${count} -lt 5 ]] ; do
345 # Generate some useful debug info ...
346 (
347 _epatch_draw_line "***** ${patchname} *****"
155 echo 348 echo
156 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 349 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
350 echo
351 _epatch_draw_line "***** ${patchname} *****"
352 ) >> "${STDERR_TARGET}"
353
354 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
355 (
356 _epatch_draw_line "***** ${patchname} *****"
357 echo
358 echo "ACTUALLY APPLYING ${patchname} ..."
359 echo
360 _epatch_draw_line "***** ${patchname} *****"
361 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
362 ) >> "${STDERR_TARGET}"
363
364 if [ $? -ne 0 ] ; then
365 echo
366 eerror "A dry-run of patch command succeeded, but actually"
367 eerror "applying the patch failed!"
368 #die "Real world sux compared to the dreamworld!"
369 count=5
370 fi
371 break
372 fi
373
374 : $(( count++ ))
375 done
376
377 # if we had to decompress the patch, delete the temp one
378 if [[ -n ${PIPE_CMD} ]] ; then
379 rm -f "${PATCH_TARGET}"
380 fi
381
382 if [[ ${count} -ge 5 ]] ; then
383 echo
384 eerror "Failed Patch: ${patchname} !"
385 eerror " ( ${PATCH_TARGET} )"
157 eerror 386 eerror
158 eerror " ${EPATCH_SOURCE}" 387 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 388 eerror
389 eerror " ${STDERR_TARGET}"
160 echo 390 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}!" 391 die "Failed Patch: ${patchname}!"
305 fi 392 fi
306 393
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 394 # if everything worked, delete the patch log
308 395 rm -f "${STDERR_TARGET}"
309 eend 0 396 eend 0
310 fi
311 done 397 done
312 if [ "${SINGLE_PATCH}" = "no" ] 398
313 then 399 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 einfo "Done with patching" 400 : # everything worked
401}
402epatch_user() {
403 [[ $# -ne 0 ]] && die "epatch_user takes no options"
404
405 # don't clobber any EPATCH vars that the parent might want
406 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
407 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
408 EPATCH_SOURCE=${base}/${CTARGET}/${check}
409 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
410 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
411 if [[ -d ${EPATCH_SOURCE} ]] ; then
412 EPATCH_SOURCE=${EPATCH_SOURCE} \
413 EPATCH_SUFFIX="patch" \
414 EPATCH_FORCE="yes" \
415 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
416 epatch
417 break
315 fi 418 fi
419 done
316} 420}
317 421
318# @FUNCTION: emktemp 422# @FUNCTION: emktemp
319# @USAGE: [temp dir] 423# @USAGE: [temp dir]
320# @DESCRIPTION: 424# @DESCRIPTION:
… …
356# base-system@gentoo.org (Linux) 460# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 461# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 462# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 463# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 464# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 465# Small wrapper for getent (Linux),
466# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 467# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 468egetent() {
364 case ${CHOST} in 469 case ${CHOST} in
365 *-darwin*) 470 *-darwin[678])
366 case "$2" in 471 case "$2" in
367 *[!0-9]*) # Non numeric 472 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 473 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 474 ;;
370 *) # Numeric 475 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 476 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
477 ;;
478 esac
479 ;;
480 *-darwin*)
481 local mytype=$1
482 [[ "passwd" == $mytype ]] && mytype="Users"
483 [[ "group" == $mytype ]] && mytype="Groups"
484 case "$2" in
485 *[!0-9]*) # Non numeric
486 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
487 ;;
488 *) # Numeric
489 local mykey="UniqueID"
490 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
491 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 492 ;;
373 esac 493 esac
374 ;; 494 ;;
375 *-freebsd*|*-dragonfly*) 495 *-freebsd*|*-dragonfly*)
376 local opts action="user" 496 local opts action="user"
… …
576 fi 696 fi
577 ;; 697 ;;
578 698
579 *) 699 *)
580 if [[ -z $@ ]] ; then 700 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 701 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 702 -c "added by portage for ${PN}" \
703 ${euser} \
583 || die "enewuser failed" 704 || die "enewuser failed"
584 else 705 else
585 einfo " - Extra: $@" 706 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 707 useradd ${opts} "$@" \
708 ${euser} \
587 || die "enewuser failed" 709 || die "enewuser failed"
588 fi 710 fi
589 ;; 711 ;;
590 esac 712 esac
591 713
… …
739make_desktop_entry() { 861make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 862 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 863
742 local exec=${1} 864 local exec=${1}
743 local name=${2:-${PN}} 865 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 866 local icon=${3:-${PN}}
745 local type=${4} 867 local type=${4}
746 local path=${5} 868 local path=${5}
747 869
748 if [[ -z ${type} ]] ; then 870 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 871 local catmaj=${CATEGORY%%-*}
… …
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 995 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 996 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 997
876 cat <<-EOF > "${desktop}" 998 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 999 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 1000 Name=${name}
881 Type=Application 1001 Type=Application
882 Comment=${DESCRIPTION} 1002 Comment=${DESCRIPTION}
883 Exec=${exec} 1003 Exec=${exec}
884 TryExec=${exec%% *} 1004 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 1005 Icon=${icon}
887 Categories=${type}; 1006 Categories=${type};
888 EOF 1007 EOF
1008
1009 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 1010
890 ( 1011 (
891 # wrap the env here so that the 'insinto' call 1012 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1013 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1014 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." 1043 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1044 fi
924} 1045}
925 1046
926# @FUNCTION: make_session_desktop 1047# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1048# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1049# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1050# 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. 1051# Window Manager. The command is the name of the Window Manager.
1052#
1053# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1054make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1055 [[ -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 1056 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1057
935 local title=$1 1058 local title=$1
936 local command=$2 1059 local command=$2
937 local desktop=${T}/${wm}.desktop 1060 local desktop=${T}/${wm:-${PN}}.desktop
1061 shift 2
938 1062
939 cat <<-EOF > "${desktop}" 1063 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1064 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1065 Name=${title}
943 Comment=This session logs you into ${title} 1066 Comment=This session logs you into ${title}
944 Exec=${command} 1067 Exec=${command} $*
945 TryExec=${command} 1068 TryExec=${command}
946 Type=Application 1069 Type=XSession
947 EOF 1070 EOF
948 1071
949 ( 1072 (
950 # wrap the env here so that the 'insinto' call 1073 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1074 # doesn't corrupt the env of the caller
… …
972 elif [[ -d ${i} ]] ; then 1095 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 1096 for j in "${i}"/*.desktop ; do
974 doins "${j}" 1097 doins "${j}"
975 ((ret+=$?)) 1098 ((ret+=$?))
976 done 1099 done
1100 else
1101 ((++ret))
977 fi 1102 fi
978 done 1103 done
979 exit ${ret} 1104 exit ${ret}
980 ) 1105 )
981} 1106}
… …
1011 elif [[ -d ${i} ]] ; then 1136 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 1137 for j in "${i}"/*.png ; do
1013 doins "${j}" 1138 doins "${j}"
1014 ((ret+=$?)) 1139 ((ret+=$?))
1015 done 1140 done
1141 else
1142 ((++ret))
1016 fi 1143 fi
1017 done 1144 done
1018 exit ${ret} 1145 exit ${ret}
1019 ) 1146 )
1020} 1147}
… …
1055# @DESCRIPTION: 1182# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 1183# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 1184# 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 1185# 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. 1186# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 1187#
1061# You have to specify the off_t size ... I have no idea how to extract that 1188# 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 1189# 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 1190# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 1191# archive.
1065# 1192#
1066# One way to determine this is by running the following commands: 1193# One way to determine this is by running the following commands:
1194#
1195# @CODE
1067# strings <pdv archive> | grep lseek 1196# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 1197# strace -elseek <pdv archive>
1198# @CODE
1199#
1069# Basically look for the first lseek command (we do the strings/grep because 1200# 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 1201# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 1202# parameter. Here is an example:
1203#
1204# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1205# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 1206# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1207# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 1208# lseek(3, -4, SEEK_END) = 2981250
1209# @CODE
1210#
1076# Thus we would pass in the value of '4' as the second parameter. 1211# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 1212unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 1213 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 1214 local sizeoff_t=$2
1080 1215
… …
1150# @DESCRIPTION: 1285# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1286# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1287# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1288# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1289# many other game companies.
1155# 1290#
1156# If the file is not specified, then ${A} is used. If the 1291# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1292# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1293# the proper offset from the script itself.
1159unpack_makeself() { 1294unpack_makeself() {
1160 local src_input=${1:-${A}} 1295 local src_input=${1:-${A}}
… …
1251 lic="${PWD}/${lic}" 1386 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1387 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1388 lic="${lic}"
1254 fi 1389 fi
1255 fi 1390 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1391 local l="`basename ${lic}`"
1258 1392
1259 # here is where we check for the licenses the user already 1393 # 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 1394 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1395 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1396 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1397 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1398 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1399 eshopts_pop
1267 return 0 1400 return 0
1268 fi 1401 fi
1269 done 1402 done
1270 set +o noglob; set -$shopts #reset old shell opts 1403 eshopts_pop
1404 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1405
1272 local licmsg=$(emktemp) 1406 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1407 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1408 **********************************************************
1275 The following license outlines the terms of use of this 1409 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1410 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1411 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1412 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1413 **********************************************************
1280 1414
1281 EOF 1415 EOF
1282 cat ${lic} >> ${licmsg} 1416 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1417 ${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] " 1418 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1419 read alic
… …
1298# @FUNCTION: cdrom_get_cds 1432# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1433# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1434# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1435# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1436# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1437#
1304# With these cdrom functions we handle all the user interaction and 1438# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1439# 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 1440# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1441# found at CDROM_ROOT.
1308# 1442#
1309# The function will attempt to locate a cd based upon a file that is on 1443# 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 1444# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1445# the cdrom functions will handle.
1312# 1446#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1447# 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 1448# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1449# 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 1450# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1451# also use the CDROM_NAME_SET bash array.
1318# 1452#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1453# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1454cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1455 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1456 # the # of files they gave us
1323 local cdcnt=0 1457 local cdcnt=0
… …
1444# displayed and we'll hang out here until: 1578# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1579# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1580# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1581_cdrom_locate_file_on_cd() {
1448 local mline="" 1582 local mline=""
1449 local showedmsg=0 1583 local showedmsg=0 showjolietmsg=0
1450 1584
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1585 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1586 local i=0
1453 local -a cdset=(${*//:/ }) 1587 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1588 if [[ -n ${CDROM_SET} ]] ; then
… …
1463 while read point node fs foo ; do 1597 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1598 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1599 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1600 && continue
1467 point=${point//\040/ } 1601 point=${point//\040/ }
1602 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1603 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1604 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1605 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1606 export CDROM_MATCH=${cdset[${i}]}
1472 return 1607 return
… …
1494 showedmsg=1 1629 showedmsg=1
1495 fi 1630 fi
1496 einfo "Press return to scan for the cd again" 1631 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1632 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1633 echo
1634 if [[ ${showjolietmsg} -eq 0 ]] ; then
1635 showjolietmsg=1
1636 else
1499 einfo "If you are having trouble with the detection" 1637 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1638 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1639 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1640 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1641 ebeep 5
1642 fi
1503 read || die "something is screwed with your system" 1643 read || die "something is screwed with your system"
1504 done 1644 done
1505} 1645}
1506 1646
1647# @FUNCTION: strip-linguas
1648# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1649# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1650# Make sure that LINGUAS only contains languages that
1508# a package can support 1651# a package can support. The first form allows you to
1509# 1652# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1653# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1654# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1655# files found in all the directories and uses the union
1513# 1656# 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() { 1657strip-linguas() {
1520 local ls newls nols 1658 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1659 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1660 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1661 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1662 local d f
1525 for d in "$@" ; do 1663 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1664 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1665 newls=${ls}
1528 else 1666 else
1529 newls="" 1667 newls=""
1530 fi 1668 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1669 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1670 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1671 hasq ${f} ${ls} && newls="${newls} ${f}"
1534 else 1672 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1673 hasq ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1674 fi
… …
1549 else 1687 else
1550 nols="${nols} ${f}" 1688 nols="${nols} ${f}"
1551 fi 1689 fi
1552 done 1690 done
1553 [[ -n ${nols} ]] \ 1691 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1692 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1693 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} 1694}
1587 1695
1588# @FUNCTION: preserve_old_lib 1696# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1697# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1698# @DESCRIPTION:
… …
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1707 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1708 die "Invalid preserve_old_lib() usage"
1601 fi 1709 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1710 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1711
1712 # let portage worry about it
1713 has preserve-libs ${FEATURES} && return 0
1714
1604 local lib dir 1715 local lib dir
1605 for lib in "$@" ; do 1716 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1717 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1718 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1719 dodir ${dir} || die "dodir ${dir} failed"
… …
1618preserve_old_lib_notify() { 1729preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1730 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1731 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1732 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1733 fi
1734
1735 # let portage worry about it
1736 has preserve-libs ${FEATURES} && return 0
1623 1737
1624 local lib notice=0 1738 local lib notice=0
1625 for lib in "$@" ; do 1739 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1740 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1741 if [[ ${notice} -eq 0 ]] ; then
… …
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1747 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1748 ewarn
1635 fi 1749 fi
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1750 ewarn " # revdep-rebuild --library ${lib##*/}"
1637 done 1751 done
1752 if [[ ${notice} -eq 1 ]] ; then
1753 ewarn
1754 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1755 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1756 for lib in "$@" ; do
1757 ewarn " # rm '${lib}'"
1758 done
1759 fi
1638} 1760}
1639 1761
1640# @FUNCTION: built_with_use 1762# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1763# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1764# @DESCRIPTION:
1765#
1766# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1767#
1643# A temporary hack until portage properly supports DEPENDing on USE 1768# A temporary hack until portage properly supports DEPENDing on USE
1644# flags being enabled in packages. This will check to see if the specified 1769# 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 1770# 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 1771# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1772# 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 1773# 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" 1774# 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 1775# 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 1776# 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 1777# 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 1778# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1779# in IUSE like normal USE flags.
1655# 1780#
1656# Remember that this function isn't terribly intelligent so order of optional 1781# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1782# flags matter.
1658built_with_use() { 1783built_with_use() {
1659 local hidden="no" 1784 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1785 if [[ $1 == "--hidden" ]] ; then
… …
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1816 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1817 esac
1693 fi 1818 fi
1694 1819
1695 if [[ ${hidden} == "no" ]] ; then 1820 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1821 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1822 # Don't check USE_EXPAND #147237
1698 local expand 1823 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1824 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1825 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1826 expand=""
1702 break 1827 break
1703 fi 1828 fi
1704 done 1829 done
1705 if [[ -n ${expand} ]] ; then 1830 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1831 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1832 case ${missing_action} in
1708 true) return 0;; 1833 true) return 0;;
1709 false) return 1;; 1834 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1835 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1836 esac
… …
1723 shift 1848 shift
1724 done 1849 done
1725 [[ ${opt} = "-a" ]] 1850 [[ ${opt} = "-a" ]]
1726} 1851}
1727 1852
1728# @DESCRIPTION: epunt_cxx 1853# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1854# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1855# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1856# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1857# detected. If dir is not specified, then it defaults to ${S}.
1733# 1858#
… …
1735epunt_cxx() { 1860epunt_cxx() {
1736 local dir=$1 1861 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1862 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1863 ebegin "Removing useless C++ checks"
1739 local f 1864 local f
1740 for f in $(find ${dir} -name configure) ; do 1865 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1866 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1867 done
1743 eend 0 1868 eend 0
1744} 1869}
1745 1870
1746# @FUNCTION: make_wrapper 1871# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1872# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1873# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1874# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1875# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1876# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1877# libpaths followed by optionally changing directory to chdir.
… …
1775 ) || die 1900 ) || die
1776 else 1901 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1902 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1903 fi
1779} 1904}
1905
1906# @FUNCTION: prepalldocs
1907# @USAGE:
1908# @DESCRIPTION:
1909# Compress files in /usr/share/doc which are not already
1910# compressed, excluding /usr/share/doc/${PF}/html.
1911# Uses the ecompressdir to do the compression.
1912# 2009-02-18 by betelgeuse:
1913# Commented because ecompressdir is even more internal to
1914# Portage than prepalldocs (it's not even mentioned in man 5
1915# ebuild). Please submit a better version for review to gentoo-dev
1916# if you want prepalldocs here.
1917#prepalldocs() {
1918# if [[ -n $1 ]] ; then
1919# ewarn "prepalldocs: invalid usage; takes no arguments"
1920# fi
1921
1922# cd "${D}"
1923# [[ -d usr/share/doc ]] || return 0
1924
1925# find usr/share/doc -exec gzip {} +
1926# ecompressdir --ignore /usr/share/doc/${PF}/html
1927# ecompressdir --queue /usr/share/doc
1928#}
Legend:
Removed from v.1.284  
changed lines
  Added in v.1.330
  ViewVC Help
Powered by ViewVC 1.1.13