add back 92 and 94 for vapier

(Portage version: 2.0.51.22-r2)

6 files changed, 236 insertions, 2 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 62bc24c58dd9..0f87e0210dde 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2005/07/28 14:29:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.47 2005/07/28 14:52:47 seemant Exp $
+
+  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> +grub-0.92-r1.ebuild,
+  +grub-0.94-r1.ebuild:
+  add back 92 and 94 for vapier
 
   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,
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4060d7b9219d..5efd8bff3117 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,7 +1,9 @@
-MD5 11a8bb736645ef4f638403111db20dcb ChangeLog 14190
+MD5 09972a5eb076742fbab965403960c92e ChangeLog 14321
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
 MD5 265cdebdd7e789aa0f65ece937b6f3d9 grub-0.96-r1.ebuild 5102
 MD5 81ff3c533676c996778973eb2d0bbe9a grub-0.96-r2.ebuild 5240
+MD5 3c491ccbc8208833cc6e8b7fefb790d6 grub-0.92-r1.ebuild 2552
+MD5 436f5580a8686de1071b36f639142dba grub-0.94-r1.ebuild 3624
 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
@@ -18,3 +20,5 @@ MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r2 140
 MD5 5c12894c0a8cfd4a46a67e631dd45804 files/grub-0.96-netboot-pic.patch 446
 MD5 fb0f1b7cf2bf8055ee45f1e44c793cb7 files/grub-0.96-xfs-writable-string.patch 519
 MD5 3c201afcdacfff41b196d3d56ef07866 files/grub-0.96-gcc2.patch 573
+MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
diff --git a/sys-boot/grub/files/digest-grub-0.92-r1 b/sys-boot/grub/files/digest-grub-0.92-r1
new file mode 100644
index 000000000000..cbaef07bdcd0
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.92-r1
@@ -0,0 +1,2 @@
+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.94-r1 b/sys-boot/grub/files/digest-grub-0.94-r1
new file mode 100644
index 000000000000..6e16be87c678
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.94-r1
@@ -0,0 +1,2 @@
+MD5 299672a99cf59656e653d8ffd7851b56 grub-0.94.tar.gz 923518
+MD5 be1a9091b936e179990372201a3fdff6 grub-0.94-splash.patch.bz2 40177
diff --git a/sys-boot/grub/grub-0.92-r1.ebuild b/sys-boot/grub/grub-0.92-r1.ebuild
new file mode 100644
index 000000000000..a839872c5bfb
--- /dev/null
+++ b/sys-boot/grub/grub-0.92-r1.ebuild
@@ -0,0 +1,89 @@
+# 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.12 2005/07/28 14:52:47 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
+	http://dev.gentoo.org/~seemant/extras/${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.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
new file mode 100644
index 000000000000..659ebc3659c5
--- /dev/null
+++ b/sys-boot/grub/grub-0.94-r1.ebuild
@@ -0,0 +1,133 @@
+# 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.21 2005/07/28 14:52:47 seemant 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
+}