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

Diff of /eclass/eutils.eclass

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

Revision 1.103 Revision 1.245
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 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.103 2004/09/17 10:37:58 kugelfang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.245 2006/07/15 19:26:55 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96} 39}
97 40
98# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
112# to point to the latest version of the library present. 55# to point to the latest version of the library present.
113# 56#
114# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
115# 58#
116gen_usr_ldscript() { 59gen_usr_ldscript() {
60 local lib libdir=$(get_libdir)
117 # Just make sure it exists 61 # Just make sure it exists
118 dodir /usr/$(get_libdir) 62 dodir /usr/${libdir}
119 63
64 for lib in "${@}" ; do
120 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT" 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
121/* GNU ld script 66 /* GNU ld script
122 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
123 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
124 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
125 otherwise we run into linking problems. 70 otherwise we run into linking problems.
126 See bug #4411 on http://bugs.gentoo.org/ for 71
127 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
74 GROUP ( /${libdir}/${lib} )
128END_LDSCRIPT 75 END_LDSCRIPT
129 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
130 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
131 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
132
133 return 0
134}
135
136# Simple function to draw a line consisting of '=' the same length as $*
137#
138# <azarah@gentoo.org> (11 Nov 2002)
139#
140draw_line() {
141 local i=0
142 local str_length=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
146 then
147 echo "==============================================================="
148 return 0
149 fi
150
151 # Get the length of $*
152 str_length="$(echo -n "$*" | wc -m)"
153
154 while [ "$i" -lt "${str_length}" ]
155 do
156 echo -n "="
157
158 i=$((i + 1))
159 done 77 done
160
161 echo
162
163 return 0
164} 78}
79
165 80
166# Default directory where patches are located 81# Default directory where patches are located
167EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
168# Default extension for patches 83# Default extension for patches
169EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
170# Default options for patch 85# Default options for patch
171# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
172EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
173# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
174# and not the full path .. 91# and not the full path ..
175EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
176# Change the printed message for a single patch. 93# Change the printed message for a single patch.
177EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
178# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
179# 98#
180# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
181# 100#
182EPATCH_FORCE="no" 101EPATCH_FORCE="no"
213# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
214# 133#
215# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
216# 135#
217epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
218 local PIPE_CMD="" 142 local PIPE_CMD=""
219 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
220 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
221 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
222 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
223 local x="" 147 local x=""
224 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
225 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
226 then 152 then
227 local m="" 153 local m=""
228 einfo "${#} patches to apply..."
229 for m in "$@" ; do 154 for m in "$@" ; do
230 epatch "${m}" 155 epatch "${m}"
231 done 156 done
232 return 0 157 return 0
233 fi 158 fi
247 local EPATCH_SOURCE="$1/*" 172 local EPATCH_SOURCE="$1/*"
248 else 173 else
249 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 174 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
250 fi 175 fi
251 else 176 else
252 if [ ! -d ${EPATCH_SOURCE} ] 177 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
253 then 178 then
254 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 179 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
255 then 180 then
256 EPATCH_SOURCE="$1" 181 EPATCH_SOURCE="$1"
257 fi 182 fi
258 183
259 echo 184 echo
260 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 185 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
261 eerror 186 eerror
262 eerror " ${EPATCH_SOURCE}" 187 eerror " ${EPATCH_SOURCE}"
188 eerror " ( ${EPATCH_SOURCE##*/} )"
263 echo 189 echo
264 die "Cannot find \$EPATCH_SOURCE!" 190 die "Cannot find \$EPATCH_SOURCE!"
265 fi 191 fi
266 192
267 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 193 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
286 ;; 212 ;;
287 esac 213 esac
288 214
289 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
290 then 216 then
291 einfo "Applying various patches (bugfixes/updates)..." 217 einfo "${EPATCH_MULTI_MSG}"
292 fi 218 fi
293 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
294 do 220 do
295 # New ARCH dependant patch naming scheme... 221 # New ARCH dependant patch naming scheme ...
296 # 222 #
297 # ???_arch_foo.patch 223 # ???_arch_foo.patch
298 # 224 #
299 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
300 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 226 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
301 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
302 then 228 then
303 local count=0 229 local count=0
304 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
231 local patchname=${x##*/}
305 232
306 if [ -n "${EPATCH_EXCLUDE}" ] 233 if [ -n "${EPATCH_EXCLUDE}" ]
307 then 234 then
308 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 235 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
309 then 236 then
310 continue 237 continue
311 fi 238 fi
312 fi 239 fi
313 240
315 then 242 then
316 if [ -n "${EPATCH_SINGLE_MSG}" ] 243 if [ -n "${EPATCH_SINGLE_MSG}" ]
317 then 244 then
318 einfo "${EPATCH_SINGLE_MSG}" 245 einfo "${EPATCH_SINGLE_MSG}"
319 else 246 else
320 einfo "Applying ${x##*/}..." 247 einfo "Applying ${patchname} ..."
321 fi 248 fi
322 else 249 else
323 einfo " ${x##*/}..." 250 einfo " ${patchname} ..."
324 fi 251 fi
325 252
326 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 255
329 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
330 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
331 do 258 do
332 # Generate some useful debug info ... 259 # Generate some useful debug info ...
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335 262
336 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
337 then 264 then
338 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 else 267 else
341 PATCH_TARGET="${x}" 268 PATCH_TARGET="${x}"
342 fi 269 fi
343 270
344 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 273
347 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 276
350 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
351 then 278 then
352 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
353 then 280 then
354 echo 281 echo
355 eerror "Could not extract patch!" 282 eerror "Could not extract patch!"
356 #die "Could not extract patch!" 283 #die "Could not extract patch!"
357 count=5 284 count=5
358 break 285 break
359 fi 286 fi
360 fi 287 fi
361 288
362 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
363 then 290 then
364 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
369 296
370 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
371 299
372 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
373 then 301 then
374 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
375 echo 303 echo
376 eerror "A dry-run of patch command succeeded, but actually" 304 eerror "A dry-run of patch command succeeded, but actually"
377 eerror "applying the patch failed!" 305 eerror "applying the patch failed!"
378 #die "Real world sux compared to the dreamworld!" 306 #die "Real world sux compared to the dreamworld!"
379 count=5 307 count=5
380 fi 308 fi
381 309
382 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
383 311
384 break 312 break
385 fi 313 fi
386 314
387 count=$((count + 1)) 315 count=$((count + 1))
393 fi 321 fi
394 322
395 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
396 then 324 then
397 echo 325 echo
398 eerror "Failed Patch: ${x##*/}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
399 eerror 328 eerror
400 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
401 eerror 330 eerror
402 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
403 echo 332 echo
404 die "Failed Patch: ${x##*/}!" 333 die "Failed Patch: ${patchname}!"
405 fi 334 fi
406 335
407 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
408 337
409 eend 0 338 eend 0
410 fi 339 fi
411 done 340 done
412 if [ "${SINGLE_PATCH}" = "no" ] 341 if [ "${SINGLE_PATCH}" = "no" ]
413 then 342 then
414 einfo "Done with patching" 343 einfo "Done with patching"
415 fi 344 fi
416} 345}
417 346
418# This function return true if we are using the NPTL pthreads
419# implementation.
420#
421# <azarah@gentoo.org> (06 March 2003)
422#
423have_NPTL() {
424 cat > ${T}/test-nptl.c <<-"END"
425 #define _XOPEN_SOURCE
426 #include <unistd.h>
427 #include <stdio.h>
428
429 int main()
430 {
431 char buf[255];
432 char *str = buf;
433
434 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
435 if (NULL != str) {
436 printf("%s\n", str);
437 if (NULL != strstr(str, "NPTL"))
438 return 0;
439 }
440
441 return 1;
442 }
443 END
444
445 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
446 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
447 then
448 echo "yes"
449 einfon "Checking what PTHREADS implementation we have ... "
450 if ${T}/nptl
451 then
452 return 0
453 else
454 return 1
455 fi
456 else
457 echo "no"
458 fi
459
460 return 1
461}
462
463# This function check how many cpu's are present, and then set
464# -j in MAKEOPTS accordingly.
465#
466# Thanks to nall <nall@gentoo.org> for this.
467#
468get_number_of_jobs() {
469 local jobs=0
470
471 if [ ! -r /proc/cpuinfo ]
472 then
473 return 1
474 fi
475
476 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
477 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
478 then
479 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
480 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
481 ADMINPARAM="${ADMINPARAM/-j}"
482 fi
483
484 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
485
486 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
487 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
488 then
489 # these archs will always have "[Pp]rocessor"
490 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
491
492 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
493 then
494 # sparc always has "ncpus active"
495 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496
497 elif [ "${ARCH}" = "alpha" ]
498 then
499 # alpha has "cpus active", but only when compiled with SMP
500 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
501 then
502 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
503 else
504 jobs=2
505 fi
506
507 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
508 then
509 # ppc has "processor", but only when compiled with SMP
510 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
511 then
512 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
513 else
514 jobs=2
515 fi
516 elif [ "${ARCH}" = "s390" ]
517 then
518 # s390 has "# processors : "
519 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
520 else
521 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
522 die "Unknown ARCH -- ${ARCH}!"
523 fi
524
525 # Make sure the number is valid ...
526 if [ "${jobs}" -lt 1 ]
527 then
528 jobs=1
529 fi
530
531 if [ -n "${ADMINPARAM}" ]
532 then
533 if [ "${jobs}" -gt "${ADMINPARAM}" ]
534 then
535 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
536 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
537 else
538 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
539 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
540 fi
541 fi
542}
543
544# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
545# does not exist on the users system 348# does not exist on the users system
546# vapier@gentoo.org 349# vapier@gentoo.org
547# 350#
548# Takes just 1 parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
549mymktemp() { 352emktemp() {
353 local exe="touch"
354 [[ $1 == -d ]] && exe="mkdir" && shift
550 local topdir="$1" 355 local topdir=$1
551 356
552 [ -z "${topdir}" ] && topdir=/tmp 357 if [[ -z ${topdir} ]] ; then
553 if [ "`which mktemp 2>/dev/null`" ] 358 [[ -z ${T} ]] \
554 then 359 && topdir="/tmp" \
555 mktemp -p ${topdir} 360 || topdir=${T}
361 fi
362
363 if [[ -z $(type -p mktemp) ]] ; then
364 local tmp=/
365 while [[ -e ${tmp} ]] ; do
366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
367 done
368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
369 echo "${tmp}"
556 else 370 else
557 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 371 if [[ ${exe} == "touch" ]] ; then
558 touch ${tmp} 372 [[ ${USERLAND} == "GNU" ]] \
559 echo ${tmp} 373 && mktemp -p "${topdir}" \
374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
560 fi 379 fi
380 fi
561} 381}
562 382
563# Small wrapper for getent (Linux) and nidump (Mac OS X) 383# Small wrapper for getent (Linux), nidump (Mac OS X),
564# used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
565# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566# 387#
567# egetent(database, key) 388# egetent(database, key)
568egetent() { 389egetent() {
569 if use macos || use ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
570 case "$2" in 392 case "$2" in
571 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
572 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
573 ;; 395 ;;
574 *) # Numeric 396 *) # Numeric
575 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
576 ;; 398 ;;
577 esac 399 esac
578 else 400 ;;
579 getent $1 $2 401 *-freebsd*|*-dragonfly*)
402 local opts action="user"
403 [[ $1 == "passwd" ]] || action="group"
404
405 # lookup by uid/gid
406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
580 fi 408 fi
409
410 pw show ${action} ${opts} "$2" -q
411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
416 type -p nscd >& /dev/null && nscd -i "$1"
417 getent "$1" "$2"
418 ;;
419 esac
581} 420}
582 421
583# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
584# vapier@gentoo.org 423# vapier@gentoo.org
585# 424#
592# shell: /bin/false 431# shell: /bin/false
593# homedir: /dev/null 432# homedir: /dev/null
594# groups: none 433# groups: none
595# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
596enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
597 # get the username 443 # get the username
598 local euser="$1"; shift 444 local euser=$1; shift
599 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
600 then
601 eerror "No username specified !" 446 eerror "No username specified !"
602 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
603 fi 448 fi
604 449
605 # lets see if the username already exists 450 # lets see if the username already exists
606 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
607 then
608 return 0 452 return 0
609 fi 453 fi
610 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
611 455
612 # options to pass to useradd 456 # options to pass to useradd
613 local opts= 457 local opts=
614 458
615 # handle uid 459 # handle uid
616 local euid="$1"; shift 460 local euid=$1; shift
617 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
618 then
619 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
620 then
621 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
622 then
623 euid="next" 464 euid="next"
624 fi 465 fi
625 else 466 else
626 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
627 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
628 fi 469 fi
629 else 470 else
630 euid="next" 471 euid="next"
631 fi 472 fi
632 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
633 then 474 for euid in $(seq 101 999) ; do
634 local pwrange
635 if use macos || use ppc-macos ; then
636 pwrange="`jot 898 101`"
637 else
638 pwrange="`seq 101 999`"
639 fi
640 for euid in ${pwrange} ; do
641 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
642 done 476 done
643 fi 477 fi
644 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
645 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
646 480
647 # handle shell 481 # handle shell
648 local eshell="$1"; shift 482 local eshell=$1; shift
649 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
650 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
651 if [ ! -e "${eshell}" ]
652 then
653 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
654 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
655 fi 491 fi
656 else 492 else
657 eshell="/bin/false" 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
494 [[ -x ${ROOT}${shell} ]] && break
495 done
496
497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
500 fi
501
502 eshell=${shell}
658 fi 503 fi
659 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
660 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
661 506
662 # handle homedir 507 # handle homedir
663 local ehome="$1"; shift 508 local ehome=$1; shift
664 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
665 then
666 ehome="/dev/null" 510 ehome="/dev/null"
667 fi 511 fi
668 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
669 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
670 514
671 # handle groups 515 # handle groups
672 local egroups="$1"; shift 516 local egroups=$1; shift
673 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
674 then
675 local oldifs="${IFS}" 518 local oldifs=${IFS}
519 local defgroup="" exgroups=""
520
676 export IFS="," 521 export IFS=","
677 for g in ${egroups} 522 for g in ${egroups} ; do
678 do 523 export IFS=${oldifs}
679 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
680 then
681 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
682 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
683 fi 527 fi
528 if [[ -z ${defgroup} ]] ; then
529 defgroup=${g}
530 else
531 exgroups="${exgroups},${g}"
532 fi
533 export IFS=","
684 done 534 done
685 export IFS="${oldifs}" 535 export IFS=${oldifs}
536
686 opts="${opts} -g ${egroups}" 537 opts="${opts} -g ${defgroup}"
538 if [[ ! -z ${exgroups} ]] ; then
539 opts="${opts} -G ${exgroups:1}"
540 fi
687 else 541 else
688 egroups="(none)" 542 egroups="(none)"
689 fi 543 fi
690 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
691 545
692 # handle extra and add the user 546 # handle extra and add the user
693 local eextra="$@"
694 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
695 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
696 if use macos || use ppc-macos ; 549 case ${CHOST} in
697 then 550 *-darwin*)
698 ### Make the user 551 ### Make the user
699 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
700 then
701 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
702 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
703 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
704 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
705 ### Add the user to the groups specified 557 ### Add the user to the groups specified
558 local oldifs=${IFS}
559 export IFS=","
706 for g in ${egroups} 560 for g in ${egroups} ; do
707 do
708 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
709 done 562 done
563 export IFS=${oldifs}
710 else 564 else
711 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
712 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
713 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
714 die "Required function missing" 568 die "Required function missing"
715 fi 569 fi
570 ;;
571 *-freebsd*|*-dragonfly*)
572 if [[ -z $@ ]] ; then
573 pw useradd ${euser} ${opts} \
574 -c "added by portage for ${PN}" \
575 die "enewuser failed"
716 else 576 else
717 if [ -z "${eextra}" ] 577 einfo " - Extra: $@"
718 then 578 pw useradd ${euser} ${opts} \
579 "$@" || die "enewuser failed"
580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
586 else
587 einfo " - Extra: $@"
588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *)
606 if [[ -z $@ ]] ; then
719 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
720 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
721 || die "enewuser failed" 609 || die "enewuser failed"
722 else 610 else
723 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
724 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
725 || die "enewuser failed" 613 || die "enewuser failed"
726 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
727 fi 623 fi
624
728 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
729
730 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
731 then
732 einfo " - Creating ${ehome} in ${D}"
733 dodir ${ehome}
734 fowners ${euser} ${ehome}
735 fperms 755 ${ehome}
736 fi
737} 626}
738 627
739# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
740# vapier@gentoo.org 629# vapier@gentoo.org
741# 630#
744# Default values if you do not specify any: 633# Default values if you do not specify any:
745# groupname: REQUIRED ! 634# groupname: REQUIRED !
746# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
747# extra: none 636# extra: none
748enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
749 # get the group 645 # get the group
750 local egroup="$1"; shift 646 local egroup="$1"; shift
751 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
752 then 648 then
753 eerror "No group specified !" 649 eerror "No group specified !"
770 then 666 then
771 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
772 then 668 then
773 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
774 then 670 then
775 if use macos || use ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
776 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
777 else 673 else
778 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
779 fi 675 fi
780 else 676 else
794 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
795 691
796 # add the group 692 # add the group
797 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
798 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
799 if use macos || use ppc-macos ; 695 case ${CHOST} in
800 then 696 *-darwin*)
801 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
802 then 698 then
803 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
804 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
805 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
806 die "Required function missing" 702 die "Required function missing"
807 fi 703 fi
808 704
809 # If we need the next available 705 # If we need the next available
810 case ${egid} in 706 case ${egid} in
811 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
812 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
813 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
814 done 710 done
815 esac 711 esac
816 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
817 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
818 else 714 ;;
715
716 *-freebsd*|*-dragonfly*)
717 case ${egid} in
718 *[!0-9]*) # Non numeric
719 for egid in $(seq 101 999); do
720 [ -z "`egetent group ${egid}`" ] && break
721 done
722 esac
723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
819 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
820 fi 738 ;;
739 esac
821 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
822} 741}
823 742
824# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
825# vapier@gentoo.org 744# vapier@gentoo.org
826# 745#
827# edos2unix(file, <more files>...) 746# edos2unix(file, <more files> ...)
828edos2unix() { 747edos2unix() {
829 for f in "$@" 748 for f in "$@"
830 do 749 do
831 cp "${f}" ${T}/edos2unix 750 cp "${f}" ${T}/edos2unix
832 sed 's/\r$//' ${T}/edos2unix > "${f}" 751 sed 's/\r$//' ${T}/edos2unix > "${f}"
833 done 752 done
834} 753}
835 754
755
756##############################################################
757# START: Handle .desktop files and menu entries #
758# maybe this should be separated into a new eclass some time #
759# lanius@gentoo.org #
760##############################################################
761
836# Make a desktop file ! 762# Make a desktop file !
837# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
838# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
839# gnome2 /usr/share/applications
840# gnome1 /usr/share/gnome/apps/
841# KDE ${KDEDIR}/share/applnk /usr/share/applnk
842# 765#
843# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
844# 767#
845# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
846# name: the name that will show up in the menu 769# name: the name that will show up in the menu
847# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
848# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
849# a full path to an icon 772# a full path to an icon
850# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
851# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
852# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
853make_desktop_entry() { 776make_desktop_entry() {
854 [ -z "$1" ] && eerror "You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
855 778
856 local exec="${1}" 779 local exec=${1}
857 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
858 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
859 local type="${4}" 782 local type=${4}
860 local subdir="${6}" 783 local path=${5}
861 local path="${5:-${GAMES_BINDIR}}" 784
862 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
863 then 786 local catmaj=${CATEGORY%%-*}
864 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
865 "app-emulation") 788 case ${catmaj} in
866 type=Emulator 789 app)
867 subdir="Emulation" 790 case ${catmin} in
791 admin) type=System;;
792 cdr) type=DiscBurning;;
793 dicts) type=Dictionary;;
794 editors) type=TextEditor;;
795 emacs) type=TextEditor;;
796 emulation) type=Emulator;;
797 laptop) type=HardwareSettings;;
798 office) type=Office;;
799 vim) type=TextEditor;;
800 xemacs) type=TextEditor;;
801 *) type=;;
802 esac
868 ;; 803 ;;
869 "games-"*) 804
870 type=Game 805 dev)
871 subdir="Games" 806 type="Development"
872 ;; 807 ;;
873 "net-"*) 808
874 type=Network 809 games)
875 subdir="${type}" 810 case ${catmin} in
811 action) type=ActionGame;;
812 arcade) type=ArcadeGame;;
813 board) type=BoardGame;;
814 kid) type=KidsGame;;
815 emulation) type=Emulator;;
816 puzzle) type=LogicGame;;
817 rpg) type=RolePlaying;;
818 roguelike) type=RolePlaying;;
819 simulation) type=Simulation;;
820 sports) type=SportsGame;;
821 strategy) type=StrategyGame;;
822 *) type=;;
823 esac
824 type="Game;${type}"
876 ;; 825 ;;
826
827 mail)
828 type="Network;Email"
829 ;;
830
831 media)
832 case ${catmin} in
833 gfx) type=Graphics;;
834 radio) type=Tuner;;
835 sound) type=Audio;;
836 tv) type=TV;;
837 video) type=Video;;
838 *) type=;;
839 esac
840 type="AudioVideo;${type}"
841 ;;
842
843 net)
844 case ${catmin} in
845 dialup) type=Dialup;;
846 ftp) type=FileTransfer;;
847 im) type=InstantMessaging;;
848 irc) type=IRCClient;;
849 mail) type=Email;;
850 news) type=News;;
851 nntp) type=News;;
852 p2p) type=FileTransfer;;
853 *) type=;;
854 esac
855 type="Network;${type}"
856 ;;
857
858 sci)
859 case ${catmin} in
860 astro*) type=Astronomy;;
861 bio*) type=Biology;;
862 calc*) type=Calculator;;
863 chem*) type=Chemistry;;
864 geo*) type=Geology;;
865 math*) type=Math;;
866 *) type=;;
867 esac
868 type="Science;${type}"
869 ;;
870
871 www)
872 case ${catmin} in
873 client) type=WebBrowser;;
874 *) type=;;
875 esac
876 type="Network"
877 ;;
878
877 *) 879 *)
878 type= 880 type=
879 subdir=
880 ;; 881 ;;
881 esac 882 esac
882 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
883 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
884 891
885echo "[Desktop Entry] 892echo "[Desktop Entry]
886Encoding=UTF-8 893Encoding=UTF-8
887Version=0.9.2 894Version=0.9.2
888Name=${name} 895Name=${name}
889Type=Application 896Type=Application
890Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
891Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
892Path=${path} 900Path=${path}
893Icon=${icon} 901Icon=${icon}
894Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
895 903
896 if [ -d "/usr/share/applications" ] 904 (
897 then 905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
898 insinto /usr/share/applications 907 insinto /usr/share/applications
899 doins "${desktop}" 908 doins "${desktop}"
900 fi 909 )
910}
901 911
902 #if [ -d "/usr/share/gnome/apps" ] 912# Make a GDM/KDM Session file
903 #then 913#
904 # insinto /usr/share/gnome/apps/Games 914# make_desktop_entry(<title>, <command>)
905 # doins ${desktop} 915# title: File to execute to start the Window Manager
906 #fi 916# command: Name of the Window Manager
907 917
908 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 918make_session_desktop() {
909 #then 919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
910 # for ver in /usr/kde/* 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
911 # do
912 # insinto ${ver}/share/applnk/Games
913 # doins ${desktop}
914 # done
915 #fi
916 921
917 if [ -d "/usr/share/applnk" ] 922 local title=$1
918 then 923 local command=$2
919 insinto /usr/share/applnk/${subdir} 924 local desktop=${T}/${wm}.desktop
925
926echo "[Desktop Entry]
927Encoding=UTF-8
928Name=${title}
929Comment=This session logs you into ${title}
930Exec=${command}
931TryExec=${command}
932Type=Application" > "${desktop}"
933
934 insinto /usr/share/xsessions
920 doins "${desktop}" 935 doins "${desktop}"
936}
937
938domenu() {
939 local i j
940 insinto /usr/share/applications
941 for i in "$@" ; do
942 if [[ -f ${i} ]] ; then
943 doins "${i}"
944 elif [[ -d ${i} ]] ; then
945 for j in "${i}"/*.desktop ; do
946 doins "${j}"
947 done
921 fi 948 fi
922 949 done
923 return 0
924} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
955
956doicon() {
957 local i j
958 insinto /usr/share/pixmaps
959 for i in "$@" ; do
960 if [[ -f ${i} ]] ; then
961 doins "${i}"
962 elif [[ -d ${i} ]] ; then
963 for j in "${i}"/*.png ; do
964 doins "${j}"
965 done
966 fi
967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
972}
973
974##############################################################
975# END: Handle .desktop files and menu entries #
976##############################################################
977
925 978
926# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
927find_unpackable_file() { 980find_unpackable_file() {
928 local src="$1" 981 local src=$1
929 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
930 then
931 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
932 else 984 else
933 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
934 then
935 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
936 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
937 then
938 src="${PWD}/${src}" 988 src=${PWD}/${src}
939 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
940 then
941 src="${src}" 990 src=${src}
942 fi
943 fi 991 fi
944 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
945 echo "${src}" 994 echo "${src}"
946} 995}
947 996
948# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
949# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
964# lseek 1013# lseek
965# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
966# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
967# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
968unpack_pdv() { 1017unpack_pdv() {
969 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
970 local sizeoff_t="$2" 1019 local sizeoff_t=$2
971 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
972 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
973 1023
974 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
975 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
976 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
977 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
978 1028
979 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
980 local metafile="`mymktemp ${T}`" 1030 local metafile="$(emktemp)"
981 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1031 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
982 1032
983 # rip out the final file name from the metadata 1033 # rip out the final file name from the metadata
984 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1034 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
985 datafile="`basename ${datafile}`" 1035 datafile="`basename ${datafile}`"
986 1036
987 # now lets uncompress/untar the file if need be 1037 # now lets uncompress/untar the file if need be
988 local tmpfile="`mymktemp ${T}`" 1038 local tmpfile="$(emktemp)"
989 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1039 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
990 1040
991 local iscompressed="`file -b ${tmpfile}`" 1041 local iscompressed="`file -b ${tmpfile}`"
992 if [ "${iscompressed:0:8}" == "compress" ] ; then 1042 if [ "${iscompressed:0:8}" == "compress" ] ; then
993 iscompressed=1 1043 iscompressed=1
1038# Unpack those pesky makeself generated files ... 1088# Unpack those pesky makeself generated files ...
1039# They're shell scripts with the binary package tagged onto 1089# They're shell scripts with the binary package tagged onto
1040# the end of the archive. Loki utilized the format as does 1090# the end of the archive. Loki utilized the format as does
1041# many other game companies. 1091# many other game companies.
1042# 1092#
1043# Usage: unpack_makeself [file to unpack] [offset] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1044# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1045# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1046# the proper offset from the script itself. 1096# the proper offset from the script itself.
1047unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1048 local src="`find_unpackable_file $1`" 1099 local src=$(find_unpackable_file "${src_input}")
1049 local skip="$2" 1100 local skip=$2
1101 local exe=$3
1050 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1051 local shrtsrc="`basename ${src}`" 1105 local shrtsrc=$(basename "${src}")
1052 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1053 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1054 then
1055 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1056 local skip=0 1109 local skip=0
1110 exe=tail
1057 case ${ver} in 1111 case ${ver} in
1058 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1059 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1060 ;; 1114 ;;
1061 2.0|2.0.1) 1115 2.0|2.0.1)
1062 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1063 ;; 1117 ;;
1064 2.1.1) 1118 2.1.1)
1065 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1119 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1066 let skip="skip + 1" 1120 let skip="skip + 1"
1067 ;; 1121 ;;
1068 2.1.2) 1122 2.1.2)
1069 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1123 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1070 let skip="skip + 1" 1124 let skip="skip + 1"
1071 ;; 1125 ;;
1072 2.1.3) 1126 2.1.3)
1073 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1074 let skip="skip + 1" 1128 let skip="skip + 1"
1129 ;;
1130 2.1.4|2.1.5)
1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1132 skip=$(head -n ${skip} "${src}" | wc -c)
1133 exe="dd"
1075 ;; 1134 ;;
1076 *) 1135 *)
1077 eerror "I'm sorry, but I was unable to support the Makeself file." 1136 eerror "I'm sorry, but I was unable to support the Makeself file."
1078 eerror "The version I detected was '${ver}'." 1137 eerror "The version I detected was '${ver}'."
1079 eerror "Please file a bug about the file ${shrtsrc} at" 1138 eerror "Please file a bug about the file ${shrtsrc} at"
1081 die "makeself version '${ver}' not supported" 1140 die "makeself version '${ver}' not supported"
1082 ;; 1141 ;;
1083 esac 1142 esac
1084 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1143 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1085 fi 1144 fi
1145 case ${exe} in
1146 tail) exe="tail -n +${skip} '${src}'";;
1147 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1148 *) die "makeself cant handle exe '${exe}'"
1149 esac
1086 1150
1087 # lets grab the first few bytes of the file to figure out what kind of archive it is 1151 # lets grab the first few bytes of the file to figure out what kind of archive it is
1088 local tmpfile="`mymktemp ${T}`" 1152 local tmpfile="$(emktemp)"
1089 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1153 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1090 local filetype="`file -b ${tmpfile}`" 1154 local filetype="$(file -b "${tmpfile}")"
1091 case ${filetype} in 1155 case ${filetype} in
1092 *tar\ archive) 1156 *tar\ archive)
1093 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1157 eval ${exe} | tar --no-same-owner -xf -
1094 ;; 1158 ;;
1095 bzip2*) 1159 bzip2*)
1096 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1160 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1097 ;; 1161 ;;
1098 gzip*) 1162 gzip*)
1099 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1163 eval ${exe} | tar --no-same-owner -xzf -
1100 ;; 1164 ;;
1101 compress*) 1165 compress*)
1102 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1166 eval ${exe} | gunzip | tar --no-same-owner -xf -
1103 ;; 1167 ;;
1104 *) 1168 *)
1105 eerror "Unknown filetype \"${filetype}\" ?" 1169 eerror "Unknown filetype \"${filetype}\" ?"
1106 false 1170 false
1107 ;; 1171 ;;
1116check_license() { 1180check_license() {
1117 local lic=$1 1181 local lic=$1
1118 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1119 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1120 else 1184 else
1121 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1122 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1123 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1124 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1125 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1126 lic="${src}" 1190 lic="${lic}"
1127 fi
1128 fi 1191 fi
1192 fi
1129 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1130 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1131 1195
1132 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1133 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1198 local shopts=$-
1134 local alic 1199 local alic
1200 set -o noglob #so that bash doesn't expand "*"
1135 for alic in "${ACCEPT_LICENSE}" ; do 1201 for alic in ${ACCEPT_LICENSE} ; do
1136 [ "${alic}" == "*" ] && return 0 1202 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1137 [ "${alic}" == "${l}" ] && return 0 1203 set +o noglob; set -${shopts} #reset old shell opts
1204 return 0
1205 fi
1138 done 1206 done
1207 set +o noglob; set -$shopts #reset old shell opts
1139 1208
1140 local licmsg="`mymktemp ${T}`" 1209 local licmsg="$(emktemp)"
1141 cat << EOF > ${licmsg} 1210 cat << EOF > ${licmsg}
1142********************************************************** 1211**********************************************************
1143The following license outlines the terms of use of this 1212The following license outlines the terms of use of this
1144package. You MUST accept this license for installation to 1213package. You MUST accept this license for installation to
1145continue. When you are done viewing, hit 'q'. If you 1214continue. When you are done viewing, hit 'q'. If you
1171# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1172# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1173# 1242#
1174# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1175# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1176# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1177# 1250#
1178# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1179# 1252#
1180# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1181# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1185 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1186 # the # of files they gave us 1259 # the # of files they gave us
1187 local cdcnt=0 1260 local cdcnt=0
1188 local f= 1261 local f=
1189 for f in "$@" ; do 1262 for f in "$@" ; do
1190 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1191 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1192 done 1265 done
1193 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1194 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1195 1268
1196 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1197 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1198 if [ ! -z "${CD_ROOT}" ] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1199 export CDROM_ROOT="${CD_ROOT}"
1200 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1201 return
1202 fi
1203 # do the same for CD_ROOT_X
1204 if [ ! -z "${CD_ROOT_1}" ] ; then
1205 local var= 1272 local var=
1206 cdcnt=0 1273 cdcnt=0
1207 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1208 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1209 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1210 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1211 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1212 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1213 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1214 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1215 fi 1283 fi
1216 export CDROM_ROOTS_${cdcnt}="${!var}"
1217 done 1284 done
1218 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1219 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1220 return 1293 return
1221 fi 1294 fi
1222 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1223 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1224 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1225 if [ -z "${CDROM_NAME}" ] ; then
1226 echo "cdrom for ${PN}."
1227 else
1228 echo "${CDROM_NAME}."
1229 fi
1230 echo 1300 echo
1231 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1232 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1233 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1234 einfo "directory containing the files." 1304 einfo "directory containing the files."
1235 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1236 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1237 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1238 cdcnt=0 1320 cdcnt=0
1239 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1240 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1241 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1242 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1243 done 1325 done
1244 echo 1326 echo
1245 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1246 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1247 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1248 einfon "" 1330 einfon ""
1249 cdcnt=0 1331 cdcnt=0
1250 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1251 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1252 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1253 done 1335 done
1254 echo 1336 echo
1255 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1256 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1257 einfo "and that place will be used as the same data source" 1339 einfo "and that place will be used as the same data source"
1258 einfo "for all the CDs." 1340 einfo "for all the CDs."
1259 echo 1341 echo
1342 einfo "For example:"
1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1344 echo
1260 fi 1345 fi
1346
1347 export CDROM_SET=""
1261 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1262 cdrom_load_next_cd 1349 cdrom_load_next_cd
1263} 1350}
1264 1351
1265# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1266# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1267# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1268# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1269cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1270 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1271 local var= 1357 local var
1272 1358 ((++CDROM_CURRENT_CD))
1273 if [ ! -z "${CD_ROOT}" ] ; then
1274 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1275 return
1276 fi
1277 1359
1278 unset CDROM_ROOT 1360 unset CDROM_ROOT
1279 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1280 if [ -z "${!var}" ] ; then 1363 if [[ -z ${!var} ]] ; then
1281 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1282 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1283 else 1366 else
1284 export CDROM_ROOT="${!var}" 1367 export CDROM_ROOT=${!var}
1285 fi 1368 fi
1286 1369
1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288} 1371}
1289 1372
1292# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1293# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1294# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1295# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1296# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1297cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1298 while [ -z "${CDROM_ROOT}" ] ; do
1299 local dir="$(dirname ${@})"
1300 local file="$(basename ${@})"
1301 local mline="" 1381 local mline=""
1302 local showedmsg=0 1382 local showedmsg=0
1303 1383
1304 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1392 local dir=$(dirname ${cdset[${i}]})
1393 local file=$(basename ${cdset[${i}]})
1394
1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1305 [ -d "${mline}/${dir}" ] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1306 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1307 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1308 done 1406 done
1309 1407
1310 if [ -z "${CDROM_ROOT}" ] ; then
1311 echo 1408 echo
1312 if [ ${showedmsg} -eq 0 ] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1313 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1314 if [ -z "${CDROM_NAME}" ] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1315 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1316 else
1317 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1318 fi
1319 else 1413 else
1320 if [ -z "${CDROM_NAME_1}" ] ; then
1321 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1322 else
1323 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1324 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1325 fi
1326 fi 1415 fi
1327 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1328 fi 1423 fi
1424 showedmsg=1
1425 fi
1329 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1330 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1331 read 1428 echo
1332 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1333 done 1434 done
1334} 1435}
1335 1436
1336# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1337# a package can support 1438# a package can support
1344# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1345# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1346# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1347# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1348strip-linguas() { 1449strip-linguas() {
1349 local ls newls 1450 local ls newls nols
1350 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1351 local op="$1"; shift 1452 local op=$1; shift
1352 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1353 local d f 1454 local d f
1354 for d in "$@" ; do 1455 for d in "$@" ; do
1355 if [ "${op}" == "-u" ] ; then 1456 if [[ ${op} == "-u" ]] ; then
1356 newls="${ls}" 1457 newls=${ls}
1357 else 1458 else
1358 newls="" 1459 newls=""
1359 fi 1460 fi
1360 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1361 if [ "${op}" == "-i" ] ; then 1462 if [[ ${op} == "-i" ]] ; then
1362 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1363 else 1464 else
1364 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1365 fi 1466 fi
1366 done 1467 done
1367 ls="${newls}" 1468 ls=${newls}
1368 done 1469 done
1369 ls="${ls//.po}"
1370 else 1470 else
1371 ls="$@" 1471 ls="$@"
1372 fi 1472 fi
1373 1473
1374 ls=" ${ls} " 1474 nols=""
1375 newls="" 1475 newls=""
1376 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1377 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1477 if hasq ${f} ${ls} ; then
1378 nl="${newls} ${f}" 1478 newls="${newls} ${f}"
1379 else 1479 else
1380 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1381 fi 1481 fi
1382 done 1482 done
1483 [[ -n ${nols} ]] \
1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1485 export LINGUAS=${newls:1}
1486}
1487
1488# moved from kernel.eclass since they are generally useful outside of
1489# kernel.eclass -iggy (20041002)
1490
1491# the following functions are useful in kernel module ebuilds, etc.
1492# for an example see ivtv or drbd ebuilds
1493
1494# set's ARCH to match what the kernel expects
1495set_arch_to_kernel() {
1496 i=10
1497 while ((i--)) ; do
1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1499 done
1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1501 case ${ARCH} in
1502 x86) export ARCH="i386";;
1503 amd64) export ARCH="x86_64";;
1504 hppa) export ARCH="parisc";;
1505 mips) export ARCH="mips";;
1506 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!
1507 *) export ARCH="${ARCH}";;
1508 esac
1509}
1510
1511# set's ARCH back to what portage expects
1512set_arch_to_portage() {
1513 i=10
1514 while ((i--)) ; do
1515 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1516 done
1517 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1518}
1519
1520# Jeremy Huddleston <eradicator@gentoo.org>:
1521# preserve_old_lib /path/to/libblah.so.0
1522# preserve_old_lib_notify /path/to/libblah.so.0
1523#
1524# These functions are useful when a lib in your package changes --library. Such
1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1526# would break packages that link against it. Most people get around this
1527# by using the portage SLOT mechanism, but that is not always a relevant
1528# solution, so instead you can add the following to your ebuilds:
1529#
1530# src_install() {
1531# ...
1532# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1533# ...
1534# }
1535#
1536# pkg_postinst() {
1537# ...
1538# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1539# ...
1540# }
1541
1542preserve_old_lib() {
1543 LIB=$1
1544
1545 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1546 SONAME=`basename ${LIB}`
1547 DIRNAME=`dirname ${LIB}`
1548
1549 dodir ${DIRNAME}
1550 cp ${ROOT}${LIB} ${D}${DIRNAME}
1551 touch ${D}${LIB}
1552 fi
1553}
1554
1555preserve_old_lib_notify() {
1556 LIB=$1
1557
1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1559 SONAME=`basename ${LIB}`
1560
1561 ewarn "An old version of an installed library was detected on your system."
1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1563 ewarn "is not being removed. In order to make full use of this newer version,"
1564 ewarn "you will need to execute the following command:"
1565 ewarn " revdep-rebuild --library ${SONAME}"
1566 ewarn
1567 ewarn "After doing that, you can safely remove ${LIB}"
1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1569 fi
1570}
1571
1572# Hack for people to figure out if a package was built with
1573# certain USE flags
1574#
1575# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1576# ex: built_with_use xchat gtk2
1577#
1578# Flags: -a all USE flags should be utilized
1579# -o at least one USE flag should be utilized
1580# Note: the default flag is '-a'
1581built_with_use() {
1582 local opt=$1
1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1584
1585 local PKG=$(best_version $1)
1586 shift
1587
1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1592 [[ ! -e ${USEFILE} ]] && return 0
1593
1594 local USE_BUILT=$(<${USEFILE})
1595 while [[ $# -gt 0 ]] ; do
1596 if [[ ${opt} = "-o" ]] ; then
1597 has $1 ${USE_BUILT} && return 0
1598 else
1599 has $1 ${USE_BUILT} || return 1
1600 fi
1601 shift
1602 done
1603 [[ ${opt} = "-a" ]]
1604}
1605
1606# Many configure scripts wrongly bail when a C++ compiler
1607# could not be detected. #73450
1608epunt_cxx() {
1609 local dir=$1
1610 [[ -z ${dir} ]] && dir=${S}
1611 ebegin "Removing useless C++ checks"
1612 local f
1613 for f in $(find ${dir} -name configure) ; do
1614 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1615 done
1616 eend 0
1617}
1618
1619# dopamd <file> [more files]
1620#
1621# Install pam auth config file in /etc/pam.d
1622dopamd() {
1623 [[ -z $1 ]] && die "dopamd requires at least one argument"
1624
1625 use pam || return 0
1626
1627 INSDESTTREE=/etc/pam.d \
1628 doins "$@" || die "failed to install $@"
1629}
1630# newpamd <old name> <new name>
1631#
1632# Install pam file <old name> as <new name> in /etc/pam.d
1633newpamd() {
1634 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1635
1636 use pam || return 0
1637
1638 INSDESTTREE=/etc/pam.d \
1639 newins "$1" "$2" || die "failed to install $1 as $2"
1640}
1641
1642# make a wrapper script ...
1643# NOTE: this was originally games_make_wrapper, but I noticed other places where
1644# this could be used, so I have moved it here and made it not games-specific
1645# -- wolf31o2
1646# $1 == wrapper name
1647# $2 == binary to run
1648# $3 == directory to chdir before running binary
1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1650# $5 == path for wrapper
1651make_wrapper() {
1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1656 cat << EOF > "${tmpwrapper}"
1657#!/bin/sh
1658cd "${chdir:-.}"
1383 if [ -z "${newls}" ] ; then 1659if [ -n "${libdir}" ] ; then
1384 unset LINGUAS 1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1385 else 1662 else
1386 export LINGUAS="${newls}" 1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1387 fi 1665fi
1666exec ${bin} "\$@"
1667EOF
1668 chmod go+rx "${tmpwrapper}"
1669 if [[ -n ${path} ]] ; then
1670 exeinto "${path}"
1671 newexe "${tmpwrapper}" "${wrapper}"
1672 else
1673 newbin "${tmpwrapper}" "${wrapper}"
1674 fi
1388} 1675}

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20