Bump to post-3.6 nightly snapshot with Xen fixes

(Portage version: 2.1_pre5-r4)

6 files changed, 166 insertions, 11 deletions

diff --git a/sys-boot/elilo/ChangeLog b/sys-boot/elilo/ChangeLog
index f0da58a5523a..75b2ad37d89a 100644
--- a/sys-boot/elilo/ChangeLog
+++ b/sys-boot/elilo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/elilo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.16 2006/03/10 18:49:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.17 2006/03/16 13:07:11 agriffis Exp $
+
+*elilo-3.6_p20060314 (16 Mar 2006)
+
+  16 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/elilo.sh-chkspace.patch, +files/elilo.sh-vmm.patch,
+  +elilo-3.6_p20060314.ebuild:
+  Bump to post-3.6 nightly snapshot with Xen fixes
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> elilo-3.4-r3.ebuild,
   elilo-3.6.ebuild:
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 151f4ce4d956..adc8bf400432 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 28d143762e6196236321944997e0c8e0 ChangeLog 2520
 RMD160 f112b4cfb298c22de3ee0f39b3bb86a622e16cc0 ChangeLog 2520
 SHA256 b523b4be22fb38ba38826e5e0a42cac0fb24455748161878d32d9aafbadb02fd ChangeLog 2520
@@ -10,12 +7,18 @@ SHA256 0d2a3d22067e5eda6a3c5fb35f6176b5d013924502ab7759397a7140c93d3aa9 elilo-3.
 MD5 3c6c6811fcd8ce2413dfc92c525341eb elilo-3.6.ebuild 1657
 RMD160 d76feb03a0cd4bb26971f9a5a6fc41b205c4e76e elilo-3.6.ebuild 1657
 SHA256 61ca372c0015235a5324be998e26faa78a4545e64b2f2237ef8b9a457654027a elilo-3.6.ebuild 1657
+MD5 802351403a1cbc6f5509744a934ef792 elilo-3.6_p20060314.ebuild 2000
+RMD160 b8eeb4f3ae87865448969c9ca5581c2d9ed9a276 elilo-3.6_p20060314.ebuild 2000
+SHA256 48357fc9f636725e1204d28a576646be829bd9f2f80c9afac8f7f071c2449a5c elilo-3.6_p20060314.ebuild 2000
 MD5 f0780671bcf192ebb0f1d7ee557f1286 files/digest-elilo-3.4-r3 440
 RMD160 caaa7f3ae538215d21bf39adea015337f7a0f73c files/digest-elilo-3.4-r3 440
 SHA256 5c8f0a906d06ee6ddf5508d1660f29827a89f48806fbfadac1b2a9af1618c0f3 files/digest-elilo-3.4-r3 440
 MD5 8f06a45c25f09850bdccdef1717c9073 files/digest-elilo-3.6 443
 RMD160 09228a66e9af58c3d91677face2c0bd3eff5d8eb files/digest-elilo-3.6 443
 SHA256 a25b11588df44ddc979dfdfc5f261ad426e319b1527015ca46a53b7aa8f67115 files/digest-elilo-3.6 443
+MD5 ff24d6059d629a2cdb715001bc0422c3 files/digest-elilo-3.6_p20060314 500
+RMD160 27848399bb1b55608187a805b89565255d854d6c files/digest-elilo-3.6_p20060314 500
+SHA256 3d6dc825c042cf5161e00e2be86669d006891f761dcdb0ec012df20a24c4bb9c files/digest-elilo-3.6_p20060314 500
 MD5 2640f713f5f00cf0a17e31d220c8242c files/elilo-3.3a-devscheme.patch 3571
 RMD160 5d9adf423262c563f8124d67dedd14da6bf6f8d5 files/elilo-3.3a-devscheme.patch 3571
 SHA256 9d21c53d4d9e0e17bd26d803403eee1c33fd0144d472d937d1fd2e5d79532a03 files/elilo-3.3a-devscheme.patch 3571
@@ -37,10 +40,3 @@ SHA256 9b49f022c95f11de63ff27fb9cba2c58a4966fe8750192a1e8c192d5e1d5b77f files/el
 MD5 78fc29bf052a5244c63204ddcdd7a1ac metadata.xml 157
 RMD160 d78bc90d4c0fdb88250c9822e913c6f0159b2e8b metadata.xml 157
 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEcorJrHF4yAQTrARAsP8AKDGEXzWyDwYuPmhlIt3tEVyGUOjLQCfUR/c
