gentoo resync : 16.01.2018

4 files changed, 531 insertions, 1 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3626fba12a36..a21022986728 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,12 +1,15 @@
 AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc
 AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790fd305555480d804c5c13915f1b46ddc1be8b4d967f1dd60fa70263a663d4f345386399dabc33c63c97a55ba8c43b565ac SHA512 1938754656a0654a3e40909c30c9416e65078b2d664b44d31ef9e75cd2d0dbb360982106c9300ffca60da81aeb27c8a37298c9aff762d0800d77d17e46b9a524
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
+AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfbd6d0a3434c5c2dd849415cec7b5cbb3573bb95c8a81224fc5bca639103437aafcfa05ab3554bdfb3c866013e38b19a SHA512 4027b6fc313c2186f4eb2a9cb050dea1687c9cff64a83ec0cec2a122ca588cb6334064a2c46dc9c9d66e8fd41056f27548e7aacb5193f82734b04e15f4a17c67
 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
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
+DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
 EBUILD wireshark-2.2.7.ebuild 6481 BLAKE2B 167c80ea9d3f41234ec9324d37ed3886776fac88863fd47e264eebc35014cc1c8da5c191da741d2fa2d8d7239eb8de649819c544deed346102627bc723e5ae29 SHA512 f7c45d28f9b5dd2a10b1575e4f9d071e435dcd34d6b7638ea2d8fc0ec3ca7c8ac4e8d73d23b2bc093c623b87e32b25ac36d80ca0d309daa32a18ebe5813529bb
 EBUILD wireshark-2.4.2.ebuild 7379 BLAKE2B 6b2e91ce48323c78b8182774e87140e8f1b6db3187074d11d671ee3597aae4e6ba1a487458e144ece58a69bb89e2d254a73f4809714c0b5038bd488ca0a982f1 SHA512 219ada160e01d499ff48ec40e161a64ffc0e709169fafccf41d6b428ee10eb00e34c0d2db8198f151c893a425c9781583eb56f6216f3162c2e87dec63d0d8fcb
-EBUILD wireshark-2.4.3.ebuild 7338 BLAKE2B feca3a7305795ab5520ecebca28c426e6f65d2b1a25b1a58b7733d03ce5781a97be815a0d8d5b6a5e00bcfb863cd9265c1b7662959fcdeab1a531b39bf56bef3 SHA512 7e5259040b5b1ebc052f939f54e3e97d246c0a70b6e95e4627695d899c00b0335d255a9523494e81544df5bf8e5a9c73526d1eaaff1e6527e03a70f2a091ce0e
+EBUILD wireshark-2.4.3.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
+EBUILD wireshark-2.4.4.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
 EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718
 MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
