gentoo resync : 09.06.2018

23 files changed, 176 insertions, 494 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1b09638049ba..74af8abb5504 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 258af4792d84..51c0fd56394f 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,7 +1,7 @@
 DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3
-DIST etherape-0.9.16.tar.gz 1435235 BLAKE2B af6d0ba7d9532b383322546a42126fd456a2695ec7332cd082addc6ed72bb8e11d058854881157775e767c37c0ca3984074bdbe2f8a098622f48d38e9aa99281 SHA512 0c0b5e04cf1628fe22cfa35ee85b4ab4736265d071c9d179c0dc52e2894f022da7648f236e7ab29e28049a4afc8728ba639a6654da82e299938259fbe01e0d57
 DIST etherape-0.9.17.tar.gz 1436276 BLAKE2B 3ac9496238d5a3653129822c6d21643a5e65afd93ff278532bcad623a0c4dc05b553711dd6f7047774cb758a6f65113a3381a08154001a6c2058415d35f2cd1d SHA512 65f039cd98826fee9a5988235dbdface00e2f17e5bd83eb28339d5bdb9d2b5f8ffe84e071c36418617d68add32e39866eb393f23b008b35fe36662453a02c57a
+DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a6eec0635472752daf420c890d4a5231bd1baff6ee58937ad27e1d96eaae5b79cc2f9a2b6eeeb7c957d08cbc8f667 SHA512 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
-EBUILD etherape-0.9.16.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
-EBUILD etherape-0.9.17.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
+EBUILD etherape-0.9.17.ebuild 604 BLAKE2B a4ed8fe466630bfa884ea32bbd7c244a5fb16e4bff3ce0031d081b8beaf246563937d542056743aaf4d45c5bd41da724bfd4a92003d5f3948c7d1af9fcd855ac SHA512 fb24c1a48cf6a96d7b000995c18c96e97551f611b15e1e601682f4815164c2283ed69ed55611d04c387eb271f54fa874e5ccc15b46be167b25fcee43934495c8
+EBUILD etherape-0.9.18.ebuild 564 BLAKE2B 093ec296766b484fa508462b6f65d8b56af5884f0c98dda915e60bc69ee5be7936236a4456a5b1dafec25a33ff981383742c197df8f12d0bd1d3db2943268dc7 SHA512 94e51eca55f371dff53d6dd0a4ecc88495edda31374fee272a3eb8af173e1837d114b26c1bac2597877c84af4bbb187bd5e57ec73caeaa4c64ff0ce820482289
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.17.ebuild b/net-analyzer/etherape/etherape-0.9.17.ebuild
index 4f8df6a0aae4..74efaf843ce3 100644
--- a/net-analyzer/etherape/etherape-0.9.17.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.17.ebuild
@@ -14,10 +14,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=gnome-base/libglade-2.0
+	dev-libs/popt
 	gnome-base/libgnomecanvas[glade]
 	net-libs/libpcap
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
diff --git a/net-analyzer/etherape/etherape-0.9.16.ebuild b/net-analyzer/etherape/etherape-0.9.18.ebuild
index 4f8df6a0aae4..1cfcbd672427 100644
--- a/net-analyzer/etherape/etherape-0.9.16.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.18.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
 
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
 HOMEPAGE="http://etherape.sourceforge.net/"
@@ -13,13 +12,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
-	>=gnome-base/libglade-2.0
-	gnome-base/libgnomecanvas[glade]
+	dev-libs/glib:2
+	dev-libs/popt
 	net-libs/libpcap
+	x11-libs/goocanvas:2.0
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	virtual/pkgconfig
 "
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 888e1efc1cef..2614ee46d858 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -14,13 +14,11 @@ AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce9
 AUX munin-node_init.d_2.0.7 745 BLAKE2B 069f730d947991d9ecbc75dfa038dcc5ef089ad1759dbea8d15c40a4fef7b5b33a1bc9dea2d916c0e4dd88285015a7aa714f3fd900c7724e3d3e620b84a4cdd2 SHA512 e6652707c539afef01e7cd777acec2c639edf66fb9bf1f126711d19f166eb3ef69d5ed8e895e77e4fb0b7f5a4c8788eb6532f4e09d13693d164e6edbde55e5d0
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.33-gentoo-1.tar.xz 11024 BLAKE2B 60170b0e25143f56c6663394ae08b7323c4371111c7faf35b9fdfe0849860ecfdb1fbd50c0400e950d3330c5d0b3a309ab09c1f5724805c759a2e6078efd2dfe SHA512 c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8
-DIST munin-2.0.33-gentoo-2.tar.xz 11288 BLAKE2B 3e39e7ad1f7ed39f8ba1f5eef4183f94dc6010f31c05ee3e1c60e44450f932f677d0d2ecac40c1255959afb0069b9332f82397c7be3225acb3f1400cd720eb3f SHA512 4d185529199377e85fb3e7d0a8c38de2ae500d2f992292e6ae016d11e81642833725987ac006b5f535963593c7698c676d28091805691e8b46c016fc2580917d
-DIST munin-2.0.33.tar.gz 1349546 BLAKE2B e2604c1ea492df6d6bc801bab664483b63186010c0a5cb021c355ad5bffb6ccac738d8462351e795704f7305ac752c8efa342d6ad20a43d7db96729c1d05fb5d SHA512 33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67
 DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9eb33d4c8fe5f680bd3655efb5f0adce53ba4a839258e0324bf734f7367819abc8c6a4b859a48b36b015ea80c0b1f4a29 SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b
 DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
