remove cruft ebuilds

Package-Manager: portage-2.0.51.22-r2

14 files changed, 7 insertions, 769 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index e65cb6f1dede..62bc24c58dd9 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.45 2005/07/24 13:43:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.46 2005/07/28 14:29:55 seemant Exp $
+
+  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> -grub-0.92-r1.ebuild,
+  -grub-0.93.20030118.ebuild, -grub-0.94-r1.ebuild, -grub-0.94-r2.ebuild,
+  -grub-0.95.20040823.ebuild, -grub-0.96.ebuild:
+  remove cruft ebuilds
 
   24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
   +files/grub-0.96-gcc2.patch, grub-0.96-r2.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 42c80482a4cf..4060d7b9219d 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,19 +1,7 @@
-MD5 589c75142bd2a41d9342de643e7b9438 ChangeLog 13968
-MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
-MD5 774d3294eb6bd4722df2a9fadaedd73f grub-0.94-r1.ebuild 3605
-MD5 ffc7d940854b3789738f79ada45c9a94 grub-0.94-r2.ebuild 3721
-MD5 0db2c1935cf7f2ca214b3fcd736bcf8d grub-0.95.20040823.ebuild 4193
-MD5 57b1ac06a99f01be2f0529ddae744349 grub-0.96.ebuild 4184
+MD5 11a8bb736645ef4f638403111db20dcb ChangeLog 14190
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
 MD5 265cdebdd7e789aa0f65ece937b6f3d9 grub-0.96-r1.ebuild 5102
 MD5 81ff3c533676c996778973eb2d0bbe9a grub-0.96-r2.ebuild 5240
-MD5 bf9f6a1bc8f0e1cc82de7d6593a6f7c1 grub-0.92-r1.ebuild 2462
-MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
-MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
-MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
-MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
 MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
 MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
