Add Qt 5 support to the stable branch (bug #488640).

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

3 files changed, 254 insertions, 16 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 6f00de564bbe..04dcd36e5384 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.664 2014/11/02 12:09:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.665 2014/11/06 21:43:21 jer Exp $
+
+*wireshark-1.12.1-r1 (06 Nov 2014)
+
+  06 Nov 2014; Jeroen Roovers <jer@gentoo.org> +wireshark-1.12.1-r1.ebuild:
+  Add Qt 5 support to the stable branch (bug #488640).
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> wireshark-1.12.1.ebuild,
   wireshark-1.99.0-r1.ebuild, wireshark-99999999.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b540b4a011bd..0bea79f37fef 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -9,25 +9,16 @@ AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 DIST wireshark-1.12.1.tar.bz2 29059989 SHA256 82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b SHA512 840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929 WHIRLPOOL f98131bde6680370943cf6070cb44c6ad96d42060573e521051b81ad9d934b03741bb4d75a1d30762eebf5f22387f9eb7158acee4caee2503c4eafff52a12ada
 DIST wireshark-1.99.0.tar.bz2 29782811 SHA256 9454180264c288c0ae03dfc3856310e319acf29f7b2e8a8ea2fd91665b606364 SHA512 021d4adfe8a6a326def81daa79ede1fea8a214f6d9f9c3f1cb008a36e82fe42655cc6c6f4de2a425181e03e61f3dba5cad2ebb11605d29f4bbc0623f66f0d3db WHIRLPOOL 04e22741d28b4576bfceb1c0507fd8cce7b7781999245e1cc8cd1ae2063f62fa518c007f42826a445acf99f18c61b7b9f3deb67629438e7e3c9276d2282a5793
+EBUILD wireshark-1.12.1-r1.ebuild 5941 SHA256 f535605651fab53c5b011a81a4c1ec67097cca50c6034cb66401bf403340da09 SHA512 95a5ca3750bcb722a9633d0776de705adc100087bcbbdd898fbe172d364bc6471cb3a254fdf84b0e902b88089f40b90df77c1d2b8eab6d482f32a140abe9b5ab WHIRLPOOL efbc1bc60a9c2ef8e6fcb89752d56d312f460db34e267b5871514ff30d00ac6c3d27da6c54e1c4b713d519ae0a42ce69b50fec078a764960842331e991552e4c
 EBUILD wireshark-1.12.1.ebuild 5597 SHA256 993905b4d7671f3959306b282c5756f30f372b3f14e6034432f5a6e7640d928d SHA512 64e3f379ce1bd5c251d98a366c8340e6127b957f206b788e5cb0c18620d10bd2853315ce79e966d9d5eecd2bbcc0b5dd1c888583785ca621b90efc8d391604aa WHIRLPOOL b6023d2206151b3f6af4e23dc5a5c396a289ee3166259104ac543a268d15b86acaa342e6844bd96ea84211593c22b4903c7a5d34a546759504a730e67ca3c711
 EBUILD wireshark-1.99.0-r1.ebuild 6026 SHA256 ab04c651ca463574e5d9d0f2dceca5158d123b6c475c0e2b1c1b335848964395 SHA512 3c0cbd15e41d9fe39498981652cc1fbcf42adf68b26e5407a2835d6356b84377ddaefd8e462f13082ad6a7bd03397a5ed90b9335e479a2140d024b29609c0b24 WHIRLPOOL 58ffe25b2ad17ed1ba295759ae2f76861fde09c7ea17ca9227ba4a2805c16a46d5d2bc7d4914a8d618d031b5cea63f5451a1f2e47533a92421098c29cda3dbf5
 EBUILD wireshark-99999999.ebuild 6069 SHA256 71f1eb0314a73bf8d80fa86eb42dec87fb3ab130df40262dafaf3e51a67f5758 SHA512 ff31425114af734296c53da4bc5004bf0b3d9ec854f338ec54b25102c108fc8bafbc92ab12e248648cd0966a2e6d096e156db0cac2489add4281a49d1cfebb47 WHIRLPOOL 0e6c69738344b201a6b81cf0c8d986aa18324b93cbc866b2c05f70c130ad6cfdefc9842cedeacf0f928b8b29d2c426051722dd95a7e20a78f099bda9b68a93ef
-MISC ChangeLog 97225 SHA256 f53a687dc98b4f2a567e9859c1a3a29a01569ca58fbd85d5aa2afca4f54123f4 SHA512 bbbdef60437d403bbb13b8d3e23af2af76273f8b9fdb57ccd95425c228af62235228aa6995769a6ff61d1865dad4280e900ef7a53663eff726dfa321605fb667 WHIRLPOOL d940a3bf0828e619a6c3db4004da962a34f53754738a290f9943014857ffb90b59bd2355af544fd1377ef03dbdce14ff01b92923471dfbe69ce3d72c9ba113b7
+MISC ChangeLog 97391 SHA256 ead06bfcf85e497e78cda083c7389b2b5d16c3a92dbd28a59cdd57e4e7e73566 SHA512 43dcfd17b3aeae6863f99f2c8713e981b59719684a8d1f4b9d766ef33138b4e86c879d275980c4ee3ecd7c17006c997ecdb04841deaeb470c61a89288bef53e9 WHIRLPOOL 99f73b7fc64b72545b7b8ca97b5cd679a8969ff088429feb202eb6fe1aada1c55a71da68e6434f8e88caaed00e4ce371e94d8317dd7b496201ee3a1014af1546
 MISC metadata.xml 2460 SHA256 c764e8b164a3c24ee43cbbd46f3ce01b4015da62e9d29b1117868a3644497dc5 SHA512 f957bb3ce85ede2c8944581e116160fb601c1dddcc7cfdfa9b6a39fe5c9c7e51afe686369681a31ebc231a46aac33be5223730b1143f1895deb7569a606f2fd2 WHIRLPOOL 57259e5c67ec9d2dfd7ae69f17146a514915e4f3d0031eaebbdd9640f4b11ad9df25de71f223cf4df044bfa749a148ee5069faf790060761d800476e56619f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVh7fAAoJEC7dUkA7aK9H1loP/3bbQVi0OTkgdvnPnjCOWqZF
-6kE03GqlsKT2zFjGdzpcL/xMRThhrb5fC0+3Lbmhl9GtbaQ9MBE70swI0e5Ugbti
-0fmsGDo2IoTlA53mwhtOeASgeLnoyFIZ0fmmrvmlGPLkV9cYK1yD4SjR4jFhGOno
-91Azu7yt41GYsReQsjzcsJai3N94eEFu58m6Oc6Y5HiUD/OeKobUw1bSwtF/3zYC
-qPCHdkDwCKyhJQdNfB9Ce5xReDIu78KVlVECSvmKaOchWH4+cMtsLH9HBfUKogdh
-1BImGmuVKrZbDkDzkua3O7DD78zB/ImM2J3zrC7gWFOlCUZM5eAOgURdE5vEyOEh
-U+vLmaefMb2OYmjC50chN57Q2qwhqGwzmawbL2Ua8e+VhyAPVLDtfimqGLw+vfyh
-Pj+Rvsq2vIINJz8CYKER6BWKBBr1+OVZniZ9QAYoW26SY5fGd6YTUN3+aSWdsNiM
-I11SCUS5ebnTCGpLJY80gOYGTrYY7CJbtfgrzSwjS53zIFpmYa5l8d02NKCyyT37
-SOciPKSJVtPuNGK5oaMvNlC7UlxdQWPy4QaT50p9+PgPYlx3LfuNigLDMU5Eoe2t
-KZmT6bs8f/yJ1y4YnUVx1peT7WXr+AQr9oO0jBcTaoI25KHZ+l6BDu+YmzBIM4In
-VFzIUS6DGNAOH2JDhutF
-=FNUY
+iEYEAREIAAYFAlRb63oACgkQVWmRsqeSphNSqQCdFsNX2ePDvfnzl6OiZfmGqyT1
+1JsAnRiomb8YlwT9gLXpt4rvhfwuTStK
+=wfHZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..d301da37d460
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild,v 1.1 2014/11/06 21:43:21 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps multilib qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${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 +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 selinux smi ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+	virtual/freedesktop-icon-theme
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
+		"${FILESDIR}"/${PN}-1.99.0-qt5.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# 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
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	use qt4 && export QT_MIN_VERSION=4.6.0
+	use qt5 && export QT_MIN_VERSION=5.3.0
+
+	# 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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4) \
+		$(use_with qt5) \
+		$(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
+		$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+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 \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	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 gtk3 || use qt4; then
+		local c d
+		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
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4; then
+		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			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."
+}