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

Diff of /eclass/eutils.eclass

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

Revision 1.180 Revision 1.200
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.180 2005/06/03 21:58:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 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}"
173 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
177 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 179
179 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
180 then 181 then
181 local m="" 182 local m=""
182 for m in "$@" ; do 183 for m in "$@" ; do
376# vapier@gentoo.org 377# vapier@gentoo.org
377# 378#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 380emktemp() {
380 local exe="touch" 381 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 383 local topdir=$1
383 384
384 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 387 && topdir="/tmp" \
388 || topdir="${T}" 388 || topdir=${T}
389 fi 389 fi
390 390
391 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 392 local tmp=/
394 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 395 done
397 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 397 echo "${tmp}"
399 else 398 else
400 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
401 && exe="-p" \ 400 && exe="-p" \
402 || exe="-d" 401 || exe="-d"
403 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
404 fi 403 fi
405} 404}
448# homedir: /dev/null 447# homedir: /dev/null
449# groups: none 448# groups: none
450# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
451enewuser() { 450enewuser() {
452 # get the username 451 # get the username
453 local euser="$1"; shift 452 local euser=$1; shift
454 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 460 return 0
464 fi 461 fi
465 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
466 463
467 # options to pass to useradd 464 # options to pass to useradd
468 local opts= 465 local opts=
469 466
470 # handle uid 467 # handle uid
471 local euid="$1"; shift 468 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 472 euid="next"
479 fi 473 fi
480 else 474 else
481 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
483 fi 477 fi
484 else 478 else
485 euid="next" 479 euid="next"
486 fi 480 fi
487 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
488 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 484 done
498 fi 485 fi
499 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
501 488
502 # handle shell 489 # handle shell
503 local eshell="$1"; shift 490 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then
506 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
507 then
508 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 494 die "${eshell} does not exist"
510 fi 495 fi
511 else 496 else
512 if [[ "${USERLAND}" == "Darwin" ]]; then 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
513 eshell="/usr/bin/false" 498 [[ -x ${ROOT}${shell} ]] && break;
514 elif [[ "${USERLAND}" == "BSD" ]]; then 499 done
515 eshell="/usr/sbin/nologin" 500
516 else 501 if [[ ${shell} == "/dev/null" ]]; then
517 eshell="/bin/false" 502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
518 fi 504 fi
505
506 eshell=${shell}
519 fi 507 fi
520 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
522 510
523 # handle homedir 511 # handle homedir
524 local ehome="$1"; shift 512 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 514 ehome="/dev/null"
528 fi 515 fi
529 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
531 518
532 # handle groups 519 # handle groups
533 local egroups="$1"; shift 520 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 522 local oldifs=${IFS}
537 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
538 524
539 export IFS="," 525 export IFS=","
540 for g in ${egroups} 526 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 527 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
547 fi 531 fi
548 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 533 defgroup=${g}
551 else 534 else
552 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
553 fi 536 fi
554 export IFS="," 537 export IFS=","
555 done 538 done
556 export IFS="${oldifs}" 539 export IFS=${oldifs}
557 540
558 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
562 fi 544 fi
563 else 545 else
564 egroups="(none)" 546 egroups="(none)"
565 fi 547 fi
566 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
567 549
568 # handle extra and add the user 550 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 553 case ${USERLAND} in
573 then 554 Darwin)
574 ### Make the user 555 ### Make the user
575 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 561 ### Add the user to the groups specified
582 local oldifs="${IFS}" 562 local oldifs=${IFS}
583 export IFS="," 563 export IFS=","
584 for g in ${egroups} 564 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
587 done 566 done
588 export IFS="${oldifs}" 567 export IFS=${oldifs}
589 else 568 else
590 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
593 die "Required function missing" 572 die "Required function missing"
594 fi 573 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 574 ;;
596 if [ -z "${eextra}" ] 575 BSD)
597 then 576 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
600 die "enewuser failed" 579 die "enewuser failed"
601 else 580 else
602 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
605 fi 584 fi
606 else 585 ;;
607 if [ -z "${eextra}" ] 586 *)
608 then 587 if [[ -z $@ ]] ; then
609 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 590 || die "enewuser failed"
612 else 591 else
613 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 594 || die "enewuser failed"
616 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
617 fi 604 fi
605
618 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
628 608
629# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 610# vapier@gentoo.org
631# 611#
696 fi 676 fi
697 677
698 # If we need the next available 678 # If we need the next available
699 case ${egid} in 679 case ${egid} in
700 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
703 done 683 done
704 esac 684 esac
705 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
708 case ${egid} in 688 case ${egid} in
709 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
712 done 692 done
713 esac 693 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 else 695 else
747# name: the name that will show up in the menu 727# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 730# a full path to an icon
751# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 734make_desktop_entry() {
755 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
756 736
757 local exec=${1} 737 local exec=${1}
783 dev) 763 dev)
784 type="Development" 764 type="Development"
785 ;; 765 ;;
786 766
787 games) 767 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 768 case ${catmin} in
791 action) type=ActionGame;; 769 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 771 board) type=BoardGame;;
794 kid) type=KidsGame;; 772 kid) type=KidsGame;;
919 doins "${i}" 897 doins "${i}"
920 elif [[ -d ${i} ]] ; then 898 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 899 for j in "${i}"/*.desktop ; do
922 doins "${j}" 900 doins "${j}"
923 done 901 done
924 fi 902 fi
925 done 903 done
926} 904}
927newmenu() { 905newmenu() {
928 insinto /usr/share/applications 906 insinto /usr/share/applications
929 newins "$1" "$2" 907 newins "$1" "$2"
937 doins "${i}" 915 doins "${i}"
938 elif [[ -d ${i} ]] ; then 916 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 917 for j in "${i}"/*.png ; do
940 doins "${j}" 918 doins "${j}"
941 done 919 done
942 fi 920 fi
943 done 921 done
944} 922}
945newicon() { 923newicon() {
946 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
947 newins "$1" "$2" 925 newins "$1" "$2"
952############################################################## 930##############################################################
953 931
954 932
955# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 934find_unpackable_file() {
957 local src="$1" 935 local src=$1
958 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
961 else 938 else
962 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 942 src=${PWD}/${src}
968 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 944 src=${src}
971 fi
972 fi 945 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 948 echo "${src}"
975} 949}
976 950
977# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
993# lseek 967# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
996# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
997unpack_pdv() { 971unpack_pdv() {
998 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 973 local sizeoff_t=$2
1000 974
975 [[ -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 :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 977
1003 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 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\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1074# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1075# the proper offset from the script itself. 1050# the proper offset from the script itself.
1076unpack_makeself() { 1051unpack_makeself() {
1077 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1078 local skip="$2" 1053 local skip=$2
1079 local exe="$3" 1054 local exe=$3
1080 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1081 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1084 then 1061 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1086 local skip=0 1063 local skip=0
1157check_license() { 1134check_license() {
1158 local lic=$1 1135 local lic=$1
1159 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1138 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1144 lic="${lic}"
1168 fi
1169 fi 1145 fi
1146 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1172 1149
1173 # here is where we check for the licenses the user already 1150 # 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 1151 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1152 local shopts=$-
1346# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1350 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1351 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1352 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1353 local mline="" 1330 local mline=""
1354 local showedmsg=0 1331 local showedmsg=0
1355 1332
1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1357 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1378 fi 1355 fi
1379 showedmsg=1 1356 showedmsg=1
1380 fi 1357 fi
1381 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1383 read 1365 read
1384 fi 1366 fi
1385 done 1367 done
1386} 1368}
1387 1369
1510 LIB=$1 1492 LIB=$1
1511 1493
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1514 1496
1515 einfo "An old version of an installed library was detected on your system." 1497 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" 1498 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," 1499 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:" 1500 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1520 einfo 1502 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1505 fi
1524} 1506}
1525 1507
1526# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1527# certain USE flags 1509# certain USE flags

Legend:
Removed from v.1.180  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20