Fix building with newer automakes.

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

3 files changed, 25 insertions, 12 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 779a557eebe1..d6487c059b58 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.173 2011/11/18 00:04:29 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.174 2012/01/06 04:57:12 vapier Exp $
+
+  06 Jan 2012; Mike Frysinger <vapier@gentoo.org> grub-0.97-r10.ebuild:
+  Fix building with newer automakes.
 
   18 Nov 2011; Mike Frysinger <vapier@gentoo.org> grub-1.99-r2.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 15cd4e7932ea..d25c9119492a 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -18,7 +18,7 @@ DIST grub-0.96-r1-gentoo-0.1.tar.bz2 47051 RMD160 6dea68ba610fd68c99cf2080648df9
 DIST grub-0.96-r2-gentoo-0.1.tar.bz2 47639 RMD160 fceb2193a32e8657390045cfc390829aa056fd5d SHA1 9fcb15861e9c9ec4d46fa80a6c91402c7f3e05dc SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c
 DIST grub-0.96.tar.gz 985761 RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa SHA1 2520b03c8990ffe900cfc4fabd800d1056014f48 SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba
 DIST grub-0.97-patches-1.0.tar.bz2 46259 RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 SHA1 36184739f02b582bbe76857d83aae7ea81a06e7e SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f
-DIST grub-0.97-patches-1.11.tar.bz2 55261 RMD160 cc0fd57305abc550e932470032d34839b0332d78 SHA1 3af9f703349dfe9f0cffa7f88689ec5195f3e834 SHA256 f74d7deffbbb5440d6a1c8cbced22ccbef3146c1084b005b7ac9fb9ef30f4782
+DIST grub-0.97-patches-1.12.tar.bz2 55811 RMD160 035ab02c920c82bae57e094bc3649d4681f2a93e SHA1 c5a11a17748c33ee2bcb612de8fa6c30014e5143 SHA256 80cedf74d29e334182d8fb906035d2c365b96b6e8a09bbe800f44f98c828ac97
 DIST grub-0.97-patches-1.2.tar.bz2 20872 RMD160 7d91e01873f52daad271eda85e67f031e72570c9 SHA1 d9a11b6142931baeb8d13adb06fc86706ea17e3d SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049
 DIST grub-0.97-patches-1.4.tar.bz2 24693 RMD160 6afefff73b5f3ab5c6d05563c4f67f37dbfce16c SHA1 7c26a941467b58380747c9d1e07c14dfc3998b10 SHA256 290dd96fdeb9471c516f061f4949ccda33f8d03ab81a6e2beb5005b3022e71da
 DIST grub-0.97-patches-1.7.tar.bz2 31190 RMD160 f72f956c36d07e914bb7b4512ff9c88349123ab0 SHA1 6c5e011a8a55fc986abc84c43d59266a42f2ac9c SHA256 6dfb17ff874ce8f737211a728c319a133b90e3633a80daf5ef370c15ee625389
@@ -32,7 +32,7 @@ EBUILD grub-0.94-r1.ebuild 3500 RMD160 0847c2f47e5144bf33e7d5e21157dd3bcffe6385
 EBUILD grub-0.96-r1.ebuild 4714 RMD160 2577214aaa908eccec06968bf7d4364a1e3d85a6 SHA1 e62cde850ff44026b54e7e87b4d48a8941cc9e8e SHA256 0844dde0888894523e460175f4db0b0460eb09bb8e8d838889d279c429ba916c
 EBUILD grub-0.96-r2.ebuild 4316 RMD160 7a1cfa74e0bb5849ce8392d63d90f727084252ec SHA1 c1db97404fb162bbf2039e729ac4f8c3877bf174 SHA256 e39d3a05b3202751b1b2cb8bc81e001f2cb7658ff93be664bdcaefb8636a3e9c
 EBUILD grub-0.96-r3.ebuild 4547 RMD160 54d8783620b547e2e99832782cb5ec390b95246f SHA1 7442044cd471933c43d6a294293107b0f6835590 SHA256 8337ccc0d4d86904901a4d05b168b328769d83c66ab307fa612a31b9722fc36e
-EBUILD grub-0.97-r10.ebuild 9458 RMD160 e541e56b786821d5884556dfe325150bfdf63c5f SHA1 d6c8a4967bcccecc96e609157d453d375596fb1f SHA256 521303ec1dc2650ac4a04c90d78a6476eb6346fc8ddd131cc22aa4bd490565b4
+EBUILD grub-0.97-r10.ebuild 9455 RMD160 e384d2d5449d12085eccaea6c3ab9fc2693b00cf SHA1 7cb1acde638a2224ace5dbc72ef8b7fa649f8e2c SHA256 f878cb15a657297c6d40828f58d20d95513fdbadd371a5ac306b74b887e7f2b4
 EBUILD grub-0.97-r2.ebuild 4821 RMD160 91c7ed297f8aa283b25cbacf3cb04b5212120362 SHA1 c620bfaa7d4fd81a394a6045613de6b775d01b43 SHA256 1cb1cdfc0d3425925dd5ca79e8e9709ece26d71a819f6e19a5bcf2167fa2f61a
 EBUILD grub-0.97-r3.ebuild 4690 RMD160 ab2b91ad9550276e79587c6f8de4a6f55c2ef275 SHA1 62d3f237d80bfcfdcbdccc8be1e9d42bbf4ecccc SHA256 66cb357d9d49119e28fc04c9d64edc034ecc4e82675923e88da965a2ac6ad28f
 EBUILD grub-0.97-r4.ebuild 4935 RMD160 e116e0cdff0c7e358f478ba8ab78a9f425704674 SHA1 d70cb04b4b77416d0974c0a0ac728695773f6552 SHA256 f0f4a206b8475263d6c313b903046cd139c5d8ca9d09811ef3d3f972474fda99
