Fix building with automake-1.13 (bug #467042 by Juergen Rose).

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

7 files changed, 28 insertions, 30 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 3f44e0b3d85e..095de1309425 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.473 2013/04/24 06:23:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.474 2013/04/24 14:50:58 jer Exp $
+
+  24 Apr 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.14.ebuild,
+  wireshark-1.6.14-r1.ebuild, wireshark-1.8.6.ebuild,
+  wireshark-1.8.6-r1.ebuild, wireshark-1.9.2.ebuild:
+  Fix building with automake-1.13 (bug #467042 by Juergen Rose).
 
   24 Apr 2013; Justin Lecher <jlec@gentoo.org> wireshark-1.8.6-r1.ebuild:
   Clean deprecated macros, #467042
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 50fbb868c483..c6b9bd632a67 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
@@ -7,17 +7,17 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.6.14.tar.bz2 22121915 SHA256 fef159fd04cc1db9ce59209a48a84a808ad43f9d8a2767d47ab151482f75a83b SHA512 855b5ecac33d4b36102420ceffc2ec36fe10679f9233ef4c31fa6492c9b85a38557d987fc037510de6574a7911e9529b836f77b4a6cd673b60c3ff4e32cb1542 WHIRLPOOL 8f4c4a5813503db40efd88bbce931e26f1513496468a86e16438cd84b447e99f67d11591a5873fb7697500a12d9eb62df295d73396c78d25d114f3f3c33020c8
 DIST wireshark-1.8.6.tar.bz2 24250787 SHA256 2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea SHA512 d130c615d950875c3e119edda8a5c6842fe48d57c77bf8cb8751354455fc1bac3c6c6d65b0f76be6a83e4350eed85337ffcad6d006c95fc713db9afe172e9b16 WHIRLPOOL e5de3cea6f011d3f2d27ba468035080aa2cb836a363e027064fa788e969a3b05de8f7b6095bab1a6f5169f5de2ff91620abf271a8e047b4907821bbfc4b04128
 DIST wireshark-1.9.2.tar.bz2 26758261 SHA256 753c1687dbbdc4039bd03f138b81189d1528b25a0871b0d769555c6640fcbdeb SHA512 e4796e27ba566b1408f4fd577b32a4cfd8265665dd160bf9e01776dc9dbbd5483b699971fcc50b54935c19d0f6b08019f7fa46ad7e1ea1712703df95ba6a8957 WHIRLPOOL d88b50cdd0a47cabd601ed772463fa2fec17675692910dbbf9d5311ae7da28aab22087ce372ff1432daaa5f833241ca3c22e97cd1254e253e07049f86053ef16
-EBUILD wireshark-1.6.14-r1.ebuild 5326 SHA256 51ea3b738ad893bbe7c0a0e87b9b7daeea8eac991abefe5a90b0d6966b65be68 SHA512 b4c2df2f2f6d2344785f78b85712adb532ba10df4d02a31deb4504b981b604731fa8fa80bbefe41d0029177f4815bfd127f94ef0f876709153c07ba98cddedf8 WHIRLPOOL 47a2de3f01abaa06d9ad6ca2ac70eb019e11f0fe3e8315dd461a4eb60770e3d16bca8da1b2f42e7df6fbee16fff5ba883f7ab4b77585b833545d6d283272fc37
-EBUILD wireshark-1.6.14.ebuild 5179 SHA256 6a5a83bbf0630f4f04f18499e830dadc44c317c78e85088b230668d965b73143 SHA512 1fa68943183eb9c5d2a45b4122da965ff928f37e4087929a8c17653e1032f484c486abd2d3ca848f3b75300d1601ea2850bc560f8b56eeffaf8c8af4e066eb2d WHIRLPOOL 7d09c7b435ecae34e46427eb16c889f2277a821decaa515fa5edd26233a6a272d5f4c7a639d55151be545298eda1e607e5515d9e9b08a10315fe34aec39746b8
-EBUILD wireshark-1.8.6-r1.ebuild 5727 SHA256 aaad91bc9488a695c31cce4e724cc7163bac5e410fed4408221a00b09fae2e7f SHA512 c632895a314edb43e3de9c7d0fd8e5ef69851aeee9079dc9d602a18c9d0c5f2998fb18a312bbc8530b8e79d05fdb9a28c981aeb79137359a63cb6062a5646359 WHIRLPOOL fa4640deb5afeeb6d8eb720df61c1160772b86c690edbae261f1bae9dbcf68af310095f8d298f77c25f8499f70e3fcfbb6092765ac0eb4d06fac0a2abef66212
-EBUILD wireshark-1.8.6.ebuild 5498 SHA256 ae5d0856b8824c2f4d248e2ecd39bfed5ef9059797779522772fcdfa051cedf9 SHA512 f652e301bf0bfac4439fed26d5bd437a37df37b96cf6dc918818fa3e4b7a82c19fbad10fdd5d70a7f99d3f5f2bff421b685cc7a212a829efb0cd1b513c840f23 WHIRLPOOL 834722ae3bbbc4c29c1993dbffab402f3275e2ae4d694bdd05dddc4ed8f5976196803ee1867ad14b476986c572e6f708f08340106d0004ebe44f1713e1c3cf47
-EBUILD wireshark-1.9.2.ebuild 5718 SHA256 00c2e482ca004b1aba51afab31a5446ca8bcf4691486cf52d428f389586b0ada SHA512 b41ed8a5d7b6bc67aa402929c38196ef7f6e005bd40daac24f5a599f85080727229b42cb972903c69f932d3f1867ac7cdb927aa793214674de60961472dfdd10 WHIRLPOOL eccfe9531d40655afd834c6567e4f2d556937c14c4ecf9ee77824246779e9cc6ac916266238cb6c09a3794359086caacd47913c6b9a603f50e55067abb405fbe
-MISC ChangeLog 69082 SHA256 cea2c7db94bd6794f257e0d625b8864c391662d1c99513db4ab49add9d501f66 SHA512 54bcdccb2eb4b31200f0c8ae693b8f4c47a9ba103774668618e5cedf1f2220342fcf252b23f4a67ab1cade036c1235e29e60e00391dd9fcc32caedeec04840e3 WHIRLPOOL 98a44fbf77cb10dbab1dd43efb1e8db42c6061eabdd3d698dac65e0a329f306aee079fb9d378cf0b9ada504e5f65411f767baa593d1f4ffff489d8fb4568ccd0
+EBUILD wireshark-1.6.14-r1.ebuild 5388 SHA256 8102cbd445b3d9eee06e3ae1df306f25aef9b7139117026d50ad42f92882aeec SHA512 03a7e40817958de116080077d37389a194a566276e4cd7fe33440e0d866fbc136a2d4e0d649835d1f0049e9bf74f8a4edc43f1f0ff36f5fafa8c5795b9a24be7 WHIRLPOOL e90a90194a355bd2ca1dfb73ccb86996328c21fc7491502a2be29f7af6bda25743c6bae7e4d2588fba1734f975b3970aaf405307aad030fd4606f22efb6d40ab
+EBUILD wireshark-1.6.14.ebuild 5251 SHA256 f39a36d909978a992f457b3dd1c4333d7a03cbc97dc79c69f0080f339ea10718 SHA512 ae88404fde125d79ae810c7fd8d9c973ebaa9bb0a8e967112e048f5f03250090693311f6fb00c2444531db3d152bc8dc3791000c31079bd87c80ee3445977580 WHIRLPOOL 3d34a6b311d00b9119646307d7a7bd53d02662525f45129d3c3bb3a708942c6f24238527bd922cfaafb2b37de1232ae53ab695b16646158c9702dff4a1bf34b3
+EBUILD wireshark-1.8.6-r1.ebuild 5707 SHA256 f52b87e7d11aebe5c8c8bd141c48ac2fddd86e7ba7292cfdc761f63ca99adb77 SHA512 44f62bb4db0cb76982402bcae53e6e1b6a672f74724c0ae5efe685a20ad3a6ce97d7f765c482fa26d2a70f17a21822c72f86dd3760485aa19b2c1e12c42eae38 WHIRLPOOL a04452b3ac0904f616ba8fd1fc2f1c755454193d62e35af93f2a95f36ff3b402231ce8f76362d40df78208ba19d8df3a72f4d32217997471feb9e89dab9cae0b
+EBUILD wireshark-1.8.6.ebuild 5570 SHA256 2b45aba1780e7584ae18fa711332d364136e8696c556b06b907479e086d8fcbd SHA512 992778a788657cf3a395dd9f17a973f8dd0286f9df8652933865df593c09e68a13de47efa4cbc9adf80ccb74afa5abd85784520c165b1855b151311cd592916f WHIRLPOOL 1876efd355941819542181da2235c5bc16c222076e848e8faf0d3d5fda504cd078aaf7aabc919f84bf5cc82faccbd2e274c16c1b1bdbea5ed6d98a0852cfd6a9
+EBUILD wireshark-1.9.2.ebuild 5790 SHA256 4aeecf2dd3617a78d2ac262744508ef70a44355ed5fb4eb353a31ffe0fa5406a SHA512 68f19012692317887e9ac0f0a3d1f6d89d66429481df6c64d517ec6e4a99ef0a49c1b6ae94967a23d043bd19749dedc4ad91932dc5c6710f4f86feac71a5cff7 WHIRLPOOL 82c44118423e8c73dc593777b8e8b7fa686c16421562b4440f1c358fe0959812a8e181e86d7480b691e30820125c827ff8f84c76f4937cef36111c444f902668
+MISC ChangeLog 69326 SHA256 a85cda1811198eaf95c524cd2fdf92157860c7a016b9a19d120e113c3b46e7a9 SHA512 e85ac4e2524e677ebf7adce7dbc54d83d655ca0c05f9c6bff04829cd74b0c07df973b76db694a774ae43e8fb31031f2ad2382d0b141be6d9e51a1d104a0bbcc7 WHIRLPOOL dc15999f6a053fa9f519de0c655c62f9b21a4e8ed41f6aa375a18e3d6ccce27448a97a2557b9688fb57040b74288bbc942bfda54aff0c19f059035840db546e1
 MISC metadata.xml 2476 SHA256 d3160185578d198161686cc780d11ac30e4293edf70171dcdcd6d765a1b21cf2 SHA512 ab8ae1a87f8cdd28965782fbea8e8b535499a7dcfce2cbb0ce9deb3d06767ebf74d2b856868223ae011da4e366cef3787872d6c81aeb43a6ea2de12ede2af56d WHIRLPOOL 8aff37fb6b84367d7597df7a3889912cdbecc7da3111759d8d3d39eb2f5cacee40b743c9bb9d84a18df2f62ad77a0fcc7f0e726705044329dbfaa2aa1719742c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlF3ek4ACgkQgAnW8HDreRahxgCgtUN+HHJ4qz3To3HaV3C6lkNr
-+50An23wQDxRt76zupPgaxHqQgNM2mYZ
-=n3d9
+iEYEAREIAAYFAlF38VUACgkQVWmRsqeSphNUMwCeOxw5IB/lXMrKeRkAFeLUY85A
+S4cAn0NvjOFfiBFsfVCkHJWHTWVkhVbj
+=K6LP
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
index c915caf97c3d..0d5dae91dafa 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14-r1.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-analyzer/wireshark/wireshark-1.6.14-r1.ebuild,v 1.4 2013/04/23 20:55:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild,v 1.5 2013/04/24 14:50:58 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -74,11 +74,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
-
-	sed -i \
-		-e '/^Icon/s|.png||g' \
-		${PN}.desktop || die
-
+	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.in || die
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.6.14.ebuild b/net-analyzer/wireshark/wireshark-1.6.14.ebuild
index 22238835b5a7..cf74ea0893c0 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14.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-analyzer/wireshark/wireshark-1.6.14.ebuild,v 1.12 2013/04/23 20:55:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14.ebuild,v 1.13 2013/04/24 14:50:58 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -74,6 +74,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.in || die
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
index 31d8a4e36f17..9d94f421062c 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6-r1.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-analyzer/wireshark/wireshark-1.8.6-r1.ebuild,v 1.5 2013/04/24 06:23:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild,v 1.6 2013/04/24 14:50:58 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -74,15 +74,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.8.3-gnutls3.patch
-
-	sed -i \
-		-e '/^Icon/s|.png||g' \
-		${PN}.desktop || die
-
-	sed \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-i configure.in || die
-
+	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.in || die
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.8.6.ebuild b/net-analyzer/wireshark/wireshark-1.8.6.ebuild
index 1ceee40c4487..31be4af0ee93 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6.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-analyzer/wireshark/wireshark-1.8.6.ebuild,v 1.12 2013/04/23 20:55:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6.ebuild,v 1.13 2013/04/24 14:50:58 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -74,6 +74,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.8.3-gnutls3.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.in || die
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.9.2.ebuild b/net-analyzer/wireshark/wireshark-1.9.2.ebuild
index 7ef4d31e7a67..73747338aeaf 100644
--- a/net-analyzer/wireshark/wireshark-1.9.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.9.2.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-analyzer/wireshark/wireshark-1.9.2.ebuild,v 1.5 2013/04/23 20:55:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.2.ebuild,v 1.6 2013/04/24 14:50:58 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -79,6 +79,7 @@ src_prepare() {
 		-e '/^Icon/s|.png||g' \
 		-e '/^MimeType.*[[:alnum:]]$/s|$|;|g' \
 		${PN}.desktop || die
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
 
 	eautoreconf
 }