Backport recent changes to 1.6.13. Clean up.

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

4 files changed, 84 insertions, 71 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/Manifest b/net-analyzer/wireshark/Manifest
index d093a887ae9d..f56feed4b82c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,17 +7,17 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.6.13.tar.bz2 22077778 SHA256 32f4811bb7a259612aac04be5722da51f145fcf66fcf69f358e98d4cb78dd091 SHA512 addb42d7630c4c382099cad696581c73a43ebc31727d1838926cb306ff13641b6b586063fa9186a7c0f24522690fa8955844b228ea9b79b7a71ae893730dba45 WHIRLPOOL 72a91fb14529db5e737980b816bd70175b2b0245e387e0fb3d0e937bdddc46085f01bfab75c34663f768b119270bd676367ecc3b0ffa8872e43679bfeb05152f
 DIST wireshark-1.8.5.tar.bz2 24196532 SHA256 d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372 SHA512 3378310870e2e11cd4caf91e0571e2a52bd81bc76f1715997338d867a4d98ad7bb34e0f4443220386b498aeebce15c02d9825e50cf587587f573a5a0c578b039 WHIRLPOOL a9ca0f7cf14efcc4c56f7a2ab16ed0962998bc1467602d3f201e569513b0dde1363a7507e7a3f53535b8878ed2fd4a469699c88dcc1a3c4ce90461ac2c7a3c00
 DIST wireshark-1.9.0.tar.bz2 24592626 SHA256 0a21aa84e78de2ae2f758e5f21edf2ec5c26a372fbfbb30a53a9b67a128e4538 SHA512 b1e6ad9a2320c9a73de57dd4f37189f3319c67e95559648587395fbd20a0ec86f98b6674e77f450df3ac39ebe5b92a4105afa3d6d222ee6ac03a7b6bb5e4bc8c WHIRLPOOL 429322185e44f5dced728d6945ada7abba08328f8e0d3bb22a853cb730df611d9218315ac009987348993c1a3fff53f14b2f5133c67530d3fa92f835fad273fd
-EBUILD wireshark-1.6.13-r1.ebuild 5295 SHA256 063ea6ae0a34d71f3c64b2d4e7edeabd99ac9eb1d5f94223ab738781e062e035 SHA512 25c173b855d01d506b0ec032caa293c5bc0e5362f56d12bc80d79d46bb3928cc5dd2fde7cf5a5a6cf9de6ea6830f84e530e8aeaf8c7098754abc457fe04f7b7c WHIRLPOOL 4a5e13c4bd6497e651aae48dbce72b3ec49e808b43c83d76910fe047c6031995d4de143e8af915d131e6dcbe4ed575cac90479fad59f2c3c127901aba83078e2
+EBUILD wireshark-1.6.13-r1.ebuild 5383 SHA256 9d61121b9d79f50606d9acb969ff0ccd747f7037eeefa3dc58777d25d747498c SHA512 492c1a8fe2893519dde53edc65a24da7885089c1de27f12b38b193b84148d37bc14cecf73d75804c633b2c7dc0628bc52a4f1a6c82df8e32c477a575ddd2590b WHIRLPOOL b427beedec7e6a0c59108742c1be314d07eaff58fc48323f5fa626a38ed0877ae0b0e95b761dd149aed84a883c17dd2685d49b633febcb4f45d4d9271d55cdf6
 EBUILD wireshark-1.6.13.ebuild 6409 SHA256 2084d4b6fbe051f2954e0e70f43e8b69bc4415f7843511d0778a982ab08185c5 SHA512 06e5ed612d116caa105a9c0713cf8cc9af2f7c81bdc07d2cddf5dfcab4d0f0bd15ba86c8902d251369448e8998091d413e24a22a9fe813aeb1fe571a85bcf29f WHIRLPOOL aa1752218035641aacc74fa0ef553908ed13a219c29268d7eb37833b3dd0bb2e26d845056b45901826427d8b8a4a31c9b00b4b68d2be43bfaafeee89e1833eaa
 EBUILD wireshark-1.8.5-r1.ebuild 5682 SHA256 0152c2ad5950d5baf2f5ad0beebb4bb93b7202b787a8b1170d386803b05c9a13 SHA512 b6a447760f4a67f187fbf95b80904eb57937dfca49037c72c945971cd1f7c491cd9aa46e8040dd75018f6375638b02265ba22d8f1661bb896ba95b2ed85f6166 WHIRLPOOL 4342e097f6c2f559be7edbd7ae284b7d494c974b8b97c7af701bd62e9d6cc4d4acc270e047e1a0a93f6e5a953211cf4fff932e84d72f55c9ef133857d43671a8
 EBUILD wireshark-1.8.5.ebuild 6796 SHA256 f6b50852f4c03692aa88a9d98f3f7edc8131d7cb8f490e483b50358180472630 SHA512 b389b70836ad0e3539e9f1e7eca73362e9ebc87a078422def834559818b0145defca90539284c98657ef704d73b94da14253c90c95f4e6f96c408826a8e2537a WHIRLPOOL 61054a9accda9ac0661bdee3d35c2e7281fcf5c867f1d0f3c789acb86188153507e13a91b3e442f58da69cf5ea9eb548f7c314803ffb3d21eb4c4bd6945c1f77
