Backport recent changes to 1.6.13. Clean up.

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

3 files changed, 78 insertions, 65 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ea04f6465239..4d8b59d7ea87 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.450 2013/02/22 16:43:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.451 2013/02/22 17:19:09 jer Exp $
+
+  22 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.13-r1.ebuild,
+  wireshark-1.9.0.ebuild:
+  Backport recent changes to 1.6.13. Clean up.
 
   22 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.9.0.ebuild:
   Restore old use pcap && use_enable filecaps logic.
diff --git a/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild
index d0923ff96bba..22a5574acab3 100644
--- a/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.13-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.13-r1.ebuild,v 1.1 2013/01/31 15:59:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v 1.2 2013/02/22 17:19:09 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -15,44 +15,56 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns doc doc-pdf gtk ipv6 libadns lua crypt geoip kerberos profile
-	+pcap portaudio python selinux smi ssl threads zlib
+	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	portaudio profile python selinux smi ssl threads zlib
 "
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		>=x11-libs/gtk+-2.4.0:2
+		dev-libs/atk
+		x11-libs/pango
+		x11-misc/xdg-utils
 	)
+	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
 	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	selinux? ( sec-policy/selinux-wireshark )
+	smi? ( net-libs/libsmi )
+	ssl? ( <net-libs/gnutls-3 )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
 
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	dev-lang/perl
-	sys-devel/bison
+	doc? (
+		app-doc/doxygen
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+	)
 	sys-apps/sed
+	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 
 S=${WORKDIR}/${MY_P}
 
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 3 ||
+		( $(gcc-major-version) -eq 3 &&
+		$(gcc-minor-version) -le 4 ) ]] ; then
+		die "Unsupported compiler version, please upgrade."
+	fi
+}
+
 pkg_setup() {
 	if ! use gtk; then
 		ewarn "USE=-gtk disables gtk-based gui called wireshark."
@@ -75,12 +87,6 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
 	# profile and pie are incompatible #215806, #292991
 	if use profile; then
 		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
@@ -90,13 +96,15 @@ src_configure() {
 
 	if use adns; then
 		if use libadns; then
-			myconf+=" --with-adns --without-c-ares"
+			myconf+=( "--with-adns --without-c-ares" )
 		else
-			myconf+=" --without-adns --with-c-ares"
+			myconf+=( "--without-adns --with-c-ares" )
 		fi
 	else
 		if use libadns; then
-			myconf+=" --with-adns --without-c-ares"
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --without-c-ares" )
 		fi
 	fi
 
@@ -108,7 +116,7 @@ src_configure() {
 				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
 				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
 				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=" --with-ssl"
+				myconf+=( "--with-ssl" )
 				;;
 		esac
 	fi
@@ -125,8 +133,8 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_enable threads) \
-		$(use_with filecaps libcap) \
 		$(use_with crypt gcrypt) \
+		$(use_with filecaps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
@@ -139,12 +147,12 @@ src_configure() {
 		$(use_with zlib) \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \
 		--disable-extra-gcc-checks \
-		${myconf}
+		${myconf[@]}
 }
 
 src_compile() {
 	default
-	use doc && cd docbook && { emake; }
+	use doc && emake -C docbook
 }
 
 src_install() {
@@ -180,8 +188,8 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use filecaps && use pcap; then
-		fcaps -o 0 -g wireshark -m 550 \
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 0750 -M 550 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi
diff --git a/net-analyzer/wireshark/wireshark-1.9.0.ebuild b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
index 3526dd17963d..0525ca9a70d4 100644
--- a/net-analyzer/wireshark/wireshark-1.9.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
@@ -1,8 +1,8 @@
 # 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.0.ebuild,v 1.3 2013/02/22 16:43:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.4 2013/02/22 17:19:09 jer Exp $
 
-EAPI="5"
+EAPI=5
 PYTHON_DEPEND="python? 2"
 inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user
 
@@ -15,51 +15,51 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns doc doc-pdf +filecaps geoip gtk crypt ipv6 kerberos libadns lua +pcap
+	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl zlib
 "
 RDEPEND="
 	>=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
+	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		>=x11-libs/gtk+-2.4.0:2
+		dev-libs/atk
+		x11-libs/pango
+		x11-misc/xdg-utils
 	)
+	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
 	lua? ( >=dev-lang/lua-5.1 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
 	selinux? ( sec-policy/selinux-wireshark )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 "
 
 DEPEND="
 	${RDEPEND}
+	dev-lang/perl
 	doc? (
-		dev-libs/libxslt
-		dev-libs/libxml2
 		app-doc/doxygen
+		dev-libs/libxml2
+		dev-libs/libxslt
 		doc-pdf? ( dev-java/fop )
 	)
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
 	sys-apps/sed
+	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 
 S=${WORKDIR}/${MY_P}
 
 pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 3 || ( $(gcc-major-version) -eq 3 &&
+	if [[ $(gcc-major-version) -lt 3 ||
+		( $(gcc-major-version) -eq 3 &&
 		$(gcc-minor-version) -le 4 ) ]] ; then
 		die "Unsupported compiler version, please upgrade."
 	fi
@@ -106,6 +106,7 @@ src_configure() {
 			myconf+=( "--without-adns --without-c-ares" )
 		fi
 	fi
+
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
 	if use kerberos; then