Remove broken python support. Remove ewarn messages in favour of local USE flag descriptions. Add Qt4 support by Andrei Slavoiu (bug #472992).

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

4 files changed, 223 insertions, 7 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 0c2d0a874e82..b46f07c85b83 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # 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.514 2013/06/10 03:38:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.515 2013/06/11 23:39:29 jer Exp $
+
+*wireshark-1.10.0-r1 (11 Jun 2013)
+
+  11 Jun 2013; Jeroen Roovers <jer@gentoo.org> +wireshark-1.10.0-r1.ebuild,
+  metadata.xml:
+  Remove broken python support. Remove ewarn messages in favour of local USE
+  flag descriptions. Add Qt4 support by Andrei Slavoiu (bug #472992).
 
   10 Jun 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.16.ebuild,
   wireshark-1.8.8.ebuild, wireshark-1.10.0.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index cdb18862560c..2a4456c91e0c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,15 +7,16 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.10.0.tar.bz2 27101631 SHA256 1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add SHA512 1d1b37e50fc35da96de142d21bc02e171f8412ce7b6017ca1b1a1e48daa3da05a06612d68ae1317fb338a0fdc82999a3c56b02250e1ca09ac25a9dacac1c7c86 WHIRLPOOL 238bc0be297e09fca289c9a74d6cc96864be29e598fdaabfb8de4edc4ff591cd948790015748ee49b7db5c6eff824e74107a8428fc144af5b89c00b56ae7dd77
 DIST wireshark-1.6.16.tar.bz2 22152321 SHA256 7b280a8c2d2247fa1a0e351c50d25634e679397da3ea7ee9f64c27eacbcebc54 SHA512 12fd6a5201a97f21e0d674adf2ec9b280ab1f78fdea10e605f3b74b06ef87ce9d31f0a132bb805481154a693b6b621ea18b1ca16bc471a98dce0823ba78f6c7f WHIRLPOOL 40f13a1be22e673dc97d2f708b981dcac57844b18369b52babe7e44f3628975b9034de4ce19552a28c3dc7df0b16f762eefecc5447e5041ae2a2c60273c197e4
 DIST wireshark-1.8.8.tar.bz2 24273325 SHA256 4358bff34b685a210b7f99fe7d3c233d07a487bb76237efb834afdc44cf5ac38 SHA512 8dd08702e4e6442891b83d870f03332188a9a95da27592721f04baeedeb2d6f7f3fb80ba0eaa57f58d0d1cbea4229078b07b2b04351e50559ee05594bfa3f070 WHIRLPOOL f89c6dc9e5b898a633b11c7bcb0218a025440dee138e766c3eea64c67633e20817731502d1abbbfb551b2d634b17e81b2c84b29bc2731415ec4a1fe3f75169fa
+EBUILD wireshark-1.10.0-r1.ebuild 5515 SHA256 fe033c86ceaa33784cb2a569232ab23736db36aaeee342f577c1638a4b3be7e3 SHA512 99eff4942d38da74a71bdae133735547ac79a913bdcad77f1fa91b7ce49bf557580c863de5022e0331814cb6421219448f82fd68e7bbcba093b525546896da26 WHIRLPOOL a0b2f2af5313b8772f000bf9df6f7d1576b7783a613b02224c3b5a382d5de43ed41105cb3080050892a340f8b0d540224c2c277937498ee2b952a0d56f0f02d1
 EBUILD wireshark-1.10.0.ebuild 5795 SHA256 1186f02ff1cc35ba4dfe033c72c70b42de0c1d46d76e44f1462a2d71af337491 SHA512 8eff46862d352327db3799b932d7dda30cb102afd3f56fea95a961607d2921151c73a201bddce8d17c6a07447ca48a12dfbc0354f951b68f9b0f68d526d91541 WHIRLPOOL bc865239e6d596939e928a62f12f54eb4b100c94c2d9c63e05525ae9670fab8de93dd864761318ddcda9c9196af2ed6d92a76499dbeb0674460f0dc66c552074
 EBUILD wireshark-1.6.16.ebuild 5426 SHA256 7e18d769ffc6457a37943d1145482f79a2d5ea6eab6ffeea42dff36bf50a95e2 SHA512 30440889e857b32592785ef9c4088de83498ec654d3997a6e10a1db21ec2c172202faddfd8234b6685ce0a2ed265e08c77f09a80f120e26019828d31cd9c2162 WHIRLPOOL 77c70d8900a36862c1050dbb6ede364f85d4980f99c50ef68d014246fd13dee4419171cdaa725d4920f5a559010025b52e2c34685433b196f8f1e2fd1bd25771
 EBUILD wireshark-1.8.8.ebuild 5758 SHA256 76302cc884c924a34ff7770c4760169f1ebeec188d627562216a0b54e8c60953 SHA512 46b83a5182d64c2de1821cff701f88d3f76bd6476b88aa46c31830d1f4844202c199653a13061c0c0010edb41e63ec6cc75de260556b5f2b3d193583436371d6 WHIRLPOOL 81b4c1c0025ba36ac3b39ced77852ef09f0f90773b749cbf42763ab4563d352d59fd59bb276ac2cc51ad485ff4f1c1abdbc84699c7cffb01c382af920150eb65
-MISC ChangeLog 74797 SHA256 b1131d77501593898f9d44b9354d3fc6eeb988d05efe7a6393daa5e35ba81f6a SHA512 db6b38fd8d6336a840653ac0a1a1d916b3d9647cf3779254aee43fb9dea51641e384e4d91e364bb4c6e37a030e9b77774e298b2a1a017f044ebf200bbd7d91ce WHIRLPOOL 137b0d74ef1c65d6b4ca625ac1de731ae87bf4d48c46f56d70c0a9d31ec439a14c5dc321a06c88ed8d4f45a4aa22693ca916754372b772fbe4393448d39a928a
-MISC metadata.xml 2318 SHA256 c1a2d9ac8e094eb2931748b1e1816afea96792b7aacef67e07de4dc5e5eb5c9d SHA512 f277625dfa5d456978168c49bda809121fa51272d96620392525c444058735084eb555643d336d4011033f3e259676e896146bd6c87c38bf2b1f09a7abd7ba68 WHIRLPOOL 3d59521c183b41c07f114efb3928bcc7f4317ed031cd20e5c1bdcd9daae83f40ff7db0018a64d7d561e3bd1128994f1d7860bb7578e1537dbba246d16c4386b6
+MISC ChangeLog 75073 SHA256 ff7a58563d9946d174fca2f8a3f9fb89053ab36dbdc6f19a39e21e6c8656c53f SHA512 9cac2480ffdf06393b430d92f2324bcb6e9235353ed32522ea54be439eb4c7947f26bccaf00837631cfe4be20f235d2671700262cb496a2b35ebf84b7cd51301 WHIRLPOOL 214b5a5f0999317394103db58f5da602719f6425f915c6326b14f5c45c79c3385eb5fae4e7a033bc5df380309a7cb7188238b746b7ae5dcf42d034ad6c233405
+MISC metadata.xml 2458 SHA256 3360493938b6cc0d3750dd8df22786942cf5ee096ab5ad79348ebc1c367d1a27 SHA512 98eed0933e78bf80cf21e1b76b74f2622e7c1a4745e22c6871b4d7192433507a90709895073cc4316600ec01890c5d4d8e03e3db54bda9907c26247ec2102aa8 WHIRLPOOL cf30eb58ad85e518f3081f34284ed743c00e7ebc55630b9987f52b3848be5fd32e9b13cb7f3fcee8587c127367d042efb305b31e2da826143616ec6c64dec7bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG1SioACgkQVWmRsqeSphM7dgCdH9+SWQ65uzB1wvz7G4isb3ao
-E1IAnjMZGgDy/JwbGNzOlkBBf2DrUQ1w
-=saZ4
+iEYEAREIAAYFAlG3taoACgkQVWmRsqeSphOuMACfbNeIOWoRJLwKGJiRdC7Wu/mD
+o8EAnRi1oAhuYUR5i+eC7xKOiOGFn8oR
+=EvRv
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index d971e8a7280e..fb29035288a1 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -28,9 +28,11 @@
 <flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 <flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name='gtk'>Build the wireshark executable with a GTK+ UI.</flag>
 <flag name='libadns'>Use <pkg>net-lib/adns</pkg> (DEPRECATED) instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
 <flag name='netlink'>Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+<flag name='qt4'>Build the wireshark executable with a Qt UI.</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..dc73a94ee664
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild
@@ -0,0 +1,206 @@
+# 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.10.0-r1.ebuild,v 1.1 2013/06/11 23:39:29 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic user
+
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk ipv6 kerberos libadns lua
+	+netlink +pcap portaudio profile qt4 selinux smi ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	gtk? ( !qt4 )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl )
+	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
+	crypt? ( dev-libs/libgcrypt )
+	caps? ( sys-libs/libcap )
+	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 )
+	lua? ( >=dev-lang/lua-5.1 )
+	pcap? ( net-libs/libpcap[-netlink] )
+	portaudio? ( media-libs/portaudio )
+	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	selinux? ( sec-policy/selinux-wireshark )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	>=virtual/perl-Pod-Simple-3.170.0
+	sys-devel/bison
+	sys-devel/flex
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# profile and pie are incompatible #215806, #292991
+	if use profile; then
+		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
+		append-flags $(test-flags-CC -nopie)
+	fi
+
+	if use adns; then
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --with-c-ares" )
+		fi
+	else
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			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
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				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" )
+				;;
+		esac
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap, setuid-install requires dumpcap
+	econf \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
+		$(use_enable gtk wireshark) \
+		$(use_enable ipv6) \
+		$(use_enable profile profile-build) \
+		$(use_enable qt4 wireshark) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with netlink libnl) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4 qt) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		--disable-extra-gcc-checks \
+		--disable-usr-local \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	use doc && emake -j1 -C docbook
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk; then
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		domenu wireshark.desktop
+	fi
+
+	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
+	ewarn "the wireshark group. This security measure ensures that only trusted"
+	ewarn "users are allowed to sniff your traffic."
+}