Fixed build failure against automake-1.13 (use of outdated AM_CONFIG_HEADER), bug #467988 by Lars Wendler (Polynomial-C).

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 30 insertions, 19 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index 86d488183e4b..c53d3d706a66 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/aalib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.46 2012/05/09 13:18:37 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.47 2013/04/30 16:59:33 slyfox Exp $
+
+  30 Apr 2013; Sergei Trofimovich <slyfox@gentoo.org> aalib-1.4_rc5-r4.ebuild,
+  aalib-1.4_rc5.ebuild:
+  Fixed build failure against automake-1.13 (use of outdated AM_CONFIG_HEADER),
+  bug #467988 by Lars Wendler (Polynomial-C).
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> aalib-1.4_rc5-r4.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index ecf087d47ce7..8b12c48fbaec 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX aalib-1.4_rc4-gentoo.patch 1245 RMD160 ca2df1fc54bf70ff57bec5260dad401e2a0dac12 SHA1 c2a2fd25e70e65706a86017c4c1da247957d6981 SHA256 fa5d946e9d0e4a78c37187f6795b27bcb057e9e2ec00fe3a873a11e25fba23a7
-AUX aalib-1.4_rc4-m4.patch 241 RMD160 8da68015ba2e16647f281aebd59bcc0329fe9954 SHA1 8262748e21eb7f7aeb517cbebf1dfec1017b84a8 SHA256 24d09cb9eb9ed8d0990c677b5fbfe43762fe872d198c146c7de6fdb39eab692f
-AUX aalib-1.4_rc5-fix-aarender.patch 1350 RMD160 9dbdaf08406e1c12c9b7ea4e19f5f151a1c35e6d SHA1 9d90df40c4be853ee14bc656e8e3f960648a2e6d SHA256 ce8900622dd0fca6ccd35ea7027e159ae1174bb2876ca0ca87b7a66d51a451a6
-AUX aalib-1.4_rc5-fix-protos.patch 2105 RMD160 82296048048ff818a0d67b7d7edffca3d418dec4 SHA1 4690b4e33c2e8fa0c0d520c13948a8ff83c719f6 SHA256 1ada77080d8dbd5636d2d9a29a3fcf9033fe9ff9860cede5ab8338d5bcbea161
-DIST aalib-1.4rc5.tar.gz 391028 RMD160 a10bcab16d3aa0e60facca3e989f6a51846885f6 SHA1 a23269e950a249d2ef93625837cace45ddbce03b SHA256 fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee
-EBUILD aalib-1.4_rc5-r4.ebuild 1472 RMD160 3fb4d4877bd8c4dd5f18784391e5ca5b2a7b9df3 SHA1 fb7d05ea1eb086b6b75f2ec1c7943bef5908e7c3 SHA256 aab0eff05ce852c09980c25e2dce6a219f5ef571276fa568e71fc4b4dc90243e
-EBUILD aalib-1.4_rc5.ebuild 1323 RMD160 41b8ca511b7210109a465a33b1cf7687d306d018 SHA1 e276edcbc05c9cf5d805ef559ee5df8783543740 SHA256 123b277cb3a1dee42bd409b22b9003ba99e257f16e997f89bb4b603ee59a7baa
-MISC ChangeLog 6440 RMD160 12ad850310e4d732eb83e878d1b156f2fde6929a SHA1 338b1f837f0aca8dd4f57aee8d7b034922f0990f SHA256 7612b728ef7e1f574fd24570ed1042dd04c20307f3994933be57aa1ceb1ea5b7
-MISC metadata.xml 326 RMD160 60bcb8ed3e9b7341db79664c4b78409cb2816290 SHA1 b4059a02ebc5da99e9dd834b62c64dff16f6d5ca SHA256 95f97cf9a89a4d76a706ed7b4d58e279d2b0e54b2eb45cdc4b7d443d222e1314
+AUX aalib-1.4_rc4-gentoo.patch 1245 SHA256 fa5d946e9d0e4a78c37187f6795b27bcb057e9e2ec00fe3a873a11e25fba23a7 SHA512 058f594a573ac61dcd484b85bebdde8f80bb567ec72c0692312e3d129b5656b902ddcbe3253623812aabb82e3a4503b9cb22510faefe86595549c4dc090460a4 WHIRLPOOL 5846e3481f5c95819a21b69a5a09804c834095f558e2458c8c4ed4ede568f5510687a5f06ce1e2850f7453222cadd721339e1f01ae88b8fc02545b56389a89db
+AUX aalib-1.4_rc4-m4.patch 241 SHA256 24d09cb9eb9ed8d0990c677b5fbfe43762fe872d198c146c7de6fdb39eab692f SHA512 bea8e769596ec8d529d67a2b6081d2a7c1e47d9089551a31356f8b15a4dbfd36fdc97839754ef188621d8870628707b274f2183cebffc219ea0f3784fa12d8f1 WHIRLPOOL 9d5cf224edf45ffef0b42f8087d43833a86ee13e9b7871f422024d84bc36f905ef5dce5f39799104bf24046164a6c9c2e84b01165c57bf90c6a396dffb90f560
+AUX aalib-1.4_rc5-fix-aarender.patch 1350 SHA256 ce8900622dd0fca6ccd35ea7027e159ae1174bb2876ca0ca87b7a66d51a451a6 SHA512 83f6a1fffcdfa342d23df9a47d3803cd4416fba33a126602cc341405b953600f5e7b14ce21bd9f7699113f975815ddfcb6a9a95cc392ae62828557f59064a9da WHIRLPOOL 45ea620daa1074294a37effc557d6b642f015f795d3142de951cf85574bc971e384ba5afe0c7d5f4039719a4cd52c55443844a2efa98bfa63d5bd5c3245d3413
+AUX aalib-1.4_rc5-fix-protos.patch 2105 SHA256 1ada77080d8dbd5636d2d9a29a3fcf9033fe9ff9860cede5ab8338d5bcbea161 SHA512 e46268f5fb972500851f5489cc6311171a07a8b1a7a564bdafe5760008db72787650ad74e5144cbdb30b7fef027ee646e5534dd2eabddbd057bef1b27229af37 WHIRLPOOL 063fcd38329c7c2a841d004059c01314d17148c64408631f6a9a58f2d8594984aebd76874bce1666b0e4d02e3d204cbba84e2593f12e6a62611b50e63bf78cc2
+DIST aalib-1.4rc5.tar.gz 391028 SHA256 fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299 WHIRLPOOL ec98116736b64eb6e855777a5ec13894446b76beb4f874a490144919031d6ddd341b49cc429b2c918acde5cebc22a3e2dc97b949379200f441d2c544a02f2736
+EBUILD aalib-1.4_rc5-r4.ebuild 1591 SHA256 5c810854bf8485b612242de4735dcfbc39dda484f72d28241a0326ae06fc33b7 SHA512 34be0007bd23deaac2bacd01e4eb28b3434008fff575c6619295b48c7ff1cf825e45583401c84b30bbbddaf56255780c2bba62c569286c71a7c2b35e70956a3a WHIRLPOOL 1257b9a5b65c5a0ffaaa3526c80a5671ae450bf4bfd9e07f7b7061e45000bd85ed85fedfe200a1ab4b2e07b215832d9b5c00262086bf03a84b22808379f81285
+EBUILD aalib-1.4_rc5.ebuild 1446 SHA256 205e8cc2cb66972a3754c4e12f5e6c2f5e8cb5ebb8d0de5c87470cfb9ecf2cb7 SHA512 c385e7c33bd81ab817a6dffaf1bde2c796f31448920eb40954bf4bf27f142c2b624ff0c58f008ed742a5108abaaf884af7b6cb1dad8766d8b15cf99f11febb35 WHIRLPOOL 000c64b60312a2f943a7bdf4dbf7611ddedec55c9e3a775556dfd423c5d87968894967f818822da84e2d8504498e75a63c487ed8a7071a279d343881c50e4060
+MISC ChangeLog 6668 SHA256 9405f39e832590eec4817a3d6e3e8ed401f2745b94d10d731660aef0e1cb929f SHA512 42af8a83e943f4eb12e43219a398882c97d70f99fe9938ca76540405175aef1b7c76c4d7d062c3984e2a6c6656c18a17dfac001cd7769ed8489e8fe12e3e0f54 WHIRLPOOL b85d0da665ff0d64d4d77a1b9c2dbef65f7041dc9b5e087511d1716b8727120e66a5decc4df9e9f6f5cec6db9e98c899eaf8b455da6b6b82d87575b9d383cdd1
+MISC metadata.xml 326 SHA256 95f97cf9a89a4d76a706ed7b4d58e279d2b0e54b2eb45cdc4b7d443d222e1314 SHA512 63a5dc71a943a7ba8828f39cfb7235735530dc4f7bc4de1f0f8b49e757aa6ea45643d2d2939eeaa185d4dc1ddc9a51c98073818e692e2ba73fa7434a72dfaf09 WHIRLPOOL 808eda3cb5de104e9ddcf78287449bb6f593f0a11992e18ca5372c80cd34880a410a16669a8b46e8db32100e0a7d2063ea15262640bc39aa0624992ab4c4d42b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qbrMACgkQvFcC4BYPU0qS2wCfYdR9RvZIHmQOsMs7hsKfN25M
-AjYAn1gZeHRQ9+GpupPDdeT3HTmkvd/y
-=fv0c
+iEYEAREIAAYFAlF/+EUACgkQcaHudmEf86qmLwCeJ/ucnroqQL3q4usVjaiUNcW2
+fqEAn20knfR/EGtcUbjhg0+8/xLiLRb7
+=9tE+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/aalib/aalib-1.4_rc5-r4.ebuild b/media-libs/aalib/aalib-1.4_rc5-r4.ebuild
index 3b6b3c6cbb30..642dba2f66a6 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r4.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5-r4.ebuild,v 1.2 2012/05/09 13:18:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5-r4.ebuild,v 1.3 2013/04/30 16:59:33 slyfox Exp $
 
 EAPI=4
 
@@ -37,6 +37,9 @@ src_prepare() {
 	use gpm || sed -i \
 		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
 
+	#467988 automake-1.13
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
 }
 
diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index 516dd292a348..502d19a33e03 100644
--- a/media-libs/aalib/aalib-1.4_rc5.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.26 2011/02/06 12:08:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.27 2013/04/30 16:59:33 slyfox Exp $
 
 inherit eutils libtool toolchain-funcs autotools
 
@@ -35,6 +35,9 @@ src_unpack() {
 	use gpm && sed -i \
 		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
 
+	#467988 automake-1.13
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
 }