Add ewarn message with instructions for adding grub:0 to the world file.

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

3 files changed, 16 insertions, 18 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 8f51765632b8..f278b3aed953 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.214 2012/06/28 10:10:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.215 2012/06/28 14:54:59 floppym Exp $
+
+  28 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild:
+  Add ewarn message with instructions for adding grub:0 to the world file.
 
 *grub-2.00 (28 Jun 2012)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c57f933bb4dc..d9ab69f438ab 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8
 AUX 1.99-do_not_stat_so_often.patch 1731 RMD160 ed04af18876c27ca6a85d627d2082a773add19c8 SHA1 ee1936e26f2a3f564195385465752ccee7d29713 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727
@@ -50,25 +50,15 @@ EBUILD grub-0.97-r8.ebuild 8948 RMD160 16358e22e4806fce95513bc4faff3ba01ababd21
 EBUILD grub-0.97-r9.ebuild 9053 RMD160 23b5973daff5607e8e35d9746cef8c86a1de0a1b SHA1 944114e731617a4b967d0539377c59f1a8667871 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8413 RMD160 77c4579d76acd48b3a1d5f4784fb512df3002007 SHA1 ed90c12ebc31d4729230fa6daf67b5d310c2c131 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585
-EBUILD grub-2.00.ebuild 7356 RMD160 df1d205cbfa165523897b426dd27b62154c38787 SHA1 f1d0360975539cccb5aa66cf734197b862b167ce SHA256 c8be5189dada2653ac40d2adcd44c8d9bd15e5d5decf5550963ff4d9430323ba
+EBUILD grub-2.00.ebuild 7584 RMD160 695fe15b28bfbb3057c54510f66c1d9f8d715d79 SHA1 e43c25094616ee1a3b9a7646998974b5628bb3b1 SHA256 45c05c8f13a57242cfc5ef92124991b9b8881edb0f0e683cdc4f67ba9d292f4a
 EBUILD grub-2.00_beta6.ebuild 7140 RMD160 a514ef13f06d98a97469f4e7e8ede54b81dae133 SHA1 36b3cf0674c1c4170bceb50015f4e58d00f61dfd SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68
 EBUILD grub-9999.ebuild 7357 RMD160 64e33cddadf77637585f45f4a0a235af80c67225 SHA1 51be3195b177b6cb585576341e0396e2051c3671 SHA256 d53037698d836e5280ab9e6bb17ace326dab3b5ae055a0a67a1b81359e28d15e
-MISC ChangeLog 42850 RMD160 04559dc1bddb64856622f233fb61b0f8b30f75ea SHA1 e65da59b9735bac26fd3902b3b45382db1eb1bb9 SHA256 281a7daf26ba49b46f6a66ad128ce7c726a22583287caf57f6fbb01639accb36
+MISC ChangeLog 42991 RMD160 d2153be5750daca452b5578cc420e322e0c75848 SHA1 be03797bd1778476425ad2c62678ed584e044aec SHA256 7bf350f517f7e676762d144562fb23e675d310262c34dffc07bf8adc06f21a2d
 MISC metadata.xml 607 RMD160 4d6c4e92248479483d0ca45a34567921ad970b86 SHA1 fd20ee64f83670b9bd29b2cbe9a93508af9fe0bd SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP7C3pAAoJEOSiRoyO7jvo7UMP/0WzbNBJExTISXOvOTLX96yh
-B2M4mUNi19D58TXGb7ahoZg7hX1UVQsvThr0RB4QmxhSDCXc/nVQD3wPPGg0ZFku
-YvOfkSDlzk0dEdxXBB34OjuufwQVXiDG+4TdICTQ6rW5PWmi2U86MbdvD3PfY9gp
-/Yr/fCrN0wvlULLluDSNCvsPlClk5pKvD7y82E/0u0xui+dDDpUSiYRwsK/aubvK
-jMOmOJI88p7LM4gFwuweHECTWogyIaRnNnVXfUhKlw+6OiUoeosNXrVJAqSQmILs
-5ywAmogfXtAMniXS3L6o6jz9V1j4KhgBip8PUEMobZcsbRkSLCYCAwrjNJrxVXEt
-JBLp72G2KbDDzUoN2K3agWcmrdLUr9XFBkG4OIWfW6R5NETJiuPg3FVCK9e4RkH3
-sJxsO3qkLJLj8X/7nChSCc5PlPU4lsqEt9QdcdCFtKAKgmop038C79wwogGC5TRa
-9eUlSXNs3ZGQmnL2GXTNbKacwPWhtjlrkhoHgMt2X8r7MB7jHjcrKP2ek7H6a/TN
-8oVhJXU+AWXdJBvDxsdsg+4mdsmMv25laHTGU31tEXD90SkI9x9mxh1/8SEe2Mrz
-dbvC5vyTLYTKsEbGu/9x4vnqQYr1+U8PN4JuHFlTRmPc371t6kx/Y6lwWzs4lrUT
-mJKazZXjgyu6uRpyHneM
-=RSWx
+iF4EAREIAAYFAk/scE4ACgkQC77qH+pIQ6T1+AD+LDmSR2IfzwhGEx08HcVrLOlN
+9XZezfERDq6mGNzCWXAA/jTSX4hdjrwLSsobDns6NqcvDwfFxSKMXPpRbAuZwaHh
+=g+1O
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index e5bb6454d083..c99aff071a78 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.1 2012/06/28 10:10:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.2 2012/06/28 14:54:59 floppym Exp $
 
 EAPI=4
 
@@ -301,4 +301,9 @@ pkg_postinst() {
 	if ! has_version dev-libs/libisoburn; then
 		elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
 	fi
+	if has_version sys-boot/grub:0; then
+		ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
+		ewarn "the following to add sys-boot/grub:0 to your world file."
+		ewarn "emerge --noreplace sys-boot/grub:0"
+	fi
 }