gentoo resync : 02.08.2019

28 files changed, 850 insertions, 915 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 11e103331103..11a32727cb54 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 5c30f3b0f7b1..37d10d6232f1 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,8 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
+DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 EBUILD icinga2-2.10.5.ebuild 4737 BLAKE2B 82b6eff71862480ff9017a301a45d807e2ff8c23eaafd2ee5e7df29e75f90e7f33507bce3ee3d14b6c0deeece33a7b531f023e8429dd55779578c3ce82b99a44 SHA512 b10ae453454d9747f3368c39be3c380bd1409f48298d32d7380b68bfc8fffdbf48afe1271ba8c30766c23b64335f46fa3fddcd313598e94856acc3dad4f696bf
+EBUILD icinga2-2.10.6.ebuild 4739 BLAKE2B 98edc856ce987b5e3b6ce3b7c13626392f1cd8c30f445aee583d20b35b07c86425eb12020461266f04ce009840f94c4636716c8ceb57ca7dac70ceae0c0cccfc SHA512 36f667896c130b61d2f76f29ec014207b60fc3dc9743a6723e51983e89be3bb4727d0243b516dd695b3f88265365ff2205e852546889911da2e530bef7cf7b93
 EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
new file mode 100644
index 000000000000..8a9695a5e27b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 89c3520ec08d..b7fef81fa80c 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,5 +1,5 @@
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
-EBUILD linkchecker-9.4.0.ebuild 1417 BLAKE2B 1674975fc3c778beaf6e78b6d6f7320cbb6fb913d0fe0d5de029aea274b961cd9e5ec1adbfcd07745320327f1c1edbe6f73682ed40adec397894e37a1970c76f SHA512 0802830c19cdb9750ae4ad5d997452b4f3cd103dc41478618fdc971ab0a9e3ce4185abcabcaf89f804f2194e4367de681e77e8c776635ca6ed6396576db31119
-EBUILD linkchecker-9999.ebuild 1221 BLAKE2B 0193a2f063e41a641b2b008e4b84abce2aa41826d9a84f51582b21dcafaa5633bbeb6c771f232f9cafcc49c1d3c9f2ca50c3b473b9d208839e2d3b6153ef3abe SHA512 970acb72a0edc5fd6792b6d06bfc2807682ee9e7c275187b6b80248322e575363db3b485828845abbb58ed3e1dacdbce3fe98d0b6a8538df96dc2f1237e2c92d
+EBUILD linkchecker-9.4.0-r1.ebuild 1413 BLAKE2B 6cd2e21b3de44c95362f5f25b9f058d556fc4878c0d35feec881e89723a38830180a7dc044f72026b9aaf74f3b25f9ccb0208a20444234c8b3f26437712f171b SHA512 5386a834bae0852e622e8c4f323bf3c9dad496278322d3d72944b8562469e76100e7cfd83931c6574615fb914a27438ad1e6f08d61df32700498824771a3fcc7
+EBUILD linkchecker-9999.ebuild 1217 BLAKE2B 14229d6a36b20b6827a3e5410525ecbb5728f3684479d2b2722f2fdfa63fbb51425db3ccda3d269c572addc90ad41029926516b8cbbdfbd30df00a3950b740a7 SHA512 26fa313483c47548775c9172780e86c80f9859f26c30ea7bf544b690f88889a803093df577da497a7629cf09ab54acb5f7e2a7f73b5f557929acb96f1121a479
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild b/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild
index ce086daf5a23..a18fd0556c92 100644
--- a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild
@@ -18,9 +18,9 @@ KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="sqlite"
 
 RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 DEPEND=""
 
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 528d4f9fc6cc..32272ea2e2c4 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -19,9 +19,9 @@ KEYWORDS=""
 IUSE="sqlite"
 
 RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 DEPEND=""
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index cabc7f546772..c573681025dd 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
-EBUILD metasploit-4.17.21-r4.ebuild 12241 BLAKE2B bd8f424eb18242dcf6113c99ce1ec2b22d3a493a3b54ba1de1af358c2efece5e93e8430ae6726ffc3011cccddff656cfe6b4e51ea229f4656d39018739872bf5 SHA512 56b1bcf9388914ef39adf2b438bbc168fbe88b27404c753441843581efc35cb280a39240125c47a005834f8e1acad05a098d4fca472d4f364835d32fe4dabd80
-EBUILD metasploit-9999.ebuild 12233 BLAKE2B 43593e3349db4932a2c4808be403b07e4dceb79abdad407a3285a515f31209ddddbeddf371822fc71156f99c1dae3dbbee8423d776370926a6108adcafa4dcce SHA512 eea4237aaaf6a6c36f6df83a1b4475126797c3fa2c2c5758042e28079b46637e56e0b509abe28eaa149029dd5db683111773d479c59c972b4b4f1d258483e799
+EBUILD metasploit-4.17.21-r5.ebuild 12470 BLAKE2B 15d5d3b943bfaadcd355d5aa8eb6691296929c9b969c66374230ed708b3d3c94f73733fdd482bff7a9ca8b4760ba2931deffdf138f1ba6c3c272906df2837ab2 SHA512 49247dc10f2689bba6f34ec5fe1da5ca589009800bf7b35f3516fe08eea015c1ea9bdd39f48bdfc5544b167bdd9fad0c50f8690c48d5da482910029b74e30873
+EBUILD metasploit-9999.ebuild 12236 BLAKE2B 9a52de12c903d51345700cdef81c206cf18416fecb12375c698d93aadd04fc8ae9f245ebeb5f04ac982ba71d4ad8cdda78cf5753d102c88657d4e8bb5d973d5f SHA512 29bbe0fbf7316a662c08bf0a71593e339ce0293f8b8edfc9515aaf49a6c76b45e359b9dbb50a8908a7e07787874bdbe9beee1917ad1026ff41b42528e42210b9
 MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
