Rename patch because it is more generally applicable as a QA fix. Apply patch to all supported ebuilds (bug #394479).

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

6 files changed, 31 insertions, 14 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index c9c48e8c06a4..521f5e136283 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.372 2012/08/07 01:14:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.373 2012/08/07 09:02:01 jer Exp $
+
+  07 Aug 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.9.ebuild,
+  wireshark-1.6.9-r1.ebuild, wireshark-1.8.1.ebuild, wireshark-1.8.1-r1.ebuild,
+  -files/wireshark-1.8.1-394479.patch, +files/wireshark-1.8.1-ldflags.patch:
+  Rename patch because it is more generally applicable as a QA fix. Apply patch
+  to all supported ebuilds (bug #394479).
 
   07 Aug 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.1-r1.ebuild,
   +files/wireshark-1.8.1-394479.patch:
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.1-394479.patch b/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
index 91d27e57f9d8..91d27e57f9d8 100644
--- a/net-analyzer/wireshark/files/wireshark-1.8.1-394479.patch
+++ b/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
diff --git a/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild
index 44197f35d27c..8bd721f05987 100644
--- a/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild,v 1.1 2012/08/02 15:21:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.9-r1.ebuild,v 1.2 2012/08/07 09:02:01 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit eutils flag-o-matic python toolchain-funcs user
+inherit autotools eutils flag-o-matic python toolchain-funcs user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-apps/sed
 	sys-devel/flex
-	!!<net-analyzer/wireshark-1.6.0_rc1"
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -103,7 +103,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
+		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/wireshark/wireshark-1.6.9.ebuild b/net-analyzer/wireshark/wireshark-1.6.9.ebuild
index 1f3c68e49eed..52525b363a6a 100644
--- a/net-analyzer/wireshark/wireshark-1.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.9.ebuild,v 1.4 2012/07/30 05:24:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.9.ebuild,v 1.5 2012/08/07 09:02:01 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit eutils flag-o-matic python toolchain-funcs user
+inherit autotools eutils flag-o-matic python toolchain-funcs user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-apps/sed
 	sys-devel/flex
-	!!<net-analyzer/wireshark-1.6.0_rc1"
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -103,7 +103,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
+		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild
index 37e1b50888f9..b940589b305e 100644
--- a/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild,v 1.4 2012/08/07 01:14:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild,v 1.5 2012/08/07 09:02:01 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -103,7 +103,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-394479.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.8.1.ebuild b/net-analyzer/wireshark/wireshark-1.8.1.ebuild
index b46f6cb8066d..06102e27f5c3 100644
--- a/net-analyzer/wireshark/wireshark-1.8.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1.ebuild,v 1.8 2012/08/02 15:21:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1.ebuild,v 1.9 2012/08/07 09:02:01 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
-inherit eutils flag-o-matic python toolchain-funcs user
+inherit autotools eutils flag-o-matic python toolchain-funcs user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-apps/sed
 	sys-devel/flex
-	!!<net-analyzer/wireshark-1.8.0"
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -102,6 +102,11 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eautoreconf
+}
+
 src_configure() {
 	local myconf