Version bump #290533 by Opportunist.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 117 insertions, 12 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 1cadd626b8ea..760d61bc907f 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.124 2009/10/14 00:06:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.125 2009/10/26 23:05:53 vapier Exp $
+
+*grub-1.97 (26 Oct 2009)
+
+  26 Oct 2009; Mike Frysinger <vapier@gentoo.org> +grub-1.97.ebuild,
+  grub-9999.ebuild:
+  Version bump #290533 by Opportunist.
 
   14 Oct 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
   Fix by pyon for USE=multislot and info collisions #288877.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 663485bc52de..9e5996a8fb7c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -21,6 +21,7 @@ DIST grub-0.97-patches-1.8.tar.bz2 48274 RMD160 99c967daca704e853e9d161a51db3d39
 DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd44b429eaa SHA1 1d9da2df8bccef9821ebbbc2f5c5353dbd90bf4d SHA256 6b8445c9260803f059031cbe7475a45fee6499fc2dbd911288af6169455c4028
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST grub-1.96.tar.gz 639970 RMD160 80c8a41b73063706310f3f6e99acb912e2e8f9ab SHA1 6af22f354d8c551dd82e71f15196e2f96a1318ba SHA256 0cdfb104da5492b1b2b402ed45873b3b7a7407f5017ae7d8806327a619dc1d59
+DIST grub-1.97.tar.gz 1246414 RMD160 82277210019561975939a4ff68de65d0b5824149 SHA1 df5345640ffe73112e11352f563d7ae619718e3b SHA256 8d582e9627ab6d7c73edaed3c30c933aefc2884aec76cf671d6d40f46ce65673
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2639 RMD160 cacac6d3ed808c52a05fc6b1c0c929af7f114926 SHA1 5828e84ded260a50bd7c6cd30217e1d0cf881299 SHA256 40c896a0ec005d50e9c6effd4d2ee95c1e0712d26a13f8f55bc6d7380c6d7102
 EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a SHA1 a2131f5f673ad9f5dbf6288d7484eb844de52e37 SHA256 864ca6f410a0a6caf18d4bdc4a0389bb922802459e0c2a975c0442f6bd4a4fd5
@@ -36,13 +37,14 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce
 EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.96.ebuild 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2
-EBUILD grub-9999.ebuild 2604 RMD160 5057ede2ce347df09387528d068bf0427d4e8eff SHA1 91bf56783c2d9217060f797526363396572083ae SHA256 50be006d77f58bc575e9906c9dcf0c868c4a55f50be108bc8e5d14f1aff4f01f
-MISC ChangeLog 26752 RMD160 714aa450899a19c821317cfae8bce3a1eddd87bc SHA1 0b8f8f176d9de9b539ebbbf6bd72a8e77e5222cf SHA256 61d30b0d5c8fd1ab814c5f8e6c16a2d71aed3f7f4dcaec20bac2bdd9e8fc8b2f
+EBUILD grub-1.97.ebuild 2551 RMD160 10a5e7ea2f0ba16b56dc16a629da5e16a974f51c SHA1 16bc6fe250fe97889b6b63c671d3533aeb87be50 SHA256 81168ecb775145e1d5eb0d0446003ad1145ade11de7c8f399cf6fad204b616f6
+EBUILD grub-9999.ebuild 2552 RMD160 1278e0c625d818beed0e73aa3f3de11757851431 SHA1 3e773c670fc99488325ccf463e5efec6d20f0096 SHA256 5b4ec24430c7e6dfeac996a82d1562a4cb790655b5c295bbf0d08398f2efa8d3
+MISC ChangeLog 26907 RMD160 48df9f750fc3c648a38780f97be3e450973a1325 SHA1 3e84269c89ff01f0b833c0c1fe1229a65b2bdad3 SHA256 6f19cd23a52440f139e854a7504b698d8698e793e4737e1eabf0969b009d58e1
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrVFhAACgkQlPl3HsVfCDrePgCfe2QEi8NJmQn00sK5xU+7lVNK
-DpcAnR17qZt9dT3WJ3aNkIeOmoXs1ZzJ
-=SwUY
+iEYEARECAAYFAkrmK10ACgkQlPl3HsVfCDqHewCfe4TpA+VCyEYuOC1LebMr4u49
+FfgAnjNINUWmjsEYz4EexuC/6Jl/XpfZ
+=tIej
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.97.ebuild b/sys-boot/grub/grub-1.97.ebuild
new file mode 100644
index 000000000000..5f113cede7e1
--- /dev/null
+++ b/sys-boot/grub/grub-1.97.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.ebuild,v 1.1 2009/10/26 23:05:53 vapier Exp $
+
+inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://svn.sv.gnu.org/grub/trunk/grub2"
+	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GRUB 2 boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+use multislot && SLOT="2" || SLOT="0"
+KEYWORDS=""
+IUSE="custom-cflags debug multislot static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo"
+DEPEND="${RDEPEND}
+	dev-lang/ruby"
+PROVIDE="virtual/bootloader"
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
+
+	# autogen.sh does more than just run autotools
+	sed -i -e 's:^auto:eauto:' autogen.sh
+	(. ./autogen.sh) || die
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	econf \
+		--disable-werror \
+		--sbindir=/sbin \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--disable-efiemu \
+		--enable-grub-mkfont \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable debug grub-fstest)
+	emake -j1 || die "making regular stuff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+	GRUB_DISTRIBUTOR="Gentoo"
+	EOF
+	if use multislot ; then
+		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
+		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/usr/share/info/grub{,2}.info || die
+	fi
+}
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}/grub
+
+	if [[ ! -e ${dir}/grub.cfg ]] ; then
+		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+		grub-mkconfig -o "${dir}/grub.cfg"
+	fi
+
+	#local install=grub-install
+	#use multislot && install="grub2-install --grub-setup=/bin/true"
+	#einfo "Running: ${install} "
+	#${install}
+}
+
+pkg_postinst() {
+	if use multislot ; then
+		elog "You have installed grub2 with USE=multislot, so to coexist"
+		elog "with grub1, the grub2 install binary is named grub2-install."
+	fi
+	setup_boot_dir "${ROOT}"boot
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2794ccd903c7..db0b2732c2b2 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.13 2009/10/14 00:06:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.14 2009/10/26 23:05:53 vapier Exp $
 
 inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -54,7 +54,6 @@ src_compile() {
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
-		--disable-grub-pe2elf \
 		--enable-grub-mkfont \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu) \
@@ -70,9 +69,8 @@ src_install() {
 	GRUB_DISTRIBUTOR="Gentoo"
 	EOF
 	if use multislot ; then
-		sed -i s:grub-install:grub2-install: "${D}"/sbin/grub-install
+		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
 		mv "${D}"/sbin/grub{,2}-install || die
-		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
 		mv "${D}"/usr/share/info/grub{,2}.info || die
 	fi
 }