gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-analyzer
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
85 files changed, 1900 insertions, 1521 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 201009b64ad4..f62b7ad624f2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index daa8ba807de3..133787d33419 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,5 +1,7 @@
 DIST bwping-1.15.tar.gz 104234 BLAKE2B f0bc4b050760c775b5186667c2c15ce431832761d0bf00bf451d37514f93bafc1b6379ba96c30b1132f6dcb22fd4626304e4037c47794f9bf6fe28d10d5df6fb SHA512 76578571e3b3ca0f5ee61c28380d784fdcfbcee632e92b28a42c446ded9fb0fd0b682f360a51fca2df599353d5da9227762b186b5339ccfe7b9a7fa876399f8a
 DIST bwping-1.16.tar.gz 103811 BLAKE2B 63880d4fe96d1272c06ca307fd0eb16fb1729ec3ddbd0de7bd484859625b3a9e8ba6d5730ac8df30795e2f7cb22ffd73dc9416eaca1ebc876f7ada83bcb46ca7 SHA512 d8f625a858e8278021ae91c5476ce18d1ecb8518a0f1d3d410a59dea4a64ec658fff527bc1f80d141a1249fe92da87afc536b86d31a30bcf316072e45cbc3998
+DIST bwping-1.17.tar.gz 104254 BLAKE2B 29db75f69c195f69df1131a0f096678e2e8c7aed603b16bedd269ac6bd8493016af27658248b40f2e551006c669d929a36dfa2cf37ddca69d4b9e9db5c3575b3 SHA512 b8337a714e3a51e6f999bc5a924bbb91498d614f858a7e532111d7cd27efbfacedfcff7d10650e84c66c74d3e7eeb5015e7491e61f44d738e941bb42769716a5
 EBUILD bwping-1.15.ebuild 386 BLAKE2B 9dc4c68a191c42d7c0de0b62ed51b92c2eb2ed7cd70f287134ebd84e43535819c35cab83921b17ec68bbe7a7a75e6935edb7ab924d92b444b914195d88733c9e SHA512 5dcf64cf3df28ba31e1225ea8cf558e4df7f95923211388a2b8198ba3476edf01d30497935cf00c3cfc8e1e7f8d400a7dd00b8fff5200d49f7f0a7f14322fb04
 EBUILD bwping-1.16.ebuild 388 BLAKE2B 6c319b4609361d8babc33eecb5c41f58f88a97f903f0944b00de30800dbcbca76c66a822d19e4ace5b2151bdf93fe8e9609637f3328425ed867c8cefc9a2dde5 SHA512 a6b1985c8d7e5b597216b3370437bcc0b3bd7d4fead357cdb71a24a6a836189ec7754a92c5798d118f6e16a18f44d5d563925d2ee7859e53b2db057833ac8efe
+EBUILD bwping-1.17.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.17.ebuild b/net-analyzer/bwping/bwping-1.17.ebuild
new file mode 100644
index 000000000000..b22cf8d14539
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.17.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 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 a6a3ac8a6279..47e211d36c12 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,6 +1,8 @@
 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
 DIST cacti-spine-1.2.11.tar.gz 107495 BLAKE2B faa2356e374f392565d3a1fed446527bd5be9cf63ec1b286e0e6069503b80fea9042d367f087f05ff5660a0fb647a2d2478c6f25a557b8aec821a151af2a7f02 SHA512 6c7dd2c4b35040cce58714e1b238b473d42465327cde469cb09c304d51fe74b0731ec4ed4d70321c092d6efd4eac6ab375140beb5d552fcf7ad4286713a4f22b
+DIST cacti-spine-1.2.12.tar.gz 107512 BLAKE2B 1ced87c30d26d524ce9c98508cfee42dfccceac9e68662fbf31e257ebb8990bfd4935a735554ba3153f8382ada1fea86fb4712811857a09a49bec609a41aae5b SHA512 382a456bc64f4bfd56db8e6fcc2e626d66d529bbb6bfa34210053e64f9b61ae1376c9a4870402e7ccb069c20f91a85dbf5b4ec72826a1f3d70f2e6900accc0c3
 EBUILD cacti-spine-1.2.11.ebuild 893 BLAKE2B 6cf6f61d4bcbf6bdfb8ba26800ab92555f75f71b69f567964aaca60ef8ca438f8ead73a3276564365f20e4cba7d609199c62d0f356659d78f881932871d52852 SHA512 085cd6edd7a13757e84e63f46da3a674806c88596243c2d9af12189ee2974d5558aa772c7eefb902d565dafe60551766be5cac15f5a599d6e5357535dedfdff3
+EBUILD cacti-spine-1.2.12.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
 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.2.12.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.12.ebuild
new file mode 100644
index 000000000000..a5c1da23c064
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 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.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/Manifest b/net-analyzer/cacti/Manifest
index f3c64f39c0b4..d08aa2663307 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.11.tar.gz 25099698 BLAKE2B 25d974eb21bafeb9d5c84d1a857b1d95803945c73b21fc4e7219c5349c15aebb4d0130dc9701b3a3615c3514bfa3f3a29286153ba8f7cb515a255e06f20a56a9 SHA512 ab8a856fde55f405314fe0ec1eccccfb78105181fc081dcc04091963b08777550182867b45daea4f630f19dbb538ad7ca5c62f2dac9cd867524dfef113e2a220
+DIST cacti-1.2.12.tar.gz 25126474 BLAKE2B 12f552480bfd72ed8b73400c1d53c08eb38171c83baf63b3bdbac8bec5e9bf798824fb2c19954fda240c64f35adca601a2dbe9af6229b1f6791dc7b5f8477968 SHA512 df6a512a2e8faa70b8ee0b2ab72ea9e21db465f3978a3ecedf17cd34cb16793d3b0107f01f8cd8400fb15b162c27214680f22657f6f0d59853de88c49966087c
 EBUILD cacti-1.2.11.ebuild 1010 BLAKE2B aa1febefca9f600b00b544fd86167386e984c6b3134689023367e8795e073684ba8801910675d19568b8b34b9d7ebd1c212618017826bd60fcfa96a3a03a6680 SHA512 75a010fcfa28e289810ddd10a3b0f6c507ef608eb9176199d2d965cfea6b900eb3a9768adc5eaff56e46d0b15e82aa62e7b6c8ee9df6ba63338758f4240b1b92
+EBUILD cacti-1.2.12.ebuild 1014 BLAKE2B 6a411ccf50676e6fbe8f67144d445a7519318ccf83f7003ad9b322ff8cd0c4871c8b582e646041ca1920fda51f6c7dd96f9e598eb0195a4e22abd603c5bd4d3a SHA512 a564373a907200a00816b135240c10eb1dc8741dbcb88a2488e43a4794be0194b470b55e31c481ccc36b75d1b7dd6a2ed761bc48f02944562785db311b35fe8b
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.12.ebuild b/net-analyzer/cacti/cacti-1.2.12.ebuild
new file mode 100644
index 000000000000..66775efc3b40
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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/carl/Manifest b/net-analyzer/carl/Manifest
index 45325f26333d..20de6c4a5c74 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,4 +1,4 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
 EBUILD carl-0.9-r2.ebuild 397 BLAKE2B 12a9af54152b85f802de6065d414cce3047be8e0901eca9def578c4de5b9e1829c1d383b0a23d23561e5b78531d38ad50dfff0dd5d11c77921bc9f71dc3b1459 SHA512 e781f017c74b232f8a77741fab29f2831a4760d516d01bb8a0a06c0135e29a4261cd00ffca9762444aed30ada80f9214aa6634524c4abc51bb3af1094567025f
-EBUILD carl-0.9-r3.ebuild 419 BLAKE2B 82405cc8b6571500dfffa71934c2e3d9929fea89055cb1579c83353c0fd0806d820fd723848663a5e06dfd995697580b077d51d61cafaa0b085c8ad2d2429f12 SHA512 1c66fb49bc2d0072dd29bbdb3e57cb00361370682a995bac8437b54d69e32c90c52f73d992a8287c36950fd1953f05f875e643c1022a14ca90c6767472b2eac4
+EBUILD carl-0.9-r3.ebuild 417 BLAKE2B 6b7b700f0a5955c539c7a0774291452d29940b268a26e2266bcf1db38d236c076d7c03ac1239660758c096a1c72c3b3fe42c4dce14c74640366d201c9b910d9b SHA512 747d6786e27e7de4b709ee87638666ff0de07fc28ac66924f778e01587a9565b149cd61cb182599d3421aaa8b8ef273eda79e67c0935ffffa18efe67a0610bef
 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637
diff --git a/net-analyzer/carl/carl-0.9-r3.ebuild b/net-analyzer/carl/carl-0.9-r3.ebuild
index f62c3fdc7c87..8c4ba2d113c4 100644
--- a/net-analyzer/carl/carl-0.9-r3.ebuild
+++ b/net-analyzer/carl/carl-0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE=""
 
 DOCS="README"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 639d6dcceedb..b68926f3efae 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,9 +1,4 @@
-DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-DIST fail2ban-0.10.5.tar.gz 520460 BLAKE2B 872b1b2d96d5c79b228cf7c38923161336e452c33fddce75d25004454a5b5d119d435aeb789d55576de4e24bbf8d8288d9fc2fb3f17323074a27857a08e3c6a4 SHA512 d2ad64999031537f2adfc01efd02d2db0718485e38745736339c2e3a1792cd82147fb6cf5a3d371d83dbe91d1afe34e741e038ed4d84d6f444ea1922dc4bb658
 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
