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

Diff of /eclass/eutils.eclass

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

Revision 1.128 Revision 1.374
1# Copyright 1999-2004 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.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.374 2011/12/17 03:57:38 reavertm 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:
7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION:
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
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.
14#
15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass!
14 17
15DEPEND="!bootstrap? ( sys-devel/patch )" 18if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
19___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
20
21inherit multilib portability user
16 22
17DESCRIPTION="Based on the ${ECLASS} eclass" 23DESCRIPTION="Based on the ${ECLASS} eclass"
18 24
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 25if has "${EAPI:-0}" 0 1 2; then
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 26
21# outputting to a terminal, don't wait. For compatability purposes, the argument 27# @FUNCTION: epause
22# must be an integer greater than zero. 28# @USAGE: [seconds]
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 29# @DESCRIPTION:
30# Sleep for the specified number of seconds (default of 5 seconds). Useful when
31# printing a message the user should probably be reading and often used in
32# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
33# don't wait at all. Defined in EAPIs 0 1 and 2.
24epause() { 34epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 35 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 36}
29 37
30# Beep the specified number of times (defaults to five). If our output 38# @FUNCTION: ebeep
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 39# @USAGE: [number of beeps]
32# don't beep. 40# @DESCRIPTION:
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 41# Issue the specified number of beeps (default of 5 beeps). Useful when
42# printing a message the user should probably be reading and often used in
43# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
44# don't beep at all. Defined in EAPIs 0 1 and 2.
34ebeep() { 45ebeep() {
35 local n 46 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 47 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 48 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 49 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 50 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 51 echo -ne "\a"
41 sleep 1 52 sleep 1
42 done 53 done
43 fi 54 fi
44} 55}
45 56
46# This function simply returns the desired lib directory. With portage 57else
47# 2.0.51, we now have support for installing libraries to lib32/lib64 58
48# to accomidate the needs of multilib systems. It's no longer a good idea 59ebeep() {
49# to assume all libraries will end up in lib. Replace any (sane) instances 60 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
50# where lib is named directly with $(get_libdir) if possible. 61}
62
63epause() {
64 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
65}
66
67fi
68
69# @FUNCTION: eqawarn
70# @USAGE: [message]
71# @DESCRIPTION:
72# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
73# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
74# profile.
75if ! declare -F eqawarn >/dev/null ; then
76 eqawarn() {
77 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
78 :
79 }
80fi
81
82# @FUNCTION: ecvs_clean
83# @USAGE: [list of dirs]
84# @DESCRIPTION:
85# Remove CVS directories recursiveley. Useful when a source tarball contains
86# internal CVS directories. Defaults to $PWD.
87ecvs_clean() {
88 [[ -z $* ]] && set -- .
89 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
90 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
91}
92
93# @FUNCTION: esvn_clean
94# @USAGE: [list of dirs]
95# @DESCRIPTION:
96# Remove .svn directories recursiveley. Useful when a source tarball contains
97# internal Subversion directories. Defaults to $PWD.
98esvn_clean() {
99 [[ -z $* ]] && set -- .
100 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
101}
102
103# @FUNCTION: estack_push
104# @USAGE: <stack> [items to push]
105# @DESCRIPTION:
106# Push any number of items onto the specified stack. Pick a name that
107# is a valid variable (i.e. stick to alphanumerics), and push as many
108# items as you like onto the stack at once.
51# 109#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 110# The following code snippet will echo 5, then 4, then 3, then ...
53# 111# @CODE
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 112# estack_push mystack 1 2 3 4 5
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 113# while estack_pop mystack i ; do
56# fall back on old behavior. Any profile that has these set should also 114# echo "${i}"
57# depend on a newer version of portage (not yet released) which uses these 115# done
58# over CONF_LIBDIR in econf, dolib, etc... 116# @CODE
59# 117estack_push() {
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it 118 [[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments"
61# is still in testing. 119 local stack_name="__ESTACK_$1__" ; shift
62get_libdir() { 120 eval ${stack_name}+=\( \"\$@\" \)
63 LIBDIR_TEST=$(type econf) 121}
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 122
65 # if there is an override, we want to use that... always. 123# @FUNCTION: estack_pop
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 124# @USAGE: <stack> [variable]
67 # We don't need to know the verison of portage. We only need to know 125# @DESCRIPTION:
68 # if there is support for CONF_LIBDIR in econf and co. 126# Pop a single item off the specified stack. If a variable is specified,
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 127# the popped item is stored there. If no more items are available, return
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 128# 1, else return 0. See estack_push for more info.
71 # # and if there isnt an override, and we're using a version of 129estack_pop() {
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib 130 [[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments"
73 # # and friends from portage 2.0.50 wont be too happy otherwise. 131
74 # CONF_LIBDIR="lib" 132 # We use the fugly __estack_xxx var names to avoid collision with
133 # passing back the return value. If we used "local i" and the
134 # caller ran `estack_pop ... i`, we'd end up setting the local
135 # copy of "i" rather than the caller's copy. The __estack_xxx
136 # garbage is preferable to using $1/$2 everywhere as that is a
137 # bit harder to read.
138 local __estack_name="__ESTACK_$1__" ; shift
139 local __estack_retvar=$1 ; shift
140 eval local __estack_i=\${#${__estack_name}[@]}
141 # Don't warn -- let the caller interpret this as a failure
142 # or as normal behavior (akin to `shift`)
143 [[ $(( --__estack_i )) -eq -1 ]] && return 1
144
145 if [[ -n ${__estack_retvar} ]] ; then
146 eval ${__estack_retvar}=\"\${${__estack_name}[${__estack_i}]}\"
75 #fi 147 fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach... 148 eval unset ${__estack_name}[${__estack_i}]
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85} 149}
86 150
87get_multilibdir() { 151# @FUNCTION: eshopts_push
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib" 152# @USAGE: [options to `set` or `shopt`]
89 echo ${CONF_MULTILIBDIR:=lib32} 153# @DESCRIPTION:
90} 154# Often times code will want to enable a shell option to change code behavior.
91 155# Since changing shell options can easily break other pieces of code (which
92# Sometimes you need to override the value returned by get_libdir. A good 156# assume the default state), eshopts_push is used to (1) push the current shell
93# example of this is xorg-x11, where lib32 isnt a supported configuration, 157# options onto a stack and (2) pass the specified arguments to set.
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99# 158#
100# get_libdir_override lib64 159# If the first argument is '-s' or '-u', we assume you want to call `shopt`
160# rather than `set` as there are some options only available via that.
101# 161#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 162# A common example is to disable shell globbing so that special meaning/care
103get_libdir_override() { 163# may be used with variables/arguments to custom functions. That would be:
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..." 164# @CODE
105 CONF_LIBDIR="$1" 165# eshopts_push -o noglob
106 CONF_LIBDIR_OVERRIDE="$1" 166# for x in ${foo} ; do
107} 167# if ...some check... ; then
108 168# eshopts_pop
109# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have
111# the .so in /lib, and the .a in /usr/lib. What happens is that
112# in some cases when linking dynamic, the .a in /usr/lib is used
113# instead of the .so in /lib due to gcc/libtool tweaking ld's
114# library search path. This cause many builds to fail.
115# See bug #4411 for more info.
116#
117# To use, simply call:
118#
119# gen_usr_ldscript libfoo.so
120#
121# Note that you should in general use the unversioned name of
122# the library, as ldconfig should usually update it correctly
123# to point to the latest version of the library present.
124#
125# <azarah@gentoo.org> (26 Oct 2002)
126#
127gen_usr_ldscript() {
128 local libdir="$(get_libdir)"
129 # Just make sure it exists
130 dodir /usr/${libdir}
131
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
133/* GNU ld script
134 Because Gentoo have critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we
136 need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for
139 more info. */
140GROUP ( /${libdir}/${1} )
141END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}"
143}
144
145# Simple function to draw a line consisting of '=' the same length as $*
146#
147# <azarah@gentoo.org> (11 Nov 2002)
148#
149draw_line() {
150 local i=0
151 local str_length=""
152
153 # Handle calls that do not have args, or wc not being installed ...
154 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
155 then
156 echo "==============================================================="
157 return 0 169# return 0
158 fi 170# fi
159
160 # Get the length of $*
161 str_length="$(echo -n "$*" | wc -m)"
162
163 while [ "$i" -lt "${str_length}" ]
164 do
165 echo -n "="
166
167 i=$((i + 1))
168 done 171# done
169 172# eshopts_pop
170 echo 173# @CODE
171 174eshopts_push() {
172 return 0 175 # have to assume __ESHOPTS_SAVE__ isn't screwed with
176 # as a `declare -a` here will reset its value
177 local i=${#__ESHOPTS_SAVE__[@]}
178 if [[ $1 == -[su] ]] ; then
179 __ESHOPTS_SAVE__[$i]=$(shopt -p)
180 [[ $# -eq 0 ]] && return 0
181 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
182 else
183 __ESHOPTS_SAVE__[$i]=$-
184 [[ $# -eq 0 ]] && return 0
185 set "$@" || die "eshopts_push: bad options to set: $*"
186 fi
173} 187}
174 188
175# Default directory where patches are located 189# @FUNCTION: eshopts_pop
190# @USAGE:
191# @DESCRIPTION:
192# Restore the shell options to the state saved with the corresponding
193# eshopts_push call. See that function for more details.
194eshopts_pop() {
195 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
196 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
197 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
198 local s=${__ESHOPTS_SAVE__[$i]}
199 unset __ESHOPTS_SAVE__[$i]
200 if [[ ${s} == "shopt -"* ]] ; then
201 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
202 else
203 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
204 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
205 fi
206}
207
208# @FUNCTION: eumask_push
209# @USAGE: <new umask>
210# @DESCRIPTION:
211# Set the umask to the new value specified while saving the previous
212# value onto a stack. Useful for temporarily changing the umask.
213eumask_push() {
214 estack_push eumask "$(umask)"
215 umask "$@" || die "${FUNCNAME}: bad options to umask: $*"
216}
217
218# @FUNCTION: eumask_pop
219# @USAGE:
220# @DESCRIPTION:
221# Restore the previous umask state.
222eumask_pop() {
223 local s
224 estack_pop eumask s || die "${FUNCNAME}: unbalanced push"
225 umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}"
226}
227
228# @VARIABLE: EPATCH_SOURCE
229# @DESCRIPTION:
230# Default directory to search for patches.
176EPATCH_SOURCE="${WORKDIR}/patch" 231EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 232# @VARIABLE: EPATCH_SUFFIX
233# @DESCRIPTION:
234# Default extension for patches (do not prefix the period yourself).
178EPATCH_SUFFIX="patch.bz2" 235EPATCH_SUFFIX="patch.bz2"
236# @VARIABLE: EPATCH_OPTS
237# @DESCRIPTION:
179# Default options for patch 238# Default options for patch:
239# @CODE
180# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 240# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
181EPATCH_OPTS="-g0" 241# --no-backup-if-mismatch - do not leave .orig files behind
242# -E - automatically remove empty files
243# @CODE
244EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
245# @VARIABLE: EPATCH_EXCLUDE
246# @DESCRIPTION:
182# List of patches not to apply. Not this is only file names, 247# List of patches not to apply. Note this is only file names,
183# and not the full path .. 248# and not the full path. Globs accepted.
184EPATCH_EXCLUDE="" 249EPATCH_EXCLUDE=""
250# @VARIABLE: EPATCH_SINGLE_MSG
251# @DESCRIPTION:
185# Change the printed message for a single patch. 252# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 253EPATCH_SINGLE_MSG=""
187# Force applying bulk patches even if not following the style: 254# @VARIABLE: EPATCH_MULTI_MSG
188# 255# @DESCRIPTION:
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 256# Change the printed message for multiple patches.
190# 257EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
258# @VARIABLE: EPATCH_FORCE
259# @DESCRIPTION:
260# Only require patches to match EPATCH_SUFFIX rather than the extended
261# arch naming style.
191EPATCH_FORCE="no" 262EPATCH_FORCE="no"
192 263
193# This function is for bulk patching, or in theory for just one 264# @FUNCTION: epatch
194# or two patches. 265# @USAGE: [patches] [dirs of patches]
266# @DESCRIPTION:
267# epatch is designed to greatly simplify the application of patches. It can
268# process patch files directly, or directories of patches. The patches may be
269# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
270# the -p option as epatch will automatically attempt -p0 to -p5 until things
271# apply successfully.
195# 272#
196# It should work with .bz2, .gz, .zip and plain text patches. 273# If you do not specify any options, then epatch will default to the directory
197# Currently all patches should be the same format. 274# specified by EPATCH_SOURCE.
198# 275#
199# You do not have to specify '-p' option to patch, as it will 276# When processing directories, epatch will apply all patches that match:
200# try with -p0 to -p5 until it succeed, or fail at -p5. 277# @CODE
201# 278# if ${EPATCH_FORCE} != "yes"
202# Above EPATCH_* variables can be used to control various defaults,
203# bug they should be left as is to ensure an ebuild can rely on
204# them for.
205#
206# Patches are applied in current directory.
207#
208# Bulk Patches should preferibly have the form of:
209#
210# ??_${ARCH}_foo.${EPATCH_SUFFIX} 279# ??_${ARCH}_foo.${EPATCH_SUFFIX}
280# else
281# *.${EPATCH_SUFFIX}
282# @CODE
283# The leading ?? are typically numbers used to force consistent patch ordering.
284# The arch field is used to apply patches only for the host architecture with
285# the special value of "all" means apply for everyone. Note that using values
286# other than "all" is highly discouraged -- you should apply patches all the
287# time and let architecture details be detected at configure/compile time.
211# 288#
212# For example: 289# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
290# for patches to apply.
213# 291#
214# 01_all_misc-fix.patch.bz2 292# Refer to the other EPATCH_xxx variables for more customization of behavior.
215# 02_sparc_another-fix.patch.bz2
216#
217# This ensures that there are a set order, and you can have ARCH
218# specific patches.
219#
220# If you however give an argument to epatch(), it will treat it as a
221# single patch that need to be applied if its a file. If on the other
222# hand its a directory, it will set EPATCH_SOURCE to this.
223#
224# <azarah@gentoo.org> (10 Nov 2002)
225#
226epatch() { 293epatch() {
227 local PIPE_CMD="" 294 _epatch_draw_line() {
228 local STDERR_TARGET="${T}/$$.out" 295 # create a line of same length as input string
229 local PATCH_TARGET="${T}/$$.patch" 296 [[ -z $1 ]] && set "$(printf "%65s" '')"
230 local PATCH_SUFFIX="" 297 echo "${1//?/=}"
231 local SINGLE_PATCH="no" 298 }
232 local x=""
233 299
234 if [ "$#" -gt 1 ] 300 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
235 then 301
302 # Let the rest of the code process one user arg at a time --
303 # each arg may expand into multiple patches, and each arg may
304 # need to start off with the default global EPATCH_xxx values
305 if [[ $# -gt 1 ]] ; then
236 local m="" 306 local m
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 307 for m in "$@" ; do
239 epatch "${m}" 308 epatch "${m}"
240 done 309 done
241 return 0 310 return 0
242 fi 311 fi
243 312
244 if [ -n "$1" -a -f "$1" ] 313 local SINGLE_PATCH="no"
245 then 314 # no args means process ${EPATCH_SOURCE}
315 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
316
317 if [[ -f $1 ]] ; then
246 SINGLE_PATCH="yes" 318 SINGLE_PATCH="yes"
247 319 set -- "$1"
248 local EPATCH_SOURCE="$1" 320 # Use the suffix from the single patch (localize it); the code
321 # below will find the suffix for us
249 local EPATCH_SUFFIX="${1##*\.}" 322 local EPATCH_SUFFIX=$1
250 323
251 elif [ -n "$1" -a -d "$1" ] 324 elif [[ -d $1 ]] ; then
252 then 325 # Some people like to make dirs of patches w/out suffixes (vim)
253 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 326 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
254 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 327
328 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
329 # Re-use EPATCH_SOURCE as a search dir
330 epatch "${EPATCH_SOURCE}/$1"
331 return $?
332
333 else
334 # sanity check ... if it isn't a dir or file, wtf man ?
335 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
336 echo
337 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
338 eerror
339 eerror " ${EPATCH_SOURCE}"
340 eerror " ( ${EPATCH_SOURCE##*/} )"
341 echo
342 die "Cannot find \$EPATCH_SOURCE!"
343 fi
344
345 local PIPE_CMD
346 case ${EPATCH_SUFFIX##*\.} in
347 xz) PIPE_CMD="xz -dc" ;;
348 lzma) PIPE_CMD="lzma -dc" ;;
349 bz2) PIPE_CMD="bzip2 -dc" ;;
350 gz|Z|z) PIPE_CMD="gzip -dc" ;;
351 ZIP|zip) PIPE_CMD="unzip -p" ;;
352 *) ;;
353 esac
354
355 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
356
357 local x
358 for x in "$@" ; do
359 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
360 # didn't match anything, ignore continue on
361 [[ ! -f ${x} ]] && continue
362
363 local patchname=${x##*/}
364
365 # Apply single patches, or forced sets of patches, or
366 # patches with ARCH dependant names.
367 # ???_arch_foo.patch
368 # Else, skip this input altogether
369 local a=${patchname#*_} # strip the ???_
370 a=${a%%_*} # strip the _foo.patch
371 if ! [[ ${SINGLE_PATCH} == "yes" || \
372 ${EPATCH_FORCE} == "yes" || \
373 ${a} == all || \
374 ${a} == ${ARCH} ]]
255 then 375 then
256 local EPATCH_SOURCE="$1/*" 376 continue
377 fi
378
379 # Let people filter things dynamically
380 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
381 # let people use globs in the exclude
382 eshopts_push -o noglob
383
384 local ex
385 for ex in ${EPATCH_EXCLUDE} ; do
386 if [[ ${patchname} == ${ex} ]] ; then
387 eshopts_pop
388 continue 2
389 fi
390 done
391
392 eshopts_pop
393 fi
394
395 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
396 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
397 einfo "${EPATCH_SINGLE_MSG}"
398 else
399 einfo "Applying ${patchname} ..."
400 fi
257 else 401 else
258 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 402 einfo " ${patchname} ..."
259 fi 403 fi
260 else 404
261 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 405 # most of the time, there will only be one run per unique name,
262 then 406 # but if there are more, make sure we get unique log filenames
263 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 407 local STDERR_TARGET="${T}/${patchname}.out"
264 then 408 if [[ -e ${STDERR_TARGET} ]] ; then
265 EPATCH_SOURCE="$1" 409 STDERR_TARGET="${T}/${patchname}-$$.out"
410 fi
411
412 printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
413
414 # Decompress the patch if need be
415 local count=0
416 local PATCH_TARGET
417 if [[ -n ${PIPE_CMD} ]] ; then
418 PATCH_TARGET="${T}/$$.patch"
419 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
420
421 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
422 echo
423 eerror "Could not extract patch!"
424 #die "Could not extract patch!"
425 count=5
426 break
266 fi 427 fi
428 else
429 PATCH_TARGET=${x}
430 fi
267 431
432 # Check for absolute paths in patches. If sandbox is disabled,
433 # people could (accidently) patch files in the root filesystem.
434 # Or trigger other unpleasantries #237667. So disallow -p0 on
435 # such patches.
436 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
437 if [[ -n ${abs_paths} ]] ; then
438 count=1
439 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
440 fi
441 # Similar reason, but with relative paths.
442 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
443 if [[ -n ${rel_paths} ]] ; then
444 eqawarn "QA Notice: Your patch uses relative paths '../'."
445 eqawarn " In the future this will cause a failure."
446 eqawarn "${rel_paths}"
447 fi
448
449 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
450 while [[ ${count} -lt 5 ]] ; do
451 # Generate some useful debug info ...
452 (
453 _epatch_draw_line "***** ${patchname} *****"
268 echo 454 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 455 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
456 echo
457 _epatch_draw_line "***** ${patchname} *****"
458 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
459 ret=$?
460 echo
461 echo "patch program exited with status ${ret}"
462 exit ${ret}
463 ) >> "${STDERR_TARGET}"
464
465 if [ $? -eq 0 ] ; then
466 (
467 _epatch_draw_line "***** ${patchname} *****"
468 echo
469 echo "ACTUALLY APPLYING ${patchname} ..."
470 echo
471 _epatch_draw_line "***** ${patchname} *****"
472 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
473 ret=$?
474 echo
475 echo "patch program exited with status ${ret}"
476 exit ${ret}
477 ) >> "${STDERR_TARGET}"
478
479 if [ $? -ne 0 ] ; then
480 echo
481 eerror "A dry-run of patch command succeeded, but actually"
482 eerror "applying the patch failed!"
483 #die "Real world sux compared to the dreamworld!"
484 count=5
485 fi
486 break
487 fi
488
489 : $(( count++ ))
490 done
491
492 # if we had to decompress the patch, delete the temp one
493 if [[ -n ${PIPE_CMD} ]] ; then
494 rm -f "${PATCH_TARGET}"
495 fi
496
497 if [[ ${count} -ge 5 ]] ; then
498 echo
499 eerror "Failed Patch: ${patchname} !"
500 eerror " ( ${PATCH_TARGET} )"
270 eerror 501 eerror
271 eerror " ${EPATCH_SOURCE}" 502 eerror "Include in your bugreport the contents of:"
503 eerror
504 eerror " ${STDERR_TARGET}"
272 echo 505 echo
273 die "Cannot find \$EPATCH_SOURCE!" 506 die "Failed Patch: ${patchname}!"
274 fi
275
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
277 fi
278
279 case ${EPATCH_SUFFIX##*\.} in
280 bz2)
281 PIPE_CMD="bzip2 -dc"
282 PATCH_SUFFIX="bz2"
283 ;;
284 gz|Z|z)
285 PIPE_CMD="gzip -dc"
286 PATCH_SUFFIX="gz"
287 ;;
288 ZIP|zip)
289 PIPE_CMD="unzip -p"
290 PATCH_SUFFIX="zip"
291 ;;
292 *)
293 PIPE_CMD="cat"
294 PATCH_SUFFIX="patch"
295 ;;
296 esac
297
298 if [ "${SINGLE_PATCH}" = "no" ]
299 then
300 einfo "Applying various patches (bugfixes/updates) ..."
301 fi
302 for x in ${EPATCH_SOURCE}
303 do
304 # New ARCH dependant patch naming scheme ...
305 #
306 # ???_arch_foo.patch
307 #
308 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ])
311 then
312 local count=0
313 local popts="${EPATCH_OPTS}"
314
315 if [ -n "${EPATCH_EXCLUDE}" ]
316 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]
318 then
319 continue
320 fi
321 fi 507 fi
322 508
323 if [ "${SINGLE_PATCH}" = "yes" ] 509 # if everything worked, delete the patch log
324 then 510 rm -f "${STDERR_TARGET}"
325 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then
327 einfo "${EPATCH_SINGLE_MSG}"
328 else
329 einfo "Applying ${x##*/} ..."
330 fi
331 else
332 einfo " ${x##*/} ..."
333 fi
334
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
337
338 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ]
340 do
341 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
344
345 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
349 else
350 PATCH_TARGET="${x}"
351 fi
352
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
355
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
358
359 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
362 then
363 echo
364 eerror "Could not extract patch!"
365 #die "Could not extract patch!"
366 count=5
367 break
368 fi
369 fi
370
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
372 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
378
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
380
381 if [ "$?" -ne 0 ]
382 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
384 echo
385 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!"
388 count=5
389 fi
390
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
392
393 break
394 fi
395
396 count=$((count + 1))
397 done
398
399 if [ "${PATCH_SUFFIX}" != "patch" ]
400 then
401 rm -f ${PATCH_TARGET}
402 fi
403
404 if [ "${count}" -eq 5 ]
405 then
406 echo
407 eerror "Failed Patch: ${x##*/}!"
408 eerror
409 eerror "Include in your bugreport the contents of:"
410 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}"
412 echo
413 die "Failed Patch: ${x##*/}!"
414 fi
415
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
417
418 eend 0 511 eend 0
419 fi
420 done 512 done
421 if [ "${SINGLE_PATCH}" = "no" ]
422 then
423 einfo "Done with patching"
424 fi
425}
426 513
427# This function return true if we are using the NPTL pthreads 514 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
428# implementation. 515 : # everything worked
429# 516}
430# <azarah@gentoo.org> (06 March 2003)
431#
432have_NPTL() {
433 cat > ${T}/test-nptl.c <<-"END"
434 #define _XOPEN_SOURCE
435 #include <unistd.h>
436 #include <stdio.h>
437 517
438 int main() 518# @FUNCTION: epatch_user
439 { 519# @USAGE:
440 char buf[255]; 520# @DESCRIPTION:
441 char *str = buf; 521# Applies user-provided patches to the source tree. The patches are
522# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
523# of these three directories to exist will be the one to use, ignoring
524# any more general directories which might exist as well.
525#
526# User patches are intended for quick testing of patches without ebuild
527# modifications, as well as for permanent customizations a user might
528# desire. Obviously, there can be no official support for arbitrarily
529# patched ebuilds. So whenever a build log in a bug report mentions that
530# user patches were applied, the user should be asked to reproduce the
531# problem without these.
532#
533# Not all ebuilds do call this function, so placing patches in the
534# stated directory might or might not work, depending on the package and
535# the eclasses it inherits and uses. It is safe to call the function
536# repeatedly, so it is always possible to add a call at the ebuild
537# level. The first call is the time when the patches will be
538# applied.
539#
540# Ideally, this function should be called after gentoo-specific patches
541# have been applied, so that their code can be modified as well, but
542# before calls to e.g. eautoreconf, as the user patches might affect
543# autotool input files as well.
544epatch_user() {
545 [[ $# -ne 0 ]] && die "epatch_user takes no options"
442 546
443 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255); 547 # Allow multiple calls to this function; ignore all but the first
444 if (NULL != str) { 548 local applied="${T}/epatch_user.applied"
445 printf("%s\n", str); 549 [[ -e ${applied} ]] && return 2
446 if (NULL != strstr(str, "NPTL"))
447 return 0;
448 }
449 550
450 return 1; 551 # don't clobber any EPATCH vars that the parent might want
451 } 552 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
452 END 553 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
453 554 EPATCH_SOURCE=${base}/${CTARGET}/${check}
454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..." 555 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 556 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
456 then 557 if [[ -d ${EPATCH_SOURCE} ]] ; then
457 echo "yes" 558 EPATCH_SOURCE=${EPATCH_SOURCE} \
458 einfon "Checking what PTHREADS implementation we have ..." 559 EPATCH_SUFFIX="patch" \
459 if ${T}/nptl 560 EPATCH_FORCE="yes" \
460 then 561 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
562 epatch
563 echo "${EPATCH_SOURCE}" > "${applied}"
461 return 0 564 return 0
462 else
463 return 1
464 fi
465 else
466 echo "no"
467 fi 565 fi
468 566 done
567 echo "none" > "${applied}"
469 return 1 568 return 1
470} 569}
471 570
472# This function check how many cpu's are present, and then set 571# @FUNCTION: emktemp
473# -j in MAKEOPTS accordingly. 572# @USAGE: [temp dir]
474# 573# @DESCRIPTION:
475# Thanks to nall <nall@gentoo.org> for this.
476#
477get_number_of_jobs() {
478 local jobs=0
479
480 if [ ! -r /proc/cpuinfo ]
481 then
482 return 1
483 fi
484
485 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
487 then
488 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
489 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
490 ADMINPARAM="${ADMINPARAM/-j}"
491 fi
492
493 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
494
495 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497 then
498 # these archs will always have "[Pp]rocessor"
499 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502 then
503 # sparc always has "ncpus active"
504 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505
506 elif [ "${ARCH}" = "alpha" ]
507 then
508 # alpha has "cpus active", but only when compiled with SMP
509 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510 then
511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs=2
514 fi
515
516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517 then
518 # ppc has "processor", but only when compiled with SMP
519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520 then
521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522 else
523 jobs=2
524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
529 else
530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531 die "Unknown ARCH -- ${ARCH}!"
532 fi
533
534 # Make sure the number is valid ...
535 if [ "${jobs}" -lt 1 ]
536 then
537 jobs=1
538 fi
539
540 if [ -n "${ADMINPARAM}" ]
541 then
542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
543 then
544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546 else
547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549 fi
550 fi
551}
552
553# Cheap replacement for when debianutils (and thus mktemp) 574# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 575# does not exist on the users system.
555# vapier@gentoo.org
556#
557# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 576emktemp() {
559 local exe="touch" 577 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 578 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 579 local topdir=$1
562 580
563 if [ -z "${topdir}" ] 581 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 582 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 583 && topdir="/tmp" \
567 || topdir="${T}" 584 || topdir=${T}
568 fi 585 fi
569 586
570 if [ -z "$(type -p mktemp)" ] 587 if ! type -P mktemp > /dev/null ; then
571 then 588 # system lacks `mktemp` so we have to fake it
572 local tmp=/ 589 local tmp=/
573 while [ -e "${tmp}" ] ; do 590 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 591 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 592 done
576 ${exe} "${tmp}" 593 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 594 echo "${tmp}"
578 else 595 else
579 [ "${exe}" == "touch" ] \ 596 # the args here will give slightly wierd names on BSD,
580 && exe="-p" \ 597 # but should produce a usable file on all userlands
581 || exe="-d" 598 if [[ ${exe} == "touch" ]] ; then
582 mktemp ${exe} "${topdir}" 599 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
583 fi
584}
585
586# Small wrapper for getent (Linux), nidump (Mac OS X),
587# and pw (FreeBSD) used in enewuser()/enewgroup()
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590#
591# egetent(database, key)
592egetent() {
593 if useq ppc-macos ; then
594 case "$2" in
595 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;;
598 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;;
601 esac
602 elif useq x86-fbsd ; then
603 local action
604 if [ "$1" == "passwd" ]
605 then
606 action="user"
607 else 600 else
608 action="group" 601 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
609 fi
610 pw show "${action}" "$2" -q
611 else
612 which nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2"
614 fi
615}
616
617# Simplify/standardize adding users to the system
618# vapier@gentoo.org
619#
620# enewuser(username, uid, shell, homedir, groups, extra options)
621#
622# Default values if you do not specify any:
623# username: REQUIRED !
624# uid: next available (see useradd(8))
625# note: pass -1 to get default behavior
626# shell: /bin/false
627# homedir: /dev/null
628# groups: none
629# extra: comment of 'added by portage for ${PN}'
630enewuser() {
631 # get the username
632 local euser="$1"; shift
633 if [ -z "${euser}" ]
634 then
635 eerror "No username specified !"
636 die "Cannot call enewuser without a username"
637 fi
638
639 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
641 then
642 return 0
643 fi
644 einfo "Adding user '${euser}' to your system ..."
645
646 # options to pass to useradd
647 local opts=
648
649 # handle uid
650 local euid="$1"; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
652 then
653 if [ "${euid}" -gt 0 ]
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ]
656 then
657 euid="next"
658 fi 602 fi
659 else
660 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID"
662 fi 603 fi
663 else
664 euid="next"
665 fi
666 if [ "${euid}" == "next" ]
667 then
668 local pwrange
669 if [ "${USERLAND}" == "BSD" ] ; then
670 pwrange="`jot 898 101`"
671 else
672 pwrange="`seq 101 999`"
673 fi
674 for euid in ${pwrange} ; do
675 [ -z "`egetent passwd ${euid}`" ] && break
676 done
677 fi
678 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}"
680
681 # handle shell
682 local eshell="$1"; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
684 then
685 if [ ! -e "${eshell}" ]
686 then
687 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist"
689 fi
690 else
691 if [ "${USERLAND}" == "BSD" ]
692 then
693 eshell="/usr/bin/false"
694 else
695 eshell="/bin/false"
696 fi
697 fi
698 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}"
700
701 # handle homedir
702 local ehome="$1"; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
704 then
705 ehome="/dev/null"
706 fi
707 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}"
709
710 # handle groups
711 local egroups="$1"; shift
712 if [ ! -z "${egroups}" ]
713 then
714 local oldifs="${IFS}"
715 local defgroup="" exgroups=""
716
717 export IFS=","
718 for g in ${egroups}
719 do
720 export IFS="${oldifs}"
721 if [ -z "`egetent group \"${g}\"`" ]
722 then
723 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID"
725 fi
726 if [ -z "${defgroup}" ]
727 then
728 defgroup="${g}"
729 else
730 exgroups="${exgroups},${g}"
731 fi
732 export IFS=","
733 done
734 export IFS="${oldifs}"
735
736 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ]
738 then
739 opts="${opts} -G ${exgroups:1}"
740 fi
741 else
742 egroups="(none)"
743 fi
744 einfo " - Groups: ${egroups}"
745
746 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}"
749 export SANDBOX_ON="0"
750 if useq ppc-macos
751 then
752 ### Make the user
753 if [ -z "${eextra}" ]
754 then
755 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified
760 local oldifs="${IFS}"
761 export IFS=","
762 for g in ${egroups}
763 do
764 dscl . merge /groups/${g} users ${euser}
765 done
766 export IFS="${oldifs}"
767 else
768 einfo "Extra options are not supported on macos yet"
769 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}"
771 die "Required function missing"
772 fi
773 elif use x86-fbsd ; then
774 if [ -z "${eextra}" ]
775 then
776 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \
778 die "enewuser failed"
779 else
780 einfo " - Extra: ${eextra}"
781 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed"
783 fi
784 else
785 if [ -z "${eextra}" ]
786 then
787 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \
789 || die "enewuser failed"
790 else
791 einfo " - Extra: ${eextra}"
792 useradd ${opts} ${euser} ${eextra} \
793 || die "enewuser failed"
794 fi
795 fi
796 export SANDBOX_ON="${oldsandbox}"
797
798 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
799 then
800 einfo " - Creating ${ehome} in ${D}"
801 dodir ${ehome}
802 fowners ${euser} ${ehome}
803 fperms 755 ${ehome}
804 fi
805} 604}
806 605
807# Simplify/standardize adding groups to the system 606# @FUNCTION: edos2unix
808# vapier@gentoo.org 607# @USAGE: <file> [more files ...]
809# 608# @DESCRIPTION:
810# enewgroup(group, gid) 609# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
811# 610# to remove all of these text utilities from DEPEND variables because this
812# Default values if you do not specify any: 611# is a script based solution. Just give it a list of files to convert and
813# groupname: REQUIRED ! 612# they will all be changed from the DOS CRLF format to the UNIX LF format.
814# gid: next available (see groupadd(8))
815# extra: none
816enewgroup() {
817 # get the group
818 local egroup="$1"; shift
819 if [ -z "${egroup}" ]
820 then
821 eerror "No group specified !"
822 die "Cannot call enewgroup without a group"
823 fi
824
825 # see if group already exists
826 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
827 then
828 return 0
829 fi
830 einfo "Adding group '${egroup}' to your system ..."
831
832 # options to pass to useradd
833 local opts=
834
835 # handle gid
836 local egid="$1"; shift
837 if [ ! -z "${egid}" ]
838 then
839 if [ "${egid}" -gt 0 ]
840 then
841 if [ -z "`egetent group ${egid}`" ]
842 then
843 if useq ppc-macos ; then
844 opts="${opts} ${egid}"
845 else
846 opts="${opts} -g ${egid}"
847 fi
848 else
849 egid="next available; requested gid taken"
850 fi
851 else
852 eerror "Groupid given but is not greater than 0 !"
853 die "${egid} is not a valid GID"
854 fi
855 else
856 egid="next available"
857 fi
858 einfo " - Groupid: ${egid}"
859
860 # handle extra
861 local eextra="$@"
862 opts="${opts} ${eextra}"
863
864 # add the group
865 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0"
867 if useq ppc-macos ; then
868 if [ ! -z "${eextra}" ];
869 then
870 einfo "Extra options are not supported on macos yet"
871 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}"
873 die "Required function missing"
874 fi
875
876 # If we need the next available
877 case ${egid} in
878 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do
880 [ -z "`egetent group ${egid}`" ] && break
881 done
882 esac
883 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then
886 case ${egid} in
887 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do
889 [ -z "`egetent group ${egid}`" ] && break
890 done
891 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else
894 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi
896 export SANDBOX_ON="${oldsandbox}"
897}
898
899# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org
901#
902# edos2unix(file, <more files> ...)
903edos2unix() { 613edos2unix() {
904 for f in "$@" 614 [[ $# -eq 0 ]] && return 0
905 do 615 sed -i 's/\r$//' -- "$@" || die
906 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done
909} 616}
910 617
911# Make a desktop file ! 618# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 619# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 620# Amaze your friends ! Get the women ! Join today !
914# 621#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 622# make_desktop_entry(<command>, [name], [icon], [type], [fields])
916# 623#
917# binary: what binary does the app run with ? 624# binary: what command does the app run with ?
918# name: the name that will show up in the menu 625# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 626# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 627# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 628# a full path to an icon
922# type: what kind of application is this ? for categories: 629# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 630# http://standards.freedesktop.org/menu-spec/latest/apa.html
924# path: if your app needs to startup in a specific dir 631# fields: extra fields to append to the desktop file; a printf string
925make_desktop_entry() { 632make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 633 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
927 634
928 local exec="${1}" 635 local exec=${1}
929 local name="${2:-${PN}}" 636 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 637 local icon=${3:-${PN}}
931 local type="${4}" 638 local type=${4}
932 local subdir="${6}" 639 local fields=${5}
933 local path="${5:-${GAMES_BINDIR}}" 640
934 if [ -z "${type}" ] 641 if [[ -z ${type} ]] ; then
935 then 642 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 643 local catmin=${CATEGORY##*-}
937 "app-emulation") 644 case ${catmaj} in
938 type=Emulator 645 app)
939 subdir="Emulation" 646 case ${catmin} in
647 accessibility) type=Accessibility;;
648 admin) type=System;;
649 antivirus) type=System;;
650 arch) type=Archiving;;
651 backup) type=Archiving;;
652 cdr) type=DiscBurning;;
653 dicts) type=Dictionary;;
654 doc) type=Documentation;;
655 editors) type=TextEditor;;
656 emacs) type=TextEditor;;
657 emulation) type=Emulator;;
658 laptop) type=HardwareSettings;;
659 office) type=Office;;
660 pda) type=PDA;;
661 vim) type=TextEditor;;
662 xemacs) type=TextEditor;;
663 esac
664 ;;
665
666 dev)
667 type="Development"
668 ;;
669
670 games)
671 case ${catmin} in
672 action|fps) type=ActionGame;;
673 arcade) type=ArcadeGame;;
674 board) type=BoardGame;;
675 emulation) type=Emulator;;
676 kids) type=KidsGame;;
677 puzzle) type=LogicGame;;
678 roguelike) type=RolePlaying;;
679 rpg) type=RolePlaying;;
680 simulation) type=Simulation;;
681 sports) type=SportsGame;;
682 strategy) type=StrategyGame;;
683 esac
684 type="Game;${type}"
685 ;;
686
687 gnome)
688 type="Gnome;GTK"
689 ;;
690
691 kde)
692 type="KDE;Qt"
693 ;;
694
695 mail)
696 type="Network;Email"
697 ;;
698
699 media)
700 case ${catmin} in
701 gfx)
702 type=Graphics
940 ;; 703 ;;
941 "games-"*) 704 *)
942 type=Game 705 case ${catmin} in
943 subdir="Games" 706 radio) type=Tuner;;
707 sound) type=Audio;;
708 tv) type=TV;;
709 video) type=Video;;
710 esac
711 type="AudioVideo;${type}"
944 ;; 712 ;;
713 esac
714 ;;
715
945 "net-"*) 716 net)
717 case ${catmin} in
718 dialup) type=Dialup;;
719 ftp) type=FileTransfer;;
720 im) type=InstantMessaging;;
721 irc) type=IRCClient;;
722 mail) type=Email;;
723 news) type=News;;
724 nntp) type=News;;
725 p2p) type=FileTransfer;;
726 voip) type=Telephony;;
727 esac
946 type=Network 728 type="Network;${type}"
947 subdir="${type}"
948 ;; 729 ;;
730
731 sci)
732 case ${catmin} in
733 astro*) type=Astronomy;;
734 bio*) type=Biology;;
735 calc*) type=Calculator;;
736 chem*) type=Chemistry;;
737 elec*) type=Electronics;;
738 geo*) type=Geology;;
739 math*) type=Math;;
740 physics) type=Physics;;
741 visual*) type=DataVisualization;;
742 esac
743 type="Education;Science;${type}"
744 ;;
745
746 sys)
747 type="System"
748 ;;
749
750 www)
751 case ${catmin} in
752 client) type=WebBrowser;;
753 esac
754 type="Network;${type}"
755 ;;
756
949 *) 757 *)
950 type= 758 type=
951 subdir=
952 ;; 759 ;;
953 esac 760 esac
954 fi 761 fi
955 local desktop="${T}/${exec}.desktop" 762 if [ "${SLOT}" == "0" ] ; then
763 local desktop_name="${PN}"
764 else
765 local desktop_name="${PN}-${SLOT}"
766 fi
767 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
768 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
956 769
770 # Don't append another ";" when a valid category value is provided.
771 type=${type%;}${type:+;}
772
773 eshopts_push -s extglob
774 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
775 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
776 ewarn "allowed in .desktop files if the value is not an absolute path."
777 icon=${icon%.@(xpm|png|svg)}
778 fi
779 eshopts_pop
780
781 cat <<-EOF > "${desktop}"
957echo "[Desktop Entry] 782 [Desktop Entry]
958Encoding=UTF-8
959Version=0.9.2
960Name=${name} 783 Name=${name}
961Type=Application 784 Type=Application
962Comment=${DESCRIPTION} 785 Comment=${DESCRIPTION}
963Exec=${exec} 786 Exec=${exec}
964Path=${path} 787 TryExec=${exec%% *}
965Icon=${icon} 788 Icon=${icon}
966Categories=Application;${type};" > "${desktop}" 789 Categories=${type}
790 EOF
967 791
792 if [[ ${fields:-=} != *=* ]] ; then
793 # 5th arg used to be value to Path=
794 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
795 fields="Path=${fields}"
796 fi
797 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
798
799 (
800 # wrap the env here so that the 'insinto' call
801 # doesn't corrupt the env of the caller
802 insinto /usr/share/applications
803 doins "${desktop}"
804 ) || die "installing desktop file failed"
805}
806
807# @FUNCTION: validate_desktop_entries
808# @USAGE: [directories]
809# @MAINTAINER:
810# Carsten Lohrke <carlo@gentoo.org>
811# @DESCRIPTION:
812# Validate desktop entries using desktop-file-utils
813validate_desktop_entries() {
814 if [[ -x /usr/bin/desktop-file-validate ]] ; then
815 einfo "Checking desktop entry validity"
816 local directories=""
817 for d in /usr/share/applications $@ ; do
818 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
819 done
820 if [[ -n ${directories} ]] ; then
821 for FILE in $(find ${directories} -name "*\.desktop" \
822 -not -path '*.hidden*' | sort -u 2>/dev/null)
823 do
824 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
825 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
826 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
827 done
828 fi
829 echo ""
830 else
831 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
832 fi
833}
834
835# @FUNCTION: make_session_desktop
836# @USAGE: <title> <command> [command args...]
837# @DESCRIPTION:
838# Make a GDM/KDM Session file. The title is the file to execute to start the
839# Window Manager. The command is the name of the Window Manager.
840#
841# You can set the name of the file via the ${wm} variable.
842make_session_desktop() {
843 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
844 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
845
846 local title=$1
847 local command=$2
848 local desktop=${T}/${wm:-${PN}}.desktop
849 shift 2
850
851 cat <<-EOF > "${desktop}"
852 [Desktop Entry]
853 Name=${title}
854 Comment=This session logs you into ${title}
855 Exec=${command} $*
856 TryExec=${command}
857 Type=XSession
858 EOF
859
860 (
861 # wrap the env here so that the 'insinto' call
862 # doesn't corrupt the env of the caller
863 insinto /usr/share/xsessions
864 doins "${desktop}"
865 )
866}
867
868# @FUNCTION: domenu
869# @USAGE: <menus>
870# @DESCRIPTION:
871# Install the list of .desktop menu files into the appropriate directory
872# (/usr/share/applications).
873domenu() {
874 (
875 # wrap the env here so that the 'insinto' call
876 # doesn't corrupt the env of the caller
877 local i j ret=0
968 insinto /usr/share/applications 878 insinto /usr/share/applications
969 doins "${desktop}" 879 for i in "$@" ; do
880 if [[ -f ${i} ]] ; then
881 doins "${i}"
882 ((ret+=$?))
883 elif [[ -d ${i} ]] ; then
884 for j in "${i}"/*.desktop ; do
885 doins "${j}"
886 ((ret+=$?))
887 done
888 else
889 ((++ret))
890 fi
891 done
892 exit ${ret}
893 )
894}
970 895
971 return 0 896# @FUNCTION: newmenu
897# @USAGE: <menu> <newname>
898# @DESCRIPTION:
899# Like all other new* functions, install the specified menu as newname.
900newmenu() {
901 (
902 # wrap the env here so that the 'insinto' call
903 # doesn't corrupt the env of the caller
904 insinto /usr/share/applications
905 newins "$@"
906 )
907}
908
909# @FUNCTION: doicon
910# @USAGE: <list of icons>
911# @DESCRIPTION:
912# Install the list of icons into the icon directory (/usr/share/pixmaps).
913# This is useful in conjunction with creating desktop/menu files.
914doicon() {
915 (
916 # wrap the env here so that the 'insinto' call
917 # doesn't corrupt the env of the caller
918 local i j ret
919 insinto /usr/share/pixmaps
920 for i in "$@" ; do
921 if [[ -f ${i} ]] ; then
922 doins "${i}"
923 ((ret+=$?))
924 elif [[ -d ${i} ]] ; then
925 for j in "${i}"/*.png ; do
926 doins "${j}"
927 ((ret+=$?))
928 done
929 else
930 ((++ret))
931 fi
932 done
933 exit ${ret}
934 )
935}
936
937# @FUNCTION: newicon
938# @USAGE: <icon> <newname>
939# @DESCRIPTION:
940# Like all other new* functions, install the specified icon as newname.
941newicon() {
942 (
943 # wrap the env here so that the 'insinto' call
944 # doesn't corrupt the env of the caller
945 insinto /usr/share/pixmaps
946 newins "$@"
947 )
972} 948}
973 949
974# for internal use only (unpack_pdv and unpack_makeself) 950# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 951find_unpackable_file() {
976 local src="$1" 952 local src=$1
977 if [ -z "${src}" ] 953 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 954 src=${DISTDIR}/${A}
980 else 955 else
981 if [ -e "${DISTDIR}/${src}" ] 956 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 957 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 958 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 959 src=${PWD}/${src}
987 elif [ -e "${src}" ] 960 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 961 src=${src}
990 fi
991 fi 962 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 963 fi
964 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 965 echo "${src}"
994} 966}
995 967
968# @FUNCTION: unpack_pdv
969# @USAGE: <file to unpack> <size of off_t>
970# @DESCRIPTION:
996# Unpack those pesky pdv generated files ... 971# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 972# They're self-unpacking programs with the binary package stuffed in
998# the middle of the archive. Valve seems to use it a lot ... too bad 973# the middle of the archive. Valve seems to use it a lot ... too bad
999# it seems to like to segfault a lot :(. So lets take it apart ourselves. 974# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1000# 975#
1001# Usage: unpack_pdv [file to unpack] [size of off_t]
1002# - you have to specify the off_t size ... i have no idea how to extract that 976# You have to specify the off_t size ... I have no idea how to extract that
1003# information out of the binary executable myself. basically you pass in 977# information out of the binary executable myself. Basically you pass in
1004# the size of the off_t type (in bytes) on the machine that built the pdv 978# the size of the off_t type (in bytes) on the machine that built the pdv
979# archive.
980#
1005# archive. one way to determine this is by running the following commands: 981# One way to determine this is by running the following commands:
982#
983# @CODE
1006# strings <pdv archive> | grep lseek 984# strings <pdv archive> | grep lseek
1007# strace -elseek <pdv archive> 985# strace -elseek <pdv archive>
986# @CODE
987#
1008# basically look for the first lseek command (we do the strings/grep because 988# Basically look for the first lseek command (we do the strings/grep because
1009# sometimes the function call is _llseek or something) and steal the 2nd 989# sometimes the function call is _llseek or something) and steal the 2nd
1010# parameter. here is an example: 990# parameter. Here is an example:
991#
992# @CODE
1011# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 993# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1012# lseek 994# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 995# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 996# lseek(3, -4, SEEK_END) = 2981250
997# @CODE
998#
1015# thus we would pass in the value of '4' as the second parameter. 999# Thus we would pass in the value of '4' as the second parameter.
1016unpack_pdv() { 1000unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 1001 local src=$(find_unpackable_file "$1")
1018 local sizeoff_t="$2" 1002 local sizeoff_t=$2
1019 1003
1004 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1020 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1005 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1021 1006
1022 local shrtsrc="`basename ${src}`" 1007 local shrtsrc=$(basename "${src}")
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1008 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1009 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1010 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1026 1011
1027 # grab metadata for debug reasons 1012 # grab metadata for debug reasons
1028 local metafile="$(emktemp)" 1013 local metafile=$(emktemp)
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1014 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1030 1015
1031 # rip out the final file name from the metadata 1016 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1017 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1033 datafile="`basename ${datafile}`" 1018 datafile=$(basename "${datafile}")
1034 1019
1035 # now lets uncompress/untar the file if need be 1020 # now lets uncompress/untar the file if need be
1036 local tmpfile="$(emktemp)" 1021 local tmpfile=$(emktemp)
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1022 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1023
1039 local iscompressed="`file -b ${tmpfile}`" 1024 local iscompressed=$(file -b "${tmpfile}")
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1025 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1041 iscompressed=1 1026 iscompressed=1
1042 mv ${tmpfile}{,.Z} 1027 mv ${tmpfile}{,.Z}
1043 gunzip ${tmpfile} 1028 gunzip ${tmpfile}
1044 else 1029 else
1045 iscompressed=0 1030 iscompressed=0
1046 fi 1031 fi
1047 local istar="`file -b ${tmpfile}`" 1032 local istar=$(file -b "${tmpfile}")
1048 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1033 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1049 istar=1 1034 istar=1
1050 else 1035 else
1051 istar=0 1036 istar=0
1052 fi 1037 fi
1053 1038
1081 true 1066 true
1082 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1067 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1083 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1068 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1084} 1069}
1085 1070
1071# @FUNCTION: unpack_makeself
1072# @USAGE: [file to unpack] [offset] [tail|dd]
1073# @DESCRIPTION:
1086# Unpack those pesky makeself generated files ... 1074# Unpack those pesky makeself generated files ...
1087# They're shell scripts with the binary package tagged onto 1075# They're shell scripts with the binary package tagged onto
1088# the end of the archive. Loki utilized the format as does 1076# the end of the archive. Loki utilized the format as does
1089# many other game companies. 1077# many other game companies.
1090# 1078#
1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1079# If the file is not specified, then ${A} is used. If the
1092# - If the file is not specified then unpack will utilize ${A}.
1093# - If the offset is not specified then we will attempt to extract 1080# offset is not specified then we will attempt to extract
1094# the proper offset from the script itself. 1081# the proper offset from the script itself.
1095unpack_makeself() { 1082unpack_makeself() {
1083 local src_input=${1:-${A}}
1096 local src="$(find_unpackable_file "$1")" 1084 local src=$(find_unpackable_file "${src_input}")
1097 local skip="$2" 1085 local skip=$2
1098 local exe="$3" 1086 local exe=$3
1099 1087
1088 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1089
1100 local shrtsrc="$(basename "${src}")" 1090 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1092 if [[ -z ${skip} ]] ; then
1103 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1093 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1105 local skip=0 1094 local skip=0
1106 exe=tail 1095 exe=tail
1107 case ${ver} in 1096 case ${ver} in
1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1097 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1098 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1110 ;; 1099 ;;
1111 2.0|2.0.1) 1100 2.0|2.0.1)
1112 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1101 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1113 ;; 1102 ;;
1114 2.1.1) 1103 2.1.1)
1115 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1104 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1116 let skip="skip + 1" 1105 (( skip++ ))
1117 ;; 1106 ;;
1118 2.1.2) 1107 2.1.2)
1119 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1108 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1120 let skip="skip + 1" 1109 (( skip++ ))
1121 ;; 1110 ;;
1122 2.1.3) 1111 2.1.3)
1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1112 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1124 let skip="skip + 1" 1113 (( skip++ ))
1125 ;; 1114 ;;
1126 2.1.4) 1115 2.1.4|2.1.5)
1127 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1116 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1128 skip=$(head -n ${skip} "${src}" | wc -c) 1117 skip=$(head -n ${skip} "${src}" | wc -c)
1129 exe="dd" 1118 exe="dd"
1130 ;; 1119 ;;
1131 *) 1120 *)
1138 esac 1127 esac
1139 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1128 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1140 fi 1129 fi
1141 case ${exe} in 1130 case ${exe} in
1142 tail) exe="tail -n +${skip} '${src}'";; 1131 tail) exe="tail -n +${skip} '${src}'";;
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1132 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1133 *) die "makeself cant handle exe '${exe}'"
1145 esac 1134 esac
1146 1135
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1136 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(emktemp)" 1137 local filetype tmpfile=$(emktemp)
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1138 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1139 filetype=$(file -b "${tmpfile}") || die
1151 case ${filetype} in 1140 case ${filetype} in
1152 *tar\ archive) 1141 *tar\ archive*)
1153 eval ${exe} | tar --no-same-owner -xf - 1142 eval ${exe} | tar --no-same-owner -xf -
1154 ;; 1143 ;;
1155 bzip2*) 1144 bzip2*)
1156 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1145 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1157 ;; 1146 ;;
1167 ;; 1156 ;;
1168 esac 1157 esac
1169 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1158 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1170} 1159}
1171 1160
1172# Display a license for user to accept. 1161# @FUNCTION: cdrom_get_cds
1173# 1162# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1174# Usage: check_license [license] 1163# @DESCRIPTION:
1175# - If the file is not specified then ${LICENSE} is used.
1176check_license() {
1177 local lic=$1
1178 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}"
1183 elif [ -e "${PWD}/${src}" ] ; then
1184 lic="${PWD}/${src}"
1185 elif [ -e "${src}" ] ; then
1186 lic="${src}"
1187 fi
1188 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1190 local l="`basename ${lic}`"
1191
1192 # here is where we check for the licenses the user already
1193 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$-
1195 local alic
1196 set -o noglob #so that bash doesn't expand "*"
1197 for alic in ${ACCEPT_LICENSE} ; do
1198 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1199 set +o noglob; set -${shopts} #reset old shell opts
1200 return 0
1201 fi
1202 done
1203 set +o noglob; set -$shopts #reset old shell opts
1204
1205 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg}
1207**********************************************************
1208The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you
1211CTRL+C out of this, the install will not run!
1212**********************************************************
1213
1214EOF
1215 cat ${lic} >> ${licmsg}
1216 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1217 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1218 read alic
1219 case ${alic} in
1220 yes|Yes|y|Y)
1221 return 0
1222 ;;
1223 *)
1224 echo;echo;echo
1225 eerror "You MUST accept the license to continue! Exiting!"
1226 die "Failed to accept license"
1227 ;;
1228 esac
1229}
1230
1231# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1164# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1232# the whole 'non-interactive' policy, but damnit I want CD support ! 1165# the whole 'non-interactive' policy, but damnit I want CD support !
1233# 1166#
1234# with these cdrom functions we handle all the user interaction and 1167# With these cdrom functions we handle all the user interaction and
1235# standardize everything. all you have to do is call cdrom_get_cds() 1168# standardize everything. All you have to do is call cdrom_get_cds()
1236# and when the function returns, you can assume that the cd has been 1169# and when the function returns, you can assume that the cd has been
1237# found at CDROM_ROOT. 1170# found at CDROM_ROOT.
1238# 1171#
1172# The function will attempt to locate a cd based upon a file that is on
1173# the cd. The more files you give this function, the more cds
1174# the cdrom functions will handle.
1175#
1239# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1176# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1240# etc... if you want to give the cds better names, then just export 1177# etc... If you want to give the cds better names, then just export
1241# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1178# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1179# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1180# also use the CDROM_NAME_SET bash array.
1242# 1181#
1243# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1182# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1244#
1245# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1246# - this will attempt to locate a cd based upon a file that is on
1247# the cd ... the more files you give this function, the more cds
1248# the cdrom functions will handle
1249cdrom_get_cds() { 1183cdrom_get_cds() {
1250 # first we figure out how many cds we're dealing with by 1184 # first we figure out how many cds we're dealing with by
1251 # the # of files they gave us 1185 # the # of files they gave us
1252 local cdcnt=0 1186 local cdcnt=0
1253 local f= 1187 local f=
1254 for f in "$@" ; do 1188 for f in "$@" ; do
1255 cdcnt=$((cdcnt + 1)) 1189 ((++cdcnt))
1256 export CDROM_CHECK_${cdcnt}="$f" 1190 export CDROM_CHECK_${cdcnt}="$f"
1257 done 1191 done
1258 export CDROM_TOTAL_CDS=${cdcnt} 1192 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1193 export CDROM_CURRENT_CD=1
1260 1194
1261 # now we see if the user gave use CD_ROOT ... 1195 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1196 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1197 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}"
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return
1267 fi
1268 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then
1270 local var= 1198 local var=
1271 cdcnt=0 1199 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1200 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1201 ((++cdcnt))
1274 var="CD_ROOT_${cdcnt}" 1202 var="CD_ROOT_${cdcnt}"
1203 [[ -z ${!var} ]] && var="CD_ROOT"
1275 if [ -z "${!var}" ] ; then 1204 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1205 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1206 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1207 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1208 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1209 fi
1281 export CDROM_ROOTS_${cdcnt}="${!var}"
1282 done 1210 done
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1211 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1212 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1213 export CDROM_SET=-1
1214 for f in ${CDROM_CHECK_1//:/ } ; do
1215 ((++CDROM_SET))
1216 [[ -e ${CDROM_ROOT}/${f} ]] && break
1217 done
1218 export CDROM_MATCH=${f}
1285 return 1219 return
1286 fi 1220 fi
1287 1221
1222 # User didn't help us out so lets make sure they know they can
1223 # simplify the whole process ...
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1224 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1225 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1290 if [ -z "${CDROM_NAME}" ] ; then
1291 echo "cdrom for ${PN}."
1292 else
1293 echo "${CDROM_NAME}."
1294 fi
1295 echo 1226 echo
1296 einfo "If you do not have the CD, but have the data files" 1227 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1228 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1229 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1230 einfo "directory containing the files."
1300 echo 1231 echo
1232 einfo "For example:"
1233 einfo "export CD_ROOT=/mnt/cdrom"
1234 echo
1301 else 1235 else
1236 if [[ -n ${CDROM_NAME_SET} ]] ; then
1237 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1238 cdcnt=0
1239 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1240 ((++cdcnt))
1241 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1242 done
1243 fi
1244
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1245 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1246 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1247 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1248 ((++cdcnt))
1306 var="CDROM_NAME_${cdcnt}" 1249 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1250 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1251 done
1309 echo 1252 echo
1310 einfo "If you do not have the CDs, but have the data files" 1253 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1254 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1255 einfo "the following variables so they point to the right place:"
1313 einfon "" 1256 einfon ""
1314 cdcnt=0 1257 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1258 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1317 echo -n " CD_ROOT_${cdcnt}" 1260 echo -n " CD_ROOT_${cdcnt}"
1318 done 1261 done
1319 echo 1262 echo
1320 einfo "Or, if you have all the files in the same place, or" 1263 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1264 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1265 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1266 einfo "for all the CDs."
1324 echo 1267 echo
1268 einfo "For example:"
1269 einfo "export CD_ROOT_1=/mnt/cdrom"
1270 echo
1325 fi 1271 fi
1272
1273 export CDROM_SET=""
1326 export CDROM_CURRENT_CD=0 1274 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1275 cdrom_load_next_cd
1328} 1276}
1329 1277
1330# this is only used when you need access to more than one cd. 1278# @FUNCTION: cdrom_load_next_cd
1331# when you have finished using the first cd, just call this function. 1279# @DESCRIPTION:
1332# when it returns, CDROM_ROOT will be pointing to the second cd. 1280# Some packages are so big they come on multiple CDs. When you're done reading
1333# remember, you can only go forward in the cd chain, you can't go back. 1281# files off a CD and want access to the next one, just call this function.
1282# Again, all the messy details of user interaction are taken care of for you.
1283# Once this returns, just read the variable CDROM_ROOT for the location of the
1284# mounted CD. Note that you can only go forward in the CD list, so make sure
1285# you only call this function when you're done using the current CD.
1334cdrom_load_next_cd() { 1286cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1287 local var
1337 1288 ((++CDROM_CURRENT_CD))
1338 if [ ! -z "${CD_ROOT}" ] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return
1341 fi
1342 1289
1343 unset CDROM_ROOT 1290 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1291 var=CD_ROOT_${CDROM_CURRENT_CD}
1292 [[ -z ${!var} ]] && var="CD_ROOT"
1345 if [ -z "${!var}" ] ; then 1293 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1294 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1295 _cdrom_locate_file_on_cd ${!var}
1348 else 1296 else
1349 export CDROM_ROOT="${!var}" 1297 export CDROM_ROOT=${!var}
1350 fi 1298 fi
1351 1299
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1300 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1301}
1354 1302
1357# all it does is try to locate a give file on a cd ... if the cd isn't 1305# all it does is try to locate a give file on a cd ... if the cd isn't
1358# found, then a message asking for the user to insert the cdrom will be 1306# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1307# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1308# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1309# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1310_cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do
1364 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})"
1366 local mline="" 1311 local mline=""
1367 local showedmsg=0 1312 local showedmsg=0 showjolietmsg=0
1368 1313
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1314 while [[ -z ${CDROM_ROOT} ]] ; do
1315 local i=0
1316 local -a cdset=(${*//:/ })
1317 if [[ -n ${CDROM_SET} ]] ; then
1318 cdset=(${cdset[${CDROM_SET}]})
1319 fi
1320
1321 while [[ -n ${cdset[${i}]} ]] ; do
1322 local dir=$(dirname ${cdset[${i}]})
1323 local file=$(basename ${cdset[${i}]})
1324
1325 local point= node= fs= foo=
1326 while read point node fs foo ; do
1327 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1328 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1329 && continue
1330 point=${point//\040/ }
1370 [ -d "${mline}/${dir}" ] || continue 1331 [[ ! -d ${point}/${dir} ]] && continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1332 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1372 && export CDROM_ROOT=${mline} 1333 export CDROM_ROOT=${point}
1334 export CDROM_SET=${i}
1335 export CDROM_MATCH=${cdset[${i}]}
1336 return
1337 done <<< "$(get_mounts)"
1338
1339 ((++i))
1373 done 1340 done
1374 1341
1375 if [ -z "${CDROM_ROOT}" ] ; then
1376 echo 1342 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1343 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1345 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1346 einfo "Please insert+mount the cdrom for ${PN} now !"
1381 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi
1384 else 1347 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1348 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1390 fi
1391 fi 1349 fi
1392 showedmsg=1 1350 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !"
1356 fi
1393 fi 1357 fi
1358 showedmsg=1
1359 fi
1394 einfo "Press return to scan for the cd again" 1360 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1361 einfo "or hit CTRL+C to abort the emerge."
1396 read 1362 echo
1363 if [[ ${showjolietmsg} -eq 0 ]] ; then
1364 showjolietmsg=1
1365 else
1366 ewarn "If you are having trouble with the detection"
1367 ewarn "of your CD, it is possible that you do not have"
1368 ewarn "Joliet support enabled in your kernel. Please"
1369 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1370 ebeep 5
1397 fi 1371 fi
1372 read || die "something is screwed with your system"
1398 done 1373 done
1399} 1374}
1400 1375
1376# @FUNCTION: strip-linguas
1377# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1378# @DESCRIPTION:
1401# Make sure that LINGUAS only contains languages that 1379# Make sure that LINGUAS only contains languages that
1402# a package can support 1380# a package can support. The first form allows you to
1403# 1381# specify a list of LINGUAS. The -i builds a list of po
1404# usage: strip-linguas <allow LINGUAS> 1382# files found in all the directories and uses the
1405# strip-linguas -i <directories of .po files> 1383# intersection of the lists. The -u builds a list of po
1406# strip-linguas -u <directories of .po files> 1384# files found in all the directories and uses the union
1407# 1385# of the lists.
1408# The first form allows you to specify a list of LINGUAS.
1409# The -i builds a list of po files found in all the
1410# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists.
1413strip-linguas() { 1386strip-linguas() {
1414 local ls newls 1387 local ls newls nols
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1388 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1389 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1390 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1418 local d f 1391 local d f
1419 for d in "$@" ; do 1392 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1393 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1394 newls=${ls}
1422 else 1395 else
1423 newls="" 1396 newls=""
1424 fi 1397 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1398 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1426 if [ "${op}" == "-i" ] ; then 1399 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1400 has ${f} ${ls} && newls="${newls} ${f}"
1428 else 1401 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1402 has ${f} ${ls} || newls="${newls} ${f}"
1430 fi 1403 fi
1431 done 1404 done
1432 ls="${newls}" 1405 ls=${newls}
1433 done 1406 done
1434 ls="${ls//.po}"
1435 else 1407 else
1436 ls="$@" 1408 ls="$@"
1437 fi 1409 fi
1438 1410
1439 ls=" ${ls} " 1411 nols=""
1440 newls="" 1412 newls=""
1441 for f in ${LINGUAS} ; do 1413 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1414 if has ${f} ${ls} ; then
1443 newls="${newls} ${f}" 1415 newls="${newls} ${f}"
1444 else 1416 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1417 nols="${nols} ${f}"
1446 fi 1418 fi
1447 done 1419 done
1448 if [ -z "${newls}" ] ; then 1420 [[ -n ${nols} ]] \
1449 unset LINGUAS 1421 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1450 else
1451 export LINGUAS="${newls}" 1422 export LINGUAS=${newls:1}
1452 fi
1453} 1423}
1454 1424
1455# moved from kernel.eclass since they are generally useful outside of 1425# @FUNCTION: preserve_old_lib
1456# kernel.eclass -iggy (20041002) 1426# @USAGE: <libs to preserve> [more libs]
1457 1427# @DESCRIPTION:
1458# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds
1460
1461# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() {
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in
1465 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";;
1469 *) export ARCH="${ARCH}";;
1470 esac
1471}
1472
1473# set's ARCH back to what portage expects
1474set_arch_to_portage() {
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476}
1477
1478# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0
1480# preserve_old_lib_notify /path/to/libblah.so.0
1481#
1482# These functions are useful when a lib in your package changes --soname. Such 1428# These functions are useful when a lib in your package changes ABI SONAME.
1483# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1429# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1484# would break packages that link against it. Most people get around this 1430# would break packages that link against it. Most people get around this
1485# by using the portage SLOT mechanism, but that is not always a relevant 1431# by using the portage SLOT mechanism, but that is not always a relevant
1486# solution, so instead you can add the following to your ebuilds: 1432# solution, so instead you can call this from pkg_preinst. See also the
1487# 1433# preserve_old_lib_notify function.
1488# src_install() {
1489# ...
1490# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1491# ...
1492# }
1493#
1494# pkg_postinst() {
1495# ...
1496# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1497# ...
1498# }
1499
1500preserve_old_lib() { 1434preserve_old_lib() {
1501 LIB=$1 1435 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1436 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1437 die "Invalid preserve_old_lib() usage"
1438 fi
1439 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1502 1440
1503 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1441 # let portage worry about it
1504 SONAME=`basename ${LIB}` 1442 has preserve-libs ${FEATURES} && return 0
1505 DIRNAME=`dirname ${LIB}`
1506 1443
1507 dodir ${DIRNAME} 1444 local lib dir
1508 cp ${ROOT}${LIB} ${D}${DIRNAME} 1445 for lib in "$@" ; do
1446 [[ -e ${ROOT}/${lib} ]] || continue
1447 dir=${lib%/*}
1448 dodir ${dir} || die "dodir ${dir} failed"
1449 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1509 touch ${D}${LIB} 1450 touch "${D}"/${lib}
1510 fi 1451 done
1511} 1452}
1512 1453
1454# @FUNCTION: preserve_old_lib_notify
1455# @USAGE: <libs to notify> [more libs]
1456# @DESCRIPTION:
1457# Spit helpful messages about the libraries preserved by preserve_old_lib.
1513preserve_old_lib_notify() { 1458preserve_old_lib_notify() {
1514 LIB=$1 1459 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1460 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1461 die "Invalid preserve_old_lib_notify() usage"
1462 fi
1515 1463
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1464 # let portage worry about it
1517 SONAME=`basename ${LIB}` 1465 has preserve-libs ${FEATURES} && return 0
1518 1466
1467 local lib notice=0
1468 for lib in "$@" ; do
1469 [[ -e ${ROOT}/${lib} ]] || continue
1470 if [[ ${notice} -eq 0 ]] ; then
1471 notice=1
1519 einfo "An old version of an installed library was detected on your system." 1472 ewarn "Old versions of installed libraries were detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1473 ewarn "In order to avoid breaking packages that depend on these old libs,"
1521 einfo "is not being removed. In order to make full use of this newer version," 1474 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1522 einfo "you will need to execute the following command:" 1475 ewarn "in order to remove these old dependencies. If you do not have this"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1476 ewarn "helper program, simply emerge the 'gentoolkit' package."
1524 einfo 1477 ewarn
1525 einfo "After doing that, you can safely remove ${LIB}" 1478 fi
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1479 # temp hack for #348634 #357225
1527 fi 1480 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1481 ewarn " # revdep-rebuild --library '${lib}'"
1482 done
1483 if [[ ${notice} -eq 1 ]] ; then
1484 ewarn
1485 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1486 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1487 for lib in "$@" ; do
1488 ewarn " # rm '${lib}'"
1489 done
1490 fi
1528} 1491}
1529 1492
1530# Hack for people to figure out if a package was built with 1493# @FUNCTION: built_with_use
1531# certain USE flags 1494# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1495# @DESCRIPTION:
1532# 1496#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1497# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1534# ex: built_with_use xchat gtk2 1498#
1499# A temporary hack until portage properly supports DEPENDing on USE
1500# flags being enabled in packages. This will check to see if the specified
1501# DEPEND atom was built with the specified list of USE flags. The
1502# --missing option controls the behavior if called on a package that does
1503# not actually support the defined USE flags (aka listed in IUSE).
1504# The default is to abort (call die). The -a and -o flags control
1505# the requirements of the USE flags. They correspond to "and" and "or"
1506# logic. So the -a flag means all listed USE flags must be enabled
1507# while the -o flag means at least one of the listed IUSE flags must be
1508# enabled. The --hidden option is really for internal use only as it
1509# means the USE flag we're checking is hidden expanded, so it won't be found
1510# in IUSE like normal USE flags.
1511#
1512# Remember that this function isn't terribly intelligent so order of optional
1513# flags matter.
1535built_with_use() { 1514built_with_use() {
1515 local hidden="no"
1516 if [[ $1 == "--hidden" ]] ; then
1517 hidden="yes"
1518 shift
1519 fi
1520
1521 local missing_action="die"
1522 if [[ $1 == "--missing" ]] ; then
1523 missing_action=$2
1524 shift ; shift
1525 case ${missing_action} in
1526 true|false|die) ;;
1527 *) die "unknown action '${missing_action}'";;
1528 esac
1529 fi
1530
1531 local opt=$1
1532 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1533
1536 local PKG=$(portageq best_version ${ROOT} $1) 1534 local PKG=$(best_version $1)
1535 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1536 shift
1537
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1538 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1538 [[ ! -e ${USEFILE} ]] && return 1 1539 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1540
1541 # if the IUSE file doesn't exist, the read will error out, we need to handle
1542 # this gracefully
1543 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1544 case ${missing_action} in
1545 true) return 0;;
1546 false) return 1;;
1547 die) die "Unable to determine what USE flags $PKG was built with";;
1548 esac
1549 fi
1550
1551 if [[ ${hidden} == "no" ]] ; then
1552 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1553 # Don't check USE_EXPAND #147237
1554 local expand
1555 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1556 if [[ $1 == ${expand}_* ]] ; then
1557 expand=""
1558 break
1559 fi
1560 done
1561 if [[ -n ${expand} ]] ; then
1562 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1563 case ${missing_action} in
1564 true) return 0;;
1565 false) return 1;;
1566 die) die "$PKG does not actually support the $1 USE flag!";;
1567 esac
1568 fi
1569 fi
1570 fi
1539 1571
1540 local USE_BUILT=$(<${USEFILE}) 1572 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1573 while [[ $# -gt 0 ]] ; do
1574 if [[ ${opt} = "-o" ]] ; then
1575 has $1 ${USE_BUILT} && return 0
1576 else
1544 has $1 ${USE_BUILT} || return 1 1577 has $1 ${USE_BUILT} || return 1
1578 fi
1545 shift 1579 shift
1546 done 1580 done
1547 return 0 1581 [[ ${opt} = "-a" ]]
1548} 1582}
1549 1583
1584# @FUNCTION: epunt_cxx
1585# @USAGE: [dir to scan]
1586# @DESCRIPTION:
1550# Many configure scripts wrongly bail when a C++ compiler 1587# Many configure scripts wrongly bail when a C++ compiler could not be
1551# could not be detected. #73450 1588# detected. If dir is not specified, then it defaults to ${S}.
1589#
1590# http://bugs.gentoo.org/73450
1552epunt_cxx() { 1591epunt_cxx() {
1553 local dir=$1 1592 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1593 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1594 ebegin "Removing useless C++ checks"
1556 local f 1595 local f
1557 for f in $(find ${dir} -name configure) ; do 1596 find "${dir}" -name configure | while read f ; do
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1597 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1598 done
1560 eend 0 1599 eend 0
1561} 1600}
1562 1601
1563# get_abi_var <VAR> [<ABI>] 1602# @FUNCTION: make_wrapper
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 1603# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1565# 1604# @DESCRIPTION:
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1605# Create a shell wrapper script named wrapper in installpath
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now 1606# (defaults to the bindir) to execute target (default of wrapper) by
1568# it is subject to removal if a better way is worked out. 1607# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1569# 1608# libpaths followed by optionally changing directory to chdir.
1570# ex: 1609make_wrapper() {
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1610 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1572# 1611 local tmpwrapper=$(emktemp)
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1612 # We don't want to quote ${bin} so that people can pass complex
1574# This will hopefully be added to portage soon... 1613 # things as $bin ... "./someprog --args"
1575# 1614 cat << EOF > "${tmpwrapper}"
1576# If <ABI> is not specified, ${ABI} is used. 1615#!/bin/sh
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1616cd "${chdir:-.}"
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then 1617if [ -n "${libdir}" ] ; then
1587 abi=${ABI} 1618 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1589 abi=${DEFAULT_ABI}
1590 else 1620 else
1591 return "" 1621 export LD_LIBRARY_PATH="${libdir}"
1622 fi
1592 fi 1623fi
1593 eval echo \${${flag}_${abi}} 1624exec ${bin} "\$@"
1625EOF
1626 chmod go+rx "${tmpwrapper}"
1627 if [[ -n ${path} ]] ; then
1628 (
1629 exeinto "${path}"
1630 newexe "${tmpwrapper}" "${wrapper}"
1631 ) || die
1632 else
1633 newbin "${tmpwrapper}" "${wrapper}" || die
1634 fi
1594} 1635}
1595 1636
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1637# @FUNCTION: path_exists
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; } 1638# @USAGE: [-a|-o] <paths>
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; } 1639# @DESCRIPTION:
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; } 1640# Check if the specified paths exist. Works for all types of paths
1641# (files/dirs/etc...). The -a and -o flags control the requirements
1642# of the paths. They correspond to "and" and "or" logic. So the -a
1643# flag means all the paths must exist while the -o flag means at least
1644# one of the paths must exist. The default behavior is "and". If no
1645# paths are specified, then the return value is "false".
1646path_exists() {
1647 local opt=$1
1648 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1600 1649
1650 # no paths -> return false
1651 # same behavior as: [[ -e "" ]]
1652 [[ $# -eq 0 ]] && return 1
1653
1654 local p r=0
1655 for p in "$@" ; do
1656 [[ -e ${p} ]]
1657 : $(( r += $? ))
1658 done
1659
1660 case ${opt} in
1661 -a) return $(( r != 0 )) ;;
1662 -o) return $(( r == $# )) ;;
1663 esac
1664}
1665
1666# @FUNCTION: in_iuse
1667# @USAGE: <flag>
1668# @DESCRIPTION:
1669# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
1670# as necessary.
1671#
1672# Note that this function should not be used in the global scope.
1673in_iuse() {
1674 debug-print-function ${FUNCNAME} "${@}"
1675 [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
1676
1677 local flag=${1}
1678 local liuse=( ${IUSE} )
1679
1680 has "${flag}" "${liuse[@]#[+-]}"
1681}
1682
1683# @FUNCTION: use_if_iuse
1684# @USAGE: <flag>
1685# @DESCRIPTION:
1686# Return true if the given flag is in USE and IUSE.
1687#
1688# Note that this function should not be used in the global scope.
1689use_if_iuse() {
1690 in_iuse $1 || return 1
1691 use $1
1692}
1693
1694# @FUNCTION: usex
1695# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
1696# @DESCRIPTION:
1697# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
1698# otherwise echo [false output][false suffix] (defaults to "no").
1699usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
1700
1701check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
1702
1703fi

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.374

  ViewVC Help
Powered by ViewVC 1.1.20