Fix autoreconf failures with automake-1.13 (bug #466938).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 18 insertions, 11 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index aa6bfeada74b..52b04b2cc8de 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.167 2013/03/19 03:36:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.168 2013/04/25 19:23:12 radhermit Exp $
+
+  25 Apr 2013; Tim Harder <radhermit@gentoo.org> libgcrypt-1.5.1.ebuild:
+  Fix autoreconf failures with automake-1.13 (bug #466938).
 
 *libgcrypt-1.5.1 (19 Mar 2013)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 1020315d2ce7..9631c627f233 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -16,17 +16,17 @@ EBUILD libgcrypt-1.5.0-r2.ebuild 1293 SHA256 c9eedf9269e2e89e630d3c23493d3d05e04
 EBUILD libgcrypt-1.5.0-r3.ebuild 1566 SHA256 16d8b1a33c00630c42d92ba3ea599081b84a3807ea112b470ef566971fb8b470 SHA512 c281667f5dd2bc981f42afc7bb11830f2a9a3ab992d3a4f28ca36938ef1acf61de2333b8750e8e8c87bffb0816744a3f10107cce1f7739116219846d48b4eaf0 WHIRLPOOL fd195ffd579344644ac621d1bbc5f54fb8deaedaaf8dd930b1815ff8d507c0ab537d1a7579f355ad635b1d3b6fb10c464428af0544b537cd31f4b852e902a5d2
 EBUILD libgcrypt-1.5.0-r4.ebuild 1719 SHA256 52c051ff384cb1cac57d0e9e9ccd7d5a92fb25e118ce91238b9383e32c0c5cd9 SHA512 5c3e89db7d10c3bd7f65c0ce4d1450760936930043cdb94b2c3ee33feacfcaa48509b6affba62645b50a4df91fc8de9ed27050be57ef7a26d6c0e6fe0aea9ef5 WHIRLPOOL f15f9127d2306d31e105621ebfd0745cf8e211acb8c36daaf40f22f42a84d04cc7643d1c82a6f1df5b942305c748bf230579a9d7ae5a5d9f9b121b1180058b7c
 EBUILD libgcrypt-1.5.0.ebuild 1152 SHA256 e6aa83ade326e53949c053da8cef23aa85b74a16a19b1b6da03a5ede6b83659f SHA512 f77c202e8500b7b10bee50ce9620bf8ac3b2ae6533869ce3686b4b44ce7adaff16312b57ce3cbf6d0d6409d137c97e1ecce9260de18d62dbf7f1289877139c89 WHIRLPOOL af21e0f6cb113c302176980e3875a22ffbe5d1c408c8c01421cc2a66f4ae89322e03498aef6e57b02ae865f073872b3b1a87874b910d55b415c695b106e77b7d
-EBUILD libgcrypt-1.5.1.ebuild 1692 SHA256 2a4717a61b0ade22e8caa1c4f3dc6b7c3b36366923d07f89f41507d2e19cca51 SHA512 a50f6ed7379cee317c2dcff03aeed9804702b54f1369ab21214ba6296d0775ebf6edf1497884305177a61852f24747bc1585ed9aee3f167c109a7a1937f3d40b WHIRLPOOL ec8254d7e3cfd25a072bebf7ffad2c08aede5a4ef58012dcd167349250b3ccab6b28be8130ab1227181e1feb8080a087c930ed1c9b01ef698c2584c7c5c26910
-MISC ChangeLog 24445 SHA256 aa45d498e08af2ad0c9817edce24d6cf4f43d9903e0b39482c71a0b9f5e57e2b SHA512 f176596bfdc2b10ad4a3f3d4086e44dfa3ce5a78eae4be720c8db9a822ad2034cddf3c057c3a9a04f325a4f37cba65783174a16408a02b4dec3cd1a4e4419f0a WHIRLPOOL 49c707b1306aa7a1c2da824a5bd707dcd5c349c38a3c5ead0ca953a04751086713767f60ff977e4392d6e4e5461434639cb409410b054ff70dbb87e8048b6879
+EBUILD libgcrypt-1.5.1.ebuild 1776 SHA256 aeb4d3dd9201380dd9fb96262a4d1582944d71072ceb07d443946d6fce757551 SHA512 a0d1e7a0bf745123803c93dfd6033590af57e7bdd4fb0a08d6e9260f7b1aec5256863b1fb95c36b56a864d2e966bf313bc5147b61e71c9998121ba9853c63345 WHIRLPOOL c3b7831c72b332e63669c590ef601b508e27570e205133526500c4d4582a0d4091252ec77efee1c619464b77d8e3b22dc2929a77f38388c27c86cc09f3ec6907
+MISC ChangeLog 24579 SHA256 7cf3fa1456d7db66d2b72f83e9a71619fe44e2baaf2b8c2c7b7c76f2e9da440e SHA512 e8127d19f8975f3f36efdea74467cddb87b98e924b7e16d1b91e96867e6424f0b9976ffe02064b75b3e5295dc92d99115e74fa8585813343763f0c0282b93fb1 WHIRLPOOL b30b8753bdcc5bdba8b0117f81c535d2c40d2177ad4babd3cd11dc8fb6710d70403d0379433299ba4ed8a76572ccd88e53b045776d51cea16188d8a4c104e301
 MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRR90mAAoJEEqz6FtPBkyjIvoH/j/FN+eRE/LCw469Q1ZogGMS
-aZDvDNCOonINIr5mRzWsqG4jgj838yyKQ0CzX/zeIoj2a542EioCsOIy96DPr/Zz
-WY0jLpCkCzOgbXfR+aaihs/NFTm82TVxR0x2AFoLNZjDcLGmqZuyrc7FsSS4y062
-9dh50EDjD4M3XPo7In4pcZjDIMh8T9UneoBR9duDoZT/cAX4PXwKRvLcJGkdCkEM
-1Ua0Zqnbo7uifjfyR5hZXZv6qx20xVfgioC3C18v6yV6plf2of/O8+vQAbAtFiYe
-Td9TVD1xQmWDg+tlhlRO1kIQR64rWWjGra4gcY9mC0HA5uHEsiF40ClGxxv9iiY=
-=WmPt
+iQEcBAEBCAAGBQJReYKhAAoJEEqz6FtPBkyjkegIAJMuU5Io7BN59Bcyc+YLpEgn
+ykrzUXF2cFb1XFxhTHi72jQg0I3l6qxv3iMrQOTsaHGlDCAgg9gVQJxGfG6EDLQI
+9rJyUC8jGvRH6YRlNKdkcbykLEYIJ8I8uCIZMvaMI6Qhn+VL86VXKG4miv1qzkPR
+ROaqXboTrHpBMTS3AlEIZYtxTioBFpFzR0DLOgqY3Wf9Nq+cwS28mtePge6ZLaKl
+P4OUjipTtPNcqpoS2FzzZ2Q4fQr9SaFPuuUhHxDKAcf/jminkkEN7E7hS98bVFSt
+Bccp3RzZA8isSf6TNIXDEi1fNFD3/IZJb4MFOHCQzLx2Md+SXQ3vuYlG+flKb60=
+=02NI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild
index 4ffaed620f47..997d0f36ac0a 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild,v 1.1 2013/03/19 03:36:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild,v 1.2 2013/04/25 19:23:12 radhermit Exp $
 
 EAPI="5"
 
@@ -26,6 +26,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.0-uscore.patch
 	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
 	epatch "${WORKDIR}"/${PN}-1.5.0-idea.patch
+
+	# bug 466938
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+
 	epatch_user
 	eautoreconf
 }