-EBUILD fail2ban-0.10.4-r1.ebuild 3216 BLAKE2B d807e5422811d4a703133ee2b435926d4f3aa17f94281ded5972374180203a7baa3045c7f3a306be8a3e9105250a06279e097544378c8e9ae82003470eed9de1 SHA512 1ffb020f2cfa7927553a6715be23681d6f7917273036af304b4e44bdab1342662824efbf3c9d5822bded8bf552eb4bfa1d439d972ff27f282b41ed052442a74f
-EBUILD fail2ban-0.10.4-r2.ebuild 3259 BLAKE2B 1f10e15e5baa979906974fdee8d6a3050f9570b2861dd72ea2b4a7282fa1492885590fc22e9d5445f79720f1f52f65544ce286c57e43ff73156af5b2d038fabf SHA512 606d8b0bb9f1b66a5b65dce012f19e3d90231d033bc72dab513af2179bad23b0cf96378f65b3437c73c6c38a69ea91a71e65d837a1afcead25312ffbd3abb8d9
-EBUILD fail2ban-0.10.5-r1.ebuild 3381 BLAKE2B 27c5f4a366091b2e64c8cf1b133bdba9739673a85613ef5130d42eee7296355796c2b9c862129c41e2b0a4e3881bd23ae7cf47781c08c4b91689f75ecd0f2bf3 SHA512 6021f943f4d5bf45b137df2631c73a16e4e38dd4a190d059b401179daaa4938ed94b55eb769fed0bb96eb2c9ca054768fd50a9ed74438730635f2ecf41bf453c
-EBUILD fail2ban-0.11.1-r2.ebuild 3335 BLAKE2B 826790fb32386ba0770657b81d5cc35cac20ab1ff924cf87950c53494a31aa8323d44aa92dc1f9a5b3691df6fe5de5e957b9bd106ba10211aaac20f127055366 SHA512 75469e838b1991997f14e87514e61d5bd450577f919e67e8945003061b14c74d92eaf0702e6985d448837abfaed6d4d968fa07c521bb5c702b4227b7c837a1d1
+EBUILD fail2ban-0.11.1-r2.ebuild 3330 BLAKE2B d00241a2570eb7116da51dfe209717184244d10cf99e2548590add8695e37ea98ec48f663ac9cc24f1c061d61b42a65c182969d2776756204c38e11e42fde115 SHA512 90962c7950c02045f286ac461b1ef34f9fced60265718910ead80c3a49778dbd86b0b6e675a182629562c7bab362c4c039112e24758d94794ba8f6a42f3d2319
 EBUILD fail2ban-99999999.ebuild 3264 BLAKE2B c6b6d7983bfe24941a3d22df8bb86683eac433977d6be7366f005e6e94cb1dec8db40050da768f901c9f5f524b708c7dd442d1612c6ca07a727b0127101a770d SHA512 20c092acc70eea675c0147e7cfa65d86bbc1233669e7ce34fbd2686fc3aba1217acb4ae35b7fa8360f42f843cd6bf5a4a021747eb4d25589babde78115068649
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
deleted file mode 100644
index 1db3b7bffdde..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="selinux systemd"
-
-# TODO support ipfw and ipfilter
-RDEPEND="
-	kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
-	net-misc/whois
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
-	)' 'python*' ) )
-"
-
-RESTRICT="test"
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	eapply_user
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if python_is_python3; then
-		./fail2ban-2to3 || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
deleted file mode 100644
index 652d96b809db..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
-	)' 'python*' ) )
-"
-
-RESTRICT="test"
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-src_unpack() {
-	default
-	mv ${PN}-${PN}-* ${P} || die
-}
-
-python_prepare_all() {
-	default
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if python_is_python3; then
-		./fail2ban-2to3 || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
deleted file mode 100644
index e00569c23f08..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
-	)' 'python*' ) )
-"
-
-RESTRICT="test"
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-src_unpack() {
-	default
-	mv ${PN}-${PN}-* ${P} || die
-}
-
-python_prepare_all() {
-	default
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if python_is_python3; then
-		./fail2ban-2to3 || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-
-	newbashcomp files/bash-completion ${PN}-client
-	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
index a9be25c75638..f71bda0473e8 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="selinux systemd"
 
 RDEPEND="
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index 629637ffcb75..acd801e809f6 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
-DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74
-EBUILD flent-1.0.1-r1.ebuild 607 BLAKE2B ee1fea6a973b539c986d52ec1ce10fd040db8ecfa6a0d1e3842d17887843f684dac79f57fd2de7501b3b010f8cf8c199085eac4817cd5bfac57df0432e0fadb7 SHA512 62b5393242103203c33295b70ffe084c79e6de46c5bf7834bd1cb2e39d547a67303b5007140d8fdc5919d2648a3bfb9bfc83111344639445880d32cb48855c6e
+DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6
+EBUILD flent-1.3.2.ebuild 613 BLAKE2B 4d688c76e509abc1c2a96d260e4bcc87dfc54b1966d1300aa60957b0e2f96fc4836c1a96ba815d1f5442bd85ec09c7a8fd6395f797db5775f6aab96b84b00e62 SHA512 3146ade9a6be5468e198e91de8ffe0dba14272e747e6012cbaaaeb1fd7120a0946b02d569ed2a3d728823c037b21ce243adae7bf75cf1dceeb2cb8eae001f71d
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild
index e9a575668ac4..d3d134d7af8f 100644
--- a/net-analyzer/flent/flent-1.0.1-r1.ebuild
+++ b/net-analyzer/flent/flent-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 8f66ded8c997..d58fd250fc21 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed
-EBUILD gnome-nettool-3.8.1.ebuild 978 BLAKE2B 2a93f9d3a9bd1b9757652211933bfcf310d2f4b153d6c697daf5374e458a5b03940881e16d8a78e9a3bb3d9cc8fb11dfd8dbc19bd7eae4b70cd953d8086d3c65 SHA512 1c0e1547d9ad06eb45d39c296a8771b195d1a38b2efee157036fdcc4122d68e88f6d787e06e25874ac3841480a38fa0bd15f73c5c62e482956d1056d33acbebf
+EBUILD gnome-nettool-3.8.1.ebuild 947 BLAKE2B 6b5d2140df3b0a92bd8a9038765c162d2ad14c9c9bbacc5ff52d99b2fb864242114d54c0d7f4e091360d1b2b50decadb79dea977ba1ecf4e1e3fdc2ce232519e SHA512 4412117a893483897a242ba4e685b474df2def9251599e96d8efbec82acc37086a20341dca7ddf9e60951ec47925d005df4816f0febdadb809def57cca4611ba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
index c168c33de958..9d215a641c88 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,8 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 	|| (
 		net-misc/iputils
 		net-analyzer/tcptraceroute
-		net-analyzer/traceroute
-		sys-freebsd/freebsd-usbin )
+		net-analyzer/traceroute )
 	net-analyzer/nmap
 	net-dns/bind-tools
 	userland_GNU? ( net-misc/netkit-fingerd net-misc/whois )
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index d1367b957bf0..a26ac123e118 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,5 +1,5 @@
 AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438
 AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532
 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
-EBUILD graphite-web-1.1.5-r1.ebuild 3045 BLAKE2B 5bff9640ecb28a608b661dbafe5d7b94b36ca21f55df3dbfd1f3de3fd5f85fbdd5b5d68faecf774c2cbaa63dc5e77812b53612bb2f7f558bcef4a2aee435567b SHA512 d224b3c3900a2d737564d81413a14a64c57fb113d0a548583d0e9e2d2c05d767e06ec59c8e7a70a1878dbb256970cae6070bf30f89018f8588a96c3ebf467968
+EBUILD graphite-web-1.1.5-r1.ebuild 2966 BLAKE2B ad0ebbd4068438719af7d8df197d938cadf89b8b92b9927e467e47adea7a8dbb5a6289e9ec2770a9796ba4825cc5ef6b39576fe6a2f5920d1dda9e63d28fd024 SHA512 010668dae9fd625d8b31a6db6d64fd0d3f860d6f208ecb951440ac7406b1376937d492a3719b6bb4d6e1605f1e691752cd32ab82c846fd27c4cf4a596b217fd7
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index f0dbbc3d667d..35eb0f1c76f7 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )  # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python3_{6,7} )  # 3.8 dropped due to dep on python-memcached
 
 inherit distutils-r1 prefix
 
