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

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

  ViewVC Help
Powered by ViewVC 1.1.20