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

Diff of /eclass/eutils.eclass

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

Revision 1.60 Revision 1.128
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 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.60 2003/09/23 01:26:58 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.128 2004/12/23 09:20:45 eradicator Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15newdepend "!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18
19# 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
21# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then
26 sleep ${1:-5}
27 fi
28}
29
30# 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,
32# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() {
35 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a"
41 sleep 1
42 done
43 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)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
18 108
19# This function generate linker scripts in /usr/lib for dynamic 109# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 110# libs in /lib. This is to fix linking problems when you have
21# the .so in /lib, and the .a in /usr/lib. What happens is that 111# the .so in /lib, and the .a in /usr/lib. What happens is that
22# in some cases when linking dynamic, the .a in /usr/lib is used 112# in some cases when linking dynamic, the .a in /usr/lib is used
33# to point to the latest version of the library present. 123# to point to the latest version of the library present.
34# 124#
35# <azarah@gentoo.org> (26 Oct 2002) 125# <azarah@gentoo.org> (26 Oct 2002)
36# 126#
37gen_usr_ldscript() { 127gen_usr_ldscript() {
38 128 local libdir="$(get_libdir)"
39 # Just make sure it exists 129 # Just make sure it exists
40 dodir /usr/lib 130 dodir /usr/${libdir}
41 131
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
43/* GNU ld script 133/* GNU ld script
44 Because Gentoo have critical dynamic libraries 134 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 135 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 136 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 137 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 138 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 139 more info. */
50GROUP ( /lib/libxxx ) 140GROUP ( /${libdir}/${1} )
51END_LDSCRIPT 141END_LDSCRIPT
52 142 fperms a+x "/usr/${libdir}/${1}"
53 dosed "s:libxxx:$1:" /usr/lib/$1
54
55 return 0
56} 143}
57 144
58# Simple function to draw a line consisting of '=' the same length as $* 145# Simple function to draw a line consisting of '=' the same length as $*
59# 146#
60# <azarah@gentoo.org> (11 Nov 2002) 147# <azarah@gentoo.org> (11 Nov 2002)
144 local SINGLE_PATCH="no" 231 local SINGLE_PATCH="no"
145 local x="" 232 local x=""
146 233
147 if [ "$#" -gt 1 ] 234 if [ "$#" -gt 1 ]
148 then 235 then
149 eerror "Invalid arguments to epatch()" 236 local m=""
150 die "Invalid arguments to epatch()" 237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do
239 epatch "${m}"
240 done
241 return 0
151 fi 242 fi
152 243
153 if [ -n "$1" -a -f "$1" ] 244 if [ -n "$1" -a -f "$1" ]
154 then 245 then
155 SINGLE_PATCH="yes" 246 SINGLE_PATCH="yes"
165 local EPATCH_SOURCE="$1/*" 256 local EPATCH_SOURCE="$1/*"
166 else 257 else
167 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 258 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
168 fi 259 fi
169 else 260 else
170 if [ ! -d ${EPATCH_SOURCE} ] 261 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
171 then 262 then
172 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 263 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
173 then 264 then
174 EPATCH_SOURCE="$1" 265 EPATCH_SOURCE="$1"
175 fi 266 fi
204 ;; 295 ;;
205 esac 296 esac
206 297
207 if [ "${SINGLE_PATCH}" = "no" ] 298 if [ "${SINGLE_PATCH}" = "no" ]
208 then 299 then
209 einfo "Applying various patches (bugfixes/updates)..." 300 einfo "Applying various patches (bugfixes/updates) ..."
210 fi 301 fi
211 for x in ${EPATCH_SOURCE} 302 for x in ${EPATCH_SOURCE}
212 do 303 do
213 # New ARCH dependant patch naming scheme... 304 # New ARCH dependant patch naming scheme ...
214 # 305 #
215 # ???_arch_foo.patch 306 # ???_arch_foo.patch
216 # 307 #
217 if [ -f ${x} ] && \ 308 if [ -f ${x} ] && \
218 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
233 then 324 then
234 if [ -n "${EPATCH_SINGLE_MSG}" ] 325 if [ -n "${EPATCH_SINGLE_MSG}" ]
235 then 326 then
236 einfo "${EPATCH_SINGLE_MSG}" 327 einfo "${EPATCH_SINGLE_MSG}"
237 else 328 else
238 einfo "Applying ${x##*/}..." 329 einfo "Applying ${x##*/} ..."
239 fi 330 fi
240 else 331 else
241 einfo " ${x##*/}..." 332 einfo " ${x##*/} ..."
242 fi 333 fi
243 334
244 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
245 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
246 337
258 else 349 else
259 PATCH_TARGET="${x}" 350 PATCH_TARGET="${x}"
260 fi 351 fi
261 352
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 355
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 358
268 if [ "${PATCH_SUFFIX}" != "patch" ] 359 if [ "${PATCH_SUFFIX}" != "patch" ]
275 count=5 366 count=5
276 break 367 break
277 fi 368 fi
278 fi 369 fi
279 370
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 372 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 378
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 380
290 if [ "$?" -ne 0 ] 381 if [ "$?" -ne 0 ]
291 then 382 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 384 echo
336# This function return true if we are using the NPTL pthreads 427# This function return true if we are using the NPTL pthreads
337# implementation. 428# implementation.
338# 429#
339# <azarah@gentoo.org> (06 March 2003) 430# <azarah@gentoo.org> (06 March 2003)
340# 431#
341
342have_NPTL() { 432have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 433 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 434 #define _XOPEN_SOURCE
346 #include <unistd.h> 435 #include <unistd.h>
347 #include <stdio.h> 436 #include <stdio.h>
348 437
360 449
361 return 1; 450 return 1;
362 } 451 }
363 END 452 END
364 453
365 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
366 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
367 then 456 then
368 echo "yes" 457 echo "yes"
369 einfon "Checking what PTHREADS implementation we have ... " 458 einfon "Checking what PTHREADS implementation we have ..."
370 if ${T}/nptl 459 if ${T}/nptl
371 then 460 then
372 return 0 461 return 0
373 else 462 else
374 return 1 463 return 1
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 512 else
424 jobs=2 513 jobs=2
425 fi 514 fi
426 515
427 elif [ "${ARCH}" = "ppc" ] 516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 517 then
429 # ppc has "processor", but only when compiled with SMP 518 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 520 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 522 else
434 jobs=2 523 jobs=2
435 fi 524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 529 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 531 die "Unknown ARCH -- ${ARCH}!"
439 fi 532 fi
440 533
446 539
447 if [ -n "${ADMINPARAM}" ] 540 if [ -n "${ADMINPARAM}" ]
448 then 541 then
449 if [ "${jobs}" -gt "${ADMINPARAM}" ] 542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
450 then 543 then
451 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
452 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
453 else 546 else
454 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
455 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
456 fi 549 fi
457 fi 550 fi
458} 551}
459 552
460# Cheap replacement for when debianutils (and thus mktemp) 553# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 554# does not exist on the users system
462# vapier@gentoo.org 555# vapier@gentoo.org
463# 556#
464# Takes just 1 parameter (the directory to create tmpfile in) 557# Takes just 1 optional parameter (the directory to create tmpfile in)
465mymktemp() { 558emktemp() {
559 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift
466 local topdir="$1" 561 local topdir="$1"
467 562
468 [ -z "${topdir}" ] && topdir=/tmp 563 if [ -z "${topdir}" ]
469 if [ "`which mktemp 2>/dev/null`" ]
470 then 564 then
471 mktemp -p ${topdir} 565 [ -z "${T}" ] \
472 else 566 && topdir="/tmp" \
567 || topdir="${T}"
568 fi
569
570 if [ -z "$(type -p mktemp)" ]
571 then
572 local tmp=/
573 while [ -e "${tmp}" ] ; do
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 575 done
576 ${exe} "${tmp}"
475 echo ${tmp} 577 echo "${tmp}"
578 else
579 [ "${exe}" == "touch" ] \
580 && exe="-p" \
581 || exe="-d"
582 mktemp ${exe} "${topdir}"
583 fi
584}
585
586# Small wrapper for getent (Linux), nidump (Mac OS X),
587# and pw (FreeBSD) used in enewuser()/enewgroup()
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590#
591# egetent(database, key)
592egetent() {
593 if useq ppc-macos ; then
594 case "$2" in
595 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;;
598 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;;
601 esac
602 elif useq x86-fbsd ; then
603 local action
604 if [ "$1" == "passwd" ]
605 then
606 action="user"
607 else
608 action="group"
609 fi
610 pw show "${action}" "$2" -q
611 else
612 which nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2"
476 fi 614 fi
477} 615}
478 616
479# Simplify/standardize adding users to the system 617# Simplify/standardize adding users to the system
480# vapier@gentoo.org 618# vapier@gentoo.org
496 then 634 then
497 eerror "No username specified !" 635 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 636 die "Cannot call enewuser without a username"
499 fi 637 fi
500 638
501 # setup a file for testing usernames/groups
502 local tmpfile="`mymktemp ${T}`"
503 chown ${euser} ${tmpfile} >& /dev/null
504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
505
506 # see if user already exists 639 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 641 then
509 return 0 642 return 0
510 fi 643 fi
511 einfo "Adding user '${euser}' to your system ..." 644 einfo "Adding user '${euser}' to your system ..."
512 645
517 local euid="$1"; shift 650 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 652 then
520 if [ "${euid}" -gt 0 ] 653 if [ "${euid}" -gt 0 ]
521 then 654 then
522 opts="${opts} -u ${euid}" 655 if [ ! -z "`egetent passwd ${euid}`" ]
656 then
657 euid="next"
658 fi
523 else 659 else
524 eerror "Userid given but is not greater than 0 !" 660 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 661 die "${euid} is not a valid UID"
526 fi 662 fi
527 else 663 else
528 euid="next available" 664 euid="next"
665 fi
666 if [ "${euid}" == "next" ]
667 then
668 local pwrange
669 if [ "${USERLAND}" == "BSD" ] ; then
670 pwrange="`jot 898 101`"
671 else
672 pwrange="`seq 101 999`"
529 fi 673 fi
674 for euid in ${pwrange} ; do
675 [ -z "`egetent passwd ${euid}`" ] && break
676 done
677 fi
678 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 679 einfo " - Userid: ${euid}"
531 680
532 # handle shell 681 # handle shell
533 local eshell="$1"; shift 682 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] 683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
535 then 684 then
536 if [ ! -e "${eshell}" ] 685 if [ ! -e "${eshell}" ]
537 then 686 then
538 eerror "A shell was specified but it does not exist !" 687 eerror "A shell was specified but it does not exist !"
539 die "${eshell} does not exist" 688 die "${eshell} does not exist"
540 fi 689 fi
541 else 690 else
691 if [ "${USERLAND}" == "BSD" ]
692 then
693 eshell="/usr/bin/false"
694 else
542 eshell="/bin/false" 695 eshell="/bin/false"
696 fi
543 fi 697 fi
544 einfo " - Shell: ${eshell}" 698 einfo " - Shell: ${eshell}"
545 opts="${opts} -s ${eshell}" 699 opts="${opts} -s ${eshell}"
546 700
547 # handle homedir 701 # handle homedir
548 local ehome="$1"; shift 702 local ehome="$1"; shift
549 if [ -z "${ehome}" ] 703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
550 then 704 then
551 ehome="/dev/null" 705 ehome="/dev/null"
552 fi 706 fi
553 einfo " - Home: ${ehome}" 707 einfo " - Home: ${ehome}"
554 opts="${opts} -d ${ehome}" 708 opts="${opts} -d ${ehome}"
555 709
556 # handle groups 710 # handle groups
557 local egroups="$1"; shift 711 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 712 if [ ! -z "${egroups}" ]
559 then 713 then
560 local realgroup=
561 local oldifs="${IFS}" 714 local oldifs="${IFS}"
715 local defgroup="" exgroups=""
716
562 export IFS="," 717 export IFS=","
563 for g in ${egroups} 718 for g in ${egroups}
564 do 719 do
565 chgrp ${g} ${tmpfile} >& /dev/null 720 export IFS="${oldifs}"
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 721 if [ -z "`egetent group \"${g}\"`" ]
567 if [ "${g}" != "${realgroup}" ]
568 then 722 then
569 eerror "You must add ${g} to the system first" 723 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 724 die "${g} is not a valid GID"
571 fi 725 fi
726 if [ -z "${defgroup}" ]
727 then
728 defgroup="${g}"
729 else
730 exgroups="${exgroups},${g}"
731 fi
732 export IFS=","
572 done 733 done
573 export IFS="${oldifs}" 734 export IFS="${oldifs}"
735
574 opts="${opts} -g ${egroups}" 736 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ]
738 then
739 opts="${opts} -G ${exgroups:1}"
740 fi
575 else 741 else
576 egroups="(none)" 742 egroups="(none)"
577 fi 743 fi
578 einfo " - Groups: ${egroups}" 744 einfo " - Groups: ${egroups}"
579 745
580 # handle extra and add the user 746 # handle extra and add the user
581 local eextra="$@" 747 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 748 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 749 export SANDBOX_ON="0"
750 if useq ppc-macos
751 then
752 ### Make the user
584 if [ -z "${eextra}" ] 753 if [ -z "${eextra}" ]
585 then 754 then
586 useradd ${opts} ${euser} \ 755 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified
760 local oldifs="${IFS}"
761 export IFS=","
762 for g in ${egroups}
763 do
764 dscl . merge /groups/${g} users ${euser}
765 done
766 export IFS="${oldifs}"
767 else
768 einfo "Extra options are not supported on macos yet"
769 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}"
771 die "Required function missing"
772 fi
773 elif use x86-fbsd ; then
774 if [ -z "${eextra}" ]
775 then
776 pw useradd ${euser} ${opts} \
587 -c "added by portage for ${PN}" \ 777 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 778 die "enewuser failed"
589 else 779 else
590 einfo " - Extra: ${eextra}" 780 einfo " - Extra: ${eextra}"
781 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed"
783 fi
784 else
785 if [ -z "${eextra}" ]
786 then
787 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \
789 || die "enewuser failed"
790 else
791 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 792 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 793 || die "enewuser failed"
794 fi
593 fi 795 fi
594 export SANDBOX_ON="${oldsandbox}" 796 export SANDBOX_ON="${oldsandbox}"
595 797
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 798 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 799 then
618 then 820 then
619 eerror "No group specified !" 821 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 822 die "Cannot call enewgroup without a group"
621 fi 823 fi
622 824
623 # setup a file for testing groupname
624 local tmpfile="`mymktemp ${T}`"
625 chgrp ${egroup} ${tmpfile} >& /dev/null
626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
627
628 # see if group already exists 825 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 826 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 827 then
631 return 0 828 return 0
632 fi 829 fi
633 einfo "Adding group '${egroup}' to your system ..." 830 einfo "Adding group '${egroup}' to your system ..."
634 831
639 local egid="$1"; shift 836 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 837 if [ ! -z "${egid}" ]
641 then 838 then
642 if [ "${egid}" -gt 0 ] 839 if [ "${egid}" -gt 0 ]
643 then 840 then
841 if [ -z "`egetent group ${egid}`" ]
842 then
843 if useq ppc-macos ; then
844 opts="${opts} ${egid}"
845 else
644 opts="${opts} -g ${egid}" 846 opts="${opts} -g ${egid}"
847 fi
848 else
849 egid="next available; requested gid taken"
850 fi
645 else 851 else
646 eerror "Groupid given but is not greater than 0 !" 852 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 853 die "${egid} is not a valid GID"
648 fi 854 fi
649 else 855 else
656 opts="${opts} ${eextra}" 862 opts="${opts} ${eextra}"
657 863
658 # add the group 864 # add the group
659 local oldsandbox="${SANDBOX_ON}" 865 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 866 export SANDBOX_ON="0"
867 if useq ppc-macos ; then
868 if [ ! -z "${eextra}" ];
869 then
870 einfo "Extra options are not supported on macos yet"
871 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}"
873 die "Required function missing"
874 fi
875
876 # If we need the next available
877 case ${egid} in
878 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do
880 [ -z "`egetent group ${egid}`" ] && break
881 done
882 esac
883 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then
886 case ${egid} in
887 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do
889 [ -z "`egetent group ${egid}`" ] && break
890 done
891 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 894 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi
662 export SANDBOX_ON="${oldsandbox}" 896 export SANDBOX_ON="${oldsandbox}"
663} 897}
664 898
665# Simple script to replace 'dos2unix' binaries 899# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 900# vapier@gentoo.org
667# 901#
668# edos2unix(file, <more files>...) 902# edos2unix(file, <more files> ...)
669edos2unix() { 903edos2unix() {
670 for f in $@ 904 for f in "$@"
671 do 905 do
672 cp ${f} ${T}/edos2unix 906 cp "${f}" ${T}/edos2unix
673 sed 's/\r$//' ${T}/edos2unix > ${f} 907 sed 's/\r$//' ${T}/edos2unix > "${f}"
674 done 908 done
675} 909}
676 910
677# Make a desktop file ! 911# Make a desktop file !
678# Great for making those icons in kde/gnome startmenu ! 912# Great for making those icons in kde/gnome startmenu !
679# Amaze your friends ! Get the women ! Join today ! 913# Amaze your friends ! Get the women ! Join today !
680# gnome2 /usr/share/applications
681# gnome1 /usr/share/gnome/apps/
682# KDE ${KDEDIR}/share/applnk /usr/share/applnk
683# 914#
684# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 915# make_desktop_entry(<binary>, [name], [icon], [type], [path])
685# 916#
686# binary: what binary does the app run with ? 917# binary: what binary does the app run with ?
687# name: the name that will show up in the menu 918# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 919# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 920# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 921# a full path to an icon
691# type: what kind of application is this ? for categories: 922# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 923# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 924# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 925make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
696 927
697 local exec="${1}" 928 local exec="${1}"
698 local name="${2:-${PN}}" 929 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 930 local icon="${3:-${PN}.png}"
700 local type="${4}" 931 local type="${4}"
932 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 933 local path="${5:-${GAMES_BINDIR}}"
702 if [ -z "${type}" ] 934 if [ -z "${type}" ]
703 then 935 then
704 case ${CATEGORY} in 936 case ${CATEGORY} in
705 "app-emulation") 937 "app-emulation")
706 type=Emulator 938 type=Emulator
939 subdir="Emulation"
707 ;; 940 ;;
708 "games-"*) 941 "games-"*)
709 type=Game 942 type=Game
943 subdir="Games"
944 ;;
945 "net-"*)
946 type=Network
947 subdir="${type}"
710 ;; 948 ;;
711 *) 949 *)
712 type= 950 type=
951 subdir=
713 ;; 952 ;;
714 esac 953 esac
715 fi 954 fi
716 local desktop="${T}/${exec}.desktop" 955 local desktop="${T}/${exec}.desktop"
717 956
722Type=Application 961Type=Application
723Comment=${DESCRIPTION} 962Comment=${DESCRIPTION}
724Exec=${exec} 963Exec=${exec}
725Path=${path} 964Path=${path}
726Icon=${icon} 965Icon=${icon}
727Categories=Application;${type};" > ${desktop} 966Categories=Application;${type};" > "${desktop}"
728 967
729 if [ -d "/usr/share/applications" ]
730 then
731 insinto /usr/share/applications 968 insinto /usr/share/applications
732 doins ${desktop} 969 doins "${desktop}"
733 fi
734
735 #if [ -d "/usr/share/gnome/apps" ]
736 #then
737 # insinto /usr/share/gnome/apps/Games
738 # doins ${desktop}
739 #fi
740
741 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
742 #then
743 # for ver in /usr/kde/*
744 # do
745 # insinto ${ver}/share/applnk/Games
746 # doins ${desktop}
747 # done
748 #fi
749
750 if [ -d "/usr/share/applnk" ]
751 then
752 insinto /usr/share/applnk/${type}
753 doins ${desktop}
754 fi
755 970
756 return 0 971 return 0
757} 972}
758 973
759# new convenience patch wrapper function to eventually replace epatch(), 974# for internal use only (unpack_pdv and unpack_makeself)
760# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and 975find_unpackable_file() {
761# /usr/bin/patch 976 local src="$1"
762# Features:
763# - bulk patch handling similar to epatch()'s
764# - automatic patch level detection like epatch()'s
765# - automatic patch uncompression like epatch()'s
766# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
767# manually instead
768# - once I decide it's production-ready, it'll be called from base_src_unpack
769# to handle $PATCHES to avoid defining src_unpack just to use xpatch
770
771# accepts zero or more parameters specifying patchfiles and/or patchdirs
772
773# known issues:
774# - only supports unified style patches (does anyone _really_ use anything
775# else?)
776# - because it doesn't use --dry-run there is a risk of it failing
777# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
778# any of the backup heuristics that patch employs to discover a filename.
779# however, this isn't dangerous because if it works for the developer who's
780# writing the ebuild, it'll always work for the users, and if it doesn't,
781# then we'll fix it :-)
782# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
783xpatch() {
784
785 debug-print-function ${FUNCNAME} $*
786
787 local list=
788 local list2=
789 declare -i plevel
790
791 # parse patch sources
792 for x in $*
793 do
794 debug-print "${FUNCNAME}: parsing parameter ${x}"
795 if [ -f "${x}" ] 977 if [ -z "${src}" ]
796 then 978 then
797 list="${list} ${x}" 979 src="${DISTDIR}/${A}"
798 elif [ -d "${x}" ] 980 else
799 then 981 if [ -e "${DISTDIR}/${src}" ]
800 # handles patchdirs like epatch() for now: no recursion.
801 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
802 # only patches with _$ARCH_ or _all_ in their filenames are applied.
803 for file in `ls -A ${x}`
804 do
805 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
806 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
807 "${file}" != "${file/_$ARCH_}" ]
808 then 982 then
809 list2="${list2} ${x}/${file}" 983 src="${DISTDIR}/${src}"
984 elif [ -e "${PWD}/${src}" ]
985 then
986 src="${PWD}/${src}"
987 elif [ -e "${src}" ]
988 then
989 src="${src}"
810 fi 990 fi
811 done 991 fi
812 list="`echo ${list2} | sort` ${list}" 992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}"
993 echo "${src}"
994}
995
996# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in
998# the middle of the archive. Valve seems to use it a lot ... too bad
999# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1000#
1001# Usage: unpack_pdv [file to unpack] [size of off_t]
1002# - you have to specify the off_t size ... i have no idea how to extract that
1003# information out of the binary executable myself. basically you pass in
1004# the size of the off_t type (in bytes) on the machine that built the pdv
1005# archive. one way to determine this is by running the following commands:
1006# strings <pdv archive> | grep lseek
1007# strace -elseek <pdv archive>
1008# basically look for the first lseek command (we do the strings/grep because
1009# sometimes the function call is _llseek or something) and steal the 2nd
1010# parameter. here is an example:
1011# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1012# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250
1015# thus we would pass in the value of '4' as the second parameter.
1016unpack_pdv() {
1017 local src="`find_unpackable_file $1`"
1018 local sizeoff_t="$2"
1019
1020 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("
1021
1022 local shrtsrc="`basename ${src}`"
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026
1027 # grab metadata for debug reasons
1028 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030
1031 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`"
1034
1035 # now lets uncompress/untar the file if need be
1036 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038
1039 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1
1042 mv ${tmpfile}{,.Z}
1043 gunzip ${tmpfile}
1044 else
1045 iscompressed=0
1046 fi
1047 local istar="`file -b ${tmpfile}`"
1048 if [ "${istar:0:9}" == "POSIX tar" ] ; then
1049 istar=1
1050 else
1051 istar=0
1052 fi
1053
1054 #for some reason gzip dies with this ... dd cant provide buffer fast enough ?
1055 #dd if=${src} ibs=${metaskip} count=1 \
1056 # | dd ibs=${tailskip} skip=1 \
1057 # | gzip -dc \
1058 # > ${datafile}
1059 if [ ${iscompressed} -eq 1 ] ; then
1060 if [ ${istar} -eq 1 ] ; then
1061 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1062 | head -c $((${metaskip}-${tailskip})) \
1063 | tar -xzf -
813 else 1064 else
814 die "Couldn't find ${x}" 1065 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1066 | head -c $((${metaskip}-${tailskip})) \
1067 | gzip -dc \
1068 > ${datafile}
1069 fi
1070 else
1071 if [ ${istar} -eq 1 ] ; then
1072 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1073 | head -c $((${metaskip}-${tailskip})) \
1074 | tar --no-same-owner -xf -
1075 else
1076 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1077 | head -c $((${metaskip}-${tailskip})) \
1078 > ${datafile}
1079 fi
815 fi 1080 fi
816 done 1081 true
817 1082 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
818 debug-print "${FUNCNAME}: final list of patches: ${list}" 1083 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
819
820 for x in ${list};
821 do
822 debug-print "${FUNCNAME}: processing ${x}"
823 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
824 case "`/usr/bin/file -b ${x}`" in
825 *gzip*)
826 patchfile="${T}/current.patch"
827 ungzip -c "${x}" > "${patchfile}"
828 ;;
829 *bzip2*)
830 patchfile="${T}/current.patch"
831 bunzip2 -c "${x}" > "${patchfile}"
832 ;;
833 *text*)
834 patchfile="${x}"
835 ;;
836 *)
837 die "Could not determine filetype of patch ${x}"
838 ;;
839 esac
840 debug-print "${FUNCNAME}: patchfile=${patchfile}"
841
842 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
843 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
844 debug-print "${FUNCNAME}: raw target=${target}"
845 # strip target down to the path/filename, remove leading +++
846 target="${target/+++ }"; target="${target%% *}"
847 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
848 # to discard them as well to calculate the correct patchlevel.
849 target="${target//\/\//\/}"
850 debug-print "${FUNCNAME}: stripped target=${target}"
851
852 # look for target
853 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
854 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
855 cd "${basedir}"
856
857 # try stripping leading directories
858 target2="${target}"
859 plevel=0
860 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
861 while [ ! -f "${target2}" ]
862 do
863 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
864 plevel=$((plevel+1))
865 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
866 [ "${target2}" == "${target2/\/}" ] && break
867 done
868 test -f "${target2}" && break
869
870 # try stripping filename - needed to support patches creating new files
871 target2="${target%/*}"
872 plevel=0
873 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
874 while [ ! -d "${target2}" ]
875 do
876 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
877 plevel=$((plevel+1))
878 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
879 [ "${target2}" == "${target2/\/}" ] && break
880 done
881 test -d "${target2}" && break
882
883 done
884
885 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
886 || die "Could not determine patchlevel for ${x}"
887 debug-print "${FUNCNAME}: determined plevel=${plevel}"
888 # do the patching
889 ebegin "Applying patch ${x##*/}..."
890 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
891 || die "Failed to apply patch ${x}"
892 eend $?
893
894 done
895
896} 1084}
897 1085
898# Unpack those pesky makeself generated files ... 1086# Unpack those pesky makeself generated files ...
899# They're shell scripts with the binary package tagged onto 1087# They're shell scripts with the binary package tagged onto
900# the end of the archive. Loki utilized the format as does 1088# the end of the archive. Loki utilized the format as does
901# many other game companies. 1089# many other game companies.
902# 1090#
903# Usage: unpack_makeself [file to unpack] [offset] 1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
904# - If the file is not specified then unpack will utilize ${A}. 1092# - If the file is not specified then unpack will utilize ${A}.
905# - If the offset is not specified then we will attempt to extract 1093# - If the offset is not specified then we will attempt to extract
906# the proper offset from the script itself. 1094# the proper offset from the script itself.
907unpack_makeself() { 1095unpack_makeself() {
908 local src="$1" 1096 local src="$(find_unpackable_file "$1")"
909 local skip="$2" 1097 local skip="$2"
1098 local exe="$3"
910 1099
911 if [ -z "${src}" ]
912 then
913 src="${DISTDIR}/${A}"
914 else
915 if [ -e "${DISTDIR}/${src}" ]
916 then
917 src="${DISTDIR}/${src}"
918 elif [ -e "${PWD}/${src}" ]
919 then
920 src="${PWD}/${src}"
921 elif [ -e "${src}" ]
922 then
923 src="${src}"
924 fi
925 fi
926 [ ! -e "${src}" ] && die "Could not find requested makeself archive ${src}"
927
928 local shrtsrc="`basename ${src}`" 1100 local shrtsrc="$(basename "${src}")"
929 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
930 if [ -z "${skip}" ] 1102 if [ -z "${skip}" ]
931 then 1103 then
932 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
933 local skip=0 1105 local skip=0
1106 exe=tail
934 case ${ver} in 1107 case ${ver} in
935 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
936 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
937 ;; 1110 ;;
938 2.0|2.0.1) 1111 2.0|2.0.1)
939 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1112 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
940 ;; 1113 ;;
941 2.1.1) 1114 2.1.1)
942 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1115 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
943 let skip="skip + 1" 1116 let skip="skip + 1"
944 ;; 1117 ;;
945 2.1.2) 1118 2.1.2)
946 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1119 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
947 let skip="skip + 1" 1120 let skip="skip + 1"
948 ;; 1121 ;;
949 2.1.3) 1122 2.1.3)
950 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
951 let skip="skip + 1" 1124 let skip="skip + 1"
1125 ;;
1126 2.1.4)
1127 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1128 skip=$(head -n ${skip} "${src}" | wc -c)
1129 exe="dd"
952 ;; 1130 ;;
953 *) 1131 *)
954 eerror "I'm sorry, but I was unable to support the Makeself file." 1132 eerror "I'm sorry, but I was unable to support the Makeself file."
955 eerror "The version I detected was '${ver}'." 1133 eerror "The version I detected was '${ver}'."
956 eerror "Please file a bug about the file ${shrtsrc} at" 1134 eerror "Please file a bug about the file ${shrtsrc} at"
958 die "makeself version '${ver}' not supported" 1136 die "makeself version '${ver}' not supported"
959 ;; 1137 ;;
960 esac 1138 esac
961 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1139 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
962 fi 1140 fi
1141 case ${exe} in
1142 tail) exe="tail -n +${skip} '${src}'";;
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'"
1145 esac
963 1146
964 # we do this because otherwise a failure in gzip will cause 0 bytes to be sent 1147 # lets grab the first few bytes of the file to figure out what kind of archive it is
965 # to tar which will make tar not extract anything and exit with 0 1148 local tmpfile="$(emktemp)"
966 tail -n +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f - 2>/dev/null 1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
967 local pipestatus="${PIPESTATUS[*]}" 1150 local filetype="$(file -b "${tmpfile}")"
968 pipestatus="${pipestatus// }" 1151 case ${filetype} in
969 if [ "${pipestatus//0}" != "" ] 1152 *tar\ archive)
970 then 1153 eval ${exe} | tar --no-same-owner -xf -
971 # maybe it isnt gzipped ... they usually are, but not always ... 1154 ;;
972 tail -n +${skip} ${src} | tar -x --no-same-owner -f - \ 1155 bzip2*)
1156 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1157 ;;
1158 gzip*)
1159 eval ${exe} | tar --no-same-owner -xzf -
1160 ;;
1161 compress*)
1162 eval ${exe} | gunzip | tar --no-same-owner -xf -
1163 ;;
1164 *)
1165 eerror "Unknown filetype \"${filetype}\" ?"
1166 false
1167 ;;
1168 esac
973 || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" 1169 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
974 fi
975} 1170}
976 1171
977# Display a license for user to accept. 1172# Display a license for user to accept.
978# 1173#
979# Usage: check_license [license] 1174# Usage: check_license [license]
990 elif [ -e "${src}" ] ; then 1185 elif [ -e "${src}" ] ; then
991 lic="${src}" 1186 lic="${src}"
992 fi 1187 fi
993 fi 1188 fi
994 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1190 local l="`basename ${lic}`"
995 1191
996 # here is where we check for the licenses the user already 1192 # here is where we check for the licenses the user already
997 # accepted ... if we don't find a match, we make the user accept 1193 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$-
998 local alic 1195 local alic
1196 set -o noglob #so that bash doesn't expand "*"
999 for alic in ${ACCEPT_LICENSE} ; do 1197 for alic in ${ACCEPT_LICENSE} ; do
1000 [ "${alic}" == "*" ] && return 0 1198 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1001 [ "${alic}" == "${lic}" ] && return 0 1199 set +o noglob; set -${shopts} #reset old shell opts
1200 return 0
1201 fi
1002 done 1202 done
1203 set +o noglob; set -$shopts #reset old shell opts
1003 1204
1004 local licmsg="`mymktemp ${T}`" 1205 local licmsg="$(emktemp)"
1005 cat << EOF > ${licmsg} 1206 cat << EOF > ${licmsg}
1006********************************************************** 1207**********************************************************
1007The following license outlines the terms of use of this 1208The following license outlines the terms of use of this
1008package. You MUST accept this license for installation to 1209package. You MUST accept this license for installation to
1009continue. When you are done viewing, hit 'q'. If you 1210continue. When you are done viewing, hit 'q'. If you
1011********************************************************** 1212**********************************************************
1012 1213
1013EOF 1214EOF
1014 cat ${lic} >> ${licmsg} 1215 cat ${lic} >> ${licmsg}
1015 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1216 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1016 einfon "Do you accept the terms of this license? [yes/no] " 1217 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1017 read alic 1218 read alic
1018 case ${alic} in 1219 case ${alic} in
1019 yes|Yes|y|Y) 1220 yes|Yes|y|Y)
1020 return 0 1221 return 0
1021 ;; 1222 ;;
1024 eerror "You MUST accept the license to continue! Exiting!" 1225 eerror "You MUST accept the license to continue! Exiting!"
1025 die "Failed to accept license" 1226 die "Failed to accept license"
1026 ;; 1227 ;;
1027 esac 1228 esac
1028} 1229}
1230
1231# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1232# the whole 'non-interactive' policy, but damnit I want CD support !
1233#
1234# with these cdrom functions we handle all the user interaction and
1235# standardize everything. all you have to do is call cdrom_get_cds()
1236# and when the function returns, you can assume that the cd has been
1237# found at CDROM_ROOT.
1238#
1239# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1240# etc... if you want to give the cds better names, then just export
1241# the CDROM_NAME_X variables before calling cdrom_get_cds().
1242#
1243# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1244#
1245# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1246# - this will attempt to locate a cd based upon a file that is on
1247# the cd ... the more files you give this function, the more cds
1248# the cdrom functions will handle
1249cdrom_get_cds() {
1250 # first we figure out how many cds we're dealing with by
1251 # the # of files they gave us
1252 local cdcnt=0
1253 local f=
1254 for f in "$@" ; do
1255 cdcnt=$((cdcnt + 1))
1256 export CDROM_CHECK_${cdcnt}="$f"
1257 done
1258 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1
1260
1261 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then
1264 export CDROM_ROOT="${CD_ROOT}"
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return
1267 fi
1268 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then
1270 local var=
1271 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1273 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then
1276 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}"
1280 fi
1281 export CDROM_ROOTS_${cdcnt}="${!var}"
1282 done
1283 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return
1286 fi
1287
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1289 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then
1291 echo "cdrom for ${PN}."
1292 else
1293 echo "${CDROM_NAME}."
1294 fi
1295 echo
1296 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files."
1300 echo
1301 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1305 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1308 done
1309 echo
1310 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:"
1313 einfon ""
1314 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1316 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}"
1318 done
1319 echo
1320 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs."
1324 echo
1325 fi
1326 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd
1328}
1329
1330# this is only used when you need access to more than one cd.
1331# when you have finished using the first cd, just call this function.
1332# when it returns, CDROM_ROOT will be pointing to the second cd.
1333# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var=
1337
1338 if [ ! -z "${CD_ROOT}" ] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return
1341 fi
1342
1343 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var}
1348 else
1349 export CDROM_ROOT="${!var}"
1350 fi
1351
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353}
1354
1355# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1356# functions. this should *never* be called from an ebuild.
1357# all it does is try to locate a give file on a cd ... if the cd isn't
1358# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do
1364 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})"
1366 local mline=""
1367 local showedmsg=0
1368
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1370 [ -d "${mline}/${dir}" ] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1372 && export CDROM_ROOT=${mline}
1373 done
1374
1375 if [ -z "${CDROM_ROOT}" ] ; then
1376 echo
1377 if [ ${showedmsg} -eq 0 ] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then
1380 einfo "Please insert the cdrom for ${PN} now !"
1381 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi
1384 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi
1391 fi
1392 showedmsg=1
1393 fi
1394 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge."
1396 read
1397 fi
1398 done
1399}
1400
1401# Make sure that LINGUAS only contains languages that
1402# a package can support
1403#
1404# usage: strip-linguas <allow LINGUAS>
1405# strip-linguas -i <directories of .po files>
1406# strip-linguas -u <directories of .po files>
1407#
1408# The first form allows you to specify a list of LINGUAS.
1409# The -i builds a list of po files found in all the
1410# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists.
1413strip-linguas() {
1414 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1416 local op="$1"; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f
1419 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then
1421 newls="${ls}"
1422 else
1423 newls=""
1424 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1428 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1430 fi
1431 done
1432 ls="${newls}"
1433 done
1434 ls="${ls//.po}"
1435 else
1436 ls="$@"
1437 fi
1438
1439 ls=" ${ls} "
1440 newls=""
1441 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1443 newls="${newls} ${f}"
1444 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi
1447 done
1448 if [ -z "${newls}" ] ; then
1449 unset LINGUAS
1450 else
1451 export LINGUAS="${newls}"
1452 fi
1453}
1454
1455# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002)
1457
1458# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds
1460
1461# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() {
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in
1465 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";;
1469 *) export ARCH="${ARCH}";;
1470 esac
1471}
1472
1473# set's ARCH back to what portage expects
1474set_arch_to_portage() {
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476}
1477
1478# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0
1480# preserve_old_lib_notify /path/to/libblah.so.0
1481#
1482# These functions are useful when a lib in your package changes --soname. Such
1483# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1484# would break packages that link against it. Most people get around this
1485# by using the portage SLOT mechanism, but that is not always a relevant
1486# solution, so instead you can add the following to your ebuilds:
1487#
1488# src_install() {
1489# ...
1490# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1491# ...
1492# }
1493#
1494# pkg_postinst() {
1495# ...
1496# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1497# ...
1498# }
1499
1500preserve_old_lib() {
1501 LIB=$1
1502
1503 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1504 SONAME=`basename ${LIB}`
1505 DIRNAME=`dirname ${LIB}`
1506
1507 dodir ${DIRNAME}
1508 cp ${ROOT}${LIB} ${D}${DIRNAME}
1509 touch ${D}${LIB}
1510 fi
1511}
1512
1513preserve_old_lib_notify() {
1514 LIB=$1
1515
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}`
1518
1519 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo
1525 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi
1528}
1529
1530# Hack for people to figure out if a package was built with
1531# certain USE flags
1532#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2
1535built_with_use() {
1536 local PKG=$(portageq best_version ${ROOT} $1)
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1
1539
1540 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do
1544 has $1 ${USE_BUILT} || return 1
1545 shift
1546 done
1547 return 0
1548}
1549
1550# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450
1552epunt_cxx() {
1553 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks"
1556 local f
1557 for f in $(find ${dir} -name configure) ; do
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done
1560 eend 0
1561}
1562
1563# get_abi_var <VAR> [<ABI>]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now
1568# it is subject to removal if a better way is worked out.
1569#
1570# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600

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

  ViewVC Help
Powered by ViewVC 1.1.20