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

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 18 insertions, 20 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/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
 }