gentoo resync : 09.06.2018

7 files changed, 142 insertions, 18 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ba19980b5827..1b91db39b374 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,12 +5,16 @@ AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfb
 AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
 AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
+AUX wireshark-2.6.1-Qt-5.11.patch 1968 BLAKE2B 74c96bfdec9540b7ea91dd71c9420ac735e9f9b7d2ebccafad5447252d7f6768184ce3af16628e966634473687f8da92e300b47c01ab2ce974a475e8796886b9 SHA512 a079b03d35733f837e73c5d2bd6860ccc3dc185f4488ac4768b3cf081bde15e86a562c7c5e445775e2618f993e8286d5bde9b0617f9d3f30e94d1802d4d75a63
+AUX wireshark-99999999-androiddump-wsutil.patch 772 BLAKE2B 061dc2253d10dd088ebf7cacbe6a1afadf2b5b41d37ad1de07e6c3985feb13934f743c3c303dab0548d4df4b762afd876ace6f522a3d0d750ed1d77b823402b7 SHA512 181683e22a2b694c28e49915d2b00e7c3261dc9eabc1893892d0c62f73b4aa28f3811a5b69ff496e2c166e2fa958f0a54776d63489337ccd4851d4eafddc0f0a
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
+AUX wireshark-99999999-qtsvg.patch 792 BLAKE2B 88a51d38d3854ff6488a5b3042866f9dba4a94009e241c1ec1838b008af7c006433d59b550a289bc132a01ee873838c22bc478f780d5e930afdb04de295426f0 SHA512 7cc0d21d5689fdae0714799f6b2ba3711a44eb353e55d4f367b5fd1974688be517d9629a8b68537edad8545ce5f5149109a5af3392d1c70e6d76734b7bae1822
+AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 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.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 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.1.ebuild 6751 BLAKE2B 6b16e6dde3cfd158c8802b8de6bfcd41ec3f3c8fb8fc40d240023b30f80e2103c792d764996741abca06e0daae1bc5309955e368f231fcec5680f8dca31561d7 SHA512 42b51e4dcd87f05ea632005168f7eaa50b16cfe64f80b35c7ed9d7f43f52cee989f9fc7d739cea45f0697e2d6281fb252395853e9723f502bd418b8c21ba9499
-EBUILD wireshark-99999999.ebuild 6599 BLAKE2B 88bd901752d603d201d8f5cedaa986b70c19f934f3998003d8f14039eb9b86dfda8983a5a987f70efdb32fec3a2075e0059492d82b66f8ae9510a2475a434f43 SHA512 8b3d5fae3df5f2ca4cfcdd9fcfd110dbe88e7b9a283f2574242ccd7ef39aac44f3957d1488dc944166af7445aef6dff2d6f0c7371a5694a67ca877806371fc5f
+EBUILD wireshark-2.6.1.ebuild 6790 BLAKE2B 430b730aee91af383d262f5900ef4ff12250f24e2054f3a1a2d1592b3a0a8f8caba6f223ad55d2a6144c588fe79d474981d7c4c77fbb7dd0790d5442dd580a6c SHA512 7e696dc58ba80acf94afddada8f63660f03023a18dc654daf541b2aa7b98fc902f70c25b72050afa3456e0ab95b07491a514538309705a0de34a31dc59818441
+EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
new file mode 100644
index 000000000000..c8d8bb9ce9c2
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
@@ -0,0 +1,54 @@
+From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
+From: Roland Knall <rknall@gmail.com>
+Date: Wed, 25 Apr 2018 10:28:30 +0200
+Subject: [PATCH] Qt: Fix various missing header includes
+
+Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
+
+Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
+Reviewed-on: https://code.wireshark.org/review/27145
+Petri-Dish: Roland Knall <rknall@gmail.com>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Roland Knall <rknall@gmail.com>
+---
+ ui/qt/packet_format_group_box.cpp | 1 +
+ ui/qt/time_shift_dialog.cpp       | 1 +
+ ui/qt/wireless_frame.cpp          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
+index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644
+--- a/ui/qt/packet_format_group_box.cpp
++++ b/ui/qt/packet_format_group_box.cpp
+@@ -10,6 +10,7 @@
+ #include <ui_packet_format_group_box.h>
+ 
+ #include <QStyle>
++#include <QStyleOption>
+ 
+ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
+     QGroupBox(parent),
+diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
+index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644
+--- a/ui/qt/time_shift_dialog.cpp
++++ b/ui/qt/time_shift_dialog.cpp
+@@ -14,6 +14,7 @@
+ #include <ui/time_shift.h>
+ #include <ui/qt/utils/tango_colors.h>
+ 
++#include <QStyleOption>
+ 
+ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
+     QDialog(parent),
+diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
+index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644
+--- a/ui/qt/wireless_frame.cpp
++++ b/ui/qt/wireless_frame.cpp
+@@ -23,6 +23,7 @@
+ #include <wsutil/frequency-utils.h>
+ 
+ #include <QProcess>
++#include <QAbstractItemView>
+ 
+ // To do:
+ // - Disable or hide invalid channel types.
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
new file mode 100644
index 000000000000..8ceb3ba54882
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
@@ -0,0 +1,34 @@
+--- a/extcap/CMakeLists.txt
++++ b/extcap/CMakeLists.txt
+@@ -68,6 +68,8 @@
+ 		if(HAVE_LIBPCAP)
+ 			set(androiddump_LIBS
+ 				ui
++				wiretap
++				wsutil
+ 				${GLIB2_LIBRARIES}
+ 				${PCAP_LIBRARIES}
+ 			)
+@@ -78,6 +80,7 @@
+ 		set(androiddump_LIBS
+ 			ui
+ 			wiretap
++			wsutil
+ 			${GLIB2_LIBRARIES}
+ 			${ZLIB_LIBRARIES}
+ 			${CMAKE_DL_LIBS}
+@@ -89,7 +92,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})
+@@ -212,4 +214,4 @@
+ 	${androiddump_FILES}
+ 	${sshdump_FILES}
+ 	${ciscodump_FILES}
+-)
+\ No newline at end of file
++)
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
new file mode 100644
index 000000000000..4f151dbba21b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -910,14 +910,12 @@
+ 		Qt5LinguistTools
+ 		Qt5Multimedia
+ 		Qt5PrintSupport
+-		Qt5Svg
+ 		Qt5Widgets
+ 	)
+ 	set(Qt5Core_OPTIONS REQUIRED)
+ 	set(Qt5LinguistTools_OPTIONS REQUIRED)
+ 	set(Qt5Multimedia_OPTIONS REQUIRED)
+ 	set(Qt5PrintSupport_OPTIONS REQUIRED)
+-	set(Qt5Svg_OPTIONS REQUIRED)
+ 	set(Qt5Widgets_OPTIONS REQUIRED)
+ 	if (APPLE)
+ 		set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1187,11 +1185,6 @@
+ 		# That's the name autotools used
+ 		set(QT_MULTIMEDIA_LIB 1)
+ 	endif()
+-	if(Qt5Svg_FOUND)
+-		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-		# That's the name autotools used
+-		set(QT_SVG_LIB 1)
+-	endif()
+ 	if(Qt5MacExtras_FOUND)
+ 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ 		# That's the name autotools used
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
new file mode 100644
index 000000000000..c0bfc3acd5a6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
@@ -0,0 +1,11 @@
+--- a/ui/CMakeLists.txt
++++ b/ui/CMakeLists.txt
+@@ -76,6 +76,8 @@
+ 
+ add_library(ui STATIC ${UI_SRC})
+ 
++set(ui_LIBS wiretap)
++
+ set_target_properties(ui PROPERTIES
+ 	LINK_FLAGS "${WS_LINK_FLAGS}"
+ 	FOLDER "UI"
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index 0303f97755a3..c5eea4d2e6e9 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.1-Qt-5.11.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
 )
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7ca08d8b9246..d1a9875cba39 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 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
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux
 	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
 	zlib
 "
@@ -28,12 +28,6 @@ CDEPEND="
 	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 )
@@ -43,7 +37,6 @@ CDEPEND="
 	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
@@ -81,15 +74,15 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
 )
 
 pkg_setup() {
@@ -142,7 +135,6 @@ src_configure() {
 		-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)
@@ -155,7 +147,6 @@ src_configure() {
 		-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)
@@ -205,7 +196,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk || use qt5; then
+	if 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