index d749f104d93e..e980b733098c 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
@@ -45,6 +45,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bundler
 	dev-ruby/dnsruby
 	dev-ruby/faker
+	dev-ruby/faraday
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*
@@ -123,7 +124,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
@@ -239,6 +240,10 @@ all_ruby_prepare() {
 	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
 	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
 
+	#fails without faraday in Gemfile.lock
+	#despite activesupport(?) needing it, it doesn't end up there :-(
+	sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec
+
 	#let's bogart msfupdate
 	rm msfupdate
 	echo "#!/bin/sh" > msfupdate
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index dbc324bc0ec4..49691b5c0747 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 415e437d61bf..fb4c7308e2fd 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -9,16 +9,9 @@ AUX munin-html.socket 129 BLAKE2B 5ff1c673732f6a10abb79d929677a06791aeec99094754
 AUX munin-node.service 194 BLAKE2B 38d849ec81750cedaf74f8575bb779a76bf6dbd2e737ddd9b961fcf024832ed0ba5c62708546df81643b9045b0da18783eef9421e49524dd3e61ff03ed3cebcb SHA512 e7586afed85e67de04494353dbc9a3008e6246a158ddb66634c799c64bd8ea991a153b45c050934edde18cd7ac0828d1961acd3a1ddc9dc6b088cb95f0ea7a1b
 AUX munin-node_conf.d_1.4.6-r2 188 BLAKE2B 419e475fb422a74d1c094145c25b7ad371e1075b2a60c5241df1492b85c95fe9891db04afaad295096935da03c58d2279e346ba5020cdb11d092ce4b487ccb47 SHA512 f6b4b198a219ab4706aea3820ac36932bdb807abb7f42447cc36afe140e15a04e65d5daa44843aaedf1ecfa2f040a373687ddea4f94a55d104492e640c313152
 AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce94ee1dd9e2ca9dc15ba322b531fe4564a76e5cd6526b5b1be5bf06e31ca6c108e8e9f05c89d718c7531ef18a5f SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b
-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.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eba6f024c6ac430356cff725c35cfdd84240f5df57d87a0c5bcd71fa5c1dc0482c6a91f7a46d75aeca68f745a74264243 SHA512 a725f978710f328b0a14aa96b5ba499eead358668431c2d53483847846a447bc6f5be855d12c0c13e7dadf821e1c8aee1352ba90f380db389c6d720a0704785f
-DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b033a190cfa1d3a5def7455daf7c6cae741b08f3389b4508220eb2bda6b6afd7eddf620dbb745eecd9cbc3e7b08 SHA512 1139cd2ca765ba85fcf7cf37986fb0dd5423d976ae2943373ee4706f376a6f299f0c626912db318eb49e541054017c604725e6f9b0c1e9198530375a2db6eb05
-DIST munin-2.0.47-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.47.tar.gz 2257217 BLAKE2B 5b21c779487741ed505f77e07926d275741471a4dc699c8b8032bf008853c93757b7d0303773fbd76ec72dcf9185927a50517ca6d7744bd1020cdccd966cbb1b SHA512 63b292378576726886a606f089ef3b19073bba89b63768570d9f1e6d12c69d1dcded6b2b377fd53290443108023a01c9cc81b6fd2ea092259cdf5b116bff665a
 DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762
-EBUILD munin-2.0.38.ebuild 12317 BLAKE2B b6ff588ee1677a7c4224f7c9bc11701fd3b6c4c1384644254ca75a9e30a885222eaae96344415b773311d70e17443043e573ef7fa1f38fd16358acd452dee614 SHA512 a536fd709bf2bec938551eeba84054b9a8b7a12e82ec9c2abc75f81463871c8809e6d97cfe5dd0e265d2bcd3faf25c1dc438d6fb7ded527cd2ad4437733bc7eb
-EBUILD munin-2.0.47.ebuild 12243 BLAKE2B dea9c3a348864d433d2ea6eb9d855aa8304d4e37f0821e827bc02b6540119afc1984839500bae78e542830ad21fed41cb905cf4c1fff0ab8e2872d1774cf75f2 SHA512 9e2dc7f379d7d99d486fe7f298e36dd9b21129526afe63eee2c3fd148fce4fade486e056edea616decc5d4e38dd530ab6c72d2d495adc9df2083ddb75a3a1dc9
 EBUILD munin-2.0.49.ebuild 12275 BLAKE2B 01ec8f4ff21fdeae4a9479f3386b05cd6450acde550fee53830e032f7b6b0369b7814748185c4970b1ae417abd54624946df376694686aa75514433dd0f837f3 SHA512 762bc414c30ac62a73bce6f276c096120ba181d0085b8036fae5a8774bc8d977caab97c1e576f588c3229f085f4e5d4363eb909bfc64942beb1eeac487be7788
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.7 b/net-analyzer/munin/files/munin-node_init.d_2.0.7
deleted file mode 100644
index 7932e356f2e8..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.7
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-
-command=/usr/sbin/munin-node
-command_args="--config ${CFGFILE}"
-pidfile=$(get_munin_config pid_file)
-start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0} --wait 1500"
-extra_started_commands="reload"
-
-depend() {
-	config "$CFGFILE"
-
-	before cron
-
-	[ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \
-		use logger
-}
-
-start_pre() {
-    checkpath -d $(dirname ${pidfile})
-}
-
-reload() {
-    ebegin "Reloading ${SERVICE}"
-    kill -HUP `cat ${pidfile}`
-    eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-2.0.38.ebuild b/net-analyzer/munin/munin-2.0.38.ebuild
deleted file mode 100644
index 25d031a02c76..000000000000
--- a/net-analyzer/munin/munin-2.0.38.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=1
-
-inherit 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 ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( 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
-	apache2? ( 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 )
-	ldap? ( dev-perl/perl-ldap )
-	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-Exception
-		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() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	sed -i -e '/hp-ux/ s/done/fi/' Makefile || die
-
-	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 apache2 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 apache2 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 apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; 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 apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; 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.47.ebuild b/net-analyzer/munin/munin-2.0.47.ebuild
deleted file mode 100644
index d1c4dea964e8..000000000000
--- a/net-analyzer/munin/munin-2.0.47.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=1
-
-inherit 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 ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( 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
-	apache2? ( 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 )
-	ldap? ( dev-perl/perl-ldap )
-	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-Exception
-		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/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() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${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 apache2 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 apache2 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 apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; 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 apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; 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/namebench/Manifest b/net-analyzer/namebench/Manifest
index cd134473688c..ba7b0b463483 100644
--- a/net-analyzer/namebench/Manifest
+++ b/net-analyzer/namebench/Manifest
@@ -1,3 +1,3 @@
 DIST namebench-1.3.1-source.tgz 1118505 BLAKE2B eeb1921dcdc627d9ab7d0742f7ad0e17915a301243b8f152472b9c8e545a0510655f637989ccc377b03d2b8c4f7c95dafbb8496fb49449bc9c2f2caad30e5708 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b
-EBUILD namebench-1.3.1-r2.ebuild 1055 BLAKE2B 042b0aec8504587bc4089136abec68fcab6c4853950852e1bb48ad20169251048e04992f3a09bb5d2544e4a2a87a9c9f580355bc9d7b17623e02a4287af81af1 SHA512 3c455685a45426aeeb184f0cca7e9a08997c8050c4543dfdc588d9953358d0684f465ddc6aae65f641aa369e3a3672f349023bcf70b3f7a8102564f4cedae04f
+EBUILD namebench-1.3.1-r3.ebuild 1051 BLAKE2B 21d1f618e195b62c0ee9ef6986775f0e9573dadc4affa39b1ea755870ba18f3c3f9fa7c88d2c1ef10f0b11a5cb230d1fd6fbc6bd2429a1f308d767b43193210c SHA512 9cc9acca3ffc717883103f3eacfe17de1501a596b06c149b29d22212173ef33db98ac20285f26a321d2f3d737818da82d4aabb038941bea9bcebf3d3edc2913c
 MISC metadata.xml 359 BLAKE2B ab64609d2c15ddc53f224bd9ef0acd57e4ab0571fa3eee09c8cef165339c8674db40adfa6fc3dfb3c1736dbb7e839fd13171e9a0360e6537855ad866ee6d8c59 SHA512 e7f84527d450abc038dd4962899a3a6789787049c8b097ec485f53b6b6143503e3d394be629c3987a450af6c718086bb5deabb38a8e95271d32fdfda7fcff3f6
diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r3.ebuild
index 147f06b12436..880c4fc0f9a3 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r3.ebuild
@@ -19,11 +19,11 @@ IUSE="X"
 # PYTHON_REQ_USE does not support X? ( tk ) syntax yet
 DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
 RDEPEND="${DEPEND}
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
 	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index c8e2fe360ae5..5119f4160bf8 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -2,12 +2,14 @@ DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762f
 DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
 DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
 DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4
+DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
 EBUILD netdata-1.15.0-r1.ebuild 2904 BLAKE2B 07a2bdffb08348bdb67c3458148b13a9a0c8b5d961f7a5e112202780f481c6d2876f0fd7001ac92871eed2380c46acd45c85ec4d07a58cf4a776f651af23de71 SHA512 0abc01056a0c320c84db10483c58ce31e3e1bbac5e29953afedc6481627f0f8a3ba83826a72f6105706c6c8d5dbc5a6873f134b561ebb21e9da2ced343fe212d
 EBUILD netdata-1.15.0-r2.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
 EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
-EBUILD netdata-1.16.0.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
-EBUILD netdata-9999.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
-MISC metadata.xml 993 BLAKE2B 94e8d906b5e1f52b67a35a622efba0f581b90bd7603dbca52191410676980da200b7c83d736beec48fea1fef6534c247fa8bc4e017bc4cfe730394f12a5f4a3f SHA512 0a88120e40aadc1647135b93771330a4076ff25d9881c92856b7ac0873d56e3e6365da27c1f080eaabec702aa05281dfc308572e0b3488e4c232609ae543d07f
+EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-9999.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index f12bf742e155..a160e06f3657 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>candrews@gentoo.org</email>
-        <name>Craig Andrews</name>
-    </maintainer>
-    <use>
-        <flag name="compression">Enable compression via zlib</flag>
-        <flag name="dbengine">Enable the Netdata database engine</flag>
-        <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
-        <flag name="nfacct">Enable the nfacct plugin</flag>
-        <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
-        <flag name="tor">Enable monitoring of tor</flag>
-        <flag name="xen">Enable monitoring of xen</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">netdata/netdata</remote-id>
-    </upstream>
-    <longdescription lang="en">
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <use>
+    <flag name="compression">Enable compression via zlib</flag>
+    <flag name="dbengine">Enable the Netdata database engine</flag>
+    <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
+    <flag name="nfacct">Enable the nfacct plugin</flag>
+    <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
+    <flag name="tor">Enable monitoring of tor</flag>
+    <flag name="xen">Enable monitoring of xen</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">netdata/netdata</remote-id>
+  </upstream>
+  <longdescription lang="en">
         Linux real time system monitoring web interface
     </longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/netdata/netdata-1.16.0.ebuild b/net-analyzer/netdata/netdata-1.16.0.ebuild
index 77427218be1f..b12cc034edfb 100644
--- a/net-analyzer/netdata/netdata-1.16.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.16.0.ebuild
@@ -96,6 +96,7 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=${NETDATA_USER} \
+		--disable-jsonc \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
diff --git a/net-analyzer/netdata/netdata-1.16.1.ebuild b/net-analyzer/netdata/netdata-1.16.1.ebuild
new file mode 100644
index 000000000000..b12cc034edfb
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.16.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		--disable-jsonc \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 77427218be1f..b12cc034edfb 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -96,6 +96,7 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=${NETDATA_USER} \
+		--disable-jsonc \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 3dd827021d4a..9df358df028f 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -7,5 +7,5 @@ DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
 EBUILD netselect-0.3-r3.ebuild 976 BLAKE2B 53e56c268d75225b7566279f7fe604a6fd915d40e31160947c8a2ed10e47c06ec815e27371357a8b2641fdd488b1f3f998a68afc3f32fe3fc17e13df3d7cf5c1 SHA512 c3a42dec4c8830765d1b5122465708c9c8f47d67c80a57a69ce91741f7c135de52963ac9ef2ed0a5306a32b9ba7f86e7383ed7faf5d3227434fcdf1c24ecfaef
 EBUILD netselect-0.3-r4.ebuild 994 BLAKE2B af8c22627e8ab2e495a2d4653543c69bd30d7a406551a07d87570782dd00d98e7d386eeb4de2e0dd16a0f6e41754aa0f903e78da93f19f16f23cf4f1bfe862d7 SHA512 af56e7e5c74d79f4079d2721021f9c9b00183db5e92eec44e722a47c98701250910afc7057d7fae1a7d5bccd39104620625a46dd02ef8948caf734b80abbae6f
-EBUILD netselect-0.4.ebuild 949 BLAKE2B 50444201310b1a71a915c2dc98038388cb56015a5a1d9e60095af67d4aff7c0bd4483166f43b1f0df9f3d3e37395c63b466c60d785932272acee4ca93e61cf40 SHA512 5506431382ebf9ec59179133b252b628667a0897d8629594cdfede616087865ce1219d563faaebdac219be99d9adc0e180117523b42cda1f9f1321ddfde4a14b
+EBUILD netselect-0.4.ebuild 947 BLAKE2B dcc1c3f14d962b309906ef195192e662b911899c7fdfaff6e2e47365526ba7e919e8aed1ca60d48fade4a000dd4a013d54013f938446ec01b5515c13033df7bb SHA512 4c7c982412e35e7cf90b49cd8a06545d5a5fd429fb7e6894fd250750d6a1ebdeaaee288fbe6434d54b4e9942074ad89642bd9e9b128ac085e4d5c3379ad34658
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
index 29fb6185a9fb..05f5cc209795 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest
index a2ce7cc8d9a6..ab1abb260b3e 100644
--- a/net-analyzer/squid-graph/Manifest
+++ b/net-analyzer/squid-graph/Manifest
@@ -1,3 +1,3 @@
 DIST squid-graph-3.2.tar.gz 20066 BLAKE2B 16c4b9621ad45eefe7be8c83d7339fb832516241e8eb17c7f0906b6dc7cddf06b2ed32d00e84ab390f95f7a57798f7af75a36af940605ce186513c09611c2152 SHA512 ab2529b0b67fb6549dd0837f2208ae712460ad19876baee8000a51c91ab31c464b83b360dfc93690ad6f4b3feb969cc95ca38a179ddefb6e0aa54b0cff866bfd
-EBUILD squid-graph-3.2-r1.ebuild 476 BLAKE2B 20f7043064320e636d1019b7d128f670f393a8d644147f47942922e724b5ecb075e0e9b939de9a32bd3596729d75468a3b8ee23ca4dd44793317492c8461d44c SHA512 6a7c6deb475718b5b10a9d6f3fbabd85e7a412211bd7e8743f60a3ac4506566ffc165504cf90030d63eaf7f57c01085469231359ce13845344fa91364f0e608d
+EBUILD squid-graph-3.2-r1.ebuild 478 BLAKE2B 19d7d79525a3bb2fbe4619bc7ce5e8bbb8991a65db242f93b242e2e0a45ce6bfa5e61cb4e42cd06fc486f322a7f1b5d71aeae13e377b976e60e58c7edbbb9289 SHA512 2073dd5f11f68ec6f3164fe6962b8cd1c0ea975628ac1c23b2e3d0f5a7522fa34fbe46e3e190f3a51de0583e9527cf460f2d15a5a1217e0605b899aa9e416577
 MISC metadata.xml 440 BLAKE2B 3a2323e854cf053276baf26c951e546fbe3ad63edbd4d753525795faee01e724ba385c7d60b2aec7fa5422670d7cf5958d30d5a6b01cc87c8751152b5360f3fd SHA512 32c8207098291a0c1d4248d3d2a6c726a9627c038be9df16aa9368ae20c6dfd63380152c79b3348d990fa61ea8acc220a87bafe3e3f5ba9913686b142aea23d2
diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
index a532f9ba04d6..2d14d8885f1b 100644
--- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="dev-perl/GD[png]"
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 106ed20bc285..9551926f8d72 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,8 +11,12 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d
 DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
 DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
+DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
+DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
 EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147
 EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9
-EBUILD wireshark-99999999.ebuild 6742 BLAKE2B 1c7c56171e9fa7a768966a6949c00fa8afa7a108c5da6dd912188790541d0a0308618ab9f484e983444b63df3e7960558ad15886277b17fdf053b5640c97e123 SHA512 81ce54ba8d23f0b3f9ab62ab1718bff1bd96981d3349fb779672c3ffb0f155bf2997c62e051e7334188fe12a3b8af4bce1f9f4f5ef1925eeeac7a0970b383043
+EBUILD wireshark-3.0.3.ebuild 6582 BLAKE2B 903e0d9984291cf6a19d02b037ebaf81dbada4e64665800bd8411291bcb4835d4d89f167c5e4626bb7c103376c51d6504759df17c82983f9dcf61fee08c13b57 SHA512 7f6b2b4333b81835f719ce22684e0a5c0a213399b16aa41575544957376ce258de5784abf088c78347fd5bdc1e95a9482bbfe2a9a64f51fc276ab0388478b5c5
+EBUILD wireshark-3.1.0.ebuild 6736 BLAKE2B f06505598eaafeb3299579665ebc28a3e01c14b595c39b62aea0b48e5d00c9dd01a6f54a1b420cedabaf560cddc7a19009717c8a4cc759a0eaa55eb2f16e5752 SHA512 7b442698ccda0e6c932012aaec2530c7b3c835b8568575c6e2c6459cc93094f50c85c7a40e11bca3786ca354b667fad593451feb4ce0cfc52423ac2cef1b093e
+EBUILD wireshark-99999999.ebuild 6741 BLAKE2B 32a56fe750a8f75cb8dd242570171c63ab6b06f209ba01109aed7cca903f47ed6b4b77be567a58ee7720f410e83432b16042601c5ba1f6bb4b941f5bf0e469cd SHA512 b42a66200147a7ea82f038fa1766b2cee29575f4df5a02eb62d908e9d347a7fc494eb5fe8099d1464863d5ed48d778e7c59c88e4a51b4e88673b45d9a699e272
 MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
new file mode 100644
index 000000000000..f7585e7fc2ff
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.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
+
+	python_setup 'python3*'
+
+	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_dpauxmon=$(usex dpauxmon)
+		-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_sdjournal=$(usex sdjournal)
+		-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)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps 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_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+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
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	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 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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
new file mode 100644
index 000000000000..bd412c65b24c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-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=""
+IUSE="
+	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
+	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+	+text2pcap tfshark +tshark +udpdump zlib
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	plugin_ifdemo? ( plugins )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.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
+
+	python_setup 'python3*'
+
+	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_dpauxmon=$(usex dpauxmon)
+		-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_sdjournal=$(usex sdjournal)
+		-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)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps 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_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
+		-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_test() {
+	cmake-utils_src_test
+}
+
+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
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	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 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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 937819a5e035..c964508b1b07 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -8,8 +8,8 @@ inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
 EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
-
 LICENSE="GPL-2"
+
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
@@ -19,7 +19,6 @@ IUSE="
 	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
 	+text2pcap tfshark +tshark +udpdump zlib
 "
-
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="