gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-analyzer
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
135 files changed, 1976 insertions, 1279 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b7062e4373aa..f048a776e006 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 86eed3a396ec..a1da80587ae3 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,8 +1,8 @@
 DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2
 DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2
 DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282
-EBUILD arping-2.17.ebuild 696 BLAKE2B a7c597992d93e0d3ff39916042f978c99ad43ad99339edb54d8f3f694b7bc651a9d827f8a77534ee29775e7eb7bec5066dc8e1fef3135700d2b53c11e17feb5d SHA512 a61be5c3bd84ff0b76d2f9b5fbfe3c2fb033cdfcdf755a96e04637faf9a61410f597770f7ff2d344d4bd52dd9c688e7f0121f6ea21ba74462730c61cd30c7acc
-EBUILD arping-2.19.ebuild 705 BLAKE2B c524cdcac8848de0ff2675ce69870a2f10c97e44dce6317c83c2bfb8c3c22a2d86d82148b0929c4a2a5d54a7350cde1777a3d6cce24545b4b12f61eba04078dc SHA512 016060a189a6a85ae825c9578ee63efa2f463af60b2f9e8ea5b19a873b7a89f9dcd20abb185768698e92eb8951251d8b9f1e15a92daadba4af4003315ff4edef
-EBUILD arping-2.20.ebuild 784 BLAKE2B a884e1a4797b0bc4c7bb872f8686826b69440d53fd3cb7694d4b1287fb9ee7bf7af0c0c16f363959b72a5bf3c9800b2c854fcae792b385a72a558a61c6ac8656 SHA512 a131e5b00fe3289c89895c553c708482810f368fdba2b35518ac743f3ec1ec242ca9395d5d533c4efd2626bc3b821ae16c6de69171c6c5f728f5078fa0389ef7
+EBUILD arping-2.17.ebuild 720 BLAKE2B d519da4e3ed1674a47d53391641a7b23027b63dc738013c7721c1cd97f0ee772e46b285afad0014b34cd7199757abb499ab8255e43df01ffb2723c18b57c5d40 SHA512 c03e11c22b971862c4d1b95838d587977f70c3afaed5d3038b348d49ec83ecad2853d4da37146942876f2d35b0b653ef06a169051fdc61d0dd4c458ff5459b26
+EBUILD arping-2.19.ebuild 729 BLAKE2B af75619dbd47a05ddd7956da56bac240eb19017df187f895ba5ecc74623bee988a2e256f330a0614dc3cde14226b9672aea3d20c56d7d6c09abda012f24b5a02 SHA512 4519008c8b2de9c878243cb07a78f5dd4166fdfb118289bd9ade85496ca9eb9658576ab99fe3243fdc2e1370ae97a041885830fb2acb17211d12e2f12c4ef74b
+EBUILD arping-2.20.ebuild 811 BLAKE2B 823c9a759cdfe2a831fca83d6e02dcfff9c4fac95af8c7f134809191414c896c1b5af1e4e5092fbc51bfd4531d09245081b925d5d07055af8f0c9a50338c235b SHA512 4a40d0e652c6384966946b2de7a983a26895c2e30158aa5581053eca20802b6339b778a49ec29d560fb5ede72d8f87b28dd6d0ea71bde7f9c2ae2c534eeb6f1e
 EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index afd95c1681ba..d835ad002b19 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arping/arping-2.19.ebuild b/net-analyzer/arping/arping-2.19.ebuild
index c31fa81c7b4f..8c07c531c864 100644
--- a/net-analyzer/arping/arping-2.19.ebuild
+++ b/net-analyzer/arping/arping-2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild
index bfa7e8bc3a8d..2af28124c81d 100644
--- a/net-analyzer/arping/arping-2.20.ebuild
+++ b/net-analyzer/arping/arping-2.20.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 62bbf5d27c93..daa8ba807de3 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,3 +1,5 @@
 DIST bwping-1.15.tar.gz 104234 BLAKE2B f0bc4b050760c775b5186667c2c15ce431832761d0bf00bf451d37514f93bafc1b6379ba96c30b1132f6dcb22fd4626304e4037c47794f9bf6fe28d10d5df6fb SHA512 76578571e3b3ca0f5ee61c28380d784fdcfbcee632e92b28a42c446ded9fb0fd0b682f360a51fca2df599353d5da9227762b186b5339ccfe7b9a7fa876399f8a
+DIST bwping-1.16.tar.gz 103811 BLAKE2B 63880d4fe96d1272c06ca307fd0eb16fb1729ec3ddbd0de7bd484859625b3a9e8ba6d5730ac8df30795e2f7cb22ffd73dc9416eaca1ebc876f7ada83bcb46ca7 SHA512 d8f625a858e8278021ae91c5476ce18d1ecb8518a0f1d3d410a59dea4a64ec658fff527bc1f80d141a1249fe92da87afc536b86d31a30bcf316072e45cbc3998
 EBUILD bwping-1.15.ebuild 386 BLAKE2B 9dc4c68a191c42d7c0de0b62ed51b92c2eb2ed7cd70f287134ebd84e43535819c35cab83921b17ec68bbe7a7a75e6935edb7ab924d92b444b914195d88733c9e SHA512 5dcf64cf3df28ba31e1225ea8cf558e4df7f95923211388a2b8198ba3476edf01d30497935cf00c3cfc8e1e7f8d400a7dd00b8fff5200d49f7f0a7f14322fb04
+EBUILD bwping-1.16.ebuild 388 BLAKE2B 6c319b4609361d8babc33eecb5c41f58f88a97f903f0944b00de30800dbcbca76c66a822d19e4ace5b2151bdf93fe8e9609637f3328425ed867c8cefc9a2dde5 SHA512 a6b1985c8d7e5b597216b3370437bcc0b3bd7d4fead357cdb71a24a6a836189ec7754a92c5798d118f6e16a18f44d5d563925d2ee7859e53b2db057833ac8efe
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.16.ebuild b/net-analyzer/bwping/bwping-1.16.ebuild
new file mode 100644
index 000000000000..b8610ffd425f
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.16.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="https://bwping.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+src_test() {
+	[[ ${UID} = 0 ]] && default
+}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index d19b074cdfdb..de6b15f08f3d 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,11 +1,6 @@
-AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265
+AUX cacti-spine-0.8.8d-ping.patch 260 BLAKE2B 4c6ac12fcb0fd31f6e53e46e5de39f34c565ee8ae1dbc947949ded2cc65816f697b6f4de40e0441c710b092f30a3b1eadf292b1065a17f385327c70071ca9713 SHA512 5bd91a390e352930d2b89f580fb0c3e93dfa9d52c86b16a0b8c036452088757e2b739aae05b3f07301a3ed94dafe6f05cc593b28359261b6664d002c907cfb49
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
-AUX cacti-spine-1.2.5-my_bool.patch 208 BLAKE2B 001bedf38a4cf481aa451670f9e8712b11dcae4192b8517db6c44b060560afeb094d66410f7e42fcd3229f96490782f0bcf23c359010762d25a7879def3c3668 SHA512 c0e873444ae4f259786a3e2705a0e07485fd6676bf5024cc503a8b30285b3920322c57184105a75148d696a4e762d63ff29c260b855f9a0c3040afc8bd7ab548
-DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
-DIST cacti-spine-1.2.6.tar.gz 106592 BLAKE2B 4c7f92e1c1e6061689a5a18cc73326e38b1ed275d443069bf5bb6ad0edb9429b4946096db650d9af73b11ec51f1bc8728420a5084847b4d468b1e13341655ea3 SHA512 6659a3694c38704e266efda40893ed8e1bc1c52f3ae93a66ad219043408dd77bfdbde55191982ed3cebdffce1f49faf3e487fb926c680ea9b1c6dd379e1b53fc
-DIST cacti-spine-1.2.7.tar.gz 106764 BLAKE2B 3c880c5e7e736d6d3acf3dbd5aeba13ed457d92541616ff8ddd2e88182a93c6c46ecc7c4c2d5f16784c91cdef823febf8fffac4a7ff92cf7ee11f1fda129956f SHA512 9877d4bb4d17728c714add8d5b6e974a2d92115753bfc1b2737e2d435072138169d9e2486eddc9e25048a4a72767baeb64a5479f738c4d3e57d8f362c8e3f48e
-EBUILD cacti-spine-1.1.38-r2.ebuild 866 BLAKE2B 16f5f9870d68ef5893d7bb9c6a31bb56916b935b2c665c13306cb6f57fe9d8ffc7c169d3744dd602648dc4db9f46b57d4633e537cce75107dd8aaced9d68ae24 SHA512 82fa09570d0e5d5a1226e82078dadfc384d75ee34f64744e2e70936d2376f9037035ab3abbe62a2d1c38e80cad4162c872ab89d857cb66c2c9ff32ac4d61bab4
-EBUILD cacti-spine-1.2.6.ebuild 936 BLAKE2B 16f005831e06f8b73cc07b945ed11a8a29b3e95a7b92714012088f90e5a66c33d831229b8fbe743c3a25c36df4133824e0c16561e56efe2b950804e3ff475297 SHA512 d8e4f9e7ca39d17cbdaabe81a7d973aa22863703c1105b0bdbdcb8bf20c557a7252999eafba2ef9f563d6910805afd74b31eb62b2b8524951d5c6ca1ae33683d
-EBUILD cacti-spine-1.2.7.ebuild 936 BLAKE2B 16f005831e06f8b73cc07b945ed11a8a29b3e95a7b92714012088f90e5a66c33d831229b8fbe743c3a25c36df4133824e0c16561e56efe2b950804e3ff475297 SHA512 d8e4f9e7ca39d17cbdaabe81a7d973aa22863703c1105b0bdbdcb8bf20c557a7252999eafba2ef9f563d6910805afd74b31eb62b2b8524951d5c6ca1ae33683d
+DIST cacti-spine-1.2.8.tar.gz 106801 BLAKE2B 813d4b6d4a4a632cc6d59c5c4eeeb37df78995ca5952e77204a9b5f8b599b34fe043b9f8c1ae81ad20600c08403ff06c04119db53bb03e37788fc11e5e39be6a SHA512 7f9a90f5e41a8a72d0068321b119f5ed7768fd7939bf5a994627b2f199158440639e88d31da35444e28fb73f8dbb57c1012f01ae09d24f0478d8e75a21bb942a
+EBUILD cacti-spine-1.2.8.ebuild 932 BLAKE2B 3e2b4334458dcc925064bb077de3ca579f77c4ea9ca1e9f3be99d83ca588c55a83bd692fde51a1e72120e8bbf803cddbc1c01b08bc17545018267b876bb5fdd4 SHA512 8d15cdfd14fdd29e7ce8aa205e8ad0a44c9763c774582d161840cabb1655f9ebbd47fe3c1610c056e16b77d62e1ab1679289ff05b4cb070cbfffa8609586e689
 EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
deleted file mode 100644
index 3a835f786dd6..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.7.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.7.ebuild
deleted file mode 100644
index 8ca6122419f9..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libressl"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.6.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.8.ebuild
index 8ca6122419f9..3317303b0b2e 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.6.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86"
 IUSE="libressl"
 
 CDEPEND="
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
index 0d94674ce5a3..55dc8754c8db 100644
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
@@ -1,11 +1,11 @@
 --- a/ping.c
 +++ b/ping.c
