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

Diff of /eclass/eutils.eclass

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

Revision 1.178 Revision 1.223
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.178 2005/05/26 22:09:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes 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.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 60# to point to the latest version of the library present.
62# 61#
63# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
64# 63#
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 85
117# Default directory where patches are located 86# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 88# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
167# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
168# 137#
169# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
170# 139#
171epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 159 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
177 local x="" 164 local x=""
165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 167
179 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
180 then 169 then
181 local m="" 170 local m=""
182 for m in "$@" ; do 171 for m in "$@" ; do
283 272
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
286 do 275 do
287 # Generate some useful debug info ... 276 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 279
291 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 281 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 287
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 290
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 293
305 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 295 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 297 then
312 count=5 301 count=5
313 break 302 break
314 fi 303 fi
315 fi 304 fi
316 305
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 307 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 313
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
326 316
327 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
328 then 318 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 320 echo
376# vapier@gentoo.org 366# vapier@gentoo.org
377# 367#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 369emktemp() {
380 local exe="touch" 370 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 372 local topdir=$1
383 373
384 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 376 && topdir="/tmp" \
388 || topdir="${T}" 377 || topdir=${T}
389 fi 378 fi
390 379
391 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 381 local tmp=/
394 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 384 done
397 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 386 echo "${tmp}"
399 else 387 else
400 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
401 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
402 || exe="-d" 395 || exe="-dt"
403 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
404 fi 398 fi
405} 399}
406 400
407# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 405#
412# egetent(database, key) 406# egetent(database, key)
413egetent() { 407egetent() {
414 if useq ppc-macos ; then 408 case ${CHOST} in
409 *-darwin*)
415 case "$2" in 410 case "$2" in
416 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 413 ;;
419 *) # Numeric 414 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 416 ;;
422 esac 417 esac
423 elif useq x86-fbsd ; then 418 ;;
424 local action 419 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 420 local opts action="user"
426 then 421 [[ $1 == "passwd" ]] || action="group"
427 action="user" 422
428 else 423 # lookup by uid/gid
429 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 426 fi
427
431 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
432 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
433 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 435 getent "$1" "$2"
435 fi 436 ;;
437 esac
436} 438}
437 439
438# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
439# vapier@gentoo.org 441# vapier@gentoo.org
440# 442#
448# homedir: /dev/null 450# homedir: /dev/null
449# groups: none 451# groups: none
450# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
451enewuser() { 453enewuser() {
452 # get the username 454 # get the username
453 local euser="$1"; shift 455 local euser=$1; shift
454 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 457 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
458 fi 459 fi
459 460
460 # lets see if the username already exists 461 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 463 return 0
464 fi 464 fi
465 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
466 466
467 # options to pass to useradd 467 # options to pass to useradd
468 local opts= 468 local opts=
469 469
470 # handle uid 470 # handle uid
471 local euid="$1"; shift 471 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 475 euid="next"
479 fi 476 fi
480 else 477 else
481 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
483 fi 480 fi
484 else 481 else
485 euid="next" 482 euid="next"
486 fi 483 fi
487 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
488 then 485 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 486 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 487 done
498 fi 488 fi
499 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
501 491
502 # handle shell 492 # handle shell
503 local eshell="$1"; shift 493 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
510 fi 498 fi
511 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
512 if [ "${USERLAND}" == "BSD" ] 500 eerror "Do not specify ${eshell} yourself, use -1"
513 then 501 die "Pass '-1' as the shell parameter"
514 eshell="/usr/bin/false" 502 fi
515 else 503 else
516 eshell="/bin/false" 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 [[ -x ${ROOT}${shell} ]] && break
506 done
507
508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
517 fi 511 fi
512
513 eshell=${shell}
518 fi 514 fi
519 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
521 517
522 # handle homedir 518 # handle homedir
523 local ehome="$1"; shift 519 local ehome=$1; shift
524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 521 ehome="/dev/null"
527 fi 522 fi
528 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
530 525
531 # handle groups 526 # handle groups
532 local egroups="$1"; shift 527 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 529 local oldifs=${IFS}
536 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
537 531
538 export IFS="," 532 export IFS=","
539 for g in ${egroups} 533 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 534 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
546 fi 538 fi
547 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 540 defgroup=${g}
550 else 541 else
551 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
552 fi 543 fi
553 export IFS="," 544 export IFS=","
554 done 545 done
555 export IFS="${oldifs}" 546 export IFS=${oldifs}
556 547
557 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
561 fi 551 fi
562 else 552 else
563 egroups="(none)" 553 egroups="(none)"
564 fi 554 fi
565 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
566 556
567 # handle extra and add the user 557 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
571 if useq ppc-macos 560 case ${CHOST} in
572 then 561 *-darwin*)
573 ### Make the user 562 ### Make the user
574 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 568 ### Add the user to the groups specified
581 local oldifs="${IFS}" 569 local oldifs=${IFS}
582 export IFS="," 570 export IFS=","
583 for g in ${egroups} 571 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
586 done 573 done
587 export IFS="${oldifs}" 574 export IFS=${oldifs}
588 else 575 else
589 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
592 die "Required function missing" 579 die "Required function missing"
593 fi 580 fi
594 elif use x86-fbsd ; then 581 ;;
595 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
596 then 583 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
599 die "enewuser failed" 586 die "enewuser failed"
600 else 587 else
601 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
604 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
605 else 597 else
606 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
607 then 599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
616 *)
617 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 620 || die "enewuser failed"
611 else 621 else
612 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 624 || die "enewuser failed"
615 fi 625 fi
626 ;;
627 esac
628
629 if [[ ! -e ${ROOT}/${ehome} ]] ; then
630 einfo " - Creating ${ehome} in ${ROOT}"
631 mkdir -p "${ROOT}/${ehome}"
632 chown ${euser} "${ROOT}/${ehome}"
633 chmod 755 "${ROOT}/${ehome}"
616 fi 634 fi
635
617 export SANDBOX_ON="${oldsandbox}" 636 export SANDBOX_ON=${oldsandbox}
618
619 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
620 then
621 einfo " - Creating ${ehome} in ${D}"
622 dodir ${ehome}
623 fowners ${euser} ${ehome}
624 fperms 755 ${ehome}
625 fi
626} 637}
627 638
628# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 640# vapier@gentoo.org
630# 641#
659 then 670 then
660 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
661 then 672 then
662 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
663 then 674 then
664 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
665 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
666 else 677 else
667 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
668 fi 679 fi
669 else 680 else
683 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
684 695
685 # add the group 696 # add the group
686 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
689 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
690 then 702 then
691 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
694 die "Required function missing" 706 die "Required function missing"
695 fi 707 fi
696 708
697 # If we need the next available 709 # If we need the next available
698 case ${egid} in 710 case ${egid} in
699 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
702 done 714 done
703 esac 715 esac
704 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
707 case ${egid} in 721 case ${egid} in
708 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
711 done 725 done
712 esac 726 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
715 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
716 fi 742 ;;
743 esac
717 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
718} 745}
719 746
720# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
721# vapier@gentoo.org 748# vapier@gentoo.org
746# name: the name that will show up in the menu 773# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 776# a full path to an icon
750# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 780make_desktop_entry() {
754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
755 782
756 local exec=${1} 783 local exec=${1}
782 dev) 809 dev)
783 type="Development" 810 type="Development"
784 ;; 811 ;;
785 812
786 games) 813 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 814 case ${catmin} in
790 action) type=ActionGame;; 815 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 817 board) type=BoardGame;;
793 kid) type=KidsGame;; 818 kid) type=KidsGame;;
834 type="Network;${type}" 859 type="Network;${type}"
835 ;; 860 ;;
836 861
837 sci) 862 sci)
838 case ${catmin} in 863 case ${catmin} in
839 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
840 bio*) type=Biology;; 865 bio*) type=Biology;;
841 calc*) type=Calculator;; 866 calc*) type=Calculator;;
842 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
843 geo*) type=Geology;; 868 geo*) type=Geology;;
844 math*) type=Math;; 869 math*) type=Math;;
876Exec=${exec} 901Exec=${exec}
877Path=${path} 902Path=${path}
878Icon=${icon} 903Icon=${icon}
879Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
880 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
881 insinto /usr/share/applications 909 insinto /usr/share/applications
882 doins "${desktop}" 910 doins "${desktop}"
883 911 )
884 return 0
885} 912}
886 913
887# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
888# 915#
889# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
918 doins "${i}" 945 doins "${i}"
919 elif [[ -d ${i} ]] ; then 946 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.desktop ; do 947 for j in "${i}"/*.desktop ; do
921 doins "${j}" 948 doins "${j}"
922 done 949 done
923 fi 950 fi
924 done 951 done
925} 952}
926newmenu() { 953newmenu() {
927 insinto /usr/share/applications 954 insinto /usr/share/applications
928 newins "$1" "$2" 955 newins "$1" "$2"
936 doins "${i}" 963 doins "${i}"
937 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
938 for j in "${i}"/*.png ; do 965 for j in "${i}"/*.png ; do
939 doins "${j}" 966 doins "${j}"
940 done 967 done
941 fi 968 fi
942 done 969 done
943} 970}
944newicon() { 971newicon() {
945 insinto /usr/share/pixmaps 972 insinto /usr/share/pixmaps
946 newins "$1" "$2" 973 newins "$1" "$2"
951############################################################## 978##############################################################
952 979
953 980
954# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
955find_unpackable_file() { 982find_unpackable_file() {
956 local src="$1" 983 local src=$1
957 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
958 then
959 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
960 else 986 else
961 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
962 then
963 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
964 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
965 then
966 src="${PWD}/${src}" 990 src=${PWD}/${src}
967 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
968 then
969 src="${src}" 992 src=${src}
970 fi
971 fi 993 fi
972 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
973 echo "${src}" 996 echo "${src}"
974} 997}
975 998
976# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
977# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
992# lseek 1015# lseek
993# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
994# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
995# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
996unpack_pdv() { 1019unpack_pdv() {
997 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
998 local sizeoff_t="$2" 1021 local sizeoff_t=$2
999 1022
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1000 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1001 1025
1002 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1003 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1004 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1005 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1006 1030
1007 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1071# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1072# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1073# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1074# the proper offset from the script itself. 1098# the proper offset from the script itself.
1075unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1076 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1077 local skip="$2" 1102 local skip=$2
1078 local exe="$3" 1103 local exe=$3
1079 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1080 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1081 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1082 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1083 then
1084 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1085 local skip=0 1111 local skip=0
1086 exe=tail 1112 exe=tail
1087 case ${ver} in 1113 case ${ver} in
1088 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1089 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1101 ;; 1127 ;;
1102 2.1.3) 1128 2.1.3)
1103 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1104 let skip="skip + 1" 1130 let skip="skip + 1"
1105 ;; 1131 ;;
1106 2.1.4) 1132 2.1.4|2.1.5)
1107 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1108 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1109 exe="dd" 1135 exe="dd"
1110 ;; 1136 ;;
1111 *) 1137 *)
1156check_license() { 1182check_license() {
1157 local lic=$1 1183 local lic=$1
1158 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1159 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1160 else 1186 else
1161 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1162 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1163 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1164 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1165 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1166 lic="${src}" 1192 lic="${lic}"
1167 fi
1168 fi 1193 fi
1194 fi
1169 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1170 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1171 1197
1172 # here is where we check for the licenses the user already 1198 # here is where we check for the licenses the user already
1173 # accepted ... if we don't find a match, we make the user accept 1199 # accepted ... if we don't find a match, we make the user accept
1174 local shopts=$- 1200 local shopts=$-
1230 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1231 # the # of files they gave us 1257 # the # of files they gave us
1232 local cdcnt=0 1258 local cdcnt=0
1233 local f= 1259 local f=
1234 for f in "$@" ; do 1260 for f in "$@" ; do
1235 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1236 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1237 done 1263 done
1238 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1239 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1240 1266
1241 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1242 # if they did, let's just believe them that it's correct 1268 # if they did, let's just believe them that it's correct
1243 if [[ ! -z ${CD_ROOT} ]] ; then
1244 export CDROM_ROOT=${CD_ROOT}
1245 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1246 return
1247 fi
1248 # do the same for CD_ROOT_X
1249 if [[ ! -z ${CD_ROOT_1} ]] ; then 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1250 local var= 1270 local var=
1251 cdcnt=0 1271 cdcnt=0
1252 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1253 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1254 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1255 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1256 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1257 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1258 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1259 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1260 fi 1281 fi
1261 export CDROM_ROOTS_${cdcnt}="${!var}"
1262 done 1282 done
1263 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1264 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1265 return 1291 return
1266 fi 1292 fi
1267 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1268 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1269 einfon "This ebuild will need the " 1297 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1270 if [[ -z ${CDROM_NAME} ]] ; then
1271 echo "cdrom for ${PN}."
1272 else
1273 echo "${CDROM_NAME}."
1274 fi
1275 echo 1298 echo
1276 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1279 einfo "directory containing the files." 1302 einfo "directory containing the files."
1283 echo 1306 echo
1284 else 1307 else
1285 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1286 cdcnt=0 1309 cdcnt=0
1287 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1288 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1289 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1290 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1291 done 1314 done
1292 echo 1315 echo
1293 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1294 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1295 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1296 einfon "" 1319 einfon ""
1297 cdcnt=0 1320 cdcnt=0
1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1299 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1300 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1301 done 1324 done
1302 echo 1325 echo
1303 einfo "Or, if you have all the files in the same place, or" 1326 einfo "Or, if you have all the files in the same place, or"
1304 einfo "you only have one cdrom, you can export CD_ROOT" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1307 echo 1330 echo
1308 einfo "For example:" 1331 einfo "For example:"
1309 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1310 echo 1333 echo
1311 fi 1334 fi
1335
1336 export CDROM_SET=""
1312 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1313 cdrom_load_next_cd 1338 cdrom_load_next_cd
1314} 1339}
1315 1340
1316# this is only used when you need access to more than one cd. 1341# this is only used when you need access to more than one cd.
1317# when you have finished using the first cd, just call this function. 1342# when you have finished using the first cd, just call this function.
1318# when it returns, CDROM_ROOT will be pointing to the second cd. 1343# when it returns, CDROM_ROOT will be pointing to the second cd.
1319# remember, you can only go forward in the cd chain, you can't go back. 1344# remember, you can only go forward in the cd chain, you can't go back.
1320cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1321 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1322 local var= 1346 local var
1323 1347 ((++CDROM_CURRENT_CD))
1324 if [[ ! -z ${CD_ROOT} ]] ; then
1325 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1326 return
1327 fi
1328 1348
1329 unset CDROM_ROOT 1349 unset CDROM_ROOT
1330 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1331 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1332 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1333 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1334 else 1355 else
1335 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1336 fi 1357 fi
1337 1358
1338 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1343# all it does is try to locate a give file on a cd ... if the cd isn't 1364# all it does is try to locate a give file on a cd ... if the cd isn't
1344# found, then a message asking for the user to insert the cdrom will be 1365# found, then a message asking for the user to insert the cdrom will be
1345# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1346# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1347# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1348cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1349 while [[ -z ${CDROM_ROOT} ]] ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1350 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1351 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1352 local mline=""
1353 local showedmsg=0
1354 1383
1355 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1356 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1357 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1358 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1359 done 1395 done
1360 1396
1361 if [[ -z ${CDROM_ROOT} ]] ; then
1362 echo 1397 echo
1363 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1365 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1366 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1367 else
1368 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1369 fi
1370 else 1402 else
1371 if [[ -z ${CDROM_NAME_1} ]] ; then
1372 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1373 else
1374 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1375 einfo "Please insert+mount the ${!var} cdrom now !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1376 fi
1377 fi 1404 fi
1378 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1379 fi 1412 fi
1413 showedmsg=1
1414 fi
1380 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1381 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1382 read 1417 echo
1383 fi 1418 einfo "If you are having trouble with the detection"
1419 einfo "of your CD, it is possible that you do not have"
1420 einfo "Joliet support enabled in your kernel. Please"
1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1422 read || die "something is screwed with your system"
1384 done 1423 done
1385} 1424}
1386 1425
1387# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1388# a package can support 1427# a package can support
1509 LIB=$1 1548 LIB=$1
1510 1549
1511 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1512 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1513 1552
1514 einfo "An old version of an installed library was detected on your system." 1553 ewarn "An old version of an installed library was detected on your system."
1515 einfo "In order to avoid breaking packages that link against is, this older version" 1554 ewarn "In order to avoid breaking packages that link against it, this older version"
1516 einfo "is not being removed. In order to make full use of this newer version," 1555 ewarn "is not being removed. In order to make full use of this newer version,"
1517 einfo "you will need to execute the following command:" 1556 ewarn "you will need to execute the following command:"
1518 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1519 einfo 1558 ewarn
1520 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1521 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1522 fi 1561 fi
1523} 1562}
1524 1563
1525# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1526# certain USE flags 1565# certain USE flags
1536 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1537 1576
1538 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1539 shift 1578 shift
1540 1579
1541 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1542 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1543 1585
1544 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1545 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1546 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1547 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1599# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1600# $5 == path for wrapper 1642# $5 == path for wrapper
1601make_wrapper() { 1643make_wrapper() {
1602 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1603 local tmpwrapper=$(emktemp) 1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1604 cat << EOF > "${tmpwrapper}" 1648 cat << EOF > "${tmpwrapper}"
1605#!/bin/sh 1649#!/bin/sh
1606cd "${chdir}" 1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1607export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1656 fi
1657fi
1608exec ${bin} "\$@" 1658exec ${bin} "\$@"
1609EOF 1659EOF
1610 chmod go+rx "${tmpwrapper}" 1660 chmod go+rx "${tmpwrapper}"
1611 if [ -n "${5}" ] 1661 if [[ -n ${path} ]] ; then
1612 then
1613 exeinto ${5} 1662 exeinto "${path}"
1614 newexe "${tmpwrapper}" "${wrapper}" 1663 newexe "${tmpwrapper}" "${wrapper}"
1615 else 1664 else
1616 newbin "${tmpwrapper}" "${wrapper}" 1665 newbin "${tmpwrapper}" "${wrapper}"
1617 fi 1666 fi
1618} 1667}

Legend:
Removed from v.1.178  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20