Fix building with automake-1.13 by ablepharus (bug #469106).

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 23 insertions, 13 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index e754eb5582b0..e607eeb7b66c 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.151 2013/03/05 13:34:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.152 2013/05/08 20:29:39 jer Exp $
+
+  08 May 2013; Jeroen Roovers <jer@gentoo.org> wvstreams-4.6.1-r2.ebuild,
+  wvstreams-4.6.1-r3.ebuild:
+  Fix building with automake-1.13 by ablepharus (bug #469106).
 
 *wvstreams-4.6.1-r3 (05 Mar 2013)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 2b16f78d3f4c..ba133ffa7fd4 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -6,18 +6,14 @@ AUX wvstreams-4.6.1-glibc212.patch 489 SHA256 1090e2b4bcf94e21f18ebc81a1bf6c6ae8
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 395 SHA256 5d95bf846dd6b306bf2b8f26efed1addb88753e5f72a0ec6466dbfaca847ecb6 SHA512 37962c21a09831bdc5904637238ee5dff18d5a9725e9a64c651cbc71f6b1e4a44f25c0c5afa1c44bcdd6bf7624aeb380bd1c0a308ce09c7860bd79ef70efb42a WHIRLPOOL 213a377314c96b22081b28c8cbe236fd6a91f5496d9e8a222616fe055f81fd9175ce1825878c7bda97cfb3d7aa617934680d2b1ebfe96593d490589908a00221
 AUX wvstreams-4.6.1-parallel-make.patch 1874 SHA256 f8e89d6cd227ee6aea225b89cf0848ae41f009718d1927b95dde8b87cd713f94 SHA512 63e1195a253300e486d227f022bfcb5a769dcd8ca9b0ee7a90ee21c77b87ed375f62b45ad6e3b54399d95fae6999ef0779418c432fa11a99c25f60eecdee9acb WHIRLPOOL ef2fa15161b983eea6e082ebfe78f6ba3f2af7ae94e32ccafbe82a71e16faae22f38f072e7a665a86dc5996c0ffdaf325b4281e5071772f401d9147676a5146d
 DIST wvstreams-4.6.1.tar.gz 1118456 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a WHIRLPOOL 4d5a8e39332d00c1614d81e3d980d2458aebdf745b6630c8875adfff89b2c0baf08d39e5f7cc47bb4dbe37bc573c7e019e31163837df6d6d13741eeccc1c8e7a
-EBUILD wvstreams-4.6.1-r2.ebuild 2356 SHA256 00dbef1e780e53e774fdedda4d29ec629a41233fefd4150c83f12747053ee4ca SHA512 15b9905af5de4fba4bc3e4a86a6aeadf4b3e0ce38e4fc5cc8aa355f69109055b969728ff7ffa1a31357869e8e5fb888c9a94c5a34869628c6c435ab4a73c8cb4 WHIRLPOOL 3c51c14f0af5be0bd03b3b37182be982fd9a6b89f6ef223e822ec35b49b6a8d1e257018cb62d3b6401589226ce93403136afa9ba9c8d91a820e4969a0988ce93
-EBUILD wvstreams-4.6.1-r3.ebuild 2356 SHA256 46066f7ae43409a21f681cfa77b57a9dfdfd723e656b222753423944ff27e649 SHA512 8d04fa0b40772e92a56011b7a9def7dc5b42350d0caf42866a2ee6510c16a7bfa9096675d0d2b3417ea2f2154c2344533188b4282793370e2fba1e2ab7e03b70 WHIRLPOOL 84cad7ded78552d170cc7d8a04b7e6e7ac29e4c463105c7614b722a9e7100da89167c3b33540aaedf8d6dc9a22bc4437831a20ead03e63c33093afbd5bcd3e19
-MISC ChangeLog 26905 SHA256 3cf58974c9c72c751d8a7229f59cb320d9e5f64cb12535a5c4cb9f96cbcaa6fc SHA512 f589f4278dc0578b3dddc5951f31c9e85015cd78dbb3ac3370b3b5fbaa6b3d53ac4b757054761d0cfe444e651a75b4131de0d16afd9005f08b00ae6898964cbf WHIRLPOOL b41c4d4a9545228e5fab797fae06a66dbffbcd74ea7d12ede95849b9f3a8b92247712a7527e3bc0a2988dd7f2bef23633c29d6792171672e6e552bb31815626d
+EBUILD wvstreams-4.6.1-r2.ebuild 2488 SHA256 dab1734fe711f5a2eba48b0a2ccc9e8c7ef4589287d0dd138c46ff42b758c84c SHA512 dc0475f522683c297e61e0263cecc7d1f5ea4dfc2c8e8f992aad50ab877f6d9c587476a126cea52e81b34b3a8bdd3247b2adf18f645b85f30caa323f76090924 WHIRLPOOL 376e8006fb72192e19671c4018d77343332d5d462593ee8b45a46892fe249c6d7022cf5281a5a02676cd572ee6e4efc49baf277b9fd7991dd091eea4496d0188
+EBUILD wvstreams-4.6.1-r3.ebuild 2487 SHA256 8c4d3b9ae1544329a392c65637d7985339d69acb2138db2f5c5da588ab938bc5 SHA512 feafbca78ded4120ec1b8582e335cc60a6f6cea9c9340b2348f467e8fe731b06d35303d71034fcad139b25ce576f276f555b88e27fbae0dd8720d13261c71928 WHIRLPOOL 47a404ac0581e1a7b4b2ef44b9bbfc932b9289455f70bc19944ab1f21463f942fea1ad6dea900a2e68f87e08c080072edfdee55bee501873c148a2156e32ee66
+MISC ChangeLog 27066 SHA256 a49646511de682f3d2dd8f83b9461daa437c5c77af330825003718c3ab6b41c4 SHA512 bc8fe1db2acc2bd8452a61ef954fe00422b30123f206f0b70d976b88efc8c5a113241ed5fb55b61743b7c7400f18a106ab5e50b3353033009e1220b52cf35048 WHIRLPOOL 9191a81a468bceef21231c991920bf1f371d51d73060f7d14c5c7793636f7557017205d65b81ab6884fb808c12255c28ec9c80af6c379f7bc6c2341e3b6a203d
 MISC metadata.xml 522 SHA256 459b304d5f5e36f63564f44f9b50a3cf928a4bb9dd36e44fa81567e87096ab05 SHA512 3c5e0e13849db5d2232ce3ab45d7537ebb53e731468645552cb3e65716a5bfd104973dec836f556d9de88d7cc9e6a2a50e414552ba4922f90c1f4bb96dc733a9 WHIRLPOOL c10c11fd6898869adf70fd69aa8a88eabd988a2f21e4bc5dd2034eac2138d6c05f92e96f17cd0c422b14b90aa8fdc0668add9fbd8e9bf60cf3bdd4d42b265f90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRNfRvAAoJEBzRPIrUMBNCkPUH/2mpi3nw6800MVqxRTMoAUt4
-kO2GjvbgIKPWJPkBs13/G03cAm9YD1wU5rz2TwZqU896/vovffQUeAlFLKnZZMhU
-wpjPq1Uk/KRkZ0eVzMAfEwS+JNufZ0L+783Mmcq/J2dlRCTZxHEQ2r2pI+89uzX7
-qBVb0UOEOnS3uTaU5N/kfgwxxzvOSzCB6luV+4F2fQw6QR7frLMuWbANoDLPLf9K
-dCKl2a1Q9leeCL8vnhRToFP3ZShB/vM3CFAZhCwaav0aS5dpP+JeaJkwYyVN+W6f
-8t/jG+6OMticeAAZK8IiVjG4SRzGR5e8jGwsai95tw7QISTSE2/ntrkK8uSHagk=
-=+ivf
+iEYEAREIAAYFAlGKtbUACgkQVWmRsqeSphM5CQCeKM2aN6ttitRFfTICAgEmmW2z
+K+gAn34thoyRG6Wf6+Fdic0bqafU2wCJ
+=XEH8
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
index 9ce49626e2d2..4e60b9d15f82 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r2.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/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.9 2013/03/05 13:34:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.10 2013/05/08 20:29:39 jer Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic toolchain-funcs versionator
@@ -52,6 +52,11 @@ src_prepare() {
 		"${FILESDIR}"/${P}-glibc212.patch \
 		"${FILESDIR}"/${P}-gcc47.patch
 
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.ac argp/configure.ac || die
+
 	eautoreconf
 	pushd argp >/dev/null
 	eautoreconf
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
index 9d83ab2a4bc4..0f4fb543f637 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r3.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/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild,v 1.1 2013/03/05 13:34:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild,v 1.2 2013/05/08 20:29:39 jer Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic toolchain-funcs versionator
@@ -50,6 +50,11 @@ src_prepare() {
 		"${FILESDIR}"/${P}-glibc212.patch \
 		"${FILESDIR}"/${P}-gcc47.patch
 
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.ac argp/configure.ac || die
+
 	eautoreconf
 	pushd argp >/dev/null
 	eautoreconf