@@ -43,12 +43,22 @@ EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
 EBUILD grub-1.99-r2.ebuild 8295 RMD160 40fe549f40388e979d7028b7cdb59a84f6858fd4 SHA1 7f2d2b04f480249432426ed17d7afc8606964d29 SHA256 b26f203af5c7ed37b3a4bb74007f66b520883870d26bdb3859fc721d07e346de
 EBUILD grub-9999.ebuild 8080 RMD160 32d81ab52b8cc94a310e26313ed5b7a01062a27c SHA1 6a24c73c0321cbd39725f572993b943196c60bb2 SHA256 b77cdc20e20a1cc58deab002c795f94325150e3c1ddee2012cb14be59e0765bc
-MISC ChangeLog 35376 RMD160 8f5042cfda4505e49f8e0576ea27ec8e2ee01f83 SHA1 bfc76445427063bbb168d8558c1f3b324955bd66 SHA256 a68218882edd3399fcd11082ade29f3d047bc435a3b394cc8e8317aeaae3e472
+MISC ChangeLog 35486 RMD160 92c6823bf5b38b2f84a595f17a0584a08a41db18 SHA1 f8f207e97bab1aeedc43c2a475e884fd4c286952 SHA256 a52517058d7c5ec1efbc7170af6c62c7c772796ecefc9567d143724df8931607
 MISC metadata.xml 339 RMD160 755d01714b2122044f91caa8edd71b0ee4436d8e SHA1 4383abb52e4eb0cbe5215f9b0d86f3977eeee674 SHA256 62efb79ff5e2adec3535622af752bbb291b5b6c130094447364c567a5ff2e1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7FoRYACgkQaC/OocHi7JZPGAD+MleFOEWa3A4QEW/IwfpU5/M/
-RB8W92ijU0BpNOLA5CoA/1HYc18O6TXlCNPCXLTljRTCSSqppu+kS7Z7SHvErXjo
-=sYPG
+iQIcBAEBAgAGBQJPBn9RAAoJELEHsLL7fEFWKD8P/14mNXtB0OwfvjDHEar/Zk1Y
++YS2NaPd3AHBzpH5soeAoDHbEPH7GJNA3JpqBADtqpqAcGdaMKI8PfH1y1Ri021P
+TE7aEx71oFOWqaLSbpGFWhFHME3XJIhXa9AnG0MKCY8B2m+4QeoDPDqCGFIUTRmn
+S1DhEFGCvpUyW/KAtsRQAokpWqAdGoN3mtChMtTAW7kSTNYE3ojEjWozi6vuxYG0
+9LNtw1WlCXJLP6ksuOVMEUmuoMg6XNTMZpkgfhtj8GivIwR+7R4mg8ewDwtIcnYU
+yHkBvKr2d00ulGQzI1lil81GDGsJmFOiIqYky28lNSpgrQyK/JyNYtDwi1oFb7ws
+3DIglfJRiQ6sBQiMwzhp2Kg+59oWx0EC6p8+427vBSlAJnIrDDv3s860P3Cd01vg
+3qpaqPDBRZJyJ7DCrrKLa9tdJaYRHi0lbXnPeCp0x7ZbnBzME53q5ECKRzpBQ3ZD
+aJZi4qnwLtb9eGkzfOVAegzp3nVgRl9O6f5ZXN+327niHNmnE/RsKoe+7H1csVde
+irLXWMmLFxXkPVfWGfDzhjJ2lLa3zTdQqguyiJQcoh9ns/NDagQX0sTrgg2hRmGh
+r34exKw9L631q9PMVyvAZE7eag2QQ1dX/3I3kpvWQn5GNsNDh2S1UZrK7DuAmbfQ
+bW4OWtW2paQKgK6Vvmjk
+=XH2v
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index e97bc23edde6..015915b52e14 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-2011 Gentoo Foundation
+# 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-0.97-r10.ebuild,v 1.11 2011/09/10 02:33:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.12 2012/01/06 04:57:12 vapier 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
@@ -16,7 +16,7 @@
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info pax-utils
 
-PATCHVER="1.11" # Should match the revision ideally
+PATCHVER="1.12" # Should match the revision ideally
 DESCRIPTION="GNU GRUB Legacy boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 SRC_URI="mirror://gentoo/${P}.tar.gz