Update version. Some cleanups.

(Portage version: 2.0.51.19)

4 files changed, 158 insertions, 18 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index c0226ce5fec7..042c347416c6 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.32 2005/02/04 00:13:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.33 2005/03/05 20:28:13 azarah Exp $
+
+*grub-0.96 (05 Mar 2005)
+
+  05 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +grub-0.96.ebuild:
+  Update version.  Some cleanups.
 
   03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index dad03025056f..45bcc96adebe 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 77fa3c65fb336599a25fd727838b5276 ChangeLog 11505
-MD5 ab8dffe755fef76f482674e25a29c08a grub-0.92-r1.ebuild 2528
 MD5 cafd80ff67a1bc6b1ecbf32469ee9da8 grub-0.93.20030118.ebuild 2514
 MD5 dffe8532072808193e7384c312ad89fe grub-0.94-r1.ebuild 3521
+MD5 ab8dffe755fef76f482674e25a29c08a grub-0.92-r1.ebuild 2528
+MD5 77fa3c65fb336599a25fd727838b5276 ChangeLog 11505
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
+MD5 95e6d8fcf49269fc36ff0d769f6e8774 grub-0.96.ebuild 4199
 MD5 fe0f7810d06253ce327ea11a9cb1c32f grub-0.94-r2.ebuild 3637
 MD5 89306ea5a227e50c510b5e385be16db3 grub-0.95.20040823.ebuild 4112
-MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
+MD5 041742a4139b57b39ebfef605a2688da .grub-0.96.ebuild.swp 20480
 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 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
 MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
+MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
+MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
 MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
+MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
 MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
-MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCAr5FArHZZzCEUG0RAqigAJ4zs3o5FghofQX9UsHADwEQtMbGjgCfdrho
-Q95TVM4g0k7pDFEoYvGr+rE=
-=9HsR
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/digest-grub-0.96 b/sys-boot/grub/files/digest-grub-0.96
new file mode 100644
index 000000000000..b43ad3d90a05
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.96
@@ -0,0 +1,2 @@
+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.96.ebuild b/sys-boot/grub/grub-0.96.ebuild
new file mode 100644
index 000000000000..2b87f17ff532
--- /dev/null
+++ b/sys-boot/grub/grub-0.96.ebuild
@@ -0,0 +1,140 @@
+# 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.1 2005/03/05 20:28:13 azarah Exp $
+
+inherit mount-boot eutils flag-o-matic gcc 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/grub/${P}.tar.gz
+	mirror://gentoo/${PN}-0.95.20040823-splash.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="static netboot"
+
+DEPEND=">=sys-libs/ncurses-5.2-r5
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+	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"
+}
+
+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
+}
+
+src_compile() {
+	### 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-versio) -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 -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 /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
+}