-EBUILD wireshark-1.9.0.ebuild 5655 SHA256 371d8d2568bb406b878bc7125694cc26049238a4d735838d5f07b83c6487caf6 SHA512 6bc55bb0e229e5cbc50cb34e8698fd0029d4ace1d157aa541435de7fad5fcbc91f0ccaff67a5d875cc6512af27a5aee68e05a224945fec71f8b3056c82112b53 WHIRLPOOL eed14dd36029384138cb6ef915a5ba715a4797a376a8c721be7a1f976dfed49ef7d2858752d9e62937270606ddeed8eec6211ef4e62720fc089789873afc1f09
-MISC ChangeLog 65231 SHA256 bf72afb10e76d760b97bb2a2dc2292905be6c63466720ad3175d942b342e4306 SHA512 799721f1356beb547c85eb989462759fc12b0229e8a4a09dd1f84da04fb5cd4defede9d8d4b117ceffcd9fa083979b12e02a593664ef7644761c0149a73875c3 WHIRLPOOL 6ad0589a43ff1636535f2eb8fcf83159c9467e0c2cceadb4d7f443168cf2e1010d5d5985de21ed55252a36c09e36d2225f81697a10d4f2794f4ec70bf3d3a7d9
+EBUILD wireshark-1.9.0.ebuild 5654 SHA256 9d34e85f3815498626a5328f058e6118c12624f37ddc464e2665b4ca91f229f0 SHA512 484002858c965c250405837a9998a503f49da6b4714ee62af6284632c6bba631ab7576a63a0386a3397a0a9e74aa272808f26b03b3e9751ce3de184a6ad45dcd WHIRLPOOL 36223f105b0a6bbb358db37781a86e4f48e3f2421b10910fb17f7a3466f6090d46e6c479164671b24da62f6c8bdac2816e78d6a03f05b47df60b19f8379c74e7
+MISC ChangeLog 65380 SHA256 6c86d5180a97cc4c8a6f65df73885cdd34248e8439dff3229a57dbe402e23472 SHA512 b3fa819692e0c78e41d424829dd670d3a095d457eb211df0c820a4815a23c3c8197c024831197f5e210aac26b8e69f430d258a7c2acf8163885b0fed264ff4bc WHIRLPOOL 24ee27328841efa3a9f6ed5bd17edba699422da1c8f56374b4c6ef6924c2f6ec2d5877308d52b5281c7979cad6772348a22db3e2694915928b7828af0f0d3105
 MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnoEwACgkQVWmRsqeSphNMSwCdHvHoJ84SDU1ojkQW/qA8+bgg
-iSkAniySj/gs8vbmQqrq44Znzv0QkfI6
-=Dnf3
+iEYEAREIAAYFAlEnqI8ACgkQVWmRsqeSphMX+wCbBhIB6DLuEsiSFt8+GrWlvbE+
+8UEAn0IFqcvBd/Gm3YaI3+w/1+C2gFEU
+=KBGW
 -----END PGP SIGNATURE-----
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