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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20