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

Diff of /eclass/eutils.eclass

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

Revision 1.73 Revision 1.87
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Technologies, Inc.
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.73 2003/12/01 20:13:00 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.87 2004/04/01 20:50:43 iggy 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.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15newdepend "!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# This function generate linker scripts in /usr/lib for dynamic 19# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 20# libs in /lib. This is to fix linking problems when you have
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 423 else
424 jobs=2 424 jobs=2
425 fi 425 fi
426 426
427 elif [ "${ARCH}" = "ppc" ] 427 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 428 then
429 # ppc has "processor", but only when compiled with SMP 429 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 431 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 433 else
434 jobs=2 434 jobs=2
435 fi 435 fi
436 elif [ "${ARCH}" = "s390" ]
437 then
438 # s390 has "# processors : "
439 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 440 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 441 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 442 die "Unknown ARCH -- ${ARCH}!"
439 fi 443 fi
440 444
456 fi 460 fi
457 fi 461 fi
458} 462}
459 463
460# Cheap replacement for when debianutils (and thus mktemp) 464# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 465# does not exist on the users system
462# vapier@gentoo.org 466# vapier@gentoo.org
463# 467#
464# Takes just 1 parameter (the directory to create tmpfile in) 468# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 469mymktemp() {
466 local topdir="$1" 470 local topdir="$1"
496 then 500 then
497 eerror "No username specified !" 501 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 502 die "Cannot call enewuser without a username"
499 fi 503 fi
500 504
501 # setup a file for testing usernames/groups
502 local tmpfile="`mymktemp ${T}`"
503 chown ${euser} ${tmpfile} >& /dev/null
504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
505
506 # see if user already exists 505 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 506 if [ "${euser}" == "`getent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 507 then
509 return 0 508 return 0
510 fi 509 fi
511 einfo "Adding user '${euser}' to your system ..." 510 einfo "Adding user '${euser}' to your system ..."
512 511
517 local euid="$1"; shift 516 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 517 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 518 then
520 if [ "${euid}" -gt 0 ] 519 if [ "${euid}" -gt 0 ]
521 then 520 then
522 opts="${opts} -u ${euid}" 521 if [ ! -z "`getent passwd ${euid}`" ]
522 then
523 euid="next"
524 fi
523 else 525 else
524 eerror "Userid given but is not greater than 0 !" 526 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 527 die "${euid} is not a valid UID"
526 fi 528 fi
527 else 529 else
528 euid="next available" 530 euid="next"
529 fi 531 fi
532 if [ "${euid}" == "next" ]
533 then
534 for euid in `seq 101 999` ; do
535 [ -z "`getent passwd ${euid}`" ] && break
536 done
537 fi
538 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 539 einfo " - Userid: ${euid}"
531 540
532 # handle shell 541 # handle shell
533 local eshell="$1"; shift 542 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 543 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
555 564
556 # handle groups 565 # handle groups
557 local egroups="$1"; shift 566 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 567 if [ ! -z "${egroups}" ]
559 then 568 then
560 local realgroup=
561 local oldifs="${IFS}" 569 local oldifs="${IFS}"
562 export IFS="," 570 export IFS=","
563 for g in ${egroups} 571 for g in ${egroups}
564 do 572 do
565 chgrp ${g} ${tmpfile} >& /dev/null 573 if [ -z "`getent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 574 then
569 eerror "You must add ${g} to the system first" 575 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 576 die "${g} is not a valid GID"
571 fi 577 fi
572 done 578 done
573 export IFS="${oldifs}" 579 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 580 opts="${opts} -g ${egroups}"
618 then 624 then
619 eerror "No group specified !" 625 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 626 die "Cannot call enewgroup without a group"
621 fi 627 fi
622 628
623 # setup a file for testing groupname
624 local tmpfile="`mymktemp ${T}`"
625 chgrp ${egroup} ${tmpfile} >& /dev/null
626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
627
628 # see if group already exists 629 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 630 if [ "${egroup}" == "`getent group \"${egroup}\" | cut -d: -f1`" ]
630 then 631 then
631 return 0 632 return 0
632 fi 633 fi
633 einfo "Adding group '${egroup}' to your system ..." 634 einfo "Adding group '${egroup}' to your system ..."
634 635
639 local egid="$1"; shift 640 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 641 if [ ! -z "${egid}" ]
641 then 642 then
642 if [ "${egid}" -gt 0 ] 643 if [ "${egid}" -gt 0 ]
643 then 644 then
645 if [ -z "`getent group ${egid}`" ]
646 then
644 opts="${opts} -g ${egid}" 647 opts="${opts} -g ${egid}"
648 else
649 egid="next available; requested gid taken"
650 fi
645 else 651 else
646 eerror "Groupid given but is not greater than 0 !" 652 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 653 die "${egid} is not a valid GID"
648 fi 654 fi
649 else 655 else
696 702
697 local exec="${1}" 703 local exec="${1}"
698 local name="${2:-${PN}}" 704 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 705 local icon="${3:-${PN}.png}"
700 local type="${4}" 706 local type="${4}"
707 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 708 local path="${5:-${GAMES_PREFIX}}"
702 if [ -z "${type}" ] 709 if [ -z "${type}" ]
703 then 710 then
704 case ${CATEGORY} in 711 case ${CATEGORY} in
705 "app-emulation") 712 "app-emulation")
706 type=Emulator 713 type=Emulator
714 subdir="Emulation"
707 ;; 715 ;;
708 "games-"*) 716 "games-"*)
709 type=Game 717 type=Game
718 subdir="Games"
710 ;; 719 ;;
711 "net-"*) 720 "net-"*)
712 type=Network; 721 type=Network
722 subdir="${type}"
713 ;; 723 ;;
714 *) 724 *)
715 type= 725 type=
726 subdir=
716 ;; 727 ;;
717 esac 728 esac
718 fi 729 fi
719 local desktop="${T}/${exec}.desktop" 730 local desktop="${T}/${exec}.desktop"
720 731
750 # done 761 # done
751 #fi 762 #fi
752 763
753 if [ -d "/usr/share/applnk" ] 764 if [ -d "/usr/share/applnk" ]
754 then 765 then
755 insinto /usr/share/applnk/${type} 766 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 767 doins ${desktop}
757 fi 768 fi
758 769
759 return 0 770 return 0
760}
761
762# new convenience patch wrapper function to eventually replace epatch(),
763# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and
764# /usr/bin/patch
765# Features:
766# - bulk patch handling similar to epatch()'s
767# - automatic patch level detection like epatch()'s
768# - automatic patch uncompression like epatch()'s
769# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
770# manually instead
771# - once I decide it's production-ready, it'll be called from base_src_unpack
772# to handle $PATCHES to avoid defining src_unpack just to use xpatch
773
774# accepts zero or more parameters specifying patchfiles and/or patchdirs
775
776# known issues:
777# - only supports unified style patches (does anyone _really_ use anything
778# else?)
779# - because it doesn't use --dry-run there is a risk of it failing
780# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
781# any of the backup heuristics that patch employs to discover a filename.
782# however, this isn't dangerous because if it works for the developer who's
783# writing the ebuild, it'll always work for the users, and if it doesn't,
784# then we'll fix it :-)
785# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
786xpatch() {
787
788 debug-print-function ${FUNCNAME} $*
789
790 local list=
791 local list2=
792 declare -i plevel
793
794 # parse patch sources
795 for x in $*
796 do
797 debug-print "${FUNCNAME}: parsing parameter ${x}"
798 if [ -f "${x}" ]
799 then
800 list="${list} ${x}"
801 elif [ -d "${x}" ]
802 then
803 # handles patchdirs like epatch() for now: no recursion.
804 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
805 # only patches with _$ARCH_ or _all_ in their filenames are applied.
806 for file in `ls -A ${x}`
807 do
808 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
809 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
810 "${file}" != "${file/_$ARCH_}" ]
811 then
812 list2="${list2} ${x}/${file}"
813 fi
814 done
815 list="`echo ${list2} | sort` ${list}"
816 else
817 die "Couldn't find ${x}"
818 fi
819 done
820
821 debug-print "${FUNCNAME}: final list of patches: ${list}"
822
823 for x in ${list};
824 do
825 debug-print "${FUNCNAME}: processing ${x}"
826 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
827 case "`/usr/bin/file -b ${x}`" in
828 *gzip*)
829 patchfile="${T}/current.patch"
830 ungzip -c "${x}" > "${patchfile}"
831 ;;
832 *bzip2*)
833 patchfile="${T}/current.patch"
834 bunzip2 -c "${x}" > "${patchfile}"
835 ;;
836 *text*)
837 patchfile="${x}"
838 ;;
839 *)
840 die "Could not determine filetype of patch ${x}"
841 ;;
842 esac
843 debug-print "${FUNCNAME}: patchfile=${patchfile}"
844
845 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
846 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
847 debug-print "${FUNCNAME}: raw target=${target}"
848 # strip target down to the path/filename, remove leading +++
849 target="${target/+++ }"; target="${target%% *}"
850 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
851 # to discard them as well to calculate the correct patchlevel.
852 target="${target//\/\//\/}"
853 debug-print "${FUNCNAME}: stripped target=${target}"
854
855 # look for target
856 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
857 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
858 cd "${basedir}"
859
860 # try stripping leading directories
861 target2="${target}"
862 plevel=0
863 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
864 while [ ! -f "${target2}" ]
865 do
866 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
867 plevel=$((plevel+1))
868 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
869 [ "${target2}" == "${target2/\/}" ] && break
870 done
871 test -f "${target2}" && break
872
873 # try stripping filename - needed to support patches creating new files
874 target2="${target%/*}"
875 plevel=0
876 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
877 while [ ! -d "${target2}" ]
878 do
879 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
880 plevel=$((plevel+1))
881 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
882 [ "${target2}" == "${target2/\/}" ] && break
883 done
884 test -d "${target2}" && break
885
886 done
887
888 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
889 || die "Could not determine patchlevel for ${x}"
890 debug-print "${FUNCNAME}: determined plevel=${plevel}"
891 # do the patching
892 ebegin "Applying patch ${x##*/}..."
893 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
894 || die "Failed to apply patch ${x}"
895 eend $?
896
897 done
898
899} 771}
900 772
901# for internal use only (unpack_pdv and unpack_makeself) 773# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 774find_unpackable_file() {
903 local src="$1" 775 local src="$1"
1101 local l="`basename ${lic}`" 973 local l="`basename ${lic}`"
1102 974
1103 # here is where we check for the licenses the user already 975 # here is where we check for the licenses the user already
1104 # accepted ... if we don't find a match, we make the user accept 976 # accepted ... if we don't find a match, we make the user accept
1105 local alic 977 local alic
1106 for alic in ${ACCEPT_LICENSE} ; do 978 for alic in "${ACCEPT_LICENSE}" ; do
1107 [ "${alic}" == "*" ] && return 0 979 [ "${alic}" == "*" ] && return 0
1108 [ "${alic}" == "${l}" ] && return 0 980 [ "${alic}" == "${l}" ] && return 0
1109 done 981 done
1110 982
1111 local licmsg="`mymktemp ${T}`" 983 local licmsg="`mymktemp ${T}`"
1131 eerror "You MUST accept the license to continue! Exiting!" 1003 eerror "You MUST accept the license to continue! Exiting!"
1132 die "Failed to accept license" 1004 die "Failed to accept license"
1133 ;; 1005 ;;
1134 esac 1006 esac
1135} 1007}
1008
1009# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1010# the whole 'non-interactive' policy, but damnit I want CD support !
1011#
1012# with these cdrom functions we handle all the user interaction and
1013# standardize everything. all you have to do is call cdrom_get_cds()
1014# and when the function returns, you can assume that the cd has been
1015# found at CDROM_ROOT.
1016#
1017# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1018# etc... if you want to give the cds better names, then just export
1019# the CDROM_NAME_X variables before calling cdrom_get_cds().
1020#
1021# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1022#
1023# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1024# - this will attempt to locate a cd based upon a file that is on
1025# the cd ... the more files you give this function, the more cds
1026# the cdrom functions will handle
1027cdrom_get_cds() {
1028 # first we figure out how many cds we're dealing with by
1029 # the # of files they gave us
1030 local cdcnt=0
1031 local f=
1032 for f in "$@" ; do
1033 cdcnt=$((cdcnt + 1))
1034 export CDROM_CHECK_${cdcnt}="$f"
1035 done
1036 export CDROM_TOTAL_CDS=${cdcnt}
1037 export CDROM_CURRENT_CD=1
1038
1039 # now we see if the user gave use CD_ROOT ...
1040 # if they did, let's just believe them that it's correct
1041 if [ ! -z "${CD_ROOT}" ] ; then
1042 export CDROM_ROOT="${CD_ROOT}"
1043 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1044 return
1045 fi
1046 # do the same for CD_ROOT_X
1047 if [ ! -z "${CD_ROOT_1}" ] ; then
1048 local var=
1049 cdcnt=0
1050 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1051 cdcnt=$((cdcnt + 1))
1052 var="CD_ROOT_${cdcnt}"
1053 if [ -z "${!var}" ] ; then
1054 eerror "You must either use just the CD_ROOT"
1055 eerror "or specify ALL the CD_ROOT_X variables."
1056 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1057 die "could not locate CD_ROOT_${cdcnt}"
1058 fi
1059 export CDROM_ROOTS_${cdcnt}="${!var}"
1060 done
1061 export CDROM_ROOT=${CDROM_ROOTS_1}
1062 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1063 return
1064 fi
1065
1066 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1067 einfon "This ebuild will need the "
1068 if [ -z "${CDROM_NAME}" ] ; then
1069 echo "cdrom for ${PN}."
1070 else
1071 echo "${CDROM_NAME}."
1072 fi
1073 echo
1074 einfo "If you do not have the CD, but have the data files"
1075 einfo "mounted somewhere on your filesystem, just export"
1076 einfo "the variable CD_ROOT so that it points to the"
1077 einfo "directory containing the files."
1078 echo
1079 else
1080 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1081 cdcnt=0
1082 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1083 cdcnt=$((cdcnt + 1))
1084 var="CDROM_NAME_${cdcnt}"
1085 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1086 done
1087 echo
1088 einfo "If you do not have the CDs, but have the data files"
1089 einfo "mounted somewhere on your filesystem, just export"
1090 einfo "the following variables so they point to the right place:"
1091 einfon ""
1092 cdcnt=0
1093 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1094 cdcnt=$((cdcnt + 1))
1095 echo -n " CD_ROOT_${cdcnt}"
1096 done
1097 echo
1098 einfo "Or, if you have all the files in the same place, or"
1099 einfo "you only have one cdrom, you can export CD_ROOT"
1100 einfo "and that place will be used as the same data source"
1101 einfo "for all the CDs."
1102 echo
1103 fi
1104 export CDROM_CURRENT_CD=0
1105 cdrom_load_next_cd
1106}
1107
1108# this is only used when you need access to more than one cd.
1109# when you have finished using the first cd, just call this function.
1110# when it returns, CDROM_ROOT will be pointing to the second cd.
1111# remember, you can only go forward in the cd chain, you can't go back.
1112cdrom_load_next_cd() {
1113 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1114 local var=
1115
1116 if [ ! -z "${CD_ROOT}" ] ; then
1117 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1118 return
1119 fi
1120
1121 unset CDROM_ROOT
1122 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1123 if [ -z "${!var}" ] ; then
1124 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1125 cdrom_locate_file_on_cd ${!var}
1126 else
1127 export CDROM_ROOT="${!var}"
1128 fi
1129
1130 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1131}
1132
1133# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1134# functions. this should *never* be called from an ebuild.
1135# all it does is try to locate a give file on a cd ... if the cd isn't
1136# found, then a message asking for the user to insert the cdrom will be
1137# displayed and we'll hang out here until:
1138# (1) the file is found on a mounted cdrom
1139# (2) the user hits CTRL+C
1140cdrom_locate_file_on_cd() {
1141 while [ -z "${CDROM_ROOT}" ] ; do
1142 local dir="$(dirname ${@})"
1143 local file="$(basename ${@})"
1144 local mline=""
1145 local showedmsg=0
1146
1147 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1148 [ -d "${mline}/${dir}" ] || continue
1149 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1150 && export CDROM_ROOT=${mline}
1151 done
1152
1153 if [ -z "${CDROM_ROOT}" ] ; then
1154 echo
1155 if [ ${showedmsg} -eq 0 ] ; then
1156 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1157 if [ -z "${CDROM_NAME}" ] ; then
1158 einfo "Please insert the cdrom for ${PN} now !"
1159 else
1160 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1161 fi
1162 else
1163 if [ -z "${CDROM_NAME_1}" ] ; then
1164 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1165 else
1166 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1167 einfo "Please insert+mount the ${!var} cdrom now !"
1168 fi
1169 fi
1170 showedmsg=1
1171 fi
1172 einfo "Press return to scan for the cd again"
1173 einfo "or hit CTRL+C to abort the emerge."
1174 read
1175 fi
1176 done
1177}

Legend:
Removed from v.1.73  
changed lines
  Added in v.1.87

  ViewVC Help
Powered by ViewVC 1.1.20