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

Diff of /eclass/eutils.eclass

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

Revision 1.46 Revision 1.432
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2013 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.46 2003/07/22 18:42:59 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.432 2014/03/15 00:47:42 creffett Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6#
7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves.
9#
10# NB: If you add anything, please comment it!
11 4
12ECLASS=eutils 5# @ECLASS: eutils.eclass
13INHERITED="$INHERITED $ECLASS" 6# @MAINTAINER:
14 7# base-system@gentoo.org
15DEPEND="$DEPEND !bootstrap? ( sys-devel/patch )" 8# @BLURB: many extra (but common) functions that are used in ebuilds
16 9# @DESCRIPTION:
17DESCRIPTION="Based on the ${ECLASS} eclass" 10# The eutils eclass contains a suite of functions that complement
18 11# the ones that ebuild.sh already contain. The idea is that the functions
19# This function generate linker scripts in /usr/lib for dynamic 12# are not required in all ebuilds but enough utilize them to have a common
20# libs in /lib. This is to fix linking problems when you have 13# home rather than having multiple ebuilds implementing the same thing.
21# the .so in /lib, and the .a in /usr/lib. What happens is that
22# in some cases when linking dynamic, the .a in /usr/lib is used
23# instead of the .so in /lib due to gcc/libtool tweaking ld's
24# library search path. This cause many builds to fail.
25# See bug #4411 for more info.
26# 14#
27# To use, simply call: 15# Due to the nature of this eclass, some functions may have maintainers
28# 16# different from the overall eclass!
29# gen_usr_ldscript libfoo.so
30#
31# Note that you should in general use the unversioned name of
32# the library, as ldconfig should usually update it correctly
33# to point to the latest version of the library present.
34#
35# <azarah@gentoo.org> (26 Oct 2002)
36#
37gen_usr_ldscript() {
38 17
39 # Just make sure it exists 18if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
40 dodir /usr/lib 19___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
41 20
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 21inherit multilib toolchain-funcs
43/* GNU ld script
44 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */
50GROUP ( /lib/libxxx )
51END_LDSCRIPT
52 22
53 dosed "s:libxxx:$1:" /usr/lib/$1 23if has "${EAPI:-0}" 0 1 2; then
54 24
25# @FUNCTION: epause
26# @USAGE: [seconds]
27# @DESCRIPTION:
28# Sleep for the specified number of seconds (default of 5 seconds). Useful when
29# printing a message the user should probably be reading and often used in
30# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
31# don't wait at all. Defined in EAPIs 0 1 and 2.
32epause() {
33 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
34}
35
36# @FUNCTION: ebeep
37# @USAGE: [number of beeps]
38# @DESCRIPTION:
39# Issue the specified number of beeps (default of 5 beeps). Useful when
40# printing a message the user should probably be reading and often used in
41# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
42# don't beep at all. Defined in EAPIs 0 1 and 2.
43ebeep() {
44 local n
45 if [[ -z ${EBEEP_IGNORE} ]] ; then
46 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
47 echo -ne "\a"
48 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
49 echo -ne "\a"
50 sleep 1
51 done
52 fi
53}
54
55else
56
57ebeep() {
58 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
59}
60
61epause() {
62 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
63}
64
65fi
66
67# @FUNCTION: eqawarn
68# @USAGE: [message]
69# @DESCRIPTION:
70# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
71# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
72# profile.
73if ! declare -F eqawarn >/dev/null ; then
74 eqawarn() {
75 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
76 :
77 }
78fi
79
80# @FUNCTION: ecvs_clean
81# @USAGE: [list of dirs]
82# @DESCRIPTION:
83# Remove CVS directories recursiveley. Useful when a source tarball contains
84# internal CVS directories. Defaults to $PWD.
85ecvs_clean() {
86 [[ -z $* ]] && set -- .
87 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
88 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
89}
90
91# @FUNCTION: esvn_clean
92# @USAGE: [list of dirs]
93# @DESCRIPTION:
94# Remove .svn directories recursiveley. Useful when a source tarball contains
95# internal Subversion directories. Defaults to $PWD.
96esvn_clean() {
97 [[ -z $* ]] && set -- .
98 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
99}
100
101# @FUNCTION: estack_push
102# @USAGE: <stack> [items to push]
103# @DESCRIPTION:
104# Push any number of items onto the specified stack. Pick a name that
105# is a valid variable (i.e. stick to alphanumerics), and push as many
106# items as you like onto the stack at once.
107#
108# The following code snippet will echo 5, then 4, then 3, then ...
109# @CODE
110# estack_push mystack 1 2 3 4 5
111# while estack_pop mystack i ; do
112# echo "${i}"
113# done
114# @CODE
115estack_push() {
116 [[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments"
117 local stack_name="__ESTACK_$1__" ; shift
118 eval ${stack_name}+=\( \"\$@\" \)
119}
120
121# @FUNCTION: estack_pop
122# @USAGE: <stack> [variable]
123# @DESCRIPTION:
124# Pop a single item off the specified stack. If a variable is specified,
125# the popped item is stored there. If no more items are available, return
126# 1, else return 0. See estack_push for more info.
127estack_pop() {
128 [[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments"
129
130 # We use the fugly __estack_xxx var names to avoid collision with
131 # passing back the return value. If we used "local i" and the
132 # caller ran `estack_pop ... i`, we'd end up setting the local
133 # copy of "i" rather than the caller's copy. The __estack_xxx
134 # garbage is preferable to using $1/$2 everywhere as that is a
135 # bit harder to read.
136 local __estack_name="__ESTACK_$1__" ; shift
137 local __estack_retvar=$1 ; shift
138 eval local __estack_i=\${#${__estack_name}\[@\]}
139 # Don't warn -- let the caller interpret this as a failure
140 # or as normal behavior (akin to `shift`)
141 [[ $(( --__estack_i )) -eq -1 ]] && return 1
142
143 if [[ -n ${__estack_retvar} ]] ; then
144 eval ${__estack_retvar}=\"\${${__estack_name}\[${__estack_i}\]}\"
145 fi
146 eval unset ${__estack_name}\[${__estack_i}\]
147}
148
149# @FUNCTION: evar_push
150# @USAGE: <variable to save> [more vars to save]
151# @DESCRIPTION:
152# This let's you temporarily modify a variable and then restore it (including
153# set vs unset semantics). Arrays are not supported at this time.
154#
155# This is meant for variables where using `local` does not work (such as
156# exported variables, or only temporarily changing things in a func).
157#
158# For example:
159# @CODE
160# evar_push LC_ALL
161# export LC_ALL=C
162# ... do some stuff that needs LC_ALL=C set ...
163# evar_pop
164#
165# # You can also save/restore more than one var at a time
166# evar_push BUTTERFLY IN THE SKY
167# ... do stuff with the vars ...
168# evar_pop # This restores just one var, SKY
169# ... do more stuff ...
170# evar_pop 3 # This pops the remaining 3 vars
171# @CODE
172evar_push() {
173 local var val
174 for var ; do
175 [[ ${!var+set} == "set" ]] \
176 && val=${!var} \
177 || val="${___ECLASS_ONCE_EUTILS}"
178 estack_push evar "${var}" "${val}"
179 done
180}
181
182# @FUNCTION: evar_push_set
183# @USAGE: <variable to save> [new value to store]
184# @DESCRIPTION:
185# This is a handy shortcut to save and temporarily set a variable. If a value
186# is not specified, the var will be unset.
187evar_push_set() {
188 local var=$1
189 evar_push ${var}
190 case $# in
191 1) unset ${var} ;;
192 2) printf -v "${var}" '%s' "$2" ;;
193 *) die "${FUNCNAME}: incorrect # of args: $*" ;;
194 esac
195}
196
197# @FUNCTION: evar_pop
198# @USAGE: [number of vars to restore]
199# @DESCRIPTION:
200# Restore the variables to the state saved with the corresponding
201# evar_push call. See that function for more details.
202evar_pop() {
203 local cnt=${1:-bad}
204 case $# in
205 0) cnt=1 ;;
206 1) isdigit "${cnt}" || die "${FUNCNAME}: first arg must be a number: $*" ;;
207 *) die "${FUNCNAME}: only accepts one arg: $*" ;;
208 esac
209
210 local var val
211 while (( cnt-- )) ; do
212 estack_pop evar val || die "${FUNCNAME}: unbalanced push"
213 estack_pop evar var || die "${FUNCNAME}: unbalanced push"
214 [[ ${val} == "${___ECLASS_ONCE_EUTILS}" ]] \
215 && unset ${var} \
216 || printf -v "${var}" '%s' "${val}"
217 done
218}
219
220# @FUNCTION: eshopts_push
221# @USAGE: [options to `set` or `shopt`]
222# @DESCRIPTION:
223# Often times code will want to enable a shell option to change code behavior.
224# Since changing shell options can easily break other pieces of code (which
225# assume the default state), eshopts_push is used to (1) push the current shell
226# options onto a stack and (2) pass the specified arguments to set.
227#
228# If the first argument is '-s' or '-u', we assume you want to call `shopt`
229# rather than `set` as there are some options only available via that.
230#
231# A common example is to disable shell globbing so that special meaning/care
232# may be used with variables/arguments to custom functions. That would be:
233# @CODE
234# eshopts_push -s noglob
235# for x in ${foo} ; do
236# if ...some check... ; then
237# eshopts_pop
238# return 0
239# fi
240# done
241# eshopts_pop
242# @CODE
243eshopts_push() {
244 if [[ $1 == -[su] ]] ; then
245 estack_push eshopts "$(shopt -p)"
246 [[ $# -eq 0 ]] && return 0
247 shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"
248 else
249 estack_push eshopts $-
250 [[ $# -eq 0 ]] && return 0
251 set "$@" || die "${FUNCNAME}: bad options to set: $*"
252 fi
253}
254
255# @FUNCTION: eshopts_pop
256# @USAGE:
257# @DESCRIPTION:
258# Restore the shell options to the state saved with the corresponding
259# eshopts_push call. See that function for more details.
260eshopts_pop() {
261 local s
262 estack_pop eshopts s || die "${FUNCNAME}: unbalanced push"
263 if [[ ${s} == "shopt -"* ]] ; then
264 eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}"
265 else
266 set +$- || die "${FUNCNAME}: sanity: invalid shell settings: $-"
267 set -${s} || die "${FUNCNAME}: sanity: unable to restore saved shell settings: ${s}"
268 fi
269}
270
271# @FUNCTION: eumask_push
272# @USAGE: <new umask>
273# @DESCRIPTION:
274# Set the umask to the new value specified while saving the previous
275# value onto a stack. Useful for temporarily changing the umask.
276eumask_push() {
277 estack_push eumask "$(umask)"
278 umask "$@" || die "${FUNCNAME}: bad options to umask: $*"
279}
280
281# @FUNCTION: eumask_pop
282# @USAGE:
283# @DESCRIPTION:
284# Restore the previous umask state.
285eumask_pop() {
286 [[ $# -eq 0 ]] || die "${FUNCNAME}: we take no options"
287 local s
288 estack_pop eumask s || die "${FUNCNAME}: unbalanced push"
289 umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}"
290}
291
292# @FUNCTION: isdigit
293# @USAGE: <number> [more numbers]
294# @DESCRIPTION:
295# Return true if all arguments are numbers.
296isdigit() {
297 local d
298 for d ; do
299 [[ ${d:-bad} == *[!0-9]* ]] && return 1
300 done
55 return 0 301 return 0
56} 302}
57 303
58# Simple function to draw a line consisting of '=' the same length as $* 304# @VARIABLE: EPATCH_SOURCE
59# 305# @DESCRIPTION:
60# <azarah@gentoo.org> (11 Nov 2002) 306# Default directory to search for patches.
61#
62draw_line() {
63 local i=0
64 local str_length=""
65
66 # Handle calls that do not have args, or wc not being installed ...
67 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
68 then
69 echo "==============================================================="
70 return 0
71 fi
72
73 # Get the length of $*
74 str_length="$(echo -n "$*" | wc -m)"
75
76 while [ "$i" -lt "${str_length}" ]
77 do
78 echo -n "="
79
80 i=$((i + 1))
81 done
82
83 echo
84
85 return 0
86}
87
88# Default directory where patches are located
89EPATCH_SOURCE="${WORKDIR}/patch" 307EPATCH_SOURCE="${WORKDIR}/patch"
90# Default extension for patches 308# @VARIABLE: EPATCH_SUFFIX
309# @DESCRIPTION:
310# Default extension for patches (do not prefix the period yourself).
91EPATCH_SUFFIX="patch.bz2" 311EPATCH_SUFFIX="patch.bz2"
92# Default options for patch 312# @VARIABLE: EPATCH_OPTS
313# @DESCRIPTION:
314# Options to pass to patch. Meant for ebuild/package-specific tweaking
315# such as forcing the patch level (-p#) or fuzz (-F#) factor. Note that
316# for single patch tweaking, you can also pass flags directly to epatch.
93EPATCH_OPTS="" 317EPATCH_OPTS=""
318# @VARIABLE: EPATCH_COMMON_OPTS
319# @DESCRIPTION:
320# Common options to pass to `patch`. You probably should never need to
321# change these. If you do, please discuss it with base-system first to
322# be sure.
323# @CODE
324# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
325# --no-backup-if-mismatch - do not leave .orig files behind
326# -E - automatically remove empty files
327# @CODE
328EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
329# @VARIABLE: EPATCH_EXCLUDE
330# @DESCRIPTION:
94# List of patches not to apply. Not this is only file names, 331# List of patches not to apply. Note this is only file names,
95# and not the full path .. 332# and not the full path. Globs accepted.
96EPATCH_EXCLUDE="" 333EPATCH_EXCLUDE=""
334# @VARIABLE: EPATCH_SINGLE_MSG
335# @DESCRIPTION:
97# Change the printed message for a single patch. 336# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 337EPATCH_SINGLE_MSG=""
99# Force applying bulk patches even if not following the style: 338# @VARIABLE: EPATCH_MULTI_MSG
100# 339# @DESCRIPTION:
101# ??_${ARCH}_foo.${EPATCH_SUFFIX} 340# Change the printed message for multiple patches.
102# 341EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
342# @VARIABLE: EPATCH_FORCE
343# @DESCRIPTION:
344# Only require patches to match EPATCH_SUFFIX rather than the extended
345# arch naming style.
103EPATCH_FORCE="no" 346EPATCH_FORCE="no"
347# @VARIABLE: EPATCH_USER_EXCLUDE
348# @DEFAULT_UNSET
349# @DESCRIPTION:
350# List of patches not to apply. Note this is only file names,
351# and not the full path. Globs accepted.
104 352
105# This function is for bulk patching, or in theory for just one 353# @FUNCTION: epatch
106# or two patches. 354# @USAGE: [options] [patches] [dirs of patches]
355# @DESCRIPTION:
356# epatch is designed to greatly simplify the application of patches. It can
357# process patch files directly, or directories of patches. The patches may be
358# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
359# the -p option as epatch will automatically attempt -p0 to -p4 until things
360# apply successfully.
107# 361#
108# It should work with .bz2, .gz, .zip and plain text patches. 362# If you do not specify any patches/dirs, then epatch will default to the
109# Currently all patches should be the same format. 363# directory specified by EPATCH_SOURCE.
110# 364#
111# You do not have to specify '-p' option to patch, as it will 365# Any options specified that start with a dash will be passed down to patch
112# try with -p0 to -p5 until it succeed, or fail at -p5. 366# for this specific invocation. As soon as an arg w/out a dash is found, then
367# arg processing stops.
113# 368#
114# Above EPATCH_* variables can be used to control various defaults, 369# When processing directories, epatch will apply all patches that match:
115# bug they should be left as is to ensure an ebuild can rely on 370# @CODE
116# them for. 371# if ${EPATCH_FORCE} != "yes"
117#
118# Patches are applied in current directory.
119#
120# Bulk Patches should preferibly have the form of:
121#
122# ??_${ARCH}_foo.${EPATCH_SUFFIX} 372# ??_${ARCH}_foo.${EPATCH_SUFFIX}
373# else
374# *.${EPATCH_SUFFIX}
375# @CODE
376# The leading ?? are typically numbers used to force consistent patch ordering.
377# The arch field is used to apply patches only for the host architecture with
378# the special value of "all" means apply for everyone. Note that using values
379# other than "all" is highly discouraged -- you should apply patches all the
380# time and let architecture details be detected at configure/compile time.
123# 381#
124# For example: 382# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
383# for patches to apply.
125# 384#
126# 01_all_misc-fix.patch.bz2 385# Refer to the other EPATCH_xxx variables for more customization of behavior.
127# 02_sparc_another-fix.patch.bz2
128#
129# This ensures that there are a set order, and you can have ARCH
130# specific patches.
131#
132# If you however give an argument to epatch(), it will treat it as a
133# single patch that need to be applied if its a file. If on the other
134# hand its a directory, it will set EPATCH_SOURCE to this.
135#
136# <azarah@gentoo.org> (10 Nov 2002)
137#
138epatch() { 386epatch() {
139 local PIPE_CMD="" 387 _epatch_draw_line() {
140 local STDERR_TARGET="${T}/$$.out" 388 # create a line of same length as input string
141 local PATCH_TARGET="${T}/$$.patch" 389 [[ -z $1 ]] && set "$(printf "%65s" '')"
142 local PATCH_SUFFIX="" 390 echo "${1//?/=}"
391 }
392
393 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
394
395 # First process options. We localize the EPATCH_OPTS setting
396 # from above so that we can pass it on in the loop below with
397 # any additional values the user has specified.
398 local EPATCH_OPTS=( ${EPATCH_OPTS[*]} )
399 while [[ $# -gt 0 ]] ; do
400 case $1 in
401 -*) EPATCH_OPTS+=( "$1" ) ;;
402 *) break ;;
403 esac
404 shift
405 done
406
407 # Let the rest of the code process one user arg at a time --
408 # each arg may expand into multiple patches, and each arg may
409 # need to start off with the default global EPATCH_xxx values
410 if [[ $# -gt 1 ]] ; then
411 local m
412 for m in "$@" ; do
413 epatch "${m}"
414 done
415 return 0
416 fi
417
143 local SINGLE_PATCH="no" 418 local SINGLE_PATCH="no"
144 local x="" 419 # no args means process ${EPATCH_SOURCE}
420 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
145 421
146 if [ "$#" -gt 1 ] 422 if [[ -f $1 ]] ; then
147 then
148 eerror "Invalid arguments to epatch()"
149 die "Invalid arguments to epatch()"
150 fi
151
152 if [ -n "$1" -a -f "$1" ]
153 then
154 SINGLE_PATCH="yes" 423 SINGLE_PATCH="yes"
155 424 set -- "$1"
156 local EPATCH_SOURCE="$1" 425 # Use the suffix from the single patch (localize it); the code
426 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 427 local EPATCH_SUFFIX=$1
158 428
159 elif [ -n "$1" -a -d "$1" ] 429 elif [[ -d $1 ]] ; then
160 then 430 # We have to force sorting to C so that the wildcard expansion is consistent #471666.
161 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 431 evar_push_set LC_COLLATE C
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 432 # Some people like to make dirs of patches w/out suffixes (vim).
433 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
434 evar_pop
435
436 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
437 # Re-use EPATCH_SOURCE as a search dir
438 epatch "${EPATCH_SOURCE}/$1"
439 return $?
440
441 else
442 # sanity check ... if it isn't a dir or file, wtf man ?
443 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
444 echo
445 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
446 eerror
447 eerror " ${EPATCH_SOURCE}"
448 eerror " ( ${EPATCH_SOURCE##*/} )"
449 echo
450 die "Cannot find \$EPATCH_SOURCE!"
451 fi
452
453 # Now that we know we're actually going to apply something, merge
454 # all of the patch options back in to a single variable for below.
455 EPATCH_OPTS="${EPATCH_COMMON_OPTS} ${EPATCH_OPTS[*]}"
456
457 local PIPE_CMD
458 case ${EPATCH_SUFFIX##*\.} in
459 xz) PIPE_CMD="xz -dc" ;;
460 lzma) PIPE_CMD="lzma -dc" ;;
461 bz2) PIPE_CMD="bzip2 -dc" ;;
462 gz|Z|z) PIPE_CMD="gzip -dc" ;;
463 ZIP|zip) PIPE_CMD="unzip -p" ;;
464 *) ;;
465 esac
466
467 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
468
469 local x
470 for x in "$@" ; do
471 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
472 # didn't match anything, ignore continue on
473 [[ ! -f ${x} ]] && continue
474
475 local patchname=${x##*/}
476
477 # Apply single patches, or forced sets of patches, or
478 # patches with ARCH dependant names.
479 # ???_arch_foo.patch
480 # Else, skip this input altogether
481 local a=${patchname#*_} # strip the ???_
482 a=${a%%_*} # strip the _foo.patch
483 if ! [[ ${SINGLE_PATCH} == "yes" || \
484 ${EPATCH_FORCE} == "yes" || \
485 ${a} == all || \
486 ${a} == ${ARCH} ]]
163 then 487 then
164 local EPATCH_SOURCE="$1/*" 488 continue
489 fi
490
491 # Let people filter things dynamically
492 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
493 # let people use globs in the exclude
494 eshopts_push -o noglob
495
496 local ex
497 for ex in ${EPATCH_EXCLUDE} ; do
498 if [[ ${patchname} == ${ex} ]] ; then
499 einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..."
500 eshopts_pop
501 continue 2
502 fi
503 done
504
505 for ex in ${EPATCH_USER_EXCLUDE} ; do
506 if [[ ${patchname} == ${ex} ]] ; then
507 einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..."
508 eshopts_pop
509 continue 2
510 fi
511 done
512
513 eshopts_pop
514 fi
515
516 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
517 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
518 einfo "${EPATCH_SINGLE_MSG}"
519 else
520 einfo "Applying ${patchname} ..."
521 fi
165 else 522 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 523 einfo " ${patchname} ..."
524 fi
525
526 # most of the time, there will only be one run per unique name,
527 # but if there are more, make sure we get unique log filenames
528 local STDERR_TARGET="${T}/${patchname}.out"
529 if [[ -e ${STDERR_TARGET} ]] ; then
530 STDERR_TARGET="${T}/${patchname}-$$.out"
531 fi
532
533 printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
534
535 # Decompress the patch if need be
536 local count=0
537 local PATCH_TARGET
538 if [[ -n ${PIPE_CMD} ]] ; then
539 PATCH_TARGET="${T}/$$.patch"
540 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
541
542 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
543 echo
544 eerror "Could not extract patch!"
545 #die "Could not extract patch!"
546 count=5
547 break
167 fi 548 fi
549 else
550 PATCH_TARGET=${x}
551 fi
552
553 # Check for absolute paths in patches. If sandbox is disabled,
554 # people could (accidently) patch files in the root filesystem.
555 # Or trigger other unpleasantries #237667. So disallow -p0 on
556 # such patches.
557 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
558 if [[ -n ${abs_paths} ]] ; then
559 count=1
560 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
561 fi
562 # Similar reason, but with relative paths.
563 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
564 if [[ -n ${rel_paths} ]] ; then
565 echo
566 eerror "Rejected Patch: ${patchname} !"
567 eerror " ( ${PATCH_TARGET} )"
568 eerror
569 eerror "Your patch uses relative paths '../':"
570 eerror "${rel_paths}"
571 echo
572 die "you need to fix the relative paths in patch"
573 fi
574
575 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
576 local patch_cmd
577 # Handle aliased patch command #404447 #461568
578 local patch="patch"
579 eval $(alias patch 2>/dev/null | sed 's:^alias ::')
580 while [[ ${count} -lt 5 ]] ; do
581 patch_cmd="${patch} -p${count} ${EPATCH_OPTS}"
582
583 # Generate some useful debug info ...
584 (
585 _epatch_draw_line "***** ${patchname} *****"
586 echo
587 echo "PATCH COMMAND: ${patch_cmd} < '${PATCH_TARGET}'"
588 echo
589 _epatch_draw_line "***** ${patchname} *****"
590 ${patch_cmd} --dry-run -f < "${PATCH_TARGET}" 2>&1
591 ret=$?
592 echo
593 echo "patch program exited with status ${ret}"
594 exit ${ret}
595 ) >> "${STDERR_TARGET}"
596
597 if [ $? -eq 0 ] ; then
598 (
599 _epatch_draw_line "***** ${patchname} *****"
600 echo
601 echo "ACTUALLY APPLYING ${patchname} ..."
602 echo
603 _epatch_draw_line "***** ${patchname} *****"
604 ${patch_cmd} < "${PATCH_TARGET}" 2>&1
605 ret=$?
606 echo
607 echo "patch program exited with status ${ret}"
608 exit ${ret}
609 ) >> "${STDERR_TARGET}"
610
611 if [ $? -ne 0 ] ; then
612 echo
613 eerror "A dry-run of patch command succeeded, but actually"
614 eerror "applying the patch failed!"
615 #die "Real world sux compared to the dreamworld!"
616 count=5
617 fi
618 break
619 fi
620
621 : $(( count++ ))
622 done
623
624 # if we had to decompress the patch, delete the temp one
625 if [[ -n ${PIPE_CMD} ]] ; then
626 rm -f "${PATCH_TARGET}"
627 fi
628
629 if [[ ${count} -ge 5 ]] ; then
630 echo
631 eerror "Failed Patch: ${patchname} !"
632 eerror " ( ${PATCH_TARGET} )"
633 eerror
634 eerror "Include in your bugreport the contents of:"
635 eerror
636 eerror " ${STDERR_TARGET}"
637 echo
638 die "Failed Patch: ${patchname}!"
639 fi
640
641 # if everything worked, delete the full debug patch log
642 rm -f "${STDERR_TARGET}"
643
644 # then log away the exact stuff for people to review later
645 cat <<-EOF >> "${T}/epatch.log"
646 PATCH: ${x}
647 CMD: ${patch_cmd}
648 PWD: ${PWD}
649
650 EOF
651 eend 0
652 done
653
654 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
655 : # everything worked
656}
657
658# @FUNCTION: epatch_user
659# @USAGE:
660# @DESCRIPTION:
661# Applies user-provided patches to the source tree. The patches are
662# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>[:SLOT]/, where the first
663# of these three directories to exist will be the one to use, ignoring
664# any more general directories which might exist as well. They must end
665# in ".patch" to be applied.
666#
667# User patches are intended for quick testing of patches without ebuild
668# modifications, as well as for permanent customizations a user might
669# desire. Obviously, there can be no official support for arbitrarily
670# patched ebuilds. So whenever a build log in a bug report mentions that
671# user patches were applied, the user should be asked to reproduce the
672# problem without these.
673#
674# Not all ebuilds do call this function, so placing patches in the
675# stated directory might or might not work, depending on the package and
676# the eclasses it inherits and uses. It is safe to call the function
677# repeatedly, so it is always possible to add a call at the ebuild
678# level. The first call is the time when the patches will be
679# applied.
680#
681# Ideally, this function should be called after gentoo-specific patches
682# have been applied, so that their code can be modified as well, but
683# before calls to e.g. eautoreconf, as the user patches might affect
684# autotool input files as well.
685epatch_user() {
686 [[ $# -ne 0 ]] && die "epatch_user takes no options"
687
688 # Allow multiple calls to this function; ignore all but the first
689 local applied="${T}/epatch_user.log"
690 [[ -e ${applied} ]] && return 2
691
692 # don't clobber any EPATCH vars that the parent might want
693 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
694 for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
695 EPATCH_SOURCE=${base}/${CTARGET}/${check}
696 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
697 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
698 if [[ -d ${EPATCH_SOURCE} ]] ; then
699 EPATCH_SOURCE=${EPATCH_SOURCE} \
700 EPATCH_SUFFIX="patch" \
701 EPATCH_FORCE="yes" \
702 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
703 epatch
704 echo "${EPATCH_SOURCE}" > "${applied}"
705 return 0
706 fi
707 done
708 echo "none" > "${applied}"
709 return 1
710}
711
712# @FUNCTION: emktemp
713# @USAGE: [temp dir]
714# @DESCRIPTION:
715# Cheap replacement for when debianutils (and thus mktemp)
716# does not exist on the users system.
717emktemp() {
718 local exe="touch"
719 [[ $1 == -d ]] && exe="mkdir" && shift
720 local topdir=$1
721
722 if [[ -z ${topdir} ]] ; then
723 [[ -z ${T} ]] \
724 && topdir="/tmp" \
725 || topdir=${T}
726 fi
727
728 if ! type -P mktemp > /dev/null ; then
729 # system lacks `mktemp` so we have to fake it
730 local tmp=/
731 while [[ -e ${tmp} ]] ; do
732 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
733 done
734 ${exe} "${tmp}" || ${exe} -p "${tmp}"
735 echo "${tmp}"
168 else 736 else
169 if [ ! -d ${EPATCH_SOURCE} ] 737 # the args here will give slightly wierd names on BSD,
170 then 738 # but should produce a usable file on all userlands
171 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 739 if [[ ${exe} == "touch" ]] ; then
172 then 740 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
173 EPATCH_SOURCE="$1" 741 else
742 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
743 fi
744 fi
745}
746
747# @FUNCTION: edos2unix
748# @USAGE: <file> [more files ...]
749# @DESCRIPTION:
750# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
751# to remove all of these text utilities from DEPEND variables because this
752# is a script based solution. Just give it a list of files to convert and
753# they will all be changed from the DOS CRLF format to the UNIX LF format.
754edos2unix() {
755 [[ $# -eq 0 ]] && return 0
756 sed -i 's/\r$//' -- "$@" || die
757}
758
759# @FUNCTION: make_desktop_entry
760# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields])
761# @DESCRIPTION:
762# Make a .desktop file.
763#
764# @CODE
765# binary: what command does the app run with ?
766# name: the name that will show up in the menu
767# icon: the icon to use in the menu entry
768# this can be relative (to /usr/share/pixmaps) or
769# a full path to an icon
770# type: what kind of application is this?
771# for categories:
772# http://standards.freedesktop.org/menu-spec/latest/apa.html
773# if unset, function tries to guess from package's category
774# fields: extra fields to append to the desktop file; a printf string
775# @CODE
776make_desktop_entry() {
777 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
778
779 local exec=${1}
780 local name=${2:-${PN}}
781 local icon=${3:-${PN}}
782 local type=${4}
783 local fields=${5}
784
785 if [[ -z ${type} ]] ; then
786 local catmaj=${CATEGORY%%-*}
787 local catmin=${CATEGORY##*-}
788 case ${catmaj} in
789 app)
790 case ${catmin} in
791 accessibility) type="Utility;Accessibility";;
792 admin) type=System;;
793 antivirus) type=System;;
794 arch) type="Utility;Archiving";;
795 backup) type="Utility;Archiving";;
796 cdr) type="AudioVideo;DiscBurning";;
797 dicts) type="Office;Dictionary";;
798 doc) type=Documentation;;
799 editors) type="Utility;TextEditor";;
800 emacs) type="Development;TextEditor";;
801 emulation) type="System;Emulator";;
802 laptop) type="Settings;HardwareSettings";;
803 office) type=Office;;
804 pda) type="Office;PDA";;
805 vim) type="Development;TextEditor";;
806 xemacs) type="Development;TextEditor";;
807 esac
808 ;;
809
810 dev)
811 type="Development"
812 ;;
813
814 games)
815 case ${catmin} in
816 action|fps) type=ActionGame;;
817 arcade) type=ArcadeGame;;
818 board) type=BoardGame;;
819 emulation) type=Emulator;;
820 kids) type=KidsGame;;
821 puzzle) type=LogicGame;;
822 roguelike) type=RolePlaying;;
823 rpg) type=RolePlaying;;
824 simulation) type=Simulation;;
825 sports) type=SportsGame;;
826 strategy) type=StrategyGame;;
827 esac
828 type="Game;${type}"
829 ;;
830
831 gnome)
832 type="Gnome;GTK"
833 ;;
834
835 kde)
836 type="KDE;Qt"
837 ;;
838
839 mail)
840 type="Network;Email"
841 ;;
842
843 media)
844 case ${catmin} in
845 gfx)
846 type=Graphics
847 ;;
848 *)
849 case ${catmin} in
850 radio) type=Tuner;;
851 sound) type=Audio;;
852 tv) type=TV;;
853 video) type=Video;;
854 esac
855 type="AudioVideo;${type}"
856 ;;
857 esac
858 ;;
859
860 net)
861 case ${catmin} in
862 dialup) type=Dialup;;
863 ftp) type=FileTransfer;;
864 im) type=InstantMessaging;;
865 irc) type=IRCClient;;
866 mail) type=Email;;
867 news) type=News;;
868 nntp) type=News;;
869 p2p) type=FileTransfer;;
870 voip) type=Telephony;;
871 esac
872 type="Network;${type}"
873 ;;
874
875 sci)
876 case ${catmin} in
877 astro*) type=Astronomy;;
878 bio*) type=Biology;;
879 calc*) type=Calculator;;
880 chem*) type=Chemistry;;
881 elec*) type=Electronics;;
882 geo*) type=Geology;;
883 math*) type=Math;;
884 physics) type=Physics;;
885 visual*) type=DataVisualization;;
886 esac
887 type="Education;Science;${type}"
888 ;;
889
890 sys)
891 type="System"
892 ;;
893
894 www)
895 case ${catmin} in
896 client) type=WebBrowser;;
897 esac
898 type="Network;${type}"
899 ;;
900
901 *)
902 type=
903 ;;
904 esac
905 fi
906 if [ "${SLOT}" == "0" ] ; then
907 local desktop_name="${PN}"
908 else
909 local desktop_name="${PN}-${SLOT}"
910 fi
911 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
912 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
913
914 # Don't append another ";" when a valid category value is provided.
915 type=${type%;}${type:+;}
916
917 eshopts_push -s extglob
918 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
919 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
920 ewarn "allowed in .desktop files if the value is not an absolute path."
921 icon=${icon%.@(xpm|png|svg)}
922 fi
923 eshopts_pop
924
925 cat <<-EOF > "${desktop}"
926 [Desktop Entry]
927 Name=${name}
928 Type=Application
929 Comment=${DESCRIPTION}
930 Exec=${exec}
931 TryExec=${exec%% *}
932 Icon=${icon}
933 Categories=${type}
934 EOF
935
936 if [[ ${fields:-=} != *=* ]] ; then
937 # 5th arg used to be value to Path=
938 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
939 fields="Path=${fields}"
940 fi
941 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
942
943 (
944 # wrap the env here so that the 'insinto' call
945 # doesn't corrupt the env of the caller
946 insinto /usr/share/applications
947 doins "${desktop}"
948 ) || die "installing desktop file failed"
949}
950
951# @FUNCTION: _eutils_eprefix_init
952# @INTERNAL
953# @DESCRIPTION:
954# Initialized prefix variables for EAPI<3.
955_eutils_eprefix_init() {
956 has "${EAPI:-0}" 0 1 2 && : ${ED:=${D}} ${EPREFIX:=} ${EROOT:=${ROOT}}
957}
958
959# @FUNCTION: validate_desktop_entries
960# @USAGE: [directories]
961# @MAINTAINER:
962# Carsten Lohrke <carlo@gentoo.org>
963# @DESCRIPTION:
964# Validate desktop entries using desktop-file-utils
965validate_desktop_entries() {
966 _eutils_eprefix_init
967 if [[ -x "${EPREFIX}"/usr/bin/desktop-file-validate ]] ; then
968 einfo "Checking desktop entry validity"
969 local directories=""
970 for d in /usr/share/applications $@ ; do
971 [[ -d ${ED}${d} ]] && directories="${directories} ${ED}${d}"
972 done
973 if [[ -n ${directories} ]] ; then
974 for FILE in $(find ${directories} -name "*\.desktop" \
975 -not -path '*.hidden*' | sort -u 2>/dev/null)
976 do
977 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
978 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
979 [[ -n $temp ]] && elog ${temp/--/${FILE/${ED}/}:}
980 done
981 fi
982 echo ""
983 else
984 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
985 fi
986}
987
988# @FUNCTION: make_session_desktop
989# @USAGE: <title> <command> [command args...]
990# @DESCRIPTION:
991# Make a GDM/KDM Session file. The title is the file to execute to start the
992# Window Manager. The command is the name of the Window Manager.
993#
994# You can set the name of the file via the ${wm} variable.
995make_session_desktop() {
996 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
997 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
998
999 local title=$1
1000 local command=$2
1001 local desktop=${T}/${wm:-${PN}}.desktop
1002 shift 2
1003
1004 cat <<-EOF > "${desktop}"
1005 [Desktop Entry]
1006 Name=${title}
1007 Comment=This session logs you into ${title}
1008 Exec=${command} $*
1009 TryExec=${command}
1010 Type=XSession
1011 EOF
1012
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
1016 insinto /usr/share/xsessions
1017 doins "${desktop}"
1018 )
1019}
1020
1021# @FUNCTION: domenu
1022# @USAGE: <menus>
1023# @DESCRIPTION:
1024# Install the list of .desktop menu files into the appropriate directory
1025# (/usr/share/applications).
1026domenu() {
1027 (
1028 # wrap the env here so that the 'insinto' call
1029 # doesn't corrupt the env of the caller
1030 local i j ret=0
1031 insinto /usr/share/applications
1032 for i in "$@" ; do
1033 if [[ -f ${i} ]] ; then
1034 doins "${i}"
1035 ((ret+=$?))
1036 elif [[ -d ${i} ]] ; then
1037 for j in "${i}"/*.desktop ; do
1038 doins "${j}"
1039 ((ret+=$?))
1040 done
1041 else
1042 ((++ret))
1043 fi
1044 done
1045 exit ${ret}
1046 )
1047}
1048
1049# @FUNCTION: newmenu
1050# @USAGE: <menu> <newname>
1051# @DESCRIPTION:
1052# Like all other new* functions, install the specified menu as newname.
1053newmenu() {
1054 (
1055 # wrap the env here so that the 'insinto' call
1056 # doesn't corrupt the env of the caller
1057 insinto /usr/share/applications
1058 newins "$@"
1059 )
1060}
1061
1062# @FUNCTION: _iconins
1063# @INTERNAL
1064# @DESCRIPTION:
1065# function for use in doicon and newicon
1066_iconins() {
1067 (
1068 # wrap the env here so that the 'insinto' call
1069 # doesn't corrupt the env of the caller
1070 local funcname=$1; shift
1071 local size dir
1072 local context=apps
1073 local theme=hicolor
1074
1075 while [[ $# -gt 0 ]] ; do
1076 case $1 in
1077 -s|--size)
1078 if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then
1079 size=${2%%x*}
1080 else
1081 size=${2}
174 fi 1082 fi
175 1083 case ${size} in
176 echo 1084 16|22|24|32|36|48|64|72|96|128|192|256)
177 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 1085 size=${size}x${size};;
178 eerror 1086 scalable)
179 eerror " ${EPATCH_SOURCE}"
180 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 bz2)
189 PIPE_CMD="bzip2 -dc"
190 PATCH_SUFFIX="bz2"
191 ;; 1087 ;;
192 gz|Z|z) 1088 *)
193 PIPE_CMD="gzip -dc" 1089 eerror "${size} is an unsupported icon size!"
194 PATCH_SUFFIX="gz" 1090 exit 1;;
195 ;; 1091 esac
196 ZIP|zip) 1092 shift 2;;
197 PIPE_CMD="unzip -p" 1093 -t|--theme)
198 PATCH_SUFFIX="zip" 1094 theme=${2}
199 ;; 1095 shift 2;;
1096 -c|--context)
1097 context=${2}
1098 shift 2;;
200 *) 1099 *)
201 PIPE_CMD="cat" 1100 if [[ -z ${size} ]] ; then
202 PATCH_SUFFIX="patch" 1101 insinto /usr/share/pixmaps
203 ;; 1102 else
204 esac 1103 insinto /usr/share/icons/${theme}/${size}/${context}
205
206 if [ "${SINGLE_PATCH}" = "no" ]
207 then
208 einfo "Applying various patches (bugfixes/updates)..."
209 fi
210 for x in ${EPATCH_SOURCE}
211 do
212 # New ARCH dependant patch naming scheme...
213 #
214 # ???_arch_foo.patch
215 #
216 if [ -f ${x} ] && \
217 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
218 [ "${EPATCH_FORCE}" = "yes" ])
219 then
220 local count=0
221 local popts="${EPATCH_OPTS}"
222
223 if [ -n "${EPATCH_EXCLUDE}" ]
224 then
225 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]
226 then
227 continue
228 fi
229 fi 1104 fi
230 1105
231 if [ "${SINGLE_PATCH}" = "yes" ] 1106 if [[ ${funcname} == doicon ]] ; then
232 then 1107 if [[ -f $1 ]] ; then
233 if [ -n "${EPATCH_SINGLE_MSG}" ] 1108 doins "${1}"
234 then 1109 elif [[ -d $1 ]] ; then
235 einfo "${EPATCH_SINGLE_MSG}" 1110 shopt -s nullglob
1111 doins "${1}"/*.{png,svg}
1112 shopt -u nullglob
236 else 1113 else
237 einfo "Applying ${x##*/}..." 1114 eerror "${1} is not a valid file/directory!"
1115 exit 1
238 fi 1116 fi
239 else 1117 else
240 einfo " ${x##*/}..." 1118 break
241 fi 1119 fi
1120 shift 1;;
1121 esac
1122 done
1123 if [[ ${funcname} == newicon ]] ; then
1124 newins "$@"
1125 fi
1126 ) || die
1127}
242 1128
243 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1129# @FUNCTION: doicon
244 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1130# @USAGE: [options] <icons>
1131# @DESCRIPTION:
1132# Install icon into the icon directory /usr/share/icons or into
1133# /usr/share/pixmaps if "--size" is not set.
1134# This is useful in conjunction with creating desktop/menu files.
1135#
1136# @CODE
1137# options:
1138# -s, --size
1139# !!! must specify to install into /usr/share/icons/... !!!
1140# size of the icon, like 48 or 48x48
1141# supported icon sizes are:
1142# 16 22 24 32 36 48 64 72 96 128 192 256 scalable
1143# -c, --context
1144# defaults to "apps"
1145# -t, --theme
1146# defaults to "hicolor"
1147#
1148# icons: list of icons
1149#
1150# example 1: doicon foobar.png fuqbar.svg suckbar.png
1151# results in: insinto /usr/share/pixmaps
1152# doins foobar.png fuqbar.svg suckbar.png
1153#
1154# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png
1155# results in: insinto /usr/share/icons/hicolor/48x48/apps
1156# doins foobar.png fuqbar.png blobbar.png
1157# @CODE
1158doicon() {
1159 _iconins ${FUNCNAME} "$@"
1160}
245 1161
246 # Allow for prefix to differ ... im lazy, so shoot me :/ 1162# @FUNCTION: newicon
247 while [ "${count}" -lt 5 ] 1163# @USAGE: [options] <icon> <newname>
248 do 1164# @DESCRIPTION:
249 # Generate some useful debug info ... 1165# Like doicon, install the specified icon as newname.
250 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1166#
251 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1167# @CODE
1168# example 1: newicon foobar.png NEWNAME.png
1169# results in: insinto /usr/share/pixmaps
1170# newins foobar.png NEWNAME.png
1171#
1172# example 2: newicon -s 48 foobar.png NEWNAME.png
1173# results in: insinto /usr/share/icons/hicolor/48x48/apps
1174# newins foobar.png NEWNAME.png
1175# @CODE
1176newicon() {
1177 _iconins ${FUNCNAME} "$@"
1178}
252 1179
253 if [ "${PATCH_SUFFIX}" != "patch" ] 1180# @FUNCTION: strip-linguas
254 then 1181# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
255 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1182# @DESCRIPTION:
256 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 1183# Make sure that LINGUAS only contains languages that
1184# a package can support. The first form allows you to
1185# specify a list of LINGUAS. The -i builds a list of po
1186# files found in all the directories and uses the
1187# intersection of the lists. The -u builds a list of po
1188# files found in all the directories and uses the union
1189# of the lists.
1190strip-linguas() {
1191 local ls newls nols
1192 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1193 local op=$1; shift
1194 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1195 local d f
1196 for d in "$@" ; do
1197 if [[ ${op} == "-u" ]] ; then
1198 newls=${ls}
1199 else
1200 newls=""
1201 fi
1202 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1203 if [[ ${op} == "-i" ]] ; then
1204 has ${f} ${ls} && newls="${newls} ${f}"
257 else 1205 else
258 PATCH_TARGET="${x}" 1206 has ${f} ${ls} || newls="${newls} ${f}"
259 fi 1207 fi
260
261 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
262 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263
264 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
265 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266
267 if [ "${PATCH_SUFFIX}" != "patch" ]
268 then
269 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
270 then
271 echo
272 eerror "Could not extract patch!"
273 #die "Could not extract patch!"
274 count=5
275 break
276 fi
277 fi
278
279 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
280 then
281 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286
287 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
288
289 if [ "$?" -ne 0 ]
290 then
291 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
292 echo
293 eerror "A dry-run of patch command succeeded, but actually"
294 eerror "applying the patch failed!"
295 #die "Real world sux compared to the dreamworld!"
296 count=5
297 fi
298
299 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
300
301 break
302 fi
303
304 count=$((count + 1))
305 done 1208 done
306 1209 ls=${newls}
307 if [ "${PATCH_SUFFIX}" != "patch" ] 1210 done
308 then 1211 else
309 rm -f ${PATCH_TARGET} 1212 ls="$@"
310 fi 1213 fi
311 1214
312 if [ "${count}" -eq 5 ] 1215 nols=""
313 then 1216 newls=""
314 echo 1217 for f in ${LINGUAS} ; do
315 eerror "Failed Patch: ${x##*/}!" 1218 if has ${f} ${ls} ; then
316 eerror 1219 newls="${newls} ${f}"
317 eerror "Include in your bugreport the contents of:" 1220 else
318 eerror 1221 nols="${nols} ${f}"
319 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}"
320 echo
321 die "Failed Patch: ${x##*/}!"
322 fi
323
324 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
325
326 eend 0
327 fi 1222 fi
328 done 1223 done
329 if [ "${SINGLE_PATCH}" = "no" ] 1224 [[ -n ${nols} ]] \
330 then 1225 && einfo "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
331 einfo "Done with patching" 1226 export LINGUAS=${newls:1}
332 fi
333} 1227}
334 1228
335# This function return true if we are using the NPTL pthreads 1229# @FUNCTION: preserve_old_lib
336# implementation. 1230# @USAGE: <libs to preserve> [more libs]
337# 1231# @DESCRIPTION:
338# <azarah@gentoo.org> (06 March 2003) 1232# These functions are useful when a lib in your package changes ABI SONAME.
339# 1233# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
340 1234# would break packages that link against it. Most people get around this
341have_NPTL() { 1235# by using the portage SLOT mechanism, but that is not always a relevant
342 1236# solution, so instead you can call this from pkg_preinst. See also the
343 cat > ${T}/test-nptl.c <<-"END" 1237# preserve_old_lib_notify function.
344 #define _XOPEN_SOURCE 1238preserve_old_lib() {
345 #include <unistd.h> 1239 _eutils_eprefix_init
346 #include <stdio.h> 1240 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
347 1241 eerror "preserve_old_lib() must be called from pkg_preinst() only"
348 int main() 1242 die "Invalid preserve_old_lib() usage"
349 {
350 char buf[255];
351 char *str = buf;
352
353 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
354 if (NULL != str) {
355 printf("%s\n", str);
356 if (NULL != strstr(str, "NPTL"))
357 return 0;
358 }
359
360 return 1;
361 }
362 END
363
364 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
365 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
366 then
367 echo "yes"
368 einfon "Checking what PTHREADS implementation we have ... "
369 if ${T}/nptl
370 then
371 return 0
372 else
373 return 1
374 fi 1243 fi
375 else 1244 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
376 echo "no"
377 fi
378 1245
379 return 1 1246 # let portage worry about it
380} 1247 has preserve-libs ${FEATURES} && return 0
381 1248
382# This function check how many cpu's are present, and then set 1249 local lib dir
383# -j in MAKEOPTS accordingly. 1250 for lib in "$@" ; do
384# 1251 [[ -e ${EROOT}/${lib} ]] || continue
385# Thanks to nall <nall@gentoo.org> for this. 1252 dir=${lib%/*}
386# 1253 dodir ${dir} || die "dodir ${dir} failed"
387get_number_of_jobs() { 1254 cp "${EROOT}"/${lib} "${ED}"/${lib} || die "cp ${lib} failed"
388 local jobs=0 1255 touch "${ED}"/${lib}
1256 done
1257}
389 1258
390 if [ ! -r /proc/cpuinfo ] 1259# @FUNCTION: preserve_old_lib_notify
391 then 1260# @USAGE: <libs to notify> [more libs]
392 return 1 1261# @DESCRIPTION:
393 fi 1262# Spit helpful messages about the libraries preserved by preserve_old_lib.
394 1263preserve_old_lib_notify() {
395 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565. 1264 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
396 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ] 1265 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
397 then 1266 die "Invalid preserve_old_lib_notify() usage"
398 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
399 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
400 ADMINPARAM="${ADMINPARAM/-j}"
401 fi
402
403 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
404
405 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
406 "${ARCH}" = "arm" -o "${ARCH}" = "mips" ]
407 then
408 # these archs will always have "[Pp]rocessor"
409 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
410
411 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
412 then
413 # sparc always has "ncpus active"
414 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
415
416 elif [ "${ARCH}" = "alpha" ]
417 then
418 # alpha has "cpus active", but only when compiled with SMP
419 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
420 then
421 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
422 else
423 jobs=2
424 fi 1267 fi
425 1268
426 elif [ "${ARCH}" = "ppc" ] 1269 # let portage worry about it
427 then 1270 has preserve-libs ${FEATURES} && return 0
428 # ppc has "processor", but only when compiled with SMP 1271
429 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 1272 _eutils_eprefix_init
430 then 1273
431 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 1274 local lib notice=0
432 else 1275 for lib in "$@" ; do
433 jobs=2 1276 [[ -e ${EROOT}/${lib} ]] || continue
434 fi 1277 if [[ ${notice} -eq 0 ]] ; then
435 else 1278 notice=1
436 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 1279 ewarn "Old versions of installed libraries were detected on your system."
437 die "Unknown ARCH -- ${ARCH}!" 1280 ewarn "In order to avoid breaking packages that depend on these old libs,"
1281 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1282 ewarn "in order to remove these old dependencies. If you do not have this"
1283 ewarn "helper program, simply emerge the 'gentoolkit' package."
1284 ewarn
438 fi 1285 fi
1286 ewarn " # revdep-rebuild --library '${lib}' && rm '${lib}'"
1287 done
1288}
439 1289
440 # Make sure the number is valid ... 1290# @FUNCTION: built_with_use
441 if [ "${jobs}" -lt 1 ] 1291# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
442 then 1292# @DESCRIPTION:
443 jobs=1 1293#
444 fi 1294# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
445 1295#
446 if [ -n "${ADMINPARAM}" ] 1296# A temporary hack until portage properly supports DEPENDing on USE
447 then 1297# flags being enabled in packages. This will check to see if the specified
448 if [ "${jobs}" -gt "${ADMINPARAM}" ] 1298# DEPEND atom was built with the specified list of USE flags. The
449 then 1299# --missing option controls the behavior if called on a package that does
450 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 1300# not actually support the defined USE flags (aka listed in IUSE).
451 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 1301# The default is to abort (call die). The -a and -o flags control
452 else 1302# the requirements of the USE flags. They correspond to "and" and "or"
453 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 1303# logic. So the -a flag means all listed USE flags must be enabled
454 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 1304# while the -o flag means at least one of the listed IUSE flags must be
1305# enabled. The --hidden option is really for internal use only as it
1306# means the USE flag we're checking is hidden expanded, so it won't be found
1307# in IUSE like normal USE flags.
1308#
1309# Remember that this function isn't terribly intelligent so order of optional
1310# flags matter.
1311built_with_use() {
1312 _eutils_eprefix_init
1313 local hidden="no"
1314 if [[ $1 == "--hidden" ]] ; then
1315 hidden="yes"
1316 shift
455 fi 1317 fi
456 fi
457}
458 1318
459# Simplify/standardize adding users to the system 1319 local missing_action="die"
460# vapier@gentoo.org 1320 if [[ $1 == "--missing" ]] ; then
461# 1321 missing_action=$2
462# enewuser(username, uid, shell, homedir, groups, extra options) 1322 shift ; shift
463# 1323 case ${missing_action} in
464# Default values if you do not specify any: 1324 true|false|die) ;;
465# username: REQUIRED ! 1325 *) die "unknown action '${missing_action}'";;
466# uid: next available (see useradd(8)) 1326 esac
467# note: pass -1 to get default behavior
468# shell: /bin/false
469# homedir: /dev/null
470# groups: none
471# extra: comment of 'added by portage for ${PN}'
472enewuser() {
473 # get the username
474 local euser="$1"; shift
475 if [ -z "${euser}" ] ; then
476 eerror "No username specified !"
477 die "Cannot call enewuser without a username"
478 fi
479
480 # setup a file for testing usernames/groups
481 local tmpfile="`mktemp -p ${T}`"
482 touch ${tmpfile}
483 chown ${euser} ${tmpfile} >& /dev/null
484 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
485
486 # see if user already exists
487 if [ "${euser}" == "${realuser}" ] ; then
488 return 0
489 fi
490 einfo "Adding user '${euser}' to your system ..."
491
492 # options to pass to useradd
493 local opts=""
494
495 # handle uid
496 local euid="$1"; shift
497 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] ; then
498 if [ ${euid} -gt 0 ] ; then
499 opts="${opts} -u ${euid}"
500 else
501 eerror "Userid given but is not greater than 0 !"
502 die "${euid} is not a valid UID"
503 fi 1327 fi
504 else
505 euid="next available"
506 fi
507 einfo " - Userid: ${euid}"
508 1328
509 # handle shell 1329 local opt=$1
510 local eshell="$1"; shift 1330 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
511 if [ ! -z "${eshell}" ] ; then 1331
512 if [ ! -e ${eshell} ] ; then 1332 local PKG=$(best_version $1)
513 eerror "A shell was specified but it does not exist !" 1333 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
514 die "${eshell} does not exist" 1334 shift
1335
1336 local USEFILE=${EROOT}/var/db/pkg/${PKG}/USE
1337 local IUSEFILE=${EROOT}/var/db/pkg/${PKG}/IUSE
1338
1339 # if the IUSE file doesn't exist, the read will error out, we need to handle
1340 # this gracefully
1341 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1342 case ${missing_action} in
1343 true) return 0;;
1344 false) return 1;;
1345 die) die "Unable to determine what USE flags $PKG was built with";;
1346 esac
515 fi 1347 fi
516 else
517 eshell=/bin/false
518 fi
519 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}"
521 1348
522 # handle homedir 1349 if [[ ${hidden} == "no" ]] ; then
523 local ehome="$1"; shift 1350 local IUSE_BUILT=( $(<"${IUSEFILE}") )
524 if [ -z "${ehome}" ] ; then 1351 # Don't check USE_EXPAND #147237
525 ehome=/dev/null 1352 local expand
526 fi 1353 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
527 einfo " - Home: ${ehome}" 1354 if [[ $1 == ${expand}_* ]] ; then
528 opts="${opts} -d ${ehome}" 1355 expand=""
529 1356 break
530 # handle groups
531 local egroups="$1"; shift
532 if [ ! -z "${egroups}" ] ; then
533 local realgroup
534 local oldifs="${IFS}"
535 export IFS=","
536 for g in ${egroups} ; do
537 chgrp ${g} ${tmpfile} >& /dev/null
538 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
539 if [ "${g}" != "${realgroup}" ] ; then
540 eerror "You must add ${g} to the system first"
541 die "${g} is not a valid GID"
542 fi 1357 fi
543 done 1358 done
544 export IFS="${oldifs}" 1359 if [[ -n ${expand} ]] ; then
545 opts="${opts} -g ${egroups}" 1360 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1361 case ${missing_action} in
1362 true) return 0;;
1363 false) return 1;;
1364 die) die "$PKG does not actually support the $1 USE flag!";;
1365 esac
1366 fi
1367 fi
1368 fi
1369
1370 local USE_BUILT=$(<${USEFILE})
1371 while [[ $# -gt 0 ]] ; do
1372 if [[ ${opt} = "-o" ]] ; then
1373 has $1 ${USE_BUILT} && return 0
1374 else
1375 has $1 ${USE_BUILT} || return 1
1376 fi
1377 shift
1378 done
1379 [[ ${opt} = "-a" ]]
1380}
1381
1382# @FUNCTION: epunt_cxx
1383# @USAGE: [dir to scan]
1384# @DESCRIPTION:
1385# Many configure scripts wrongly bail when a C++ compiler could not be
1386# detected. If dir is not specified, then it defaults to ${S}.
1387#
1388# http://bugs.gentoo.org/73450
1389epunt_cxx() {
1390 local dir=$1
1391 [[ -z ${dir} ]] && dir=${S}
1392 ebegin "Removing useless C++ checks"
1393 local f p any_found
1394 while IFS= read -r -d '' f; do
1395 for p in "${PORTDIR}"/eclass/ELT-patches/nocxx/*.patch ; do
1396 if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then
1397 any_found=1
1398 break
1399 fi
1400 done
1401 done < <(find "${dir}" -name configure -print0)
1402
1403 if [[ -z ${any_found} ]]; then
1404 eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
1405 fi
1406 eend 0
1407}
1408
1409# @FUNCTION: make_wrapper
1410# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1411# @DESCRIPTION:
1412# Create a shell wrapper script named wrapper in installpath
1413# (defaults to the bindir) to execute target (default of wrapper) by
1414# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1415# libpaths followed by optionally changing directory to chdir.
1416make_wrapper() {
1417 _eutils_eprefix_init
1418 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1419 local tmpwrapper=$(emktemp)
1420
1421 (
1422 echo '#!/bin/sh'
1423 [[ -n ${chdir} ]] && printf 'cd "%s"\n' "${EPREFIX}${chdir}"
1424 if [[ -n ${libdir} ]] ; then
1425 local var
1426 if [[ ${CHOST} == *-darwin* ]] ; then
1427 var=DYLD_LIBRARY_PATH
1428 else
1429 var=LD_LIBRARY_PATH
1430 fi
1431 cat <<-EOF
1432 if [ "\${${var}+set}" = "set" ] ; then
1433 export ${var}="\${${var}}:${EPREFIX}${libdir}"
1434 else
1435 export ${var}="${EPREFIX}${libdir}"
1436 fi
1437 EOF
1438 fi
1439 # We don't want to quote ${bin} so that people can pass complex
1440 # things as ${bin} ... "./someprog --args"
1441 printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}\/}"
1442 ) > "${tmpwrapper}"
1443 chmod go+rx "${tmpwrapper}"
1444
1445 if [[ -n ${path} ]] ; then
1446 (
1447 exeinto "${path}"
1448 newexe "${tmpwrapper}" "${wrapper}"
1449 ) || die
546 else 1450 else
547 egroups="(none)" 1451 newbin "${tmpwrapper}" "${wrapper}" || die
548 fi
549 einfo " - Groups: ${egroups}"
550
551 # handle extra and add the user
552 local eextra="$@"
553 local oldsandbox=${SANDBOX_ON}
554 export SANDBOX_ON="0"
555 if [ -z "${eextra}" ] ; then
556 useradd ${opts} ${euser} \
557 -c "added by portage for ${PN}" \
558 || die "enewuser failed"
559 else
560 einfo " - Extra: ${eextra}"
561 useradd ${opts} ${euser} ${eextra} \
562 || die "enewuser failed"
563 fi
564 export SANDBOX_ON="${oldsandbox}"
565
566 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then
567 einfo " - Creating ${ehome} in ${D}"
568 dodir ${ehome}
569 fowners ${euser} ${ehome}
570 fperms 755 ${ehome}
571 fi
572}
573
574# Simplify/standardize adding groups to the system
575# vapier@gentoo.org
576#
577# enewgroup(group, gid)
578#
579# Default values if you do not specify any:
580# groupname: REQUIRED !
581# gid: next available (see groupadd(8))
582# extra: none
583enewgroup() {
584 # get the group
585 local egroup="$1"; shift
586 if [ -z "${egroup}" ] ; then
587 eerror "No group specified !"
588 die "Cannot call enewgroup without a group"
589 fi
590
591 # setup a file for testing groupname
592 local tmpfile="`mktemp -p ${T}`"
593 touch ${tmpfile}
594 chgrp ${egroup} ${tmpfile} >& /dev/null
595 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
596
597 # see if group already exists
598 if [ "${egroup}" == "${realgroup}" ] ; then
599 return 0
600 fi
601 einfo "Adding group '${egroup}' to your system ..."
602
603 # options to pass to useradd
604 local opts=""
605
606 # handle gid
607 local egid="$1"; shift
608 if [ ! -z "${egid}" ] ; then
609 if [ ${egid} -gt 0 ] ; then
610 opts="${opts} -g ${egid}"
611 else
612 eerror "Groupid given but is not greater than 0 !"
613 die "${egid} is not a valid GID"
614 fi 1452 fi
615 else
616 egid="next available"
617 fi
618 einfo " - Groupid: ${egid}"
619
620 # handle extra
621 local eextra="$@"
622 opts="${opts} ${eextra}"
623
624 # add the group
625 local oldsandbox=${SANDBOX_ON}
626 export SANDBOX_ON="0"
627 groupadd ${opts} ${egroup} || die "enewgroup failed"
628 export SANDBOX_ON="${oldsandbox}"
629} 1453}
630 1454
631# Simple script to replace 'dos2unix' binaries 1455# @FUNCTION: path_exists
632# vapier@gentoo.org 1456# @USAGE: [-a|-o] <paths>
633# 1457# @DESCRIPTION:
634# edos2unix(file, <more files>...) 1458# Check if the specified paths exist. Works for all types of paths
635edos2unix() { 1459# (files/dirs/etc...). The -a and -o flags control the requirements
1460# of the paths. They correspond to "and" and "or" logic. So the -a
1461# flag means all the paths must exist while the -o flag means at least
1462# one of the paths must exist. The default behavior is "and". If no
1463# paths are specified, then the return value is "false".
1464path_exists() {
1465 local opt=$1
1466 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1467
1468 # no paths -> return false
1469 # same behavior as: [[ -e "" ]]
1470 [[ $# -eq 0 ]] && return 1
1471
1472 local p r=0
636 for f in $@ ; do 1473 for p in "$@" ; do
637 cp ${f} ${T}/edos2unix 1474 [[ -e ${p} ]]
638 sed 's/\r$//' ${T}/edos2unix > ${f} 1475 : $(( r += $? ))
639 done 1476 done
640}
641 1477
642# Make a desktop file ! 1478 case ${opt} in
643# Great for making those icons in kde/gnome startmenu ! 1479 -a) return $(( r != 0 )) ;;
644# Amaze your friends ! Get the women ! Join today ! 1480 -o) return $(( r == $# )) ;;
645# gnome2 /usr/share/applications
646# gnome1 /usr/share/gnome/apps/
647# KDE ${KDEDIR}/share/applnk /usr/share/applnk
648#
649# make_desktop_entry(<binary>, [name], [icon], [type], [path])
650#
651# binary: what binary does the app run with ?
652# name: the name that will show up in the menu
653# icon: give your little like a pretty little icon ...
654# this can be relative (to /usr/share/pixmaps) or
655# a full path to an icon
656# type: what kind of application is this ? for categories:
657# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html
658# path: if your app needs to startup in a specific dir
659make_desktop_entry() {
660 [ -z "$1" ] && eerror "You must specify the executable" && return 1
661
662 local exec=${1}
663 local name=${2:-${PN}}
664 local icon=${3:-${PN}.png}
665 local type=${4}
666 local path=${5:-${GAMES_PREFIX}}
667 if [ -z "${type}" ] ; then
668 case ${CATEGORY} in
669 app-emulation) type=Emulator ;;
670 app-games) type=Game ;;
671 *) type="" ;;
672 esac 1481 esac
1482}
1483
1484# @FUNCTION: in_iuse
1485# @USAGE: <flag>
1486# @DESCRIPTION:
1487# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
1488# as necessary.
1489#
1490# Note that this function should not be used in the global scope.
1491in_iuse() {
1492 debug-print-function ${FUNCNAME} "${@}"
1493 [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
1494
1495 local flag=${1}
1496 local liuse=( ${IUSE} )
1497
1498 has "${flag}" "${liuse[@]#[+-]}"
1499}
1500
1501# @FUNCTION: use_if_iuse
1502# @USAGE: <flag>
1503# @DESCRIPTION:
1504# Return true if the given flag is in USE and IUSE.
1505#
1506# Note that this function should not be used in the global scope.
1507use_if_iuse() {
1508 in_iuse $1 || return 1
1509 use $1
1510}
1511
1512# @FUNCTION: usex
1513# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
1514# @DESCRIPTION:
1515# Proxy to declare usex for package managers or EAPIs that do not provide it
1516# and use the package manager implementation when available (i.e. EAPI >= 5).
1517# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
1518# otherwise echo [false output][false suffix] (defaults to "no").
1519if has "${EAPI:-0}" 0 1 2 3 4; then
1520 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
673 fi 1521fi
674 local desktop=${T}/${exec}.desktop
675 1522
676echo "[Desktop Entry] 1523# @FUNCTION: prune_libtool_files
677Encoding=UTF-8 1524# @USAGE: [--all|--modules]
678Version=0.9.2 1525# @DESCRIPTION:
679Name=${name} 1526# Locate unnecessary libtool files (.la) and libtool static archives
680Type=Application 1527# (.a) and remove them from installation image.
681Comment=${DESCRIPTION} 1528#
682Exec=${exec} 1529# By default, .la files are removed whenever the static linkage can
683Path=${path} 1530# either be performed using pkg-config or doesn't introduce additional
684Icon=${icon} 1531# flags.
685Categories=Application;${type};" > ${desktop} 1532#
686 1533# If '--modules' argument is passed, .la files for modules (plugins) are
687 if [ -d /usr/share/applications ] ; then 1534# removed as well. This is usually useful when the package installs
688 insinto /usr/share/applications 1535# plugins and the plugin loader does not use .la files.
689 doins ${desktop} 1536#
690 fi 1537# If '--all' argument is passed, all .la files are removed without
691 1538# performing any heuristic on them. You shouldn't ever use that,
692 #if [ -d /usr/share/gnome/apps ] ; then 1539# and instead report a bug in the algorithm instead.
693 # insinto /usr/share/gnome/apps/Games 1540#
694 # doins ${desktop} 1541# The .a files are only removed whenever corresponding .la files state
695 #fi 1542# that they should not be linked to, i.e. whenever these files
696 1543# correspond to plugins.
697 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] ; then 1544#
698 # for ver in /usr/kde/* ; do 1545# Note: if your package installs both static libraries and .pc files
699 # insinto ${ver}/share/applnk/Games 1546# which use variable substitution for -l flags, you need to add
700 # doins ${desktop} 1547# pkg-config to your DEPEND.
701 # done 1548prune_libtool_files() {
702 #fi
703
704 if [ -d /usr/share/applnk ] ; then
705 insinto /usr/share/applnk/${type}
706 doins ${desktop}
707 fi
708
709 return 0
710}
711
712# new convenience patch wrapper function to eventually replace epatch(),
713# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and
714# /usr/bin/patch
715# Features:
716# - bulk patch handling similar to epatch()'s
717# - automatic patch level detection like epatch()'s
718# - automatic patch uncompression like epatch()'s
719# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
720# manually instead
721# - once I decide it's production-ready, it'll be called from base_src_unpack
722# to handle $PATCHES to avoid defining src_unpack just to use xpatch
723
724# accepts zero or more parameters specifying patchfiles and/or patchdirs
725
726# known issues:
727# - only supports unified style patches (does anyone _really_ use anything
728# else?)
729# - because it doesn't use --dry-run there is a risk of it failing
730# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
731# any of the backup heuristics that patch employs to discover a filename.
732# however, this isn't dangerous because if it works for the developer who's
733# writing the ebuild, it'll always work for the users, and if it doesn't,
734# then we'll fix it :-)
735# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
736xpatch() {
737
738 debug-print-function $FUNCNAME $* 1549 debug-print-function ${FUNCNAME} "$@"
739 1550
740 local list="" 1551 local removing_all removing_modules opt
741 local list2="" 1552 _eutils_eprefix_init
742 declare -i plevel 1553 for opt; do
743
744 # parse patch sources
745 for x in $*; do
746 debug-print "$FUNCNAME: parsing parameter $x"
747 if [ -f "$x" ]; then
748 list="$list $x"
749 elif [ -d "$x" ]; then
750 # handles patchdirs like epatch() for now: no recursion.
751 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
752 # only patches with _$ARCH_ or _all_ in their filenames are applied.
753 for file in `ls -A $x`; do
754 debug-print "$FUNCNAME: parsing in subdir: file $file"
755 if [ -f "$x/$file" ] && [ "${file}" != "${file/_all_}" -o "${file}" != "${file/_$ARCH_}" ]; then
756 list2="$list2 $x/$file"
757 fi
758 done
759 list="`echo $list2 | sort` $list"
760 else
761 die "Couldn't find $x"
762 fi
763 done
764
765 debug-print "$FUNCNAME: final list of patches: $list"
766
767 for x in $list; do
768 debug-print "$FUNCNAME: processing $x"
769 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
770 case "`/usr/bin/file -b $x`" in
771 *gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";;
772 *bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";;
773 *text*) patchfile="$x";;
774 *) die "Could not determine filetype of patch $x";;
775 esac
776 debug-print "$FUNCNAME: patchfile=$patchfile"
777
778 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
779 target="`/bin/grep -m 1 '^+++ ' $patchfile`"
780 debug-print "$FUNCNAME: raw target=$target"
781 # strip target down to the path/filename, remove leading +++
782 target="${target/+++ }"; target="${target%% *}"
783 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
784 # to discard them as well to calculate the correct patchlevel.
785 target="${target//\/\//\/}"
786 debug-print "$FUNCNAME: stripped target=$target"
787
788 # look for target
789 for basedir in "$S" "$WORKDIR" "${PWD}"; do
790 debug-print "$FUNCNAME: looking in basedir=$basedir"
791 cd "$basedir"
792
793 # try stripping leading directories
794 target2="$target"
795 plevel=0
796 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
797 while [ ! -f "$target2" ]; do
798 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
799 plevel=plevel+1
800 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
801 [ "$target2" == "${target2/\/}" ] && break
802 done
803 test -f "$target2" && break
804
805 # try stripping filename - needed to support patches creating new files
806 target2="${target%/*}"
807 plevel=0
808 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
809 while [ ! -d "$target2" ]; do
810 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
811 plevel=plevel+1
812 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
813 [ "$target2" == "${target2/\/}" ] && break
814 done
815 test -d "$target2" && break
816
817 done
818
819 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" || die "Could not determine patchlevel for $x"
820 debug-print "$FUNCNAME: determined plevel=$plevel"
821 # do the patching
822 ebegin "Applying patch ${x##*/}..."
823 /usr/bin/patch -p$plevel < "$patchfile" > /dev/null || die "Failed to apply patch $x"
824 eend $?
825
826 done
827
828}
829
830# Unpack those pesky makeself generated files ...
831# They're shell scripts with the binary package tagged onto
832# the end of the archive. Loki utilized the format as does
833# many other game companies.
834#
835# Usage: unpack_makeself [file to unpack] [offset]
836# - If the file is not specified then unpack will utilize ${A}.
837# - If the offset is not specified then we will attempt to extract
838# the proper offset from the script itself.
839unpack_makeself() {
840 local src=$1
841 local skip=$2
842
843 [ -z "${src}" ] && src=${A}
844 [ -e ./${src} ] \
845 && src=${PWD}/${src} \
846 || src=${DISTDIR}/${src}
847 local shrtsrc=`basename ${src}`
848 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
849 if [ -z "${skip}" ] ; then
850 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
851 local skip=0
852 case ${ver} in 1554 case "${opt}" in
853 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1555 --all)
854 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1556 removing_all=1
1557 removing_modules=1
855 ;; 1558 ;;
856 2.0|2.0.1) 1559 --modules)
857 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1560 removing_modules=1
858 ;;
859 2.1.1)
860 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-`
861 let skip="skip + 1"
862 ;; 1561 ;;
863 *) 1562 *)
864 eerror "I'm sorry, but I was unable to support the Makeself file." 1563 die "Invalid argument to ${FUNCNAME}(): ${opt}"
865 eerror "The version I detected was '${ver}'."
866 eerror "Please file a bug about the file ${shrtsrc} at"
867 eerror "http://bugs.gentoo.org/ so that support can be added."
868 die "makeself version '${ver}' not supported"
869 ;;
870 esac 1564 esac
871 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1565 done
1566
1567 local f
1568 local queue=()
1569 while IFS= read -r -d '' f; do # for all .la files
1570 local archivefile=${f/%.la/.a}
1571
1572 # The following check is done by libtool itself.
1573 # It helps us avoid removing random files which match '*.la',
1574 # see bug #468380.
1575 if ! sed -n -e '/^# Generated by .*libtool/q0;4q1' "${f}"; then
1576 continue
872 fi 1577 fi
873 1578
874 # we do this because otherwise a failure in gzip will cause 0 bytes to be sent 1579 [[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
875 # to tar which will make tar not extract anything and exit with 0 1580 local reason pkgconfig_scanned
876 local out="`(tail +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f -) 2>&1`" 1581 local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}")
877 if [ ! -z "${out}" ] ; then 1582
878 # maybe it isnt gzipped ... they usually are, but not always ... 1583 if [[ ${snotlink} == yes ]]; then
879 tail +${skip} ${src} | tar -x --no-same-owner -f - \ 1584
880 || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" 1585 # Remove static libs we're not supposed to link against.
1586 if [[ -f ${archivefile} ]]; then
1587 einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)"
1588 queue+=( "${archivefile}" )
1589 fi
1590
1591 # The .la file may be used by a module loader, so avoid removing it
1592 # unless explicitly requested.
1593 if [[ ${removing_modules} ]]; then
1594 reason='module'
1595 fi
1596
1597 else
1598
1599 # Remove .la files when:
1600 # - user explicitly wants us to remove all .la files,
1601 # - respective static archive doesn't exist,
1602 # - they are covered by a .pc file already,
1603 # - they don't provide any new information (no libs & no flags).
1604
1605 if [[ ${removing_all} ]]; then
1606 reason='requested'
1607 elif [[ ! -f ${archivefile} ]]; then
1608 reason='no static archive'
1609 elif [[ ! $(sed -nre \
1610 "s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \
1611 "${f}") ]]; then
1612 reason='no libs & flags'
1613 else
1614 if [[ ! ${pkgconfig_scanned} ]]; then
1615 # Create a list of all .pc-covered libs.
1616 local pc_libs=()
1617 if [[ ! ${removing_all} ]]; then
1618 local pc
1619 local tf=${T}/prune-lt-files.pc
1620 local pkgconf=$(tc-getPKG_CONFIG)
1621
1622 while IFS= read -r -d '' pc; do # for all .pc files
1623 local arg libs
1624
1625 # Use pkg-config if available (and works),
1626 # fallback to sed.
1627 if ${pkgconf} --exists "${pc}" &>/dev/null; then
1628 sed -e '/^Requires:/d' "${pc}" > "${tf}"
1629 libs=$(${pkgconf} --libs "${tf}")
1630 else
1631 libs=$(sed -ne 's/^Libs://p' "${pc}")
1632 fi
1633
1634 for arg in ${libs}; do
1635 if [[ ${arg} == -l* ]]; then
1636 if [[ ${arg} == '*$*' ]]; then
1637 eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
1638 eqawarn "(arg: ${arg})"
1639 eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
1640 fi
1641
1642 pc_libs+=( lib${arg#-l}.la )
1643 fi
1644 done
1645 done < <(find "${D}" -type f -name '*.pc' -print0)
1646
1647 rm -f "${tf}"
1648 fi
1649
1650 pkgconfig_scanned=1
1651 fi # pkgconfig_scanned
1652
1653 has "${f##*/}" "${pc_libs[@]}" && reason='covered by .pc'
1654 fi # removal due to .pc
1655
1656 fi # shouldnotlink==no
1657
1658 if [[ ${reason} ]]; then
1659 einfo "Removing unnecessary ${f#${D%/}} (${reason})"
1660 queue+=( "${f}" )
881 fi 1661 fi
1662 done < <(find "${ED}" -xtype f -name '*.la' -print0)
1663
1664 if [[ ${queue[@]} ]]; then
1665 rm -f "${queue[@]}"
1666 fi
882} 1667}
1668
1669# @FUNCTION: einstalldocs
1670# @DESCRIPTION:
1671# Install documentation using DOCS and HTML_DOCS.
1672#
1673# If DOCS is declared and non-empty, all files listed in it are
1674# installed. The files must exist, otherwise the function will fail.
1675# In EAPI 4 and subsequent EAPIs DOCS may specify directories as well,
1676# in other EAPIs using directories is unsupported.
1677#
1678# If DOCS is not declared, the files matching patterns given
1679# in the default EAPI implementation of src_install will be installed.
1680# If this is undesired, DOCS can be set to empty value to prevent any
1681# documentation from being installed.
1682#
1683# If HTML_DOCS is declared and non-empty, all files and/or directories
1684# listed in it are installed as HTML docs (using dohtml).
1685#
1686# Both DOCS and HTML_DOCS can either be an array or a whitespace-
1687# separated list. Whenever directories are allowed, '<directory>/.' may
1688# be specified in order to install all files within the directory
1689# without creating a sub-directory in docdir.
1690#
1691# Passing additional options to dodoc and dohtml is not supported.
1692# If you needed such a thing, you need to call those helpers explicitly.
1693einstalldocs() {
1694 debug-print-function ${FUNCNAME} "${@}"
1695
1696 local dodoc_opts=-r
1697 has ${EAPI} 0 1 2 3 && dodoc_opts=
1698
1699 if ! declare -p DOCS &>/dev/null ; then
1700 local d
1701 for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
1702 THANKS BUGS FAQ CREDITS CHANGELOG ; do
1703 if [[ -s ${d} ]] ; then
1704 dodoc "${d}" || die
1705 fi
1706 done
1707 elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
1708 if [[ ${DOCS[@]} ]] ; then
1709 dodoc ${dodoc_opts} "${DOCS[@]}" || die
1710 fi
1711 else
1712 if [[ ${DOCS} ]] ; then
1713 dodoc ${dodoc_opts} ${DOCS} || die
1714 fi
1715 fi
1716
1717 if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
1718 if [[ ${HTML_DOCS[@]} ]] ; then
1719 dohtml -r "${HTML_DOCS[@]}" || die
1720 fi
1721 else
1722 if [[ ${HTML_DOCS} ]] ; then
1723 dohtml -r ${HTML_DOCS} || die
1724 fi
1725 fi
1726
1727 return 0
1728}
1729
1730check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
1731
1732# @FUNCTION: optfeature
1733# @USAGE: <short description> <package atom to match> [other atoms]
1734# @DESCRIPTION:
1735# Print out a message suggesting an optional package (or packages) which
1736# provide the described functionality
1737#
1738# The following snippet would suggest app-misc/foo for optional foo support,
1739# app-misc/bar or app-misc/baz[bar] for optional bar support
1740# and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
1741# @CODE:
1742# optfeature "foo support" app-misc/foo
1743# optfeature "bar support" app-misc/bar app-misc/baz[bar]
1744# optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
1745#
1746optfeature() {
1747 debug-print-function ${FUNCNAME} "$@"
1748 local i j msg
1749 local desc=$1
1750 local flag=0
1751 shift
1752 for i; do
1753 for j in $i; do
1754 if has_version "$j"; then
1755 flag=1
1756 else
1757 flag=0
1758 break
1759 fi
1760 done
1761 if [[ $flag -eq 1 ]]; then
1762 break
1763 fi
1764 done
1765 if [[ $flag -eq 0 ]]; then
1766 for i; do
1767 msg=" "
1768 for j in $i; do
1769 msg="${msg} ${j} and"
1770 done
1771 msg="${msg:0: -4} for ${desc}"
1772 elog "${msg}"
1773 done
1774 fi
1775}
1776
1777fi

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.432

  ViewVC Help
Powered by ViewVC 1.1.20