diff --git a/sys-boot/grub/files/digest-grub-0.92-r1 b/sys-boot/grub/files/digest-grub-0.92-r1
deleted file mode 100644
index cbaef07bdcd0..000000000000
--- a/sys-boot/grub/files/digest-grub-0.92-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50f2786e7bf96b1115ee82b9c101a816 grub-0.92.tar.gz 877112
-MD5 3acebcea3c38fc2a6b4413e22e480086 grub-0.92-gentoo-0.1.tar.bz2 21404
diff --git a/sys-boot/grub/files/digest-grub-0.93.20030118 b/sys-boot/grub/files/digest-grub-0.93.20030118
deleted file mode 100644
index c28752969b54..000000000000
--- a/sys-boot/grub/files/digest-grub-0.93.20030118
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 289ed7946dec7ac4eac146b3a5c0c608 grub-0.93.tar.gz 891032
-MD5 a1d905b0ec3450c44e7142ef1671aa76 grub-0.93.20030118-gentoo.diff.bz2 29995
diff --git a/sys-boot/grub/files/digest-grub-0.94-r1 b/sys-boot/grub/files/digest-grub-0.94-r1
deleted file mode 100644
index 6e16be87c678..000000000000
--- a/sys-boot/grub/files/digest-grub-0.94-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 299672a99cf59656e653d8ffd7851b56 grub-0.94.tar.gz 923518
-MD5 be1a9091b936e179990372201a3fdff6 grub-0.94-splash.patch.bz2 40177
diff --git a/sys-boot/grub/files/digest-grub-0.94-r2 b/sys-boot/grub/files/digest-grub-0.94-r2
deleted file mode 100644
index 6e16be87c678..000000000000
--- a/sys-boot/grub/files/digest-grub-0.94-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 299672a99cf59656e653d8ffd7851b56 grub-0.94.tar.gz 923518
-MD5 be1a9091b936e179990372201a3fdff6 grub-0.94-splash.patch.bz2 40177
diff --git a/sys-boot/grub/files/digest-grub-0.95.20040823 b/sys-boot/grub/files/digest-grub-0.95.20040823
deleted file mode 100644
index c8246ab022ba..000000000000
--- a/sys-boot/grub/files/digest-grub-0.95.20040823
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6867cf182a3cf1e6a214b41f0370b7eb grub-0.95.20040823.tar.gz 921128
-MD5 7d0c1f5a474a8877a6f38edc4599030a grub-0.95.20040823-splash.patch.bz2 40226
diff --git a/sys-boot/grub/files/digest-grub-0.96 b/sys-boot/grub/files/digest-grub-0.96
deleted file mode 100644
index b43ad3d90a05..000000000000
--- a/sys-boot/grub/files/digest-grub-0.96
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
-MD5 7d0c1f5a474a8877a6f38edc4599030a grub-0.95.20040823-splash.patch.bz2 40226
diff --git a/sys-boot/grub/grub-0.92-r1.ebuild b/sys-boot/grub/grub-0.92-r1.ebuild
deleted file mode 100644
index 212321e35d1e..000000000000
--- a/sys-boot/grub/grub-0.92-r1.ebuild
+++ /dev/null
@@ -1,88 +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/grub/grub-0.92-r1.ebuild,v 1.10 2005/07/28 14:27:16 seemant Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=0.1
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2-r5"
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
-
-	if [ "`gcc-version`" = "3.3" ]
-	then
-		epatch ${FILESDIR}/grub-0.93-gcc3.3.diff
-	fi
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	unset BLOCK_SIZE #73499
-
-	#i686-specific code in the boot loader is a bad idea; disabling to ensure
-	#at least some compatibility if the hard drive is moved to an older or
-	#incompatible system.
-	unset CFLAGS
-	./configure --prefix=/usr \
-		--sbindir=/sbin \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-auto-linux-mem-opt \
-		|| die "Configuration of package failed."
-
-	#the vga16.patch changes configure.in but not configure so
-	#--enable-vga16 doesnt work.  config.h gets overwritten by make.
-	echo "#define VGA16 1" >> config.h.in
-
-	emake || die "Building failed!"
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sbindir=${D}/sbin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die "Installation failed."
-
-	dodir /boot/grub
-	cp ${FILESDIR}/splash.xpm.gz ${D}/boot/grub
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-	if [ ! -e /boot/grub/stage1 ]
-	then
-		#if the boot loader files aren't in place, copy them over.
-		cd /usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 /boot/grub
-	else
-		einfo '*** A new GRUB has been installed. If you need to reinstall'
-		einfo '*** GRUB to a boot record on your drive, please remember to'
-		einfo '*** "cp /usr/share/grub/i386-pc/*stage* /boot/grub" first.'
-		einfo "*** If you're using XFS, unmount and remount /boot as well."
-	fi
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ln -s grub.conf /boot/grub/menu.lst
-		einfo "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-	fi
-}
diff --git a/sys-boot/grub/grub-0.93.20030118.ebuild b/sys-boot/grub/grub-0.93.20030118.ebuild
deleted file mode 100644
index f1756081b62f..000000000000
--- a/sys-boot/grub/grub-0.93.20030118.ebuild
+++ /dev/null
@@ -1,92 +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/grub/grub-0.93.20030118.ebuild,v 1.11 2005/03/11 04:29:25 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic
-
-NEWP=${PN}-${PV%.*}
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${NEWP}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-PROVIDE="virtual/bootloader"
-
-S=${WORKDIR}/${NEWP}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# grub-0.93.20030118-gentoo.diff; <woodchip@gentoo.org> (18 Jan 2003)
-	# -fixes from grub CVS pulled on 20030118
-	# -vga16 patches; mined from Debian's grub-0.93+cvs20030102-1.diff
-	# -special-raid-devices.patch
-	# -addsyncs.patch
-	# -splashimagehelp.patch
-	# -configfile.patch
-	# -installcopyonly.patch
-	epatch ${WORKDIR}/${P}-gentoo.diff
-
-	# grub-0.93-gcc3.3.diff <johnm@gentoo.org> (14 Sep 2003)
-	# -fixes compile error with >=gcc-3.3
-	epatch ${FILESDIR}/grub-0.93-gcc3.3.diff
-
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	filter-flags -fstack-protector
-	filter-flags -fPIC
-
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	use static && export LDFLAGS="${LDFLAGS} -static"
-
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie` `test_flag -fno-stack-protector`"
-
-	econf CC="${CC:=gcc} ${HARDENED_CFLAGS}" --exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die
-
-	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" || die
-}
-
-src_install() {
-	einstall exec_prefix=${D}/ || die
-
-	insinto /boot/grub
-	doins ${FILESDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-	/sbin/grub-install --just-copy
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ln -s grub.conf /boot/grub/menu.lst
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-}
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
deleted file mode 100644
index 990c80347ec7..000000000000
--- a/sys-boot/grub/grub-0.94-r1.ebuild
+++ /dev/null
@@ -1,133 +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/grub/grub-0.94-r1.ebuild,v 1.19 2005/05/30 19:58:21 swegener Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
-	mirror://gentoo/${P}-splash.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-IUSE="static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64; then
-		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-splash.patch
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-
-	# This patchset is from SuSE -- hopefully fixes the acl symlink issue
-	# And should add some boot prettification
-#	epatch ${WORKDIR}/${PF}-gentoo.diff
-#	epatch ${FILESDIR}/${P}-test.patch
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	filter-ldflags -pie
-	append-flags -DNDEBUG
-	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
-	use static && append-ldflags -static
-
-	has_pie && CC="${CC} `test_flag -fno-pic` `test_flag -nopie`"
-	has_ssp && CC="${CC} `test_flag -fno-stack-protector`"
-
-	autoconf || die
-	aclocal || die
-	WANT_AUTOMAKE=1.7 automake || die
-
-	# build the net-bootable grub first
-	CFLAGS="" \
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die
-
-	emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-	mv stage2/{nbgrub,pxegrub} ${S}
-	mv stage2/stage2 stage2/stage2.netboot
-
-	make clean || die
-
-	# now build the regular grub
-	CFLAGS="${CFLAGS}" \
-	econf \
-			--libdir=/lib \
-			--datadir=/usr/lib/grub \
-			--exec-prefix=/ \
-			--disable-auto-linux-mem-opt || die
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub
-	doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${FILESDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	ln -s grub.conf /boot/grub/menu.lst
-
-	[ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /usr/lib/grub to /boot"
-	cp -p /usr/lib/grub/* /boot/grub
-	cp -p /usr/lib/grub/grub/*/* /boot/grub
-
-	[ -e /boot/grub/grub.conf ] \
-		&& /usr/sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/sys-boot/grub/grub-0.94-r2.ebuild b/sys-boot/grub/grub-0.94-r2.ebuild
deleted file mode 100644
index b6a21a8983f0..000000000000
--- a/sys-boot/grub/grub-0.94-r2.ebuild
+++ /dev/null
@@ -1,136 +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/grub/grub-0.94-r2.ebuild,v 1.8 2005/05/30 19:58:21 swegener Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
-	mirror://gentoo/${P}-splash.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64; then
-		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-splash.patch
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-
-	# Trying to get rid of the need for the ugly menu.lst -> grub.conf symlink
-	epatch ${FILESDIR}/${P}-grub.conf.patch
-
-	# This patchset is from SuSE -- hopefully fixes the acl symlink issue
-	# And should add some boot prettification
-#	epatch ${WORKDIR}/${PF}-gentoo.diff
-#	epatch ${FILESDIR}/${P}-test.patch
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	filter-ldflags -pie
-	append-flags -DNDEBUG
-	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
-	use static && append-ldflags -static
-
-	has_pie && CC="${CC} `test_flag -fno-pic` `test_flag -nopie`"
-	has_ssp && CC="${CC} `test_flag -fno-stack-protector`"
-
-	autoconf || die
-	aclocal || die
-	WANT_AUTOMAKE=1.7 automake || die
-
-	# build the net-bootable grub first
-	CFLAGS="" \
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die
-
-	emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-	mv stage2/{nbgrub,pxegrub} ${S}
-	mv stage2/stage2 stage2/stage2.netboot
-
-	make clean || die
-
-	# now build the regular grub
-	CFLAGS="${CFLAGS}" \
-	econf \
-			--libdir=/lib \
-			--datadir=/usr/lib/grub \
-			--exec-prefix=/ \
-			--disable-auto-linux-mem-opt || die
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub
-	doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${FILESDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	ln -s grub.conf /boot/grub/menu.lst
-
-	[ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /usr/lib/grub to /boot"
-	cp -p /usr/lib/grub/* /boot/grub
-	cp -p /usr/lib/grub/grub/*/* /boot/grub
-
-	[ -e /boot/grub/grub.conf ] \
-		&& /usr/sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/sys-boot/grub/grub-0.95.20040823.ebuild b/sys-boot/grub/grub-0.95.20040823.ebuild
deleted file mode 100644
index aa5c94ffff2f..000000000000
--- a/sys-boot/grub/grub-0.95.20040823.ebuild
+++ /dev/null
@@ -1,146 +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/grub/grub-0.95.20040823.ebuild,v 1.17 2005/07/04 11:35:49 swegener Exp $
-
-inherit mount-boot eutils flag-o-matic gnuconfig toolchain-funcs
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-splash.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static netboot"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64; then
-		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	gnuconfig_update
-
-	epatch ${WORKDIR}/${P}-splash.patch
-	#epatch ${FILESDIR}/${P}-gcc3.4.patch
-
-	# Trying to get rid of the need for the ugly menu.lst -> grub.conf symlink
-	#epatch ${FILESDIR}/${P}-grub.conf.patch
-
-	# This patchset is from SuSE -- hopefully fixes the acl symlink issue
-	# And should add some boot prettification
-	# epatch ${WORKDIR}/${PF}-gentoo.diff
-	# epatch ${FILESDIR}/${P}-test.patch
-
-	# -fwritable-strings is deprecated; testing to see if we need it any more
-	epatch ${FILESDIR}/${P}-warnings.patch
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	filter-ldflags -pie
-	append-flags -DNDEBUG
-	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
-	use static && append-ldflags -static
-
-	has_pie && CC="$(tc-getCC) `test_flag -fno-pic` `test_flag -nopie`"
-	has_ssp && CC="$(tc-getCC) `test_flag -fno-stack-protector`"
-
-	autoconf || die "autoconf failed"
-	aclocal || die "aclocal failed"
-	WANT_AUTOMAKE=1.8 automake || die "automake failed"
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot
-	then
-		CFLAGS="" \
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv stage2/{nbgrub,pxegrub} ${S}
-		mv stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	CFLAGS="${CFLAGS}" \
-	econf \
-			--libdir=/lib \
-			--datadir=/usr/lib/grub \
-			--exec-prefix=/ \
-			--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub
-	doexe stage2/stage2
-	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${FILESDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	ln -s grub.conf /boot/grub/menu.lst
-
-	[ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	cp -p /usr/lib/grub/* /boot/grub
-	cp -p /lib/grub/*/* /boot/grub
-	cp -p /usr/lib/grub/*/* /boot/grub
-
-	[ -e /boot/grub/grub.conf ] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/sys-boot/grub/grub-0.96.ebuild b/sys-boot/grub/grub-0.96.ebuild
deleted file mode 100644
index 8135dad0300d..000000000000
--- a/sys-boot/grub/grub-0.96.ebuild
+++ /dev/null
@@ -1,148 +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/grub/grub-0.96.ebuild,v 1.7 2005/07/04 11:35:49 swegener Exp $
-
-inherit mount-boot eutils flag-o-matic gnuconfig toolchain-funcs
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-0.95.20040823-splash.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static netboot"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64; then
-		if ! has_m32; then
-			eerror "Your compiler seems to be unable to compile 32bit code."
-			eerror "If you are on amd64, make sure you compile gcc with:"
-			echo
-			eerror "    USE=multilib FEATURES=-sandbox"
-			die "Cannot produce 32bit objects!"
-		fi
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	gnuconfig_update
-
-	epatch ${WORKDIR}/${PN}-0.95.20040823-splash.patch
-	#epatch ${FILESDIR}/${P}-gcc3.4.patch
-
-	# -fwritable-strings is deprecated; testing to see if we need it any more
-	epatch ${FILESDIR}/${PN}-0.95.20040823-warnings.patch
-
-	# patch for GCC4; bug #85016
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	filter-ldflags -pie
-	append-flags -DNDEBUG
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -minline-all-stringops
-	use static && append-ldflags -static
-
-	has_pie && CFLAGS="${CFLAGS} $(test_flag -fno-pic) $(test_flag -nopie)"
-	has_ssp && CFLAGS="${CFLAGS} $(test_flag -fno-stack-protector)"
-
-	autoconf || die "autoconf failed"
-	aclocal || die "aclocal failed"
-	#WANT_AUTOMAKE=1.8 \
-	automake || die "automake failed"
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		CFLAGS="" \
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} ${S}
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	CFLAGS="${CFLAGS}" \
-	econf \
-			--libdir=/lib \
-			--datadir=/usr/lib/grub \
-			--exec-prefix=/ \
-			--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub
-	doexe stage2/stage2
-	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${FILESDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-
-	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
-
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub
-	done
-
-	[[ -e /boot/grub/grub.conf ]] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}