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

Legend:
Removed from v.1.284  
changed lines
  Added in v.1.329

  ViewVC Help
Powered by ViewVC 1.1.20