@@ -20,19 +20,13 @@ RDEPEND="
 	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	mysql? (
-		|| (
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-		)
-	)
+	mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
 	>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
 	dev-python/cairocffi[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/scandir[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	media-libs/fontconfig
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index 2ca9f0915d4a..874e7e34d88f 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -2,8 +2,10 @@ DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737
 DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d
 DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483
 DIST lft-3.9.tar.gz 377008 BLAKE2B ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8 SHA512 9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806
+DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7
 EBUILD lft-3.77.ebuild 493 BLAKE2B 49e6ddad7656e1c01304a464eb4c092f1f2e7e423732397645cbc3ed1ce2ada675f59d7668368d6f0e067e39ee875823f4f2f979c34000ddacdfae57449b5e36 SHA512 7d921ace43680f2ead6e1e9a1cd45d8e3a3a505b2b9293ad2940dbe117a3339e1a80ff04b15831459b80a214beaf27efaac57c9696642d4a58933516756c7164
 EBUILD lft-3.79.ebuild 496 BLAKE2B a473d61c76ee7692a243e5fc8bfe20300879aec259336d161ea64c0f62c7ad6b266a3e00e6aa1b84d74e838f3f060265f753c720edbd1f38c6401971f50b68b8 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89
 EBUILD lft-3.80.ebuild 518 BLAKE2B aa43152e115169c697369770cc9ab04deecafc9e8e35bd7ba59b322fd1fe02349c539acfe7a2ad45ce237de954b65739598cfb9455b2ff5fe60c2b900c150f19 SHA512 1ac97a059e628e16ed8f1bdf2b87a66b8d7d377298ea2cdf502486599c8f332b813629d6fc5eabf90a34f0c47672dd9f36d590c28199fe7b25146b20f4e528e6
 EBUILD lft-3.90.ebuild 606 BLAKE2B d55eb2ca5b273475c41bb145a9a3e097fb81cc542345114f4a73f82d9e3a4a4beec902b045a104ea412a5707c6326e68b2e9a4d9b177eea68d529c4adcfe9153 SHA512 d3e98b311159c5ac59548bc142aeb560dc245a55f7de06e2875d44529c1a4b2d8997313bab3cd9a9c4b927cf0e3530fdaf62a3cb191afd2614bca91f473b5f15
+EBUILD lft-3.91.ebuild 583 BLAKE2B 2a683deb48b3a6ab9c064934b12e07e63646f6d39d639f83054a7dcc706f7a653e08759402be5e662bcda63304517868fa7b2cdb9fe1cf1057ed904cf8994783 SHA512 f854b5959c155ed78c5d81c7440e04118e4216b11720734f245d78d6df3d8f89e424471614966748934c2ae228b711e1108203dc2572626c55e1dfce64a7f93a
 MISC metadata.xml 2868 BLAKE2B 8ae5df11623eb04065537a289d1565a1ad766d93ebaff9b4fc8e326991331edfd7efa712387633a0edc5436445a1f3748425b7d93191ffb61a36c944cfd32b99 SHA512 13fa9fcdcc8c7e75a9a195d9463fc0456a81cc124302ab06f4caba6f20af0a1551ca76c7a6dc77a2551f0a02fbf29fd1087e9b14d674c1f9e661e52fc298b64a
diff --git a/net-analyzer/lft/lft-3.91.ebuild b/net-analyzer/lft/lft-3.91.ebuild
new file mode 100644
index 000000000000..3d32b1582d59
--- /dev/null
+++ b/net-analyzer/lft/lft-3.91.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
+HOMEPAGE="http://pwhois.org/lft/"
+SRC_URI="http://pwhois.org/get/${P}.tar.gz"
+
+LICENSE="VOSTROM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	sed -i -e 's:strip:true:g' Makefile.in || die
+	sed -i \
+		-e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \
+		configure config/acconfig.h.in || die
+	default
+}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
deleted file mode 100644
index 00785464e0ca..000000000000
--- a/net-analyzer/metasploit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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 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/files/database.yml b/net-analyzer/metasploit/files/database.yml
deleted file mode 100644
index 403191669cca..000000000000
--- a/net-analyzer/metasploit/files/database.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# The tests currently use the development user
-# https://dev.metasploit.com/redmine/issues/8418
-#
-
-development:
-  adapter: "postgresql"
-  database: "msf_test_database"
-  username: "msf_test_user"
-  password: "secure"
-  port: 5432
-  host: "localhost"
-  pool: 256
-  timeout: 5
-
-production:
-  adapter: "postgresql"
-  database: "msf_database"
-  username: "msf_user"
-  password: "secure"
-  port: 5432
-  host: "localhost"
-  pool: 256
-  timeout: 5
-
-test:
-  adapter: "postgresql"
-  database: "msf_test_database"
-  username: "msf_test_user"
-  password: "secure"
-  port: 5432
-  host: "localhost"
-  pool: 256
-  timeout: 5
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
deleted file mode 100644
index 1edaa58c665f..000000000000
--- a/net-analyzer/metasploit/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-		<description>Very delicate package, ask before you touch please</description>
-	</maintainer>
-	<use>
-		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
-		<flag name="nexpose">Enable the plugin to integrate with nexpose</flag>
-		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
-		<flag name="pcap">Enable libpcap for packet sniffing</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">rapid7/metasploit-framework</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
deleted file mode 100644
index f06d33d3ee27..000000000000
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby24"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_BRANCH="4.x"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS="~arm"
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit eapi7-ver
-	SLOT="$(ver_cut 1).$(ver_cut 2)"
-fi
-
-DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-LICENSE="BSD"
-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="strip test"
-
-#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/actionpack-4.2.6:4.2
-	>=dev-ruby/activerecord-4.2.6:4.2
-	>=dev-ruby/activesupport-4.2.6:4.2
-	dev-ruby/backports
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bcrypt_pbkdf
-	dev-ruby/bit-struct
-	dev-ruby/bundler
-	dev-ruby/dnsruby
-	dev-ruby/faker:0
-	dev-ruby/faraday
-	dev-ruby/filesize:*
-	dev-ruby/jsobfu:*
-	dev-ruby/json:*
-	dev-ruby/metasm:*
-	dev-ruby/metasploit-concern
-	<dev-ruby/metasploit-credential-3.0.0
-	<dev-ruby/metasploit_data_models-3.0.0
-	dev-ruby/metasploit-model
-	dev-ruby/metasploit-payloads:1.3.53
-	dev-ruby/metasploit_payloads-mettle:0.4.2
-	dev-ruby/mqtt
-	dev-ruby/msgpack
-	dev-ruby/net-ssh:*
-	dev-ruby/ed25519
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm:1.2.1
-	dev-ruby/packetfu:1.1.13
-	dev-ruby/patch_finder
-	dev-ruby/pdf-reader:*
-	~dev-ruby/pg-0.21.0
-	dev-ruby/railties:*
-	dev-ruby/rb-readline
-	dev-ruby/recog:*
-	dev-ruby/redcarpet
-	dev-ruby/rex-arch
-	dev-ruby/rex-bin_tools
-	dev-ruby/rex-core
-	dev-ruby/rex-encoder
-	dev-ruby/rex-exploitation
-	dev-ruby/rex-java
-	dev-ruby/rex-mime
-	dev-ruby/rex-nop
-	dev-ruby/rex-ole
-	<dev-ruby/rex-powershell-0.1.78
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-registry
-	dev-ruby/rex-rop_builder
-	dev-ruby/rex-socket
-	dev-ruby/rex-sslscan
-	dev-ruby/rex-struct2
-	dev-ruby/rex-text
-	dev-ruby/rex-zip
-	dev-ruby/ruby-macho
-	dev-ruby/rubyntlm
-	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip:*
-	dev-ruby/sqlite3
-	dev-ruby/sshkey
-	dev-ruby/tzinfo:*
-	dev-ruby/windows_error
-	dev-ruby/xdr:2.0.0
-	dev-ruby/xmlrpc
-	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
-	usr/lib*/${PN}${SLOT}/data/exploits/*
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#use the stable pg
-	#https://github.com/rapid7/metasploit-framework/issues/10234
-	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use nexpose; then
-		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
-	fi
-	#no support for nessus right now
-	#if ! use nessus; then
-		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
-	#fi
-
-	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
-	#openvas-omp is deprecated and masked for removal. Bug:692076
-	#Remove openvas-omp in gemspec. Bug:698762
-	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
-
-	#fails without faraday in Gemfile.lock
-	#despite activesupport(?) needing it, it doesn't end up there :-(
-	sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
deleted file mode 100644
index 54db9b0d61c9..000000000000
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby24"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_BRANCH="4.x"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit eapi7-ver
-	SLOT="$(ver_cut 1).$(ver_cut 2)"
-fi
-
-DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-LICENSE="BSD"
-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="strip test"
-
-#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/actionpack-4.2.6:4.2
-	>=dev-ruby/activerecord-4.2.6:4.2
-	>=dev-ruby/activesupport-4.2.6:4.2
-	dev-ruby/backports
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bcrypt_pbkdf
-	dev-ruby/bit-struct
-	dev-ruby/bundler
-	dev-ruby/dnsruby
-	dev-ruby/faker:0
-	dev-ruby/filesize:*
-	dev-ruby/jsobfu:*
-	dev-ruby/json:*
-	dev-ruby/metasm:*
-	dev-ruby/metasploit-concern
-	<dev-ruby/metasploit-credential-3.0.0
-	<dev-ruby/metasploit_data_models-3.0.0
-	dev-ruby/metasploit-model
-	dev-ruby/metasploit-payloads:1.3.53
-	dev-ruby/metasploit_payloads-mettle:0.4.2
-	dev-ruby/mqtt
-	dev-ruby/msgpack
-	dev-ruby/net-ssh:*
-	dev-ruby/ed25519
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm:1.2.1
-	dev-ruby/packetfu:1.1.13
-	dev-ruby/patch_finder
-	dev-ruby/pdf-reader:*
-	~dev-ruby/pg-0.21.0
-	dev-ruby/railties:*
-	dev-ruby/rb-readline
-	dev-ruby/recog:*
-	dev-ruby/redcarpet
-	dev-ruby/rex-arch
-	dev-ruby/rex-bin_tools
-	dev-ruby/rex-core
-	dev-ruby/rex-encoder
-	dev-ruby/rex-exploitation
-	dev-ruby/rex-java
-	dev-ruby/rex-mime
-	dev-ruby/rex-nop
-	dev-ruby/rex-ole
-	<dev-ruby/rex-powershell-0.1.78
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-registry
-	dev-ruby/rex-rop_builder
-	dev-ruby/rex-socket
-	dev-ruby/rex-sslscan
-	dev-ruby/rex-struct2
-	dev-ruby/rex-text
-	dev-ruby/rex-zip
-	dev-ruby/ruby-macho
-	dev-ruby/rubyntlm
-	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip:*
-	dev-ruby/sqlite3
-	dev-ruby/sshkey
-	dev-ruby/tzinfo:*
-	dev-ruby/windows_error
-	dev-ruby/xdr:2.0.0
-	dev-ruby/xmlrpc
-	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
-	usr/lib*/${PN}${SLOT}/data/exploits/*
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#use the stable pg
-	#https://github.com/rapid7/metasploit-framework/issues/10234
-	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use nexpose; then
-		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
-	fi
-	#no support for nessus right now
-	#if ! use nessus; then
-		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
-	#fi
-
-	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
-	#openvas-omp is deprecated and masked for removal. Bug:692076
-	#Remove openvas-omp in gemspec. Bug:698762
-	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 0ed1e9fcb995..472a2c2630df 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -19,8 +19,11 @@ DIST munin-2.0.57-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.57.tar.gz 2272894 BLAKE2B 8daff79d4c9224d83ea91d4583a1c11cdc0d2de05c536da5717cf31555f1d2c87475e4de541688e4b542267a6b8a534911149a7edd6469bd13de79838fae3aed SHA512 d00cfaf450dc4be5fe52f30440fc14ee49f021fe46c1a641ffd2e60682056051b6b2fc8713bd14ae9f9e5aaf28dbf335b6a2e9ec53f8518178888442c069298c
 DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
+DIST munin-2.0.61-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.61.tar.gz 2254571 BLAKE2B e73fb6fc4f71c8d56a7e8a05852f699c94a7cf321b8034ad31ccbd06a37a602e6d312c0079fcb31afc5489a265a35a68c037743e01471ca950223d5cb6757b64 SHA512 ea6ae5a7f812985e0179dc2fe2f21136ecf6152ec2adf48d53e4fa19cfc14e74befe56c77a18f27ba966c12034a4fea442d5d1498a7cfe57ed052d332c199019
 EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823
 EBUILD munin-2.0.56.ebuild 12254 BLAKE2B 925fe7a93c3130d665afa4aa9c874bbf34b22e29fea84fbb6a5f518facd256cb79bf1e2b20ffa5f086d1a8715328a3f34482e1e08f7ded2fa924a976b20cd93f SHA512 5fdc2357b5a48815f7de08d46def379bc5d263b68f1f88ecd5756d095299a53fc8996dce41350fd4281bba434c85c090bfbd965edc1ca46ce5f051d47eeb7c46
 EBUILD munin-2.0.57.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
-EBUILD munin-2.0.59.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
+EBUILD munin-2.0.59.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
+EBUILD munin-2.0.61.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.59.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild
index 80f46fab8967..acaf9f6d9f0c 100644
--- a/net-analyzer/munin/munin-2.0.59.ebuild
+++ b/net-analyzer/munin/munin-2.0.59.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 )"
diff --git a/net-analyzer/munin/munin-2.0.61.ebuild b/net-analyzer/munin/munin-2.0.61.ebuild
new file mode 100644
index 000000000000..acaf9f6d9f0c
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.61.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2020 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 ~arm64 ~ppc ~ppc64 ~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-user/munin-async
+	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/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index e54822747a96..c2a47de814e2 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -3,6 +3,8 @@ AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
+DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.5-r6.ebuild 8039 BLAKE2B b6437d73d0f50cd73e48cb184ea734e9389793bd3479ab73560ab60325fba6b936bd072a2aad1ae6eec26429270796e19b91ec0f5a9d08038dad6c14b39793f3 SHA512 0fb7d3be03aa30692542715c6d5e3a61f5fd65ef806f90241a3855205a10b5a32839086825b80610a7ae77101cf270ef73d623951e638f69fadc72c8c3039896
+EBUILD nagios-core-4.4.6.ebuild 8504 BLAKE2B 5b206a9280b010c277c8c3350ef375a69586e132ae4ab84b42cac098ac2235f31576f3c30e86137e2289b1d7e02ddc6390b22ad1188b3ad018ca0aeaaa60b8f4 SHA512 e6ae6f086f7279af0966de46be1c7a13f915bd401ab1b283265e961d6f9bc718e8ea505b8bdd5184b5ddc75a88547b6fd485e5c96fab2181fe3901fbea217a68
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
new file mode 100644
index 000000000000..e6228fde4033
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+	acct-user/nagios
+	virtual/mailx
+	perl? ( dev-lang/perl:= )"
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+BDEPEND="${CONFIGURE_DEPEND} web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+	${DEPEND}
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+				www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+				( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--localstatedir="${EPREFIX}/var/lib/nagios" \
+		--sysconfdir="${EPREFIX}/etc/nagios" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
+		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+
+	# The paths in the web server configuration files need to match
+	# those passed to econf above.
+	cp "${FILESDIR}/99_nagios4-r1.conf" \
+		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
+		"${T}/" || die "failed to create copies of web server conf files"
+
+	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
+		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
+		-i "${T}/99_nagios4-r1.conf" \
+		-i "${T}/lighttpd_nagios4-r1.conf" \
+		|| die "failed to substitute paths into web server conf files"
+
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	# The build system installs these directories, but portage assumes
+	# that the build system doesn't know what it's doing so we have to
+	# keepdir them, too. I guess you'll have to manually re-check the
+	# upstream build system forever to see if this is still necessary.
+	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd startup/openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		ewarn "The local state directory for nagios has changed in v4.4.5,"
+		ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
+		ewarn "wish to migrate your state to the new location, first stop"
+		ewarn "nagios and then run"
+		ewarn ""
+		ewarn "  diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
+		ewarn ""
+		ewarn "to identify any files that should be moved to the new"
+		ewarn "location. They can simply be moved with \"mv\" before"
+		ewarn "restarting nagios."
+	fi
+}
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 64180b42e011..dfddc108358e 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1-r1.ebuild 1211 BLAKE2B 2f8b54e651dff1f97a3477780c81c18b3b281e071fa58ba24431ad9593d0adcdf97426a3da0dc440db716fe77035bdf7264af3f3048f083121efa210bd34ad05 SHA512 67721746b526b8cc6d455dff3cbea3ef3934aca703b4c0ea54f48dc49bd5495a5a5ebe2cd5e1a5e96154d1978a2a1ebc1c3579036afc723ed42bab554a8b5cde
-EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1162 BLAKE2B be2394d2b19d71161884a8964831f4fa4a788aaa8b5be3b4ca0183be8b70bdadec2b9ac45e637356abfd4f550de40eec5286ab4363d68983e74c5d2f0280ac77 SHA512 1d50e156fe83cd9c6e5379c8352ea110be11548480f73d20cb9519553f1f96f863c2416b92210b7fb6456bba26c46dc443deb0064b66f9aff9de30891331fd66
+EBUILD nagios-icinga-openvpn-0.0.1-r1.ebuild 1210 BLAKE2B fc775eb85235e64f9935faade44e3967e46c8ca62c3c6783ca871f885b0e64d32e708c6958f5e7bd125ad9b07ee3c88a9e566d7243f27b938b957ea9b97004a3 SHA512 6a9e34f410e9c58928e973bb5dbf0d3120594c1d1ed6535f65a7905341ca3d8a67bf205a90620fc5ada9a0ccaf3ed157c2cd44d0055dfb5ee0b33810b9e3347b
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
index a03ce2d5c4d0..48966a0e20d0 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 src_install() {
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
deleted file mode 100644
index fce8d525b7e6..000000000000
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN="check_openvpn"
-DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
-SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 429e5cc37909..a3931f1dd257 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,13 +1,5 @@
-DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 BLAKE2B 067097f4aae85615e85e5481c3c3a5e6f6f3ce61056c61f59e5c6febca3f84e697999dad87626aaae04f853ade9efbd07d17c61c933fafd9252ee8d372a4cfc7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4
-DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 BLAKE2B 025f983416ef5b1340fe2c3c1b4aa8784be23201ebdbf2ab9ed7c4e885c91b992d523ab26d7aed42cb9df44f7ab890034a968ee60e7d928311c99021ab10abb4 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9
-DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 BLAKE2B 35831f0511fc71b883919303f534bb9c4760160031ff62beff6d5eedea44f1f058bd80bfe770585e2f256b1ba8e53e2708808fdc420d3bb8ca95941f73c5ab40 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd
-DIST nagios-plugin-check_raid-4.0.2.tar.gz 50680 BLAKE2B f483876d3c7f7ec5d266d1cd22eddb50534505caa90d0715325148f6314e54aa83e4b42ad4ec8d7edcfed6c640af7e6f86f1f93314d92de39b02b67598f82339 SHA512 b02f32c91eb6bf54f4bd66cb57bf3d43b5f89320be095fcf31b224865f04f24c91245be2afee5ff8588757ff75462e62e1d89ef824e6fbe4d3f90d4a015e0ba3
+DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1
 DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
-DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 BLAKE2B a6049f58a4ff50bf86f85c6d8f35ffbc19a1a6ba6dccfb275bc59ea6e15635b8c8c001d5fbda6030f75adea78fb75dbb7e83628c73f9af76291c3547f64a1ee7 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446
-EBUILD nagios-plugin-check_raid-4.0.0-r1.ebuild 2095 BLAKE2B 7afa0d8af2abd5f13ccd0becfb928b05da8490b5dd4f9292a404e9893188b7f8e45eb4b6555131b016990ff1416274cc563df258fd903590cc37ef5f9fadeb3f SHA512 42bb9c4ec3dff16817d43e15ea43dcbf407c44c2a9f115eb175315091a45923285aeed93ef0e660c4d4770ce9b9cd16472c7830997c58c5b57eb8586bd801cc0
-EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2127 BLAKE2B 399c66c2a6ac36e833009f00ff2360548a5ba7e1e71dfa4ef7d4189fce9d30ae2a484449b8ce4c191c9f6a443224490d8f50d858bcd5ca23c03396c996d8d6c2 SHA512 e3a492e1dbd53897d7cbe57f4e61c1393258d0c2db65b9faeff6489311c6dd16eecf86e098f8fcb7e23cd6a146eb71e15418f437060f06ae0f638e558809c5d2
-EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2127 BLAKE2B 33d201d845a928e2d64597efb4973a6595c513c7ad5c414bd85489a415eee4f16d0d401cdb3b2fcbf4c60ca41f5a01a084b739ae167d77a722c865fb13a8539d SHA512 5c32d8ca59cc88da1ddf958a815d0551d4df68bd5bf585abbfcdc682840b29a3186fa36ff4ea0ffa35b8a24918e1623d367d9a352ef364b4a07be03b60a1b697
-EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2087 BLAKE2B 9a9f7f8b23939ddf9344688a5ee1775c5d2fc71abebd6285014b19fe0300362e6edb1e9572913259b26beab7f33929ccb4d39a6112aaed30009296f8c90e16e2 SHA512 958f6aa14fdba330b822ffc6d4f08ce3ddc065095e0dd150200c544370bf4e6118b06d17382db924dea188ff9e0713488e6db81dad2c47bd0c68616e699c9409
-EBUILD nagios-plugin-check_raid-4.0.2.ebuild 2087 BLAKE2B 9a9f7f8b23939ddf9344688a5ee1775c5d2fc71abebd6285014b19fe0300362e6edb1e9572913259b26beab7f33929ccb4d39a6112aaed30009296f8c90e16e2 SHA512 958f6aa14fdba330b822ffc6d4f08ce3ddc065095e0dd150200c544370bf4e6118b06d17382db924dea188ff9e0713488e6db81dad2c47bd0c68616e699c9409
+EBUILD nagios-plugin-check_raid-4.0.10.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
 EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
 MISC metadata.xml 1134 BLAKE2B 10f73b789386776485af1240eaaa83aec0555ecb04ea91ab5d7ff26ae19be485935ed7460187f4e9b7e9eac64b848f555b92cdf00267696b8a224b2b71dbf0f3 SHA512 9cad7c98ce113e9cb7802e3d55514e8f9548378aa9cbd78e8c8513313eba1f0f1b3f3e25a596798295425edac638fedcae68459ac89767ac2254f5bdffe4ceba
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
deleted file mode 100644
index a4f6fd702221..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		megaraid-scsi? ( sys-block/megarc )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-		"
-
-# TODO:
-# Package all the other Perl build pieces, and stop using the monolithic perl script.
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	mv -f Makefile Makefile.upstream
-	sed -i '/CPANfile/d' Makefile.PL
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "$plugindir"
-	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
-	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
deleted file mode 100644
index 5ced7dc757a8..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-COMMIT="5da4400ff978189d6be889f2448099535baa01f4"
-MY_PV="${COMMIT:-$PV}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		megaraid-scsi? ( sys-block/megarc )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-		"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	mv -f Makefile Makefile.upstream
-	sed -i '/CPANfile/d' Makefile.PL
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "$plugindir"
-	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
-	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
deleted file mode 100644
index 3a3e90fbab65..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-COMMIT="02b6425dac3db7e98d4c36bf0836357c6b36196c"
-MY_PV="${COMMIT:-$PV}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		megaraid-scsi? ( sys-block/megarc )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-		"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	mv -f Makefile Makefile.upstream
-	sed -i '/CPANfile/d' Makefile.PL
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "$plugindir"
-	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
-	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
deleted file mode 100644
index 2e72240ec989..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-#COMMIT=""
-MY_PV="${COMMIT:-$PV}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		megaraid-scsi? ( sys-block/megarc )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-		"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	mv -f Makefile Makefile.upstream
-	sed -i '/CPANfile/d' Makefile.PL
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "$plugindir"
-	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
-	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild
index 2e72240ec989..26049ac2dfbc 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
 
 DEPEND="dev-perl/Monitoring-Plugin
@@ -47,7 +47,7 @@ src_install() {
 	plugindir="/usr/$(get_libdir)/nagios/plugins"
 	dodir "$plugindir"
 	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
-	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index 934ebf12e8d4..8a7e6061b111 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,5 +1,7 @@
 AUX nagios-plugins-linux-madrisan-25-fix-fno-common.patch 1276 BLAKE2B 2dbae02f3b64590e091e2f6d4ce8d3462046eec02ed2a1234858e553c862922623fca7a1bc171d3381ac62f6953b9425f1e2a9bee11d8d42759002d9d11da50d SHA512 bc8e3a1870cc327d7519c248f33b4aa20e2689d48e76bffdcb0ca388a85b110d5484b115c78353e3369f0fe2d004325d43299eb1f03973c570de6a8efca2d15c
 AUX nagios-plugins-linux-madrisan-25-fix-musl-build.patch 928 BLAKE2B 829f26bcfe2a298f3f6bd2763127de2ab8deba5c859cfaf3915365f5b5254defe0ee30f706cd9efaefa8945eb451b252aff6f3417cb5df841d837167561dd495 SHA512 c52dd38fc6c25a41368c45cc0235fad2acbcef2b4db67c65f0c28be9322890193ca30ba0777363f413184142b2c85523ca3d6f98f8aabd7d6ef3c0117dea8086
 DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec
+DIST nagios-plugins-linux-madrisan-26.tar.xz 379480 BLAKE2B e30fa00c029506ffd76e9c16f409f62f00ab481894d6b35dd34470dab5f2a18b2fc18bd06ae5e6a7179ed23f36c785c9a403258b9066e5a08f6a139ab0192088 SHA512 61c523ddf7a98ae01caf543a7e38903478346ce380884a7cd2a2e592db806e73fb996675aa701e2bbf57b31ed062886daba4af70cc2875e1c296537de01c588d
 EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1272 BLAKE2B 51adbec0b1afcd79c4bc6d098db0133d3efc00e1e0977800017c933eebd8b23aa942682844455fb9b89b2d0bc86eeb24ac543b066555d139899e9252ee96c49a SHA512 13262ae5658f5d644156e2767cc44d3c0065958bfe430634d5178e76915d3a3b8ac34d1b1b7db2806238cf6197f3d6ba6d34222253de8349afc5807f9d8986a9
-MISC metadata.xml 517 BLAKE2B b78b662d5028f2d3a6739be37b771af2ee51c35fa47b9aeff228dbcf67a8feaee45ea8db57acf2c6ac490b19ec87f97d0ba4db2883406945f5e37d30e430921e SHA512 b3a1dfedeb45883a101e1194643a6cfbc5041cf772f9ac70d32de38d909ef5aa5a1403b283e797c721b663498953d4b0810887a4c3e2ab51655084122b2e7ce3
+EBUILD nagios-plugins-linux-madrisan-26-r1.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
+MISC metadata.xml 612 BLAKE2B 0766fb1263f00a86cb3a04f1214193d59cf52b49738299389cfafd6fbb179c359387cf0267f7cef083cf6b416db39733c30426f8240ffa4d3944d90c7da1fb43 SHA512 990649aed9420b40d725e3a4a78bfe7e9504e216292835c55bdd634310840f85609fe13d35ebe351a9f66ea1b7de12d823bdec42fc91cd1ea797cc7098370e7f
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml
index 2485783589cb..380090a8861e 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml
+++ b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="curl">Build check_docker which requires <pkg>net-misc/curl</pkg></flag>
+		<flag name="varlink">Build check_podman which requires <pkg>dev-libs/libvarlink</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">madrisan/nagios-plugins-linux</remote-id>
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild
new file mode 100644
index 000000000000..f76ea708a821
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN="nagios-plugins-linux"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Additional and alternative Nagios plugins for Linux"
+HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
+SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl varlink"
+
+DEPEND="
+	curl? ( net-misc/curl:0= )
+	varlink? ( dev-libs/libvarlink:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# Avoid collision with net-analyzer/monitoring-plugins
+	# and net-analyzer/nagios-plugins
+	sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins"
+		# Most options are already defaults for Gentoo
+		--disable-hardening
+		$(use_enable curl libcurl)
+		$(use_enable varlink libvarlink)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 91e7d6c06481..d48e96de0a8a 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,2 +1,3 @@
 EBUILD nagios-4.4.5.ebuild 392 BLAKE2B 33882a460ec2320a9c265e8f7f9179c8304c1a05494978f44aab114be5560d74dd6c4be9f19930292096d6b6990bce6fb4a51526af779a2cb18e2cfb7abf4cca SHA512 6bdf8ea67f8dfc495cb394a7b598fc1709ba6b7479a5af9807bf4060ce82e872cdf22949fdad176e1729c2d2a99927233aba365e3eccb6419f3ba18eef122dd0
+EBUILD nagios-4.4.6.ebuild 397 BLAKE2B 706d8a1f8833cc9f1596d2e1cabee25595acf50577b3ff5626b52132676fb81986ef7660f0e6a37df6660eb50da00c9791804356967ed96d118c4e7178a0aad5 SHA512 e705f6fc813064a107f562c75d1e9d4a55dad3aaea4c6f6ef4ce15626205965518dbd3e8b4056127104d97c9462e5dc4f790cf3eb02b9b1f37a393a55df9303e
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild
new file mode 100644
index 000000000000..8e497876ab38
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="https://www.nagios.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 2fa4385f1304..e26ba750b7d4 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -5,6 +5,7 @@ AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e39
 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 net-snmp-99999999-tinfo.patch 300 BLAKE2B d6f312ca789de74f7b59a2afa3c711aa9e194b08331b11f97a4667bb4e087140dea35ea49ebfa4c5e29da0bbf682bf9f48d3dcdf0df7de91ca5a76ac9242957a SHA512 c7222d2401f7a30ab871cdcddad1f5cc89b18437357262fa2c64d5eab9f6988345b6b05e612863762846465c4f22bf06c8e1950fabc9642030a04a953d69688d
 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
@@ -20,5 +21,5 @@ EBUILD net-snmp-5.8-r4.ebuild 5362 BLAKE2B ea28ce42536d30a2ebd65aea7fe43373811c0
 EBUILD net-snmp-5.8-r5.ebuild 5558 BLAKE2B fcb029e7f92bdf90ac3578d5599177d9a5d2ea4479199ee438bf44e82ab54b17a411b1db8058d1071a00e147c769b8026ec0ee853ddebb98a5bd1ea48a769b22 SHA512 0597a38dee250bca1a42370abebba5c67febf707c5429e21fd489475b0cdf8e47cec0dff91290982ce15a12b31ba3ad7d1eceedd88801f2a82f60ff0213c237e
 EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5570 BLAKE2B f75cd10ede99d60c0795bfd327bf256ad90a9c72821c14e6a4292315bd3ff3947eaa5f1ecfc45bbaa9796411f6c2cb31f04678eb2080868f84bbcb1a26aa948e SHA512 aacc4e3f80cb1b10e21cf069ad0c79c59a3262adb7399d4b8e33b00e05506b032c1b46a2434a0cab5d4351a55c45b76d20a9449398f5f3724eac4179c1e8075c
 EBUILD net-snmp-5.8.1_pre2.ebuild 5571 BLAKE2B 24e01221c74e249b692b68e666f92ccc31b06d27bc0a83a2513efd0f53d6823fc24ae652f1716791fd48f241bef8279713e954b7efe732f8e2ddd50322b3d679 SHA512 9de9231e3be9ba3aefaef68bc67b02ab1a55686d1f2b20c9af10cd31d4db1c6a06ea98fbc8936b6d37d872cc971ba53d7174671e5106da97eff6e26aab3c7ee2
-EBUILD net-snmp-99999999.ebuild 5509 BLAKE2B 9621a6effe14d8f835902a07951473acf43700e0620264a23b74273fb22d64ccc21ba8a084f594957bccd012ae6e15f0d266365d5b7d0cbc0e61ad6340c8ff1e SHA512 4e4bbeec20b7be336c2c740a73ec3c41b8d9b5a5026e2ce1e41b39cc42c93e88e83c910ab18e404770c38ed725d3fd4aba11f67124c6a88185bc06110d3b870e
+EBUILD net-snmp-99999999.ebuild 5520 BLAKE2B 4e720f3ce4c2769074e966301cbafd0269982b8e82614e04692660cb819e49ba6b6bea332ee278e56a9aaf590d4ab24f05289aff55641cb89523d093fd979849 SHA512 96ca977388d258f84e7027711875fb2e37bf9700bfcb49b9d844049859ecde0f30a6eb9a9d5cc5820bf1ac0b7969bcf230ee8e77326a3c116102ff8738a4f7b2
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
new file mode 100644
index 000000000000..6eb2df50c43a
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -598,6 +598,7 @@
+   AC_CHECK_HEADERS([curses.h])
+   AC_CHECK_HEADERS([ncurses/curses.h])],,,
+   [LIBCURSES])
++NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
+ AC_SUBST([LIBCURSES])
+ 
+ #   libm for ceil
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index dded84ec7341..dd3818e50c1d 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
 WANT_AUTOMAKE=none
@@ -76,8 +76,8 @@ 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
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 9f6d728cedf6..fcffc1cffab1 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -4,4 +4,4 @@ DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8d
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1622 BLAKE2B 53be7631ddadb9fb50a84cb08154e0c30a64f72fecb65874e43ad23387a755767a1e9e817761433b786c5d7ef66aeebc13ee8710828a7c5557573b66d38ebefa SHA512 e1786e76851597d5d394b59a475c306a7239036c2504410062ce2b2b0e42e86e92281f805c5e27dbb91ebe1306f7ba2393c7aa7b7d3179da298792129182148f
 EBUILD netcat-110.20180111.ebuild 1272 BLAKE2B b58aad81ff3d298a022954308c3b8e7405fe8542b5f658fb57331919406e2a682fb66455c19f319c41427d01619ec88c4bfa6278b595029e24f1e6fc7f560c25 SHA512 3e05c4a06f4a44ef0a2c8e36c26be838420d127226c36644b3b7cd6b25c122f5b19cdbd767e343313498ebc6ffa14e43ceef94c0132127b30dcc87037ac97d0c
-MISC metadata.xml 420 BLAKE2B 2ecb5d0734634fa00dbe4aecc8353dcad2a6d76bfb6ff22522b52ca2e67298a0923e46fd2d32c31f48262b06c6f46b02e4e065853c56efc793186132b2e92570 SHA512 f6d0b317880cf10065aa552d4653f3338c89fc36b2175d64b6b17bcdafbea03e0c02608904ffca7a934f2bdcc794758f4132b7cd279fc91530ab077eb2115ccf
+MISC metadata.xml 485 BLAKE2B 54b7566a3f1a99ff906b3a1f12866278c26c5a253b45097dfbaafa9e032116cd6236b88eda9035ecebe1b6b85403b27f82e0847871db5b62b2d42bf5d16b60dd SHA512 f757fca78d0fb3bada6445aeff1b887eefca037c2484432ec8d9c4392554124e21d0b9e848e1527e5c2977428b3419ed90085206c84a2eacb34e75aca5fcbf47
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 28817802168b..803e0cb6ba1c 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -8,5 +8,6 @@
 	<longdescription>the network swiss army knife</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nc110</remote-id>
+		<remote-id type="cpe">cpe:/a:netcat_project:netcat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 05be420f031a..58512c5eb01a 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,10 @@
 AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8
 AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb16acb0a88c17ee1254f86ca9b63a5108bce9205c000283b817478749d963b69c65e3bdc8e2fadecc9a1826a7f2e SHA512 66d2e0cb977275250fd7b51e5156957a4506ddba586de5fe796459ea241cbbed7013fd4cf9d7acf6666407352fb34e3b962a2d01565a9cb982c89c76b7cd79b9
+DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3
+DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e
 EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
-EBUILD netdata-9999.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
+EBUILD netdata-1.22.0.ebuild 3439 BLAKE2B 5e3ce83175f0209bffeba022a44af2afd7ee94cd61ffe636d67a3103f187ec438290645ed35b5ec5719ce516f4c24dc2907f71a097067436346562b5db70b4e0 SHA512 1bc3432e2c2468c811eab4077a01f607b662efcdf1450d8333206d06848220443e1e7a9150d79135b7c2cf33a84a9e11d2df396c28dd7e0b3d274f75e2d62f26
+EBUILD netdata-1.22.1.ebuild 3439 BLAKE2B 5e3ce83175f0209bffeba022a44af2afd7ee94cd61ffe636d67a3103f187ec438290645ed35b5ec5719ce516f4c24dc2907f71a097067436346562b5db70b4e0 SHA512 1bc3432e2c2468c811eab4077a01f607b662efcdf1450d8333206d06848220443e1e7a9150d79135b7c2cf33a84a9e11d2df396c28dd7e0b3d274f75e2d62f26
+EBUILD netdata-9999.ebuild 3439 BLAKE2B 5e3ce83175f0209bffeba022a44af2afd7ee94cd61ffe636d67a3103f187ec438290645ed35b5ec5719ce516f4c24dc2907f71a097067436346562b5db70b4e0 SHA512 1bc3432e2c2468c811eab4077a01f607b662efcdf1450d8333206d06848220443e1e7a9150d79135b7c2cf33a84a9e11d2df396c28dd7e0b3d274f75e2d62f26
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/netdata-1.22.0.ebuild b/net-analyzer/netdata/netdata-1.22.0.ebuild
new file mode 100644
index 000000000000..2682b937ff4a
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.22.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit autotools fcaps linux-info python-single-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 +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +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? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+		mysql? (
+			|| (
+				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
+				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
+			)
+		)
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_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() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-cloud \ # https://github.com/netdata/netdata/issues/8961
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(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
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	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-1.22.1.ebuild b/net-analyzer/netdata/netdata-1.22.1.ebuild
new file mode 100644
index 000000000000..2682b937ff4a
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.22.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit autotools fcaps linux-info python-single-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 +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +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? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+		mysql? (
+			|| (
+				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
+				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
+			)
+		)
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_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() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-cloud \ # https://github.com/netdata/netdata/issues/8961
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(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
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	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 7d7a959dc6c5..2682b937ff4a 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -98,6 +98,7 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
+		--disable-cloud \ # https://github.com/netdata/netdata/issues/8961
 		$(use_enable jsonc) \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 79e2ca34ee4d..900cac96bbea 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -4,7 +4,10 @@ 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
+DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
+DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 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
+EBUILD openbsd-netcat-1.195.ebuild 1538 BLAKE2B cdd56207e2bf4219989c15ed6dcf9d0ee7827f9950acf81e635ae93e5765b82dd175998d107269f8c9aad0f86ac2f400779ecf90df986456a46551f010bab8c9 SHA512 5a7ddccb776ade6cbeb08bc74d8a7a0297a1902b595d7596d938063dab3c1bed65d74eddfd2438443e1913dd4c2a910cefacfe9ece443fda6989f8d9fe914635
 MISC metadata.xml 351 BLAKE2B 52a6f3fb0e94749d226310a8439bc81e3a6fb4a59116b23d63ce992e246807e4486595330f3b0cc5a437672eadf4fb8ecea21fc8a0565fc5e9311d341917dc60 SHA512 80bf423a6e8309ff117540ce0d2e29eeea89f3de4c4e4aea161ba37675ff0415a4f5a8cc37cb2ffe841e702de66a324888509a2f66df9576b76e774febfc8936
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
new file mode 100644
index 000000000000..363c5e7a8193
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="The OpenBSD network swiss army knife"
+HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
+	https://salsa.debian.org/debian/netcat-openbsd"
+SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
+	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
+LICENSE="BSD"
+SLOT="0"
+IUSE="elibc_Darwin"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
+	!net-analyzer/netcat
+	!net-analyzer/netcat6
+"
+
+S=${WORKDIR}/netcat-openbsd-${PV}
+
+src_prepare() {
+	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
+		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
+	done
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this undoes some of the Debian/Linux changes
+		eapply "${FILESDIR}"/${P}-darwin.patch
+	fi
+	default
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin nc
+	doman nc.1
+	cd "${WORKDIR}"/debian || die
+	newdoc netcat-openbsd.README.Debian README
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if [[ ${KERNEL} = "linux" ]]; then
+		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index d951d8a20497..92dbd5b2e062 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -13,6 +13,6 @@ DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3e
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.6.0-r1.ebuild 4256 BLAKE2B 96efab5cf4cbdd45e5f64bf41bae3de3260dfa2ad0699ae76b2c6f98c3e88369df5173fb465628dceabb4f8bc92216c8bb51955454a8bc25bfadbed8a63e5906 SHA512 08bba445ae1e6a2e91bcdf903647919e645930bf95786d41ae2663acd1b01eb06009a2ba582ac559ccee45686168fcca9c4592e11570e7f17a2ddeb08329523b
-EBUILD rrdtool-1.7.1.ebuild 4257 BLAKE2B fb477b4e164f5dd1f1bca0d9913b2c757e422d4d5fac755614677ae0138b6a4b277eefead23cc7309302e477822efce743a5515a9c17d47432786d57406a1ea6 SHA512 ba0a361ab8a69a10caa2a0f044c2bc727a35334db79ff26c1afe210d8231b1fd502eeb232b91ba95e9b8acb4a433b1fe2981f8e4a040eeab0366170ea47053b0
-EBUILD rrdtool-1.7.2.ebuild 4205 BLAKE2B 2b595a98c4da0802fac77d36e751c5fa05e8993b0fff2fa4931a227c41cb59d973fd1f8d307fd267dd2d513cf11ddaca3dd586f6c57addfede355b5fa369ddac SHA512 1794867d92c03c59e2788bf6d223b0c8d5312293e136c81f70bdf683f3be19a14ffdb8c2f8761f74bd4fc7998d548e239d586960a15d99aac3b810b4d5d91f5c
+EBUILD rrdtool-1.7.1.ebuild 4251 BLAKE2B b422dd13981e28eaecc51396e6726eae4ce205ed2619a9a85035a2afba0729c8dcbb39956d08d5bf2422edeca2e876f05d6ba006d78f3980f10d3d332f3a83f6 SHA512 9c09607dd79f1bf9dd4936a45a1f58e7f2c5d13f0f7ea628ade5180612ed029a036168a05e7d60920e2c324a94d9b6fe283b7a27640c12430876d0ece41497db
+EBUILD rrdtool-1.7.2.ebuild 4231 BLAKE2B baf2ad5a700db73e0499f90d4bd156c88aee09fa9d507bf521056cf99491db0973d94515fb0c3c9b8cf335c83a487d9484ca109802f3a77c5df0fd39db0e6ea1 SHA512 00b1e99c0df4bf5ca8b1cccdb6a7d542c2742511f6f3654fa8c5ed41c9c19f1c73389aa5bd1d35d4451a53f95062b087a10a34265994b4aefa1ce416096db01f
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index c6feaa1b781e..748d2b72a576 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 9ca47c565ce8..95596dfc78ce 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
@@ -100,12 +100,13 @@ src_prepare() {
 			tests/Makefile.am || die
 	fi
 
-	export rd_cv_gcc_flag__Werror=no
-
 	eautoreconf
 }
 
 src_configure() {
+	export rd_cv_gcc_flag__Werror=no
+	export rd_cv_ms_async=ok
+
 	filter-flags -ffast-math
 
 	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index e15ac3404f45..8a553fc7c515 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -3,7 +3,9 @@ AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca8
 DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5
 DIST sec-2.8.1.tar.gz 143700 BLAKE2B 4101883ccd947140546659c799f9641d496912f22e08debbae5bc9b8b65301ddfeb4c005a9885063c6381383d1f0581a7b96f56cf53bf2401438cfa6cf1755f0 SHA512 03c7acd1e1cfd6dc11143e0ff35758925ddc75e460987a91d5606564f0caa45afade497b8653ec2d8865cfcfab4d87743777eb104e1a16f79069cf61e17d0661
 DIST sec-2.8.2.tar.gz 144131 BLAKE2B d2c9e33be815c1e2321e94e2f679ca6eb6d272b4f68bbf575508c916293c39a36bb4e675a09986395fb34dcc04e356a0dcbf88d076f4c27f532337b4493138d9 SHA512 846a0671d5d774f74645e5e4f6d7a01c04079be19ea9b2ec9cb862fb48173dac0e1131981bb6e1fae525c74610dfdabc1535ff5818ae893bec35daab46e05c07
+DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269
 EBUILD sec-2.7.6-r1.ebuild 586 BLAKE2B e3bde9b861cc02de2581baf734db4010ebbee161112761bec720b29c6c8adf4edec9cb5ebe91f601ea0b7ff1192275de33bb9c39a540b83613dabb56927d49eb SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d
 EBUILD sec-2.8.1.ebuild 610 BLAKE2B 3f9155a8132891e82596a2d5c432b6cb5da9ac5612b9b1eb0f400429461f514443a31b6233c2e68525d789f4f8aea8dadc9f472deec18b9d3f25a3fdb2b52ac4 SHA512 7d6f6b5eb347797f5dbd8facd3c17e66770d3c995762f97a98ed8a3af11a7b664c68be7ea2ff0d4960c2c7dcea920bab067f1206a65923fea21f4d20d67af959
 EBUILD sec-2.8.2.ebuild 610 BLAKE2B 617400450f6aa79fec80d06d9a8fd45d71e7b5279a36946411a526bc42e6680128a8b3e2f2c432712555c6e6831751000da93bed8b45c19fdeed353f5f57c42e SHA512 5f9120e3fae0f78c32cc0c2cb3fe393bd5e0fc96b0d90cfa18beb09a23802ef186f7bc1b7c12ba7abd12f2126eecce2b19eae44205fe825360f9fbc76ea15130
+EBUILD sec-2.8.3.ebuild 610 BLAKE2B 617400450f6aa79fec80d06d9a8fd45d71e7b5279a36946411a526bc42e6680128a8b3e2f2c432712555c6e6831751000da93bed8b45c19fdeed353f5f57c42e SHA512 5f9120e3fae0f78c32cc0c2cb3fe393bd5e0fc96b0d90cfa18beb09a23802ef186f7bc1b7c12ba7abd12f2126eecce2b19eae44205fe825360f9fbc76ea15130
 MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
diff --git a/net-analyzer/sec/sec-2.8.3.ebuild b/net-analyzer/sec/sec-2.8.3.ebuild
new file mode 100644
index 000000000000..89e843baa33a
--- /dev/null
+++ b/net-analyzer/sec/sec-2.8.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="https://github.com/simple-evcorr/sec"
+SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+src_install() {
+	dobin sec
+
+	dodoc ChangeLog README
+	docinto contrib
+	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+	newman sec.man sec.1
+
+	newinitd "${FILESDIR}"/sec.init.d sec
+	newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest
new file mode 100644
index 000000000000..53eb15edfe26
--- /dev/null
+++ b/net-analyzer/snallygaster/Manifest
@@ -0,0 +1,3 @@
+DIST snallygaster-0.0.6.tar.gz 22260 BLAKE2B 5f5f45678ee83922d477eb7356bf830a4ececbff6fc02bc21d2b714abf350c1b2643fb8134f330d8f54a4c58809b9de2671f46b728e631ac0a5f4996f87fd8e1 SHA512 abca663005e43948ef7c6516a3e85d1b1010811365f39a280b9c091490a8b4687fdaa1b0acbd29f5a84285fe16cd74398098eb9600b5ec41ec880d355cd0ddbd
+EBUILD snallygaster-0.0.6.ebuild 540 BLAKE2B 3d0254f87df1fe231e06854887f5507e65988eace51aa92d5eb0a016b8ec275edf8bcf5e45b63efa75d85d1b8cad5a387f890d98548c1d416901863ee475fd3d SHA512 b37b7b963fd1458f0baf292ed7b286b4e1a226fd9b1d57ef6da5a1dbcb46e10a3efa08e47bd4d23ac6092576048cb4d6bf1363b2f31f67cd4bcbc9996338e75c
+MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/net-analyzer/snallygaster/metadata.xml b/net-analyzer/snallygaster/metadata.xml
new file mode 100644
index 000000000000..28ef3c7b080f
--- /dev/null
+++ b/net-analyzer/snallygaster/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
new file mode 100644
index 000000000000..721aa4381322
--- /dev/null
+++ b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
+HOMEPAGE="https://github.com/hannob/snallygaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/dnspython
+	dev-python/urllib3
+	dev-python/beautifulsoup"
+RDEPEND="${DEPEND}"
+DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 278f53bb8a95..9a66f676fbe8 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,6 +1,6 @@
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 EBUILD tcpdump-4.9.3-r1.ebuild 1926 BLAKE2B c29eba2ce6fb0ad870181b11f425a1890795f15f9b2a605cfa1f74fe845178fdc0f918640d0801187b5a599419d18967ccc502f9fd4aea0db79a73be5c1451d1 SHA512 05e260dfed29e697c8cb61e0a1400cab7b48706f55fb2c18f2b5e7f09f3055d4f006cddb3cd7147f151d501cf2072f2433f1d4df49c246c08c6afeef9e62bf12
-EBUILD tcpdump-4.9.3.ebuild 1970 BLAKE2B 21479c00b6e3782f76821cbe4971050bb048ecca3071f9499d5df49099b2f84c2aa689dc70a811191d7ae7d298ff457b8915d55dac8ecf7bd39f944f864d99d4 SHA512 7cd73813b82354b1f1eaacea501590438772a96f91fca4f29e83f4558dce430afaebea5b702a5acf3380305b624685993a7f86eef696ccd5df0c417c332803bf
+EBUILD tcpdump-4.9.3.ebuild 1938 BLAKE2B 3fbeee3f62778f3347d509c2daa7a70ece06f40e3a8d37b85f3a67f53a6c3ed1eaa09bc52b48239db0c51739ad2f94239f9ebe11ed9c1e4bc2dbde8b8eff94b9 SHA512 f627bd6a18482bbc70724491eb69acfbba095d5193bfee673da5f275ce8b40383450776aa1e22444595116df42bc5b6d23a2ffd16a5b94cbc3144253f64e104a
 EBUILD tcpdump-9999.ebuild 2267 BLAKE2B ba2e463b49d4d716709e5914e37bb84877ea954e59ae7ffdc59919221c76bc9811a7ec28cc23ff571373433456ea90522b8b2b59ad785ef235039c5783df1b65 SHA512 2c8c2f0346504873fd6f879e15b49b44d112cf780c75becf7bd862add84ca59a3613c996aa78bf34bad0c0163c278f12978b39c2b32c0d3b75994859116510ae
 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 f5cdec856e94..3731233ad947 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	test? (
 		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		app-arch/sharutils
 	)
 "
 
diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest
index 06d60e400ef0..97e92f57c459 100644
--- a/net-analyzer/tcping/Manifest
+++ b/net-analyzer/tcping/Manifest
@@ -1,3 +1,5 @@
 DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d
+DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992
 EBUILD tcping-1.3.5-r1.ebuild 629 BLAKE2B 05cd6050a41c66d83680bef698b122c743c40625f82d9b52c5c1c3ccee1ad56f86ce370fe6e5ed304234e6398bf48d7b5f264b5134eb4fac4ee07605cc7e67d4 SHA512 2114c7fbafe9714a4e37050b04959af00cb78e5cdb26ce8dcc5474d35ddda4ba9c3c442f05e0b304857e6a8231d6b8a565db58e1f7c19c3206ea8780f2a948d5
+EBUILD tcping-1.3.6.ebuild 624 BLAKE2B b1dab34c816c4a4605eb7ea24aa87a48d44b5dbe044ed2a37921b576fe04e929795018f9706e67f5cd9bef6f43de530f4be6ab84c8194ead11bb63734ae5447f SHA512 64161c96305f32c264b4635e48934f13293820b4d5e8f52ef6f235a7e72afb531890b96a529f078de5e33e88517fbf0a730e788e4780e6ea259bbfb6ad298d3e
 MISC metadata.xml 214 BLAKE2B 4dab37301a1db60dcb52e9f891190c6a47df7685658ea2accf8e152430b2ec3162a78bc9ad4cf7836954b10be3897228d998c0436a1179df673c25a87b166a86 SHA512 81de8d9677e88447cac7cfa2b6155040211f235c3186591a08a145b9e711f1e7cfbb133762fc9f54db8ba975e5cdba1f7654775a523150556fea26af6ba116f9
diff --git a/net-analyzer/tcping/tcping-1.3.6.ebuild b/net-analyzer/tcping/tcping-1.3.6.ebuild
new file mode 100644
index 000000000000..ac21b008725e
--- /dev/null
+++ b/net-analyzer/tcping/tcping-1.3.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Check if a desired port is reachable via TCP"
+HOMEPAGE="https://github.com/mkirchner/tcping"
+SRC_URI="https://github.com/mkirchner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+	sed -e '/^CC=/s:=:?=:' \
+		-e '/^CCFLAGS/s:=:+=:' \
+		-e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \
+		-i Makefile || die
+	tc-export CC
+	export CCFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcping
+	dodoc README
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index bce6fb9b0670..e83d071f960b 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,7 @@
 DIST testssl-3.0.1.tar.gz 9207908 BLAKE2B 0c7c43b306866fa79718027ce9db3a894a4344f714a4318578f4d9dc79b09e1beba1f69f7f25e75ece6811e1394479a29e021697c30f160a0d9f3f291d4792c5 SHA512 e081c6bb24c45cb197b57403cfd4f384459ce2c0d0f0ccd2fa0f68d61429ba9bf4a351efd2b0febbadaca7b1f5825c338d8b03f59ea4cbe8467358ee92cdc715
+DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2
 DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a
 EBUILD testssl-3.0.1.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
+EBUILD testssl-3.0.2.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
 EBUILD testssl-3.0.ebuild 1509 BLAKE2B 3fe3638078171668db5e9820cd1b29062117c8f081e0d68f9830dc1e1970a17b546eeb491170420a359901abf7ea7d9b2255a9c483b2a564ebf315b2dec319bd SHA512 5e404a151afe689e1701cbf79ccd0c6e925f4848bb513ff9f5aab6f35dd99c287ba31321841693ad51b06e54122f0bb6d876f45cda4c8aa2480982f59983be14
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-3.0.2.ebuild b/net-analyzer/testssl/testssl-3.0.2.ebuild
new file mode 100644
index 000000000000..8a2472e4e275
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
index 5b04916ae0e5..961a37d26036 100644
--- a/net-analyzer/thcrut/Manifest
+++ b/net-analyzer/thcrut/Manifest
@@ -1,5 +1,8 @@
 AUX thcrut-1.2.5-configure.patch 2088 BLAKE2B 413e67d125ac4dcf086b06a63519d79d4d049ee6d94455f20a74c02a1ef9a2c8c9be99a268febe14ae2eab6c7a7c4d61a9861d2b6c4cd71f4ba5067ffb4b9c1e SHA512 0d3e77959f534d3231037c0cb71e602842f19dbbf33864100b854931ceb3b47c95017dc84f5f6b557562c338864f8809e20f96ff7f7fa88dafb930a443056d3a
+AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308fee387d0579107be9a295c88e100f6a2157b9503dff5185ac1a2d270cc116230645491535436fbd94d3e337f2 SHA512 4ebfafb9f9d9610b1ed695ca471f5a5284d06069db7a9635bdf29a72032c052f8e60688853048ee7ef90c2c99c3e34a4dcce0b88d2f1e1716a1a4ec3411578d6
+AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
 AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
 DIST thcrut-1.2.5.tar.gz 660673 BLAKE2B b57d2f15a4190880b135c2631a377f7136f56764d16a5fcd367b72d2cb33313a5c3651bd9f8558eb7b12a630de45674ab8d7c279dd3c0b57a2a8a2407dce33be SHA512 954f7512bd3e3937796cc065612214ae7d17f70175305ee66951a4e4dc2fcd83c7b15c690f429c7642c9951c2219f86a045418a77e42e3e4a54deac2ae0c46ab
 EBUILD thcrut-1.2.5-r1.ebuild 634 BLAKE2B 8c7de5db26feaf3e6f53cbfd01a90d6daabd79e776d247f697408f317859ba9e79eb16429d04c94f3fcf883928379c16f508687f79e51af733cd6243540d2ac8 SHA512 c92ed1665bcc1a909f8b9366ec8a411160c7a2c43423b47d57e2ee9f88862df18c5d2315b447ebcd44c8c98825127ed708954d8bd4cbb44eeda96156450a346d
+EBUILD thcrut-1.2.5-r2.ebuild 725 BLAKE2B 54412f5d079e49dc9626110a3656dba6b4a248e91cfe751a14a2c76b2b971014815d8ea0023172439d6df25e264ca7ebc9b518bafde3db546644be31782ffafd SHA512 0291295d555bb457157088f48f1ebc04607720b585e6b54051737e97c1f40baba6a99b653be4a6cc620833d7f474147ba6badcdc79db9a9b481942b052d7f5a4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
new file mode 100644
index 000000000000..0a6bcaf4ebce
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@
+ dnl
+ dnl Use these compiler flags if we have gcc.
+ dnl
+-if test $ac_cv_prog_gcc = yes; then
++if test $ac_cv_prog_gcc_not_on_gentoo = yes; then
+   CCOPTS='-O2 -Wall'
+   CFLAGS="$CCOPTS"
+ fi
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
new file mode 100644
index 000000000000..a934048f341e
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/discover_dispatch.c
++++ b/src/discover_dispatch.c
+@@ -81,7 +81,6 @@
+ 
+ unsigned short ip_tcp_sync_chksum;
+ unsigned short ip_tcp_fp_chksum;
+-struct sockaddr_in ip_tcp_sync_addr;
+ static dispatch_func_recv_t dispatch_funcs[] = {
+ 	dis_recvdummy,
+ 	dis_recv,
+--- a/src/discover_main.c
++++ b/src/discover_main.c
+@@ -22,7 +22,6 @@
+ extern struct _opt opt;
+ extern char ip_tcp_sync[];
+ 
+-struct sockaddr_in ip_tcp_sync_addr;
+ int rawsox;
+ 
+ #define DFL_HOSTS_PARALLEL	(5000)
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..191ed447f475
--- /dev/null
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Network discovery and fingerprinting tool"
+HOMEPAGE="http://www.thc.org/thc-rut/"
+SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+
+LICENSE="free-noncomm PCRE GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libnet:1.0
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-libnet.patch
+)
+
+src_prepare() {
+	rm -r Libnet-1.0.2a pcre-3.9 || die
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ee6175367f6b..89b2a31364e2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,6 +8,6 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
 DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28 SHA512 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a
 EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B a6c802d721d9b5922c916654a97f00bb48b8099fdf1693b793966b4c0f6b53736db09f0c9366e7dc6ecfcd3c081e00d37ce8fbef68a1ae177dfb978ac17abb03 SHA512 bfdaae60f4fe32b358b232678330453d0b9e773308e65080aa9dee543852e4c148cc848202839743e109863c9f132980cd0968f5d14e524c54ac9e8754120d11
-EBUILD wireshark-3.2.3.ebuild 6778 BLAKE2B 09cddb89ddf101c34f6ebc5fd12a68325bd4a74a25f42e2f03c166fb58e556983116281c98f62a8d8174f7d5ef6f2f00ed0c0277b765787ee23797599aaf1e23 SHA512 9a39fdbcff83e17f67766cb91d912e256c1407c693f9f1fdd0928d0030ff8860b57f8d825109b7735005f0d6f3693df0a8f835b53c98f4a7c279823e605ec2a5
-EBUILD wireshark-99999999.ebuild 6473 BLAKE2B 90f269e669b6510bec652d255cd7ed799f43d278262519ca5ea2902fcb38a7f631a01e9596b0aded3412971df16e8bc9bd36664dc757f2164f75c8a2c0294653 SHA512 aaf738de7189ab83ac74b9140693089fb68b22f4afd910454c0bb1ac1b459c27005a67be6266e4c663f213868ea7d79ee1636d4696e09f604f63f3f6fc94b5dc
+EBUILD wireshark-3.2.3.ebuild 6867 BLAKE2B 9a09a6c43b745de8f645ac354a2428b152dd8b9209c2ba46210e80a0906fe5d4e929208cf1fd9975ead7aa94153ef5f946ec53f99dc47679e233d612b1ec7dc2 SHA512 0e3475aa1e2e1483d8c9ce42e0c832a87a1dcee64e6adf0f6d590824cd98cdf08d6169cb52cf0f03867a94c5d9c2c5bae739c794cb7ae733775932b813d5e93c
+EBUILD wireshark-99999999.ebuild 6563 BLAKE2B a3c2f11044bf4a8b716b56e296d41c3e4ace4bcd7d161791634135091810d3e68aed08901b34d7ccb0d377345f0a58d886f06a9ad5cb50dc9865474404737914 SHA512 6565cbdf6af904fdb15786a0f6458365f31c64b766bded9165e923a4c8376273adc7a002015b42cc9fd30abc2509e9f6cf08c8358658d128f4d7e53aae1352ab
 MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3
diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
index a09e19cba2a7..9c28437e7631 100644
--- a/net-analyzer/wireshark/wireshark-3.2.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
@@ -11,13 +11,13 @@ 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="
 	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 +zstd
+	test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
 S=${WORKDIR}/${P/_/}
 
@@ -74,6 +74,10 @@ BDEPEND="
 	qt5? (
 		dev-qt/linguist-tools:5
 	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
 "
 RDEPEND="
 	${CDEPEND}
@@ -174,6 +178,7 @@ src_configure() {
 }
 
 src_test() {
+	cmake_build test-programs
 	cmake_src_test
 }
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 6f9470ca6ee5..86206f1ead23 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -17,7 +17,7 @@ IUSE="
 	+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
+	test +text2pcap tfshark +tshark +udpdump zlib
 "
 S=${WORKDIR}/${P/_/}
 
@@ -73,6 +73,10 @@ BDEPEND="
 	qt5? (
 		dev-qt/linguist-tools:5
 	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
 "
 RDEPEND="
 	${CDEPEND}
@@ -168,6 +172,7 @@ src_configure() {
 }
 
 src_test() {
+	cmake_build test-programs
 	cmake_src_test
 }
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 040a385a09d8..b024f4d7333a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,7 +1,6 @@
 AUX zabbix-3.0.30-mysql8.patch 608 BLAKE2B 56e2cb893269cdeefbc6ca7c40e73b9af2012e4075d997369c516253211d6de6266a1f565ecbf39cd4520fe76f65968d43320ea8e5b2cd59d2a0eb9f8febc9f4 SHA512 13e95e0f3fd1aff4f2546ce5b3cb48c59e117984192a2574d799ca062ce763982d2984e5fa94b49f077aaebbbb3442a06a0d9982a38a21f5ea739fd0fed87148
 AUX zabbix-3.0.30-security-disable-PidFile.patch 1378 BLAKE2B c1efdfd0b223987c9d9bf1a3f7731f0bdfeb42d1641bbf4387d70ece757f5cb2fb88bafb87f6938a5efbec091f73d5fde0450e8aa0edc3143d589df5efbe5d19 SHA512 854b198b980e4b58dc6149e285bfa6361ab2a10b83a6d8f07b46754316d6764669e68da8018b402b59317ed95b50a13d25f68f28c4c33d76f0ef1e8dedc8da99
 AUX zabbix-4.0.18-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5
-AUX zabbix-4.0.18-security-disable-PidFile.patch 1378 BLAKE2B 27f24c966faed93b79629cf37a301e71360ef6837a188e79fdafb7ae8904391e65e83c752d082c9cd62a778e07fefa18ae629e928017520e202c092925693394 SHA512 b6f388917a27802b861635a2fc824eeccc6dc94fc472d39e308d412996c530e23611aa85972e06cad64fce837739331432bdc2178c7b3516cb100e1697099c25
 AUX zabbix-agentd.init 507 BLAKE2B 6d5f0e631639e766d6857304d205acbdf4d07b59deb43be2735d8caf1b3d9d156dfc3c54236b435383d0182869b8f5eb6cb45499a6dac010f5ea497f4533f80b SHA512 7dbdb94dee4bef1c5771ea02169b7f4d0a21e9d2c4ce44db1376562309e1a24455beb16e65a4bb049a1e713cb51bf38ed39ba48da5cf3c8969b6860bcbe74fc5
 AUX zabbix-agentd.service 277 BLAKE2B 9665032fdbc73e044ce1e897b205358209777440826b899db020ca34e659cf2f0f54696367b939fa544509bad2558e74af734cf7fdf8535458bb523b839799e3 SHA512 fd973db67986a1fcebf170dd108c6d4d21e2cdbf79ac624a202039ffe13b6ecf22f5ba774c3052b3b0282a4b485fef8998671ffbffd3c77d117878c98c8e45c0
 AUX zabbix-agentd.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
@@ -14,13 +13,15 @@ AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b70639
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3
-DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb
+DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
 DIST zabbix-4.0.19.tar.gz 17211769 BLAKE2B 1f7ac3fb195c35a41fae84a2b9a7985bee49664df8469ef7a14b9e264348447e5d5822fdc05feca4041ca57e74d15bc8b5cae262024fc5dca7749af263224d2d SHA512 c279af3d8b1b9125420d65e4e20a8892f9531a345e1f0046214fa14ab6204d535fd0cb672b5f3c6b5e325b7d8ff44e317bde58611f4bef9d89aba70851326daf
-DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c
+DIST zabbix-4.0.20.tar.gz 17215217 BLAKE2B 144b334e78b121d0ba01b285590a6d354ed54be8dcebc12216b51f9829dba98c76d122bb329efbf67931237636fe178ecf5dfd141954fe37d1063c24c3c6dcda SHA512 5f761ba8bd3eac67de9f8d3614ebf437a6a4cdad8f0bf961c8b4cbe39f13bafe64bdb58b6ba56f1a27304ebdaa32109447bd3328fd3e2fcc1aacde056fb1d5dd
 DIST zabbix-4.4.7.tar.gz 19413652 BLAKE2B 3c7d55a64f8d0e94d7fca3d088bb40592f56ffd5ca8025fb2cdd82ae7946bca1449b354e74cc3e50a6fca9b0bc2b46cf995b74d31d4b462f3d0b4be734f7c19b SHA512 2b96771bb555fae3df67665ac2e47c94662b071eb97c943d59b8f1fc7d31e2bf349c551a0015c6e239321f069b3ab87373c397a023cbff3daad8bd310d11fb6a
+DIST zabbix-4.4.8.tar.gz 19457802 BLAKE2B 4cc566b744d500c5f3a95eeaebe5418ff58cf3852318f474991706b0f81d1a9b0a1b3793e3e28b99fc45f4a6bfb9281c4d42acb5bb8fc49c37802d3c245dd853 SHA512 bd850d4ec8f30b9bcd531d84606c900692be5b91424cb06f66cde24ed4634a93d25476010e4387b51933406c2552a611e2e7ec4691b57ca6c38fc874c4b1aef1
 EBUILD zabbix-3.0.30.ebuild 9227 BLAKE2B 565fe222ec1d1e2aca06bf705e78fe3c0f641dfdacd61f6346efd85385386e04e5c62eb079e16ebfb9307b84a8eeb2bbb220a59e0d771035a59c669e9685050b SHA512 055dd251714720d7d175d6f4c7c07dd0d452c339b007dc75501ac17a4185ca32d7b3d57a30e93828373c67a3bbd7a22f468330368c75565a26faf6610aca9dd7
-EBUILD zabbix-4.0.18.ebuild 9242 BLAKE2B 8821d1ad7452f863b8e14d54f60b460ede2fcdcf519431dabba2d64ec49b137686ef071c3c22a1d211bda2ed45b8c5f326eb37b598720a67e8d2c43e6960ce55 SHA512 22a2768ddcb2c05aaa4192bedf94bd92e68fb6504f77ac0fb87ea3ef39d34136889cd7f27f436f36f485ef8e8d03bf945c36965a76eaef2b385294e07383ff1c
-EBUILD zabbix-4.0.19.ebuild 9244 BLAKE2B 41ed0452100dc832b18e433c2fcde2e69327d2bc869495b04154d0cd75daefc6d89bb034cecb4e564eceb8ad174dcaa0a6d93cd8314977808c8aeb701e4a287e SHA512 0ff064767a9ad2d361cc8fbf31fa11daca28ac790db72aed5d155f920ea1fa060a570d9067dcf1e9b59df96cc58f368c70df91f079a79170a18164b3ef8ce38b
-EBUILD zabbix-4.4.6.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0
-EBUILD zabbix-4.4.7.ebuild 9121 BLAKE2B ddd2ae448061ceb124ddce5115d2bd17240a44d73f21ac4095f54f13dafa8d3d643e9bbe4b5f7e57ee164104e9cd88056b80dbd87436e1cb6b5d551dc947e4f5 SHA512 fd44d8b1579d111361563ff26f301312ae806d265630eed74a4c2bcf5c7fd4592a9d07b089ef6f68dc13928ff0a966fa67ac3521d38a76148d038df70a08a41f
+EBUILD zabbix-3.0.31.ebuild 9214 BLAKE2B a03ee28ceae862d1909846f682b9489b7a23b44dce06267ce258e9137c8755271e4a90357fdf1d7843c8716df1e9518ed7188a95be4b651fb505b27e947453a9 SHA512 e4dd3829d87dbe8c28dc82e00574e6712abaf7c8b11e8bf97ccf059ff820e3689e64bc89387868c7c453328619eb62a33819d8831e50784c1ba5a6e19cd90f24
+EBUILD zabbix-4.0.19.ebuild 9250 BLAKE2B 77bad68ad6c6d435d07aa45c2f381772a8a694c5f0408100f34826cded4059ff310036c3e2d1b6f13b792e7492301d7453e8de126acedc8e7f4cacd2dec6e013 SHA512 62a6d0c2edf95779d46bb84a499fae78205101f4d4e3599c14aab3163b09ad9493742d15715b58b60088a5292694d8fed07dc286016284f2817ef026d23c1366
+EBUILD zabbix-4.0.20.ebuild 9221 BLAKE2B 342880176c78e465fe5d650826393970a5600a6a38d7ad9a40af6f8f48237a90939466079af51d63be7a939a1bea69b3607714bbfecca187058f1747121fe43e SHA512 27a8f7b4e46d9f5779d6ced6cebc13c1aef37ebd699ec9e52f31feb836eba4e4759e3597cf1995873f7808a952083f774931a4ab3e1cd7e84bbd24a6a859f1f5
+EBUILD zabbix-4.4.7.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0
+EBUILD zabbix-4.4.8.ebuild 9090 BLAKE2B 10ceda1d5e6f59db90d495d97931e315325eafcdb1417e87f3894ef641b496f0873d19b09dfbc955b1e2daa3006264301db42c481d853f0040d8262d28eb029d SHA512 800867a11a498825eb8613e02268384f98836e48973ffecc2071946c448569f0d4b8d07ca965e277a8808f55e87062339718c770354ec44b3a4bed2ea1f3cb07
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
deleted file mode 100644
index f6a6187b3fc0..000000000000
--- a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
-index 73f1621..825715c 100644
---- a/conf/zabbix_agentd.conf
-+++ b/conf/zabbix_agentd.conf
-@@ -5,6 +5,7 @@
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
-index 7498ffa..de6b579 100644
---- a/conf/zabbix_proxy.conf
-+++ b/conf/zabbix_proxy.conf
-@@ -133,6 +133,7 @@ LogFile=/tmp/zabbix_proxy.log
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
-index 760e685..3a252ae 100644
---- a/conf/zabbix_server.conf
-+++ b/conf/zabbix_server.conf
-@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c
-index 6b1a333..7a9578a 100644
---- a/src/libs/zbxnix/pid.c
-+++ b/src/libs/zbxnix/pid.c
-@@ -26,6 +26,8 @@ static int	fdpid = -1;
- 
- int	create_pid_file(const char *pidfile)
- {
-+	return SUCCEED;
-+
- 	int		fd;
- 	zbx_stat_t	buf;
- 	struct flock	fl;
diff --git a/net-analyzer/zabbix/zabbix-4.0.18.ebuild b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
index 1825d361d641..ff07f82291b2 100644
--- a/net-analyzer/zabbix/zabbix-4.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
@@ -11,11 +11,11 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 xmpp 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 ) )
@@ -91,8 +91,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-3.0.30-mysql8.patch"
 )
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-analyzer/zabbix/zabbix-4.0.19.ebuild b/net-analyzer/zabbix/zabbix-4.0.19.ebuild
index 28210112c73a..5fe2b0dd7666 100644
--- a/net-analyzer/zabbix/zabbix-4.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp 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 ) )
@@ -91,7 +91,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-modulepathfix.patch"
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
 )
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.20.ebuild b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
new file mode 100644
index 000000000000..3313b71565c9
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
+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"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-4.4.7.ebuild b/net-analyzer/zabbix/zabbix-4.4.7.ebuild
index 8d4030480f5e..4f4099f27c63 100644
--- a/net-analyzer/zabbix/zabbix-4.4.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 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 ) )
diff --git a/net-analyzer/zabbix/zabbix-4.4.6.ebuild b/net-analyzer/zabbix/zabbix-4.4.8.ebuild
index 4f4099f27c63..645e67353269 100644
--- a/net-analyzer/zabbix/zabbix-4.4.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.8.ebuild
@@ -11,11 +11,11 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 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 ) )
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-analyzer
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)