Add a magic flag GRUB_STATIC_PACKAGE_BUILDING which along with USE='static -ncurses' is used to build grub-static tarballs from now on.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.28-rc2-07920-g65fc716 x86_64

3 files changed, 23 insertions, 15 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 1b4799059223..d8d4f2a1c44a 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.101 2008/08/16 15:27:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.102 2008/11/01 12:46:54 robbat2 Exp $
+
+  01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r6.ebuild:
+  Add a magic flag GRUB_STATIC_PACKAGE_BUILDING which along with USE=static
+  -ncurses is used to build grub-static tarballs from now on.
 
   16 Aug 2008; Mike Frysinger <vapier@gentoo.org> grub-1.96.ebuild:
   Require lzo-1 #234182 by Kyle Elbert.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 108821cdbe13..a107ae25a6a2 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
@@ -28,15 +25,8 @@ EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b
 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
 EBUILD grub-0.97-r5.ebuild 6880 RMD160 942a63d78c6c1f58f7139b5df863c89466484828 SHA1 e684dfe0429d53776e1c6518c1a29f1340eccd5f SHA256 bc7d6d3c392f69d21115adefbb34ddbab2b56fdcfad3063518ae95aff82ab1b1
-EBUILD grub-0.97-r6.ebuild 8386 RMD160 1863e7d2c07230df854aecfcc1f5f076031dc548 SHA1 7eb9847c9ac220a7ba64aa999a4406b94b737e82 SHA256 46ffcbbec7406c93fbaa72d5ea3ca657189fba340bd9cd156a7a985947059e23
+EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6 SHA1 ebf3222a1eaac1c272de84617a64e2e3da80a315 SHA256 c7fb9191776c0bacf6b9160f1e78cb1fa6ccefbed03b85a219a1ab355bc5f36b
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.96.ebuild 959 RMD160 016f44982ca8aeec5f832dd0c60c50f815a3d164 SHA1 1a9360c25c55446e8482fa8da3c7c819b4c58a7d SHA256 6bbd3055db526b08c563a3e4339e50631a4abfe987e0deb643544fe2a596484f
-MISC ChangeLog 23175 RMD160 caf5c1f3dacca6c9929133c56ea66c17fa7da4b3 SHA1 743274e2aa6f127b9c5aa917c72985d8a9d3e235 SHA256 886fdcad26d7fa2782524e98df182b208f273667b7ea41d8a003aca420a2e687
+MISC ChangeLog 23389 RMD160 89d6d25a67f3af27af91b3defa5476b91260dc90 SHA1 bb6e77780ea66c6a9754b2eaa20c58ca2d6b596b SHA256 036197160326ae2cf769e006e61e6c3b5112f6dc74181da671331312f2e7dbc8
 MISC metadata.xml 250 RMD160 5d297cf8754c72fea2a5afa5b9e3b35c2e131f31 SHA1 37c9d016076a9869497199b1d2280437b01aa9ee SHA256 9cc0f0e1b861d82b2396fa0ea25e5ea3f41d066fbce9ef9404d651a011020be3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkim8gAACgkQ67wieSYcaxckZgCfUiT2npsNADs5j8bXKNaENIIF
-bacAn2l55ixtEj2+fyQDTPCi3CXnkWp3
-=6B8F
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r6.ebuild b/sys-boot/grub/grub-0.97-r6.ebuild
index 84521e0fbe97..cbc3bac9811a 100644
--- a/sys-boot/grub/grub-0.97-r6.ebuild
+++ b/sys-boot/grub/grub-0.97-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.8 2008/07/07 08:48:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.9 2008/11/01 12:46:54 robbat2 Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -90,7 +90,15 @@ src_compile() {
 	# Per bug 216625, the emul packages do not provide .a libs for performing
 	# suitable static linking
 	if use amd64 && use static ; then
-		die "You must use the grub-static package if you want a static Grub on amd64!"
+		if [ -z "${GRUB_STATIC_PACKAGE_BUILDING}" ]; then
+			die "You must use the grub-static package if you want a static Grub on amd64!"
+		else
+			eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
+			eerror "is specifically intended for building the tarballs for the"
+			eerror "grub-static package via USE='static -ncurses'."
+			eerror "All bets are now off."
+			ebeep 10
+		fi
 	fi
 
 	# build the net-bootable grub first, but only if "netboot" is set
@@ -146,6 +154,12 @@ src_install() {
 	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 	newdoc docs/menu.lst grub.conf.sample
 	dodoc "${FILESDIR}"/grub.conf.gentoo
+	prepalldocs
+
+	[ -n "${GRUB_STATIC_PACKAGE_BUILDING}" ] && \
+		mv \
+		"${D}"/usr/share/doc/${PF} \
+		"${D}"/usr/share/doc/grub-static-${PF/grub-}
 
 	insinto /usr/share/grub
 	doins "${DISTDIR}"/splash.xpm.gz