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

Diff of /eclass/eutils.eclass

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

Revision 1.99 Revision 1.247
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.99 2004/09/07 11:41:29 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 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 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
55 # if there is an override, we want to use that... always.
56 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
57 elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
58 # and if there isnt an override, and we're using a version of
59 # portage without CONF_LIBDIR support, force the use of lib. dolib
60 # and friends from portage 2.0.50 wont be too happy otherwise.
61 CONF_LIBDIR="lib"
62 fi
63 # and of course, default to lib if CONF_LIBDIR isnt set
64 echo ${CONF_LIBDIR:=lib}
65}
66
67# Sometimes you need to override the value returned by get_libdir. A good
68# example of this is xorg-x11, where lib32 isnt a supported configuration,
69# and where lib64 -must- be used on amd64 (for applications that need lib
70# to be 32bit, such as adobe acrobat). Note that this override also bypasses
71# portage version sanity checking.
72# get_libdir_override expects one argument, the result get_libdir should
73# return:
74#
75# get_libdir_override lib64
76#
77# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
78get_libdir_override() {
79 CONF_LIBDIR="$1"
80 CONF_LIBDIR_OVERRIDE="$1"
81} 39}
82 40
83# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
84# 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
85# 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
97# to point to the latest version of the library present. 55# to point to the latest version of the library present.
98# 56#
99# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
100# 58#
101gen_usr_ldscript() { 59gen_usr_ldscript() {
60 local lib libdir=$(get_libdir)
102 # Just make sure it exists 61 # Just make sure it exists
103 dodir /usr/$(get_libdir) 62 dodir /usr/${libdir}
104 63
64 for lib in "${@}" ; do
105 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT" 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
106/* GNU ld script 66 /* GNU ld script
107 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
108 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
109 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
110 otherwise we run into linking problems. 70 otherwise we run into linking problems.
111 See bug #4411 on http://bugs.gentoo.org/ for 71
112 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
74 GROUP ( /${libdir}/${lib} )
113END_LDSCRIPT 75 END_LDSCRIPT
114 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
115 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
116 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
117
118 return 0
119}
120
121# Simple function to draw a line consisting of '=' the same length as $*
122#
123# <azarah@gentoo.org> (11 Nov 2002)
124#
125draw_line() {
126 local i=0
127 local str_length=""
128
129 # Handle calls that do not have args, or wc not being installed ...
130 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
131 then
132 echo "==============================================================="
133 return 0
134 fi
135
136 # Get the length of $*
137 str_length="$(echo -n "$*" | wc -m)"
138
139 while [ "$i" -lt "${str_length}" ]
140 do
141 echo -n "="
142
143 i=$((i + 1))
144 done 77 done
145
146 echo
147
148 return 0
149} 78}
79
150 80
151# Default directory where patches are located 81# Default directory where patches are located
152EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
153# Default extension for patches 83# Default extension for patches
154EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
155# Default options for patch 85# Default options for patch
156# 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
157EPATCH_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"
158# 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,
159# and not the full path .. 91# and not the full path ..
160EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
161# Change the printed message for a single patch. 93# Change the printed message for a single patch.
162EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
163# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
164# 98#
165# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
166# 100#
167EPATCH_FORCE="no" 101EPATCH_FORCE="no"
198# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
199# 133#
200# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
201# 135#
202epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
203 local PIPE_CMD="" 142 local PIPE_CMD=""
204 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
205 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
206 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
207 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
208 local x="" 147 local x=""
209 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
210 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
211 then 152 then
212 local m="" 153 local m=""
213 einfo "${#} patches to apply..."
214 for m in "$@" ; do 154 for m in "$@" ; do
215 epatch "${m}" 155 epatch "${m}"
216 done 156 done
217 return 0 157 return 0
218 fi 158 fi
232 local EPATCH_SOURCE="$1/*" 172 local EPATCH_SOURCE="$1/*"
233 else 173 else
234 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 174 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
235 fi 175 fi
236 else 176 else
237 if [ ! -d ${EPATCH_SOURCE} ] 177 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
238 then 178 then
239 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 179 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
240 then 180 then
241 EPATCH_SOURCE="$1" 181 EPATCH_SOURCE="$1"
242 fi 182 fi
243 183
244 echo 184 echo
245 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 185 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
246 eerror 186 eerror
247 eerror " ${EPATCH_SOURCE}" 187 eerror " ${EPATCH_SOURCE}"
188 eerror " ( ${EPATCH_SOURCE##*/} )"
248 echo 189 echo
249 die "Cannot find \$EPATCH_SOURCE!" 190 die "Cannot find \$EPATCH_SOURCE!"
250 fi 191 fi
251 192
252 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 193 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
271 ;; 212 ;;
272 esac 213 esac
273 214
274 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
275 then 216 then
276 einfo "Applying various patches (bugfixes/updates)..." 217 einfo "${EPATCH_MULTI_MSG}"
277 fi 218 fi
278 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
279 do 220 do
280 # New ARCH dependant patch naming scheme... 221 # New ARCH dependant patch naming scheme ...
281 # 222 #
282 # ???_arch_foo.patch 223 # ???_arch_foo.patch
283 # 224 #
284 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
285 ([ "${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}" ] || \
286 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
287 then 228 then
288 local count=0 229 local count=0
289 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
231 local patchname=${x##*/}
290 232
291 if [ -n "${EPATCH_EXCLUDE}" ] 233 if [ -n "${EPATCH_EXCLUDE}" ]
292 then 234 then
293 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 235 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
294 then 236 then
295 continue 237 continue
296 fi 238 fi
297 fi 239 fi
298 240
300 then 242 then
301 if [ -n "${EPATCH_SINGLE_MSG}" ] 243 if [ -n "${EPATCH_SINGLE_MSG}" ]
302 then 244 then
303 einfo "${EPATCH_SINGLE_MSG}" 245 einfo "${EPATCH_SINGLE_MSG}"
304 else 246 else
305 einfo "Applying ${x##*/}..." 247 einfo "Applying ${patchname} ..."
306 fi 248 fi
307 else 249 else
308 einfo " ${x##*/}..." 250 einfo " ${patchname} ..."
309 fi 251 fi
310 252
311 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
313 255
314 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
315 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
316 do 258 do
317 # Generate some useful debug info ... 259 # Generate some useful debug info ...
318 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 262
321 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
322 then 264 then
323 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 else 267 else
326 PATCH_TARGET="${x}" 268 PATCH_TARGET="${x}"
327 fi 269 fi
328 270
329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 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##*/}
331 273
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 276
335 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then 278 then
337 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
338 then 280 then
339 echo 281 echo
340 eerror "Could not extract patch!" 282 eerror "Could not extract patch!"
341 #die "Could not extract patch!" 283 #die "Could not extract patch!"
342 count=5 284 count=5
343 break 285 break
344 fi 286 fi
345 fi 287 fi
346 288
347 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
348 then 290 then
349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
351 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
354 296
355 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
356 299
357 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
358 then 301 then
359 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##*/}
360 echo 303 echo
361 eerror "A dry-run of patch command succeeded, but actually" 304 eerror "A dry-run of patch command succeeded, but actually"
362 eerror "applying the patch failed!" 305 eerror "applying the patch failed!"
363 #die "Real world sux compared to the dreamworld!" 306 #die "Real world sux compared to the dreamworld!"
364 count=5 307 count=5
365 fi 308 fi
366 309
367 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 311
369 break 312 break
370 fi 313 fi
371 314
372 count=$((count + 1)) 315 count=$((count + 1))
378 fi 321 fi
379 322
380 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
381 then 324 then
382 echo 325 echo
383 eerror "Failed Patch: ${x##*/}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
384 eerror 328 eerror
385 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
386 eerror 330 eerror
387 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
388 echo 332 echo
389 die "Failed Patch: ${x##*/}!" 333 die "Failed Patch: ${patchname}!"
390 fi 334 fi
391 335
392 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
393 337
394 eend 0 338 eend 0
395 fi 339 fi
396 done 340 done
397 if [ "${SINGLE_PATCH}" = "no" ] 341 if [ "${SINGLE_PATCH}" = "no" ]
398 then 342 then
399 einfo "Done with patching" 343 einfo "Done with patching"
400 fi 344 fi
401} 345}
402 346
403# This function return true if we are using the NPTL pthreads
404# implementation.
405#
406# <azarah@gentoo.org> (06 March 2003)
407#
408
409have_NPTL() {
410
411 cat > ${T}/test-nptl.c <<-"END"
412 #define _XOPEN_SOURCE
413 #include <unistd.h>
414 #include <stdio.h>
415
416 int main()
417 {
418 char buf[255];
419 char *str = buf;
420
421 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
422 if (NULL != str) {
423 printf("%s\n", str);
424 if (NULL != strstr(str, "NPTL"))
425 return 0;
426 }
427
428 return 1;
429 }
430 END
431
432 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
433 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
434 then
435 echo "yes"
436 einfon "Checking what PTHREADS implementation we have ... "
437 if ${T}/nptl
438 then
439 return 0
440 else
441 return 1
442 fi
443 else
444 echo "no"
445 fi
446
447 return 1
448}
449
450# This function check how many cpu's are present, and then set
451# -j in MAKEOPTS accordingly.
452#
453# Thanks to nall <nall@gentoo.org> for this.
454#
455get_number_of_jobs() {
456 local jobs=0
457
458 if [ ! -r /proc/cpuinfo ]
459 then
460 return 1
461 fi
462
463 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
464 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
465 then
466 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
467 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
468 ADMINPARAM="${ADMINPARAM/-j}"
469 fi
470
471 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
472
473 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
474 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
475 then
476 # these archs will always have "[Pp]rocessor"
477 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
478
479 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
480 then
481 # sparc always has "ncpus active"
482 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
483
484 elif [ "${ARCH}" = "alpha" ]
485 then
486 # alpha has "cpus active", but only when compiled with SMP
487 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
488 then
489 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490 else
491 jobs=2
492 fi
493
494 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
495 then
496 # ppc has "processor", but only when compiled with SMP
497 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
500 else
501 jobs=2
502 fi
503 elif [ "${ARCH}" = "s390" ]
504 then
505 # s390 has "# processors : "
506 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
507 else
508 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
509 die "Unknown ARCH -- ${ARCH}!"
510 fi
511
512 # Make sure the number is valid ...
513 if [ "${jobs}" -lt 1 ]
514 then
515 jobs=1
516 fi
517
518 if [ -n "${ADMINPARAM}" ]
519 then
520 if [ "${jobs}" -gt "${ADMINPARAM}" ]
521 then
522 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
523 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
524 else
525 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
526 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
527 fi
528 fi
529}
530
531# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
532# does not exist on the users system 348# does not exist on the users system
533# vapier@gentoo.org 349# vapier@gentoo.org
534# 350#
535# Takes just 1 parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
536mymktemp() { 352emktemp() {
353 local exe="touch"
354 [[ $1 == -d ]] && exe="mkdir" && shift
537 local topdir="$1" 355 local topdir=$1
538 356
539 [ -z "${topdir}" ] && topdir=/tmp 357 if [[ -z ${topdir} ]] ; then
540 if [ "`which mktemp 2>/dev/null`" ] 358 [[ -z ${T} ]] \
541 then 359 && topdir="/tmp" \
542 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}"
543 else 370 else
544 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 371 if [[ ${exe} == "touch" ]] ; then
545 touch ${tmp} 372 [[ ${USERLAND} == "GNU" ]] \
546 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
547 fi 379 fi
380 fi
548} 381}
549 382
550# Small wrapper for getent (Linux) and nidump (Mac OS X) 383# Small wrapper for getent (Linux), nidump (Mac OS X),
551# used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
552# 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>
553# 387#
554# egetent(database, key) 388# egetent(database, key)
555egetent() { 389egetent() {
556 if [ "${ARCH}" == "macos" ] ; then 390 case ${CHOST} in
391 *-darwin*)
557 case "$2" in 392 case "$2" in
558 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
559 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
560 ;; 395 ;;
561 *) # Numeric 396 *) # Numeric
562 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
563 ;; 398 ;;
564 esac 399 esac
565 else 400 ;;
566 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"
567 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
568} 420}
569 421
570# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
571# vapier@gentoo.org 423# vapier@gentoo.org
572# 424#
579# shell: /bin/false 431# shell: /bin/false
580# homedir: /dev/null 432# homedir: /dev/null
581# groups: none 433# groups: none
582# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
583enewuser() { 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
584 # get the username 443 # get the username
585 local euser="$1"; shift 444 local euser=$1; shift
586 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
587 then
588 eerror "No username specified !" 446 eerror "No username specified !"
589 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
590 fi 448 fi
591 449
592 # lets see if the username already exists 450 # lets see if the username already exists
593 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
594 then
595 return 0 452 return 0
596 fi 453 fi
597 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
598 455
599 # options to pass to useradd 456 # options to pass to useradd
600 local opts= 457 local opts=
601 458
602 # handle uid 459 # handle uid
603 local euid="$1"; shift 460 local euid=$1; shift
604 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
605 then
606 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
607 then
608 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
609 then
610 euid="next" 464 euid="next"
611 fi 465 fi
612 else 466 else
613 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
614 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
615 fi 469 fi
616 else 470 else
617 euid="next" 471 euid="next"
618 fi 472 fi
619 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
620 then 474 for euid in $(seq 101 999) ; do
621 local pwrange
622 if [ "${ARCH}" == "macos" ] ; then
623 pwrange="`jot 898 101`"
624 else
625 pwrange="`seq 101 999`"
626 fi
627 for euid in ${pwrange} ; do
628 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
629 done 476 done
630 fi 477 fi
631 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
632 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
633 480
634 # handle shell 481 # handle shell
635 local eshell="$1"; shift 482 local eshell=$1; shift
636 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
637 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
638 if [ ! -e "${eshell}" ]
639 then
640 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
641 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"
642 fi 491 fi
643 else 492 else
644 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}
645 fi 503 fi
646 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
647 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
648 506
649 # handle homedir 507 # handle homedir
650 local ehome="$1"; shift 508 local ehome=$1; shift
651 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
652 then
653 ehome="/dev/null" 510 ehome="/dev/null"
654 fi 511 fi
655 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
656 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
657 514
658 # handle groups 515 # handle groups
659 local egroups="$1"; shift 516 local egroups=$1; shift
660 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
661 then
662 local oldifs="${IFS}" 518 local oldifs=${IFS}
519 local defgroup="" exgroups=""
520
663 export IFS="," 521 export IFS=","
664 for g in ${egroups} 522 for g in ${egroups} ; do
665 do 523 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
670 fi 527 fi
528 if [[ -z ${defgroup} ]] ; then
529 defgroup=${g}
530 else
531 exgroups="${exgroups},${g}"
532 fi
533 export IFS=","
671 done 534 done
672 export IFS="${oldifs}" 535 export IFS=${oldifs}
536
673 opts="${opts} -g ${egroups}" 537 opts="${opts} -g ${defgroup}"
538 if [[ ! -z ${exgroups} ]] ; then
539 opts="${opts} -G ${exgroups:1}"
540 fi
674 else 541 else
675 egroups="(none)" 542 egroups="(none)"
676 fi 543 fi
677 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
678 545
679 # handle extra and add the user 546 # handle extra and add the user
680 local eextra="$@"
681 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
682 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
683 if [ "${ARCH}" == "macos" ]; 549 case ${CHOST} in
684 then 550 *-darwin*)
685 ### Make the user 551 ### Make the user
686 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
687 then
688 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
689 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
690 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
691 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
692 ### Add the user to the groups specified 557 ### Add the user to the groups specified
558 local oldifs=${IFS}
559 export IFS=","
693 for g in ${egroups} 560 for g in ${egroups} ; do
694 do
695 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
696 done 562 done
563 export IFS=${oldifs}
697 else 564 else
698 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
699 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
700 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
701 die "Required function missing" 568 die "Required function missing"
702 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"
703 else 576 else
704 if [ -z "${eextra}" ] 577 einfo " - Extra: $@"
705 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
706 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
707 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
708 || die "enewuser failed" 609 || die "enewuser failed"
709 else 610 else
710 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
711 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
712 || die "enewuser failed" 613 || die "enewuser failed"
713 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}"
714 fi 623 fi
624
715 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
716
717 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
718 then
719 einfo " - Creating ${ehome} in ${D}"
720 dodir ${ehome}
721 fowners ${euser} ${ehome}
722 fperms 755 ${ehome}
723 fi
724} 626}
725 627
726# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
727# vapier@gentoo.org 629# vapier@gentoo.org
728# 630#
731# Default values if you do not specify any: 633# Default values if you do not specify any:
732# groupname: REQUIRED ! 634# groupname: REQUIRED !
733# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
734# extra: none 636# extra: none
735enewgroup() { 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
736 # get the group 645 # get the group
737 local egroup="$1"; shift 646 local egroup="$1"; shift
738 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
739 then 648 then
740 eerror "No group specified !" 649 eerror "No group specified !"
757 then 666 then
758 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
759 then 668 then
760 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
761 then 670 then
762 if [ "${ARCH}" == "macos" ] ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
763 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
764 else 673 else
765 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
766 fi 675 fi
767 else 676 else
781 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
782 691
783 # add the group 692 # add the group
784 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
785 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
786 if [ "${ARCH}" == "macos" ]; 695 case ${CHOST} in
787 then 696 *-darwin*)
788 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
789 then 698 then
790 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
791 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
792 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
793 die "Required function missing" 702 die "Required function missing"
794 fi 703 fi
795 704
796 # If we need the next available 705 # If we need the next available
797 case ${egid} in 706 case ${egid} in
798 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
799 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
800 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
801 done 710 done
802 esac 711 esac
803 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
804 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
805 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 *)
806 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
807 fi 738 ;;
739 esac
808 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
809} 741}
810 742
811# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
812# vapier@gentoo.org 744# vapier@gentoo.org
813# 745#
814# edos2unix(file, <more files>...) 746# edos2unix(file, <more files> ...)
815edos2unix() { 747edos2unix() {
816 for f in "$@" 748 for f in "$@"
817 do 749 do
818 cp "${f}" ${T}/edos2unix 750 cp "${f}" ${T}/edos2unix
819 sed 's/\r$//' ${T}/edos2unix > "${f}" 751 sed 's/\r$//' ${T}/edos2unix > "${f}"
820 done 752 done
821} 753}
822 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
823# Make a desktop file ! 762# Make a desktop file !
824# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
825# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
826# gnome2 /usr/share/applications
827# gnome1 /usr/share/gnome/apps/
828# KDE ${KDEDIR}/share/applnk /usr/share/applnk
829# 765#
830# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
831# 767#
832# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
833# name: the name that will show up in the menu 769# name: the name that will show up in the menu
834# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
835# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
836# a full path to an icon 772# a full path to an icon
837# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
838# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
839# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
840make_desktop_entry() { 776make_desktop_entry() {
841 [ -z "$1" ] && eerror "You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
842 778
843 local exec="${1}" 779 local exec=${1}
844 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
845 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
846 local type="${4}" 782 local type=${4}
847 local subdir="${6}" 783 local path=${5}
848 local path="${5:-${GAMES_PREFIX}}" 784
849 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
850 then 786 local catmaj=${CATEGORY%%-*}
851 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
852 "app-emulation") 788 case ${catmaj} in
853 type=Emulator 789 app)
854 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
855 ;; 803 ;;
856 "games-"*) 804
857 type=Game 805 dev)
858 subdir="Games" 806 type="Development"
859 ;; 807 ;;
860 "net-"*) 808
861 type=Network 809 games)
862 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}"
863 ;; 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
864 *) 879 *)
865 type= 880 type=
866 subdir=
867 ;; 881 ;;
868 esac 882 esac
869 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
870 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
871 891
872echo "[Desktop Entry] 892echo "[Desktop Entry]
873Encoding=UTF-8 893Encoding=UTF-8
874Version=0.9.2 894Version=0.9.2
875Name=${name} 895Name=${name}
876Type=Application 896Type=Application
877Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
878Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
879Path=${path} 900Path=${path}
880Icon=${icon} 901Icon=${icon}
881Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
882 903
883 if [ -d "/usr/share/applications" ] 904 (
884 then 905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
885 insinto /usr/share/applications 907 insinto /usr/share/applications
886 doins "${desktop}" 908 doins "${desktop}"
887 fi 909 )
910}
888 911
889 #if [ -d "/usr/share/gnome/apps" ] 912# Make a GDM/KDM Session file
890 #then 913#
891 # insinto /usr/share/gnome/apps/Games 914# make_desktop_entry(<title>, <command>)
892 # doins ${desktop} 915# title: File to execute to start the Window Manager
893 #fi 916# command: Name of the Window Manager
894 917
895 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 918make_session_desktop() {
896 #then 919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
897 # for ver in /usr/kde/* 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
898 # do
899 # insinto ${ver}/share/applnk/Games
900 # doins ${desktop}
901 # done
902 #fi
903 921
904 if [ -d "/usr/share/applnk" ] 922 local title=$1
905 then 923 local command=$2
906 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
907 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
908 fi 948 fi
909 949 done
910 return 0
911} 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
912 978
913# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
914find_unpackable_file() { 980find_unpackable_file() {
915 local src="$1" 981 local src=$1
916 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
917 then
918 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
919 else 984 else
920 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
921 then
922 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
923 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
924 then
925 src="${PWD}/${src}" 988 src=${PWD}/${src}
926 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
927 then
928 src="${src}" 990 src=${src}
929 fi
930 fi 991 fi
931 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
932 echo "${src}" 994 echo "${src}"
933} 995}
934 996
935# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
936# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
951# lseek 1013# lseek
952# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
953# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
954# 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.
955unpack_pdv() { 1017unpack_pdv() {
956 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
957 local sizeoff_t="$2" 1019 local sizeoff_t=$2
958 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
959 [ -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 :("
960 1023
961 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
962 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
963 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
964 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\"`
965 1028
966 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
967 local metafile="`mymktemp ${T}`" 1030 local metafile="$(emktemp)"
968 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1031 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
969 1032
970 # rip out the final file name from the metadata 1033 # rip out the final file name from the metadata
971 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1034 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
972 datafile="`basename ${datafile}`" 1035 datafile="`basename ${datafile}`"
973 1036
974 # now lets uncompress/untar the file if need be 1037 # now lets uncompress/untar the file if need be
975 local tmpfile="`mymktemp ${T}`" 1038 local tmpfile="$(emktemp)"
976 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}
977 1040
978 local iscompressed="`file -b ${tmpfile}`" 1041 local iscompressed="`file -b ${tmpfile}`"
979 if [ "${iscompressed:0:8}" == "compress" ] ; then 1042 if [ "${iscompressed:0:8}" == "compress" ] ; then
980 iscompressed=1 1043 iscompressed=1
1025# Unpack those pesky makeself generated files ... 1088# Unpack those pesky makeself generated files ...
1026# They're shell scripts with the binary package tagged onto 1089# They're shell scripts with the binary package tagged onto
1027# the end of the archive. Loki utilized the format as does 1090# the end of the archive. Loki utilized the format as does
1028# many other game companies. 1091# many other game companies.
1029# 1092#
1030# Usage: unpack_makeself [file to unpack] [offset] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1031# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1032# - 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
1033# the proper offset from the script itself. 1096# the proper offset from the script itself.
1034unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1035 local src="`find_unpackable_file $1`" 1099 local src=$(find_unpackable_file "${src_input}")
1036 local skip="$2" 1100 local skip=$2
1101 local exe=$3
1037 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1038 local shrtsrc="`basename ${src}`" 1105 local shrtsrc=$(basename "${src}")
1039 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1040 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1041 then
1042 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1043 local skip=0 1109 local skip=0
1110 exe=tail
1044 case ${ver} in 1111 case ${ver} in
1045 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
1046 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1047 ;; 1114 ;;
1048 2.0|2.0.1) 1115 2.0|2.0.1)
1049 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1050 ;; 1117 ;;
1051 2.1.1) 1118 2.1.1)
1052 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1119 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1053 let skip="skip + 1" 1120 let skip="skip + 1"
1054 ;; 1121 ;;
1055 2.1.2) 1122 2.1.2)
1056 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1123 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1057 let skip="skip + 1" 1124 let skip="skip + 1"
1058 ;; 1125 ;;
1059 2.1.3) 1126 2.1.3)
1060 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1061 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"
1062 ;; 1134 ;;
1063 *) 1135 *)
1064 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."
1065 eerror "The version I detected was '${ver}'." 1137 eerror "The version I detected was '${ver}'."
1066 eerror "Please file a bug about the file ${shrtsrc} at" 1138 eerror "Please file a bug about the file ${shrtsrc} at"
1068 die "makeself version '${ver}' not supported" 1140 die "makeself version '${ver}' not supported"
1069 ;; 1141 ;;
1070 esac 1142 esac
1071 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1143 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1072 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
1073 1150
1074 # 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
1075 local tmpfile="`mymktemp ${T}`" 1152 local tmpfile="$(emktemp)"
1076 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1153 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1077 local filetype="`file -b ${tmpfile}`" 1154 local filetype="$(file -b "${tmpfile}")"
1078 case ${filetype} in 1155 case ${filetype} in
1079 *tar\ archive) 1156 *tar\ archive)
1080 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1157 eval ${exe} | tar --no-same-owner -xf -
1081 ;; 1158 ;;
1082 bzip2*) 1159 bzip2*)
1083 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1160 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1084 ;; 1161 ;;
1085 gzip*) 1162 gzip*)
1086 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1163 eval ${exe} | tar --no-same-owner -xzf -
1087 ;; 1164 ;;
1088 compress*) 1165 compress*)
1089 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1166 eval ${exe} | gunzip | tar --no-same-owner -xf -
1090 ;; 1167 ;;
1091 *) 1168 *)
1092 eerror "Unknown filetype \"${filetype}\" ?" 1169 eerror "Unknown filetype \"${filetype}\" ?"
1093 false 1170 false
1094 ;; 1171 ;;
1103check_license() { 1180check_license() {
1104 local lic=$1 1181 local lic=$1
1105 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1106 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1107 else 1184 else
1108 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1109 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1110 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1111 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1112 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1113 lic="${src}" 1190 lic="${lic}"
1114 fi
1115 fi 1191 fi
1192 fi
1116 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1117 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1118 1195
1119 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1120 # 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=$-
1121 local alic 1199 local alic
1200 set -o noglob #so that bash doesn't expand "*"
1122 for alic in "${ACCEPT_LICENSE}" ; do 1201 for alic in ${ACCEPT_LICENSE} ; do
1123 [ "${alic}" == "*" ] && return 0 1202 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1124 [ "${alic}" == "${l}" ] && return 0 1203 set +o noglob; set -${shopts} #reset old shell opts
1204 return 0
1205 fi
1125 done 1206 done
1207 set +o noglob; set -$shopts #reset old shell opts
1126 1208
1127 local licmsg="`mymktemp ${T}`" 1209 local licmsg="$(emktemp)"
1128 cat << EOF > ${licmsg} 1210 cat << EOF > ${licmsg}
1129********************************************************** 1211**********************************************************
1130The following license outlines the terms of use of this 1212The following license outlines the terms of use of this
1131package. You MUST accept this license for installation to 1213package. You MUST accept this license for installation to
1132continue. When you are done viewing, hit 'q'. If you 1214continue. When you are done viewing, hit 'q'. If you
1158# 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
1159# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1160# 1242#
1161# 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',
1162# 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
1163# 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_#
1164# 1250#
1165# 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.
1166# 1252#
1167# 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] [...]
1168# - 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
1172 # 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
1173 # the # of files they gave us 1259 # the # of files they gave us
1174 local cdcnt=0 1260 local cdcnt=0
1175 local f= 1261 local f=
1176 for f in "$@" ; do 1262 for f in "$@" ; do
1177 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1178 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1179 done 1265 done
1180 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1181 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1182 1268
1183 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1184 # 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
1185 if [ ! -z "${CD_ROOT}" ] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1186 export CDROM_ROOT="${CD_ROOT}"
1187 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1188 return
1189 fi
1190 # do the same for CD_ROOT_X
1191 if [ ! -z "${CD_ROOT_1}" ] ; then
1192 local var= 1272 local var=
1193 cdcnt=0 1273 cdcnt=0
1194 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1195 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1196 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1197 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1198 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1199 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1200 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."
1201 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1202 fi 1283 fi
1203 export CDROM_ROOTS_${cdcnt}="${!var}"
1204 done 1284 done
1205 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1206 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}
1207 return 1293 return
1208 fi 1294 fi
1209 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1210 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1211 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1212 if [ -z "${CDROM_NAME}" ] ; then
1213 echo "cdrom for ${PN}."
1214 else
1215 echo "${CDROM_NAME}."
1216 fi
1217 echo 1300 echo
1218 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"
1219 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1220 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1221 einfo "directory containing the files." 1304 einfo "directory containing the files."
1222 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1223 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
1224 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1225 cdcnt=0 1320 cdcnt=0
1226 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1227 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1228 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1229 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1230 done 1325 done
1231 echo 1326 echo
1232 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"
1233 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1234 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1235 einfon "" 1330 einfon ""
1236 cdcnt=0 1331 cdcnt=0
1237 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1238 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1239 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1240 done 1335 done
1241 echo 1336 echo
1242 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"
1243 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1244 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"
1245 einfo "for all the CDs." 1340 einfo "for all the CDs."
1246 echo 1341 echo
1342 einfo "For example:"
1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1344 echo
1247 fi 1345 fi
1346
1347 export CDROM_SET=""
1248 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1249 cdrom_load_next_cd 1349 cdrom_load_next_cd
1250} 1350}
1251 1351
1252# 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.
1253# 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.
1254# 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.
1255# 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.
1256cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1257 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1258 local var= 1357 local var
1259 1358 ((++CDROM_CURRENT_CD))
1260 if [ ! -z "${CD_ROOT}" ] ; then
1261 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1262 return
1263 fi
1264 1359
1265 unset CDROM_ROOT 1360 unset CDROM_ROOT
1266 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1267 if [ -z "${!var}" ] ; then 1363 if [[ -z ${!var} ]] ; then
1268 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1269 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1270 else 1366 else
1271 export CDROM_ROOT="${!var}" 1367 export CDROM_ROOT=${!var}
1272 fi 1368 fi
1273 1369
1274 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1275} 1371}
1276 1372
1279# 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
1280# 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
1281# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1282# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1283# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1284cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1285 while [ -z "${CDROM_ROOT}" ] ; do
1286 local dir="$(dirname ${@})"
1287 local file="$(basename ${@})"
1288 local mline="" 1381 local mline=""
1289 local showedmsg=0 1382 local showedmsg=0
1290 1383
1291 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
1292 [ -d "${mline}/${dir}" ] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1293 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1294 && 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))
1295 done 1406 done
1296 1407
1297 if [ -z "${CDROM_ROOT}" ] ; then
1298 echo 1408 echo
1299 if [ ${showedmsg} -eq 0 ] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1300 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1301 if [ -z "${CDROM_NAME}" ] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1302 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1303 else
1304 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1305 fi
1306 else 1413 else
1307 if [ -z "${CDROM_NAME_1}" ] ; then
1308 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1309 else
1310 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1311 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1312 fi
1313 fi 1415 fi
1314 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
1315 fi 1423 fi
1424 showedmsg=1
1425 fi
1316 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1317 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1318 read 1428 echo
1319 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"
1320 done 1434 done
1321} 1435}
1322 1436
1323# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1324# a package can support 1438# a package can support
1325# 1439#
1326# usage: strip-linguas <allow LINGUAS> 1440# usage: strip-linguas <allow LINGUAS>
1327# strip-linguas -i <directories of .po files> 1441# strip-linguas -i <directories of .po files>
1328# strip-linguas -u <directories of .po files> 1442# strip-linguas -u <directories of .po files>
1329# 1443#
1330# The first form allows you to specify a list of LINGUAS. 1444# The first form allows you to specify a list of LINGUAS.
1331# 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
1332# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1333# 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
1334# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1335strip-linguas() { 1449strip-linguas() {
1336 local ls newls 1450 local ls newls nols
1337 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1338 local op="$1"; shift 1452 local op=$1; shift
1339 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1340 local d f 1454 local d f
1341 for d in "$@" ; do 1455 for d in "$@" ; do
1342 if [ "${op}" == "-u" ] ; then 1456 if [[ ${op} == "-u" ]] ; then
1343 newls="${ls}" 1457 newls=${ls}
1344 else 1458 else
1345 newls="" 1459 newls=""
1346 fi 1460 fi
1347 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1348 if [ "${op}" == "-i" ] ; then 1462 if [[ ${op} == "-i" ]] ; then
1349 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1350 else 1464 else
1351 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1352 fi 1466 fi
1353 done 1467 done
1354 ls="${newls}" 1468 ls=${newls}
1355 done 1469 done
1356 ls="${ls//.po}"
1357 else 1470 else
1358 ls="$@" 1471 ls="$@"
1359 fi 1472 fi
1360 1473
1361 ls=" ${ls} " 1474 nols=""
1362 newls="" 1475 newls=""
1363 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1364 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1477 if hasq ${f} ${ls} ; then
1365 nl="${newls} ${f}" 1478 newls="${newls} ${f}"
1366 else 1479 else
1367 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1368 fi 1481 fi
1369 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 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1587 shift
1588
1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1594
1595 local USE_BUILT=$(<${USEFILE})
1596 while [[ $# -gt 0 ]] ; do
1597 if [[ ${opt} = "-o" ]] ; then
1598 has $1 ${USE_BUILT} && return 0
1599 else
1600 has $1 ${USE_BUILT} || return 1
1601 fi
1602 shift
1603 done
1604 [[ ${opt} = "-a" ]]
1605}
1606
1607# Many configure scripts wrongly bail when a C++ compiler
1608# could not be detected. #73450
1609epunt_cxx() {
1610 local dir=$1
1611 [[ -z ${dir} ]] && dir=${S}
1612 ebegin "Removing useless C++ checks"
1613 local f
1614 for f in $(find ${dir} -name configure) ; do
1615 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1616 done
1617 eend 0
1618}
1619
1620# dopamd <file> [more files]
1621#
1622# Install pam auth config file in /etc/pam.d
1623dopamd() {
1624 [[ -z $1 ]] && die "dopamd requires at least one argument"
1625
1626 use pam || return 0
1627
1628 INSDESTTREE=/etc/pam.d \
1629 doins "$@" || die "failed to install $@"
1630}
1631# newpamd <old name> <new name>
1632#
1633# Install pam file <old name> as <new name> in /etc/pam.d
1634newpamd() {
1635 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1636
1637 use pam || return 0
1638
1639 INSDESTTREE=/etc/pam.d \
1640 newins "$1" "$2" || die "failed to install $1 as $2"
1641}
1642
1643# make a wrapper script ...
1644# NOTE: this was originally games_make_wrapper, but I noticed other places where
1645# this could be used, so I have moved it here and made it not games-specific
1646# -- wolf31o2
1647# $1 == wrapper name
1648# $2 == binary to run
1649# $3 == directory to chdir before running binary
1650# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1651# $5 == path for wrapper
1652make_wrapper() {
1653 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1654 local tmpwrapper=$(emktemp)
1655 # We don't want to quote ${bin} so that people can pass complex
1656 # things as $bin ... "./someprog --args"
1657 cat << EOF > "${tmpwrapper}"
1658#!/bin/sh
1659cd "${chdir:-.}"
1370 if [ -z "${newls}" ] ; then 1660if [ -n "${libdir}" ] ; then
1371 unset LINGUAS 1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1372 else 1663 else
1373 export LINGUAS="${newls}" 1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1374 fi 1666fi
1667exec ${bin} "\$@"
1668EOF
1669 chmod go+rx "${tmpwrapper}"
1670 if [[ -n ${path} ]] ; then
1671 exeinto "${path}"
1672 newexe "${tmpwrapper}" "${wrapper}"
1673 else
1674 newbin "${tmpwrapper}" "${wrapper}"
1675 fi
1375} 1676}

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20