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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.191  
changed lines
  Added in v.1.332

  ViewVC Help
Powered by ViewVC 1.1.20