gentoo resync : 02.12.2017

8 files changed, 299 insertions, 10 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 04267b6df39e..8efc8866343e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index dcdca0711e2c..6412ced2f6bd 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -11,11 +11,11 @@ AUX rrdtool-1.6.0-configure.ac.patch 537 BLAKE2B c90a5b9e2ef8fcba87947e6091c4de0
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
-DIST rrdtool-1.6.0.tar.gz 2186538 SHA256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd WHIRLPOOL ae831bfd6b397ca77d2a7b2e393d2dc542e740f1bfb9b45eada44781a7c9dd93b80279683cca1590477191bc3972f859097802387a12c8e3b40c97f1524428d6
-DIST rrdtool-1.7.0.tar.gz 2849994 SHA256 f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f WHIRLPOOL afe313254d7ae7ac6a9a9c86f38b2f6873846d0b4419d186d4fbb14b1ff7b5b6f8d1494e6608f40daa0c2a0c24f24f3edb14cea1130c5f89bf38dddbd86c7577
+DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
+DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 EBUILD rrdtool-1.4.8-r1.ebuild 4038 BLAKE2B 3bf893dd39546b26280d36fc3474660ff53cad1b5538e104be1131623466a195b008073cfccd023236d3ab9c1bfee47235663b0991acc42e29d562f5fe24c20c SHA512 264d53646ed3854ce49618dfae1287bee512e8e59aefeb7a8118dbeeb4984a9e15d77fe60d07cf730e91beb5f7c356bfef3fbb4b3dbcb2efe607b709d6202b4f
-EBUILD rrdtool-1.5.5-r1.ebuild 4294 BLAKE2B d69a274c22ae2596badc441336a00bd83317b197be07a822f67a0739dc46d0fdd4604a46db2ead9e1181cf9e54280552caf0c6a1759da27ef4068824f4ac2ca7 SHA512 5737e77cfd4dd78d2f306ce7d1013861850c95414b0cf8ebf3b247ad918f06693ff6227006383b4c6f2023ffbb63e6a6737bfa932c7ea3205e66da1acfe9e14a
+EBUILD rrdtool-1.5.5-r1.ebuild 4301 BLAKE2B 049b30a1c6eb88c9629ea98fc951fc66eeeacd14944cf44020236768210e07a29bd552c2707910b292a113b0b47bb1eae9fed0d36f6c0f914c0fd1d5814aa301 SHA512 57199dbdf7eb7a38341e5106191b0e4e0076269c125e1ce76e69c94cc2c2f0e03788d541212d4ae4b05a31b2bb87119003be626b9a585e08038e13f4c13d0fc7
 EBUILD rrdtool-1.5.5.ebuild 4027 BLAKE2B 1b281d9d92463ac5027750e45d673295e914dcc32ed512d19cd9558ddf1a433aba28c918f669dd9a42d61421b44b8d44b0cbdb2110c8e716e401f3b85e57b73b SHA512 6b0346093e6787f76d018c2e8fc52d60b0f8d0e108d17a8f6cc30f91856d69d082a75555861b4c71e1c62c466eb21d2acc38bf029993972bd8b90496debcf28c
