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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.179  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20