diff --git a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
new file mode 100644
index 000000000000..288efb7d66f5
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
@@ -0,0 +1,233 @@
+From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
+Date: Sun, 5 Nov 2017 12:05:43 +0000
+Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Icecea743739aa7e1a65753f623f311514260d373
+Reviewed-on: https://code.wireshark.org/review/24252
+Petri-Dish: João Valverde <j@v6e.pt>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: João Valverde <j@v6e.pt>
+---
+ Makefile.am      |   2 +-
+ configure.ac     |  27 +++++++++---
+ epan/Makefile.am |   2 +-
+ m4/libsmi.m4     | 125 -------------------------------------------------------
+ 4 files changed, 24 insertions(+), 132 deletions(-)
+ delete mode 100644 m4/libsmi.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index a2851e0..e6ed5eb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -422,7 +422,7 @@ EPAN_EXTRA_LIBS = \
+ 	@KRB5_LIBS@			\
+ 	@LIBGCRYPT_LIBS@		\
+ 	@LIBGNUTLS_LIBS@		\
+-	@LIBSMI_LDFLAGS@
++	@LIBSMI_LIBS@
+ 
+ # Libraries and plugin flags with which to link wireshark.
+ #
+diff --git a/configure.ac b/configure.ac
+index 3b3475b..326561c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -432,10 +432,6 @@ linux*)
+ 	fi
+ esac
+ 
+-# libsmi
+-# FIXME: currently the path argument to with-libsmi is being ignored
+-AX_LIBSMI
+-
+ #
+ # Check if we should build the Wireshark User's Guide
+ #
+@@ -2427,6 +2423,27 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
+ 
++#
++# Libsmi check
++#
++AC_ARG_WITH(libsmi,
++  AC_HELP_STRING([--with-libsmi=@<:@yes/no@:>@],
++		 [use libsmi MIB/PIB library @<:@default=yes, if available@:>@]),
++		 [], [with_libsmi="if_available"])
++
++have_libsmi=no
++if test "x$with_libsmi" != "xno"; then
++	PKG_CHECK_MODULES(LIBSMI, libsmi,
++		[have_libsmi=yes
++		 AC_DEFINE(HAVE_LIBSMI, 1, [Define if you have libsmi])
++		],
++		[if test "x$with_libsmi" = "xyes"; then
++			# Error out if the user explicitly requested libsmi
++			AC_MSG_ERROR([Libsmi was requested, but is not installed for development])
++		 fi
++		]
++	)
++fi
+ 
+ dnl
+ dnl check whether plugins should be enabled
+@@ -3012,7 +3029,7 @@ echo "                   Use pcap library : $want_pcap"
+ echo "                   Use zlib library : $zlib_message"
+ echo "               Use kerberos library : $krb5_message"
+ echo "                 Use c-ares library : $c_ares_message"
+-echo "                Use SMI MIB library : $libsmi_message"
++echo "                Use SMI MIB library : $have_libsmi"
+ echo "             Use GNU gcrypt library : yes"
+ echo "                 Use GnuTLS library : $tls_message"
+ echo "     Use POSIX capabilities library : $libcap_message"
+diff --git a/epan/Makefile.am b/epan/Makefile.am
+index 9f7de62..e85f97b 100644
+--- a/epan/Makefile.am
++++ b/epan/Makefile.am
+@@ -330,7 +330,7 @@ libwireshark_la_LIBADD = \
+ 	@KRB5_LIBS@		\
+ 	@LIBGCRYPT_LIBS@	\
+ 	@LIBGNUTLS_LIBS@	\
+-	@LIBSMI_LDFLAGS@	\
++	@LIBSMI_LIBS@	\
+ 	@LZ4_LIBS@		\
+ 	@NGHTTP2_LIBS@		\
+ 	@SNAPPY_LIBS@		\
+diff --git a/m4/libsmi.m4 b/m4/libsmi.m4
+deleted file mode 100644
+index d719438..0000000
+--- a/m4/libsmi.m4
++++ /dev/null
+@@ -1,125 +0,0 @@
+-# Configure paths for libsmi
+-# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html
+-
+-# Synopsis: AX_LIBSMI([minimum library version])
+-# The default minimum library version is 2
+-
+-# This macro sets/substitutes the following:
+-# AC_DEFINE(HAVE_LIBSMI)
+-# AC_SUBST(LIBSMI_CFLAGS)
+-# AC_SUBST(LIBSMI_LDFLAGS)
+-# AC_SUBST(LIBSMI_VERSION)
+-# $libsmi_message is set to "yes" or "no"
+-
+-AC_DEFUN([AX_LIBSMI],
+-[
+-    AC_ARG_WITH([libsmi],
+-        AC_HELP_STRING(
+-            [--with-libsmi=@<:@DIR@:>@],
+-            [use libsmi MIB/PIB library @<:@default=yes@:>@, optionally specify the prefix for libsmi]
+-        ),
+-        [
+-        if test "$withval" = "no"; then
+-            WANT_LIBSMI="no"
+-        elif test "$withval" = "yes"; then
+-            WANT_LIBSMI="yes"
+-            ac_libsmi_path=""
+-        else
+-            WANT_LIBSMI="yes"
+-            ac_libsmi_path="$withval"
+-        fi
+-        ],
+-        [WANT_LIBSMI="yes"]
+-    )
+-
+-    libsmi_message="no"
+-    LIBSMI_CFLAGS=""
+-    LIBSMI_LDFLAGS=""
+-    LIBSMI_VERSION=""
+-
+-    if test "x$WANT_LIBSMI" = "xyes"; then
+-
+-        ac_libsmi_header="smi.h"
+-
+-        libsmi_version_req=ifelse([$1], [], [2], [$1])
+-
+-        AC_MSG_CHECKING([for libsmi >= $libsmi_version_req])
+-
+-        if test "$ac_libsmi_path" != ""; then
+-            ac_libsmi_ldflags="-L$ac_libsmi_path/lib"
+-            ac_libsmi_cflags="-I$ac_libsmi_path/include"
+-        else
+-            for ac_libsmi_path_tmp in /usr /usr/local /opt $prefix; do
+-                if test -f "$ac_libsmi_path_tmp/include/$ac_libsmi_header" \
+-                    && test -r "$ac_libsmi_path_tmp/include/$ac_libsmi_header"; then
+-                    ac_libsmi_path=$ac_libsmi_path_tmp
+-                    ac_libsmi_ldflags="-L$ac_libsmi_path_tmp/lib"
+-                    ac_libsmi_cflags="-I$ac_libsmi_path_tmp/include"
+-                    break;
+-                fi
+-            done
+-        fi
+-
+-        ac_libsmi_ldflags="$ac_libsmi_ldflags -lsmi"
+-
+-        saved_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $ac_libsmi_cflags"
+-
+-        AC_LANG_PUSH(C)
+-        AC_COMPILE_IFELSE(
+-            [
+-            AC_LANG_PROGRAM([[@%:@include <smi.h>]],
+-                [[
+-  int current, revision, age, n;
+-  const int required = $libsmi_version_req;
+-  if (smiInit(""))
+-    exit(1);
+-  if (strcmp(SMI_LIBRARY_VERSION, smi_library_version))
+-    exit(2);
+-  n = sscanf(smi_library_version, "%d:%d:%d", &current, &revision, &age);
+-  if (n != 3)
+-    exit(3);
+-  if (required < current - age || required > current)
+-    exit(4);
+-                ]]
+-            )
+-            ],
+-            [
+-            AC_MSG_RESULT([yes])
+-            libsmi_message="yes"
+-            ],
+-            [
+-            AC_MSG_RESULT([not found])
+-            libsmi_message="no"
+-            ]
+-        )
+-        AC_LANG_POP([C])
+-
+-        CFLAGS="$saved_CFLAGS"
+-
+-        if test "$libsmi_message" = "yes"; then
+-
+-            LIBSMI_CFLAGS="$ac_libsmi_cflags"
+-            LIBSMI_LDFLAGS="$ac_libsmi_ldflags"
+-
+-            ac_libsmi_header_path="$ac_libsmi_path/include/$ac_libsmi_header"
+-
+-            dnl Retrieve libsmi release version
+-            if test "x$ac_libsmi_header_path" != "x"; then
+-                ac_libsmi_version=`cat $ac_libsmi_header_path \
+-                    | grep '#define.*SMI_LIBRARY_VERSION.*\"' | sed -e 's/.* "//' \
+-                        | sed -e 's/"//'`
+-                if test $ac_libsmi_version != ""; then
+-                    LIBSMI_VERSION=$ac_libsmi_version
+-                else
+-                    AC_MSG_WARN([Can not find SMI_LIBRARY_VERSION macro in smi.h header to retrieve libsmi version!])
+-                fi
+-            fi
+-
+-            AC_SUBST(LIBSMI_CFLAGS)
+-            AC_SUBST(LIBSMI_LDFLAGS)
+-            AC_SUBST(LIBSMI_VERSION)
+-            AC_DEFINE(HAVE_LIBSMI, 1, [Define to 1 if you have the `smi' library (-lsmi).])
+-        fi
+-    fi
+-])
+-- 
+2.7.4
+
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
index 246333277178..e63e4d8f74f3 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/wireshark/wireshark-2.4.4.ebuild b/net-analyzer/wireshark/wireshark-2.4.4.ebuild
new file mode 100644
index 000000000000..b56e421d4d18
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2018 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
+	lz4 +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:* )
+	lz4? ( app-arch/lz4 )
+	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/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		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
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.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 lz4) \
+		$(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
+}