-@@ -813,7 +813,7 @@
- 	int    rv;
+@@ -913,7 +913,7 @@
+ 	struct hostent result;
  
  	buf = malloc(len*sizeof(char));
 -	memset(buf, 0, sizeof(buf));
 +	memset(buf, 0, len*sizeof(char));
  
  	while (1) {
- 		rv = gethostbyname_r(hostname, &result_buf, buf, len,
+ 		hostinfo = gethostbyname_r(hostname, &result, buf, len, &h_errno);
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
deleted file mode 100644
index d9554bfa38c5..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sql.c
-+++ b/sql.c
-@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) {
- 	timeout = 5;
- 	rtimeout = 10;
- 	wtimeout = 20;
--	my_bool reconnect = 1;
-+	_Bool reconnect = 1;
- 
- 	mysql_init(mysql);
- 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index e6bf646dee11..2a27bff4175d 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,8 +1,4 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
-DIST cacti-1.1.38.tar.gz 9081347 BLAKE2B 9f64bc7cd33187c4c744e1473409ea8998cd953c6fd047c66af6ff07d288678cbd944d2e70d0fc3838a42c7f7a9dbf7b094963391791a46bc50c3ed65ed4251f SHA512 1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5
-DIST cacti-1.2.6.tar.gz 24707849 BLAKE2B eaeee3953d170d7df9eb14be85d700af2221f8f940f19ef59dc57b5f9d86e048811a04c31c8390d5722ae15dd9ad911a602ce0c95b2b999baf2104570cb4fb3b SHA512 69cccb6f87c0b7128c878528898395965b0223dc6edafa52905febd596d7b58ed240c7d0ffc211a3ef69d131c77a0f2dd5047914fb879d026c052b6c889cf21e
-DIST cacti-1.2.7.tar.gz 24819135 BLAKE2B 75dfc9eb054acf5a1344ebbbda30f35777db876e67891e8c793901882b3ba27f5bf250be4e4527ea64b5ea9af575e58fccccb47233c2a3d27ef57657312c6c5a SHA512 2fc31342aa23b4fa98e6f3cf6b7e42f8cf98f272232a1bceb1b256b2104ea26445c1be1c1ff83bf20d293a3c1e7a21eb3a871623f78069aea9b21151ac57a243
-EBUILD cacti-1.1.38-r1.ebuild 1032 BLAKE2B 030e73b3e11a9de423b821c918eb95d018dfbbef262d49c96e52fca3e6ac9ed7e5ea0d4e0e822a2c75b83f96b6569858f249ea5dc5252708fd333fe3db5671fe SHA512 287e2caeaf1c0551ce6f1fc68a3103d8dcf9c140c4b81bd65280c58696d9300ffd8dda0e43f3084830921b32a1ecece9b8c3fc3af06180cd7a23fb1ac62561f8
-EBUILD cacti-1.2.6.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
-EBUILD cacti-1.2.7.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
+DIST cacti-1.2.8.tar.gz 24881361 BLAKE2B 181b2eebf43c81a221b65eb9391ad758c05bb5871a35766a1f5323f453a0a6a533a1120963e04f7a01d4ac444942e37bf50a3c6cebe5f7261558142baad2f282 SHA512 e24d9de47a06c1741c7bcfe5c5f68a5a0f0cc2eb859fc930ced28f797f84ad537ff1a0a703dc8c26735cc4b54ba09699e33a30ac666e1f8ec2ec26ae4ceccde3
+EBUILD cacti-1.2.8.ebuild 1010 BLAKE2B 9c967abbc8ab2e20b2b4dc8c54b5ff933fde488f5321f5bcce7459a97786f70a35a1162b92194f77b9b886e714b6b3b9f2488476f753488f445290d89ec088aa SHA512 ddd995b9afc9f7c9c1a8f95b824ad56a498b8d210f71bf81deecc4b823e6e4b6c9a6142343bd06e70db202c3dd8bcd7e2d0cc06dfdfbdca0d6face2ed0fae424
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
deleted file mode 100644
index e50638085e2b..000000000000
--- a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_compile() { :; }
-
-src_install() {
-	dodoc docs/{CHANGELOG,txt/manual.txt}
-	dodoc -r docs/html/
-	rm -rf docs
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${D}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.2.7.ebuild b/net-analyzer/cacti/cacti-1.2.7.ebuild
deleted file mode 100644
index c44b77bddbdf..000000000000
--- a/net-analyzer/cacti/cacti-1.2.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_compile() { :; }
-
-src_install() {
-	dodoc CHANGELOG
-	dodoc -r docs
-	mv docs .. || die
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${D}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.2.6.ebuild b/net-analyzer/cacti/cacti-1.2.8.ebuild
index c44b77bddbdf..5b981481d395 100644
--- a/net-analyzer/cacti/cacti-1.2.6.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 7acf1b5d08db..1faf6583dba4 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,4 +1,4 @@
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
-EBUILD ettercap-0.8.3.ebuild 1742 BLAKE2B cc0211f64fd7b19a5dca22b14dd56f0fb39467451887b04bc2b3f33177187776fad9bd904be4101293be96968ece4924a4a0bfb7a6ba93d9f4dd7d8299b85606 SHA512 94ebd442f5f6ed0bd7daf7fdf1e1faecef5e80a6b1111ee83c00af5ba2c8c03ceb55c1e5db5d580644f0dfd0f84cc4ac9a6a9f5c0c384e5ce68624d0f0873ac9
-EBUILD ettercap-9999.ebuild 1701 BLAKE2B b1cea3586da1d8193878fd793a8bce5ec6674d9ce2d257b2f2d6d58d58133316cf7100392a6efa71c885ed598b92e46f658bcb933982c34c4c319e8c450ec9ed SHA512 4054f3a885f9c4916a1124d62e7cdf99e9e51ab367892ddc1da337e8e2b1e49eddc64f6ff01c7aa8491768be99fbda203e032e0404dc2f5cf0514c04b8c27d39
+EBUILD ettercap-0.8.3.ebuild 1769 BLAKE2B 48ce2bbbd78731ca8ed81942d7e4076372c5ce71f57b2fe992c5cef3169b17ef7fa55c158e91376d99a14a237d76d1ea3d482fb98d03bcbc60f3c624d9f69ca3 SHA512 0bb95b7563a38ecb7c141548b7d450de99f5bde8031fe681f0e13cbeeb47fac38cc0c2e963c1e76660c469b39292eac2e6e26d5ef64a0063f74618d08a7b2416
+EBUILD ettercap-9999.ebuild 1728 BLAKE2B 6349c5252483f16d8f2481d0bda8715113d373af5992638fcd384be8c0adfe9605a3004e5095e669b6e381feb3baccbba3a269b0d003ad6b03c4fbb23f6331a2 SHA512 8dcd83c19513d6770a4c6b3b1dcd7d1a2e6dbec9d879e1300aea26f1fe9f52cefb8ddd0f8635cd884454f72e47be6ed6ff0efbf267478222171ce774c13ec993
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index 0efc31c95f97..5a67e97e5162 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -20,6 +20,7 @@ else
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	dev-libs/libpcre
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index 504fab9ea4be..8db7873acf3e 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-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
@@ -20,6 +20,7 @@ else
 fi
 
 IUSE="doc gtk ipv6 libressl ncurses +plugins test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	dev-libs/libpcre
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 3b822ae4ad48..05ab059883ef 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-fosphor-9999.ebuild 1266 BLAKE2B 881f58972e6c63671162b6793ff35cabcb4649c906ffa855725e429a7a0a57f4fa3f413ae8df986daec13aa4ad622549ee80bef314f02dc7126bd36d29d9fe78 SHA512 5396e3f2ddee52a91f4981ce14490d9e5fdf1120bff9ed201b0115e0896199e2ea92a3a58bdc3f9c83c819db25f85cfc7080ddf43e820e9a7148931d8a95aab0
+EBUILD gr-fosphor-9999.ebuild 1317 BLAKE2B 96e8537a914531ffe116cf98900e3db6354834240d888e7d0f3206fefa39a911dede7f19585fc09eed34b212a2eb22eb444eb981b5d05275c7d19c3f78202de7 SHA512 38ea427606c212df9cb458c58acfccbe6d7e832cfd3dbbbe3052918ed7fe57b40516bb8f6975d2b390ade664a8a05bee43513884c4f174754d134642f0eb902c
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 29c293990ccf..ca6af0c3aa21 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -11,10 +11,9 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
 	#EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-	KEYWORDS=""
+	EGIT_BRANCH="gr3.7-qt5"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -24,10 +23,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+glfw wxwidgets"
+IUSE="glfw qt5 wxwidgets"
 
-RDEPEND="
-	>=net-wireless/gnuradio-3.7_rc:0=[wxwidgets?,${PYTHON_USEDEP}]
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )
@@ -52,10 +56,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GLFW="$(usex glfw)"
-		-DENABLE_QT=OFF
+		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WX="$(usex wxwidgets)"
 		-DENABLE_PYTHON=ON
 	)
-	# re-enable Qt if port to Qt5 is ever finished
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index b2e9e7609fc6..2be4bf55b57a 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -2,5 +2,5 @@ AUX gspoof-3.2-icon.patch 2951 BLAKE2B 952de6a5c1345656da88f52efba8a18da2dc45b4b
 AUX gspoof-3.2-libdir.patch 668 BLAKE2B 1f31874c36368022b18814a6dcbc0c3b8696b9ba12f51c6f5e1bf201ae2e8eb42f21521e9fc9cc1e214d8ee480f198c84b393b483c66766ecffb9b6aee07022f SHA512 d4cd192132d1a7cb12676032cb1d787b44b1ec5c7fd8667c1f69455de3892011407b1663a15d47c7a8aba38b61fb76f6f141c1c01f24420c5dad2b39f347f641
 AUX gspoof-def-values.patch 903 BLAKE2B dff9e5e8bd60a51f2acddf4e553c326fd491aa40670954da6f84cbd4ad5a357327af8833f8eb2b5e0b67653761aeab55e37964bbc1c012b2eddfdf1c3157270a SHA512 92b4a1b682669acd13b4fbf77083b633b881f4933445910976492fd093e1c4db3ef0b9d45f487ef8c3df9f252ca239d5411026f527ed3e0ab2972bbfbeea8666
 DIST gspoof-3.2.tar.gz 69340 BLAKE2B c5769a242d6d388b7606594a01b6543822167505ea6210a05f6a514c47ea875efdea3e81b495b1a635fa15d9a065a35b631b20512b326304e366f692f8a73be5 SHA512 be90aeeb9ac93b5c4a190564ecfedd05ee077afed67696b773cb79949043975807dabed8f49597dcd3b08b9b0ee53c598caa9dced6f97bd9d6170f8e82b8f0f9
-EBUILD gspoof-3.2-r3.ebuild 772 BLAKE2B cd3d1a68aa200ad2035aa951d584eb21204a6c71296cd163e7bcfb7b54272214935ef4b03739e6ff988c2d85a7b7f956b6317c5c572f8b461a7fd9faeef37825 SHA512 6fa2dfb8ed6e989ad827aac4a6714e562d976773a477bb075ab6982b372565890246711c802b4e25e25a4d4fc73ce9602f765b59a16fff8cf9c2b2840e5e4dfa
+EBUILD gspoof-3.2-r3.ebuild 773 BLAKE2B 20d95afedffdca2ce4f80e9ef8d1722f8fe51bea9894c3c71570ce2a81894c858345a207e0caec4ff64a5c83dc46ffcfd6af777170302a43eb21035e3a611b28 SHA512 07b3e26d609b6df724d0f5c71c463aa34c6bb053d3c2ebd8908e7f35a43b8005ab0ded5db3480dd8c17d87578f868cc44cda363012cbcf928bcf98365a67a87d
 MISC metadata.xml 248 BLAKE2B 86f5c3602168393b46b79f56b1bbcba7d32ab183eb1a640932bb91b4876e49e1ee407a9a5807f8bb559b5df9ee3c2fdc9fe6f69ec8b1744b7fcf2746a59e96a5 SHA512 d037f260b0d638df2bf9356b7d50974b341eefecd9e45a07b392d7180233299584f4911df4fd427122afd7e49e5f32417e0f2a3a92996450233e58eb51c34026
diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
index 3dfcdb0fe817..81f4bbad8ce7 100644
--- a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
 HOMEPAGE="http://gspoof.sourceforge.net/"
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index db946cdc03a7..8fdeb2b77090 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,11 +2,9 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 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
-DIST icinga2-2.11.0.tar.gz 7472579 BLAKE2B 36fd54e1067e6e61ab642debaa3589e6885e0be2f68d2a2bea0d03d3149ecc8bfc985ea7806b89a3b95662b03b2fc8695ae62a0036783a9f40d759e823d116fa SHA512 2526c622f00c355aa255fc42d0350bd5eb3fc270e7b4e3c3dcab575b4f7b7e03580d742064c2c3e143f302757fd997078ca12cb01575c78f79ae5616251262e2
 DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
 EBUILD icinga2-2.10.5.ebuild 4739 BLAKE2B 285278c6205b785c143fdfe7ad894094f90d40d0fac34b006594138770fa27c62323ffc212beed6b142b8db6ce51eeb8b89b5026aa5f681a6cdb5d5d5fce4e57 SHA512 263ef5cc4ee4843d6b902ebd17022af7f73542d9a6f954b46cfc97f2f248e44e5316e8bf2694952934bf6772264577d9daf1039e0e516262f32eb85476ce2b99
 EBUILD icinga2-2.10.6.ebuild 4726 BLAKE2B b9b51cb8382f7239bd3ce502eab29273364d35352a84adb653dec8438fc0d94b5cbdaa52a0bad66927237e7f438b2a51ccaf44ea9851b14cbfc792dd1b1d9b71 SHA512 4a9b62fa84342c19ef4d470bdf1ab5482aa54eb052f2d514002c9e688f89629115d2a9fd3775326cd5b5c80b8a4ac0f987f95b73ce39413ec1d5ed16247a7702
-EBUILD icinga2-2.11.0.ebuild 4719 BLAKE2B be92afb9182bf01c15dca373e0655b3ce295258fae208ffb60d95c4bbfc2576631ab40652c3eda9890c845ba84df7f542809815521505eb591a2ea5792f47cd5 SHA512 bb9b015d64446301eb72af495d20a4cf74bc560c2cc1b1efca1b40e66c56baf6eb96eddcd4a350fa60b7a7b0e71db1a8614a77bc570539873376f693be2a2061
-EBUILD icinga2-2.11.2.ebuild 4719 BLAKE2B be92afb9182bf01c15dca373e0655b3ce295258fae208ffb60d95c4bbfc2576631ab40652c3eda9890c845ba84df7f542809815521505eb591a2ea5792f47cd5 SHA512 bb9b015d64446301eb72af495d20a4cf74bc560c2cc1b1efca1b40e66c56baf6eb96eddcd4a350fa60b7a7b0e71db1a8614a77bc570539873376f693be2a2061
+EBUILD icinga2-2.11.2.ebuild 4717 BLAKE2B 8e38d240efc835a3c86d0b6886beb2bd557843dbb80ad749d984c90a9bbbe21104c8fed0f78e20c263bc486bab84706552344e7c20daa768d7ff2313f8bb0a87 SHA512 7ff4110d5da9291d332e32499c0076612cac2362a62f0922095c79d4cced1ffe33c7c9ad94c6d359729b577f2a1faa4f599da5c6183d5166c08b2413999821a0
 EBUILD icinga2-9999.ebuild 4734 BLAKE2B ec7ea399c1441b75b3690f6883488ee3a2c3dbb307055bafa4e0b6c12985316cd74a2d6f308c43bbec890e3bb741163c5c793ab7cba4092ec3dfe6e6831e9a5b SHA512 84e71c9437ff19065eef5f4e56817185af748ee896a2b2c8af8201df172cce26d5f4fc3c022644b9a8c063675c7a6407287f4094579309f9101f04a9b47a9d98
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
deleted file mode 100644
index cb76f2a6cf71..000000000000
--- a/net-analyzer/icinga2/icinga2-2.11.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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 ~arm64 ~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"
-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.66.0:=[context]
-	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/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index cb76f2a6cf71..c01fcf4d1cd5 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -5,7 +5,7 @@ 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 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index 3ca3f8e43ec6..581204b00b30 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -1,5 +1,7 @@
-AUX macchanger-1.7.0-fix-caddr_t.patch 357 BLAKE2B 8869a918b675664915f755de6fc9f458dc0a02dec6cab1b02e1aa961d6f33c479bffbb66fae3036396872e738faf464d99b367cffcc713a5c36d8dde01e8de91 SHA512 00d59ce7562f0f011bd00f68d6e9aa4dd09d1dfb1aff4cb7291602e02d7015fb1f5038037c638e79f8aaf3c4787ef549c83d60303512b7d983b7f2ab386ccd21
+AUX macchanger-1.7.0-fix-caddr_t.patch 352 BLAKE2B 915bfe65108678b61c75fcf46338be1f05c2cbc482005e2bca917609d66a681e5ab36ad30fe6313395d090c96aca2a091ef60b22b0d2c25c0f975d99cae39ccd SHA512 493eaf79e658a23e55e17b95b63b457032eff8c73bf309df7605400ceb2dcd4331a83c2b8383bd04d564478fb50654ebbe9506d65946f960d2964b2b4e32f620
 DIST macchanger-1.7.0.tar.gz 396848 BLAKE2B 7a6e5cbf302568884363ab4023033b53b1adc16896d7f88b1717f72b1b2a4d6d2dbfa2259a5c4aaa38d72201c5624a648077730cbc25f869f5f50a343bb93d0c SHA512 69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3
+DIST macchanger_1.7.0-5.4.debian.tar.xz 25084 BLAKE2B 65d39333e07a4c89da7e622aaccc0f2cab45af8d84721c3d39c457dfaf3063df872812d07860cbe78634159b0a2944e75aa54c11f46eadc37b9d4a23fc81b629 SHA512 b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc
 EBUILD macchanger-1.7.0-r1.ebuild 827 BLAKE2B 37ea254281948010006d9c4d8a2bc367890ce5f3f01018c8948d6bc11619ea0c1b0bf9dedba72f166c44c4b7130084552c53c4db89666322f008c36341318be5 SHA512 e4ea29afaae5fef4772bc7f35b050047ab4c0b8338dcd99c3e1ae9548a2f484b75796161e07de1d774b723080fd349c06e44d4a64f1293bbc850d2b594c7fdc8
 EBUILD macchanger-1.7.0.ebuild 786 BLAKE2B 5c254408e09b2c9ac7d3be4f7c96f50619dc534b25de339b8bac9281c250bd5d9f5dfa73120e2d9b01c27a54cfe8735314cb5fe7594d3d650f82b6d71ead6497 SHA512 f41d16d66bb5bfa112b988fbda7d70a0ef21f8d638811bfb2eacfdbd392170c1fc3767e702804c2e2d62f54efc2d4509e0cd8404eca7532d6872b443bf8b76fc
+EBUILD macchanger-1.7.0_p5_p4.ebuild 1314 BLAKE2B 42bb103e802414636610479836a150f2c6cd8205d9f02b8ee6f13208b2aa9a93378e78a5eb85eb0ed1018e3fbbcbd413d7159a3ea58127497a25d9def810cd11 SHA512 0e1f4d1eec7eb6143279226caa35db83359a7b94dfd112bc8214272df4ef91f79e90c61482ac50288f0c09b9d7fcc717ac68f9141279bc18bcb512029360d6a5
 MISC metadata.xml 473 BLAKE2B 4bc062f103c20f1f68bcd0242fee42a5e5c1b8ce862f336fda153bddc6294ff7e382edd5fb4aaf7091b1701cfb88b5db82da3f1b0cce7d8bcc4ef0141ef0536f SHA512 f328b70876919441f61939ad0198c98acfcae561b3eb27beeb6d09d565191f64075a63e7f99af6d69493c6100256fb2cec0a3b60b62c7d28fd41c885cedad4a4
diff --git a/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch b/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch
index c5fe5f6e16cb..0bcffcc67a7a 100644
--- a/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch
+++ b/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch
@@ -1,7 +1,7 @@
 https://github.com/alobbs/macchanger/issues/14
 
---- ./src/netinfo.c.orig
-+++ ./src/netinfo.c
+--- a/src/netinfo.c
++++ b/src/netinfo.c
 @@ -113,7 +113,7 @@
  	epa->size = IFHWADDRLEN;
  
diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
new file mode 100644
index 000000000000..1aa5414b43a6
--- /dev/null
+++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
+OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
+OUI_FILE="OUI.list-${OUI_DATE}"
+HOMEPAGE="https://github.com/alobbs/macchanger"
+SRC_URI="
+	https://github.com/alobbs/macchanger/releases/download/${PV/_p*}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz
+"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-fix-caddr_t.patch
+	"${WORKDIR}"/debian/patches/02-fix_usage_message.patch
+	"${WORKDIR}"/debian/patches/06-update_OUI_list.patch
+	"${WORKDIR}"/debian/patches/08-fix_random_MAC_choice.patch
+	"${WORKDIR}"/debian/patches/check-random-device-read-errors.patch
+	"${WORKDIR}"/debian/patches/verify-changed-MAC.patch
+
+)
+S=${WORKDIR}/${P/_p*}
+
+src_configure() {
+	# Shared data is installed below /lib, see Bug #57046
+	econf \
+		--bindir="${EPREFIX}/sbin" \
+		--datadir="${EPREFIX}/lib"
+}
+
+src_install() {
+	default
+
+	newdoc "${WORKDIR}"/debian/changelog debian.changelog
+
+	dodir /usr/bin
+	dosym ../../sbin/macchanger /usr/bin/macchanger
+	dosym ../../lib/macchanger /usr/share/macchanger
+}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 55f7b4ae071b..00785464e0ca 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-r6.ebuild 12576 BLAKE2B 03151033fc8bab37f09633a20922ce46dfc6fb63e2360595f51cf47f65eaba83939b76cef3ca74bcc40f80a39cc7828e3829a8993582c19fabbfe27e2ea6b073 SHA512 0cedeb24e1bbd58f4de8a83e4eb324d8cd80149c26225776bc1feaedb793953a0aaa95fd4610ef596dcdd620d9a3840e1b80e031264527ca413e614c4d166c69
-EBUILD metasploit-9999.ebuild 12342 BLAKE2B 200e886af2935c5a4c865d2c5cc3f906bdb9445971d78ca05d7541d7da6c6ba0d35bd40cec62fbb746d69a6d1aebc1a3d1db0a4dcbee2fb9501272f38a4ae497 SHA512 83a43d2be1cd706057503969d039d3525e6ba2e43c288198bc4ca4a50fa26f1e2c3382f4f58d66686a7bc6b1c6f1bcff3922197819089070b397f3e7f60cc952
+EBUILD metasploit-4.17.21-r6.ebuild 12564 BLAKE2B 755e433e7366c0784a9a6d9cbb7cfc0caf68659a4139e0a72970d55e83f3c8d02b493e4d260257f0a4cffb1574a776df9713dabab75fd6c299b2c287f6d82e32 SHA512 7a5c91bd269682eaec1d3d54bb296095e7c5fb0e7a69f1fc2d846a8c93a9f23afd5697340573af361775d41feceec5605a128911072493cc775e234e68a52369
+EBUILD metasploit-9999.ebuild 12330 BLAKE2B 847f568ec73f08f6189e4b8ebcf1445e3e0adef44ffa67650e6f048dfe54b7d7bc5d1239b5958802e4502e12f4c97a56f05765975f74c54d2ea5c6fcd5757167 SHA512 c5210db0aecb4cf408c023603617bffa048290d92a60dbebdc003bec82de9be42d5f354caf72c6bb3ad23a52c8bd1871be1ecc963c0889d7ebafda4a36282499
 MISC metadata.xml 760 BLAKE2B 1d242b9a6216631670676d4f2653fd86a414c00fd52a0f29903004b6848b95abf543e3c2fe59617b629104e886a061dede551a61c911d8e09b82d70c03c9788e SHA512 c8b659a986e68a5f063ff7637fc5f3ea1939aae6ac22844292f30587cb6396ab7f02bd08c1d28739d07887ac23b7989f956197b345a90e14a98600b3150ed4f7
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index db815de8d1d6..f06d33d3ee27 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -128,8 +128,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT="strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 42bf6440d53d..54db9b0d61c9 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -127,8 +127,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT="strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 6480845fc79a..789b00d77409 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -3,7 +3,7 @@ AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BL
 DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
 DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
 DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
-EBUILD mk-livestatus-1.2.8_p10.ebuild 2656 BLAKE2B 958ece38b2dce2786d511151c5d241e3206a2df46e44894b1e8a0eaac5a7e3261ae2801076c92d63fcb02ba7bf278e8daf5e6ab1a79af5d6cfd494f12916d0a7 SHA512 348b1a88b335865bf0867d3f61a4b4d5787942c50c9b6c5f5f9da85ec81c128a879dc634797823924c0b140d4364a154e4d750cea7f8d8ab1f3e59cf6fb68d9c
-EBUILD mk-livestatus-1.2.8_p16.ebuild 3398 BLAKE2B f1ddd89d4c48c4cafa0752ce956b3060e1572bb478fe727098ebf44cf70597ae63b3652c6baa8e77fd42fe7a536e947722c13ac38da837d641a368f7c08c57c1 SHA512 087cfeeb0e372769cefda5cdfc3c1e1f85ac43471b8be7f53be0e8eeaee181fe2aa3372c5494ae1222f49a05744f7e122f8af93b37e482224e90941ec62e7ae3
-EBUILD mk-livestatus-1.2.8_p26.ebuild 3366 BLAKE2B 44affea35699297de896373cb2c13fbaad2af5f28c21bfad404b66dfeeab93b9ed52abe99ae686177222e5cda537ae3ab2ff234bc25056f59d1718d7080656f2 SHA512 30502fbf7cae12d60d9ec1e3dae113184378c4328b5a9d6f4d0c349e7c6bca1cf025236afc75e3253ed21cd56565a6e917b5c2f9f38a35969034808e5c8d7a17
+EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
+EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab
+EBUILD mk-livestatus-1.2.8_p26.ebuild 3390 BLAKE2B 380082a961401822aa98abc221becf7bc7fae44bf2064e41f4847ee218f746b82bf83b79533e4a6061ad869e79674acd3f1468f11df4fc99c13db60183e9559a SHA512 fe3029d2dc50db99c3be8407befca9023bb83cdcbffdab82fe671cbbc60cb71c17fd32257f752b4f93be8f728f3698a76273d316409dffc9ae314e48141bb156
 MISC metadata.xml 617 BLAKE2B d334e2ab6cf614f4c1a8c5ab0c4d5f14e4b841618548cb1e621cd8adc2f5e9565d4c7b640313841f0bc6f906dd8204939119d5b1e2ab2737fb6355e9f11846d6 SHA512 227a4ec9dad38a0be74140697b5095c694ca6837d1bf6fc396f6de28781eba572164e9c8cf7273a8b7286f2d68e5b8efe2facde4b705901d4d675936ccd9d87e
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
index 74f333413356..b36094f1ee3e 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples nagios4 perl python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!sys-apps/ucspi-unix:0
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
index 611b5856b891..8c27e80b89bc 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples nagios4 perl python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!sys-apps/ucspi-unix:0
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild
index 3813d1d6918e..a1b4fa136b85 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples nagios4 perl python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!sys-apps/ucspi-unix:0
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
index c25e23e8e7c0..9f8ee2bcc6e3 100644
--- a/net-analyzer/multimon-ng/Manifest
+++ b/net-analyzer/multimon-ng/Manifest
@@ -1,4 +1,4 @@
-DIST multimon-ng-1.1.4.tar.gz 2426821 BLAKE2B 36f5eda463afc08ed6848d86b27ccbe27897327ea585b4b42210b13a2ac17ec8b215f239cc626f3151f6ca029897f40db333285b5442c85112b338c78a854adc SHA512 575e920b3738ab00da2cecdea8a1b1fb809ea7870e0aae7a5f8940ae8eee70af202e062d4a624d9de677135a7561daed60f264c6047b58f348405cb2bd06b21a
-EBUILD multimon-ng-1.1.4.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4
-EBUILD multimon-ng-9999.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4
+DIST multimon-ng-1.1.8.tar.gz 2430488 BLAKE2B 82bc0be58e2f7d596363fc916c11584cbd1335e7984194af22955587877ad1cba2a0cca819467061bb18b97ca70f5c2adfd73ccbf159fbc27348d59429959ada SHA512 9cf93362555e5dc465a9ec60dff27b9875879afd954e810069022b3c003eca4c3ab2a833f1c00fef877175bc72e2d378bbb53380ada54542ae29d257a7d2bd1b
+EBUILD multimon-ng-1.1.8.ebuild 827 BLAKE2B f3beaced0e6e3ec513291c3594bc9594b1ba54653157509e72272fef8b5558f5240e59695928f8d05030383bf0d7ed34688672c08b02e1d9ff35eb5292f2a825 SHA512 10962e854eac0f349346efd01599b43fe699a7aaea7e03c6ce0a3b17ea6fe27c42ae942a4e1ae8d0ab118108c3c287beb580993d155bdad836dde5d7ab05aa1b
+EBUILD multimon-ng-9999.ebuild 827 BLAKE2B f3beaced0e6e3ec513291c3594bc9594b1ba54653157509e72272fef8b5558f5240e59695928f8d05030383bf0d7ed34688672c08b02e1d9ff35eb5292f2a825 SHA512 10962e854eac0f349346efd01599b43fe699a7aaea7e03c6ce0a3b17ea6fe27c42ae942a4e1ae8d0ab118108c3c287beb580993d155bdad836dde5d7ab05aa1b
 MISC metadata.xml 432 BLAKE2B 18d6a22e90f20d23e46aa7f0c0875dc156ba6d0b141b2ac98674b44d05166bc9f48a74f2d885723b5e7838fd2f710488aace8e7c9927a3bd14103101729ec111 SHA512 f61a6ec965782d81ba149cd16df61d7334a8775a2624ba38408e7ca9660df9d69e40817eecfd17db5b819a68e178648ed440e69278223665e51c98a7c2535230
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
index 669915a3a1f0..da7b10babdb7 100644
--- a/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -26,7 +26,7 @@ DEPEND="pulseaudio? ( media-sound/pulseaudio )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
-	use X && sed -i '/find_package( X11 )/d' CMakeLists.txt
+	use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
+	use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index 669915a3a1f0..da7b10babdb7 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -26,7 +26,7 @@ DEPEND="pulseaudio? ( media-sound/pulseaudio )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
-	use X && sed -i '/find_package( X11 )/d' CMakeLists.txt
+	use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
+	use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index fb4c7308e2fd..6a83cc0a5db6 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -13,5 +13,9 @@ AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa2
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
 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.49.ebuild 12275 BLAKE2B 01ec8f4ff21fdeae4a9479f3386b05cd6450acde550fee53830e032f7b6b0369b7814748185c4970b1ae417abd54624946df376694686aa75514433dd0f837f3 SHA512 762bc414c30ac62a73bce6f276c096120ba181d0085b8036fae5a8774bc8d977caab97c1e576f588c3229f085f4e5d4363eb909bfc64942beb1eeac487be7788
+DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
+EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf
+EBUILD munin-2.0.52-r1.ebuild 12233 BLAKE2B 668df7a3a19bf86f7980ed95a18da83061a68fb0b642e44ae2f30b838b916bff97cf728583fb6744bd60faed64a8f8debb9bdbc6a08a7d14b21ca6237c188eb5 SHA512 0bc2a4d5b088949801db7b8ba8f53a20a09419800eed751ff9eccb553b67e6075bda828bf2291b595b417f0784943fb8a08325a27d2aa8f5094d3d1c5e496c64
+EBUILD munin-2.0.52.ebuild 12392 BLAKE2B 93020da1b15e1c227005120156a44186c8e2c1e1b6d8438af1fdc83c27e6f7a0f2d91624cea3a61f7ea474cdbc9fb0b204027337a50a0a8b0ccd07040901aea4 SHA512 0b5dfd06dd1d6df52cbb088d278bc3d5debf5fd42c70218aa3afd691623f182e51fd4d423099908ba76981c7a5854de4da19f155712b75c1e5745e872e7d4e13
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild
index 42bf360e6029..1e0ed2049704 100644
--- a/net-analyzer/munin/munin-2.0.49.ebuild
+++ b/net-analyzer/munin/munin-2.0.49.ebuild
@@ -19,6 +19,7 @@ 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"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 
 # Upstream's listing of required modules is NOT correct!
diff --git a/net-analyzer/munin/munin-2.0.52-r1.ebuild b/net-analyzer/munin/munin-2.0.52-r1.ebuild
new file mode 100644
index 000000000000..99acb538fe3b
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.52-r1.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit 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 )"
+RESTRICT="!test? ( test )"
+
+# 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="
+	acct-user/munin
+	acct-group/munin
+	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 net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	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
+	PERLLIB=\$(DESTDIR)$(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
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/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 CHOWN=true 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.52.ebuild b/net-analyzer/munin/munin-2.0.52.ebuild
new file mode 100644
index 000000000000..b36fc5f88fcd
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.52.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 )"
+RESTRICT="!test? ( test )"
+
+# 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 net-analyzer/openbsd-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
+	PERLLIB=\$(DESTDIR)$(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
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/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 CHOWN=true 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/nagios-check_dnssec/Manifest b/net-analyzer/nagios-check_dnssec/Manifest
index 8d48ddf08759..2d512e94b630 100644
--- a/net-analyzer/nagios-check_dnssec/Manifest
+++ b/net-analyzer/nagios-check_dnssec/Manifest
@@ -1,3 +1,3 @@
 DIST check_dnssec-0.1_p28.tar.bz2 73458 BLAKE2B 0b3ae3e051734924b89160a67a84b3cbe3f5db0ee036780b4efcbd7857a18a6ac6b180dddab7475be079d5fe902b8eeed4c6acb021b31c70daef69632ff3ecaf SHA512 e99b155f38963858750443f3cf834e4505f871cb06bbfabf07ade1b333b18507b9364e7250118ed5ee4a2134e2a45ee68b6386a9f3b0cb30a0bb02a4a6e263fa
 EBUILD nagios-check_dnssec-0.1_p28.ebuild 652 BLAKE2B e671f946a5dfb1d8adc7c6f4b0fe948145c3e5a4dc1b0e2209cbdae6d67f467fcd3158bee64c4a9634106dc86fe96323b98bb4b81c9260ce171410566814bf09 SHA512 8e528c18bec83c4405c89497212dc62e3f9a2b1ce606b9c6639b9cad5758beb7d491a521a0f67f7583b3fb298b019850abc6425e451633625e181c3d5ca218cd
-MISC metadata.xml 390 BLAKE2B 0a41ecc4603317f512197820ad62d033df4408824db37e5189ef51b8155badb0114aa0148188c8448fe69611c240232851845e518ce1f43c4730f80a3020f7b3 SHA512 0814c74c2ffd3728a8231a4d0240b23598719cfe06b57dad979092d8a6171a7564b905da4dad202313bfa2e237036b75f4f12dc57050469dd2f68f91820afda6
+MISC metadata.xml 271 BLAKE2B 7231d9dcb020ef6bb73db6e7038abab171c5ac137e457e50bd730b126a20a8af0a21b1cb987b00b8965af807dde7b0431dfacb6066d15d08b5bfbfbaecf3e5a0 SHA512 f323a192c090757e24caa9352b8be964050a00a86d174507c858c2a3a61767c243dba99ac37571779128d73e9bf6817f056d6d590be2b2ec8a8e3f3a92a4f304
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
index b7624565acac..a15e870b6e07 100644
--- a/net-analyzer/nagios-check_dnssec/metadata.xml
+++ b/net-analyzer/nagios-check_dnssec/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-      <email>creffett@gentoo.org</email>
-      <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
       <email>sysadmin@gentoo.org</email>
       <name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-check_glsa2/Manifest b/net-analyzer/nagios-check_glsa2/Manifest
index 977e8803a549..c745b4023b0f 100644
--- a/net-analyzer/nagios-check_glsa2/Manifest
+++ b/net-analyzer/nagios-check_glsa2/Manifest
@@ -1,3 +1,3 @@
 DIST check_glsa2-20120930.tar.xz 1980 BLAKE2B 6a5e3541b23fe43daba37ccac085ca1079dc1fedbfa87a439a433d6445bd039090a336765bde0c1b2fc5fad464d0f4e175e4a7e90ca65d6bd56d082a3f1cac88 SHA512 ecf7f6f119c8a73bf672eddc64374ed07c03720ec97b51f7e0bd779b3ba2c4ceab87c1c3cbbe38b1f0224234a9fb2af7bd156f9073a8a0aa8da1458988a2bc65
 EBUILD nagios-check_glsa2-20120930-r1.ebuild 869 BLAKE2B 167ccffd0e6b93a78e78cb6872ca76c270c65731840de22aab0ee89b2bbacbe02f3404e535d135ae5646b6420b7ebe7d841afb4ccf16cd364830ef8b5d31c033 SHA512 5c3d23e1f5e5881c05e64efef7f3295568d65fa0bbf7d22cfe0aa1d2b58df1f7595d83f64fc9ea3e867a1a961789131325d73190e2f22339af09971173e7ca4d
-MISC metadata.xml 466 BLAKE2B 9940c8348deb7ee8133763e7fa9fe6fa5a30094edf2d2e0e6056dd7f37800c37cc205d5b0d7db6c5d5e7821dc55fc93379e5a095857bf66900d6545ab0fc18da SHA512 b4b4b92d39729b3f5b08c53ebf3181ea847438177ddd119adb585b5ca5376b7c359e7a51d687e01a9339ea9464da48a24beb345cef83bf5befbd38128bb1d914
+MISC metadata.xml 351 BLAKE2B 79a36729dc00b5651ab2d461efdf7254b19b3b65d5279381567abe68e18215a0fa998a65ae858f1d8ece9896fe54edb7430dd5952aab106140bb853d378044cd SHA512 651d2427fbe198beafadf6a75e664718c1367c118e3b9a1e637fe33abde8751e31b221873f3f9955f0af516ea8948085998eeda2ce64b1247291a4b5a8edffeb
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
index 37450fe98c62..d01f11d38ed2 100644
--- a/net-analyzer/nagios-check_glsa2/metadata.xml
+++ b/net-analyzer/nagios-check_glsa2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>creffett@gentoo.org</email>
-    <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
     <email>sysadmin@gentoo.org</email>
     <name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
index dbb4f39d56e7..057adfa0df69 100644
--- a/net-analyzer/nagios-check_logfiles/Manifest
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91
 EBUILD nagios-check_logfiles-3.7.6.3.ebuild 665 BLAKE2B 2fb51740ef6962499caee6bb22c720fb99331d4c0fbef9e2ca5d9606c26d6f9078e6bb22e26717b5abcbcd3ed4bf7093e41e44b63befec1a1cd833171af51092 SHA512 61c6bbcb2ea40f575f53259bf97638c7966e62153fc0c6d20116b2475c93368b8fbe3beb708307689f55f6fc6634d28f25a71f04c43b1b9fb2af2fcfabaec8f1
-MISC metadata.xml 369 BLAKE2B a0a8f5c667660111a87c99a4edd2a0b0f78d8dae6f914fcce61558a2cd23788e8f365d0146546f53e6038bd1597e2a882c3ac08feef5022802467215e563ef94 SHA512 fe2c7e4ca898e3af6ded0a8b525b6441ae55fd4ea74f5355b2932d9a5c87ecd930cd5566a5804b978ef882ce7e4fc53055ed9c097d97806bb94d3a8d1b94fc02
+MISC metadata.xml 260 BLAKE2B f1ea5ab1f4548df77d58be88150b76d3a407a5fa705b439f468969436167cb10719a1767a143da3a5822cdf33e37f863d6e495e107c65bd01d1fc7533b22f025 SHA512 7166d4e68a9a0f3e1f5c6bd316382c2e67d4a267697391e21e74e0f93bda12beb4ad3595eb356888b353722b9b19319568bc63591950e4c14ede05afd04ec340
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index 690dfd5d057d..599b5a1c1aec 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
 		<name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
index 895dd32ce0bc..b3fa98e2ce37 100644
--- a/net-analyzer/nagios-plugins-snmp/Manifest
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-plugins-snmp-0.6.0.tgz 381664 BLAKE2B 1a6124b5aa194123b17a1ce98a4e023a8d71f70a6c5ae61b8b54b204050f7914f100e1e639630955e45905f86282cab6a7034e5927b3db5b609beb315a66c748 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529
 EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 889 BLAKE2B 3f11de32bcb02a72207e603e8401fc56126342b16ee67af31b7bcdedc2b3d6a8886b663dbe143f06a94903f49e8bb573987b6861698c2e87dcf38f2ccb369d0e SHA512 44c6501861586be89f75df69dd5b43b3938ad32d8560afd243931c4ccba5999f6814f5e8c528482428e88697b6c1610ec810e7db326946c2b476bef903af06ca
-MISC metadata.xml 390 BLAKE2B 0a41ecc4603317f512197820ad62d033df4408824db37e5189ef51b8155badb0114aa0148188c8448fe69611c240232851845e518ce1f43c4730f80a3020f7b3 SHA512 0814c74c2ffd3728a8231a4d0240b23598719cfe06b57dad979092d8a6171a7564b905da4dad202313bfa2e237036b75f4f12dc57050469dd2f68f91820afda6
+MISC metadata.xml 271 BLAKE2B 7231d9dcb020ef6bb73db6e7038abab171c5ac137e457e50bd730b126a20a8af0a21b1cb987b00b8965af807dde7b0431dfacb6066d15d08b5bfbfbaecf3e5a0 SHA512 f323a192c090757e24caa9352b8be964050a00a86d174507c858c2a3a61767c243dba99ac37571779128d73e9bf6817f056d6d590be2b2ec8a8e3f3a92a4f304
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index b7624565acac..a15e870b6e07 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-      <email>creffett@gentoo.org</email>
-      <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
       <email>sysadmin@gentoo.org</email>
       <name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 616dc578502e..e5db3e56ad8b 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,5 +1,7 @@
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
+DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
 EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6
 EBUILD nagios-plugins-2.2.1-r4.ebuild 3102 BLAKE2B 71b4e4382bd6ad0d2278db3a21e952cf38e551bc8f3619297ff24f508c2ffe4a4261093135e950212c8b8dab80e2cac294fc07a91bf3e273a03a09ac47822307 SHA512 9d8af2f74fd41c3bd660f72dc66665b2436671d899df8e9f06c1691df963f549320dda0dada32a39fc6214af11285fc329415e8038f35d10e245ac15f416259a
+EBUILD nagios-plugins-2.3.1.ebuild 3134 BLAKE2B 755f2395aada98fc1d15ac12cb68ca3cd2f029e9e2d9bd29b1b2d1686e3a0d4442a62725f92857d18065474a72248abbfa757cd935c9be04ddc5f231469561e6 SHA512 e93e1b9d63620eab2413036c75863924d981fd85b99c07e78133c47e580d5ea8300f1a054258ca44a8e9ca5c5183579689a7f35ddd1b301819c02737e5811923
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1.ebuild
new file mode 100644
index 000000000000..e60ae3dda0cc
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+AUTOMAGIC_DEPEND="
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Perl really needs to run during the build...
+BDEPEND="${AUTOMAGIC_DEPEND}
+	dev-lang/perl"
+
+DEPEND="
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+# Basically everything in net-analyzer/monitoring-plugins collides with
+# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
+RDEPEND="${BDEPEND}
+	${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 -1 -1 nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios-sap-ccms-plugin/Manifest b/net-analyzer/nagios-sap-ccms-plugin/Manifest
deleted file mode 100644
index 0131c5bca3e9..000000000000
--- a/net-analyzer/nagios-sap-ccms-plugin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nagios-sap-ccms-plugin-0.8-gentoo.patch 1360 BLAKE2B f55656a4bb5a00554537b2e14567e2d88016c4f6f4c82d0dac59da0b28497e4f4def1b0fd4c10d801189bbf20e700977cc8a13b89c4ccb97677fbd45352fff1c SHA512 133b5ee63448111e512958ee0eb6d45308aebd78c441265c0020bcf9211fe8a746b9f85bb319d4b943e4f52677920c77956807cf907044361507f8f68ebd34fe
-DIST sap-ccms-plugin-0.7.3.tar.gz 2948020 BLAKE2B 594b14caa0465b21c05318e078e0aebe471b8d61612bb49587a16c44dbf61fd009db877460e971c9e2e4a3cd95461890af12ec19162a2c945c3e2bbea2cfe7f8 SHA512 5de7b1a39c97ba0aac736814df2e7973c7b79d3411bdcd148a3eac2d2a1a84406b3e22f1b4979524154d02d03cb0ba3757bb68a24e8a280ceec98b767dd4b1d9
-DIST sap-ccms-plugin-0.8.tar.bz2 10143558 BLAKE2B aaf1409c3c53d9648565108ec6c7075ec5ed8ddfe105e9fa27ad2554b7f03bd2c26a9fa4c3e3abc0fe829ad2d7c271784c31320788a21ae31c0412f2b377cc2b SHA512 b1937f798f38e8e835610ecf78bb3a5d03d4b6dbdac728f93e0026ce9122524d772289570256849936a1dc2d3be22d4ba8760657a0dc14d6ba8cb8cae6746dc2
-EBUILD nagios-sap-ccms-plugin-0.7.3-r1.ebuild 1187 BLAKE2B 18eae1b34d4c195ef8af5d96766ff6e035526e12d54f9cf2840af7429982e249dd0135873d80a46c54fa42c68ed029d40a261cc1819efd4c3207586d73bfb6e6 SHA512 e83aaf820af269b10f4d6744e8aca44b01b35ad80249941072050b043d7b0e6c31294d574e687a582113bf5773c231331aae40211ae3dfd11415742ead726a35
-EBUILD nagios-sap-ccms-plugin-0.8.ebuild 1525 BLAKE2B 84af7db1f47cb70036d7293ca5d9dbdf9c7d4be14b807bbc489eef24a06cec35b4dffded93a0a53cd841f8c379c41a0ca3dd17978bda911e91d237ef80d2f3dc SHA512 85d5c6f78520bee84ba5ca2a7c3407bcf72331ad1b24ff67fa95e55e7bea3592a307ff3a5e07cc32d20366b55931f1395beeaec509a91cbd27263ba00d5322ce
-MISC metadata.xml 469 BLAKE2B 3680605f1cba746e3bb9e82feecac8e55b52c6ada79430ad9f0e283a381d6e6a6b1c8a995c05927a423a1b1a962451222d5a72b87abd7b3437e1eeaa949fe67c SHA512 e29ec78dc41a8362b6811bd347173d9d396676efad424c83d2d979742e1f62584f40a458f51e21ddc0b44dab5f8f1249b8e7ba89931e0941d09bab56f89ff01a
diff --git a/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch b/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch
deleted file mode 100644
index 8ded76b3b7d1..000000000000
--- a/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,5 +1,5 @@
- 
--VERSION=0.7.3
-+VERSION=0.8
- PLATFORM=$(shell uname -m)
- 
- 
-@@ -33,12 +33,10 @@
- SUBDIRS = sap_moni
- #C-Compiler
- 
--CC=gcc -DSAP_RFC_TIME
--X_CFLAGS = $(CFLAGS)
-+X_CFLAGS = $(CFLAGS) $(LDFLAGS) -DSAP_RFC_TIME
- SHARED_OBJECTS=libs/$(PLATFORM)/librfccm.so
- 
- ifeq ($(patsubst i%86,x86,$(PLATFORM)), x86)
--	CC=gcc -DSAP_RFC_TIME
- 	SHARED_OBJECTS=libs/x86/librfccm.so
- endif
- 
---- a/src/sap_moni/Makefile	2009-03-16 12:34:26.000000000 +0100
-+++ b/src/sap_moni/Makefile	2010-10-20 01:24:14.000000000 +0200
-@@ -1,23 +1,16 @@
--PLATFORM=$(shell uname -m)
--
- #used files
--SRC_INI = iniparser.c dictionary.c strlib.c
-+SRC_INI = dictionary.c strlib.c
- OBJ_INI = $(SRC_INI:.c=.o)
- OBJ=ctype_b.o agnt_rfc.o agnt_mon.o $(OBJ_INI)
- 
- SHARED  = sap_moni.so 
- 
- #C-Compiler
--CC=gcc -DSAP_RFC_TIME
--X_CFLAGS=$(CFLAGS) -fPIC
--
--ifeq ($(PLATFORM),ppc64)
--	CC=gcc -m64 -DSAP_RFC_TIME
--endif
-+X_CFLAGS=$(CFLAGS) -fPIC -DSAP_RFC_TIME
- 
- #Rules
- shared: $(OBJ)
--	$(CC) -shared $ $(X_CFLAGS) -o $(SHARED) $(OBJ) -ldl -lm
-+	$(CC) -shared $ $(X_CFLAGS) $(LDFLAGS) -o $(SHARED) $(OBJ) -ldl -lm -liniparser
- 
- 
- .SUFFIXES: .c .o
-@@ -26,7 +19,7 @@
- 
- #Dependencies
- agnt_rfc.o: saprfc.h sapitab.h agnt_def.h
--agnt_mon.o: agnt_def.h iniparser.h sapitab.h
-+agnt_mon.o: agnt_def.h sapitab.h
- 
- 
- #------
diff --git a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
deleted file mode 100644
index 4ccb214d4443..000000000000
--- a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>creffett@gentoo.org</email>
-    <name>Chris Reffett</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sysadmin@gentoo.org</email>
-    <name>Gentoo Sysadmin Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">nagios-sap-ccms</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
deleted file mode 100644
index 319f3f0b5397..000000000000
--- a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib
-
-MY_P="sap-ccms-plugin-${PV}"
-
-DESCRIPTION="Nagios plugin that provides an interface to SAP CCMS
-Infrastructure"
-HOMEPAGE="https://sourceforge.net/projects/nagios-sap-ccms/"
-SRC_URI="mirror://sourceforge/nagios-sap-ccms/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="net-analyzer/nagios-core"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	cd "${S}/src"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}/src"
-	exeinto /usr/$(get_libdir)/nagios/plugins
-
-	for file in {check_sap{,_cons,_instance,_instance_cons,_mult_no_thr,_multiple,_system,_system_cons},create_cfg,sap_change_thr}
-	do
-		doexe ${file}
-	done
-
-	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	dolib.so sap_moni.so
-	cd "${S}/config"
-
-	dodir /etc/sapmon
-	insinto /etc/sapmon
-	doins "${S}"/config/*
-}
-
-pkg_postinst() {
-	elog "Have a look at /etc/sapmon for configuring ${PN}"
-	elog "Further information can be found at"
-	elog "http://nagios-sap-ccms.sourceforge.net/"
-}
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
deleted file mode 100644
index 39bbc8a46c26..000000000000
--- a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="sap-ccms-plugin-${PV}"
-
-DESCRIPTION="Nagios plugin that provides an interface to SAP CCMS
-Infrastructure"
-HOMEPAGE="https://sourceforge.net/projects/nagios-sap-ccms/"
-SRC_URI="mirror://sourceforge/nagios-sap-ccms/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-QA_PRESTRIPPED="/usr/lib/librfccm.so"
-QA_FLAGS_IGNORED="/usr/lib/librfccm.so"
-
-DEPEND="
-	net-analyzer/nagios-core
-	dev-libs/iniparser:0
-"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${PN/-plugin*}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i src/sap_moni/* \
-		-e 's|#include "iniparser.h"|#include <iniparser.h>|g' \
-		|| die "sed sap_moni/"
-}
-
-src_compile() {
-	emake -C src CC=$(tc-getCC)
-}
-
-src_install() {
-	cd "${S}/src"
-	exeinto /usr/$(get_libdir)/nagios/plugins
-
-	for file in {check_sap{,_cons,_instance,_instance_cons,_mult_no_thr,_multiple,_system,_system_cons},create_cfg,sap_change_thr}
-	do
-		doexe ${file}
-	done
-
-	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	dolib.so sap_moni.so
-	newlib.so $(readlink librfccm.so) librfccm.so
-	cd "${S}/config"
-
-	dodir /etc/sapmon
-	insinto /etc/sapmon
-	doins "${S}"/config/*
-}
-
-pkg_postinst() {
-	elog "Have a look at /etc/sapmon for configuring ${PN}"
-	elog "Further information can be found at"
-	elog "http://nagios-sap-ccms.sourceforge.net/"
-}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 3b059f42287d..934edae4f5d5 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -4,6 +4,7 @@ AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d6
 AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
 AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
+AUX net-snmp-5.8.1-pkg-config.patch 621 BLAKE2B 013ae933eb2ec9edc0e454ea7d508eac9a49f92aa6fbcfd47a3b25c85852ce235a9dcb8b5aef1f16ea17976a56341bf484419fa84cb5e83a1e29481a409445aa SHA512 fb7a79514936962af175d068996a2420d70c11478a03f7437d3b471a695cbdc685d3d472c8145b4b400fb2511e591fd717e7c4e265c464696edfc091a747a6e9
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
 AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba19eeded1b52d265923cfe69070d3fb71a03ba071fe10bc6b5ce0c99e3c9720521d2b37d04ce8ace SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac
@@ -11,9 +12,11 @@ AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b237
 AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
+DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
 EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 92dd24ccb4cb1b431bff22d4e3712fe86c126e64bd870b927a5c8cb5bb6ce8f32eff0cdaa55fb88e44ea0ad4d8d6bc9704c922ccf480cd20cf2af8c88ac3ce57 SHA512 91b3a19e4e96ba6f6bce0bd91d8b963b68d42da0cdc31a2bf527402367bbf1621c131e7c3848f005459f30290bdc839f64c79b80d1d0fe1c7840242a87b455b3
 EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461
-EBUILD net-snmp-5.8-r4.ebuild 5493 BLAKE2B 97520422d339c0b95df79990463423963b96c0c2d33d5639ba6350315b7f9c9d91e1b973056b38dc8300fca1f18bdf0b6da7550e3b22a1e2938b8abe15eb7ada SHA512 6b8c6356f7ba8da4d49f932380d3929154670bbaa93f9baa639e4a91b97bb759df1f65db264f1040351fc0eab2354a99da20c9d495e84292625ef6cb584a92a0
-EBUILD net-snmp-99999999.ebuild 5318 BLAKE2B 4dcb3ceacf691790ee8a7553c1d1a1b8cfa672385cfb6446820a4a997a0a9b0d438ec9d2fd01407b50bc8c07cc0a5fe2808bf806438ba2aa5b99cd545cddd452 SHA512 1fc4beb414853e3b1a2b7bc66d89fe671e0ef93966289e4ad866ba811d5297a2dba35e386fc1e6926fe993861f36872df8173d98b05aebbfde42a537682cfd92
+EBUILD net-snmp-5.8-r5.ebuild 5525 BLAKE2B 78ebeb7d3c888a68f268571154fac87df9fd93b75323ca67c5b4ce99f75bd66be9b4e77e91c762cacfae59fd693168e705f45347adfcb8c1eab10c3cb2210fbc SHA512 ea563da2076f4e4bc8801f70edbbfba08143d54a0edb6a718e34b84a555cae4bec1c5a8ac6606c997be1e1966c593eba80aa27ff67fb4d47069feb446a235f33
+EBUILD net-snmp-5.8.1_pre1.ebuild 5537 BLAKE2B 39899e3b6a102411899a2aa6f97333b7089fe7b57efc52f0f73480d9ec68f14eabda144014df20f18b1e622a3941f80d973f26534d73b30ee47c6ef3adfc194d SHA512 5c7700d10594a526198834b3e8c3ce2386c788174cd559b3f77f6cda54cc7b709d8379520e8b32be7c5e4dd98f0f71f9f14307b4f1b47811e254b96e6ca3797b
+EBUILD net-snmp-99999999.ebuild 5472 BLAKE2B 920488b2dc8c41825d2cb449910572efbe68e88ec5f59483604a2acfe72f3af9d8ded922a1a053d143422f099729b99ecd520b4c4023c19e0143e32746d8da84 SHA512 67db92f7224cfc45805f73197dc779569c11aae8bfed8b394a1e669281e96bf5d1ad88b85188090660e6be688c337578e44f5c65c97c08a9e3836e1f0a928de7
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
new file mode 100644
index 000000000000..fd53973c2bec
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
@@ -0,0 +1,16 @@
+--- a/netsnmp-agent.pc.in
++++ b/netsnmp-agent.pc.in
+@@ -9,4 +9,4 @@
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
+-Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
++Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
+--- a/netsnmp.pc.in
++++ b/netsnmp.pc.in
+@@ -9,4 +9,4 @@
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnetsnmp
+-Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
++Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
index a7359956604a..2b3f66b5294d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
@@ -148,6 +148,8 @@ src_install () {
 	# bug #317965
 	emake -j1 DESTDIR="${D}" install
 
+	use python && python_optimize
+
 	if use perl ; then
 		perl_delete_localpod
 		if ! use X; then
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
new file mode 100644
index 000000000000..0704a753212a
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+COMMON_DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+S=${WORKDIR}/${P/_pre/.pre}
+RESTRICT=test
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8-tinfo.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index c6deae576b94..901356c5a939 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
@@ -9,7 +9,7 @@ WANT_AUTOMAKE=none
 PATCHSET=3
 GENTOO_DEPEND_ON_PERL=no
 
-inherit autotools distutils-r1 eutils git-r3 perl-module systemd
+inherit autotools distutils-r1 git-r3 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
@@ -72,8 +72,10 @@ S=${WORKDIR}/${P/_p*/}
 RESTRICT=test
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8-tinfo.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
 )
 
 pkg_setup() {
@@ -149,6 +151,8 @@ src_install () {
 	# bug #317965
 	emake -j1 DESTDIR="${D}" install
 
+	use python && python_optimize
+
 	if use perl ; then
 		perl_delete_localpod
 		if ! use X; then
@@ -203,5 +207,5 @@ src_install () {
 			|| die
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 6e97ca4578d2..73e8a013dde7 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,6 @@
 DIST netdata-1.18.1.tar.gz 3413907 BLAKE2B 9047f23875f446b378c80962e7f8e5c9424fbc2a405c75b76e242b26ae48336cbb026d3fc5c0e4127b0e5d1f1d5a14652ae92661474cd11ecbd64614461ab118 SHA512 fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9
+DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea
 EBUILD netdata-1.18.1-r1.ebuild 2757 BLAKE2B 1393c8575061ae6d7ee93b7f376155c0dba91da48ff283176f192fc46e01aff1459234fdadc4c8ab711e77169fc5e6c393dc87234ff30d900a9514aa6396a5ab SHA512 93d03fb2caeb01fb51a7e51b6191e8f99c4a0865165918d6e921b24a22c402dd601d8511980c28f2766320d0651da45e1015571c6b251b5bf5e2928cfe2d77eb
-EBUILD netdata-9999.ebuild 2874 BLAKE2B 6318cf1103aaacec8490bb2b149e6a9d52524fb915db5b46c5a78fec3840516abdcc578db3661eeb588ce176c5efd96be50dc9d95afd860e0d61f82d1cd8a0c5 SHA512 f4516f7657d973335768b662c7e18f58fcd05a0879fcc15763f72e2325888187d21d7a8153305445da567dcb2e28fe3a17bbea1c8ba87311c9bed79e8cfab437
+EBUILD netdata-1.19.0-r1.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
+EBUILD netdata-9999.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.19.0-r1.ebuild b/net-analyzer/netdata/netdata-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..7133c9ae7f67
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.19.0-r1.ebuild
@@ -0,0 +1,131 @@
+# 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
+
+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="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	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"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--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:netdata /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index b066aadbf11f..7133c9ae7f67 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -123,6 +123,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	fcaps_pkg_postinst
+
 	if use xen ; then
 		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
 	fi
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 8e2933b04d77..79e2ca34ee4d 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -4,7 +4,7 @@ DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb266087
 DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703
 DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
-EBUILD openbsd-netcat-1.105-r1.ebuild 1430 BLAKE2B 1ce2ef02d31caacd30fe25b58c642245dbc92ca1148009ca5d5d8c6b50815e7b3123b3a8cc353ef904a2730aaeaa6e52059f00134a69e56b798c9b29b27b5e28 SHA512 186bd9579a5281d8bda48e81b51d307ca44597e003de96c6a4cd17663db5afea1b9e80baf7d7a581ba3055b253e31cdb60b0e0970b385d6a71aab684d2469209
+EBUILD openbsd-netcat-1.105-r1.ebuild 1423 BLAKE2B 75f4fd8f925ab192dd5e4f8ea279bf9c18d443b6d7b48f824da78f88c3847410912e7ffbccff734c7b7b29cbfc22ed125524bd4be0a7347dddefa78058453ad2 SHA512 337b622157df344fa2430815f5087480b1c87c3c807a0ab0c079d1c43831bd1f6c74d8188b4bf2badb85f85d3789c8853f72aeeed7680c33c92d660c1d5eae03
 EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b
 EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 3eeb06ff47ab74e126dd6d5381a0ceb5e8979b32e82468781daa83e25d0869e4ebf3818f58982f18c1b99784f698fd70dfcd146b935e364de044b251380fc156 SHA512 9357418b7cd5cdd09ab43fdcc413f696b086ce849600f2f0e6de6c790bdf4909b379cbcb49d58971d9b5c800fb07f782820bf5eabcef6751c3763f6633e66147
 MISC metadata.xml 351 BLAKE2B 52a6f3fb0e94749d226310a8439bc81e3a6fb4a59116b23d63ce992e246807e4486595330f3b0cc5a437672eadf4fb8ecea21fc8a0565fc5e9311d341917dc60 SHA512 80bf423a6e8309ff117540ce0d2e29eeea89f3de4c4e4aea161ba37675ff0415a4f5a8cc37cb2ffe841e702de66a324888509a2f66df9576b76e774febfc8936
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
index fbc35796377b..298a47420fd0 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
deleted file mode 100644
index fb83a21e2922..000000000000
--- a/net-analyzer/openvas-cli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openvas-cli-1.4.3.tar.gz 108228 BLAKE2B d8f657fde8d1cac257dac8e87fdea23401ce1f89ccb08a63c8c63f5aae9c83ff663193425eabb86481ee697ecf6bf1f893325ba472a794c83586464d24e7ecbc SHA512 a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3
-EBUILD openvas-cli-1.4.3.ebuild 690 BLAKE2B 6cca66379c157fe3a4f7c4e429125ff2301729a20f5471cc47c4950d829d6ca0f8a615e8981c6150be79fd992cae3285665b044e09cc641712ce9220c619c750 SHA512 5be39313dae096bfe217d0e9685a5e7e42d2e3c97115636f14bd2cbcd6c2228176b6c0de5065d252a77d289b31cece77448598a9eef9d225e765c73857063c13
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-cli/metadata.xml b/net-analyzer/openvas-cli/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/openvas-cli/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
deleted file mode 100644
index 8a46aad30c25..000000000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DL_ID=2209
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-8.0.4
-"
-RDEPEND="${DEPEND}
-	!net-analyzer/openvas-client
-"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}"/var
-		-DSYSCONFDIR="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-tools/Manifest b/net-analyzer/openvas-tools/Manifest
deleted file mode 100644
index f9851977ef3f..000000000000
--- a/net-analyzer/openvas-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openvas-tools-0_pre20512.tar.xz 46100 BLAKE2B 4d497ef59620818c872756b9b251fa813b255d172e0e9968a130700f7851342b7a238790637e3fe93d93b664e2cc01af28d55c006ae38a64480be26fd4f824eb SHA512 ab524c18a9c9cbfbc742d19c55c7eacc99c39d9209d3f915a6e0070c662f9761cc55b1166dfb48cdaab2607a07ea0640ff9f0a3d48a364409e516a3142f96cbb
-EBUILD openvas-tools-0_pre20512.ebuild 562 BLAKE2B 66992b6e76a532348fb3cfdfc0ac010c8e7b1f244189a353db2201d53139fa12cbd6892e86ec9e8e4e4f1bccb8863c171fab22a6a394fffdf55fce0ac096decc SHA512 26026784420869596ac51e1c1437bf5a6bc2040287091ae386c693a5b83f3f922ecd8bd2e1c3d8c91b6d9dc730378feb05413c38c492250329b5f4fd9219d01f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-tools/metadata.xml b/net-analyzer/openvas-tools/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/openvas-tools/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
deleted file mode 100644
index 48c6d833eacf..000000000000
--- a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="A remote security scanner for Linux (extra tools)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/tools
-
-src_install() {
-	insinto /usr/$(get_libdir)/nagios/plugins/
-	doins nagios/*
-
-	dosbin openvas-check-setup
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins nasl.vim
-}
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
deleted file mode 100644
index 1e8c2a3f4c24..000000000000
--- a/net-analyzer/openvas/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD openvas-9.0.0.ebuild 1509 BLAKE2B 6eeb7438a3b0f529830cfa7e815628b96f27c5a5bf8fcea685efde35b4c6ed28e1ff78795f1120ef132ed9cafef97f4ab57327da164956bfa2328851cc0f51b1 SHA512 ee374829aca084cfbe3e8e73015fbaa37287ee73f310c291baf852cb3eda5bfbcec5b51cd962db282e0b83f62a5593a1796b150d26f3268b810b4c0d1d62b165
-MISC metadata.xml 990 BLAKE2B 38d5a08041cad530d89c9f7f93e6e45718fcc5358d71b72e664d249ae20f6b60502fbf00a0bf5b510c7e12192b5d696b3b262083b55389e36be6b9b6b22b4843 SHA512 897ec95d4a7b86a91fe5ced1dfbf27b724ec3a5c1a83ebdc2dfae76d707013d2ac2d908a341e36f950c0bf125d3010fab4bb58012a650be8bcd988c0d14821c2
diff --git a/net-analyzer/openvas/metadata.xml b/net-analyzer/openvas/metadata.xml
deleted file mode 100644
index a2806dd34dca..000000000000
--- a/net-analyzer/openvas/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hasan.calisir@psauxit.com</email>
-		<name>Hasan ÇALIŞIR</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Extra fonts, pdf results and html docs support</flag>
-		<flag name="cli">Command Line Interface for OpenVAS Scanner throught <pkg>net-analyzer/gvm-tools</pkg></flag>
-		<flag name="gsa">Greenbone Security Assistant (WebUI) through <pkg>net-analyzer/greenbone-security-assistant</pkg></flag>
-		<flag name="ospd">Enable support for scanner wrappers through <pkg>net-analyzer/ospd</pkg></flag>
-		<flag name="ldap">Enable support for ldap through <pkg>net-nds/openldap</pkg></flag>
-		<flag name="radius">Enable support for radius through <pkg>net-dialup/freeradius-client</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/net-analyzer/openvas/openvas-9.0.0.ebuild b/net-analyzer/openvas/openvas-9.0.0.ebuild
deleted file mode 100644
index b9d86a8e6da4..000000000000
--- a/net-analyzer/openvas/openvas-9.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cli +extras +gsa ldap +ospd radius"
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-9.0.3[extras?]
-	>=net-analyzer/openvas-manager-7.0.3[extras?]
-	~net-analyzer/openvas-scanner-5.1.3[extras?]
-	cli? ( >=net-analyzer/gvm-tools-1.4.1 )
-	gsa? ( ~net-analyzer/greenbone-security-assistant-7.0.3[extras?] )
-	ldap? ( >=net-analyzer/openvas-libraries-9.0.3[ldap] )
-	ospd? ( >=net-analyzer/ospd-1.3.2[extras?] )
-	radius? ( >=net-analyzer/openvas-libraries-9.0.3[radius] )"
-
-pkg_postinst() {
-	elog "----------------------------IMPORTANT----------------------------"
-	elog " Please read important notes > /usr/share/openvas/OPENVAS.gentoo "
-	elog "-----------------------------------------------------------------"
-	elog "Additional support for extra checks can be get from"
-	optfeature "Web server scanning and testing tool" net-analyzer/nikto
-	optfeature "Portscanner" net-analyzer/nmap
-	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "Application protocol detection tool" net-analyzer/amap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "Web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 7e83170c6a79..1fa1a8b06acd 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -2,8 +2,10 @@ DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a2
 DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
 DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3
 DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
+DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
 EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b
-EBUILD pypacker-4.6.ebuild 696 BLAKE2B 849590e13844edc4d6d08d4995e3284f0aa1e7a90ca969802f6525046197984d6e6c5d4a3f07ac4def5be19812395924a68c102d1bbc8a690405af1530b1526e SHA512 7f80a767611317ded7eb0e94f3b62add6432acdac9c95ac92d2bb2155b34ef1f991a094cdc9db731b7eb8a171bc5af6ac2afd27b882579922f17240e082352d4
-EBUILD pypacker-4.7.ebuild 697 BLAKE2B 3e6cb3ecdc10198d651dd726974ce7ac81b45e9b7fa191c02595afe26ac4f271be55468c1b68ba85c5bc35ab4dea468d7518e359fd9a19bdb8f7fa42efc3881f SHA512 f6f896ce34a9b056b2e0c1af1200404b49457c85daeff4df86661674faf667d10c21a52f618409b06be054a7d505dae2c6c26cd4135097099c0c133bf513ddf7
-EBUILD pypacker-4.8.ebuild 696 BLAKE2B 6167963cfc8e5796fcaccfb1044744511340eb3c5bb3cde52a6878de8dcbdfd7177a471d861a1598ec6a3b667afe3c793f2a3bdb205800571220f605df3b5612 SHA512 f88d3524eb9415642b164fe42e58e290a06f6f284d3951bb98d1dbce3cd54661628908abce86936076218f094400b05801094e2f4070123999578430dda3b50e
+EBUILD pypacker-4.6.ebuild 719 BLAKE2B 9eed77684be21fa11c6f836495d3e98c4d6fb22f93d131ee0d8ba81aa00f48de6888c4138ee7f2fa2e77d28a054ab281333a607d7b604d1db47f3b9125fc4f12 SHA512 5c006fb5efb4a1ebc90cbfc488e9484ed102a2168c4d7d4889b9e55c92eafb0a29976943cf83474c12815581b90d95373e7cb14fb35a831153b9d3461b71c9fb
+EBUILD pypacker-4.7.ebuild 720 BLAKE2B 91e167ce37ebd0ef552ebdf06580a3d36abc15bd56b2357db7af954834f44aaaeed6b8a5f08d6295c744b40f5247321cc4686e4c844849427e3c5beb6efe1fe9 SHA512 a0e2aa316203e0cfdc138911a0b3be4bf8c23494750ec4c64638ada7d41d4e1f671944883c9683c553c06e28172e3d6cd37419b169ba844cb420691e6c56b59a
+EBUILD pypacker-4.8.ebuild 719 BLAKE2B d6d000b5d81c6652f5b6c1f82d2c608d19888fb8006d3317ee80cd85f62927055c22c490287d097352085e83c66ec7708220bce21fa08033e5d24a6bfda28939 SHA512 08b6737b554194e95cafc22f1dc1affa3fd48595d755059c69e459f6ec3b203e7e50a1b113b8adef5584f87a45943dc19abe07a3f3cdb94d031fd0420b291df1
+EBUILD pypacker-4.9.ebuild 719 BLAKE2B d6d000b5d81c6652f5b6c1f82d2c608d19888fb8006d3317ee80cd85f62927055c22c490287d097352085e83c66ec7708220bce21fa08033e5d24a6bfda28939 SHA512 08b6737b554194e95cafc22f1dc1affa3fd48595d755059c69e459f6ec3b203e7e50a1b113b8adef5584f87a45943dc19abe07a3f3cdb94d031fd0420b291df1
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild
index 69e44bec5cc8..0f4a660d8dff 100644
--- a/net-analyzer/pypacker/pypacker-4.6.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
 HOMEPAGE="https://gitlab.com/mike01/pypacker"
-SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/pypacker/pypacker-4.7.ebuild b/net-analyzer/pypacker/pypacker-4.7.ebuild
index eceff640e8e9..1e65889800c5 100644
--- a/net-analyzer/pypacker/pypacker-4.7.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.7.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
 HOMEPAGE="https://gitlab.com/mike01/pypacker"
-SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
index 5d76249812e6..db80e87c9202 100644
--- a/net-analyzer/pypacker/pypacker-4.8.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.8.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
 HOMEPAGE="https://gitlab.com/mike01/pypacker"
-SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild
new file mode 100644
index 000000000000..db80e87c9202
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-4.9.ebuild
@@ -0,0 +1,27 @@
+# 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 distutils-r1 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://gitlab.com/mike01/pypacker"
+SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+	"${EPYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 6fc3f965802b..7560f76207e4 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1298 BLAKE2B bba6c61e4b254bc7fabde642811c27b4084b7c25af89086d20113561b1a74a6e03f57b3cb81b6f82394aed51d523ec1da7ccab654cbe6c0a03cbb45981b4b6fd SHA512 4ed7eecad1da46e3696c8dc20e21d477d53f3bc2aaab8b1f4e3bfde90def07736c7e43a22d62937b5cbbc236e6cd317a5343ef205fe272971793e4f2c033724a
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1325 BLAKE2B cafa4231fc6ca592b9610a08dd8f020b4ba9383d4eb23a63d4b35eca1a6bd2309e176f01781190a41279f599d85f841087a9888c9477704f0962e9683ac7b66c SHA512 cb908a0a5be8f3df758fff19d4e8338149ea8cf56f20b2744a57d2f6007d866b410ce96ba7521dc3f79feaa5d6434d69564fb60403716aeae931283e2b6a2cc7
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
index 608ea0ded029..dbb861877c8b 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 44a4189f73b1..a8557aed9d9f 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -6,7 +6,9 @@ AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd6208
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
 DIST snort-2.9.12.tar.gz 6456877 BLAKE2B af5584fe01caf9af2f2188e1362bd927a884354ddcb3026af514dddc1264b557691e1644d3c24e85c3b5b5f515dd9fccdd8d38ebc7c28d2f384fb822e27d8bb8 SHA512 6f759b321ca5496abf27c9e4f4fa003cd5167f8c8a160bf5f0b1aee1a93aa8d27de89b84bdf993a0bfb3a93c6315cb2bdbdc3fdb3b09b8d4d1d3c22b69c6783f
+DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
 DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
+EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
new file mode 100644
index 000000000000..e9688b46d280
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.15.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response reload-error-restart open-appid
++react +flexresp3 large-pcap-64bit selinux +libtirpc"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( dev-lang/luajit:= )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+)
+
+pkg_setup() {
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+	default
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/squidview/Manifest b/net-analyzer/squidview/Manifest
index 3fbe1bca8a1e..f08ff5a545dc 100644
--- a/net-analyzer/squidview/Manifest
+++ b/net-analyzer/squidview/Manifest
@@ -1,3 +1,4 @@
-DIST squidview-0.80.tar.gz 122502 BLAKE2B 2fe7a745d6130929f4e9feae301abf110f5e3e963ba6ec8bcf41026a8bc43e3f39862a02c3ab7cd1c4a1009122c3569cbb927b394ed3aa4f0c13bd3e47fe96bf SHA512 4a9bb0f296222ef5c8c127d4e0697ff050a2adcf8b28771379da32af816a2d43edbbd3f02920dc2c54735e7a22f50e6b9040067e2b77136506f472cfedff8894
-EBUILD squidview-0.80.ebuild 628 BLAKE2B f6e80f05ce0a0ab1c76cafdf06ece52d0041fa3a313500d6438fc706070244e6131ba394ce367ad44eccccd243c6f9a79c77c9eb1ef3699221c5ad3f23e53f32 SHA512 7093c00269784d92f1055d48ad25d4b2988581c8653d00271dbcf86038b6874a47e21b9a5270082b3255033cd80dd115c6c05ec9be6d1186430ef475213d43d8
+AUX squidview-0.86-tinfo.patch 1269 BLAKE2B 0e588b0e1db47b6b25f9c700fdf8d3a82271ec871fa452566d7d3666acd6a2e5f48a72a18d9de72c21cc45761c33fe70252b10c7ca7e54f7b0b905881c84fd11 SHA512 d1aa4eec85b3c870cc71aca3070a1ae39613168a06d960ed8df878522376c598b2d4f90c3a31cf6cb3eb700e7eb48a21ff5fe99c7a629995dd117fc88da5c165
+DIST squidview-0.86.tar.gz 129911 BLAKE2B 8a514728508c2739aa619d1a481beddd6783e61ccad1252ee6f6a8052fe87bf0edbf23eac19761aac275a370092af45b981ae201a1e4a7b47168941ba642f128 SHA512 c020799e149a4884525b832a21ce990b90da5d3e1caac240913a37b8559bac4e3402b8f5732c3728308ecbea0a56a9e4b764ec7f36b15727c000d6d9e25a57a6
+EBUILD squidview-0.86.ebuild 549 BLAKE2B c4e4cbe1036c2b81fcde67ecd7fbda52eaae6fc9ce77fa730dc0574132231fd03a84fe226e2a1b62d7575ff0153e603818884d4f3f61f503c4a71caaf841eae3 SHA512 065551a4a067f2cf166995963e1c3447dc00b9ba16977c6523a2ee76f690f099c4047f52a582d2c0c2ca5a1aa8e79065951c5d054e02f105672673fc14dcc009
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/squidview/files/squidview-0.86-tinfo.patch b/net-analyzer/squidview/files/squidview-0.86-tinfo.patch
new file mode 100644
index 000000000000..7dd536c5f81f
--- /dev/null
+++ b/net-analyzer/squidview/files/squidview-0.86-tinfo.patch
@@ -0,0 +1,43 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,23 +1,9 @@
+-AC_DEFUN([CURSES_TEST],
+-[
+-if test "x$sv_curses" = xno; then
+-  sv_test=$1
+-  sv_pass="no"
+-  AC_MSG_CHECKING([name is $sv_test])
+-  LIBS="-l$sv_test"
+-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [initscr();])],
+-    [sv_pass="yes"])
+-  AC_MSG_RESULT([$sv_pass])
+-  test "$sv_pass" = yes && sv_curses=$sv_test
+-  unset LIBS
+-fi
+-])
+-
+ AC_INIT(squidview.cpp)
+ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(squidview,0.86)
+ AC_PROG_CXX
+ AC_PROG_INSTALL
++PKG_PROG_PKG_CONFIG
+ 
+ AC_CHECK_HEADERS(curses.h, signal.h sys/time.h sys/types.h sys/stat.h \
+  unistd.h fcntl.h time.h stdlib.h math.h stdio.h,, \
+@@ -28,14 +14,7 @@
+ AC_CHECK_HEADER(vector,,AC_MSG_ERROR(C++ STL vector class missing))
+ AC_CHECK_HEADER(algorithm,,AC_MSG_ERROR(C++ STL algorithm class missing))
+ 
+-AC_MSG_NOTICE([Checking curses library name])
+-sv_curses=no
+-CURSES_TEST(ncurses)
+-CURSES_TEST(curses)
+-if test "x$sv_curses" = xno; then
+-  AC_MSG_ERROR([No suitable curses found])
+-fi
+-AC_CHECK_LIB($sv_curses, wgetch,,AC_MSG_ERROR([Curses support is not complete?]))
++PKG_CHECK_MODULES([NCURSES],[ncurses],LIBS="$LIBS $NCURSES_LIBS",AC_MSG_ERROR([No suitable curses found]))
+ 
+ AC_MSG_CHECKING([large file support])
+ sv_large="no"
diff --git a/net-analyzer/squidview/squidview-0.80.ebuild b/net-analyzer/squidview/squidview-0.80.ebuild
deleted file mode 100644
index baa6c58d7b3e..000000000000
--- a/net-analyzer/squidview/squidview-0.80.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Interactive console program to analyse squid logs"
-HOMEPAGE="http://www.rillion.net/squidview/"
-SRC_URI="http://www.rillion.net/squidview/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# BUGS and HOWTO are installed also as part of the Makefile, but the
-	# program expects them at the right location, so we can't get rid of
-	# them there for now.
-	dodoc README AUTHORS BUGS HOWTO
-}
diff --git a/net-analyzer/squidview/squidview-0.86.ebuild b/net-analyzer/squidview/squidview-0.86.ebuild
new file mode 100644
index 000000000000..4ee7ee30ad0e
--- /dev/null
+++ b/net-analyzer/squidview/squidview-0.86.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Interactive console program to analyse squid logs"
+HOMEPAGE="http://www.rillion.net/squidview/"
+SRC_URI="http://www.rillion.net/squidview/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+DOCS=(
+	AUTHORS BUGS ChangeLog HOWTO README
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.86-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 8a2957c24618..d3b051746923 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,7 +1,7 @@
 AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
 DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
 DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39
-EBUILD sslsplit-0.5.4.ebuild 1062 BLAKE2B 21b643d7ea3e2b6227c1f51d1113b708da07624357fef757361150ec8a2d29d8e5b4c1a9a217b23e9ce0b106e2d7c13568aa3c3c2fdbfd828b717170a20697a5 SHA512 7aff2062038061115f4e59d706585da52ffba89f2a12f9d0da2c7be19844c0a3530771f6ee28b2b91bf4a6abd648180ee92052e6815ee4ff911fd5977d33109f
-EBUILD sslsplit-0.5.5.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
-EBUILD sslsplit-9999.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
+EBUILD sslsplit-0.5.4.ebuild 1089 BLAKE2B fb7bcd6d5e5e9f239af47c5c1392f6688b70de51695b49caf0c3b306b7675669094a6fdeced4c387e0d795379f3a40e73f1b129b37bacc8b2bfdb937691062cd SHA512 d331ce60da4932693801c708f08f81a08a372fa15d0970f8e59ed79f72f9c40692be2664c7b47772934f2134ffc28f6bff3bd38bf1f4a9607ef87062f47d0ba6
+EBUILD sslsplit-0.5.5.ebuild 1056 BLAKE2B ef52fc2163d7b77e9bb103bbe53323d9fe6a7d364dc7d7544a0de10f973d633e09f9a99b6e4abb71a000db2be77b7cc2a2a16a2c10f566803dabd4204a97d91c SHA512 0ff6a3c4a37f1b6fdab882df66e5d3e252a870cf381c91dbcf2a83a7513d9605d95a1f4725eb0ac004b75d4a2406417c58bf7be0cf2ca131d25b81b59a6a8097
+EBUILD sslsplit-9999.ebuild 1056 BLAKE2B ef52fc2163d7b77e9bb103bbe53323d9fe6a7d364dc7d7544a0de10f973d633e09f9a99b6e4abb71a000db2be77b7cc2a2a16a2c10f566803dabd4204a97d91c SHA512 0ff6a3c4a37f1b6fdab882df66e5d3e252a870cf381c91dbcf2a83a7513d9605d95a1f4725eb0ac004b75d4a2406417c58bf7be0cf2ca131d25b81b59a6a8097
 MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
index af09469872b6..7960cc011edf 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://www.roe.ch/SSLsplit"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_musl test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
index 5ea7c49b62cf..2aa8a7e58600 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://www.roe.ch/SSLsplit"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_musl test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index 5ea7c49b62cf..2aa8a7e58600 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://www.roe.ch/SSLsplit"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_musl test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 3f0225e9e3dc..5260932c6316 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -4,5 +4,5 @@ AUX suricata-4.0.4_configure-lua-flags.patch 502 BLAKE2B 14693f51888ba8d41a736a9
 AUX suricata-4.0.4_sockios.patch 298 BLAKE2B 2a3fd2b8ace6363f90ad52f2f9802cd9565d3aabcc1d5fec4b2b0b9690110d7b28fa8d6be39d357b9dded7f2f09ba9b21e3837d92cac42483e0015ef76669ec8 SHA512 416cc3ff7636f7938e35a449bea41d2f4a02dacb80dce0821091db690279f966ef048a036a4b47b9f9208039b9103366500afcd0d6b3e85d8fe96372a0b3921a
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 DIST suricata-4.0.4.tar.gz 12511121 BLAKE2B d9dfb00a45c2e9810409a8ce91a83e23ebce20eb28492bf24f9688d292b5805dca932c39cc673cf1148325fe5ef7936dda7f6c7819605753cb2e2ddc1cf5dba0 SHA512 6e158aa6d3edb9d11e0df3f986392ee2ae49ab4dfb978288ced4484dbe5c08ae061db2a566be6d22cf14bd0b88f87f9cb9c0a657d7fc44e099b8783d933c771e
-EBUILD suricata-4.0.4.ebuild 4744 BLAKE2B 03ad9be14e12649c8e50752e31d151ad9b97b968b8caf2305d958c9d68407d59b723e5b318ad7850c71b17d5aaebb07d865f6b81748148f2297311d531423c61 SHA512 0988822e3a3689d7ff0e7cb239f9c2504f5c693789b859777bb2eb5e0ce3c906ca1effb794905d7106093fdc80b3027d351434dda0528a2fc8e1e61e8a3dd720
+EBUILD suricata-4.0.4.ebuild 4771 BLAKE2B f52e9e40f2da2a016122b09d30c34aa2467e1f2a682a5161677501d9a9c479fbf66b995b8ae9d5454e6fe7080f229e4961707fdf6e3e7e5ea133ffb84e5f2d1f SHA512 76ff00070b17bd39d1fb532a0d5f56113e6b30c3d6adb8473f0494b6440b45a967e21a846150cd97b03a99e84fc271a72057a4b2013921a13c2c2cc8b2a65cba
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/suricata-4.0.4.ebuild b/net-analyzer/suricata/suricata-4.0.4.ebuild
index 98ed94d5b7d5..2ea320ca46ba 100644
--- a/net-analyzer/suricata/suricata-4.0.4.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/jansson-2.2
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 14a786cd6f81..ea9735b41903 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,4 @@
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.9.3.ebuild 1945 BLAKE2B c004f77736af83932ca4389cedfcd5c884532fe482d321d0b8c54a8114f5d26dfe1dcc3b453dc7e7c8a8e232b5f7e7c94ceb2675ec17ad8a61a951e49d463037 SHA512 0d08b888904454e7a338f117ec357201bfb6a991ccc7dba2b6a7a45a3d639c6f02226082ba701f019aa7a1b719bb444c3edf0b359ad1c7c15e414587120fb4c7
-EBUILD tcpdump-9999.ebuild 2191 BLAKE2B a190910ce7f61bf76e80e861c317f73f8b28e66fe53f34a87b2d0e91055f3ec25c9ff08c053ea80809aa3d9e87cbee33b8e081f3fa0e8ceac0855ffa193c1b6e SHA512 ff33a6b2385aa5eefd6624ee91123ccf3891be27199c529156f644913e3d06ba8190ba311e715595f59f2010839755504022799e836cf9ed26ccbfb2b3014356
+EBUILD tcpdump-4.9.3.ebuild 1972 BLAKE2B 212f414d858a2b428777373768e08d51bb3d57be9a8d3434bc84b96975dfaeccd527af5d12aae8151a5ef162f429fd9830b3e069c65226eefe88cf04a1de0146 SHA512 f4c2e94bdad0b57fa985b836c59ab02ad86b04b67a1bfac68d08a673dbabfd9272054af6d46e9f823f5aaf0fd4da8435f21ad15b2bd0ca67e15a34f60a8f62f9
+EBUILD tcpdump-9999.ebuild 2218 BLAKE2B 049cdbd3abe9ad3d425f0825b15103d0054dead44e5740401744dec360b053710a74b4ac3579ca0f3cfce32dd5298e7934fc78b4e7d30455fb685973012a16bc SHA512 94a8dacb7b1b93cb30f1b7976634628829e26fd9d68173bc7d597c51710b281afd7bdeffcab63478ea39caaea67c104b25b6df788d13d07b2984469718ac3d03
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index 3ea9ef51738d..c4d7bb454a9d 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	drop-root? ( sys-libs/libcap-ng )
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index f4831f210d9a..52faf660b30f 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="
 LICENSE="BSD"
 SLOT="0"
 IUSE="+drop-root libressl smi ssl samba suid test"
+RESTRICT="!test? ( test )"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	KEYWORDS=""
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 31bc279f6234..6eca5dd6b2e7 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,5 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
 DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
-EBUILD tcpreplay-4.3.2.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
-EBUILD tcpreplay-999999.ebuild 1860 BLAKE2B 7e5894985eb08e8b82aa434bb30c096679c50995203be58c2490374e9163502b50585fe2afc530e9de918441181d1deef76ea999030bc40d4a077ca6b6da83e1 SHA512 36de21822cd88ab40c1c7b70c762be1284391bbb42ad0b56b9d10ddfe3de4b5f9e9195c41d900dc57fe84064003cadb389b3fefc13283e871e2adc14dfb02ebd
+EBUILD tcpreplay-4.3.2.ebuild 1870 BLAKE2B b3259f3304d9a352c41843ad22808a10e0060437fe2476398a5ed5d0b2d6ebfe53375e73829ab831dbaa8fcb83dcce5008a2d994888e4db65c95cf3ab9db6cad SHA512 4aa9cc30b785932ed73c19e001f36c73f6191af1cb739637dbe6cd5b541811f3818ce4c64e14e8910a1d505708f6467ca1e2874a0cd54b7eb174d6f31ac62d4f
+EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
index 3d0c5b4f1d7a..003400e4ef70 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
@@ -65,7 +65,7 @@ src_test() {
 		ewarn "Some tests were disabled due to FEATURES=userpriv"
 		ewarn "To run all tests issue the following command as root:"
 		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+		emake -j1 -C test tcpprep
 	else
 		emake -j1 test || {
 			ewarn "Note that some tests require eth0 iface to be up." ;
diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
index 36c173f66f59..9e2776949df2 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
@@ -64,7 +64,7 @@ src_test() {
 		ewarn "Some tests will be disabled due to FEATURES=userpriv"
 		ewarn "To run all tests issue the following command as root:"
 		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+		emake -j1 -C test tcpprep
 	else
 		emake -j1 test || {
 			ewarn "Note that some tests require eth0 iface to be up." ;
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 16f52119a27f..21d0a8dce689 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,5 @@
 DIST testssl-2.9.5_p7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
 DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb
 EBUILD testssl-2.9.5_p7.ebuild 1527 BLAKE2B 8dddf30b779034c519b25dc3c7b1951517ad2ed2623a3ba6b85d259521509032457206034735d80bc1f8475f80786594f9de11b3623c090bfcc1903afe497c1b SHA512 ae42c3b0397f7bbcb19dc1547c7d27cea64f4613482ed2b06df504533edc8b41d84ab2be9d486694d711d9c7019689cd28e1a7efa630aabb47cf3345bf0d752f
-EBUILD testssl-2.9.5_p8.ebuild 1512 BLAKE2B dbb066094e2e89f1a95ca71e19e7714f929e89698acd19984d25aa198ebf14791f4c7f8b1b4bff079fd2ef94a7be58755b5323fb2ce1c0f92ebec2ff0e6971cc SHA512 b99b54101b6d19b0adee93d1a42eadd42dfe5b521b0b3eb1cdf70f86b4477c9d184bec7d24719955edf846d6c4e3c3f47fa181a3ed65e706b7aeb7a2422059f1
+EBUILD testssl-2.9.5_p8.ebuild 1510 BLAKE2B 9103b39ff060c190ff809e9aa0023ef6a34afc41fe524f3473243b215bc3171d919fefcf3b1504952afe0413991694eb507f4df52b6a2b4367f14c462b1b3490 SHA512 15175ab1c822895d967e3ab186efcc93d423f50b6e201d80ae8235692cbbe89ebb0fa8135b442fcc2cb27eeefdd1e0d9841c8addbc6589198d3bf466b18155be
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild b/net-analyzer/testssl/testssl-2.9.5_p8.ebuild
index 122ae7a422b5..ada154f761bb 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5_p8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bundled-openssl kerberos"
 
 RDEPEND="
diff --git a/net-analyzer/thrulay/Manifest b/net-analyzer/thrulay/Manifest
index c96e9a3abb1c..c5bae7fbe7bb 100644
--- a/net-analyzer/thrulay/Manifest
+++ b/net-analyzer/thrulay/Manifest
@@ -1,5 +1,5 @@
 AUX thrulayd-conf.d 248 BLAKE2B 78679b56450e476181e51a77145d462b8824bc7c9d01bb16cece24f9f83c30923bcd0c36b10103b8fcac23e6b14bf56b04072c025da08e6114b6ccc2e6489d83 SHA512 d74cf8e47c48b762ab76ec74bf92227092706a4594a8b894a58eb0a8972ae99ad9fa565e1ea5520144e692429e35f67593c37ac79e2682a9cebd2044bc3b510a
 AUX thrulayd-init.d 557 BLAKE2B 203082d1e1005c6f5c5e313bedf78251c79a608063cd968c018d56aeb39f2ecd5ba4bee8c1beda97ca22ba19d5bedda88369ac89680abd563547812b994366fd SHA512 9573ca678b719b913f492b8f2303c8c25b1b49fe727aae5f89016c1d3a2d34595655b851ef26eb85a8f66379b9ea1868babb1e1e1a8e9bef9a61858aa467b9a2
 DIST thrulay-0.9.tar.gz 370312 BLAKE2B fdcbc0785ccc61bb85454d878f46bef97c346dd8c8a54591c993940615a8047b24fad00ffca5c3db6d7c1303b42c67f45b828e899564d7c920cc83924e3a18c2 SHA512 9655ef37f6ef3ba51a2fadacf08978fb1c284af6b571dbf76c44e5582bf705bec08170b3b2cc69512b8327485dfd3f758ed2addf510a075558aea70eb4779a6f
-EBUILD thrulay-0.9-r1.ebuild 988 BLAKE2B 906e35b2b20feb8209624bc1c18b0f390c8999b6cf5fb0bba40f5c7c57f96294c7c23a19a536e1f798966346c006b82897b3ccf07210663c0d5af26ce367d676 SHA512 95023931605ce3d696eefd6e36f6bc47b6ed97f8c3ab4d18a6a19c2139818c017730fdfadc24803fc95dad8e4149f838be969e4085ddc10166f5c9da4ecba8b7
+EBUILD thrulay-0.9-r1.ebuild 864 BLAKE2B 9494ba34eede02b41ad1f73024221b5d0a219296d3da1956bbae1ff7b5edc858525d9bd3d3c2775d61eaadeb5643696d1d03402e44f855d653cd554dc24455c1 SHA512 71fd5e82a8621b32eb5a01507d6dd2b63bfd508daac5d4afe9f14df4d45dfa76b15c1b19629fa6ee26058b7f829c61a6fadde43f5f98f766216a3ad905bfdb90
 MISC metadata.xml 303 BLAKE2B 2191f0ce17b8138cc499869831c34d76e7e449ea780f7be0a8d6b86fd0dac2a2eb5276faeed06c088f5e28e98907f5a9fef49bec6a229b86489bfcad1aa52db1 SHA512 ccf7095c2929ce1262d94f379a7a704d82980b691da0d77e8ec5684803ab6c40bcd85d167cc50f37411e92ace6978b90953e71395ab6f56a31479f2ca3a35ccf
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index f7e905e1772a..f66426aacee5 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -20,11 +20,11 @@ src_prepare() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake install DESTDIR="${D}"
 	#dobin src/thrulay || die "dobin failed"
 	#dosbin src/thrulayd || die "dosbin failed"
-	dodoc LICENSE README TODO doc/thrulay-protocol.txt || die "dodoc failed"
-	doman doc/thrulay*.[1-8] || die "doman failed"
-	newinitd "${FILESDIR}"/thrulayd-init.d thrulayd || die "newinitd failed"
-	newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd || die "newconfd failed"
+	dodoc LICENSE README TODO doc/thrulay-protocol.txt
+	doman doc/thrulay*.[1-8]
+	newinitd "${FILESDIR}"/thrulayd-init.d thrulayd
+	newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd
 }
diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest
index 156347b1a7c6..99e1b2a84764 100644
--- a/net-analyzer/tptest/Manifest
+++ b/net-analyzer/tptest/Manifest
@@ -1,4 +1,4 @@
 AUX tptest-3.1.7-getstatsfromlinevuln.patch 5727 BLAKE2B 65fb90b6557317571fde1be18c608bdadfd379d9c0be7d110bfd2d15a028ecf35a0a6cc2e66cf69c2435cdab4d947a173cf9fec7c2521483a8f3d1dbe6cd9909 SHA512 3d0135d382adbbb58fc359d021313b4eef319d96c46cfdee06def06273dce259d0027a4dd043ccb08c5382dc543c6ec5ba05b536e685f41b946c8048711dc883
 DIST tptest-3.1.7.tar.gz 313801 BLAKE2B cf4cc6e1e76dbaee8925d9432335ec0a28fcf790dba5c85568ea538fe442c55c8a3ad7ac4fbf4cb1c4ed967cc18dab50212ab26915232bd7fc284dc4e6f0278b SHA512 c78fdbc561adbe109be9fc45a2dbd5c452235525ac4d5f24e39fd8824825fd02c35853411c3f4ae1870f98b576df37f3f1f1266de7c40edcb8f35c69b9063c59
-EBUILD tptest-3.1.7-r2.ebuild 899 BLAKE2B 434e755f87b7812721fb2105114b9593bb8248d44b7a65890736971e460f16d93687b460af6925c9db87c844f62b0c223dca265b53bcc88525735ff8ecefc130 SHA512 7462d7a2570d3ad9445188659980ea1985cc69b97725fc91c3dcce6c2add46a748693a82a7595bca00c04f6f96094b248a9baf2f604cfa7680e49996cf28f62f
+EBUILD tptest-3.1.7-r2.ebuild 878 BLAKE2B e6f6ec3f9a51f2e3eee971658585dae3cf10732f0790c02c83ffb4965bff228845c3cd493ac296f678407b369bd01228df09f5cdf8bf9a2aa15d0f584c3dc1f6 SHA512 66fb9a730648e6320145009044fb619073caeb804d676574e0ce83a28c775409aeb0e690969f0973c7df978a6d251517166ccb515484b42a403fb7cc1871459c
 MISC metadata.xml 356 BLAKE2B 601b177e39d12ed70fedc182e52730c62b720bc0d8a61b3087a12519d56146b7ddb3f8e69375c62e50e1d5722223481100b47262313c7cd727a0fa10fae7aa98 SHA512 df040b3a61401e1ca7ff513904875c135b48d03dbbe8ee4bd83f2faa8e8ba448bed670a44b6ff04b24cace44d8308ca64c29dfb32b2f0dac602e3d6d62234956
diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
index d580934eae8f..709ad3a89a3e 100644
--- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -26,12 +26,11 @@ src_prepare() {
 src_compile() {
 	emake -C apps/unix/client \
 		CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
+		LDFLAGS="${LDFLAGS}"
+
 	emake -C apps/unix/server \
 		CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
index 2fa6dde5ed87..62e4c2b8dde2 100644
--- a/net-analyzer/tsung/Manifest
+++ b/net-analyzer/tsung/Manifest
@@ -1,3 +1,3 @@
 DIST tsung-1.7.0.tar.gz 1572265 BLAKE2B 8227e14106943071e7a3759b2bd06a92af55889ecf22b1a74432fd2f6d03196a9e321d16f1e291dcd71d4af560f4f2b38193326a9a87fec671dcda23ab0ecb1b SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac
-EBUILD tsung-1.7.0.ebuild 738 BLAKE2B d763a8f22b2a483b84d303631fdbbb08feed9a4c3751728b9bd4a0ca478f257cc2ef3d93e1e73581df3187a25bb8d50845c30d0e8c734e56826763f2d0e2e39c SHA512 b4c4badf3577f83f7a42fc7135157b6b5410a0535a3310b46eaf13fee0eed826155e32a851448f6e0c90422518bf6874b8f307eb2e17788f44e5eeb466bc90f8
+EBUILD tsung-1.7.0.ebuild 686 BLAKE2B 40f3daba1d7732516f4ca9ba7ae9519df0e1196d92d704f039bafa255def139a4b31af45a91fdb5f52bfe1cc3dd81b70219665340f47ff4b12d57730026a2562 SHA512 974dcac79135ef5734889d796d9d0556582e46e4bd22ecb08a2494151c65d936336cab25fb45fa71c3c3b192181cd77909fdf043deff835ce3acc001c1a0dc99
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild
index d2d90fd44c21..80940ea2f4aa 100644
--- a/net-analyzer/tsung/tsung-1.7.0.ebuild
+++ b/net-analyzer/tsung/tsung-1.7.0.ebuild
@@ -30,9 +30,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "Failed building"
+	emake
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Failed installing"
+	emake -j1 DESTDIR="${D}" install
 }
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index c0d570f06be9..38306afd9247 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -12,8 +12,8 @@ AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e2101
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-2.3.tar.gz 269907 BLAKE2B b935c7baec34f15213b3fe320add4e3ecf0d3cd43d5934231eb9b96f3bc8171aa056e1a08d42cafdc2d06b9e6108d04392a1452a3d24bdbaf748722c53f64f23 SHA512 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677
 DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6
-EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
-EBUILD vnstat-2.3.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
-EBUILD vnstat-2.4.ebuild 1525 BLAKE2B b4a3e5bdd1c554cf7ff18528eaf02688b6d7035cd8480291ad3cd7fdc7d2b71bed7cea46bfe0f30415d1b3ce4873ebfb2f5fd0343ca93d5253ecb66adf62cd22 SHA512 cd3577efee947e7688b0b9a7768d0bf71e8f10726081fe13c335737abc939bc059fe4ce5a438ce353714b0a726e3712a05da6fa9191b24ad28790a542947c005
-EBUILD vnstat-9999.ebuild 1502 BLAKE2B 85b6e903a1cd01f95b3140ff957f06f2cae8e890279fde5b89d8e478e23a9a1e96cd4db7ad31d00fe1bfb269330a367f35c24e844e3399ec44774adc1c6d80c7 SHA512 8c8644661509f62cd77319e0d445371cfbf4b9533f4e0602978103c1b7460c64a1a242a2495aeb35ac81c6b2f5898d042bfc4f0c51d544e8156f5632a2a26b02
+EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
+EBUILD vnstat-2.3.ebuild 1552 BLAKE2B 9faba315df933f75334b986f6aa59511b6af0d6281d62b3e942ffea4a9d44cff85ab7b554c747a8df8a745304d1ae55bab90f92dbd77f88967e9af0c1e34df36 SHA512 d34e59e06e7b0e4054322cd583c359997152286921d6c92f9894d660fe37ab5727fc1fd43611afbe6a1821c68bf46b4a9716410d498d7ef59784e729469b1527
+EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
+EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index d52c53733fd7..d48e9aa70bab 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	gd? ( media-libs/gd[png] )
diff --git a/net-analyzer/vnstat/vnstat-2.3.ebuild b/net-analyzer/vnstat/vnstat-2.3.ebuild
index c5e123218abe..63dfca4ff73d 100644
--- a/net-analyzer/vnstat/vnstat-2.3.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.3.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-db/sqlite
diff --git a/net-analyzer/vnstat/vnstat-2.4.ebuild b/net-analyzer/vnstat/vnstat-2.4.ebuild
index 158b3bde0441..3c08307f0cf8 100644
--- a/net-analyzer/vnstat/vnstat-2.4.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.4.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-db/sqlite
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 0b1d30191127..7299c18fe077 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-db/sqlite
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 29392972c26a..7f87e0158d49 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,8 +1,4 @@
-DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
-DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7
 DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f
-EBUILD wapiti-3.0.0.ebuild 773 BLAKE2B 523372fe70bcaaf93fae84e7ea22c44016067ffd46b9c520adfa96ab023b4b33fb2bcc6ce3724e618bccc669b9722f536f4535a060c187e7ea26dafeb69d1dd7 SHA512 42cb8736caea7370d225fe13ed51dbcfdd046cff91235f507d7718711e784b55c52b7804c1b8e7c44628bf7b4cfb3ab3cc74e527f2ed9fe95ab4adef00f52141
-EBUILD wapiti-3.0.1.ebuild 815 BLAKE2B eec75ae9d207ba0ab645765ae8cd64244b677418fe7f0a74c6ba115ef8bcd0625d19529ec1a47a1304c25ffbd37652a6a143b3e9eaacce5cb1e06356dd741b5d SHA512 3a93077e01db192a3ad12a27167f756df79427cdece3d7f21c699bc4214884a4f59f5b93928af936d74ba8c76d655aaa8ea4bdaa74e2a161b4b3423d799b1701
-EBUILD wapiti-3.0.2.ebuild 1019 BLAKE2B baed99b6104e5014df3aebeb0f5ef56262788b943397c85318b3664a79ef23051756ac934fa7b5c9e302d4fb33f688602b133621666b8e3a989adfbe0f46befb SHA512 93352a26e9851b3e26f8ba62631a66f0d86ce2e1aada0c5dded2a19868cd034b5e59f1361b2ef75f321a627cd4aa5b54519ac58eba8127bcb4a039f1d0dba760
-EBUILD wapiti-9999.ebuild 795 BLAKE2B 16242bb4ff51572036dac46508be146bbce382b7e4d8fb4721eb88d9e008cfb74a9687f8007fae17daada156b975b879bf8437e5aa0f43042bb664c55765f343 SHA512 f8f0d00c618a4d59e832883636ecfb6279123fc125f7104f82c30088645c7bc2baf0c9ca2ddd27ea53bb3e9c7b25230b8636e0a04f6e113e2088deabf14216d4
+EBUILD wapiti-3.0.2.ebuild 1047 BLAKE2B b3dbfb21b0676bfdd7f5925867425732c7c92230e8a984a151bc041b22e0ca43b938ffc1f5e649c46caa6bbf6146e68581f62a2ab0926281d7da1d25012caa26 SHA512 329e727feca73a88abf22b5b013933f48491973f1d1ae8add7c19b92edff85e03971963bd1dd1c80a94213a3c8bcd58586f2ee79c4f46f032084fd58e1fcd278
+EBUILD wapiti-9999.ebuild 1015 BLAKE2B 20b7a692c73605163dfb9ef9a40340516c2a3d895654d31665d259dfc491beac275727a6b5cb485086470dedae4a064d267f4267c7c4f5c352729ce453ab3a2e SHA512 a9d14f954e9f9a9e85f3d8fd091df7abe55f6014e246bdda0a6208a7157eb7161480bdc0725956225564440104eeab9cb73e0b755d3529e131324ed5cec57e4b
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.0.ebuild b/net-analyzer/wapiti/wapiti-3.0.0.ebuild
deleted file mode 100644
index 9ff47d165002..000000000000
--- a/net-analyzer/wapiti/wapiti-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos ntlm"
-
-DEPEND=""
-
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	dev-python/tld[${PYTHON_USEDEP}]
-	dev-python/yaswfp[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
-	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
diff --git a/net-analyzer/wapiti/wapiti-3.0.1.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
deleted file mode 100644
index b96bead9fad6..000000000000
--- a/net-analyzer/wapiti/wapiti-3.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-MY_P=${PN}3-${PV}
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos ntlm"
-
-DEPEND=""
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	dev-python/tld[${PYTHON_USEDEP}]
-	dev-python/yaswfp[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
-	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild
index d43c24730794..79510fa709f7 100644
--- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.2.ebuild
@@ -18,6 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="kerberos ntlm test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="test? (
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pytest-runner[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index be4f6180daec..14fd985c3532 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,24 +1,28 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE='xml'
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/wapiti/code/trunk/"
-inherit distutils-r1 subversion
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Web-application vulnerability scanner"
 HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI=""
+EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="kerberos ntlm"
+IUSE="kerberos ntlm test"
 
-DEPEND=""
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
 RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
@@ -27,3 +31,8 @@ RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/yaswfp[${PYTHON_USEDEP}]
 	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
 	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's/"pytest-runner"//' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6a0ec1be14d9..725e8616347c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,14 +5,12 @@ AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
-DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
-DIST wireshark-3.0.5.tar.xz 30929864 BLAKE2B 0e3d8eb37e6d1d1976e8084176fc9c75dab43a74f65f8247c9b18b85cdd82d207791b839743a59c4ad299d63f5f41a94f931901e9245dbfb3d4a239046c874c4 SHA512 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
-DIST wireshark-3.0.6.tar.xz 30846672 BLAKE2B c20bef980edb470564dff15e0133e6d65c3273e400a136faeabf92f6e4b907236f88f025baad6d4d592703d2063e56b42de28849c84ce7babeeece950e4afdb8 SHA512 fcd621c1434db69e6319e5932e2dcc378e004055378123f86bdce8dec095bbffbf2b85a880c7f46c69555fe3c9ddb7c79ee59ca2576e0fdf2cfb7eb6ce775b25
-DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
-EBUILD wireshark-3.0.3.ebuild 6581 BLAKE2B b9caaad314347dc3a02cd2994344f3113c604487b36c6b785018c0683a11dcf5e1714871431e1305ca9e1ba2eb3b542d91044f5b2c5afd0419a13b53c3f256c2 SHA512 154f303dc3c9c84088db981d00218cdf9dc7bb6dd5719d25201b9460b9dd9998093d179475c97cdc54aaf27da659acc5609ad333f0cccea3ba23f13cd837bf91
-EBUILD wireshark-3.0.4.ebuild 6585 BLAKE2B 06d39f7d056b73ea4d7180cd7373975831dbb1f1d5a4b28faa5d9ab37452d70f78247a4727cfd7acb15879917a7be703733fa42dc77ac4b61b26c5b46b383e06 SHA512 b627ce7283791654aeec6f7400b5d12e309ba98548f382256cb5732e171811637462af036c676b936217f00f24a3f0ad566a1ed9a95ca4eb8f9504a48a2d74dd
-EBUILD wireshark-3.0.5.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
-EBUILD wireshark-3.0.6.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
-EBUILD wireshark-3.1.0.ebuild 6790 BLAKE2B 7acc05ba1e54b2a9b68d775c639c60d19ad98e7f0d35caa70cf42400618cef1306de4514d21bc249e19ffda36ee6e96a8425a57bfb72de44ea439565eca2b98d SHA512 e1bcccdf1ca7fa2e97fb55591c6d067e3bb2d4a03188254b8decd6e277b8ff584f2c8590c578109fc3045b908d46a76892d952c1c264665c36cd02fa4b36ebfd
-EBUILD wireshark-99999999.ebuild 6795 BLAKE2B 615b65c6838e00c5b0c54a05508d0758f761387dd0a9488ad39608054c4940fc3d5b557a370bc1e14b9b70734ea9c0ac4df4cd8a06a84b1854c41cab12b96182 SHA512 0d5b143ad8f104f4ddb66195a000bc94fe26997ef5c9269f967e20c9832deafe31443ac53558046aa7f300bf036194c23fb6a9a5611237bf31d039ebfc567978
+DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b SHA512 64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
+DIST wireshark-3.2.0rc1.tar.xz 31426064 BLAKE2B e7fd605701aec50bf982f3775902ca6289862422a2e69dc42308f5955b8a74c3b059553fd187de66b2c771f27062517c6b690fd9af787dfdea44e589759f856a SHA512 6dfc1f46f8555798dbb1d1e6ba49cdebb497155559af6733e38819882059aa6db6fc0e72a84e30b5255ec46dda5b2245de905035415c0ef24b71a616c4b94111
+DIST wireshark-3.2.0rc2.tar.xz 31454312 BLAKE2B 41c25634d89c4e107a65278d679a17c7b21f8b9c566b394ae8b410a8ed38c4ccce4244b12f95c24c2d50c21bba05077cf068ec1e59f3d9c29bc58207c7020afc SHA512 c24bc0358127105f00efe9c79b012eb4f5b5fafd987f3cd47bf5079cb4d4f92810fd5fda207385d031ebe5afd2b26804f911509b85cbc672fa5c2d1d8e69130d
+EBUILD wireshark-3.0.3.ebuild 6594 BLAKE2B 92f6526f2ce0313b1013dc70a4b369c04ed58dfffb7577e041652e73b0a15436d07dbdff098e8561fbed72aa33b1e0510b2cc2203b19e76d60789506c93bd50e SHA512 3bb758b5ed50c51c2cbd6bf0e8e93ca68be079d51dd82dcfeac4fd599048cf087b23f9a7854348a912d9d8c422468193d4c341948c07f4cfa9c678e2806241fc
+EBUILD wireshark-3.0.7.ebuild 6596 BLAKE2B 127a3d8748f3fa9af8963d79870480f20c3e2d5aad306e19d558520155b2d07f789df84e6430338af984c3bd5a608de26f4edff3e340a0ef2c40216a81f2eb95 SHA512 c3d5917d949cf501b59fe4de8239faa8d52be95394d5a21c7361b70e7bee4b5ca0d906062da2b658a96b35671a1ee1114837d7c86ebdac487f9e3f17610a6312
+EBUILD wireshark-3.2.0_rc1.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
+EBUILD wireshark-3.2.0_rc2.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
+EBUILD wireshark-99999999.ebuild 6685 BLAKE2B 522b1a0ab6ee888263297fdd52751d3d4026d1725005086b0aa7825bebdca430bc8bd2b5ad871da51a3b2929e5401026208a457d7d04ec45cca557ff87224a33 SHA512 485eefc016acafe5cd0f85208569d52e5170ab9494e175579a5fed7ecdbb5b7f4bf807ae9858e49e3c26baf8c3a962a00d12ad28c1430afba22c6513a719d500
 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 0fcd75a867a0..73cc78d498c1 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -7,7 +7,7 @@ inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-u
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
@@ -146,7 +146,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_CAP=$(usex filecaps caps)
diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
deleted file mode 100644
index 61e8bd7a288c..000000000000
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# 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 http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+netlink +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 )
-	http2? ( net-libs/nghttp2 )
-	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 )
-	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 )
-	${PYTHON_DEPS}
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-"
-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="${EROOT%/}/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 http2)
-		-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.0.6.ebuild b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
index f4fbb9dc3bcd..173425dd9486 100644
--- a/net-analyzer/wireshark/wireshark-3.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
@@ -7,11 +7,11 @@ inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-u
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
@@ -146,7 +146,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_CAP=$(usex filecaps caps)
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
index 4d9324a7a9b8..3252cadf725c 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
@@ -7,24 +7,24 @@ inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cma
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
-	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
-	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
-	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
-	sdjournal +text2pcap tfshark +tshark +udpdump zlib
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+minizip +netlink +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
+	>=net-dns/c-ares-1.5
 	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 )
@@ -62,8 +62,6 @@ DEPEND="
 	${PYTHON_DEPS}
 "
 BDEPEND="
-	!<perl-core/Pod-Simple-3.170
-	!<virtual/perl-Pod-Simple-3.170
 	dev-lang/perl
 	sys-devel/bison
 	sys-devel/flex
@@ -147,12 +145,11 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/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)
diff --git a/net-analyzer/wireshark/wireshark-3.0.5.ebuild b/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
index f4fbb9dc3bcd..3252cadf725c 100644
--- a/net-analyzer/wireshark/wireshark-3.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
@@ -3,30 +3,30 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
+inherit fcaps flag-o-matic multilib python-any-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"
-
+SRC_URI="https://www.wireshark.org/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
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
-	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
-	+udpdump zlib
+	+minizip +netlink +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
+	>=net-dns/c-ares-1.5
 	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 )
 	http2? ( net-libs/nghttp2 )
@@ -35,6 +35,7 @@ CDEPEND="
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
@@ -53,16 +54,14 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
-	${PYTHON_DEPS}
 "
 # 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
@@ -81,7 +80,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -117,7 +116,7 @@ src_configure() {
 		append-cxxflags -fPIC -DPIC
 	fi
 
-	python_setup 'python3*'
+	python_setup
 
 	mycmakeargs+=(
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -146,19 +145,22 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/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_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex http2)
 		-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)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7ecaa00c8eec..18b738bc9381 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,18 +13,18 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
-	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
-	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
-	sdjournal +text2pcap tfshark +tshark +udpdump zlib
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+minizip +netlink +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
+	>=net-dns/c-ares-1.5
 	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 )
@@ -62,8 +62,6 @@ DEPEND="
 	${PYTHON_DEPS}
 "
 BDEPEND="
-	!<perl-core/Pod-Simple-3.170
-	!<virtual/perl-Pod-Simple-3.170
 	dev-lang/perl
 	sys-devel/bison
 	sys-devel/flex
@@ -147,12 +145,11 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/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)
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 65fc5a89a443..77cee550d80d 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -29,10 +29,10 @@ DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340c
 DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
 DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
 DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406
-EBUILD zabbix-2.2.16-r1.ebuild 9422 BLAKE2B 66f0a9ce2aff2c7d34beacf835cccacb4c35b94d25bc36bc78cc175dac974800b84fe63f989defab49d188051bb9591a026f517a87e73971575bb1fc759cab9a SHA512 19f91b0eb3a26ef92f223f29c40e0edfa0a26657b3d2d5c5edb24dc16d3a04f6786f6a0a6414417d7bd60135dc2a2d534711bd5a0876301c15fbc84d9df4acb3
-EBUILD zabbix-3.0.28.ebuild 9260 BLAKE2B f914d67e72fa9c65bb852b3bdc710c162f1b3689432d0e62a46b315cb692cc114d006a29ed8d8078ad036f3fdd9ea548d06cbe96a8cce27df465fe0df6976faa SHA512 f3cd17ef30f681aee2a86a743fee8bcc6140b6cf2330b65653ba81b02b7476e019b33f31c70645a48e07d564ac8bbebc096eea4c27b358091912418f2fa51623
-EBUILD zabbix-3.4.15.ebuild 9238 BLAKE2B c45583e3147ecf8db898697aa4fb1ea31617c7e3bdab693de043d5504005efb3d6033cb8e1f1370dc5d8e64dfb182c7b671f38b302e71c93d258dea998f2a062 SHA512 e9da0542219528829ac44bec5e93631a2b0cd4e2d4275b2ee1a442136c45b787fe6babab30a02ef7cecb7fa1ebd69ab7631555d4a6c9faaf32d02f179da43c79
-EBUILD zabbix-4.0.13.ebuild 9426 BLAKE2B 1f85e07ce0f90019d4d5c5d6e02e1f930afedf4b6ebc8086c70dd3f3eee85150580c4a251a2facc41cae5516b881b95926ba27bcc76066b5f255aa41088bc092 SHA512 6dacbd9fa2428de7009ca59bd956c1412448006919b5a3fdd6e5b5c48b43551766b5429575c0eeaabb7bcc7addc8c774ab6074f1f5939f9f3c5b5130a069727f
-EBUILD zabbix-4.2.7.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
-EBUILD zabbix-4.4.0.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
+EBUILD zabbix-2.2.16-r1.ebuild 9374 BLAKE2B 51863c24bd87b2227e5e6ef2ea6dfd82a4ed7c5724984b05f6a3f65fc7a698a4e4f28348342a28392113cf741691ccc2bb2c3fae3494ed4d43cd49e6736fe2aa SHA512 c6dc8f51a438e0254442c06005daca4788b3b37f2695aa4a43c545f56aa415069c53f1d399fb14f648f9710b716143c44627932401a4f7bb1cef7a4929582041
+EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c035ee023ce377a21ce17077585b048cec5cb18e844ddb8f83ca0b41b5396826d274ad70eaea1f4cf315fb19c68 SHA512 e64d401cf73217c3845baf23d4f869ba96474a98ea76a00dcd486349e83e5a7a07e2c65ed58e03772f72fc1fe187db682c5f5d16735827a3f8c9e5b9605d356c
+EBUILD zabbix-3.4.15.ebuild 9190 BLAKE2B 34f7fdb2eabc1b821c0480d3e5d6b3faa6038799d980fb4167c1ef606bc4208ba976b4a556a25ef6e9150413b8eb6618d75100feaeb82e2d35b5d93aaed78491 SHA512 1d7d17f1dbe723459776da9ff2b5d0fbe11e9c8a02cb4bd472147614d2e3e8e81b1988a46957108dda65b7f81177ab5c45cbc6208b504b3facdf16c0817fb986
+EBUILD zabbix-4.0.13.ebuild 9378 BLAKE2B a9561575c6a3f270b92026fa7f6568eb4e6b3233adf33304d262a59f16385073b44bb8689828460c0ef1d5625fb98525add993f462ea3222af48fd1dd09adafd SHA512 2ee7c7bebb9cc5c22b1042fdd40bb7b3173a97da818d8b52c600b708f98b56a8ccaf5025efa47c7a5658daf0861de874ee6e319709490907327442a35bf384e2
+EBUILD zabbix-4.2.7.ebuild 9517 BLAKE2B 596a6172a49b60a8fe225cc3827917f759875fe2f40b58487cd6b2dcb9139950a16ead08af86283ca2e87b99df6d9a5f75de439add860c9da179f16cf2cb8a7c SHA512 7001461570d7d7022742b3e49d894f8d8be125b0a644bcbeeb5ce29f2df8572b3fedcca0e4daf9854a85576f0353d867c9ef654289d6991b2c7a2b31a640ddb2
+EBUILD zabbix-4.4.0-r1.ebuild 9462 BLAKE2B c2e612abec395560c4ca7e1d081c78045ebbfbd17be9b4d7ce39b44b3c32ee7e8e2a16974675e10a666239a8a0feecc7e3b527a20e71630680dbe00c5b5c92ea SHA512 4c020e6d1287cccaf7c70c567a347aec0b476c60cb0907ac925c0280a6b56a0ffb050f3a53130910d1e1c7fe07b36e7e18f20736afd4c4776cefe2b4ea5e4b38
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
index cd75b8d90b24..26b70005d753 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
@@ -135,13 +135,12 @@ src_configure() {
 		$(use_with openipmi openipmi) \
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
+		$(use_with odbc unixodbc)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
index 64dc6af6ad83..09ba412f2f86 100644
--- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
@@ -137,13 +137,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
index 4d9f2799daa6..0169c3ac73bf 100644
--- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
@@ -138,13 +138,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
index 7b8602240625..2e1f7d320991 100644
--- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
@@ -142,13 +142,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
index ce4694480bfa..190162272899 100644
--- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
@@ -142,13 +142,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.4.0.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
index ce4694480bfa..e5ef1c2c0b80 100644
--- a/net-analyzer/zabbix/zabbix-4.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
 	server? ( ^^ ( mysql oracle postgres odbc ) )
@@ -32,7 +32,6 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	sqlite? ( >=dev-db/sqlite-3.3.5 )
 	postgres? ( >=dev-db/postgresql-8.1:* )
 	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
 	libxml2? ( dev-libs/libxml2 )
 	curl? ( net-misc/curl )
 	openipmi? ( sys-libs/openipmi )
@@ -41,14 +40,14 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	odbc? ( dev-db/unixODBC )
 	server? ( sys-libs/zlib )
 	proxy?  ( sys-libs/zlib )
+	server? ( dev-libs/libevent )
 	ssl? ( dev-libs/openssl:=[-bindist] )"
 
 RDEPEND="${COMMON_DEPEND}
 	proxy? ( net-analyzer/fping[suid] )
 	server? ( net-analyzer/fping[suid]
 		app-admin/webapp-config
-		dev-libs/libpcre
-		dev-libs/libevent )
+		dev-libs/libpcre )
 	java?	(
 		>=virtual/jre-1.4
 		dev-java/slf4j-api
@@ -70,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
 			=dev-libs/cyrus-sasl-2*[static-libs]
 			net-libs/gnutls[static-libs]
 		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	mysql? ( >=virtual/mysql-5.0.3[static] )
 	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
@@ -136,19 +135,17 @@ src_configure() {
 		$(use_with postgres postgresql) \
 		$(use_with oracle) \
 		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
 		$(use_with curl libcurl) \
 		$(use_with openipmi openipmi) \
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-analyzer
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)