x86 stable wrt bug #329325

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 8 insertions, 15 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index cf4a66ab5490..a5bb5c043e17 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.137 2010/07/06 00:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.138 2010/07/22 22:13:20 phajdan.jr Exp $
+
+  22 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> grub-0.97-r10.ebuild:
+  x86 stable wrt bug #329325
 
   06 Jul 2010; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index eb7b2f53c692..20bbe638ed25 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0
 AUX grub-1.99-genkernel.patch 703 RMD160 81af10caf107087fd65ee3710806fd4eb6b94b72 SHA1 c09ea4c94ed3fd8aaaefafa319f5d0bcc29c8c04 SHA256 04b0d6a30502d365fd5b320b666a8439f29061d788c74abeca1ebfaaf1c81774
@@ -28,7 +25,7 @@ EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a
 EBUILD grub-0.96-r1.ebuild 4747 RMD160 1fbaf2c1e712baf3cd7124b6e9ba58ba63ce631a SHA1 3e877e57f4a7618c7a3ebe374fa9f5ae39aae3f4 SHA256 a000bb83287a7d46a5637b60e477d8fedbf8c2b465074edf1ba3b21bca95a374
 EBUILD grub-0.96-r2.ebuild 4349 RMD160 8b59e7b7bcf02f6e6698bf785950988c71907e26 SHA1 5f068f5fcfd05a7769814d6fae868f77dea2ccf9 SHA256 cbaae5c519231d853e28e9a2799b08544e8b2a97c93d1905a21244d385b0e20c
 EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b SHA1 2d7dd82a379afd847be5b129a090bb1e954ffd71 SHA256 2278f36b971d091471f39acd68902edf5e54fc88bc2d417e033fbf8128159e13
-EBUILD grub-0.97-r10.ebuild 8987 RMD160 c7b74b52dc6365deb3942a2b83c184be63dcde04 SHA1 0447332f0e7b865f69dd87bbc357f89ae5451f00 SHA256 0dfeeaf9cb7ee22359df9c53879f4c82c916f029f65f0c6dbe3c399557d749e7
+EBUILD grub-0.97-r10.ebuild 8989 RMD160 81b0a388e0a37892d19bfd0990e711594f1a2d1e SHA1 c76dacdd1d16d187a1780b06147cc150e19506cb SHA256 8cfe25e7ac69fc297d432bfcc9568374c4bb1c78b8cd2649afa8a83ee8b05b0d
 EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
 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
@@ -39,12 +36,5 @@ EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.98.ebuild 2950 RMD160 e9596d8662b5ef606c3ada0fcc29ac7c1166a44c SHA1 49c952318ddb37d8d50c03c240b50c894585d5e6 SHA256 758e5407a4252476d2cad7144f404475e53aafbdb88e6a073ee0be29ad06b9dd
 EBUILD grub-9999.ebuild 2984 RMD160 b419a61eb223d2376df54e165f8944f7b0b0cbb8 SHA1 5a6404f69e72d05ff9a118b8419c6890a2c6383d SHA256 d79666bf868b23c8f0ae42e831512074a0125a2a14987e62d8fca2e51de974dc
-MISC ChangeLog 28896 RMD160 53f197086a91180c1c90d87c1a75a5c4ea28c597 SHA1 052206c674dea0c480125c49e7ec0244b669c731 SHA256 f775c54ed25ea38a6dd83991b583a6e1cefaec981806944ff3047f7d25d66f23
+MISC ChangeLog 29007 RMD160 ed5d339327a108c258a737d87e6706a5d0fdd3d6 SHA1 36938cc8fcb567d62bd5672415adcabbc7eb6a56 SHA256 bf4ea83e5e4531f9f8144a4ac92960d03d4351d737639458e1093a03ac98f3b9
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwye1oACgkQTwhj9JtAlp65ZAD7Bg8aOP87XSQ36SG0Qwdq2J4c
-mzfowoPn1gZXgLCmdpsA/3ezsU0xfmPPnhdFgtCbm3MHakIbpl5n2QDfSegH2buY
-=dsb7
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index 6c0a19f4bf6b..5e88501efbb4 100644
--- a/sys-boot/grub/grub-0.97-r10.ebuild
+++ b/sys-boot/grub/grub-0.97-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.1 2010/06/25 06:19:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.2 2010/07/22 22:13:20 phajdan.jr 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
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
 IUSE="custom-cflags ncurses netboot static"
 
 DEPEND="ncurses? (