-EBUILD munin-2.0.33-r1.ebuild 12312 BLAKE2B f99f25c18c642166cb877f49aa9885227c6da17d7c98030719c956154cba0911c9dfe63f7547fcbced685a6e40868005e938c7fd4720db8150ec4005c3f96834 SHA512 1978ba10bc17d82979b000cdf6983510d173609471a14ae8a7a9d005db94d75c214c32da8cd57e314eb15df53dd5f2b6069d3a098dfe4287dfc5c2aeced08beb
-EBUILD munin-2.0.33.ebuild 12178 BLAKE2B e53b9a9c58c03152f832024532ecfdd78fd0f5489556fb0e36c85fcfe28a7a891f1b5a296cad5038d30d9233b5205c7881e3f8001b9f5addb732869b2cda3be1 SHA512 264679112c768409b98d058c9ffbac595b9c947a7eca496038c9c4e8a366ed3ec80f7a3d937ad21341be3879e7e15dee7d8f77bed1516f294b811ea85e202c8e
+DIST munin-2.0.37-gentoo-1.tar.xz 5572 BLAKE2B 5f6371b2fd7e4933e3f19435e74773d2f74d6d909d65aac1f26e334239af2de4f7f78f81ae58c763024a30a15c9eaf9324c5a3a4ccc5b086951c1a49ddf8a2c9 SHA512 9ab47db4c98bc68a32e63aaf44fad83661efa316ff8f19967a886e3c5e268288d7b25503639c89e851edd57a50d215d8dd46b8e9b985feac9d367d56eb21610b
+DIST munin-2.0.37.tar.gz 2249145 BLAKE2B 430a89e6ec5920885abdd09779e61df1365ba132527ac156803a2b71d1a10d716658135a34820083b55ed843f8c6bd502c0f078493ab995df39b0afe4ee5d86e SHA512 22a87fe17a3674464e0cb242c27db57eb97a2b23e5f1fc7044de1b1b8187fbdb2ee5dbab51df42c87dfd8640194fbde23332998bff707368997421c61098d07f
 EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
+EBUILD munin-2.0.37.ebuild 12383 BLAKE2B 3da162ea89c907034b757ffed960bf651e04a7268e98d6830868b44b1b45ab00daf77675cc0e16b0e4aea40edeeb9ad66994506d30f17e97a9ac20cbb6900902 SHA512 8ff80be8cd3d11976ddbf9d9748c8a4156a2c0005852ab8f490ea5dc96a37e36d54866b367e0a6b10a1fca77fde3bcb0b6703da2a74b3dc301674164796bd690
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.33.ebuild b/net-analyzer/munin/munin-2.0.33.ebuild
deleted file mode 100644
index 71e21e8175b7..000000000000
--- a/net-analyzer/munin/munin-2.0.33.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=1
-
-inherit eutils user java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
-REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.37.ebuild
index e8bec20e1080..b2d7e64c0b8b 100644
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.37.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PATCHSET=2
+PATCHSET=1
 
-inherit eutils user java-pkg-opt-2 systemd
+inherit user java-pkg-opt-2 systemd
 
 MY_P=${P/_/-}
 
