7 files changed, 24 insertions, 86 deletions
diff --git a/sys-boot/elilo/ChangeLog b/sys-boot/elilo/ChangeLog
index 4f7dbd1c6fcf..e40cb89dc330 100644
--- a/sys-boot/elilo/ChangeLog
+++ b/sys-boot/elilo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/elilo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.9 2005/05/06 04:03:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.10 2005/08/02 22:51:22 agriffis Exp $
+
+*elilo-3.4-r3 (02 Aug 2005)
+
+  02 Aug 2005; Aron Griffis <agriffis@gentoo.org> files/elilo.conf.sample,
+  -elilo-3.4-r1.ebuild, -elilo-3.4-r2.ebuild, +elilo-3.4-r3.ebuild:
+  Stabilize -r2 with vapier's ebuild updates, but bump it to -r3 at the same
+  time to push out repaired sample elilo.conf
 
 *elilo-3.4-r2 (06 May 2005)
 
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 1921845cf2bb..75759ee2593a 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,12 +1,10 @@
-MD5 ceba62115d912083adc7373c18a52e09 ChangeLog 1355
-MD5 ce00de2a6171c43e613aa20408250af0 elilo-3.4-r2.ebuild 1652
-MD5 46b23f2a5ba4295b08bad2462a1f120e elilo-3.4-r1.ebuild 1782
+MD5 a0056ef8faa45d45d5b0771f35fb4da2 ChangeLog 1654
+MD5 656d6794a36136c8932b58a4ba4d6730 elilo-3.4-r3.ebuild 1605
 MD5 2640f713f5f00cf0a17e31d220c8242c files/elilo-3.3a-devscheme.patch 3571
-MD5 821c2877ad33567d7c7dc9598331e7f9 files/elilo-3.4 22782
-MD5 2b2d58955c4ad612fee3bcf9b977bc41 files/elilo-3.4-makefile.patch 338
 MD5 5e611594843275c52c4b4921b89a23e4 files/elilo.8-3.4 3286
-MD5 b8d17fae7a7884645a7f89b31129e3d0 files/elilo.conf.sample 161
-MD5 a479f5334497679bd91ddc7181866f52 files/eliloalt.8-3.4 550
-MD5 85650d47a2950be23774d73205b19e97 files/digest-elilo-3.4-r1 61
-MD5 85650d47a2950be23774d73205b19e97 files/digest-elilo-3.4-r2 61
 MD5 d8b9c6b6a99161eaad38eae80039af69 files/elilo-3.4-proc-sigsetjmp.patch 374
+MD5 821c2877ad33567d7c7dc9598331e7f9 files/elilo-3.4 22782
+MD5 a479f5334497679bd91ddc7181866f52 files/eliloalt.8-3.4 550
+MD5 2b2d58955c4ad612fee3bcf9b977bc41 files/elilo-3.4-makefile.patch 338
+MD5 28d31c36279045f43b3c61c5000b7821 files/elilo.conf.sample 150
+MD5 85650d47a2950be23774d73205b19e97 files/digest-elilo-3.4-r3 61
diff --git a/sys-boot/elilo/elilo-3.4-r1.ebuild b/sys-boot/elilo/elilo-3.4-r1.ebuild
deleted file mode 100644
index 1f7132c082cf..000000000000
--- a/sys-boot/elilo/elilo-3.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4-r1.ebuild,v 1.1 2005/03/30 19:50:57 plasmaroo Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="http://developer.intel.com/technology/efi"
-SRC_URI="ftp://ftp.hpl.hp.com/pub/linux-ia64/${P}.tar.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"
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/elilo-3.4-makefile.patch
-	epatch ${FILESDIR}/elilo-3.3a-devscheme.patch
-}
-
-src_compile() {
-	local iarch
-	case $ARCH in
-		ia64) iarch=ia64 ;;
-		x86)  iarch=ia32 ;;		# for cross-compiling?
-		*)    die "unknown architecture: $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"
-
-	# unversion the man-pages and Debian's elilo script
-	cp ${FILESDIR}/elilo.8-${PV} elilo.8
-	cp ${FILESDIR}/eliloalt.8-${PV} eliloalt.8
-	cp ${FILESDIR}/elilo-${PV} elilo
-}
-
-src_install() {
-	dodir /usr/lib/elilo /usr/sbin /etc
-
-	# install the efi executable in a known location
-	install -m755 elilo.efi ${D}/usr/lib/elilo || die
-
-	# install eliloalt
-	install -m755 tools/eliloalt ${D}/usr/sbin || die
-	doman eliloalt.8 || die
-
-	# text docs
-	dodoc docs/*
-
-	# install the debian elilo script
-	install -m755 elilo ${D}/usr/sbin || die
-	install -m644 ${FILESDIR}/elilo.conf.sample ${D}/etc || die
-	doman elilo.8 || die
-}
diff --git a/sys-boot/elilo/elilo-3.4-r2.ebuild b/sys-boot/elilo/elilo-3.4-r3.ebuild
index 4f268320bc0e..9122ed1ae534 100644
--- a/sys-boot/elilo/elilo-3.4-r2.ebuild
+++ b/sys-boot/elilo/elilo-3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4-r2.ebuild,v 1.2 2005/05/22 01:59:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4-r3.ebuild,v 1.1 2005/08/02 22:51:22 agriffis Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.hpl.hp.com/pub/linux-ia64/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ia64"
+KEYWORDS="ia64"
 IUSE=""
 
 # gnu-efi contains only static libs, so there's no run-time dep on it
@@ -47,10 +47,8 @@ src_install() {
 	exeinto /usr/lib/elilo
 	doexe elilo.efi || die "elilo.efi failed"
 
-	if [[ ! -e ${D}/etc/elilo.conf ]] ; then
-		insinto /etc
-		newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-	fi
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
 
 	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
 	newman "${FILESDIR}"/elilo.8-${PV} elilo.8
diff --git a/sys-boot/elilo/files/digest-elilo-3.4-r2 b/sys-boot/elilo/files/digest-elilo-3.4-r2
deleted file mode 100644
index 6c9603e2135d..000000000000
--- a/sys-boot/elilo/files/digest-elilo-3.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7357929dfca29436d35ad6386fc051c elilo-3.4.tar.gz 316518
diff --git a/sys-boot/elilo/files/digest-elilo-3.4-r1 b/sys-boot/elilo/files/digest-elilo-3.4-r3
index 6c9603e2135d..6c9603e2135d 100644
--- a/sys-boot/elilo/files/digest-elilo-3.4-r1
+++ b/sys-boot/elilo/files/digest-elilo-3.4-r3
diff --git a/sys-boot/elilo/files/elilo.conf.sample b/sys-boot/elilo/files/elilo.conf.sample
index a39c92147ae0..ed97975c69d7 100644
--- a/sys-boot/elilo/files/elilo.conf.sample
+++ b/sys-boot/elilo/files/elilo.conf.sample
@@ -1,9 +1,9 @@
 boot=/dev/sda1
 install=/usr/lib/elilo/elilo.efi
 delay=20
-default=Gentoo
+default=gentoo
 
-image=/boot/vmlinuz-2.4.22
-	label=Gentoo Linux
-        root=/dev/sda3
-        read-only
+image=/boot/kernel-2.6.12-gentoo-r6
+	label=gentoo
+	root=/dev/sda3
+	read-only