-EBUILD rrdtool-1.6.0-r1.ebuild 4247 BLAKE2B 7c4b21e293bd49f3959686e5e59102e6d87d7706f3c565fc0de5cc27e24549220d013cfc88b99e63c8abdc24d28d0938f7a93160642f39d8ea7f619212b9ee43 SHA512 0cafe4e91530e053acc774371254958d7a608cdc93fb7e6e38ba5a5229c3d3698e2e2660127a5544de36d31bb99204b92eb9eeae3e271e980f35f60b81ba2c3c
-EBUILD rrdtool-1.7.0.ebuild 4303 BLAKE2B d5d918325c627321fbda9d23f70aa7a0733333e73634c0a6c0e267e1e96a0954df7eeb1199652d1fb93fda5590bd5f7765dd4dfba67fe4326b004f34936e410b SHA512 efcc7770ddb900e1e1f3a83acbfe72b4191fe980b6d892ce0eb9fc34d75490a0f561a2796a144f79541c40d8449b1f22234a9f6014dcdb7d08163bf992353ad7
+EBUILD rrdtool-1.6.0-r1.ebuild 4254 BLAKE2B 690cb72a807dacfa5c99291ea48a86c0fc2e5960a319f154c45b004c4a7e4537b6bab7c6c1579cb33c73eba625519e25b59eeede44284483264bde5dc00002e0 SHA512 0da9052dfedd8ac5bfba5150f6508c68bd123ceb6efac59673497e07305d1d05f1181fd117b8908b1c7da28181db516efd2a1c6efaef3707eb828cba44723a5a
+EBUILD rrdtool-1.7.0.ebuild 4310 BLAKE2B 3084372a08723bf67e31eafad1b38f74a650710a1e5abbbc3c06857d21a9535d5d3d0860d3751ab431e5f09a21917a08e875e383a0ae7613932cda6a23fde083 SHA512 e7813b76116883440c66108b1b15481f7a7a3a665b39f11c3ea719372563b5e983749a9b2b2f8d61cdc808ea37230cc08e250d67a301b4271bc3819bf5d79e7e
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
index d9e1303a80d3..7178baae6cdf 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index ccde50143454..d13a264e077c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
index 24a80c6305f4..88256ecc9dc2 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c9088e7a6337..de91815eae2b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,7 +4,9 @@ AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
-EBUILD wireshark-2.2.7.ebuild 6489 BLAKE2B ef6b2cfc35890633c5936cf7513a4570b6006b92d6b5cfd504b3b097bb2f978c5c1b59253cd81b9704ba105a84f5adfdf9f9b0cc75a99f4f6a0b175fa3f1f9de SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9
+DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
+EBUILD wireshark-2.2.7.ebuild 6439 BLAKE2B 86d89c85ae317328c1ab3fdead659c4a70ee10ca1ddef1d821752ba0a89c3d8cfcea65ceff744e3deb32dcd9b2a6126992bb0664cd6e56a969baa42e37cdae9a SHA512 19547b52dd4f3571a17c954e2d3158511e0abde89632b4b370b2d5ced306b42bf08d9eeae8747651738bc2ebe38f81c0c7193e7992a8660ac61b0c7e205c830a
 EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439
+EBUILD wireshark-2.4.3.ebuild 7255 BLAKE2B 7dae35f0eba0e32a270b3f9872b80b17d0546a2a92e2ec23ddaf71abd7962e1f4746083daea7052e71ad6131f63b64f4fb622e19d48b8c365ca8e25ac14af91e SHA512 1c2e90be967e2d6525d410576c7fe8c950455cab1b4a33643225f17efe1a92a61edc08fd60f4a815260dcd257b5914730e360ae100415e17b5559b2c8c7ff137
 EBUILD wireshark-99999999.ebuild 7112 BLAKE2B 1523fd808c7c82714c3562e430960a3665bcc92f21ff801c8cf50f9240f7f59339007d32244a54e60842849b415d36e19a9cce816bd91c11882eddc44e8e25b6 SHA512 f7fbcbadcd41ef497b2d01af12c5a6299c89d5b6554778571fba05428e0df021c03750fe40ba6aae7cf926b92fbf7cf2fc556eae64e8698b6935a9502caf8dff
 MISC metadata.xml 4696 BLAKE2B 1492ecb0d92c063457da068e82af411ffeb77d6f50f89f16d380062dcbb51a90281c3a82e59830b9e67dc3e5aabbdca8e89febbd852286f9c4bb87711210fe66 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e0aadc7230b7..e28e46471220 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
new file mode 100644
index 000000000000..1e04b00a0180
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		media-libs/speex
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	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 gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.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 gtk || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# 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 capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}