gentoo resync : 04.05.2018

5 files changed, 348 insertions, 117 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2291fdac5cc6..8798705fb126 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6aaf1784eb2e..5925d3f3b02c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,12 +2,14 @@ AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c
 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-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87 SHA512 a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
+EBUILD wireshark-2.6.0-r1.ebuild 6642 BLAKE2B 4c4758d2b0f549e650518f8048a067fec34635c052ba3058c5f97d8a68b3ba845758cde26d582485a8a4435c8dd477b434c99d45a26aa8744eeb10269bb684e0 SHA512 2e26c86b1c147fe282cfc5d6abf77ec3ccf27e59422f9d976d7f29a9f2fe227b12736a8ef49584bba2a67bd465d553f8108f6761d26ecf3b382919112b277dc0
 EBUILD wireshark-2.6.0.ebuild 6657 BLAKE2B b067e041801abaf66207c7841e41d7d359d3e8d5300be0bb78f484e75feae8889c50cd75d566e4c3e32e12728df261f44dccb6784ecab7da8ac67eb9fb1675b5 SHA512 d213869467b91e8b7d4bb176441d2905bb7de877ae88651b1e8f4f16cb54c86b0eb189efdf8b0387bfc694cf61c0f6978f655639d77ea469ce1788e6f94985c6
-EBUILD wireshark-99999999.ebuild 7131 BLAKE2B 33279bcabaa939b5262335b2d3d589fcd6b954111788e5bd42eb4c13594a0239b214b3a340978c95b0b10e246be6c3430d9da5d7ad03380ae07c2a098ebcea61 SHA512 d43c61aa3f810821ff74315fdaf6dd10e2d3755ed9b167105412a87fa51d2df64809258b8541e480ea2af49934b51ccbbc14ffb3995cb02a8b81d36ae7f3dde7
+EBUILD wireshark-99999999.ebuild 6520 BLAKE2B 78ceeee60594acab089f13dd8c6b0f22b4a1f954b34e1d2647f180e25bd36bb3aac95d3027c52bc0d87d765b3406baf0f5dc64e9ec54c9e1d39fafebb0bd2ac3 SHA512 88a9cef54e5d0b1ba3e2bd6743caaf7a244eb55e43ca58baa1846dcdbc6bff9f3aafe147920ce8196623793717e3b6fb9665ba93700429998cde61aeb37d3b9a
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch
new file mode 100644
index 000000000000..e28465e814a5
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2841,6 +2841,7 @@
+ 		if(HAVE_LIBPCAP)
+ 			set(androiddump_LIBS
+ 				ui
++				wsutil
+ 				${GLIB2_LIBRARIES}
+ 				${PCAP_LIBRARIES}
+ 			)
+@@ -2851,6 +2852,7 @@
+ 		set(androiddump_LIBS
+ 			ui
+ 			wiretap
++			wsutil
+ 			${GLIB2_LIBRARIES}
+ 			${ZLIB_LIBRARIES}
+ 			${CMAKE_DL_LIBS}
+@@ -2862,7 +2864,6 @@
+ 	)
+ 
+ 	add_executable(androiddump WIN32 ${androiddump_FILES})
+-	# XXX Shouldn't we add wsutil to androiddump_LIBS instead?
+ 	set_extcap_executable_properties(androiddump)
+ 	target_link_libraries(androiddump ${androiddump_LIBS})
+ 	install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})
diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..40b8f06bf924
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune 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 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
+"
+
+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 )
+	bcg729? ( media-libs/bcg729 )
+	caps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	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-1.2.0
+		media-libs/speexdsp
+		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
+		dev-ruby/asciidoctor
+	)
+	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.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# 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."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(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 '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		echo "Installing ${wsheader}"
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	for wsheader in \
+		../${P}_build/config.h \
+		../${P}_build/version.h
+	do
+		echo "Installing ${wsheader}"
+		insinto /usr/include/wireshark
+		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 s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.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 dumpcap && 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
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index e39d7345ef96..c216e52d33d5 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib qmake-utils user xdg-utils
+inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune multilib qmake-utils user xdg-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -12,15 +12,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump bcg729 +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 )
+	adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
 "
 
 S=${WORKDIR}/${P/_/}
@@ -32,7 +28,6 @@ CDEPEND="
 	adns? ( >=net-dns/c-ares-1.5 )
 	bcg729? ( media-libs/bcg729 )
 	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
 	gtk? (
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:3
@@ -40,10 +35,12 @@ CDEPEND="
 		x11-misc/xdg-utils
 	)
 	kerberos? ( virtual/krb5 )
-	libssh? ( >=net-libs/libssh-0.6 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
@@ -64,7 +61,7 @@ CDEPEND="
 	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
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
 	${CDEPEND}
@@ -73,11 +70,7 @@ DEPEND="
 	!<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
+		dev-ruby/asciidoctor
 	)
 	qt5? (
 		dev-qt/linguist-tools:5
@@ -93,28 +86,16 @@ RDEPEND="
 	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.6.0-androiddump-wsutil.patch
 )
 
 pkg_setup() {
 	enewgroup wireshark
 }
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
 src_configure() {
-	local myconf
+	local mycmakeargs
 
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
@@ -124,109 +105,74 @@ 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" )
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex 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 bcg729) \
-		$(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-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(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 '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
 
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
+	cmake-utils_src_configure
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
 
 	# FAQ is not required as is installed from help/faq.txt
 	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
 
-	if use doc-pdf; then
-		docinto /usr/share/doc/${PF}/pdf/
-		dodoc docbook/{developer,user}-guide.pdf
-	fi
-
 	# install headers
 	local wsheader
 	for wsheader in \
-		config.h \
 		epan/*.h \
 		epan/crypt/*.h \
 		epan/dfilter/*.h \
@@ -238,11 +184,22 @@ src_install() {
 		ws_symbol_export.h \
 		wsutil/*.h
 	do
+		echo "Installing ${wsheader}"
 		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/
+	for wsheader in \
+		../${P}_build/config.h \
+		../${P}_build/version.h
+	do
+		echo "Installing ${wsheader}"
+		insinto /usr/include/wireshark
+		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