-lwzq/P6keIZ2B68m1piOGTw=
-=d82a
------END PGP SIGNATURE-----
diff --git a/sys-boot/elilo/elilo-3.6_p20060314.ebuild b/sys-boot/elilo/elilo-3.6_p20060314.ebuild
new file mode 100644
index 000000000000..0cc3cb1db20d
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.6_p20060314.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.6_p20060314.ebuild,v 1.1 2006/03/16 13:07:11 agriffis Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="http://elilo.sourceforge.net/"
+if [[ $PV == *_p* ]]; then
+	MY_P=${PV#*_p}
+	MY_P=${PN}-nightly_${MY_P:0:4}-${MY_P:4:2}-${MY_P:6:2}
+	SRC_URI="http://elilo.sourceforge.net/nightlies/${MY_P}.tgz"
+	S="${WORKDIR}/elilo"
+else
+	MY_P=${P}
+	SRC_URI="mirror://sourceforge/elilo/${P}.src.tgz"
+fi
+SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.6-1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ia64"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0
+	sys-devel/patch
+	dev-util/patchutils"
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools"
+PROVIDE="virtual/bootloader"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	ebegin Applying ../*.diff
+	# Using epatch on this is annoying because it wants to create the elilo-3.6/
+	# directory.  Since all the files are new, it doesn't know better.
+	filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
+	eend $? || return
+
+	# Add patch for vmm support, from
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185
+	epatch ${FILESDIR}/elilo.sh-vmm.patch
+
+	# Don't count files twice when summing bytesneeded
+	epatch ${FILESDIR}/elilo.sh-chkspace.patch
+
+	# Now Gentooize it
+	sed -i "
+		1s/sh/bash/;
+		s/##VERSION##/$PV/;
+		s/Debian GNU\//Gentoo /g;
+		s/Debian/Gentoo/g;
+		s/debian/gentoo/g;
+		s/dpkg --print-installation-architecture/uname -m/" debian/elilo.sh
+}
+
+src_compile() {
+	local iarch
+	case $(tc-arch) in
+		ia64) iarch=ia64 ;;
+		x86)  iarch=ia32 ;;
+		*)    die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi || die "elilo.efi failed"
+
+	newsbin debian/elilo.sh elilo || die "elilo failed"
+	dosbin tools/eliloalt || die "eliloalt failed"
+
+	insinto /etc
+	newins ${FILESDIR}/elilo.conf.sample elilo.conf
+
+	dodoc docs/* ${FILESDIR}/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/digest-elilo-3.6_p20060314 b/sys-boot/elilo/files/digest-elilo-3.6_p20060314
new file mode 100644
index 000000000000..f1c3778df47f
--- /dev/null
+++ b/sys-boot/elilo/files/digest-elilo-3.6_p20060314
@@ -0,0 +1,6 @@
+MD5 3b23007224435933d1ec8f075848f881 elilo-nightly_2006-03-14.tgz 168991
+RMD160 ea5952bff2563fa22b09135d68d2012fd2abfcae elilo-nightly_2006-03-14.tgz 168991
+SHA256 b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c elilo-nightly_2006-03-14.tgz 168991
+MD5 323e7fec2e398073d92c4cccd0307c18 elilo_3.6-1.diff.gz 14944
+RMD160 6edb6f85187724ac1f798d894cbd99242ce2d62b elilo_3.6-1.diff.gz 14944
+SHA256 cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073 elilo_3.6-1.diff.gz 14944
diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch
new file mode 100644
index 000000000000..710780e8da6c
--- /dev/null
+++ b/sys-boot/elilo/files/elilo.sh-chkspace.patch
@@ -0,0 +1,15 @@
+Don't count duplicate files twice when summing bytesneeded
+
+--- elilo/debian/elilo.sh.chkspace	2006-03-16 07:53:00.000000000 -0500
++++ elilo/debian/elilo.sh	2006-03-16 07:53:27.000000000 -0500
+@@ -580,7 +580,9 @@
+ 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
+     vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
+ 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
+-    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
++    allfiles=`for f in $imagefiles $initrdfiles $install $bootconf; do \
++	echo $f; done | sort -u`
++    bytesneeded=`cat $allfiles 2>/dev/null | wc -c`
+     # convert to KB, allowing 5% overhead
+     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
+     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")
diff --git a/sys-boot/elilo/files/elilo.sh-vmm.patch b/sys-boot/elilo/files/elilo.sh-vmm.patch
new file mode 100644
index 000000000000..294eb03b2226
--- /dev/null
+++ b/sys-boot/elilo/files/elilo.sh-vmm.patch
@@ -0,0 +1,43 @@
+Patch from Alex Williamson in
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185 support of vmm= in the
+elilo script
+
+--- elilo/debian/elilo.sh.novmm	2006-03-16 07:49:19.000000000 -0500
++++ elilo/debian/elilo.sh	2006-03-16 07:48:47.000000000 -0500
+@@ -364,6 +364,8 @@
+ 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
+     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
+ 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
++    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
++		sed 's/.*=[[:space:]]*//' | grep -v ':'`
+ 
+     ## Point of no return, removing the old EFI/debian tree
+     rm -rf $TARGET/$EFIROOT
+@@ -398,6 +400,7 @@
+ 	-e "s|\t| |g" \
+ 	-e "s|\(^image[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
+ 	-e "s|\(^[[:space:]]*initrd[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
++	-e "s|\(^[[:space:]]*vmm[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
+ 	< "$bootconf" > "$TARGET/$EFIROOT/$CFFILE"
+     if [ $? != 0 ] ; then
+ 	echo 1>&2 "$PRG: An error occured while writing to $boot"
+@@ -406,7 +409,7 @@
+ 
+     [ "$DEBUG" = 1 ] && echo "----" && cat "$TARGET/$EFIROOT/$CFFILE" && echo "----"
+ 
+-    for i in $imagefiles $initrdfiles; do
++    for i in $imagefiles $initrdfiles $vmmfiles; do
+ 	[ "$VERBOSE" = 1 ] && echo "$PRG: Installing $i on $boot..."
+ 	if [ -f $i ]; then
+ 	    mkdir -p `dirname "$TARGET/$EFIROOT/$i"`
+@@ -575,7 +578,9 @@
+ 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
+     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
+ 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
+-    bytesneeded=`cat $imagefiles $initrdfiles $install $bootconf 2>/dev/null | wc -c`
++    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
++		sed 's/.*=[[:space:]]*//' | grep -v ':'`
++    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
+     # convert to KB, allowing 5% overhead
+     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
+     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")