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

Diff of /eclass/eutils.eclass

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

Revision 1.24 Revision 1.84
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Technologies, Inc.
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.24 2003/03/03 21:27:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.84 2004/02/29 07:17:27 vapier 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 18
19# This function generate linker scripts in /usr/lib for dynamic 19# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 20# libs in /lib. This is to fix linking problems when you have
36# 36#
37gen_usr_ldscript() { 37gen_usr_ldscript() {
38 38
39 # Just make sure it exists 39 # Just make sure it exists
40 dodir /usr/lib 40 dodir /usr/lib
41 41
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT"
43/* GNU ld script 43/* GNU ld script
44 Because Gentoo have critical dynamic libraries 44 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 45 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 46 need to have a "fake" dynamic lib in /usr/lib,
70 return 0 70 return 0
71 fi 71 fi
72 72
73 # Get the length of $* 73 # Get the length of $*
74 str_length="$(echo -n "$*" | wc -m)" 74 str_length="$(echo -n "$*" | wc -m)"
75 75
76 while [ "$i" -lt "${str_length}" ] 76 while [ "$i" -lt "${str_length}" ]
77 do 77 do
78 echo -n "=" 78 echo -n "="
79 79
80 i=$((i + 1)) 80 i=$((i + 1))
81 done 81 done
82 82
83 echo 83 echo
84 84
88# Default directory where patches are located 88# Default directory where patches are located
89EPATCH_SOURCE="${WORKDIR}/patch" 89EPATCH_SOURCE="${WORKDIR}/patch"
90# Default extension for patches 90# Default extension for patches
91EPATCH_SUFFIX="patch.bz2" 91EPATCH_SUFFIX="patch.bz2"
92# Default options for patch 92# Default options for patch
93# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
93EPATCH_OPTS="" 94EPATCH_OPTS="-g0"
94# List of patches not to apply. Not this is only file names, 95# List of patches not to apply. Not this is only file names,
95# and not the full path .. 96# and not the full path ..
96EPATCH_EXCLUDE="" 97EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 98# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 99EPATCH_SINGLE_MSG=""
100# Force applying bulk patches even if not following the style:
101#
102# ??_${ARCH}_foo.${EPATCH_SUFFIX}
103#
104EPATCH_FORCE="no"
99 105
100# This function is for bulk patching, or in theory for just one 106# This function is for bulk patching, or in theory for just one
101# or two patches. 107# or two patches.
102# 108#
103# It should work with .bz2, .gz, .zip and plain text patches. 109# It should work with .bz2, .gz, .zip and plain text patches.
145 fi 151 fi
146 152
147 if [ -n "$1" -a -f "$1" ] 153 if [ -n "$1" -a -f "$1" ]
148 then 154 then
149 SINGLE_PATCH="yes" 155 SINGLE_PATCH="yes"
150 156
151 local EPATCH_SOURCE="$1" 157 local EPATCH_SOURCE="$1"
152 local EPATCH_SUFFIX="${1##*\.}" 158 local EPATCH_SUFFIX="${1##*\.}"
153 159
154 elif [ -n "$1" -a -d "$1" ] 160 elif [ -n "$1" -a -d "$1" ]
155 then 161 then
162 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ...
163 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ]
164 then
165 local EPATCH_SOURCE="$1/*"
166 else
156 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 167 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
168 fi
157 else 169 else
158 if [ ! -d ${EPATCH_SOURCE} ] 170 if [ ! -d ${EPATCH_SOURCE} ]
159 then 171 then
160 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 172 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
161 then 173 then
167 eerror 179 eerror
168 eerror " ${EPATCH_SOURCE}" 180 eerror " ${EPATCH_SOURCE}"
169 echo 181 echo
170 die "Cannot find \$EPATCH_SOURCE!" 182 die "Cannot find \$EPATCH_SOURCE!"
171 fi 183 fi
172 184
173 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 185 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
174 fi 186 fi
175 187
176 case ${EPATCH_SUFFIX##*\.} in 188 case ${EPATCH_SUFFIX##*\.} in
177 bz2) 189 bz2)
201 # New ARCH dependant patch naming scheme... 213 # New ARCH dependant patch naming scheme...
202 # 214 #
203 # ???_arch_foo.patch 215 # ???_arch_foo.patch
204 # 216 #
205 if [ -f ${x} ] && \ 217 if [ -f ${x} ] && \
206 [ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] 218 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
219 [ "${EPATCH_FORCE}" = "yes" ])
207 then 220 then
208 local count=0 221 local count=0
209 local popts="${EPATCH_OPTS}" 222 local popts="${EPATCH_OPTS}"
210 223
211 if [ -n "${EPATCH_EXCLUDE}" ] 224 if [ -n "${EPATCH_EXCLUDE}" ]
213 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 226 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]
214 then 227 then
215 continue 228 continue
216 fi 229 fi
217 fi 230 fi
218 231
219 if [ "${SINGLE_PATCH}" = "yes" ] 232 if [ "${SINGLE_PATCH}" = "yes" ]
220 then 233 then
221 if [ -n "${EPATCH_SINGLE_MSG}" ] 234 if [ -n "${EPATCH_SINGLE_MSG}" ]
222 then 235 then
223 einfo "${EPATCH_SINGLE_MSG}" 236 einfo "${EPATCH_SINGLE_MSG}"
243 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 256 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
244 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 257 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
245 else 258 else
246 PATCH_TARGET="${x}" 259 PATCH_TARGET="${x}"
247 fi 260 fi
248 261
249 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
250 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
251 264
252 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
253 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
254 267
255 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
256 then 269 then
261 #die "Could not extract patch!" 274 #die "Could not extract patch!"
262 count=5 275 count=5
263 break 276 break
264 fi 277 fi
265 fi 278 fi
266 279
267 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
268 then 281 then
269 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
270 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
271 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 #die "Real world sux compared to the dreamworld!" 296 #die "Real world sux compared to the dreamworld!"
284 count=5 297 count=5
285 fi 298 fi
286 299
287 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
288 301
289 break 302 break
290 fi 303 fi
291 304
292 count=$((count + 1)) 305 count=$((count + 1))
293 done 306 done
318 then 331 then
319 einfo "Done with patching" 332 einfo "Done with patching"
320 fi 333 fi
321} 334}
322 335
336# This function return true if we are using the NPTL pthreads
337# implementation.
338#
339# <azarah@gentoo.org> (06 March 2003)
340#
341
342have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE
346 #include <unistd.h>
347 #include <stdio.h>
348
349 int main()
350 {
351 char buf[255];
352 char *str = buf;
353
354 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
355 if (NULL != str) {
356 printf("%s\n", str);
357 if (NULL != strstr(str, "NPTL"))
358 return 0;
359 }
360
361 return 1;
362 }
363 END
364
365 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
366 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
367 then
368 echo "yes"
369 einfon "Checking what PTHREADS implementation we have ... "
370 if ${T}/nptl
371 then
372 return 0
373 else
374 return 1
375 fi
376 else
377 echo "no"
378 fi
379
380 return 1
381}
382
323# This function check how many cpu's are present, and then set 383# This function check how many cpu's are present, and then set
324# -j in MAKEOPTS accordingly. 384# -j in MAKEOPTS accordingly.
325# 385#
326# Thanks to nall <nall@gentoo.org> for this. 386# Thanks to nall <nall@gentoo.org> for this.
327# 387#
340 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`" 400 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
341 ADMINPARAM="${ADMINPARAM/-j}" 401 ADMINPARAM="${ADMINPARAM/-j}"
342 fi 402 fi
343 403
344 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" 404 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
345 405
346 if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ 406 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
347 "${ARCH}" = "arm" -o "${ARCH}" = "mips" ] 407 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
348 then 408 then
349 # these archs will always have "[Pp]rocessor" 409 # these archs will always have "[Pp]rocessor"
350 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" 410 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
351 411
352 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] 412 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
353 then 413 then
354 # sparc always has "ncpus active" 414 # sparc always has "ncpus active"
355 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 415 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
356 416
357 elif [ "${ARCH}" = "alpha" ] 417 elif [ "${ARCH}" = "alpha" ]
358 then 418 then
359 # alpha has "cpus active", but only when compiled with SMP 419 # alpha has "cpus active", but only when compiled with SMP
360 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ] 420 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
361 then 421 then
362 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
363 else 423 else
364 jobs=2 424 jobs=2
365 fi 425 fi
366 426
367 elif [ "${ARCH}" = "ppc" ] 427 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
368 then 428 then
369 # ppc has "processor", but only when compiled with SMP 429 # ppc has "processor", but only when compiled with SMP
370 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
371 then 431 then
372 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
381 # Make sure the number is valid ... 441 # Make sure the number is valid ...
382 if [ "${jobs}" -lt 1 ] 442 if [ "${jobs}" -lt 1 ]
383 then 443 then
384 jobs=1 444 jobs=1
385 fi 445 fi
386 446
387 if [ -n "${ADMINPARAM}" ] 447 if [ -n "${ADMINPARAM}" ]
388 then 448 then
389 if [ "${jobs}" -gt "${ADMINPARAM}" ] 449 if [ "${jobs}" -gt "${ADMINPARAM}" ]
390 then 450 then
391 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 451 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
395 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 455 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
396 fi 456 fi
397 fi 457 fi
398} 458}
399 459
460# Cheap replacement for when debianutils (and thus mktemp)
461# does not exist on the users system
462# vapier@gentoo.org
463#
464# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() {
466 local topdir="$1"
467
468 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ]
470 then
471 mktemp -p ${topdir}
472 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp}
475 echo ${tmp}
476 fi
477}
478
400# Simplify/standardize adding users to the system 479# Simplify/standardize adding users to the system
401# vapier@gentoo.org 480# vapier@gentoo.org
402# 481#
403# enewuser(username, uid, shell, homedir, groups, extra options) 482# enewuser(username, uid, shell, homedir, groups, extra options)
404# 483#
405# Default values if you do not specify any: 484# Default values if you do not specify any:
406# username: REQUIRED ! 485# username: REQUIRED !
407# uid: next available (see useradd(8)) 486# uid: next available (see useradd(8))
487# note: pass -1 to get default behavior
408# shell: /bin/false 488# shell: /bin/false
409# homedir: /dev/null 489# homedir: /dev/null
410# groups: none 490# groups: none
411# extra: comment of 'added by portage for ${PN}' 491# extra: comment of 'added by portage for ${PN}'
412enewuser() { 492enewuser() {
413 # get the username 493 # get the username
414 local euser="$1"; shift 494 local euser="$1"; shift
415 if [ -z "${euser}" ] ; then 495 if [ -z "${euser}" ]
496 then
416 eerror "No username specified !" 497 eerror "No username specified !"
417 die "Cannot call enewuser without a username" 498 die "Cannot call enewuser without a username"
418 fi 499 fi
500
501 # lets see if the username already exists
502 if [ "${euser}" == "`getent passwd \"${euser}\" | cut -d: -f1`" ]
503 then
504 return 0
505 fi
419 einfo "Adding user '${euser}' to your system ..." 506 einfo "Adding user '${euser}' to your system ..."
420 507
421 # setup a file for testing usernames/groups
422 local tmpfile="`mktemp -p ${T}`"
423 touch ${tmpfile}
424 chown ${euser} ${tmpfile} >& /dev/null
425 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
426
427 # see if user already exists
428 if [ "${euser}" == "${realuser}" ] ; then
429 einfo "${euser} already exists on your system :)"
430 return 0
431 fi
432
433 # options to pass to useradd 508 # options to pass to useradd
434 local opts="" 509 local opts=
435 510
436 # handle uid 511 # handle uid
437 local euid="$1"; shift 512 local euid="$1"; shift
438 if [ ! -z "${euid}" ] ; then 513 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
514 then
439 if [ ${euid} -gt 0 ] ; then 515 if [ "${euid}" -gt 0 ]
440 opts="${opts} -u ${euid}" 516 then
517 if [ ! -z "`getent passwd ${euid}`" ]
518 then
519 euid="next"
520 fi
441 else 521 else
442 eerror "Userid given but is not greater than 0 !" 522 eerror "Userid given but is not greater than 0 !"
443 die "${euid} is not a valid UID" 523 die "${euid} is not a valid UID"
444 fi 524 fi
445 else 525 else
446 euid="next available" 526 euid="next"
447 fi 527 fi
528 if [ "${euid}" == "next" ]
529 then
530 for euid in `seq 101 999` ; do
531 [ -z "`getent passwd ${euid}`" ] && break
532 done
533 fi
534 opts="${opts} -u ${euid}"
448 einfo " - Userid: ${euid}" 535 einfo " - Userid: ${euid}"
449 536
450 # handle shell 537 # handle shell
451 local eshell="$1"; shift 538 local eshell="$1"; shift
452 if [ ! -z "${eshell}" ] ; then 539 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
540 then
453 if [ ! -e ${eshell} ] ; then 541 if [ ! -e "${eshell}" ]
542 then
454 eerror "A shell was specified but it does not exist !" 543 eerror "A shell was specified but it does not exist !"
455 die "${eshell} does not exist" 544 die "${eshell} does not exist"
456 fi 545 fi
457 else 546 else
458 eshell=/bin/false 547 eshell="/bin/false"
459 fi 548 fi
460 einfo " - Shell: ${eshell}" 549 einfo " - Shell: ${eshell}"
461 opts="${opts} -s ${eshell}" 550 opts="${opts} -s ${eshell}"
462 551
463 # handle homedir 552 # handle homedir
464 local ehome="$1"; shift 553 local ehome="$1"; shift
465 if [ -z "${ehome}" ] ; then 554 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
555 then
466 ehome=/dev/null 556 ehome="/dev/null"
467 fi 557 fi
468 einfo " - Home: ${ehome}" 558 einfo " - Home: ${ehome}"
469 opts="${opts} -d ${ehome}" 559 opts="${opts} -d ${ehome}"
470 560
471 # handle groups 561 # handle groups
472 local egroups="$1"; shift 562 local egroups="$1"; shift
473 if [ ! -z "${egroups}" ] ; then 563 if [ ! -z "${egroups}" ]
564 then
474 local realgroup 565 local realgroup=
475 local oldifs="${IFS}" 566 local oldifs="${IFS}"
476 export IFS="," 567 export IFS=","
477 for g in ${egroups} ; do 568 for g in ${egroups}
569 do
478 chgrp ${g} ${tmpfile} >& /dev/null 570 chgrp ${g} ${tmpfile} >& /dev/null
479 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 571 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
480 if [ "${g}" != "${realgroup}" ] ; then 572 if [ "${g}" != "${realgroup}" ]
573 then
481 eerror "You must add ${g} to the system first" 574 eerror "You must add ${g} to the system first"
482 die "${g} is not a valid GID" 575 die "${g} is not a valid GID"
483 fi 576 fi
484 done 577 done
485 export IFS="${oldifs}" 578 export IFS="${oldifs}"
489 fi 582 fi
490 einfo " - Groups: ${egroups}" 583 einfo " - Groups: ${egroups}"
491 584
492 # handle extra and add the user 585 # handle extra and add the user
493 local eextra="$@" 586 local eextra="$@"
494 local oldsandbox="${oldsandbox}" 587 local oldsandbox="${SANDBOX_ON}"
495 export SANDBOX_ON="0" 588 export SANDBOX_ON="0"
496 if [ -z "${eextra}" ] ; then 589 if [ -z "${eextra}" ]
590 then
497 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
498 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
499 || die "enewuser failed" 593 || die "enewuser failed"
500 else 594 else
501 einfo " - Extra: ${eextra}" 595 einfo " - Extra: ${eextra}"
502 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} ${eextra} \
503 || die "enewuser failed" 597 || die "enewuser failed"
504 fi 598 fi
505 export SANDBOX_ON="${oldsandbox}" 599 export SANDBOX_ON="${oldsandbox}"
506 600
507 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then 601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
602 then
508 einfo " - Creating ${ehome} in ${D}" 603 einfo " - Creating ${ehome} in ${D}"
509 dodir ${ehome} 604 dodir ${ehome}
510 fperms ${euser} ${ehome} 605 fowners ${euser} ${ehome}
606 fperms 755 ${ehome}
511 fi 607 fi
512} 608}
513 609
514# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
515# vapier@gentoo.org 611# vapier@gentoo.org
521# gid: next available (see groupadd(8)) 617# gid: next available (see groupadd(8))
522# extra: none 618# extra: none
523enewgroup() { 619enewgroup() {
524 # get the group 620 # get the group
525 local egroup="$1"; shift 621 local egroup="$1"; shift
526 if [ -z "${egroup}" ] ; then 622 if [ -z "${egroup}" ]
623 then
527 eerror "No group specified !" 624 eerror "No group specified !"
528 die "Cannot call enewgroup without a group" 625 die "Cannot call enewgroup without a group"
529 fi 626 fi
627
628 # see if group already exists
629 if [ "${egroup}" == "`getent group \"${egroup}\" | cut -d: -f1`" ]
630 then
631 return 0
632 fi
530 einfo "Adding group '${egroup}' to your system ..." 633 einfo "Adding group '${egroup}' to your system ..."
531 634
532 # setup a file for testing groupname
533 local tmpfile="`mktemp -p ${T}`"
534 touch ${tmpfile}
535 chgrp ${egroup} ${tmpfile} >& /dev/null
536 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
537
538 # see if group already exists
539 if [ "${egroup}" == "${realgroup}" ] ; then
540 einfo "${egroup} already exists on your system :)"
541 return 0
542 fi
543
544 # options to pass to useradd 635 # options to pass to useradd
545 local opts="" 636 local opts=
546 637
547 # handle gid 638 # handle gid
548 local egid="$1"; shift 639 local egid="$1"; shift
549 if [ ! -z "${egid}" ] ; then 640 if [ ! -z "${egid}" ]
641 then
550 if [ ${egid} -gt 0 ] ; then 642 if [ "${egid}" -gt 0 ]
643 then
644 if [ -z "`getent group ${egid}`" ]
645 then
551 opts="${opts} -g ${egid}" 646 opts="${opts} -g ${egid}"
647 else
648 egid="next available; requested gid taken"
649 fi
552 else 650 else
553 eerror "Groupid given but is not greater than 0 !" 651 eerror "Groupid given but is not greater than 0 !"
554 die "${egid} is not a valid GID" 652 die "${egid} is not a valid GID"
555 fi 653 fi
556 else 654 else
561 # handle extra 659 # handle extra
562 local eextra="$@" 660 local eextra="$@"
563 opts="${opts} ${eextra}" 661 opts="${opts} ${eextra}"
564 662
565 # add the group 663 # add the group
566 local oldsandbox="${oldsandbox}" 664 local oldsandbox="${SANDBOX_ON}"
567 export SANDBOX_ON="0" 665 export SANDBOX_ON="0"
568 groupadd ${opts} ${egroup} || die "enewgroup failed" 666 groupadd ${opts} ${egroup} || die "enewgroup failed"
569 export SANDBOX_ON="${oldsandbox}" 667 export SANDBOX_ON="${oldsandbox}"
570} 668}
571 669
572# Simple script to replace 'dos2unix' binaries 670# Simple script to replace 'dos2unix' binaries
573# vapier@gentoo.org 671# vapier@gentoo.org
574# 672#
575# edos2unix(file, <more files>...) 673# edos2unix(file, <more files>...)
576edos2unix() { 674edos2unix() {
577 for f in $@ ; do 675 for f in "$@"
578 cp ${f} ${T}/ 676 do
579 sed 's/\r$//' ${T}/${f}.old > ${f} 677 cp "${f}" ${T}/edos2unix
678 sed 's/\r$//' ${T}/edos2unix > "${f}"
580 done 679 done
581} 680}
681
682# Make a desktop file !
683# Great for making those icons in kde/gnome startmenu !
684# Amaze your friends ! Get the women ! Join today !
685# gnome2 /usr/share/applications
686# gnome1 /usr/share/gnome/apps/
687# KDE ${KDEDIR}/share/applnk /usr/share/applnk
688#
689# make_desktop_entry(<binary>, [name], [icon], [type], [path])
690#
691# binary: what binary does the app run with ?
692# name: the name that will show up in the menu
693# icon: give your little like a pretty little icon ...
694# this can be relative (to /usr/share/pixmaps) or
695# a full path to an icon
696# type: what kind of application is this ? for categories:
697# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html
698# path: if your app needs to startup in a specific dir
699make_desktop_entry() {
700 [ -z "$1" ] && eerror "You must specify the executable" && return 1
701
702 local exec="${1}"
703 local name="${2:-${PN}}"
704 local icon="${3:-${PN}.png}"
705 local type="${4}"
706 local subdir="${6}"
707 local path="${5:-${GAMES_PREFIX}}"
708 if [ -z "${type}" ]
709 then
710 case ${CATEGORY} in
711 "app-emulation")
712 type=Emulator
713 subdir="Games"
714 ;;
715 "games-"*)
716 type=Game
717 subdir="Games"
718 ;;
719 "net-"*)
720 type=Network
721 subdir="${type}"
722 ;;
723 *)
724 type=
725 subdir=
726 ;;
727 esac
728 fi
729 local desktop="${T}/${exec}.desktop"
730
731echo "[Desktop Entry]
732Encoding=UTF-8
733Version=0.9.2
734Name=${name}
735Type=Application
736Comment=${DESCRIPTION}
737Exec=${exec}
738Path=${path}
739Icon=${icon}
740Categories=Application;${type};" > ${desktop}
741
742 if [ -d "/usr/share/applications" ]
743 then
744 insinto /usr/share/applications
745 doins ${desktop}
746 fi
747
748 #if [ -d "/usr/share/gnome/apps" ]
749 #then
750 # insinto /usr/share/gnome/apps/Games
751 # doins ${desktop}
752 #fi
753
754 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
755 #then
756 # for ver in /usr/kde/*
757 # do
758 # insinto ${ver}/share/applnk/Games
759 # doins ${desktop}
760 # done
761 #fi
762
763 if [ -d "/usr/share/applnk" ]
764 then
765 insinto /usr/share/applnk/${subdir}
766 doins ${desktop}
767 fi
768
769 return 0
770}
771
772# for internal use only (unpack_pdv and unpack_makeself)
773find_unpackable_file() {
774 local src="$1"
775 if [ -z "${src}" ]
776 then
777 src="${DISTDIR}/${A}"
778 else
779 if [ -e "${DISTDIR}/${src}" ]
780 then
781 src="${DISTDIR}/${src}"
782 elif [ -e "${PWD}/${src}" ]
783 then
784 src="${PWD}/${src}"
785 elif [ -e "${src}" ]
786 then
787 src="${src}"
788 fi
789 fi
790 [ ! -e "${src}" ] && die "Could not find requested archive ${src}"
791 echo "${src}"
792}
793
794# Unpack those pesky pdv generated files ...
795# They're self-unpacking programs with the binary package stuffed in
796# the middle of the archive. Valve seems to use it a lot ... too bad
797# it seems to like to segfault a lot :(. So lets take it apart ourselves.
798#
799# Usage: unpack_pdv [file to unpack] [size of off_t]
800# - you have to specify the off_t size ... i have no idea how to extract that
801# information out of the binary executable myself. basically you pass in
802# the size of the off_t type (in bytes) on the machine that built the pdv
803# archive. one way to determine this is by running the following commands:
804# strings <pdv archive> | grep lseek
805# strace -elseek <pdv archive>
806# basically look for the first lseek command (we do the strings/grep because
807# sometimes the function call is _llseek or something) and steal the 2nd
808# parameter. here is an example:
809# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
810# lseek
811# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
812# lseek(3, -4, SEEK_END) = 2981250
813# thus we would pass in the value of '4' as the second parameter.
814unpack_pdv() {
815 local src="`find_unpackable_file $1`"
816 local sizeoff_t="$2"
817
818 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("
819
820 local shrtsrc="`basename ${src}`"
821 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
822 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
823 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
824
825 # grab metadata for debug reasons
826 local metafile="`mymktemp ${T}`"
827 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
828
829 # rip out the final file name from the metadata
830 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
831 datafile="`basename ${datafile}`"
832
833 # now lets uncompress/untar the file if need be
834 local tmpfile="`mymktemp ${T}`"
835 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
836
837 local iscompressed="`file -b ${tmpfile}`"
838 if [ "${iscompressed:0:8}" == "compress" ] ; then
839 iscompressed=1
840 mv ${tmpfile}{,.Z}
841 gunzip ${tmpfile}
842 else
843 iscompressed=0
844 fi
845 local istar="`file -b ${tmpfile}`"
846 if [ "${istar:0:9}" == "POSIX tar" ] ; then
847 istar=1
848 else
849 istar=0
850 fi
851
852 #for some reason gzip dies with this ... dd cant provide buffer fast enough ?
853 #dd if=${src} ibs=${metaskip} count=1 \
854 # | dd ibs=${tailskip} skip=1 \
855 # | gzip -dc \
856 # > ${datafile}
857 if [ ${iscompressed} -eq 1 ] ; then
858 if [ ${istar} -eq 1 ] ; then
859 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
860 | head -c $((${metaskip}-${tailskip})) \
861 | tar -xzf -
862 else
863 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
864 | head -c $((${metaskip}-${tailskip})) \
865 | gzip -dc \
866 > ${datafile}
867 fi
868 else
869 if [ ${istar} -eq 1 ] ; then
870 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
871 | head -c $((${metaskip}-${tailskip})) \
872 | tar --no-same-owner -xf -
873 else
874 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
875 | head -c $((${metaskip}-${tailskip})) \
876 > ${datafile}
877 fi
878 fi
879 true
880 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
881 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
882}
883
884# Unpack those pesky makeself generated files ...
885# They're shell scripts with the binary package tagged onto
886# the end of the archive. Loki utilized the format as does
887# many other game companies.
888#
889# Usage: unpack_makeself [file to unpack] [offset]
890# - If the file is not specified then unpack will utilize ${A}.
891# - If the offset is not specified then we will attempt to extract
892# the proper offset from the script itself.
893unpack_makeself() {
894 local src="`find_unpackable_file $1`"
895 local skip="$2"
896
897 local shrtsrc="`basename ${src}`"
898 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
899 if [ -z "${skip}" ]
900 then
901 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
902 local skip=0
903 case ${ver} in
904 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
905 skip=`grep -a ^skip= ${src} | cut -d= -f2`
906 ;;
907 2.0|2.0.1)
908 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-`
909 ;;
910 2.1.1)
911 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-`
912 let skip="skip + 1"
913 ;;
914 2.1.2)
915 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1`
916 let skip="skip + 1"
917 ;;
918 2.1.3)
919 skip=`grep -a ^offset= ${src} | awk '{print $3}'`
920 let skip="skip + 1"
921 ;;
922 *)
923 eerror "I'm sorry, but I was unable to support the Makeself file."
924 eerror "The version I detected was '${ver}'."
925 eerror "Please file a bug about the file ${shrtsrc} at"
926 eerror "http://bugs.gentoo.org/ so that support can be added."
927 die "makeself version '${ver}' not supported"
928 ;;
929 esac
930 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
931 fi
932
933 # lets grab the first few bytes of the file to figure out what kind of archive it is
934 local tmpfile="`mymktemp ${T}`"
935 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile}
936 local filetype="`file -b ${tmpfile}`"
937 case ${filetype} in
938 *tar\ archive)
939 tail -n +${skip} ${src} | tar --no-same-owner -xf -
940 ;;
941 bzip2*)
942 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
943 ;;
944 gzip*)
945 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
946 ;;
947 *)
948 false
949 ;;
950 esac
951 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
952}
953
954# Display a license for user to accept.
955#
956# Usage: check_license [license]
957# - If the file is not specified then ${LICENSE} is used.
958check_license() {
959 local lic=$1
960 if [ -z "${lic}" ] ; then
961 lic="${PORTDIR}/licenses/${LICENSE}"
962 else
963 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
964 lic="${PORTDIR}/licenses/${src}"
965 elif [ -e "${PWD}/${src}" ] ; then
966 lic="${PWD}/${src}"
967 elif [ -e "${src}" ] ; then
968 lic="${src}"
969 fi
970 fi
971 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
972 local l="`basename ${lic}`"
973
974 # here is where we check for the licenses the user already
975 # accepted ... if we don't find a match, we make the user accept
976 local alic
977 for alic in "${ACCEPT_LICENSE}" ; do
978 [ "${alic}" == "*" ] && return 0
979 [ "${alic}" == "${l}" ] && return 0
980 done
981
982 local licmsg="`mymktemp ${T}`"
983 cat << EOF > ${licmsg}
984**********************************************************
985The following license outlines the terms of use of this
986package. You MUST accept this license for installation to
987continue. When you are done viewing, hit 'q'. If you
988CTRL+C out of this, the install will not run!
989**********************************************************
990
991EOF
992 cat ${lic} >> ${licmsg}
993 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
994 einfon "Do you accept the terms of this license (${l})? [yes/no] "
995 read alic
996 case ${alic} in
997 yes|Yes|y|Y)
998 return 0
999 ;;
1000 *)
1001 echo;echo;echo
1002 eerror "You MUST accept the license to continue! Exiting!"
1003 die "Failed to accept license"
1004 ;;
1005 esac
1006}
1007
1008# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1009# the whole 'non-interactive' policy, but damnit I want CD support !
1010#
1011# with these cdrom functions we handle all the user interaction and
1012# standardize everything. all you have to do is call cdrom_get_cds()
1013# and when the function returns, you can assume that the cd has been
1014# found at CDROM_ROOT.
1015#
1016# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1017# etc... if you want to give the cds better names, then just export
1018# the CDROM_NAME_X variables before calling cdrom_get_cds().
1019#
1020# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1021#
1022# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1023# - this will attempt to locate a cd based upon a file that is on
1024# the cd ... the more files you give this function, the more cds
1025# the cdrom functions will handle
1026cdrom_get_cds() {
1027 # first we figure out how many cds we're dealing with by
1028 # the # of files they gave us
1029 local cdcnt=0
1030 local f=
1031 for f in "$@" ; do
1032 cdcnt=$((cdcnt + 1))
1033 export CDROM_CHECK_${cdcnt}="$f"
1034 done
1035 export CDROM_TOTAL_CDS=${cdcnt}
1036 export CDROM_CURRENT_CD=1
1037
1038 # now we see if the user gave use CD_ROOT ...
1039 # if they did, let's just believe them that it's correct
1040 if [ ! -z "${CD_ROOT}" ] ; then
1041 export CDROM_ROOT="${CD_ROOT}"
1042 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1043 return
1044 fi
1045 # do the same for CD_ROOT_X
1046 if [ ! -z "${CD_ROOT_1}" ] ; then
1047 local var=
1048 cdcnt=0
1049 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1050 cdcnt=$((cdcnt + 1))
1051 var="CD_ROOT_${cdcnt}"
1052 if [ -z "${!var}" ] ; then
1053 eerror "You must either use just the CD_ROOT"
1054 eerror "or specify ALL the CD_ROOT_X variables."
1055 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1056 die "could not locate CD_ROOT_${cdcnt}"
1057 fi
1058 export CDROM_ROOTS_${cdcnt}="${!var}"
1059 done
1060 export CDROM_ROOT=${CDROM_ROOTS_1}
1061 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1062 return
1063 fi
1064
1065 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1066 einfon "This ebuild will need the "
1067 if [ -z "${CDROM_NAME}" ] ; then
1068 echo "cdrom for ${PN}."
1069 else
1070 echo "${CDROM_NAME}."
1071 fi
1072 echo
1073 einfo "If you do not have the CD, but have the data files"
1074 einfo "mounted somewhere on your filesystem, just export"
1075 einfo "the variable CD_ROOT so that it points to the"
1076 einfo "directory containing the files."
1077 echo
1078 else
1079 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1080 cdcnt=0
1081 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1082 cdcnt=$((cdcnt + 1))
1083 var="CDROM_NAME_${cdcnt}"
1084 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1085 done
1086 echo
1087 einfo "If you do not have the CDs, but have the data files"
1088 einfo "mounted somewhere on your filesystem, just export"
1089 einfo "the following variables so they point to the right place:"
1090 einfon ""
1091 cdcnt=0
1092 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1093 cdcnt=$((cdcnt + 1))
1094 echo -n " CD_ROOT_${cdcnt}"
1095 done
1096 echo
1097 einfo "Or, if you have all the files in the same place, or"
1098 einfo "you only have one cdrom, you can export CD_ROOT"
1099 einfo "and that place will be used as the same data source"
1100 einfo "for all the CDs."
1101 echo
1102 fi
1103 export CDROM_CURRENT_CD=0
1104 cdrom_load_next_cd
1105}
1106
1107# this is only used when you need access to more than one cd.
1108# when you have finished using the first cd, just call this function.
1109# when it returns, CDROM_ROOT will be pointing to the second cd.
1110# remember, you can only go forward in the cd chain, you can't go back.
1111cdrom_load_next_cd() {
1112 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1113 local var=
1114
1115 if [ ! -z "${CD_ROOT}" ] ; then
1116 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1117 return
1118 fi
1119
1120 unset CDROM_ROOT
1121 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1122 if [ -z "${!var}" ] ; then
1123 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1124 cdrom_locate_file_on_cd ${!var}
1125 else
1126 export CDROM_ROOT="${!var}"
1127 fi
1128
1129 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1130}
1131
1132# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1133# functions. this should *never* be called from an ebuild.
1134# all it does is try to locate a give file on a cd ... if the cd isn't
1135# found, then a message asking for the user to insert the cdrom will be
1136# displayed and we'll hang out here until:
1137# (1) the file is found on a mounted cdrom
1138# (2) the user hits CTRL+C
1139cdrom_locate_file_on_cd() {
1140 while [ -z "${CDROM_ROOT}" ] ; do
1141 local dir="$(dirname ${@})"
1142 local file="$(basename ${@})"
1143 local mline=""
1144 local showedmsg=0
1145
1146 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1147 [ -d "${mline}/${dir}" ] || continue
1148 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1149 && export CDROM_ROOT=${mline}
1150 done
1151
1152 if [ -z "${CDROM_ROOT}" ] ; then
1153 echo
1154 if [ ${showedmsg} -eq 0 ] ; then
1155 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1156 if [ -z "${CDROM_NAME}" ] ; then
1157 einfo "Please insert the cdrom for ${PN} now !"
1158 else
1159 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1160 fi
1161 else
1162 if [ -z "${CDROM_NAME_1}" ] ; then
1163 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1164 else
1165 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1166 einfo "Please insert+mount the ${!var} cdrom now !"
1167 fi
1168 fi
1169 showedmsg=1
1170 fi
1171 einfo "Press return to scan for the cd again"
1172 einfo "or hit CTRL+C to abort the emerge."
1173 read
1174 fi
1175 done
1176}

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.84

  ViewVC Help
Powered by ViewVC 1.1.20