@@ -116,9 +116,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-	eapply "${FILESDIR}/${P}"-perl526.patch
-	eapply "${FILESDIR}/${P}"-nogitversion.patch
+	rm -f "${WORKDIR}"/patches/0001-ipmi_-replace-the-ipmitool-based-plugin-with-one-bas.patch
+	rm -f "${WORKDIR}"/patches/0008-netstat-plugin-active-connections.patch
+	eapply "${WORKDIR}"/patches/*.patch
 
 	eapply_user
 
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index b9da3c956352..36a3943d40a3 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -8,6 +8,6 @@ AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
-EBUILD ntopng-2.4.ebuild 1723 BLAKE2B 349113c042d144ffc60e4cda0aa7714af23506c5e88d3b0f6dd70e21de1d4f5b3835d6fccef9f2893705d60190d637b6153299a25974dec37cfb29fe8b629368 SHA512 f17de8331ace1f50eddf367bf25c1619edcb3d1a391f63adb2c205fc74f324135c010322e9f9c30ce25a72bd6f59730612d5fc6019a109ec1a785250e2161ddd
-EBUILD ntopng-3.0-r2.ebuild 1628 BLAKE2B 5b9486c8c37cfe852366819fc6324b8fa6bd2bb058f9619cec00bde8259415f15a46ca898f4f1e60432c30a0def885a0d0322709faa757bce9a1f169189c9b87 SHA512 72af23df5efdf0655e38ab305987c93fe27c0e09d3404e8c5482c68138b9e4eb5887a48deb0da88c5d1742eec527d532f335ef42749a960f56630dfacc1b0e07
+EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1
+EBUILD ntopng-3.0-r2.ebuild 1629 BLAKE2B cc4f109a79f52d93416db7d10e7c3d7291d2d286ca9eec38dbe990691e5c5bd236bb264c76dfd0063cd2e31de2c9682e6247131a1b668d47051f9553a86d1124 SHA512 90ae9cc4bc63818a48056685a256596b19a049d6812bb4fac534408587c31602f33e03f3ab0217cf8681bceeddaed17826b0b1cc4551c46ee9b55a65fb619794
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 0e383ae5ce4d..d024ad1f63db 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index 0fc8da9c6326..bbf5c8da9375 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index d66784fa8d3f..edd217788483 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,6 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
-DIST scapy-2.3.3.tar.gz 1459132 BLAKE2B 442e13853cfd4bac4984571367990ce03a2fc1a634564ed7e05641130d435818f161687c530f17280a20f1063aafeeeea35cb867fc2f7d78a4f3ae257dbb6f90 SHA512 47ca2eceafe7b693c569a92c106782037d869c323aaaec41cace07dfdeb3c6a7e9f7bc8ca1150b3c0daea54e6665f93eb1dfc3c511419cfa28eb2e0753bf9ba4
-DIST scapy-2.4.0_rc4.tar.gz 2472251 BLAKE2B 720777e7d19ae1a312ccd78c6d005cf6f1f42fcac8f11956b2fb5521dac17ef477106cef2ee9a9384f764dd1aef337b010faed61f2fb34c3458b3a9c836eb4ed SHA512 003d573fb8ec83029eca93fa9f6333f9a4b4a166ab355a19339194b6a7b8a772d692afeed8d19e0f9422caae326167f1acf819319327f3495dc389fc9a2ea811
+DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 EBUILD scapy-2.3.2-r1.ebuild 897 BLAKE2B 6c39e33ab0c611135c34362038461e51e8adaef9828538782b35639a452704892d6ea6d6d1759f475bdf2a35f9b397b5ece3b390a21d73f46ef9964354e8de51 SHA512 c3dff0a0ce1e5929bde3cdecd85654f7f1e070bdff3735359714c3d5d427ca4ae9a339642573274dda1ba13ae041b483fcaf3c46b8ea70c4100685cfee7d89c8
-EBUILD scapy-2.3.3.ebuild 899 BLAKE2B af30ed756c47235b49aa1a20f89e9f9f0d4fe306cc999f11e2ecc55a79bd52342ec85a743dd47b8c76d9f118cb482aa875bc057e4455a4c5b19002b16f8b77fa SHA512 85cd0bb71df5e99fd737753d13f5e33a1811c8d23e38b6bcca2493b78d27e69deb393d0e363ce43d5de4fb0d8ef042768fae5a20b117d9d7befd2052de99825a
-EBUILD scapy-2.4.0_rc4.ebuild 1033 BLAKE2B a153a3ce37f760d3d25b04039df1214b25608f423abb372ecd9d8850d95d3acace29ecce60679f27754525395323b71d3d60ebb928ffc6985fc9199764647c18 SHA512 906406ecdd04d2d0dbd63c23f9fd4f7b264085b99ce695ccf1b63f59c4cc3f0d8733b64b2e327ca6cb3660324d34dc3c827b0d189f476e4ca16991283dd10700
-EBUILD scapy-9999.ebuild 995 BLAKE2B 10bced8b1549478cb7d91214e349f6352f85efec8297153b112e022c513d90933246f014d3a19979fb3bc2bc74c80e40cea4accb1dcfcb2160b0035d79e51767 SHA512 19720ee0a89e9f4b7ee6a3f7f3d3e3cf2744f44e9eea9dcc3e6cdd2ddcb8d51fda73f36c01e9216489c37e138cb81b6af8599389defb72b3a98ce6da8e05d33d
+EBUILD scapy-2.4.0.ebuild 1037 BLAKE2B f3ef7f4a91c9ac52dc34df1b07512cce0193255c0a4c4ef3f7c2888e4108d79977371e408206ad4002eec60f459ff4b473999307bbd98efff1462289325dd668 SHA512 771dd160785c597009bc490cfabbd076f43833bf6f2a350496fa976024caf2b7f2f8457869062e0a35784a4d88aedffebfbd8cbea978198c4d0f3085b81ebd0a
+EBUILD scapy-9999.ebuild 999 BLAKE2B 2c61522bc128d74c8acd148c942eeb0dbbd85482a58c5544dccf7af13aa9d85d0900334e254e38fa373fec380956a2e85d5ce76d241f8b12fc99dce48f706c45 SHA512 3fad60f8813012d4152a7648cd631a9f06f7068d223e30a306c9b32404bb2665e5b0af5f3baf91f0a1342d78173978821137218a8538e5dcf6aa9fd55959a7a9
 MISC metadata.xml 747 BLAKE2B bdfb12b918fe2bd88cac770277ef69fd3bc2d1ef74f6176edbfaed9c9c6bdaa8495bb78f557e24eee8f3b47f7f487a668c76a8d9e532749a9221da0227f3cec8 SHA512 5ee06d7b6cccd1b5939a6f7bd3cbe043285bf630db8f992f627fcd04b929abf70eab31aca5d1270cb1c33e51f1c2460d89b3963af20363122be7f56e1c10ffea
diff --git a/net-analyzer/scapy/scapy-2.3.3.ebuild b/net-analyzer/scapy/scapy-2.3.3.ebuild
deleted file mode 100644
index 391396815ff9..000000000000
--- a/net-analyzer/scapy/scapy-2.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
-
-RDEPEND="
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
-	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
-	crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}]
-	              dev-python/pycrypto[${PYTHON_USEDEP}] ) )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( virtual/imagemagick-tools )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )
-"
diff --git a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
index 8d3d643afa10..87c9eb983d6f 100644
--- a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -27,7 +27,7 @@ Scapy has optional support for the following packages:
 	net-analyzer/tcpreplay
 	virtual/imagemagick-tools
 
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
 src_prepare() {
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index ce815cfb2f7f..37900e5421fc 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -27,7 +27,7 @@ Scapy has optional support for the following packages:
 	net-analyzer/tcpreplay
 	virtual/imagemagick-tools
 
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
 src_prepare() {
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 10ca0cd26495..8a7208a4ceb3 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,5 +2,5 @@ AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62
 AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 DIST suricata-4.0.3.tar.gz 12392388 BLAKE2B 9b6338b343ff85f070d61608ff9dc7f25df868fdffbc13b5a8d245cb3db5cd757cb1785c827c388653b2f8a7977129259671900bc1abfebeb878a668b4058bdf SHA512 aa6b6d1ae86efad0184ba4fa06375f34334e07c22b7b1f82bf17fcb0ae48ad7f867bced57ab4f713de01583965e1260cb82e1355f78002071b689dddd3b53892
-EBUILD suricata-4.0.3.ebuild 4559 BLAKE2B adf2d05e0a605e7539edc6e89895b8da8d05ee7fa3e8f2c1a86557785dae0f69f9a98138d82e2496303d03642416cc3620f72507cfe4a9925112a366eeb87d52 SHA512 c57ab35bfd25ed6321c4abdce2fd32bab1e8a3a89ce1513f6464bb766850edcfa03ffef52c5aaf69edcaffcf143ce19cb0b8a51e1cfd98dc1c94bcb8ad166003
+EBUILD suricata-4.0.3.ebuild 4561 BLAKE2B d1b439fa196eb3e7e3d8b2eae0a3114d0db584d3d80ee914e10e62a245049b42f614432a8139a274091200fe485ed7e48eccf11f5de070751b82f977e7fe8021 SHA512 e21acd789dd6e45ba0b0afc0912a7d22a6cd3014329031a5662022d6af5032b5fc42ccb6c59e51db8a55386d90f7596865979526953ed8d9835182ab2b040394
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
index 19c4e17ebb26..501a7c7a03ac 100644
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools eutils user
 
 DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
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