/[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.361
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 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.361 2011/08/08 02:01:40 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 54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
75fi
76
77# @FUNCTION: ecvs_clean
78# @USAGE: [list of dirs]
79# @DESCRIPTION:
80# Remove CVS directories recursiveley. Useful when a source tarball contains
81# internal CVS directories. Defaults to $PWD.
82ecvs_clean() {
83 [[ -z $* ]] && set -- .
84 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
85 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
86}
87
88# @FUNCTION: esvn_clean
89# @USAGE: [list of dirs]
90# @DESCRIPTION:
91# Remove .svn directories recursiveley. Useful when a source tarball contains
92# internal Subversion directories. Defaults to $PWD.
93esvn_clean() {
94 [[ -z $* ]] && set -- .
95 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
96}
97
98# @FUNCTION: eshopts_push
99# @USAGE: [options to `set` or `shopt`]
100# @DESCRIPTION:
101# Often times code will want to enable a shell option to change code behavior.
102# Since changing shell options can easily break other pieces of code (which
103# assume the default state), eshopts_push is used to (1) push the current shell
104# options onto a stack and (2) pass the specified arguments to set.
105#
106# If the first argument is '-s' or '-u', we assume you want to call `shopt`
107# rather than `set` as there are some options only available via that.
108#
109# A common example is to disable shell globbing so that special meaning/care
110# may be used with variables/arguments to custom functions. That would be:
111# @CODE
112# eshopts_push -o noglob
113# for x in ${foo} ; do
114# if ...some check... ; then
115# eshopts_pop
116# return 0
117# fi
118# done
119# eshopts_pop
120# @CODE
121eshopts_push() {
122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
123 # as a `declare -a` here will reset its value
124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
127 [[ $# -eq 0 ]] && return 0
128 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
129 else
130 __ESHOPTS_SAVE__[$i]=$-
131 [[ $# -eq 0 ]] && return 0
132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
134}
135
136# @FUNCTION: eshopts_pop
137# @USAGE:
138# @DESCRIPTION:
139# Restore the shell options to the state saved with the corresponding
140# eshopts_push call. See that function for more details.
141eshopts_pop() {
142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
145 local s=${__ESHOPTS_SAVE__[$i]}
146 unset __ESHOPTS_SAVE__[$i]
147 if [[ ${s} == "shopt -"* ]] ; then
148 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
149 else
150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
153}
154
155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
56# Default options for patch 165# Default options for patch:
166# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 174# List of patches not to apply. Note this is only file names,
62# and not the full path .. 175# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
64# Change the printed message for a single patch. 179# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
66# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
69# 186# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 188# arch naming style.
72EPATCH_FORCE="no" 189EPATCH_FORCE="no"
73 190
74# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
75# or two patches. 192# @USAGE: [patches] [dirs of patches]
193# @DESCRIPTION:
194# epatch is designed to greatly simplify the application of patches. It can
195# process patch files directly, or directories of patches. The patches may be
196# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
197# the -p option as epatch will automatically attempt -p0 to -p5 until things
198# apply successfully.
76# 199#
77# It should work with .bz2, .gz, .zip and plain text patches. 200# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
79# 202#
80# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
82# 205# if ${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} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
207# else
208# *.${EPATCH_SUFFIX}
209# @CODE
210# The leading ?? are typically numbers used to force consistent patch ordering.
211# The arch field is used to apply patches only for the host architecture with
212# the special value of "all" means apply for everyone. Note that using values
213# other than "all" is highly discouraged -- you should apply patches all the
214# time and let architecture details be detected at configure/compile time.
92# 215#
93# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
94# 218#
95# 01_all_misc-fix.patch.bz2 219# 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() { 220epatch() {
108 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 224 echo "${1//?/=}"
111 } 225 }
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 226
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 228
122 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
123 then 230 # each arg may expand into multiple patches, and each arg may
231 # need to start off with the default global EPATCH_xxx values
232 if [[ $# -gt 1 ]] ; then
124 local m="" 233 local m
125 for m in "$@" ; do 234 for m in "$@" ; do
126 epatch "${m}" 235 epatch "${m}"
127 done 236 done
128 return 0 237 return 0
129 fi 238 fi
130 239
131 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
132 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
134 246 set -- "$1"
135 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
137 250
138 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
139 then 252 # 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 ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 254
255 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
256 # Re-use EPATCH_SOURCE as a search dir
257 epatch "${EPATCH_SOURCE}/$1"
258 return $?
259
260 else
261 # sanity check ... if it isn't a dir or file, wtf man ?
262 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
263 echo
264 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
265 eerror
266 eerror " ${EPATCH_SOURCE}"
267 eerror " ( ${EPATCH_SOURCE##*/} )"
268 echo
269 die "Cannot find \$EPATCH_SOURCE!"
270 fi
271
272 local PIPE_CMD
273 case ${EPATCH_SUFFIX##*\.} in
274 xz) PIPE_CMD="xz -dc" ;;
275 lzma) PIPE_CMD="lzma -dc" ;;
276 bz2) PIPE_CMD="bzip2 -dc" ;;
277 gz|Z|z) PIPE_CMD="gzip -dc" ;;
278 ZIP|zip) PIPE_CMD="unzip -p" ;;
279 *) ;;
280 esac
281
282 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
283
284 local x
285 for x in "$@" ; do
286 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
287 # didn't match anything, ignore continue on
288 [[ ! -f ${x} ]] && continue
289
290 local patchname=${x##*/}
291
292 # Apply single patches, or forced sets of patches, or
293 # patches with ARCH dependant names.
294 # ???_arch_foo.patch
295 # Else, skip this input altogether
296 local a=${patchname#*_} # strip the ???_
297 a=${a%%_*} # strip the _foo.patch
298 if ! [[ ${SINGLE_PATCH} == "yes" || \
299 ${EPATCH_FORCE} == "yes" || \
300 ${a} == all || \
301 ${a} == ${ARCH} ]]
142 then 302 then
143 local EPATCH_SOURCE="$1/*" 303 continue
304 fi
305
306 # Let people filter things dynamically
307 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
308 # let people use globs in the exclude
309 eshopts_push -o noglob
310
311 local ex
312 for ex in ${EPATCH_EXCLUDE} ; do
313 if [[ ${patchname} == ${ex} ]] ; then
314 eshopts_pop
315 continue 2
316 fi
317 done
318
319 eshopts_pop
320 fi
321
322 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
323 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
324 einfo "${EPATCH_SINGLE_MSG}"
325 else
326 einfo "Applying ${patchname} ..."
327 fi
144 else 328 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 329 einfo " ${patchname} ..."
146 fi 330 fi
147 else 331
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 332 # most of the time, there will only be one run per unique name,
149 then 333 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 334 local STDERR_TARGET="${T}/${patchname}.out"
151 then 335 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 336 STDERR_TARGET="${T}/${patchname}-$$.out"
337 fi
338
339 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
340
341 # Decompress the patch if need be
342 local count=0
343 local PATCH_TARGET
344 if [[ -n ${PIPE_CMD} ]] ; then
345 PATCH_TARGET="${T}/$$.patch"
346 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
347
348 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
349 echo
350 eerror "Could not extract patch!"
351 #die "Could not extract patch!"
352 count=5
353 break
153 fi 354 fi
355 else
356 PATCH_TARGET=${x}
357 fi
154 358
359 # Check for absolute paths in patches. If sandbox is disabled,
360 # people could (accidently) patch files in the root filesystem.
361 # Or trigger other unpleasantries #237667. So disallow -p0 on
362 # such patches.
363 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
364 if [[ -n ${abs_paths} ]] ; then
365 count=1
366 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
367 fi
368 # Similar reason, but with relative paths.
369 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
370 if [[ -n ${rel_paths} ]] ; then
371 eqawarn "QA Notice: Your patch uses relative paths '../'."
372 eqawarn " In the future this will cause a failure."
373 eqawarn "${rel_paths}"
374 fi
375
376 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
377 while [[ ${count} -lt 5 ]] ; do
378 # Generate some useful debug info ...
379 (
380 _epatch_draw_line "***** ${patchname} *****"
155 echo 381 echo
156 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
383 echo
384 _epatch_draw_line "***** ${patchname} *****"
385 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
386 ret=$?
387 echo
388 echo "patch program exited with status ${ret}"
389 exit ${ret}
390 ) >> "${STDERR_TARGET}"
391
392 if [ $? -eq 0 ] ; then
393 (
394 _epatch_draw_line "***** ${patchname} *****"
395 echo
396 echo "ACTUALLY APPLYING ${patchname} ..."
397 echo
398 _epatch_draw_line "***** ${patchname} *****"
399 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
400 ret=$?
401 echo
402 echo "patch program exited with status ${ret}"
403 exit ${ret}
404 ) >> "${STDERR_TARGET}"
405
406 if [ $? -ne 0 ] ; then
407 echo
408 eerror "A dry-run of patch command succeeded, but actually"
409 eerror "applying the patch failed!"
410 #die "Real world sux compared to the dreamworld!"
411 count=5
412 fi
413 break
414 fi
415
416 : $(( count++ ))
417 done
418
419 # if we had to decompress the patch, delete the temp one
420 if [[ -n ${PIPE_CMD} ]] ; then
421 rm -f "${PATCH_TARGET}"
422 fi
423
424 if [[ ${count} -ge 5 ]] ; then
425 echo
426 eerror "Failed Patch: ${patchname} !"
427 eerror " ( ${PATCH_TARGET} )"
157 eerror 428 eerror
158 eerror " ${EPATCH_SOURCE}" 429 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 430 eerror
431 eerror " ${STDERR_TARGET}"
160 echo 432 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}!" 433 die "Failed Patch: ${patchname}!"
305 fi 434 fi
306 435
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 436 # if everything worked, delete the patch log
308 437 rm -f "${STDERR_TARGET}"
309 eend 0 438 eend 0
310 fi
311 done 439 done
312 if [ "${SINGLE_PATCH}" = "no" ] 440
313 then 441 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 einfo "Done with patching" 442 : # everything worked
443}
444
445# @FUNCTION: epatch_user
446# @USAGE:
447# @DESCRIPTION:
448# Applies user-provided patches to the source tree. The patches are
449# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
450# of these three directories to exist will be the one to use, ignoring
451# any more general directories which might exist as well.
452#
453# User patches are intended for quick testing of patches without ebuild
454# modifications, as well as for permanent customizations a user might
455# desire. Obviously, there can be no official support for arbitrarily
456# patched ebuilds. So whenever a build log in a bug report mentions that
457# user patches were applied, the user should be asked to reproduce the
458# problem without these.
459#
460# Not all ebuilds do call this function, so placing patches in the
461# stated directory might or might not work, depending on the package and
462# the eclasses it inherits and uses. It is safe to call the function
463# repeatedly, so it is always possible to add a call at the ebuild
464# level. The first call is the time when the patches will be
465# applied.
466#
467# Ideally, this function should be called after gentoo-specific patches
468# have been applied, so that their code can be modified as well, but
469# before calls to e.g. eautoreconf, as the user patches might affect
470# autotool input files as well.
471epatch_user() {
472 [[ $# -ne 0 ]] && die "epatch_user takes no options"
473
474 # Allow multiple calls to this function; ignore all but the first
475 local applied="${T}/epach_user.applied"
476 [[ -e ${applied} ]] && return 2
477
478 # don't clobber any EPATCH vars that the parent might want
479 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
480 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
481 EPATCH_SOURCE=${base}/${CTARGET}/${check}
482 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
483 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
484 if [[ -d ${EPATCH_SOURCE} ]] ; then
485 EPATCH_SOURCE=${EPATCH_SOURCE} \
486 EPATCH_SUFFIX="patch" \
487 EPATCH_FORCE="yes" \
488 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
489 epatch
490 echo "${EPATCH_SOURCE}" > "${applied}"
491 return 0
315 fi 492 fi
493 done
494 echo "none" > "${applied}"
495 return 1
316} 496}
317 497
318# @FUNCTION: emktemp 498# @FUNCTION: emktemp
319# @USAGE: [temp dir] 499# @USAGE: [temp dir]
320# @DESCRIPTION: 500# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 536# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 537# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 538# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 539# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 540# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 541# Small wrapper for getent (Linux),
542# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 543# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 544egetent() {
364 case ${CHOST} in 545 case ${CHOST} in
365 *-darwin*) 546 *-darwin[678])
366 case "$2" in 547 case "$2" in
367 *[!0-9]*) # Non numeric 548 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 549 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
369 ;; 550 ;;
370 *) # Numeric 551 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 552 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
553 ;;
554 esac
555 ;;
556 *-darwin*)
557 local mytype=$1
558 [[ "passwd" == $mytype ]] && mytype="Users"
559 [[ "group" == $mytype ]] && mytype="Groups"
560 case "$2" in
561 *[!0-9]*) # Non numeric
562 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
563 ;;
564 *) # Numeric
565 local mykey="UniqueID"
566 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
567 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 568 ;;
373 esac 569 esac
374 ;; 570 ;;
375 *-freebsd*|*-dragonfly*) 571 *-freebsd*|*-dragonfly*)
376 local opts action="user" 572 local opts action="user"
576 fi 772 fi
577 ;; 773 ;;
578 774
579 *) 775 *)
580 if [[ -z $@ ]] ; then 776 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 777 useradd -r ${opts} \
582 -c "added by portage for ${PN}" \ 778 -c "added by portage for ${PN}" \
779 ${euser} \
583 || die "enewuser failed" 780 || die "enewuser failed"
584 else 781 else
585 einfo " - Extra: $@" 782 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 783 useradd -r ${opts} "$@" \
784 ${euser} \
587 || die "enewuser failed" 785 || die "enewuser failed"
588 fi 786 fi
589 ;; 787 ;;
590 esac 788 esac
591 789
703 esac 901 esac
704 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 902 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
705 ;; 903 ;;
706 904
707 *) 905 *)
906 # We specify -r so that we get a GID in the system range from login.defs
708 groupadd ${opts} ${egroup} || die "enewgroup failed" 907 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
709 ;; 908 ;;
710 esac 909 esac
711 export SANDBOX_ON="${oldsandbox}" 910 export SANDBOX_ON="${oldsandbox}"
712} 911}
713 912
724 923
725# Make a desktop file ! 924# Make a desktop file !
726# Great for making those icons in kde/gnome startmenu ! 925# Great for making those icons in kde/gnome startmenu !
727# Amaze your friends ! Get the women ! Join today ! 926# Amaze your friends ! Get the women ! Join today !
728# 927#
729# make_desktop_entry(<command>, [name], [icon], [type], [path]) 928# make_desktop_entry(<command>, [name], [icon], [type], [fields])
730# 929#
731# binary: what command does the app run with ? 930# binary: what command does the app run with ?
732# name: the name that will show up in the menu 931# name: the name that will show up in the menu
733# icon: give your little like a pretty little icon ... 932# icon: give your little like a pretty little icon ...
734# this can be relative (to /usr/share/pixmaps) or 933# this can be relative (to /usr/share/pixmaps) or
735# a full path to an icon 934# a full path to an icon
736# type: what kind of application is this ? for categories: 935# type: what kind of application is this ? for categories:
737# http://standards.freedesktop.org/menu-spec/latest/apa.html 936# http://standards.freedesktop.org/menu-spec/latest/apa.html
738# path: if your app needs to startup in a specific dir 937# fields: extra fields to append to the desktop file; a printf string
739make_desktop_entry() { 938make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 939 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
741 940
742 local exec=${1} 941 local exec=${1}
743 local name=${2:-${PN}} 942 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 943 local icon=${3:-${PN}}
745 local type=${4} 944 local type=${4}
746 local path=${5} 945 local fields=${5}
747 946
748 if [[ -z ${type} ]] ; then 947 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 948 local catmaj=${CATEGORY%%-*}
750 local catmin=${CATEGORY##*-} 949 local catmin=${CATEGORY##*-}
751 case ${catmaj} in 950 case ${catmaj} in
752 app) 951 app)
753 case ${catmin} in 952 case ${catmin} in
754 accessibility) type=Accessibility;; 953 accessibility) type=Accessibility;;
755 admin) type=System;; 954 admin) type=System;;
756 antivirus) type=System;; 955 antivirus) type=System;;
757 arch) type=Archiving;; 956 arch) type=Archiving;;
758 backup) type=Archiving;; 957 backup) type=Archiving;;
759 cdr) type=DiscBurning;; 958 cdr) type=DiscBurning;;
760 dicts) type=Dictionary;; 959 dicts) type=Dictionary;;
761 doc) type=Documentation;; 960 doc) type=Documentation;;
762 editors) type=TextEditor;; 961 editors) type=TextEditor;;
763 emacs) type=TextEditor;; 962 emacs) type=TextEditor;;
764 emulation) type=Emulator;; 963 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;; 964 laptop) type=HardwareSettings;;
766 office) type=Office;; 965 office) type=Office;;
767 pda) type=PDA;; 966 pda) type=PDA;;
768 vim) type=TextEditor;; 967 vim) type=TextEditor;;
769 xemacs) type=TextEditor;; 968 xemacs) type=TextEditor;;
770 *) type=;;
771 esac 969 esac
772 ;; 970 ;;
773 971
774 dev) 972 dev)
775 type="Development" 973 type="Development"
776 ;; 974 ;;
777 975
778 games) 976 games)
779 case ${catmin} in 977 case ${catmin} in
780 action|fps) type=ActionGame;; 978 action|fps) type=ActionGame;;
781 arcade) type=ArcadeGame;; 979 arcade) type=ArcadeGame;;
782 board) type=BoardGame;; 980 board) type=BoardGame;;
783 emulation) type=Emulator;; 981 emulation) type=Emulator;;
784 kids) type=KidsGame;; 982 kids) type=KidsGame;;
785 puzzle) type=LogicGame;; 983 puzzle) type=LogicGame;;
786 roguelike) type=RolePlaying;; 984 roguelike) type=RolePlaying;;
787 rpg) type=RolePlaying;; 985 rpg) type=RolePlaying;;
788 simulation) type=Simulation;; 986 simulation) type=Simulation;;
789 sports) type=SportsGame;; 987 sports) type=SportsGame;;
790 strategy) type=StrategyGame;; 988 strategy) type=StrategyGame;;
791 *) type=;;
792 esac 989 esac
793 type="Game;${type}" 990 type="Game;${type}"
794 ;; 991 ;;
795 992
796 gnome) 993 gnome)
805 type="Network;Email" 1002 type="Network;Email"
806 ;; 1003 ;;
807 1004
808 media) 1005 media)
809 case ${catmin} in 1006 case ${catmin} in
1007 gfx)
810 gfx) type=Graphics;; 1008 type=Graphics
1009 ;;
1010 *)
1011 case ${catmin} in
811 radio) type=Tuner;; 1012 radio) type=Tuner;;
812 sound) type=Audio;; 1013 sound) type=Audio;;
813 tv) type=TV;; 1014 tv) type=TV;;
814 video) type=Video;; 1015 video) type=Video;;
815 *) type=;; 1016 esac
1017 type="AudioVideo;${type}"
1018 ;;
816 esac 1019 esac
817 type="AudioVideo;${type}"
818 ;; 1020 ;;
819 1021
820 net) 1022 net)
821 case ${catmin} in 1023 case ${catmin} in
822 dialup) type=Dialup;; 1024 dialup) type=Dialup;;
823 ftp) type=FileTransfer;; 1025 ftp) type=FileTransfer;;
824 im) type=InstantMessaging;; 1026 im) type=InstantMessaging;;
825 irc) type=IRCClient;; 1027 irc) type=IRCClient;;
826 mail) type=Email;; 1028 mail) type=Email;;
827 news) type=News;; 1029 news) type=News;;
828 nntp) type=News;; 1030 nntp) type=News;;
829 p2p) type=FileTransfer;; 1031 p2p) type=FileTransfer;;
830 *) type=;; 1032 voip) type=Telephony;;
831 esac 1033 esac
832 type="Network;${type}" 1034 type="Network;${type}"
833 ;; 1035 ;;
834 1036
835 sci) 1037 sci)
836 case ${catmin} in 1038 case ${catmin} in
837 astro*) type=Astronomy;; 1039 astro*) type=Astronomy;;
838 bio*) type=Biology;; 1040 bio*) type=Biology;;
839 calc*) type=Calculator;; 1041 calc*) type=Calculator;;
840 chem*) type=Chemistry;; 1042 chem*) type=Chemistry;;
841 elec*) type=Electronics;; 1043 elec*) type=Electronics;;
842 geo*) type=Geology;; 1044 geo*) type=Geology;;
843 math*) type=Math;; 1045 math*) type=Math;;
844 physics) type=Physics;; 1046 physics) type=Physics;;
845 visual*) type=DataVisualization;; 1047 visual*) type=DataVisualization;;
846 *) type=;;
847 esac 1048 esac
848 type="Science;${type}" 1049 type="Education;Science;${type}"
849 ;; 1050 ;;
850 1051
851 sys) 1052 sys)
852 type="System" 1053 type="System"
853 ;; 1054 ;;
854 1055
855 www) 1056 www)
856 case ${catmin} in 1057 case ${catmin} in
857 client) type=WebBrowser;; 1058 client) type=WebBrowser;;
858 *) type=;;
859 esac 1059 esac
860 type="Network" 1060 type="Network;${type}"
861 ;; 1061 ;;
862 1062
863 *) 1063 *)
864 type= 1064 type=
865 ;; 1065 ;;
871 local desktop_name="${PN}-${SLOT}" 1071 local desktop_name="${PN}-${SLOT}"
872 fi 1072 fi
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1073 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1074 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 1075
1076 # Don't append another ";" when a valid category value is provided.
1077 type=${type%;}${type:+;}
1078
1079 eshopts_push -s extglob
1080 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1081 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1082 ewarn "allowed in .desktop files if the value is not an absolute path."
1083 icon=${icon%.@(xpm|png|svg)}
1084 fi
1085 eshopts_pop
1086
876 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 1088 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 1089 Name=${name}
881 Type=Application 1090 Type=Application
882 Comment=${DESCRIPTION} 1091 Comment=${DESCRIPTION}
883 Exec=${exec} 1092 Exec=${exec}
884 TryExec=${exec%% *} 1093 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 1094 Icon=${icon}
887 Categories=${type}; 1095 Categories=${type}
888 EOF 1096 EOF
1097
1098 if [[ ${fields:-=} != *=* ]] ; then
1099 # 5th arg used to be value to Path=
1100 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1101 fields="Path=${fields}"
1102 fi
1103 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
889 1104
890 ( 1105 (
891 # wrap the env here so that the 'insinto' call 1106 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 1107 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 1108 insinto /usr/share/applications
894 doins "${desktop}" 1109 doins "${desktop}"
895 ) 1110 ) || die "installing desktop file failed"
896} 1111}
897 1112
898# @FUNCTION: validate_desktop_entries 1113# @FUNCTION: validate_desktop_entries
899# @USAGE: [directories] 1114# @USAGE: [directories]
900# @MAINTAINER: 1115# @MAINTAINER:
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1137 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1138 fi
924} 1139}
925 1140
926# @FUNCTION: make_session_desktop 1141# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1142# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1143# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1144# 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. 1145# Window Manager. The command is the name of the Window Manager.
1146#
1147# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1148make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1149 [[ -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 1150 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1151
935 local title=$1 1152 local title=$1
936 local command=$2 1153 local command=$2
937 local desktop=${T}/${wm}.desktop 1154 local desktop=${T}/${wm:-${PN}}.desktop
1155 shift 2
938 1156
939 cat <<-EOF > "${desktop}" 1157 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1158 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1159 Name=${title}
943 Comment=This session logs you into ${title} 1160 Comment=This session logs you into ${title}
944 Exec=${command} 1161 Exec=${command} $*
945 TryExec=${command} 1162 TryExec=${command}
946 Type=Application 1163 Type=XSession
947 EOF 1164 EOF
948 1165
949 ( 1166 (
950 # wrap the env here so that the 'insinto' call 1167 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1168 # doesn't corrupt the env of the caller
972 elif [[ -d ${i} ]] ; then 1189 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 1190 for j in "${i}"/*.desktop ; do
974 doins "${j}" 1191 doins "${j}"
975 ((ret+=$?)) 1192 ((ret+=$?))
976 done 1193 done
1194 else
1195 ((++ret))
977 fi 1196 fi
978 done 1197 done
979 exit ${ret} 1198 exit ${ret}
980 ) 1199 )
981} 1200}
1011 elif [[ -d ${i} ]] ; then 1230 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 1231 for j in "${i}"/*.png ; do
1013 doins "${j}" 1232 doins "${j}"
1014 ((ret+=$?)) 1233 ((ret+=$?))
1015 done 1234 done
1235 else
1236 ((++ret))
1016 fi 1237 fi
1017 done 1238 done
1018 exit ${ret} 1239 exit ${ret}
1019 ) 1240 )
1020} 1241}
1055# @DESCRIPTION: 1276# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 1277# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 1278# 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 1279# 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. 1280# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 1281#
1061# You have to specify the off_t size ... I have no idea how to extract that 1282# 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 1283# 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 1284# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 1285# archive.
1065# 1286#
1066# One way to determine this is by running the following commands: 1287# One way to determine this is by running the following commands:
1288#
1289# @CODE
1067# strings <pdv archive> | grep lseek 1290# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 1291# strace -elseek <pdv archive>
1292# @CODE
1293#
1069# Basically look for the first lseek command (we do the strings/grep because 1294# 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 1295# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 1296# parameter. Here is an example:
1297#
1298# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1299# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 1300# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1301# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 1302# lseek(3, -4, SEEK_END) = 2981250
1303# @CODE
1304#
1076# Thus we would pass in the value of '4' as the second parameter. 1305# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 1306unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 1307 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 1308 local sizeoff_t=$2
1080 1309
1150# @DESCRIPTION: 1379# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1380# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1381# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1382# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1383# many other game companies.
1155# 1384#
1156# If the file is not specified, then ${A} is used. If the 1385# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1386# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1387# the proper offset from the script itself.
1159unpack_makeself() { 1388unpack_makeself() {
1160 local src_input=${1:-${A}} 1389 local src_input=${1:-${A}}
1165 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1394 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1166 1395
1167 local shrtsrc=$(basename "${src}") 1396 local shrtsrc=$(basename "${src}")
1168 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1397 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1169 if [[ -z ${skip} ]] ; then 1398 if [[ -z ${skip} ]] ; then
1170 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1399 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1171 local skip=0 1400 local skip=0
1172 exe=tail 1401 exe=tail
1173 case ${ver} in 1402 case ${ver} in
1174 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1403 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1175 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1404 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1177 2.0|2.0.1) 1406 2.0|2.0.1)
1178 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1407 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1179 ;; 1408 ;;
1180 2.1.1) 1409 2.1.1)
1181 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1410 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1182 let skip="skip + 1" 1411 (( skip++ ))
1183 ;; 1412 ;;
1184 2.1.2) 1413 2.1.2)
1185 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1414 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1186 let skip="skip + 1" 1415 (( skip++ ))
1187 ;; 1416 ;;
1188 2.1.3) 1417 2.1.3)
1189 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1418 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1190 let skip="skip + 1" 1419 (( skip++ ))
1191 ;; 1420 ;;
1192 2.1.4|2.1.5) 1421 2.1.4|2.1.5)
1193 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1422 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1194 skip=$(head -n ${skip} "${src}" | wc -c) 1423 skip=$(head -n ${skip} "${src}" | wc -c)
1195 exe="dd" 1424 exe="dd"
1204 esac 1433 esac
1205 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1434 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1206 fi 1435 fi
1207 case ${exe} in 1436 case ${exe} in
1208 tail) exe="tail -n +${skip} '${src}'";; 1437 tail) exe="tail -n +${skip} '${src}'";;
1209 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1438 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1210 *) die "makeself cant handle exe '${exe}'" 1439 *) die "makeself cant handle exe '${exe}'"
1211 esac 1440 esac
1212 1441
1213 # lets grab the first few bytes of the file to figure out what kind of archive it is 1442 # lets grab the first few bytes of the file to figure out what kind of archive it is
1214 local tmpfile=$(emktemp) 1443 local filetype tmpfile=$(emktemp)
1215 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1444 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1216 local filetype=$(file -b "${tmpfile}") 1445 filetype=$(file -b "${tmpfile}") || die
1217 case ${filetype} in 1446 case ${filetype} in
1218 *tar\ archive*) 1447 *tar\ archive*)
1219 eval ${exe} | tar --no-same-owner -xf - 1448 eval ${exe} | tar --no-same-owner -xf -
1220 ;; 1449 ;;
1221 bzip2*) 1450 bzip2*)
1251 lic="${PWD}/${lic}" 1480 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1481 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1482 lic="${lic}"
1254 fi 1483 fi
1255 fi 1484 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1485 local l="`basename ${lic}`"
1258 1486
1259 # here is where we check for the licenses the user already 1487 # 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 1488 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1489 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1490 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1491 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1492 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1493 eshopts_pop
1267 return 0 1494 return 0
1268 fi 1495 fi
1269 done 1496 done
1270 set +o noglob; set -$shopts #reset old shell opts 1497 eshopts_pop
1498 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1499
1272 local licmsg=$(emktemp) 1500 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1501 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1502 **********************************************************
1275 The following license outlines the terms of use of this 1503 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1504 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1505 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1506 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1507 **********************************************************
1280 1508
1281 EOF 1509 EOF
1282 cat ${lic} >> ${licmsg} 1510 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1511 ${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] " 1512 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1513 read alic
1298# @FUNCTION: cdrom_get_cds 1526# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1527# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1528# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1529# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1530# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1531#
1304# With these cdrom functions we handle all the user interaction and 1532# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1533# 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 1534# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1535# found at CDROM_ROOT.
1308# 1536#
1309# The function will attempt to locate a cd based upon a file that is on 1537# 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 1538# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1539# the cdrom functions will handle.
1312# 1540#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1541# 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 1542# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1543# 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 1544# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1545# also use the CDROM_NAME_SET bash array.
1318# 1546#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1547# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1548cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1549 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1550 # the # of files they gave us
1323 local cdcnt=0 1551 local cdcnt=0
1348 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1576 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1349 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1577 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1350 export CDROM_SET=-1 1578 export CDROM_SET=-1
1351 for f in ${CDROM_CHECK_1//:/ } ; do 1579 for f in ${CDROM_CHECK_1//:/ } ; do
1352 ((++CDROM_SET)) 1580 ((++CDROM_SET))
1353 [[ -e ${CD_ROOT}/${f} ]] && break 1581 [[ -e ${CDROM_ROOT}/${f} ]] && break
1354 done 1582 done
1355 export CDROM_MATCH=${f} 1583 export CDROM_MATCH=${f}
1356 return 1584 return
1357 fi 1585 fi
1358 1586
1444# displayed and we'll hang out here until: 1672# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1673# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1674# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1675_cdrom_locate_file_on_cd() {
1448 local mline="" 1676 local mline=""
1449 local showedmsg=0 1677 local showedmsg=0 showjolietmsg=0
1450 1678
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1679 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1680 local i=0
1453 local -a cdset=(${*//:/ }) 1681 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1682 if [[ -n ${CDROM_SET} ]] ; then
1463 while read point node fs foo ; do 1691 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1692 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1693 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1694 && continue
1467 point=${point//\040/ } 1695 point=${point//\040/ }
1696 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1697 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1698 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1699 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1700 export CDROM_MATCH=${cdset[${i}]}
1472 return 1701 return
1494 showedmsg=1 1723 showedmsg=1
1495 fi 1724 fi
1496 einfo "Press return to scan for the cd again" 1725 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1726 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1727 echo
1728 if [[ ${showjolietmsg} -eq 0 ]] ; then
1729 showjolietmsg=1
1730 else
1499 einfo "If you are having trouble with the detection" 1731 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1732 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1733 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1734 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1735 ebeep 5
1736 fi
1503 read || die "something is screwed with your system" 1737 read || die "something is screwed with your system"
1504 done 1738 done
1505} 1739}
1506 1740
1741# @FUNCTION: strip-linguas
1742# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1743# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1744# Make sure that LINGUAS only contains languages that
1508# a package can support 1745# a package can support. The first form allows you to
1509# 1746# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1747# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1748# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1749# files found in all the directories and uses the union
1513# 1750# 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() { 1751strip-linguas() {
1520 local ls newls nols 1752 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1753 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1754 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1755 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1756 local d f
1525 for d in "$@" ; do 1757 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1758 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1759 newls=${ls}
1528 else 1760 else
1529 newls="" 1761 newls=""
1530 fi 1762 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1763 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1764 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1765 has ${f} ${ls} && newls="${newls} ${f}"
1534 else 1766 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1767 has ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1768 fi
1537 done 1769 done
1538 ls=${newls} 1770 ls=${newls}
1539 done 1771 done
1540 else 1772 else
1542 fi 1774 fi
1543 1775
1544 nols="" 1776 nols=""
1545 newls="" 1777 newls=""
1546 for f in ${LINGUAS} ; do 1778 for f in ${LINGUAS} ; do
1547 if hasq ${f} ${ls} ; then 1779 if has ${f} ${ls} ; then
1548 newls="${newls} ${f}" 1780 newls="${newls} ${f}"
1549 else 1781 else
1550 nols="${nols} ${f}" 1782 nols="${nols} ${f}"
1551 fi 1783 fi
1552 done 1784 done
1553 [[ -n ${nols} ]] \ 1785 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1786 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1787 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} 1788}
1587 1789
1588# @FUNCTION: preserve_old_lib 1790# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1791# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1792# @DESCRIPTION:
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1801 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1802 die "Invalid preserve_old_lib() usage"
1601 fi 1803 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1804 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1805
1806 # let portage worry about it
1807 has preserve-libs ${FEATURES} && return 0
1808
1604 local lib dir 1809 local lib dir
1605 for lib in "$@" ; do 1810 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1811 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1812 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1813 dodir ${dir} || die "dodir ${dir} failed"
1618preserve_old_lib_notify() { 1823preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1824 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1825 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1826 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1827 fi
1828
1829 # let portage worry about it
1830 has preserve-libs ${FEATURES} && return 0
1623 1831
1624 local lib notice=0 1832 local lib notice=0
1625 for lib in "$@" ; do 1833 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1834 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1835 if [[ ${notice} -eq 0 ]] ; then
1631 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1839 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1632 ewarn "in order to remove these old dependencies. If you do not have this" 1840 ewarn "in order to remove these old dependencies. If you do not have this"
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1841 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1842 ewarn
1635 fi 1843 fi
1844 # temp hack for #348634 #357225
1845 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1846 ewarn " # revdep-rebuild --library '${lib}'"
1637 done 1847 done
1848 if [[ ${notice} -eq 1 ]] ; then
1849 ewarn
1850 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1851 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1852 for lib in "$@" ; do
1853 ewarn " # rm '${lib}'"
1854 done
1855 fi
1638} 1856}
1639 1857
1640# @FUNCTION: built_with_use 1858# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1859# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1860# @DESCRIPTION:
1861#
1862# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1863#
1643# A temporary hack until portage properly supports DEPENDing on USE 1864# A temporary hack until portage properly supports DEPENDing on USE
1644# flags being enabled in packages. This will check to see if the specified 1865# 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 1866# 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 1867# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1868# 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 1869# 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" 1870# 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 1871# 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 1872# 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 1873# 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 1874# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1875# in IUSE like normal USE flags.
1655# 1876#
1656# Remember that this function isn't terribly intelligent so order of optional 1877# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1878# flags matter.
1658built_with_use() { 1879built_with_use() {
1659 local hidden="no" 1880 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1881 if [[ $1 == "--hidden" ]] ; then
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1912 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1913 esac
1693 fi 1914 fi
1694 1915
1695 if [[ ${hidden} == "no" ]] ; then 1916 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1917 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1918 # Don't check USE_EXPAND #147237
1698 local expand 1919 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1920 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1921 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1922 expand=""
1702 break 1923 break
1703 fi 1924 fi
1704 done 1925 done
1705 if [[ -n ${expand} ]] ; then 1926 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1927 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1928 case ${missing_action} in
1708 true) return 0;; 1929 true) return 0;;
1709 false) return 1;; 1930 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1931 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1932 esac
1723 shift 1944 shift
1724 done 1945 done
1725 [[ ${opt} = "-a" ]] 1946 [[ ${opt} = "-a" ]]
1726} 1947}
1727 1948
1728# @DESCRIPTION: epunt_cxx 1949# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1950# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1951# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1952# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1953# detected. If dir is not specified, then it defaults to ${S}.
1733# 1954#
1735epunt_cxx() { 1956epunt_cxx() {
1736 local dir=$1 1957 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1958 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1959 ebegin "Removing useless C++ checks"
1739 local f 1960 local f
1740 for f in $(find ${dir} -name configure) ; do 1961 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1962 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1963 done
1743 eend 0 1964 eend 0
1744} 1965}
1745 1966
1746# @FUNCTION: make_wrapper 1967# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1968# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1969# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1970# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1971# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1972# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1973# libpaths followed by optionally changing directory to chdir.
1775 ) || die 1996 ) || die
1776 else 1997 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1998 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1999 fi
1779} 2000}
2001
2002# @FUNCTION: path_exists
2003# @USAGE: [-a|-o] <paths>
2004# @DESCRIPTION:
2005# Check if the specified paths exist. Works for all types of paths
2006# (files/dirs/etc...). The -a and -o flags control the requirements
2007# of the paths. They correspond to "and" and "or" logic. So the -a
2008# flag means all the paths must exist while the -o flag means at least
2009# one of the paths must exist. The default behavior is "and". If no
2010# paths are specified, then the return value is "false".
2011path_exists() {
2012 local opt=$1
2013 [[ ${opt} == -[ao] ]] && shift || opt="-a"
2014
2015 # no paths -> return false
2016 # same behavior as: [[ -e "" ]]
2017 [[ $# -eq 0 ]] && return 1
2018
2019 local p r=0
2020 for p in "$@" ; do
2021 [[ -e ${p} ]]
2022 : $(( r += $? ))
2023 done
2024
2025 case ${opt} in
2026 -a) return $(( r != 0 )) ;;
2027 -o) return $(( r == $# )) ;;
2028 esac
2029}

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

  ViewVC Help
Powered by ViewVC 1.1.20