/[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.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.178 2005/05/26 22:09:26 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 useq ppc-macos ; 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 useq x86-fbsd ; 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}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 then 508 [[ -x ${ROOT}${shell} ]] && break
514 eshell="/usr/bin/false" 509 done
515 else 510
516 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
517 fi 514 fi
515
516 eshell=${shell}
518 fi 517 fi
519 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
521 520
522 # handle homedir 521 # handle homedir
523 local ehome="$1"; shift 522 local ehome=$1; shift
524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 524 ehome="/dev/null"
527 fi 525 fi
528 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
530 528
531 # handle groups 529 # handle groups
532 local egroups="$1"; shift 530 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 532 local oldifs=${IFS}
536 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
537 534
538 export IFS="," 535 export IFS=","
539 for g in ${egroups} 536 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 537 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
546 fi 541 fi
547 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 543 defgroup=${g}
550 else 544 else
551 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
552 fi 546 fi
553 export IFS="," 547 export IFS=","
554 done 548 done
555 export IFS="${oldifs}" 549 export IFS=${oldifs}
556 550
557 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
561 fi 554 fi
562 else 555 else
563 egroups="(none)" 556 egroups="(none)"
564 fi 557 fi
565 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
566 559
567 # handle extra and add the user 560 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
571 if useq ppc-macos 563 case ${CHOST} in
572 then 564 *-darwin*)
573 ### Make the user 565 ### Make the user
574 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 571 ### Add the user to the groups specified
581 local oldifs="${IFS}" 572 local oldifs=${IFS}
582 export IFS="," 573 export IFS=","
583 for g in ${egroups} 574 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
586 done 576 done
587 export IFS="${oldifs}" 577 export IFS=${oldifs}
588 else 578 else
589 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
592 die "Required function missing" 582 die "Required function missing"
593 fi 583 fi
594 elif use x86-fbsd ; then 584 ;;
595 if [ -z "${eextra}" ] 585 *-freebsd*)
596 then 586 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
599 die "enewuser failed" 589 die "enewuser failed"
600 else 590 else
601 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
604 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
605 else 600 else
606 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
607 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
608 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 623 || die "enewuser failed"
611 else 624 else
612 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 627 || die "enewuser failed"
615 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}"
616 fi 637 fi
638
617 export SANDBOX_ON="${oldsandbox}" 639 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} 640}
627 641
628# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 643# vapier@gentoo.org
630# 644#
659 then 673 then
660 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
661 then 675 then
662 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
663 then 677 then
664 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
665 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
666 else 680 else
667 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
668 fi 682 fi
669 else 683 else
683 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
684 698
685 # add the group 699 # add the group
686 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
689 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
690 then 705 then
691 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
694 die "Required function missing" 709 die "Required function missing"
695 fi 710 fi
696 711
697 # If we need the next available 712 # If we need the next available
698 case ${egid} in 713 case ${egid} in
699 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
702 done 717 done
703 esac 718 esac
704 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
707 case ${egid} in 724 case ${egid} in
708 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
711 done 728 done
712 esac 729 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 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 *)
715 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
716 fi 745 ;;
746 esac
717 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
718} 748}
719 749
720# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
721# vapier@gentoo.org 751# vapier@gentoo.org
746# name: the name that will show up in the menu 776# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 779# a full path to an icon
750# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 783make_desktop_entry() {
754 [[ -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
755 785
756 local exec=${1} 786 local exec=${1}
782 dev) 812 dev)
783 type="Development" 813 type="Development"
784 ;; 814 ;;
785 815
786 games) 816 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 817 case ${catmin} in
790 action) type=ActionGame;; 818 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 820 board) type=BoardGame;;
793 kid) type=KidsGame;; 821 kid) type=KidsGame;;
834 type="Network;${type}" 862 type="Network;${type}"
835 ;; 863 ;;
836 864
837 sci) 865 sci)
838 case ${catmin} in 866 case ${catmin} in
839 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
840 bio*) type=Biology;; 868 bio*) type=Biology;;
841 calc*) type=Calculator;; 869 calc*) type=Calculator;;
842 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
843 geo*) type=Geology;; 871 geo*) type=Geology;;
844 math*) type=Math;; 872 math*) type=Math;;
876Exec=${exec} 904Exec=${exec}
877Path=${path} 905Path=${path}
878Icon=${icon} 906Icon=${icon}
879Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
880 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
881 insinto /usr/share/applications 912 insinto /usr/share/applications
882 doins "${desktop}" 913 doins "${desktop}"
883 914 )
884 return 0
885} 915}
886 916
887# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
888# 918#
889# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
918 doins "${i}" 948 doins "${i}"
919 elif [[ -d ${i} ]] ; then 949 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.desktop ; do 950 for j in "${i}"/*.desktop ; do
921 doins "${j}" 951 doins "${j}"
922 done 952 done
923 fi 953 fi
924 done 954 done
925} 955}
926newmenu() { 956newmenu() {
927 insinto /usr/share/applications 957 insinto /usr/share/applications
928 newins "$1" "$2" 958 newins "$1" "$2"
936 doins "${i}" 966 doins "${i}"
937 elif [[ -d ${i} ]] ; then 967 elif [[ -d ${i} ]] ; then
938 for j in "${i}"/*.png ; do 968 for j in "${i}"/*.png ; do
939 doins "${j}" 969 doins "${j}"
940 done 970 done
941 fi 971 fi
942 done 972 done
943} 973}
944newicon() { 974newicon() {
945 insinto /usr/share/pixmaps 975 insinto /usr/share/pixmaps
946 newins "$1" "$2" 976 newins "$1" "$2"
951############################################################## 981##############################################################
952 982
953 983
954# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
955find_unpackable_file() { 985find_unpackable_file() {
956 local src="$1" 986 local src=$1
957 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
958 then
959 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
960 else 989 else
961 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
962 then
963 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
964 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
965 then
966 src="${PWD}/${src}" 993 src=${PWD}/${src}
967 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
968 then
969 src="${src}" 995 src=${src}
970 fi
971 fi 996 fi
972 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
973 echo "${src}" 999 echo "${src}"
974} 1000}
975 1001
976# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
977# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
992# lseek 1018# lseek
993# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
994# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
995# 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.
996unpack_pdv() { 1022unpack_pdv() {
997 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
998 local sizeoff_t="$2" 1024 local sizeoff_t=$2
999 1025
1026 [[ -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 :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1001 1028
1002 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1003 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1004 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 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\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1006 1033
1007 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1071# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1072# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1073# - 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
1074# the proper offset from the script itself. 1101# the proper offset from the script itself.
1075unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1076 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1077 local skip="$2" 1105 local skip=$2
1078 local exe="$3" 1106 local exe=$3
1079 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1080 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1081 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1082 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1083 then
1084 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1085 local skip=0 1114 local skip=0
1086 exe=tail 1115 exe=tail
1087 case ${ver} in 1116 case ${ver} in
1088 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
1089 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1101 ;; 1130 ;;
1102 2.1.3) 1131 2.1.3)
1103 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1104 let skip="skip + 1" 1133 let skip="skip + 1"
1105 ;; 1134 ;;
1106 2.1.4) 1135 2.1.4|2.1.5)
1107 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)
1108 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1109 exe="dd" 1138 exe="dd"
1110 ;; 1139 ;;
1111 *) 1140 *)
1156check_license() { 1185check_license() {
1157 local lic=$1 1186 local lic=$1
1158 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1159 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1160 else 1189 else
1161 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1162 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1163 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1164 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1165 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1166 lic="${src}" 1195 lic="${lic}"
1167 fi
1168 fi 1196 fi
1197 fi
1169 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1170 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1171 1200
1172 # here is where we check for the licenses the user already 1201 # 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 1202 # accepted ... if we don't find a match, we make the user accept
1174 local shopts=$- 1203 local shopts=$-
1230 # 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
1231 # the # of files they gave us 1260 # the # of files they gave us
1232 local cdcnt=0 1261 local cdcnt=0
1233 local f= 1262 local f=
1234 for f in "$@" ; do 1263 for f in "$@" ; do
1235 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1236 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1237 done 1266 done
1238 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1239 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1240 1269
1241 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1242 # 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
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 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1250 local var= 1273 local var=
1251 cdcnt=0 1274 cdcnt=0
1252 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1253 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1254 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1255 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1256 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1257 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1258 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."
1259 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1260 fi 1284 fi
1261 export CDROM_ROOTS_${cdcnt}="${!var}"
1262 done 1285 done
1263 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1264 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}
1265 return 1294 return
1266 fi 1295 fi
1267 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1268 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1269 einfon "This ebuild will need the " 1300 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 1301 echo
1276 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"
1277 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1279 einfo "directory containing the files." 1305 einfo "directory containing the files."
1283 echo 1309 echo
1284 else 1310 else
1285 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1286 cdcnt=0 1312 cdcnt=0
1287 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1288 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1289 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1290 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1291 done 1317 done
1292 echo 1318 echo
1293 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"
1294 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1295 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1296 einfon "" 1322 einfon ""
1297 cdcnt=0 1323 cdcnt=0
1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1299 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1300 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1301 done 1327 done
1302 echo 1328 echo
1303 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"
1304 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1307 echo 1333 echo
1308 einfo "For example:" 1334 einfo "For example:"
1309 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1310 echo 1336 echo
1311 fi 1337 fi
1338
1339 export CDROM_SET=""
1312 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1313 cdrom_load_next_cd 1341 cdrom_load_next_cd
1314} 1342}
1315 1343
1316# 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.
1317# 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.
1318# 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.
1319# 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.
1320cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1321 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1322 local var= 1349 local var
1323 1350 ((++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 1351
1329 unset CDROM_ROOT 1352 unset CDROM_ROOT
1330 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1331 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1332 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1333 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1334 else 1358 else
1335 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1336 fi 1360 fi
1337 1361
1338 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 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 1367# 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 1368# found, then a message asking for the user to insert the cdrom will be
1345# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1346# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1347# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1348cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1349 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
1350 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1351 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1352 local mline=""
1353 local showedmsg=0
1354 1386
1355 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
1356 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1357 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1358 && 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))
1359 done 1398 done
1360 1399
1361 if [[ -z ${CDROM_ROOT} ]] ; then
1362 echo 1400 echo
1363 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1365 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1366 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1367 else
1368 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1369 fi
1370 else 1405 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 !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1376 fi
1377 fi 1407 fi
1378 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
1379 fi 1415 fi
1416 showedmsg=1
1417 fi
1380 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1381 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."
1382 read 1425 read
1383 fi
1384 done 1426 done
1385} 1427}
1386 1428
1387# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1388# a package can support 1430# a package can support
1509 LIB=$1 1551 LIB=$1
1510 1552
1511 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1512 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1513 1555
1514 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."
1515 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"
1516 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,"
1517 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1518 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1519 einfo 1561 ewarn
1520 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1521 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1522 fi 1564 fi
1523} 1565}
1524 1566
1525# 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
1526# certain USE flags 1568# certain USE flags
1536 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1537 1579
1538 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1539 shift 1581 shift
1540 1582
1541 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
1542 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1543 1588
1544 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1545 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1546 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1547 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1599# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1600# $5 == path for wrapper 1645# $5 == path for wrapper
1601make_wrapper() { 1646make_wrapper() {
1602 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1603 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"
1604 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1605#!/bin/sh 1652#!/bin/sh
1606cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1607export 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
1608exec ${bin} "\$@" 1661exec ${bin} "\$@"
1609EOF 1662EOF
1610 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1611 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1612 then
1613 exeinto ${5} 1665 exeinto "${path}"
1614 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1615 else 1667 else
1616 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1617 fi 1669 fi
1618} 1670}

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

  ViewVC Help
Powered by ViewVC 1.1.20