gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /net-analyzer
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
151 files changed, 1351 insertions, 3354 deletions
diff --git a/net-analyzer/2ping/2ping-4.5.1.ebuild b/net-analyzer/2ping/2ping-4.5.1.ebuild
index 0c1b00c80e0d..beba48f36811 100644
--- a/net-analyzer/2ping/2ping-4.5.1.ebuild
+++ b/net-analyzer/2ping/2ping-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="server"
 
 src_install() {
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 83ec28e7a9cb..57b63e789836 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,5 +1,5 @@
 AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc689ba360d8479b28e9a0b16d25864954664e6b0915149077620aa9d0fec00a85ef68b257 SHA512 7d898b96e6888233b7628af7a9a0641a4ce2f6ebe38192b88bb7f479d99067f6d34843f1b43746eed03b7512782496534e35240abf8b866a4e8f00ee9421deb1
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
 DIST 2ping-4.5.1.tar.gz 77053 BLAKE2B e1255264dde4e0deb2d064e0acbaf96270e64a057334a0c0eea4e413e472cd52ffdf2181718dca4309eb8843791ef2bef866b7cf5642f9ff41e9916c3d7180e0 SHA512 13ab8c34d6b4e8d53bc0f1c33afa1c71bf61313d29350d2211a44557b244062cb090cf5d66cc6eed58f9f4c41a667bb24a8c1155243864e8343c741770b60cd6
-EBUILD 2ping-4.5.1.ebuild 630 BLAKE2B 24274fa4c641564d6148ca44157bbf8cf7005202f5eee4abad62b900f2f6e2ccee9269778cfd641eb8e7b4b40b7385096cf62587ee5182e1a1cc1da624d76530 SHA512 278a919da35aeaec31d3d9a3dd00cc5d413c729cbb39904dd0332542a44a754035befabcb672e5bcb68361923c1bd83e5bbc99afdfabd7136ad9a2d32cd32830
+EBUILD 2ping-4.5.1.ebuild 637 BLAKE2B f02bd2452852949adafe1835a94b732d707b0361f03e71b46511dea82fd837354eb049e7ad14a4e0b75c1c2788f6ed0ec0fa0217c218515ea072155e26aef5e2 SHA512 e2afe3eb98fde1b17e4186b784fd17f0b3486f0d597b2068c400bac70f3040e8dd02e166588c4010493463218ddd64e9942fbed6d1cb7ca4504747cdf2ba58ba
 MISC metadata.xml 432 BLAKE2B 52539e695c77ff5904e49b208e1543ce4a00161eb2ac674c32c315391c2fa9cad8b3f7997bd97df1716c077a327316966c585749c428e0df77627dd066fe5466 SHA512 ece238db5f5a3e93d731066403991ed9070223a52c791c23d3d0c0ee81136d1384b71568c0ee8f0b8f7e3836616d4c9a38485f33512ab262a7193ba330c02c40
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0f0efb682253..8d6982944c3f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 89ba6fd393a0..cfa6a4f90a32 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -4,5 +4,5 @@ AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f4469
 AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
 DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
-EBUILD argus-clients-3.0.8.3.ebuild 1512 BLAKE2B d527d817e7a131b920dfa731c67038a7c6fb18e3c6041c04507b586003766a60f5ba7c12f2e9b56c24467155eaf4abb4c82bde6fa953578dffb791f84d779138 SHA512 7a1c7b40b918dafb1a126766cc20ef2d20525227caf2200a9d29f8035037b9ab27d775adc41c8f10ba82af32bdbe559a8c6a1a3359937b42bc710a56d2ebdc80
+EBUILD argus-clients-3.0.8.3.ebuild 1513 BLAKE2B e5cf517aadbd333741af825b8f83c0d6924cdf02528af19159f2087024b7414c6b031736e8ce2e65ff50bf6e2355d8224bbe401c39241a0a2a5debe6190bc64c SHA512 cb7e3da9183eae3fba61eb448c8dc7ff8ad1e0a1fd1ec57cd9596e1194ec6dc24fed270094c4440b79a1d6774b5606e79926c1259d2c8b588801160ab0b02cd7
 MISC metadata.xml 384 BLAKE2B 9752e5335c1ac3c965dd32dd18738a69be73caa8a055a424c14ede4ee077b6084dc9f8cc3d0908c13ed9dc3ce26cdb1b2335634ead4594c12d242424ad43b30a SHA512 251db762aa813d4037eb8e7617efcfceb46eeec6be6cfbb755146cea3edbebb7e4bc5eeb0d38314ae5ca3a2311ccd96750e4c9d43692f9d89cc7bc57ec2152b6
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
index 382122ab0c5d..f27f15cd9303 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
 ARGUS_CDEPEND="
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index cf091e37ca73..5a655146acf1 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,4 +1,4 @@
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
-EBUILD arp-scan-1.9.7.ebuild 479 BLAKE2B fad6f12f076725b94ff61b9c215c5e326d70c41363326066b686659546b6975ad27adb670dd2dc0722bf58b0ea9a20285b6ee66a4119f0fdaf15d1807eb63959 SHA512 7b638d6ceccee9688888eda60f5da27f329444dfdd37499dcd322530dec625fb63722ce4baa0c5d54b06c3658bb74d113ddc2e4b45c0b4408d3624649a65e107
+EBUILD arp-scan-1.9.7.ebuild 491 BLAKE2B 6d2e5ea702855b42e31176e07ac753e7a469585dd98dd8a19b685c99223c5565706fa1bec7a599fbbc98d34aabbe556f0f27e5fe2303521bb5e17c3b68803c22 SHA512 a80be2dc2472bda730099ed3f436a1cf9770c30b39f2f0e666fd6a3ae27525797dd19f52cf8881334975aea862fe8c290755fb05729cdbbb1f7aa78b8a4225fd
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 363 BLAKE2B 779a9cd3cba88ae4076ed6b094efbfeb4433e81c757bde0555e87afc9562c64f1575503a7b1395e9e41b9e659a5037bbb124ea38abde3193d9ac001a7ddea2f4 SHA512 864d8e4092af38e8fb45652cf17259466d94dd810707c2c39f7d5115dcaa1adc0164eb8397e7e303d1b57559946cc79941fd137e0a0a54cb71227196de2e95fc
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
index 699942037b59..c11f401364ba 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 921f4c3bd08a..ec4691368c67 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -2,6 +2,6 @@ AUX arping-tests.patch 5643 BLAKE2B 154071667f814ec720a6fce36612d251ab891eb3972b
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
 EBUILD arping-2.21.ebuild 853 BLAKE2B 815e29d2d3ad9641bc0067f69a41eeb9741eacbcc08c5535eb88f4219fdf8860f6c9ae36c5b338b41221a7155d64725dcce0db6f471f3d6274ec66fb967a53ab SHA512 b60dbda113926dbaa2718cb70953546afc440f988db472c588d9e287d9595dc86b50c6c6a85748ec02f6489587c8892677825298de6ab691c9d50ab308402a7a
-EBUILD arping-2.22.ebuild 778 BLAKE2B 0257dd7a86931b7500ba213dc19898addd30fed2c736b1433812df7dc656578c117a0e785ca70fab969bbcc88da630b830119801939917bb9ca2498cea905c87 SHA512 2c74c021c55f5703822f9cacc8534014286a5ce80445baf3204dc6191568bee38dc23691640dd15a73927010ffad9f7d806da3d690ea1aab7c094f56e30e9884
+EBUILD arping-2.22.ebuild 777 BLAKE2B d928cc259d9f477426d6a0c7dac42d47989437f9956b047f719cbf4a18f24a4556e2c572b14fcfe3bfa156768994c2c58442a9ba0378f1b7b4e6c82aca5a3914 SHA512 461aad71da33b5f278a9c893dccd69b0bafa3998c369f33aac9e8b7e8fd03a489c5c16053fb24f1135a5e6563ed784a7de6f0f3fd334375f4258b2882bc3a90d
 EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
 MISC metadata.xml 365 BLAKE2B c7c563e88cea335d25b5d88b725a3e05df1c3b59f5c5d5d2a18f888cbbae869520b3f9749d345cc10c066524d60d8ca456d799ab27c7a7bf8dbec0fb0ca40e3b SHA512 368117a86a11e3a6d8a847eb43c8b44c40c0cc0f774a4b06f4da6e31eb6cdfdc0820918e651c481ff1e1424f0f15a59e64a7b893621c456c2496dccb9de2b66c
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
index 55d11b15175d..2c8ebabcabd9 100644
--- a/net-analyzer/arping/arping-2.22.ebuild
+++ b/net-analyzer/arping/arping-2.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index d6b564e0053c..a63b67bf6b61 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,5 +1,7 @@
 DIST bwping-2.3.tar.gz 119043 BLAKE2B 2780f22a2cb541821aae3ddf0eaa5f2cb662ec8f190c44f7e28a092f4e07f9b19d1388b9ddaec0133cedef894c6ff64a9e53035fd73e44a8f0aae518c8b9dc7c SHA512 e8afed0d4ff0ae668f1700e3c93e4b6298e4861568d4786630826bf0f3519089602b9562c92b2c3bb97904faea0da6a084fb60cc69bc3a0a931bd0f55af3ee49
 DIST bwping-2.4.tar.gz 112687 BLAKE2B cbf2854ab5cf6e926db4e959e3e228b8dda6d5624898710de6bf0be4f7813ff85e088acba4b72e3f7d02ffec9f6feaf02720e915850e50daca2c7c3c5c775883 SHA512 e57bf644196a31acc845d4864d189595b1bca22b03ce7330581143ca369668f0dbccc23c936d985f334e03f9e5462a4298d714ceb56815a377ce1adec15364e6
+DIST bwping-2.5.tar.gz 113076 BLAKE2B c2a01b1d1d9fb83c2f0e40e2b1967d0e1e5a939d912372637558aa84cea0bca08f080cc8d980906d346ca44b39b7f37b54b0d6e18f834928bd59ddd056af43ac SHA512 2c271215476c8f1e0758aaae0e1730c526a326eeb3c7ffac3d8fac5783dbbe84d97fbb6732bfa7199ea8e4caf81a8dc9bd54ee36b63ece46dd2286880c734371
 EBUILD bwping-2.3.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
-EBUILD bwping-2.4.ebuild 429 BLAKE2B 7935122c7368253217729aca06572362a4f1d6b34632b4ca0fa90ed11d6bb59298edf87d8b3ce06f62818862292a1808d76cbb2264f97d50f8bcd3376cb42681 SHA512 a3ed74d37447fafa1acfed29fb319e4e793353b98cf70f4a0e58acd83fb377eef6d168f29ee15d7be80b457843cef1a6090a8f2efc421f18db5252abd7a7ae48
+EBUILD bwping-2.4.ebuild 427 BLAKE2B 9bc3c28abc732e78851be6b66a2bfc9b2f91d68b5274c2fb2ec797efb026ce9709b7e42b2ae16678109229317f8f89d2c82431987ff884afccfb704d47e059d7 SHA512 46054f884f967c593fae288a11e08e6b478bf2335f535f08f978a7368de758990fa8447072e0e66e13365013342393c58838d26210f0ab73002d308f4cafee5c
+EBUILD bwping-2.5.ebuild 429 BLAKE2B 67c95d53f0c90e5602890b33d0cce8125bff1df1cbc0aeb310fe029f4b74019ca2e9b208a3a9ccdeaf3575e5038384207afce2e26406a99074342a7156fe8a80 SHA512 623f33fdd1017739c98472fa4650918b216d5ddaecd9c34731fb5d1f5bed34b25f6d626fa300d3685b70a1026a2e113a67c3c9b3ff1e31bec5f9c2344bd2910e
 MISC metadata.xml 714 BLAKE2B 685d375a27c754c7702bdd706e1918dcf944e9d91b654fe7cbe3d216cc3c0d9600275e109b48d50daf427839d78c06b5522201de84237d112c195e92fd3ce2db SHA512 0784e9c845a507468d69477620fc880ba9dc18ba2173cf16cbd3a52259b835168b31b46c1afcd22ea530317733cb64759900c2d3137722324d1e7b37f5a3f3bc
diff --git a/net-analyzer/bwping/bwping-2.4.ebuild b/net-analyzer/bwping/bwping-2.4.ebuild
index 1f3911414ca9..0b6bec7fa5c3 100644
--- a/net-analyzer/bwping/bwping-2.4.ebuild
+++ b/net-analyzer/bwping/bwping-2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/bwping/bwping-2.5.ebuild b/net-analyzer/bwping/bwping-2.5.ebuild
new file mode 100644
index 000000000000..310ecf23d0ff
--- /dev/null
+++ b/net-analyzer/bwping/bwping-2.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="https://bwping.sourceforge.io/"
+SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${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 f590cbf33c6c..221e2918f4f1 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,10 +1,8 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 AUX cacti-spine-1.2.19-configure.ac-fix-bashisms.patch 1136 BLAKE2B 46b16d88fcc1114cba48481eebbb435b5f9073ff016601ee6ed4924ace282bad023d92083245df63aa770b9b3dab9475b7fd3ebb1afde5f32f4c060d766304b5 SHA512 a0c1e09a933f97dedc6c02e07433a9f28b2c407548e340e0c3cc65943df2ab6dffbb6a0258ba22977033b0b79bf9747f938da76b2b87c8e70cce635270d4135a
-DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
 DIST cacti-spine-1.2.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
 DIST cacti-spine-1.2.19.tar.gz 113974 BLAKE2B 6ec71e1480e9dfd2636c61bcea10c6581009908334fddbaab5cf4bf6948bc6f8ffb27b0325ab1f325b9ad0b0f2ba7e018373c34534ca5d4967f66100fba76934 SHA512 407a4e83aabaa62693c2f7c3d3952da9178bb28e2b8b914a5649e3eaccb9ea77d0c7db8e251a113a308bfaaa0674be941abfb2fc4f8e50d43fb73c8cd9deec63
-EBUILD cacti-spine-1.2.16.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
 EBUILD cacti-spine-1.2.17.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
-EBUILD cacti-spine-1.2.19.ebuild 872 BLAKE2B c9f52dec0abd1d85cc49bcb8d02622fc06e335755016cfb8ad1b4bead3215192618cd6240e520cb63c27b0451b60ce11954ace1e6f31395222a219766e53ffc7 SHA512 afab552e38810e6bdb5dfab30c6361edd11a872094fc3a81b31b63482ed95e6c5ac757da4886cad2c61c15e1a25f788550cfb0a85ffaccc829a1e5b8471d0215
+EBUILD cacti-spine-1.2.19.ebuild 869 BLAKE2B 9e4b4b35400f7cdb298e9788c9aaf1a8db283d5e312aeecd0a804b73cd80fc4b53eae0b822e4ed5f060f94b60c1f617af54c8f9e6dda2d57868ca2dfd7211e08 SHA512 a56cca2de931d2d536b16e105c042057b4793c2533c93b242b5818a9f49829d1be29803147d267a6afc766c15401cccf30babc988a6287407e565a0380f2166f
 EBUILD cacti-spine-9999.ebuild 745 BLAKE2B b125a5cf26b9b1d4aef143f8ed5a43caec47bd2ab81bd043c1ee297840020ee5016bdbad16a8e7c32615d0a82edfeccf441d89e727f6f6e2d86a8bf1c0036849 SHA512 af8e206e1d5cb0036c6b6d9d7e02b4003dd19c5a322e40e6728b43fd7a0ddd5e67202c9946abeadc06e0bf1174faf66795a9162b4412290dc7dae2ce7a6dcd46
 MISC metadata.xml 805 BLAKE2B b841b3ffc9585c51e7ebbcebc0847dbc0aa7f38e4005f34d7aab206501925c96e0d3797c678928503f69f30e82f6f3f9e5f7b100b206af9eb1d116da2133c97b SHA512 1d03529f32f001e726654c60c4199d33b01e943359e6bc9bbb71ff3429d620f5c07bb028816a103ca65575276293bbd56d2dd4c0867af702bf9d391a82ea3d0f
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
deleted file mode 100644
index 6c9200ecdceb..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 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"
-
-BDEPEND="sys-apps/help2man"
-DEPEND="
-	dev-libs/openssl:0=
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-RDEPEND="
-	${DEPEND}
-	>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-spine/cacti-spine-1.2.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
index d70a52735b10..97df3de4d3d4 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 
 BDEPEND="sys-apps/help2man"
 DEPEND="dev-libs/openssl:=
diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest
index df5f14b0db70..c422eafb3acc 100644
--- a/net-analyzer/chronograf/Manifest
+++ b/net-analyzer/chronograf/Manifest
@@ -1,13 +1,7 @@
 AUX chronograf.confd 456 BLAKE2B 149872b15c8f52e1419a02661e65d1029275fecea68821e212e16642e61caddfbc5bd879c82f017f56cb639ef0bcbfbcb5ccd52b3af5a969004b0e0acd5dcbda SHA512 d77e008c9afcc8a8a3edc24587e5df5ffe6033458d5f6d41d0468799aca37f3f39db69acbfdf656dadd83b697c17ec5bf0a986e2115d58df5964eb8ed4e7f851
 AUX chronograf.rc 595 BLAKE2B 7f067eb786c7790dbfda0e5ff1bc0f63993b631795eb978e164b5170af66696936106f3327223a3a4bbedf416b50cf2ea9dcc13c5adfda0ca2570ad782699c08 SHA512 722fe501606a9e55d2bfaff54bc3b34992fb22bc2ccc82cb53bdbd0683bd844bebb3ea7f3148c011e4321b163866380e0528826e0e59268dd334229ba0741816
-DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9
-DIST chronograf-1.6.2.tar.gz 4585236 BLAKE2B a9861f84c1c862512fb1a5166f063a54d6a72f0eb3d175f7314ac50fd04b4f2529e18195cffa49b11a6b13483619ae7e579bc15479f8cea0698fd13cdc594677 SHA512 c4be1deed7ce4f0006cbf123faa0577909bf821581f5f263d3d474963f2541dca0092964a38626b80b5f32c11947f130aa97d37f3d673e304cea665c42bf2a32
-DIST chronograf-1.7.3.tar.gz 16319610 BLAKE2B 3d90ad33ce78b4bd939e5c016ea14b7986d8888707a8a68cd832e0826612aa984d65615301bee4d800343ecc38964103abcf72810c6390fd9cdd65542739e9ba SHA512 dd5e4805dcbe167a399b7927b976839bb99f805abc7caf0fbf9cba479647df1a681f175d7bfc48a2267312e7f89470935623f7bc5e6bcb7cf861928f3e0b2f1a
 DIST chronograf-1.8.5-gen.tar.gz 3006503 BLAKE2B a7d8409d197df5c8a539ae0c0bf0a2fa557d5f56edc491cc9f75566e7dfa3eaea24955f7e36637dba87f9fb54aa6461b83e17c539599164100076e494d208465 SHA512 c7f28644d4143883b792448a62f03f733d7fbc1ea4fa77c29af9d5f7ee6982133c98cf995e13d76a4b43deda6ac30ecf9e8fedf7f0876beb2d9dc58dde3fea68
 DIST chronograf-1.8.5.tar.gz 2208763 BLAKE2B fd5f12c5a3ed8f83016bcfb42afafc309acd642c7b6795ca43c265ee41824e9ee116238d0f56c010b3f3c777a67225c21da3179af763fc66e0f5ef87cb5cca59 SHA512 075f83f38fcfeff199ab7fc6d393cc6aafa95cd1bc7415602dc8bedb0d7203b5b70de386165ac6ba502fdd9503779016a616eb59b31a2e87a96b01ce66ecfa5c
-DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49
-DIST chronograf-gen-1.6.2.tar.gz 3263429 BLAKE2B 6b6202bfd216a7777c89f2329379df03226b0b212e720987357b66bc26c3d07212a26ed2c41991c7ee3c0eea9f3a731985697b7e4752eb3be906cbc8790a8290 SHA512 55cf76b6c33134a49deb605543ff49aeffaa3baf4262787b19afe1d3d42c2a6e66e88d031f07a2f13a214556c479daa6b40f8586b529730c924ae45bf0e85213
-DIST chronograf-gen-1.7.3.tar.gz 2893752 BLAKE2B bfbc680c3237522844b406504412dd6001eef3f93fc31df18660bb74b7e7561f44c5d3af039af62e000610f40c81e78fcde8a651a5198b4bd152fa04e93c51c7 SHA512 8120f563e0c5be8a7b8179016db72a1ff5eb7447c1124ffeb87d5c928275f3b0080f1f4d01cd9c5b0eef601852b2e3701e3b4cefda9a427bbaeaf9fc46a69ab1
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
@@ -437,8 +431,5 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip 450232 BLAKE2B 2d10520e06557fa00e94a1ccd80b9b937bcaf404f81f853a020eed606c7a297db037baf784518e060604319ba5454423e4995ab005be18ae1398c5ef16f24719 SHA512 0a15b90c2a4577cbc298a34f714660e9fdc488b1fb72b33d0ae296cb6f15a691091d5e6d3c801998b9c2b7236b163118577b2816316078d613f74cd803947534
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD chronograf-1.4.3.0.ebuild 1850 BLAKE2B 458d6135b4a0659c43f76fcc12187dcb1324f888a6554761b81d4fe8821c2aba6f55b011060e23ad9eefb367b262926caf1ffdb624e190a31ed1a8e3a91677a0 SHA512 ff41bdb1e5516b4dbdd0ef4599d04d47a3864e229def6f4cc6874f49489a4a550be9a103e72c25682177470ea4791f9b0548ccc6431224f136763eef4636fc10
-EBUILD chronograf-1.6.2.ebuild 1847 BLAKE2B c33d24b76d191474da1798d8094b60ce1d00266aa22babc8402bacc7e6967447b0fb87669bf5352192b56f7f36b8c7430185c75927969a8695ef8e9de03a04db SHA512 b0d3efafdd1bee06a46dfc445bd8f7aec68b0c3812d24179713add1f66fb014e0773d2e072e01def138412b1e133cdb8a2a28859d4dc70a6e7a4310fdfb37240
-EBUILD chronograf-1.7.3.ebuild 1863 BLAKE2B bde09415012904ee2bcc5896409ee9c5bba276ebff17855b0ed53b0348c3041212aefdb6c3101e7823cff25be2f7b7d0693e5b68ed5e3a0b54b66e778aa5b8ed SHA512 75dd951cd52ce9c93ace572a366d96fccde8560b55f42ea42d270295bbc69fce6440f99013b15c3f9c331ab4e6e6efde80d8b21f26ca25be47c4725daaf23fc2
 EBUILD chronograf-1.8.5.ebuild 23914 BLAKE2B c90502e647d7b6139e3831465c643038f46b9bc9660174047f4f0b9b562e40620ec2ddff3c65e4c68e642ab73023892c7a180878fd67deddd9f6c5314f791268 SHA512 bed580a26b9c092738be6ed34207f5b6eb00b6427c2298fec7ab7f02b0b6e74a465bdbb8aab0d9495d39c23458bb5e8500b472373c27f5341ce6e5e834bea45f
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
deleted file mode 100644
index 2b2c7163f727..000000000000
--- a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup chronograf
-	enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
-	local f
-	golang-vcs-snapshot_src_unpack
-	pushd "${S}/src/${EGO_PN}" > /dev/null || die
-	for f in ${A}; do
-		case $f in
-			${PN}-gen-*.tar.*)
-				unpack ${f}
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
-	echo "$@"
-	"$@" || die "building chronograf failed"
-	set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
-	echo "$@"
-	"$@" ||	die "building chronoctl failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
-	dodoc CHANGELOG.md
-	insinto /etc/logrotate.d
-	newins etc/scripts/logrotate chronograf
-	systemd_dounit etc/scripts/chronograf.service
-	insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
-	keepdir /var/log/chronograf
-	fowners chronograf:chronograf /var/log/chronograf
-	newconfd "${FILESDIR}"/chronograf.confd chronograf
-	newinitd "${FILESDIR}"/chronograf.rc chronograf
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "In order to use chronograf, you will need to configure"
-		einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
-	fi
-}
diff --git a/net-analyzer/chronograf/chronograf-1.6.2.ebuild b/net-analyzer/chronograf/chronograf-1.6.2.ebuild
deleted file mode 100644
index ebae27747c62..000000000000
--- a/net-analyzer/chronograf/chronograf-1.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup chronograf
-	enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
-	local f
-	golang-vcs-snapshot_src_unpack
-	pushd "${S}/src/${EGO_PN}" > /dev/null || die
-	for f in ${A}; do
-		case $f in
-			${PN}-gen-*.tar.*)
-				unpack ${f}
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
-	echo "$@"
-	"$@" || die "building chronograf failed"
-	set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
-	echo "$@"
-	"$@" ||	die "building chronoctl failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
-	dodoc CHANGELOG.md
-	insinto /etc/logrotate.d
-	newins etc/scripts/logrotate chronograf
-	systemd_dounit etc/scripts/chronograf.service
-	insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
-	keepdir /var/log/chronograf
-	fowners chronograf:chronograf /var/log/chronograf
-	newconfd "${FILESDIR}"/chronograf.confd chronograf
-	newinitd "${FILESDIR}"/chronograf.rc chronograf
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "In order to use chronograf, you will need to configure"
-		einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
-	fi
-}
diff --git a/net-analyzer/chronograf/chronograf-1.7.3.ebuild b/net-analyzer/chronograf/chronograf-1.7.3.ebuild
deleted file mode 100644
index c4eb4def22b6..000000000000
--- a/net-analyzer/chronograf/chronograf-1.7.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup chronograf
-	enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
-	local f
-	golang-vcs-snapshot_src_unpack
-	pushd "${S}/src/${EGO_PN}" > /dev/null || die
-	for f in ${A}; do
-		case $f in
-			${PN}-gen-*.tar.*)
-				unpack ${f}
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
-	echo "$@"
-	"$@" || die "building chronograf failed"
-	set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
-	echo "$@"
-	"$@" ||	die "building chronoctl failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
-	dodoc CHANGELOG.md
-	insinto /etc/logrotate.d
-	newins etc/scripts/logrotate chronograf
-	systemd_dounit etc/scripts/chronograf.service
-	insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
-	keepdir /var/log/chronograf
-	fowners chronograf:chronograf /var/log/chronograf
-	newconfd "${FILESDIR}"/chronograf.confd chronograf
-	newinitd "${FILESDIR}"/chronograf.rc chronograf
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "In order to use chronograf, you will need to configure"
-		einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
-	fi
-}
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index a72b921ae164..4c9bfee0f552 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,6 @@
 AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04
 AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b
+AUX driftnet-1.3.0-musl-stdint.patch 2867 BLAKE2B a1cc7be83902d960f980311d8ec7cdbd9c35493b519fa6c0b68f46a2f5ed51c8366e77202348895b1daafc532d02f930a1d66b1653ebf6f05de97ab7c2809bbf SHA512 701c466a303e24e53c15881bfaf5a3a50f576e1afdfd344f8da414653b39c66d7ec37acdde0ae72d2d1c4afe4c3a6e8582c6ae870e1947ea7b85945dd99a6010
 DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
-EBUILD driftnet-1.3.0.ebuild 1332 BLAKE2B 1b71ed5c7af207ac8f3db6f90c1f344c4eb1fa9c68fb154c122b5137e73303c4174ae87bdab2c2c6bc4944e82425e49b8db60ab59c99e8892c3b15a286491001 SHA512 132da1a4eba7f52abe898dddf06d7cdde1989f96da9b011de38380f352b0433df12d068102e70c0597dbbb2684c0b88662e32bae1719d0d5cf95a191fa314ce6
+EBUILD driftnet-1.3.0.ebuild 1377 BLAKE2B 7d0caf86be281988aacfd5a9febfdcd3f32741f9225757d27f414fcfd7bbe9d6b4a00c5d8e0da4a7b682eb510e3c5055813cc36887a2d23161f0aef30418abac SHA512 06cab2ae0dd763d544b82b3495da0865311bc56adfaed162ebbd7af72cc0c42e474cc054c6ece74e66c07ecd403ac1ddd205f47dcc30e4e117d0a3b240f0a707
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 9134806f0c99..3d2fa78cc783 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ DOCS="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+	"${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
new file mode 100644
index 000000000000..7261bbc80e16
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/832419
+--- a/src/media/image.c
++++ b/src/media/image.c
+@@ -11,6 +11,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include <netinet/in.h> /* ntohl */
+@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi
+ unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) {
+     unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1];
+     struct png_chunk chunk;
+-    u_int32_t datalen;
++    uint32_t datalen;
+ 
+     /* Move past the PNG header */
+     data = (buffer + PNG_SIG_LEN);
+--- a/src/network/layer2.c
++++ b/src/network/layer2.c
+@@ -12,6 +12,7 @@
+ 
+ #include "compat/compat.h"
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #ifdef __FreeBSD__
+@@ -39,7 +40,7 @@
+ struct ethhdr {
+ 	unsigned char   h_dest[ETH_ALEN];
+ 	unsigned char   h_source[ETH_ALEN];
+-	u_int16_t       h_proto;
++	uint16_t       h_proto;
+ } __attribute__((packed));
+ #endif
+ 
+@@ -55,20 +56,20 @@ struct ethhdr {
+ #endif
+ 
+ struct ieee80211_radiotap_header {
+-	u_int8_t        it_version;     /* set to 0 */
+-	u_int8_t        it_pad;
+-	u_int16_t       it_len;         /* entire length */
+-	u_int32_t       it_present;     /* fields present */
++	uint8_t        it_version;     /* set to 0 */
++	uint8_t        it_pad;
++	uint16_t       it_len;         /* entire length */
++	uint32_t       it_present;     /* fields present */
+ };
+ 
+ struct ieee80211_frame {
+-    u_int16_t fc;
+-    u_int16_t wi_duration;
+-    u_int8_t wi_add1[6];
+-    u_int8_t wi_add2[6];
+-    u_int8_t wi_add3[6];
+-    u_int16_t wi_sequenceControl;
+-    // u_int8_t wi_add4[6];
++    uint16_t fc;
++    uint16_t wi_duration;
++    uint8_t wi_add1[6];
++    uint8_t wi_add2[6];
++    uint8_t wi_add3[6];
++    uint16_t wi_sequenceControl;
++    // uint8_t wi_add4[6];
+     //unsigned int qosControl:2;
+     //unsigned int frameBody[23124];
+ };
+@@ -89,13 +90,13 @@ struct frame_control {
+ 
+ /* SNAP LLC header format */
+ struct snap_header {
+-  u_int8_t dsap;
+-  u_int8_t ssap;
+-  u_int8_t ctl;
+-  u_int8_t org1;
+-  u_int8_t org2;
+-  u_int8_t org3;
+-  u_int16_t ether_type;          /* ethernet type */
++  uint8_t dsap;
++  uint8_t ssap;
++  uint8_t ctl;
++  uint8_t org1;
++  uint8_t org2;
++  uint8_t org3;
++  uint16_t ether_type;          /* ethernet type */
+ };
+ 
+ /*
+--- a/src/network/layer3.c
++++ b/src/network/layer3.c
+@@ -12,6 +12,7 @@
+ 
+ #include "compat/compat.h"
+ 
++#include <stdint.h>
+ #include <string.h>
+ #include <assert.h>
+ 
+@@ -30,8 +31,8 @@
+ int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset,
+ 		struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp)
+ {
+-	u_int16_t *sport = NULL;
+-	u_int16_t *dport = NULL;
++	uint16_t *sport = NULL;
++	uint16_t *dport = NULL;
+ 
+ 	while (1) {
+ 		switch (nextproto) {
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index c30d89b7ed59..c57f76c0a611 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -5,9 +5,6 @@ AUX fail2ban-0.11.2-fix-systemd-test.patch 863 BLAKE2B 4f506097ceb1d62a076d695a5
 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 AUX fail2ban-0.11.2-upstream-openrc.patch 8205 BLAKE2B ee85888dbd5ed9b7aa5b8edaba7a0eff430df4677b33c37223d04b46d8b39ff29ded81be8fdd77d0e92e14654e2fb9726064772232af393a053bd3234843218b SHA512 bc4d3ba2c8c1008efe128abe07f6c5125479bf4fb5b96c38b9e5e6401da30faf1a58242b1e01e71638ff922c7e020e16b789f013a0227a8aa6f5bba232dacfd4
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2-r1.ebuild 3765 BLAKE2B 01ce7f4b17f4a0aae2961ddbb245039fa321be59ae33f2c92484727ea4fd66ef9e7256b1e47ab715b22fe1754837abcfd18d4ae99c617ff5b809133e12bd3ca2 SHA512 7b38b4e8a5c9b0e604ee713e064ec246e7d1ce1b0d07c0e04111a267672c3270b9c8f378dcac9a2f8f0f43a51d9b363d4d76da6e354cf76f9974ecad89375206
-EBUILD fail2ban-0.11.2-r2.ebuild 3821 BLAKE2B cf90d89a8f2a23750ce0b9b33cae1986c0d6068ca164be5a0f4abafffe2b9f8f6aa4ecb2d6f623c75697fb76c08025dd96696c66bfd89584a3952cd31fc4c4ec SHA512 4da2928f8ff954574978d423ca0d91420861a99b2b5defbc3561b7148e47270b680ea8dfa9a6ddc2b1d51be214844a529455c52dc5983f5bd65783d26eed53bd
-EBUILD fail2ban-0.11.2-r4.ebuild 3872 BLAKE2B 54233156803dd5e31620b7796c91e45f3ff6c47aec2eb42a9d4c1ccfb391f855ff1958736abd86842560bffdc8a8afe9bcc5a9b72b433c54dc08810b7d11f9c0 SHA512 abf696a64761fec433fb0031206197056d41337b7d3d22efe1d4f59974324f9bf9341956cb9d426e0398ea92a5159d3c8aadc833fa541e3a6351716ecda3e6ae
-EBUILD fail2ban-0.11.2.ebuild 3624 BLAKE2B d0329d4f393ff4fad9d8a89ea297d1105f50b1756448b5c22df469a01d6f2d07c87b2d0bb7d2c399235a3a06831ef4b11f1bfeaa98c47bc855837037641eee1f SHA512 87b1a06d7ea32e04fd5422bbf4f7845e318fc9938101e1e6b3a39988aa752c2a15d75cffb1c0de47ad0c3ab1202b5a32c26e2f85314b68737aebd395487e7642
+EBUILD fail2ban-0.11.2-r4.ebuild 3867 BLAKE2B 5119d5d09bb26701bb6f740759437aa4c1f52f4cff3eec90729291c5ff742ca7cd349b32d9fddddbf441b07f48c489da7e18dba5daf47f668c45c9e96aae4851 SHA512 a3dd3e4d7b8ede3606282366eeede6a5fc2b817cb7a9004476e84ac2d5dc6eb813e25abc74fa803d1f7a0349356121aa2c790b21c984a18d0a5e08edf0ac3e01
 EBUILD fail2ban-9999.ebuild 3592 BLAKE2B e012b5ac063218af64f4299b2666f2dabc1dd2a497ec049479d058b0590cf3e9531d03d6fde0373bba7f77be83df360e01469d7470637a65860e4ce4609f8ac6 SHA512 056cd95cf7673b5fbae675ebe6c9598cdd4be046003b48e843621127260275f76e98fd5367d626e580df91479e691b522ed288675144f4fe2aa3f7f062d02185
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
deleted file mode 100644
index 52bfd2a78f2a..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-			)' 'python*' )
-	)
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
-	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-	"${FILESDIR}"/${P}-fix-2to3-usage.patch
-	"${FILESDIR}"/${P}-fix-systemd-test.patch
-)
-
-python_prepare_all() {
-	# 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() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	bin/fail2ban-testcases \
-		--no-network \
-		--no-gamin \
-		--verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/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
-	dotmpfiles 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() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	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.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
deleted file mode 100644
index a8fa65da7679..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-			)' 'python*' )
-	)
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
-	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-	"${FILESDIR}"/${P}-fix-2to3-usage.patch
-	"${FILESDIR}"/${P}-fix-systemd-test.patch
-	"${FILESDIR}"/${P}-fix-py3.10-collections.patch
-)
-
-python_prepare_all() {
-	# 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() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	bin/fail2ban-testcases \
-		--no-network \
-		--no-gamin \
-		--verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/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
-	dotmpfiles 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() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	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.2-r4.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
index a86650e9d020..ffabcf3a0b71 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
deleted file mode 100644
index 967284198c14..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-			)' 'python*' )
-	)
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
-)
-
-python_prepare_all() {
-	# 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() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	bin/fail2ban-testcases \
-		--no-network \
-		--no-gamin \
-		--verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/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
-	dotmpfiles 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() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	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/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index f8bccea3cc25..fce75796e094 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -6,5 +6,5 @@ AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d
 AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740
-EBUILD flow-tools-0.68.6-r1.ebuild 1754 BLAKE2B c1cddc59766b9a6a0448c03d03d31b4e16e6ba5a46968a2f433aa3ed9ee4ba19ea65259940cabefbc36f8771b164376134a1ddc57fbca5f90ce15d7d5a34eb4e SHA512 ec59c01b456ef4beffa311bfb8d9940f7bdce1aa3cd500e9810dbf70e1534ce0bcb9e8a988213ed09584d55231f9fc31349a7cc1ef5b55f2e49d7e87917d35e3
+EBUILD flow-tools-0.68.6-r1.ebuild 1755 BLAKE2B 5b94e304a94cea01541061a6c5debc0d612cdf2a4ec109b12f18791e2f3fc9b5e5bb6f71ab7977f424566afd8c926c1b2baea082b944f695b5c397e8eb93a050 SHA512 c5846d92b608a5875f5ec38ff6adaa0de35967b7f7b4f3ec811eaf67621523e35c83db4b99490cd356f8812168dc3d5a623e68a6a3e4ff65e13934daec4a4f7d
 MISC metadata.xml 903 BLAKE2B f91098293d03c9bc8d33d7b763dd78c51483b7d11fedd8556595f727429a0654950b25eb05b96f510c718124abdb63b4ee0007e10fb8380cebe932a57b09806e SHA512 2b43b8a5c08a92cff23af3cd451b891956dd86a554422a5075e30fed1eedf72a724867efee8214120b4bfc81ba138aa4bbf2bf9a896c96c48cb1df8cfe6ca036
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index c163a391b795..6697b3256a8d 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug mysql postgres ssl static-libs"
 
 RDEPEND="
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 3049580c71ba..9a6f4fd9fa05 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,4 +1,4 @@
 AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78
 DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
-EBUILD fping-5.0.ebuild 708 BLAKE2B 575ee108895981cc84fe0c816dcb45e9a9f0772368ea3bfd8fbd22e0f321224b6608fb369974ce0879e403eac13c1a5ec173a2c8fcd75a34d172ab90931c896a SHA512 46353758ba632252ef3ed62e38a5a546209355856c77c8fc5ba59e56cafb1b8967859684f43be86505098a61866f77161e05956a41032b978c695f99de31020a
+EBUILD fping-5.0.ebuild 715 BLAKE2B c4193253823ad0979c44c4386d70a164ff66d753df75e2d34d1a96ef96d7f53fcb220bd1f82b4321cf7e37b3e674318573f31b5df4724c3cdff71c581a209bcf SHA512 c2ce5c9d20b6a3ef1dc809b5bc404e70602e67b8ca5f6ddf8f98f7e85861843e5a19a1ef8e9c55cf0201e686a08e0e296164eda958c9bb8c09f10b23fd950601
 MISC metadata.xml 356 BLAKE2B 308a6921248fe99391baf97ae9c7fc3b2bc835b34030cd92c957dd4badbe01c4c4aeff9e55436606bb5207a53c49b0b5f0b34eb1fe45b1fe1720120ee374bb21 SHA512 f250997d66eb4e35e6737ef8a490725cc7d2442eefe723e97f1ffca4863791f5e30f87902e0b5aca66bb958025f408f12a75342706db4370003cbe8efe1fbc19
diff --git a/net-analyzer/fping/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild
index da4e623accc3..36614ec7655f 100644
--- a/net-analyzer/fping/fping-5.0.ebuild
+++ b/net-analyzer/fping/fping-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 suid"
 
 FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index a82e57e1bd72..6c1fbcf4fdb0 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,4 +1,5 @@
+AUX gr-fosphor-0.0_p20200131-htmldir.patch 285 BLAKE2B 111862d2e2f2cccd8c9d2e182f7881f2692c31455aae55ca5e8ab3f34c8d4a507c39681ec0f914f9fbd4fa1dc6eba0fcee34957e94f478b8ae280d40cc14a2d3 SHA512 d814f8bc0ff7023a4a4df40346f3eea8835d874de2f4e05175a79b14580851f560b51fde0506ad3f6eb077bbf57433c6f406cc7269c6f8dee92e80fd169a2e22
 DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
-EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B b9df137d83fc10cfda6e1745f5a5c5029e419bb1372262e714889b84bd234ef61e2b4a427d2a2f720fe105ad6adb7e0d7c7ae9bb95665e89e84c21fc614c4e77 SHA512 3f3cd7057b5aaa2af2a2731e2210d886d0feb14ae99ae43fa3c8ed00f3814cd7ae306a3375177dc04e8c9dd29ee80525ef7fcc018a15b93dfb7af83afbb7d210
-EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B b9df137d83fc10cfda6e1745f5a5c5029e419bb1372262e714889b84bd234ef61e2b4a427d2a2f720fe105ad6adb7e0d7c7ae9bb95665e89e84c21fc614c4e77 SHA512 3f3cd7057b5aaa2af2a2731e2210d886d0feb14ae99ae43fa3c8ed00f3814cd7ae306a3375177dc04e8c9dd29ee80525ef7fcc018a15b93dfb7af83afbb7d210
+EBUILD gr-fosphor-0.0_p20200131-r1.ebuild 1319 BLAKE2B 32917403fc6252e9aad25341425c649bf837f080a7527f64b0f169d239855067add9715a2b84c51509fce61588b4c0e324e3c80924a7ee752922d06bc47285b6 SHA512 e5e460b40c2d0839197df8f11e8d73b23857ec752c45bc017bb5304807001aa7c31a7d99bbd3e05904dce34c1941e156dab33301e709158820ebffe1d637d8a6
+EBUILD gr-fosphor-9999.ebuild 1273 BLAKE2B b0054195c8698e5216d772bbbcf3a2fcfb91130fa6c90dc46dc6872056ab06cf555b82bd3422451282906c79fdc66ee8dd539daa9b0a94ea559d9144c8d72734 SHA512 38dbc67e32d38ee0a3b37faf584c29fe3fbf505a23b6337e5393a0002144ddbf74f8ffadc9ca3e6a1e7615449633a4dcce7f38fe1f48f70834fc84824d591a8b
 MISC metadata.xml 309 BLAKE2B 37919b71ccbab01f305f01b618c18d1eb9ec5073ea7498daee75016faa65241d6ec835cad89d3a143650d27164e04091fa3f72d028ad6dd2d8634d67656e37af SHA512 3a0cb1788a6c420b95b9ddb283d3423749254059064f50c8f7436dc1a928657e43ae732ac54a5edfab03d5c30d572b2947a04b84709b435836664013d51e35e3
diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
new file mode 100644
index 000000000000..16a4475299bf
--- /dev/null
+++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
@@ -0,0 +1,8 @@
+--- a/docs/doxygen/CMakeLists.txt
++++ b/docs/doxygen/CMakeLists.txt
+@@ -50,4 +50,4 @@
+ 
+ add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS})
+ 
+-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR})
++install(DIRECTORY ${BUILT_DIRS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
index e3c5413176f4..b26a6c758c2e 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
 else
@@ -19,18 +20,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
+RDEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cpp
 	media-libs/freetype
@@ -39,16 +34,16 @@ RDEPEND="qt5? (
 	virtual/opencl
 	virtual/opengl
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
 
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
+PATCHES=( "${FILESDIR}"/${P}-htmldir.patch )
 
 src_configure() {
 	# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +55,5 @@ src_configure() {
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_PYTHON=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index e3c5413176f4..d02fe4973709 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
 else
@@ -19,18 +20,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
+RDEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cpp
 	media-libs/freetype
@@ -39,16 +34,14 @@ RDEPEND="qt5? (
 	virtual/opencl
 	virtual/opengl
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
 
 src_configure() {
 	# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +53,5 @@ src_configure() {
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_PYTHON=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 6e022b873ac7..ad7cba0188c3 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,5 +1,5 @@
 AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8
 AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c
 DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
-EBUILD graphite-web-1.1.8-r2.ebuild 3225 BLAKE2B 1a2f0d409ebea93350b42dcd80090658078d51e1c282f54122bc216be47b660484fada307250d06e78f8f76db4a1184556cf61f8ba3ffd1ef81924c83747f0ec SHA512 d5b822054eae866ece7b864cd93f14ceef874f07acfbaa4fd2352a44563a0eefe48f6bd52c64df4cd3031044621ba9fcb2df52bad2163be231f0720fe8529a19
+EBUILD graphite-web-1.1.8-r3.ebuild 3273 BLAKE2B c8d999b3ad12098e5b85961a3750ab013477d4c4b77e09868ae0640ccdca9bf5bcc0febd025e8dcbee75e7c0c4bbc4fbd5e695885df7b6018edf36e2644d824c SHA512 57402ecd2065bbe1a4878c63ee08008a442acfab6d508fd3331b8957a5d097da103a04ee21eec06b8cba678751e07aa84907031d84d68fa85a5a8df852005e8d
 MISC metadata.xml 593 BLAKE2B 35159475d570570bde9acc2dd8d6abdf742d03ced88259125cc474f9ea2b9bfcf80c64da1dd44bcb69e55390d72c11c8aaa3b947f68571940c3b8676e6024387 SHA512 7a07c214a85f09ded5ecb5a353d96fc746c5c67f5c71f7539647651fd1519e78e1a3887a4865e9dab59d9804a9b0d801cc1ee72e0fd7225fe75273790e31e28f
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
index 933b28b75a8c..ba068f3f4c1a 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	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-4[sqlite?,${PYTHON_USEDEP}]
 	>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
 	dev-python/cairocffi[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index 8e4edbc5e51e..1e621c137bd1 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -1,9 +1,4 @@
-AUX gvm-libs-10.0.1-pid.patch 312 BLAKE2B 805c21d61dfc6bf29cab6c6dd768fe6c9249aa7613ab18f21d347d1aeab58afc4bb75d17cc62687f3fa2270a05f16c883ba5293534e84e045f1d67dc527f8194 SHA512 dc42f495f2e45687ce221ba72fbdde4ca8fec11b4e55a46dd011e0d7169d5b20e1ba4473aa33180c698b655fce25fac2f8c6283fde04137b43c9c16af34eec43
 AUX gvm-libs-20.8.1-disable-automagic-dep.patch 961 BLAKE2B 5a233bfd45a6a3d165c6b836ba29e754dd1186f5fb703f333e6130e4e28d17e165e88fa22797c957d6720f1594e8381dabd9584fdbb4bdab66424752fcc305dc SHA512 07f355dc640cbeb16945ab0d51f5e550b1186c94dd60c500bc26fa90ab5fa7f132b80e0427be416e551b8173d88ed9bbfffc500e9b0183d8b9724420a6ff1176
-DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206
-DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46
 DIST gvm-libs-20.8.1.tar.gz 267872 BLAKE2B ec0979bba5e88692375fcdcdbd1c1b47c2d93e1d1c911884b77e0d81028bd6b587dac5f8aaae7439cbd1f594ec3c5708510bc2e356cadaefee221a11a1982efa SHA512 846b062b849688019715cbff1d6c4f6a1b4dd8c58cfdef78ea08df3cd104810e9091385cca3c49618538a28c42c0fe78a38fb934fbde604aef86e84c4f2dda94
-EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428
-EBUILD gvm-libs-11.0.1.ebuild 2012 BLAKE2B f06bd1453f0331ed32404ea69a07187cffa26ebdc1a0a4844ef9a0b9ee9dff237356968062a343ab25e531fc0b4265835cac43f8038881f00f7eeb4e66ddcf79 SHA512 761366c5a35346856af9d4afee8d3899581c4e47662d8a7321cd207cc989e42eb424f8817adbdc2dadb760e9f596d532af7cbc3c3ac4701483eb5624b6eafa91
 EBUILD gvm-libs-20.8.1.ebuild 2486 BLAKE2B 19d767651ba4a0f250fd317847b75f52581c15bf0ac60c6e7bce425893a353b54e5b26143444aac480d89c0131e2eb44a8e048a29badb6aa54a4992870ad8c22 SHA512 56c1c38c7cf5be19ea672904c5351958d701e652fd20ba8ab2425520b25531653e3423a009af39392532110c8c8c0a65539ffd1bf2948bbfb05e264620cc18da
 MISC metadata.xml 813 BLAKE2B f7efb12c1903314286761df7b503835f71134ec4290271218b722b55145ac0731d74557da24702b4bc4143ba77101bc92522363dc191ea174211771243af4abf SHA512 6568859f81846cd9be1412b16cd29c23af7127838bf891b594ee18854afac2cd3236be7ed197d7080737661a38b9b28ef155370945ea2399eb103d6281257ba3
diff --git a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
deleted file mode 100644
index 29c2a4cd83a6..000000000000
--- a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2019-04-05 11:27:07.000000000 +0300
-+++ b/CMakeLists.txt	2019-07-14 23:42:42.723081614 +0300
-@@ -172,7 +172,7 @@
- endif (NOT DATADIR)
- 
- if (NOT GVM_PID_DIR)
--  set (GVM_PID_DIR "${LOCALSTATEDIR}/run")
-+  set (GVM_PID_DIR "/var/lib/gvm")
- endif (NOT GVM_PID_DIR)
- 
- if (NOT GVM_SYSCONF_DIR)
diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
deleted file mode 100644
index ebcbd5996319..000000000000
--- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic toolchain-funcs user
-
-DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras ldap radius"
-
-DEPEND="
-	app-crypt/gpgme:=
-	dev-libs/hiredis
-	dev-libs/libgcrypt:=
-	dev-perl/UUID
-	net-libs/gnutls:=
-	net-libs/libssh:=
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	radius? ( net-dialup/freeradius-client )"
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-perl/CGI
-		  dev-perl/SQL-Translator
-	)"
-
-PATCHES=(
-	# Creating pid on build time instead of relying daemon!
-	# QA fix for 10.0.1.
-	"${FILESDIR}/${P}-pid.patch"
-)
-
-pkg_setup() {
-	enewgroup gvm 495
-	enewuser gvm 495 -1 /var/lib/gvm gvm
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove doxygen warnings for !CLANG
-	if use extras; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-		$(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1)
-	)
-	# Add release hardening flags for 10.0.1
-	append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
-	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use extras; then
-		cmake_build -C "${BUILD_DIR}" doc
-		cmake_build doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_build rebuild_cache
-}
-
-src_install() {
-	cmake_src_install
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/gvm
-	fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild
deleted file mode 100644
index 07801678f816..000000000000
--- a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras ldap test radius"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	dev-libs/glib
-	dev-libs/hiredis
-	dev-libs/libgcrypt:=
-	dev-perl/UUID
-	net-libs/gnutls:=
-	net-libs/libssh:=
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	radius? ( net-dialup/freeradius-client )"
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	dev-vcs/git
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? (
-		app-doc/doxygen[dot]
-		app-doc/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-	)
-	test? ( dev-libs/cgreen )"
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove doxygen warnings for !CLANG
-	if use extras; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DGVM_PID_DIR=${EPREFIX}/var/lib/gvm"
-		"-DBUILD_TESTS=$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use extras; then
-		cmake_build -C "${BUILD_DIR}" doc
-		cmake_build doc-full -C "${BUILD_DIR}" doc
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use extras; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/gvm
-	fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 46b811d53a5a..3c648552e584 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,5 +1,5 @@
 AUX httping-2.2.1-flags.patch 161 BLAKE2B be0f5f8df2fd89f46f15b3ef6c0c06e9f04573a822a6ce6e559471e3db586d69de0e440e3b9c4f401f30ab741d9eb85077ead8d3f9d4c026e7398609602f7c2e SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6
 DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355
-EBUILD httping-2.5.ebuild 1560 BLAKE2B 3dc0a7aea896284679d038846a704219136eb3d768188007bea4f07cbda0ad703b3db4e187c6498c6abf449eb99b44553bb6f868759f174fadac31fc7498ce6a SHA512 e7d99142fcb82609ac1a468d99ea9f87bc9a10a4503f348fd94136958a082e9d0fdd6c044c10e57641c450dd483bf9627a371268d4cf354d4a95e35260d68da0
+EBUILD httping-2.5.ebuild 1567 BLAKE2B 34e9626ad8c7c558d07d3607fcf9d94510a302087cb58a52bac83bfbf94e4af4b85cb0c0d97d651e658596aecd891fcf03363348eef6c4de59df3d7acee03b8f SHA512 9c52120be63efbf5e708ddf3e049175cc032811973376f64e555f4281d85bb89f57e31995e2851e35268024c34eb786087602c10a358503962bfd2e3b057b3a2
 EBUILD httping-9999999.ebuild 1506 BLAKE2B 29a2272df0be59b758ed4f5de8ad94e0305e79e7aba60a924e3ac92785352b55d5afa3d55611f1664a65beb97146eef303a2bfae95cd4d738f4e01c2db4eeae5 SHA512 b9edc81d9982e1c781488a6be16d38de7bbb0fdcc91910e276d1cc2c3f8eb20534e8f3e1d24dfcca017741fcb06297dfcf73f048d6a425428449c6f724355e8b
 MISC metadata.xml 434 BLAKE2B 100d04bbc330c6c5a7286b48b3c176468ea7d6537faee91b5d17e5f9bd8d2cce9c1ce28f5af44a8cc5ec08f986db641a70dbeeb657a505defb220f2cb8ab6e1a SHA512 797e4b174d7d27705ae0388efda386d974af8fc70e867c95684c810fbe9b6ad2b597e74fc8c4ab716f861a6cee90cddb9c394f06e60bb30be36070c87b995c98
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index b454614720f8..13b748882e33 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug fftw l10n_nl ncurses ssl +tfo"
 
 RDEPEND="
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index bbb5a266d105..db84da1ddbb5 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,5 +1,5 @@
 AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b8d9e120e698f1831e65b6d65ff7175b7cfe91cd58f117df8ac64eb05b17820ca963c078855989a5820b1d5da2c SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
-EBUILD ifstat-1.1-r2.ebuild 682 BLAKE2B 2f84fbb0374caa09801848df5bc6576ced62a07ee76287c052d725f4fd12d4ae0b5a15d46ea5a505600c4c35bcb266f42e6a0b74a7e4082e6026805db2568260 SHA512 7551ce3d83f1f83e452eab22ef099fc5827d243e5c6ba9cd8f3f70de7c1a6eafe74ef2962d89ad317ec765f9535884e2cca2d69c30a6987f5bcec665737b848e
+EBUILD ifstat-1.1-r2.ebuild 681 BLAKE2B a0bdd56bbd4e4f8b9f0821ac0ee427b8fbf61d97a91047c7e97ce9133f741cdeed11b8b4dbfe9df8e0edd97064763d8e81fc1e7f1655b0af86bf9655ccbb7b52 SHA512 e822b94c8287cd19440d7fdc0354e0d62e29a62b95c8987d01fbfdf754df780d574cbe2a4a2fc5ae1aa93d0142aa890b20059e545cd09731afeabfe704423d4e
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 6ece35858b77..5682724e0c88 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="snmp"
 
 DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index 6da609d99541..1c7b19142966 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,3 +1,3 @@
 DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09
-EBUILD ipaudit-1.0_beta2-r1.ebuild 571 BLAKE2B a63f91c105d539e8858e86a6c808fc9a08018d649567e1d23549740bf4b06e5527e4b34381c3f6c0d3bdd1b1a0c471ca76bfbe7fcb2bbec03927299325afc29f SHA512 d10451f20c62d82cefee6530879cbf588aad4c8c756d003e35a311bebda9fef3cb73fc108e019819e9d738fd864817279772bd37b91c6f4f86dc1feda7e985ae
+EBUILD ipaudit-1.0_beta2-r1.ebuild 572 BLAKE2B 3da67855fe463b17ae3fd1df3faf82e491cb38ca2f05808679a86f9fc33d850374f95cc78b86f64198831e4859e5ce0124bd40b058a34bcaadd921ed548f5ae8 SHA512 ff10e20d8ab5844822ed36a54d1d94636507af73ff4683c0e25253938491bcf9898b1658e5f60be9709488d911e80f72cdd0b6edaea24a91ee1eb37e5de544bf
 MISC metadata.xml 338 BLAKE2B 340f5c1773bbf5d3acb294d752edcc8be524d3a1bf9feacab11766f658a2a61e47da8e878ea1e1e6174d898e3d349d5f9bed0dcf6997c08e44b4fbf74d954360 SHA512 91d56934279db25b950f0f0e97983bff931a44690d416e77a673931d879a9af8274bf297c1ad6a9cb0a2682a7460ae10f31f86c155a52b4197a30c609c21ff4f
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
index fba409faf3e3..fce596bdb7e8 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_beta/BETA}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="mysql"
 DEPEND="net-libs/libpcap
 		mysql? ( dev-db/mysql-connector-c:0= )"
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index ac271e2cc460..b1a6ab52bee8 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -1,5 +1,5 @@
 AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811a7be4f600028edc11fc4c17e48f8396c34335a855299da17534a52dc89c916c890ae50a147620988b5f3c6ca8d9 SHA512 de93d97688e1079e480c138abc1a25572c47f2e045f70c98b7ba2c2098bcfffdb36997aab0a4272cbe908bead503b2531543368ac35624527cb8c0640594ad4b
 AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
-EBUILD iplog-2.2.3-r3.ebuild 702 BLAKE2B 6abe0ac6b74916e30436bb9f7bddb61e0ff63361f68c39befe0d88f335c19679640ea852e8608dd35ad21ac36ff08dde4216bca4fa512d5ac08332be7147fd09 SHA512 6e4001f8e8d268c42b62ce99ab9803de6d1c1776c7fc83af304547d25974b1ba7fc1c32953744c313a642e329eb6e89b15997d3994f47e6c5e40ff6dd1eeadc6
+EBUILD iplog-2.2.3-r3.ebuild 703 BLAKE2B 8fd9c6b6194dd53d45b3c14f8a92c34d98cc89c774b6164a90526cdd249e7713fac3a062f76921abbe6e4ba2b9933a6b31c65a574ae08e10665f47222d5848fc SHA512 f90ea03f5adebeb7224c64137d1b40c0cf0065a6b742571b19fe257bb9c47badbdab1ab084ec3fca30820994e29f380ea3755f5ecefd96c444e42247316da20b
 MISC metadata.xml 355 BLAKE2B 337b9d3630275e047ddd52222f2a94827901805a8e43cc316633048ab5ddf091f4300188d54f3eed58867b5a0f0efbbb5aa559f8182568104bb00bf2f4833afc SHA512 ae66cec4d69d91d7962a8b3b282fb429d008f6218e671d351dfae2dfc78310e066aa93e1a68dc00cd0b1ae61d0831ce6161fb5016edd6f1aa9120cb57903d384
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
index 8733fa8e1a59..991f22714b64 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 06da4645e34f..63b51814527a 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,9 +1,6 @@
-AUX iptstate-2.2.5-gentoo.patch 675 BLAKE2B e24ec3afa9c75a097d0a1d27c4e63e125b909590db52e49a8789ac66e00ea308f5e63b2f7d55a09fbc6de728db5812563ea3e31b9908386cd5ad76330b4e862b SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c
 AUX iptstate-2.2.7-respect-CPPFLAGS.patch 504 BLAKE2B 5797e1bbefcc52ad86d33ccf0665e7750ca9203f58fca7c2a2d1b254c4f9ba6e649890fee12a4ce3cd0342aedd3f58a1498d86a33af7ac5f44483aea3a56419b SHA512 97d295ca8b9dbc2cdba813b03233a3e8c3017b886a7ea037f8eac6e1d270f3fa9b1ebd1c173655bfdf8d1112849c82b3bc0e19b38f1c56585823df5d2e5990b2
 AUX iptstate-2.2.7-respect-LDFLAGS.patch 538 BLAKE2B 07603b7b06d7bfad425f77c9b053ee22df1cd97278356f49e036114d98747460054c19985bfd1dbc58477ab58c50db1674eac728d5be8ae1c463c5b21262ef11 SHA512 741e01d40a42a488fed95833b17a42b30772d512f07467ecbedf19b55d6f0985e87550e2a1873c02c500349ea2a72c0e278c9fdb550741087c7d84de14374f0e
 AUX iptstate-2.2.7-use-pkg-config.patch 704 BLAKE2B d57febf25748c8b94ac892d7fed1c3c9765bab730163fa8e101a79927bbf2fef19ae2935b9dff170970fd6038c175df5a52a335536be68d29a472db146cfe59a SHA512 dd886bbe30c16b3bb2cb85c873780cd9edee6eb0a90fbbd2bfe5bfa16de237c7c1f33df0cee84cac17bc00cf3ff579f378d0d0114c94ecdefcb4cf44f73c2102
-DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
 DIST iptstate-2.2.7.tar.bz2 29994 BLAKE2B 0be657d4452b40b1835279bfa141b94e3db7adeeba141dede8456c64e4847efbb23197afab7e2452c9ad84c1be5eaffa1d9f7da15a5aaeb0c6fb28c1d62d6733 SHA512 43e258639e0f728d4a393d2dd7a834a6df1131da5291559a504800a0918dad3e010baaeb1bca66cb9a62bad6955f678be3302aac916fc956a525cdd7e9d0690a
-EBUILD iptstate-2.2.6.ebuild 778 BLAKE2B 253e3316bf2dba271b93c401b40588a70049a4aa4e758557e86fe22d4528cebbb9f06717e6fc6143ebd99fef296f9dd0ab111870aff7e38112cab583a7e1606b SHA512 9b13e2253bc7cfd1adf7e95c19064c73f933b683245f32e0cba10148ee827d5fefbb96ee5c898cecb7a5d4c51da36f724938a1087823f13c13f979674b81b5c6
-EBUILD iptstate-2.2.7.ebuild 884 BLAKE2B 04eb6257a8f8b19b61f711c3dab97603694bc5c6829d44f0430d48027da7920fb226725d37e43affa9f8dad13158697a701fa8e38e2663145102f5a8af1ce52b SHA512 6f4c5a1765c91d89436bd0152a930bd6d391b8b1d85d97930f8bdbd86ad2417b57179b649c87d001281c2b97e20b30010d6ba0bf5d12bc3e80debb65d9734b20
+EBUILD iptstate-2.2.7.ebuild 882 BLAKE2B 81ff5eb5a3f50d8ddfc7c2b8b3968f1cbb69aba32848ef3680b26cf0e4f62a8878a7d8faa8581e7310b8f33d1c56881bb856b23b3820be243c4f9c60727e1030 SHA512 c2e0e0374b062c4135178f0d1e193968117288c366491436367bb6ff6fb7a5e221e267dc116d1b24d3610243da0033e72299509e26b3969042cae933b678cd2a
 MISC metadata.xml 414 BLAKE2B 614d653c3ef40f47c7b2eb9e2713091f5ff0dcf7ee1f849a22b69c1b72357c0267def97acd94d3409f45fec58f1b2c4473ea79f2357d6f61d28d0a32bdf41150 SHA512 e0a0666e076c9b275398947a0a13a7a2403a0a067536541d42c26d399cb2c56c1827ca202d253113b3d87b507fee2bbd01f8a7f33baa72cf35602daf0786b23c
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
deleted file mode 100644
index fdaeeb7867b2..000000000000
--- a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -17,12 +17,11 @@
- ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS
- 
- CXX?= g++
--CXXFLAGS?= -g -Wall -O2
-+CXXFLAGS+= -Wall
- CXXFILES?= iptstate.cc
- 
- # THIS IS FOR NORMAL COMPILATION
--LIBS?= -lncurses -lnetfilter_conntrack
--CPPFLAGS=
-+LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
- 
- ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
- 
-@@ -45,7 +44,7 @@
- 	echo "+------------------------------------------------------------+" ;\
- 	echo "";
- 
--	$(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS)
- 	@touch iptstate
- 
- 	@\
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
deleted file mode 100644
index 0f85670270ce..000000000000
--- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate"
-SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-	>=net-libs/libnetfilter_conntrack-0.0.50
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.5-gentoo.patch
-)
-
-src_prepare() {
-	default
-	tc-export CXX PKG_CONFIG
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr install
-	dodoc BUGS Changelog CONTRIB README.md WISHLIST
-}
diff --git a/net-analyzer/iptstate/iptstate-2.2.7.ebuild b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
index 4d851b9e14b3..8ac212c6fb01 100644
--- a/net-analyzer/iptstate/iptstate-2.2.7.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:=
 	>=net-libs/libnetfilter_conntrack-0.0.50"
diff --git a/net-analyzer/jmx2munin/Manifest b/net-analyzer/jmx2munin/Manifest
deleted file mode 100644
index f56893cdc711..000000000000
--- a/net-analyzer/jmx2munin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jmx2munin-gentoo-1.0_p20120811.tar.gz 6890 BLAKE2B f28622405cf76cfd6effd4a86a1994e921eb71afced8e0c9c167422fc20378b607b63d7b93add0b816b21a8dc3c9504a4c406ea17f3db159dfd9f4aea440ac32 SHA512 154817d63fb278970d04785821a29833007a553055efe28aa6a3654d01b7a4422a2a1c98cd1693ae52ea28a57505b6d7988f241f6d119425f5c3ae38471b72be
-EBUILD jmx2munin-1.0_p20120811-r1.ebuild 1042 BLAKE2B 5bb927aa335dcb7fde3886afe465fbcdb2d4e92c14d8ddfc714d53db0756261a5107eecb407ec4248699a142973589afaf2b816787ee4d6f90404e527478fa8e SHA512 fec90b91b98934c2cc2d637aa553031f8027908362bd2cbd1cf427a199110dc05b8583749a3820e3afb2b5e104d1fd500bf90db9e4ce5566bd7964c18ec23d0d
-MISC metadata.xml 454 BLAKE2B 26cc94b05ba2c219526317bf7ede1d5911c60450dee1e68554142552a8790d7350e77f09d16d1f56f2fadb2f34ccd37dda60ae2e050ce66fe182b09c70a0025a SHA512 4186ca269179b2788b95c2b42291c5319dd09c8297f5797999a7636795a6d45c9cdbe9714110f4e60d9774cfbe6a644982d61b06fe5e47f387fc071d7acd9b2d
diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
deleted file mode 100644
index ad8601a5fcc0..000000000000
--- a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-gentoo-${PV}"
-
-DESCRIPTION="JMX Monitoring plugin for Munin"
-HOMEPAGE="https://github.com/tcurdt/jmx2munin"
-SRC_URI="https://github.com/gentoo/jmx2munin/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-java/jcommander:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
-	net-analyzer/munin
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src/main/java/org/vafer/jmx"
-JAVA_GENTOO_CLASSPATH="jcommander"
-
-src_unpack() {
-	unpack ${A}
-	mv gentoo-${PN}-* ${MY_P}
-}
-
-java_prepare() {
-	rm pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.vafer.jmx.munin.Munin
-
-	exeinto /usr/libexec/munin/plugins
-	newexe contrib/${PN}.sh ${PN}_
-
-	dodoc README.md contrib/jmx2munin.cfg/cassandra/nodes_in_cluster
-
-	keepdir /etc/munin/${PN}
-}
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
deleted file mode 100644
index 1a01a3529a12..000000000000
--- a/net-analyzer/jmx2munin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sysadmin@gentoo.org</email>
-    <name>Gentoo Sysadmin Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gentoo/jmx2munin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 55410a315e33..b25ef9824b56 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,8 +1,6 @@
 AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac9815c6e20fcd0c32cbd3ee149746dccff2a89f9113243cfe56d5fee66417f07289450c43e089502c270572e5bd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
 AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
-DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
 DIST mrtg-2.17.8.tar.gz 1102598 BLAKE2B d5d513de641087f6daa207f154bbcca0196ccc8cba79a03ad6916c9c0065980745be3746953063127fc017d57e235ff67252531380fc9f68c9e5c3332d5230ce SHA512 c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa
-EBUILD mrtg-2.17.7.ebuild 1000 BLAKE2B eb96514a135aa3f18b71031ce515dfdfa940c0e0119fe85e6b270ea8eae246b1c6bed9ccd96fadc6109e08c57e1d51618291425a71fc7e0af8c264e49794cb42 SHA512 0d0b189cb3be46b6bbb849d9aa7708848f33f38b9a6ca51140313526a9d79334dbddd3f5d7b58faec726f317e615eade15fe3e59debc3e42b638b6d35468be07
-EBUILD mrtg-2.17.8.ebuild 1005 BLAKE2B 0d472a87f362a050258791fc1e6dc98ce20d1b7fd885d715b794dd89d58022d2867470e24bd38d1e51c1ad6ad8805324c62491d9e546117d1ab492941fe64d08 SHA512 bafa028092fb2b475805e7c87b92f97c5501f200331c8a775572ae7dfc94bc94df726bb378e5a6227755cdf31aeabeb4baee663127686db75d5e76576a0c37a5
+EBUILD mrtg-2.17.8.ebuild 1000 BLAKE2B 3dd5d520a2058399fac30ca9592501a4cdc6d3db10d13cbc456c1b55d4f50bdb02c49010d22fae63c65b53a285fedfb094bed7a618722ab5865e20c11670f75b SHA512 bd1386919c908037f4814f7727c5b7dbdef66aeb8711c9221eaca174a96b3918f67f058cac07d56a4414031d4d037c93f952bfb146a6a6ee0a2c071e818ad35a
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
deleted file mode 100644
index e63814c2ef96..000000000000
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="https://oss.oetiker.ch/mrtg/"
-SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-perl/SNMP_Session-1.13-r2
-	>=dev-perl/Socket6-0.23
-	dev-lang/perl
-	media-libs/gd[png]
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-mrtg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17.4-socket6.patch
-)
-
-src_prepare() {
-	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
-
-	sed -i \
-		-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
-		$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
-
-	default
-}
-
-src_install() {
-	keepdir /var/lib/mrtg
-
-	default
-
-	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
-
-	newinitd "${FILESDIR}/mrtg.rc" ${PN}
-	newconfd "${FILESDIR}/mrtg.confd" ${PN}
-}
diff --git a/net-analyzer/mrtg/mrtg-2.17.8.ebuild b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
index ad7a69595c27..83edb448022d 100644
--- a/net-analyzer/mrtg/mrtg-2.17.8.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${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"
 
 DEPEND="
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 10ccacde0bf5..cc0db528fe5a 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -2,6 +2,6 @@ AUX mtr-0.88-tinfo.patch 494 BLAKE2B 5eba829ab106aa74799780da890b39a37f69a0cb2cf
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
 DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
 EBUILD mtr-0.94-r1.ebuild 1435 BLAKE2B 1d4a682c1a98d639deccbba5af331fa1a56894c46a701767bc63f19f54cb97dae0c1d42c5ef70719782ad5210be41fbc702e3ef55e1286b98d37cc322cf8d0db SHA512 bcdcfac855318bee2063247d1413f20306fe9b0687242820fab39bff1825aa3b5e3e4bc336745dc90e9920beaafeb3e87654b94401224244d82eb433bd1d9769
-EBUILD mtr-0.95.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
+EBUILD mtr-0.95.ebuild 1552 BLAKE2B 2332a9d6e582d72b7545220001b6be3dc9fab9588c8a30727db57d3a778ec9778051c2c6963c28259658574498a84ba737b13eb073fbebba4a2414fd62da6079 SHA512 303c980eabbae6686cd6343db52060453d82f3a2505865772441f8d47f6fe75c6bd8fcf291744a906aed3755be7b6582990379c5d28d8c2c92df3f56fe2effa8
 EBUILD mtr-9999.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2
diff --git a/net-analyzer/mtr/mtr-0.95.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
index 42b6aeb30b04..9bfb694f0a20 100644
--- a/net-analyzer/mtr/mtr-0.95.ebuild
+++ b/net-analyzer/mtr/mtr-0.95.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 06ee7657b85a..3daaf6ff6c1d 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -13,6 +13,5 @@ AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa2
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
 DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
-EBUILD munin-2.0.67-r6.ebuild 12294 BLAKE2B e671fe2f048d8bc5fb25920de9cddd4fcbc8fc1f48145b50cb68c78afd7ebfe856d6e2d7ecb6ac7756aa6f599d3b555abcc07d28e2b72d2094db711515ed88f2 SHA512 0ffc4b4d8500bef896caf1574b9eb9e62bfdaf6d55fa0c660b5e66f02158b58ee65e052edd9b0773a40d7b3691cbefa710e9c1ed57a30556ebdafb8c26fbbe7c
-EBUILD munin-2.0.67-r7.ebuild 12206 BLAKE2B c5acf7bba358087ff1063db553b6583954339f610caf272cb4f5378c6be138ecc94b6cb6150c0ed600e86a5d898749b7a1b64d4f05ecc351c62bf6b3c90cf52b SHA512 156281bb0393c3316bb5a6cefd2354635caab1b028aa51e2569dda9ec475271a26bc22941b8ea396812535383dbad3965c3a49805d326a303ed3cd2d71fca8cd
+EBUILD munin-2.0.67-r7.ebuild 12201 BLAKE2B 335dd1b80c04d3f54ee725385b9d72f767e4661885ca47391cdb92e85ee1f12b721f5ddfcb28c582857372f09dc8cf17c7e6f33649f20e8e590bf5b595dae894 SHA512 aa599ca69388d3e7bbfb5271c34bb53fe3315370a4dc6e34cf2b55cf2fcccfa143a1d94e81525cf3ef30e6096fb82dba1e59a793c0bba37e3b42369021c17528
 MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c
diff --git a/net-analyzer/munin/munin-2.0.67-r6.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild
deleted file mode 100644
index fe50e885c3ad..000000000000
--- a/net-analyzer/munin/munin-2.0.67-r6.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd tmpfiles
-
-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.8 )
-	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.8:*
-			|| ( 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 || die
-	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
-
-	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
-	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() {
-	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
-
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild
index 00a940ba1b5f..08d21fe6d7bd 100644
--- a/net-analyzer/munin/munin-2.0.67-r7.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index a9294d6ff02f..fbb79784a13d 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,5 +1,3 @@
 DIST check_ipmi_sensor_v3-3.13.tar.gz 27079 BLAKE2B 19f2eddeeb43a73eb8faa2907b53f2b0514a19a3313e90487082c463ef12a128cb3b252457768c1afcacd06402b572f54cab7c05d159df4e6f7881b191663046 SHA512 b117ca13936e8c2201f3262302004bd0f903d19ee7289222962ee6b53119ba8306cdf355292c63b9d7639d850bd59c24b2875ccb8b3c408bdac60d144837e97a
-DIST check_ipmi_sensor_v3-8120430.tgz 20620 BLAKE2B 2542c4320498700362e8e7c1cfe0d00d98e4894e987aac002f0e2db499fdab4c27b33ff587349a836ae18d7b89939a96f6a66484b46486caa0d548c3e794d1c3 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845
-EBUILD nagios-check_ipmi_sensor-3.13.ebuild 671 BLAKE2B 81ef246aa7eb6996ce36de9644f347b46df1e22520aad3c23b598df85516f43307fb144944f4a156884f7a5e54db4f6e3e17ff9c59865538ca7de2151c74ad8f SHA512 10f153521e775a27dc8d1b7d63bb2baae27c8ebbd904885aaa2cf76c380a8eee627a1b906a1b187f757488233d476f401af1183443737e17286aa917c724477c
-EBUILD nagios-check_ipmi_sensor-3.2.ebuild 726 BLAKE2B 9a31d82b21b3ddbdf3dcb8b2af2555d021e31186829cff03d2edeef899067d891f73e7a27d4266cf38b62422cb37ca2e204349ac62996287d222bd294a690eb0 SHA512 3271a9c4140af4c020d820ccc4e11196bd44ad472e51f017786ba30f8c53b6f28a84cceb9b3c4318b71df368042c1b168d90bcfcab18a257879bc6eb56d35288
+EBUILD nagios-check_ipmi_sensor-3.13.ebuild 650 BLAKE2B c28f0b0817d90feeb0657e4d0206b18220f38257a61519664d1ec961ae3f450ebede1c13b33b7dc5c9aa62399a2d6458b33f976eb6882ff7b0225e972abc92e1 SHA512 d97c87356efb6716912a56979348250df83823548937d0be8a19b017035ef43132dd6c144aa3a0c9a1482dfab134a8b4b344524df088b27574fc973bafa8924b
 MISC metadata.xml 370 BLAKE2B 18dbfd7fddf9fb369b09a2fcb745078e6a65fc2ce92a85c1af54c0c15d0c3d66484a6c2ad36036ba43365643a9f0b375bbf13c77b0544d3fb59df7df5b5b25c6 SHA512 49603b8a1607d8d150d5024932ab3ff86204131b173e328a84c38457c57a648e8b4d436d767a242edb6fc6926d131abe977846e73ac17c5cbbb9cc9c10c11437
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
index 4c846630fe6d..994a1a52d408 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib
-
 MY_P="${PN#nagios-}_v$(ver_cut 1)-${PV}"
 
 DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
@@ -13,7 +11,7 @@ SRC_URI="https://github.com/thomas-krenn/check_ipmi_sensor_v3/archive/refs/tags/
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
deleted file mode 100644
index 37653d213a53..000000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib versionator
-
-MY_COMMIT="8120430"
-MY_P="${PN#nagios-}_v$(get_major_version ${PV})-${MY_COMMIT}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/IPC-Run
-	sys-libs/freeipmi"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe check_ipmi_sensor
-
-	dodoc changelog.txt
-}
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
index 083ffcfc1701..2b593a3076dd 100644
--- a/net-analyzer/nagios-check_logfiles/Manifest
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -1,3 +1,5 @@
 DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91
+DIST nagios-check_logfiles-4.0.1.3.tar.gz 254371 BLAKE2B d4219e03ac2b981b08866baa4eab4fb16857215cb817ee44f23690094a3b29bf806caa6c1cd98c439ba81fa31cd63ce1fcfca5c92d1aad260490db087a560fd7 SHA512 1893e67d9b27939fae6f330b1f796e98becbb1c4bd1dfe11811236b0d9bcdab0b2fea2a49f7b90302d15c75328422f479d1a26a486cfbe1ec0d3b8f9b71a5150
 EBUILD nagios-check_logfiles-3.7.6.3.ebuild 665 BLAKE2B 2fb51740ef6962499caee6bb22c720fb99331d4c0fbef9e2ca5d9606c26d6f9078e6bb22e26717b5abcbcd3ed4bf7093e41e44b63befec1a1cd833171af51092 SHA512 61c6bbcb2ea40f575f53259bf97638c7966e62153fc0c6d20116b2475c93368b8fbe3beb708307689f55f6fc6634d28f25a71f04c43b1b9fb2af2fcfabaec8f1
+EBUILD nagios-check_logfiles-4.0.1.3.ebuild 665 BLAKE2B 8811d3bc68c6057a3984f09be7dd691a6a6672ec30fdd7c1806c6935a4e32a7406e560b3cafad9c6d1dde017c15579343329e835ada222a8fc489412e5a188da SHA512 321d9b1a2024ab2dbf4efe3ebd652fbf02c0f2bede08bd6f222ea1ca3b6de6ad2ce38280fef6dce1e87f764f21ef0823f9a7895a537bde4870e1c0593fdd77d6
 MISC metadata.xml 261 BLAKE2B d10a6cff4ddbb4023d1088dc2da1259de0bc679eccdbdd83a2e056b42c3b37a2d1b39ae62e1b7f825e5ffec1956088c4fe5de6f2c07ff46585d56fd9ade7be3e SHA512 a7b0772ebf944cebfbef2086a385636b1331a565a81ac6918273b16a0b3576a8602121c58e30007cb93b64a81df19987fa28d97b9235ab36deb14db003e1695b
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
new file mode 100644
index 000000000000..f32c1802c024
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A nagios plugin for checking logfiles"
+HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html"
+
+MY_P=${P/nagios-/}
+
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="${EPREFIX}/etc/nagios"
+}
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 7e56aedb47bc..4a9ecd2dd491 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,3 +1,5 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
+DIST check_rbl-1.6.3.tar.gz 50250 BLAKE2B cdaaf7252871c6a2cf34a1cacef36251b8526b73f4edb73fc1611a3426f350523928532bc78068438b8e71ec0e023da46749673aa5e9e1d5c6cd8b889f330305 SHA512 2fc84089eb9e41657f522aa7813776b3d46811759e177d031ff5d2f737d63c00897d50d5d878c1e5d5368ca1dde0b173e81b8a6f16fbb970270ef63d988add9b
 EBUILD nagios-check_rbl-1.4.1.ebuild 1483 BLAKE2B 225aa6cbc698bdc7e6346195e896277dcd2f71730d28fdc4274b30573c41bbb7ec644d8f5804765fd93b71cd2f8e1b38643314498a761249b655648ad1587c26 SHA512 da8f812cec89631714719ad52fa7b065915b3e02568001e2bca277ee9a4556d74f8c6c1a6888a2ec13bc3d55cad9cce98af850e8cfddec1bd508da92047e2380
+EBUILD nagios-check_rbl-1.6.3.ebuild 1542 BLAKE2B 0739c60f746bc151a7350521509f05184ac2953356dac6179aa388adf5d875c5ed269e1e1d1d6e699c91a7d3baeb367b091971f74ce4350bf03024fbc593073b SHA512 17ecb5c8851ebe6e63ecce15f84aafef5a034b2afc6d86b36409d4e0005c6b0a7d0c2002d1ae21394d9667c2ac8ad9a3e71616e777cc3f9c56a6b0c10caf3b18
 MISC metadata.xml 469 BLAKE2B fbdd218961dcf07ca906741000ed4268491946520ed7ff6920b50a2ed70676e0fd68b63d39426c7cfdfd177c8ad70c2228736e2b2ccdecb4db1c72f686f9417f SHA512 e72d2be36e83f2691bd5d6f491a79616bed686d03ef02f33aa8d80db55f08f876a31cc3822615a5eeb5df03f7ed2e93146de20d185acf795955cc2cd6e38adf5
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
new file mode 100644
index 000000000000..ada2a30fe7af
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Monitor whether or not a host is blacklisted"
+HOMEPAGE="https://github.com/matteocorti/check_rbl"
+
+MY_P="${P/nagios-/}"
+SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+# No, this is not redundant -- see bug 627082.
+RESTRICT=test
+
+# The package's INSTALL/Makefile.PL files specify its dependencies.
+#
+#   * Data::Validate::Domain (dev-perl/Data-Validate-Domain)
+#   * Data::Validate::IP (dev-perl/Data-Validate-IP)
+#   * IO::Select (dev-lang/perl)
+#   * Monitoring::Plugin (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin)
+#   * Net::DNS (dev-perl/Net-DNS)
+#   * Net::IP (dev-perl/Net-IP)
+#   * Readonly (dev-perl/Readonly)
+#   * Socket (virtual/perl-Socket)
+#
+RDEPEND="dev-lang/perl
+	dev-perl/Data-Validate-Domain
+	dev-perl/Data-Validate-IP
+	dev-perl/Monitoring-Plugin
+	dev-perl/Net-DNS
+	dev-perl/Net-IP
+	dev-perl/Readonly
+	virtual/perl-Socket"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	perl Makefile.PL INSTALLDIRS=vendor || die
+}
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+	# It's simplest to move this file after it's been installed.
+	dodir "${nagiosplugindir}"
+	mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 83acf20be013..f636590d5924 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,6 +2,6 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 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.6-r2.ebuild 9353 BLAKE2B b8d8a8ba322403d2b5abbded84fee017924f89a1a075be01e48d8b70707712ffff8b6b5f54db6c15a9743cec716234d14a734b5325fd09e427545be58a46bd6e SHA512 1169813389640bef4270ba7f31468d19dc17124434d9c04d6ea9f8fb3c998493da1dfc87a3fb4697ad5c8e5cdc5e960e60b1740bcbe4dc7611cbf2803401301f
+EBUILD nagios-core-4.4.6-r2.ebuild 9354 BLAKE2B 34d649f01452372886d2c8fb2675515a2d6266451368b6470650cf0082cca866504d81f93b18dd7f03faf497f959a994358e85e2fdddb6dedbd0b9d05ba72e91 SHA512 b6a853fc4d7300f745ca8271a8ea4af93b4cf63dfff8343d28e17676be85d227623e577888c645636dafbec0c5859befc0933b8f4d4805773fa404fce7a1b3e3
 EBUILD nagios-core-4.4.6-r3.ebuild 9243 BLAKE2B 0f21e7a068e3b146f2d44acd0f4663c4e8c114aecbbde52842acc3c10c2e8ae0a5eb7006bcff9210cce96d8448ad60a0e145661f3a442a3b537016044d4d0425 SHA512 d96facbbfb8093145618a413fdc3918153a6eedbf9a70147202e66ce2e5b99035e11386d7775210a4bc61954391f9db9809af8bc9837656bab968d913f0195e3
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index 6cbbe87c6841..d868bf041bd4 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+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
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index f681286ebb27..1663cc94a087 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD nagios-plugin-check_raid-4.0.10-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726
-EBUILD nagios-plugin-check_raid-4.0.8-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726
-MISC metadata.xml 1135 BLAKE2B 7c88fa7b5240f5a6711872565cfd5494455e32e414a55f3ba0fe2b0d73a48443f913131d6767f9a00cfd35c1787ff68d9a4720c73a1f263541ced1b910c01971 SHA512 5c5a3b8ac1b3b5692e34651805186acdff10d73722830d1486a9fae86353a2ad8c215341df1cc0e7970d4cf56d007655357b589430081468cde7bc71c3e53d6c
+EBUILD nagios-plugin-check_raid-4.0.10-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
+EBUILD nagios-plugin-check_raid-4.0.8-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
+MISC metadata.xml 1061 BLAKE2B 1aff6dfaf869ceb1ad828a45c58c4ed1645cdff139822e781753552e612dcd48f9533ee644808530e696a33fe02b7aeb3935be7f320d8400e9c9bf9621c0782d SHA512 3022372191de1bd349f9b7f22ed1d17dbde5dd56cbcef2cf9770c06ebae8a59b48cc9cfc9b050f90640a2c48088dd5dfa384d304f6dbd27ada1ac626b39a2a97
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
index 2ce7209ce36d..92b1823c07b8 100644
--- a/net-analyzer/nagios-plugin-check_raid/metadata.xml
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="hpa">Support HP Array controllers</flag>
 		<flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag>
 		<flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag>
-		<flag name="megaraid-scsi">Support LSI MegaRAID SCSI controllers</flag>
 		<flag name="mpt-sas2">Support LSI SAS-2 controllers</flag>
 		<flag name="mpt">Support LSI MPT Fusion controllers</flag>
 	</use>
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild
index eaf055e9fadc..d0caa68e4912 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
+IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
 
 DEPEND="dev-perl/Monitoring-Plugin
 		dev-perl/Module-Pluggable"
@@ -28,7 +28,6 @@ RDEPEND="${DEPEND}
 		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 )
 "
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
index eaf055e9fadc..d0caa68e4912 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
+IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
 
 DEPEND="dev-perl/Monitoring-Plugin
 		dev-perl/Module-Pluggable"
@@ -28,7 +28,6 @@ RDEPEND="${DEPEND}
 		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 )
 "
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index f5b6f8624180..6b31d1051133 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,6 +2,6 @@ AUX check_smtp-implicit-tls.patch 4817 BLAKE2B 0a163150461b1c57892ae5802534ecc10
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
 DIST nagios-plugins-2.3.3.tar.gz 2782610 BLAKE2B f02ded0ed6d5c649a82fe7fe06e393b404fc6e9a260365b128c114381d411d93c8980fee6da73c4d03ab73669d5b8754225ff5aa14ef4430ee0c91d8c56cb131 SHA512 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
-EBUILD nagios-plugins-2.3.1-r2.ebuild 2988 BLAKE2B eed5cd61029d772a28a588f8ca59e5466e41fe4ea7ee5a8fc2defa106ddceead9eea43958e8c88ad5442aa063d8b1ca7369e76271ba4f57fe5591152366cf7a7 SHA512 edca196a5d78b9d37129175336df433576872d532188324d2efff4bb438477c0d65f09f7c183b5a1cfdabd3b8fe0eded18637376e9b20cae575c07c62be4f40d
+EBUILD nagios-plugins-2.3.1-r2.ebuild 2989 BLAKE2B e155e65319fe798a739057b5d2c21e22bd24bb7422b5ecba9ba6079e0f2d5edbc9c8dc2967a56744f4037e4926d9064c49a9f5bcb52091071e9db6703f7296f7 SHA512 980df52656b09fcda6c6489b950a532b0597d891fc1450990a16b897b44cee093092efc72292a55e086a1f5d3c9af38d7572f899f6d4b18f67956dd946c7a5e0
 EBUILD nagios-plugins-2.3.3-r2.ebuild 3039 BLAKE2B 2f2344d56139b20a291e272bdb381c45b99c7a952686e72f232e70b8d6fa5f637fbbda42d69add400d4d1b4d895b4608c7b853235eb5617b44879cdcfc2a5635 SHA512 06cbeb2ad6b950a8a3e3c142f55919c9f2e9a55608e6b0b35d9f0bd352267af77df155d687e2d6ad9fd02fb0aea8c9a24a873910b550994dd6f1d79b7fd137dd
 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild
index eca9702888e2..bb298585d90a 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index e96a78472417..af9c9c63b983 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-4.4.6.ebuild 392 BLAKE2B b5c22bd69450ff0b872c63c613b0281de4ab1f6671905883c295efa4d8e197284dcb05ab67f7b12c838f51319213635f58b9179d8e2e81b6a30d604d7236b3c5 SHA512 6ec6c964b6b0d7fbbbd55f3296bb1312763af01ade0e1ca7d3b473e84ec74b275b3d05bf6c2ded9b50a75a95ba8b0eace242eb259b744fe1be85a88d809b7c29
+EBUILD nagios-4.4.6.ebuild 393 BLAKE2B 6200ada14b6e43e509b775ba2e41914c19b660e152e185fb7c1e978238b179e276abb24fb2c1dfa8e5c19ab976b6faef2570fd54dd69c9d10d18d4acbd7e1387 SHA512 3287a38973570a85a4cb7fd21a696965d50265002f58be716485374bdf154301ac0a2cc9a6785b96c2d1bd45e57f1a7b88d766bd9862f9266b1eb851b2a670ca
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild
index dfde78da41e9..be5cb8515d0e 100644
--- a/net-analyzer/nagios/nagios-4.4.6.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 3840b7eb6f88..92c8233cad1b 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1,3 +1,5 @@
 DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb
+DIST nbtscan-1.7.2.tar.gz 29758 BLAKE2B 8e6af433a600865c391d0f7a72a8aa0b82d6ae61abedec8c2dc5cc89515f92c2ebdfd4868d578d4028b9aee4224b2f972bd574040db3c30caf9e0e59f9eb303a SHA512 b20eafe6737aa378e230dd2842e045bf2a48497e21b87ce6c534366cbb162862168a5c8143c0a69d495525caca75e91e437b87d9778e4cfe573b20461e2ccbbf
 EBUILD nbtscan-1.6.ebuild 679 BLAKE2B 4296c0705c408a0e82eec941db81158cbfac55ae6169dd6bddef8246d06e942b5b486453945bd1dc3b854b1e347a717d9e2b8ae677dacb0c2c51f4c6abd04352 SHA512 a2e0970efa4336ecf9e71950d12b181042d9c4e7658cd51fbe3c6911ac26816fb1b7c0be459b3aafecbce91e4bbef37c94f0e48cc3dfaa47fd68fa65fdddf052
+EBUILD nbtscan-1.7.2.ebuild 588 BLAKE2B 4031cede2aad5880db3387b3cb4fe8c3dab19e2952cc0d6c723c02992839b3eb6fd6583f1ccac5a72a90c71dd894fc083ee981122f4fd898df4725000d52079d SHA512 03101418e63deca178b02569c0da6f4f496ed66bbeb2be39a7ddace5dab48e2acb899e2e3e67eaaaf758af339673a605770c5b3ddb3111fd3773e1c30b69b10e
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
new file mode 100644
index 000000000000..a004786f28bf
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/nbtscan"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index cb068e6100c0..136a6175762a 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-10.0.1-es8.x86_64.rpm 15611336 BLAKE2B b9b40e4b892ba1b6bd84584937814848004981aa5e9f04ff736b18f1db558344d2ad516fe680805ec8fe2e64727c54cd3d38f211d49ddde483356733e97972cb SHA512 2ef04593b6dd84dc6c02375c9a9d37bede82eea3941d243b463b3937530c90b942a336e139b7aeed52a51df5daffa2f8a0aa00207782ae03fecd2c5ad22b4ef0
-EBUILD nessus-agent-bin-10.0.1.ebuild 2361 BLAKE2B 8a3ed115e8295798143ed4276c556fb98194f2853b6e29dfdacec149b7b3c42115464868543f8f5db0655b1e98b45f01cc61a922c90d9fceee3df666c1ac98c8 SHA512 50d785985e003543c4c5643ce3b83c082b634b694ba76159490a65f0a23cef70a76de658721b8a3dd4b65a3ac803cab0b5265ee2f3e01ace9fc1e42b164c0f30
+DIST NessusAgent-10.1.0-es8.x86_64.rpm 13227128 BLAKE2B 7e609d47a43ebecfb047cfa7654d3ecc921548512b28299f788f9ba87a81024c2a1a191af8f9f734ae4426e1bbc62968fde403c56bc764d3dc5eba2205008b2b SHA512 45bcd6d9846e067d4a6e6800486905d9201129fd9c3f38bfb7e21743d8ef6db93d9f718c52b7a8949a38c6750216eebcd0dbf799d465a6e6c510bc7a50790831
+EBUILD nessus-agent-bin-10.1.0.ebuild 2361 BLAKE2B 4e904bc555536c60d4b6fe1ab1cecd86114d4a83036f3f443eefa931c85fc460b1beb8da670653aada62134b45b4ebf09cc9743ade35d006f30a999ca20ab2ed SHA512 f4ec7de4f4843d907b60d7989422a3d29b98b15a9a9050dcf151e20d0b4dd3bfa8eb71bae5d0ffe30e589c404e40176c5cb38ac0a27740fa5c258fba9128a1b0
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.0.ebuild
index 8d4c4cdd4e54..3b22d5b2779c 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 7fbf856c66b5..fcc3d30265af 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-10.0.2-es8.x86_64.rpm 47542540 BLAKE2B 02afb5a90204e6d8a8ca8eea0e6a8241f05385c274d77802de8d0ff2eea3b3c03866d8974cfd022e856ce603870677aaf779469c0613b5d1b7b8efb549114151 SHA512 32cc9de9f2d098562092a9d6e593786e42daa79c0830d863873ff2847cd7c25a951775f39eeecdccf20331ced5a2dec0f207bd398ee2cd6f954b8424c88dc86a
-EBUILD nessus-bin-10.0.2.ebuild 1989 BLAKE2B ac48b9a95507f50cc029de2c9e1ce018bb73f51442e459f7f8e4f4e62540b6d7a9f728534133cd748be6bde5d222494ddb7f68da506c49458dd283df8c5d9bc0 SHA512 5aa02507bf22b6fc7e23e46a1ee51886c64af45b444e5b0a71a3df74da81612b0819771e4960b4a589d4cf4ad719e4edeff169766e1d6ea42b4d29f8bea05811
+DIST Nessus-10.1.0-es8.x86_64.rpm 47963604 BLAKE2B 880385787297f0d7ec5a9ba72bcdf62d8f4a9668d8c091973e41a95933d16d18a68a222d1a8f142addd2ecdd47f4dca0a2be34dec4a87a38af73580ce04fa8dd SHA512 4298ec394a59c048ee0f79566be885d39ed6ad8fc4494ae4c54ecfec71dd2eae19ff20785d06f87392b563290bff595ee835f056e984b1de9963a711b524dd4c
+EBUILD nessus-bin-10.1.0.ebuild 1989 BLAKE2B 60687eace368dd476aa29470d5745bfd99193b0504ef19ba51f4a85b8f27f6a1719c6eebfe9277331d04a741855dfcc20750897e0d94bce7bff78a2185af8557 SHA512 bde2d18ed3bc6b0b22bb61f3a7fd9fa3d20241cdcdfd563cfb331b8c2082012539b37a8b477a647c27c8fe8ae98d0cb438228b23af6e3516b055d5d791d35a7b
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.1.0.ebuild
index 6620c073f75f..0692bd7052be 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index bd0e52dd5080..350c10f6ae2e 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -6,7 +6,6 @@ AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636
 AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
-AUX net-snmp-5.9-r3-f2fs.patch 1594 BLAKE2B 41dbc49ec2b67831e1fa0965052e3eae88140512a2584e4bfac0ae52a1c575c59c48022c1c97838e7d05a3b849c6bb85810bf208e629a57cc78a982a3b6d6a67 SHA512 067fb5d58512852deffe53ce5fe2bdb905a13e4e2add3fd7f889b8e5806e2e29eb38ac04abed5fd099355b76dd3f9b6413f973ff04be5599189decf4f8d71cf1
 AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
deleted file mode 100644
index c06c94ff7ace..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/729224
-https://github.com/net-snmp/net-snmp/commit/5a18e300bd085c6ba5967d7b00cc3f57fe83f665
-
-From 5a18e300bd085c6ba5967d7b00cc3f57fe83f665 Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 8 Oct 2020 20:12:44 -0700
-Subject: [PATCH] HOST-RESOURCES-MIB: Add support for f2fs
-
-See also https://github.com/net-snmp/net-snmp/issues/111 .
----
- agent/mibgroup/hardware/fsys/fsys_mntent.c | 1 +
- agent/mibgroup/hardware/fsys/mnttypes.h    | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/agent/mibgroup/hardware/fsys/fsys_mntent.c b/agent/mibgroup/hardware/fsys/fsys_mntent.c
-index abdc63ed6..75e2782f7 100644
---- a/agent/mibgroup/hardware/fsys/fsys_mntent.c
-+++ b/agent/mibgroup/hardware/fsys/fsys_mntent.c
-@@ -146,6 +146,7 @@ _fsys_type( char *typename )
-               !strcmp(typename, MNTTYPE_CVFS) ||
-               !strcmp(typename, MNTTYPE_SIMFS) ||
-               !strcmp(typename, MNTTYPE_BTRFS) ||
-+              !strcmp(typename, MNTTYPE_F2FS) ||
-               !strcmp(typename, MNTTYPE_ZFS) ||
-               !strcmp(typename, MNTTYPE_NVMFS) ||
-               !strcmp(typename, MNTTYPE_ACFS) ||
-diff --git a/agent/mibgroup/hardware/fsys/mnttypes.h b/agent/mibgroup/hardware/fsys/mnttypes.h
-index cda42420d..3540cf31b 100644
---- a/agent/mibgroup/hardware/fsys/mnttypes.h
-+++ b/agent/mibgroup/hardware/fsys/mnttypes.h
-@@ -154,6 +154,9 @@
- #ifndef MNTTYPE_BTRFS
- #define MNTTYPE_BTRFS     "btrfs"
- #endif
-+#ifndef MNTTYPE_F2FS
-+#define MNTTYPE_F2FS      "f2fs"
-+#endif
- #ifndef MNTTYPE_ZFS
- #define MNTTYPE_ZFS       "zfs"
- #endif
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 69467be55d72..eb29752bd514 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,9 @@
 DIST netdata-1.32.1.tar.gz 22472431 BLAKE2B e05e4f29930493ad0c31373dabff57a3fd4f178730848fe4153aebb6219055ef0edda59577fe0c6cc9bd5cf3444b055e8330744f75581804f316f343fc692710 SHA512 869829eadcec4dd9c05cc6b6279830691b6cf9345cdcc0834e90d71f3bbee508c658d16bd379c51ce470c4e735e7c8d607dc045f45a60da2aa3dac36f37b5757
 DIST netdata-1.33.0.tar.gz 22470692 BLAKE2B fc0feed8a93876ca7ec304d8ff95312de19f81fccb5ec564e324751488fe6bb10033c815d456238503bcefdd31ec213d61191e21a5ee6671e23183aec7f298d9 SHA512 31b7ce97a3e756fddc358501d98b5ccf056dbe8d22585628873753f30041533d8926b8549a6f1c795c20b33952ec24df2a3ccdce85d6b1da984964bf08a5a66d
+DIST netdata-1.33.1.tar.gz 22611080 BLAKE2B 01838efcfc99ce644f04af1cde3dcbc5844cf2eaff8afb44503effd017b4dcd9ed990cd2ad6f285f81c72a0bae91586fa21c0306ad932252503ee755b949d7e3 SHA512 f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c
 EBUILD netdata-1.32.1.ebuild 3875 BLAKE2B 313c72de1625f81e4404160402e52786579c418bd216d73bb869afad7e55e1e98d11620aa8752bf0a85f0e429d0eaa0d3eabc2f5d71ca954595cf5ad6953c8aa SHA512 84bb620ea6186b8cd0a1301558ce8534d429fd0f50a3d0356ce3b73223ab1364a8e772cbf758e3e87399139aee821ddc25a4ec83e0ff46dc9a0503af67e53421
 EBUILD netdata-1.33.0.ebuild 3846 BLAKE2B 7af687733ca6bda186277185084d6624ed7957d78ea1f4e009dd2447c84833a4bfbdd6dfe916c98178601371e31ab742b909d1de71796f64e920e3a851be76b0 SHA512 a151af5cc52e4e0fae3a30cb6fc7c97a9de6ea6e80d7984fdcbc9777ea5fbc1d1cd18a16f583d3f804f1c13115b536284b11868942f7a62347b55af08d495ab0
-EBUILD netdata-9999.ebuild 3843 BLAKE2B 85ab674b580ec9240397c42eff7f88749f83637cc72f4faf15a9529ba8f19e71e5664819cd970853cf0ead417b9fe210620763ff50a629ee7778cd1532975b37 SHA512 e745c8741094d9510f6f12ea240b93cbb89a64fe5ba4091592b71b45e579c271fce3fe1ce98e29040a861ffa879458eceff8687c3701811258d089db4b4db8ac
+EBUILD netdata-1.33.1-r1.ebuild 3909 BLAKE2B 2b393e1c9e107f5e5fd91c0f7e0560bb6d808921c454ec16bc93910e74e9a15e4605e880b5c75e4b75dac84fefe8f3e1a98e00d5558447020469343ef882ea5d SHA512 5e7395c0ce56e1107e0d282616b4d5b9f48061389a38b7760184fc1cf20dce47db80dcf35ca5d70f8a54bbf535e74a5e404b8fd3570cdf616bb89c75f85ea324
+EBUILD netdata-1.33.1.ebuild 3846 BLAKE2B 7af687733ca6bda186277185084d6624ed7957d78ea1f4e009dd2447c84833a4bfbdd6dfe916c98178601371e31ab742b909d1de71796f64e920e3a851be76b0 SHA512 a151af5cc52e4e0fae3a30cb6fc7c97a9de6ea6e80d7984fdcbc9777ea5fbc1d1cd18a16f583d3f804f1c13115b536284b11868942f7a62347b55af08d495ab0
+EBUILD netdata-9999.ebuild 3906 BLAKE2B 62c2648d5c5c0e4768467f8a852fdfdc969b0ae67c356f2dc59d1f96ff0c3ea92a18487e4e3802335c0d7612193ee025395034ad4be9d57a809c7462ee6358b4 SHA512 83d2683d067551a75e8e2c9af2aa9974d19565dfcaf4aceb55f9710f47126269ea5ce03519d665e1aabbebdd6d4a90f20149896787fc449cc1adedaa6f088b03
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.33.1-r1.ebuild b/net-analyzer/netdata/netdata-1.33.1-r1.ebuild
new file mode 100644
index 000000000000..6dfe8112013e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.33.1-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~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 cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto 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-libs/libwebsockets
+	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
+	cloud? ( dev-libs/protobuf:= )
+	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_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--without-bundled-protobuf \
+		$(use_enable cloud) \
+		$(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 lto lto) \
+		$(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_compile() {
+	emake clean
+	default
+}
+
+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 nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-1.33.1.ebuild b/net-analyzer/netdata/netdata-1.33.1.ebuild
new file mode 100644
index 000000000000..5fe0d66e35d4
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.33.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~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 cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto 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-libs/libwebsockets
+	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_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		$(use_enable cloud) \
+		$(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 lto lto) \
+		$(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_compile() {
+	emake clean
+	default
+}
+
+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 nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 5759c79ca15e..427b0ff777e1 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 		dev-libs/openssl:=
 	)
 	dev-libs/libuv
+	cloud? ( dev-libs/protobuf:= )
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
@@ -101,6 +102,7 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
+		--without-bundled-protobuf \
 		$(use_enable cloud) \
 		$(use_enable jsonc) \
 		$(use_enable cups plugin-cups) \
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 98fb69d835cd..5f1009bb6606 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r3.ebuild 1910 BLAKE2B 2201aa7888ebbbfe4d999d1e76c161966d01b8a4e6b5f89e23569d705e2409361166ac7d6facd2b811ed483a585ed14abf03d0e6273ff812de587bc6b6a4ae0a SHA512 beeac77a9eecfe95f3db6be742022c9d0b36261a167ff77203dcff251b7a154615a9c39690c4cb0a4e019b913127aa996f8d81399889647f786ec3bb1b8e6e64
+EBUILD netperf-2.7.0-r3.ebuild 1917 BLAKE2B fdb4b339cf43b49a4182a9a44facb02f3c32c0cff27e277b138ed1fbd5dd36bd87859eacb4c84ace8274376a4064fbb854645c6c6dbd629cad230c65117ae8a9 SHA512 9eae6cf5bc8de678e65a87b41b45193b8a5e82ea63c01a4abc142d9e40034f7b25a18bad80e5a78910bcc8350ed6ecac251fe7533c996c81e8343a736f1164a2
 MISC metadata.xml 856 BLAKE2B f1f2ac4a59c7c5e180ad68dd84bce5563a6ba32af6d5a0c6314e9ad153d5fa80ece9d5d9fecb4f7f62e4a615531e9ba7aed6cd180064e32d9f2951e655d5c337 SHA512 5f0e528830a267e8e2c900f670306d9d7602060fcce34b8367e9bf2be3e57a81be7a9e9b32e4457287224c9dd5d9e1915e9e8d67a55d0db85cea3ce7fa8c396b
diff --git a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
index 93441fc7cb54..950df8cd767b 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit flag-o-matic
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 44968e6cdb74..84d8794273cf 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -4,7 +4,7 @@ AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5
 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b
 DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b
 DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3
-EBUILD nrpe-4.0.0.ebuild 2754 BLAKE2B 41c7ab9b52abb8dafef7936c7ffaea0bd8d3f3fd2b658254eebb119c2b8bcc4ebe293d31f6eaeafbea8a181aa1f402f5193d349254709edb6ac44b08444b633c SHA512 2e818678b118dab57bca1f4ddc094b57e225cf0aa9bed460e7f1143758cc7eba591dc32f08c6d1219c2d1e3c27bdcb396da9c46f02a27b3808abf83a2d7869bf
+EBUILD nrpe-4.0.0.ebuild 2755 BLAKE2B a7f5021e1420484b28e90971ab03e70fc280b5471ba845e077ba1aadf95311ed9d16bb0908a43621994013c66556b809bd15591db4a72ee19f86374db11dbec0 SHA512 a2587ab7129bb6abf513efe5cb868609ecd95251419c1486bc43f9aff849816809582f8103fe0b009e6430c5bbcc455d1df4bafddce685768a5b7e881492454c
 EBUILD nrpe-4.0.2.ebuild 2810 BLAKE2B 4d947f53a170ba7d178581ea7fab97eb2faa45207e6b9103352905dd6b445676d76a91cf3287addce3e965c746d525146f52e5523d13d6599a6d215d880afd13 SHA512 04f3e6b17a8636f7eb3c2055cb0d8213047c80544e4f64aaae30b17396acdb0446421bd8bfa245b3c97c4ba6b40039d3c614a0b95e8de1dbf1a97d1341899f0a
-EBUILD nrpe-4.0.3.ebuild 2765 BLAKE2B abb5c457a7b68ddb5255b41f84beb1fd970a8057487ac513964889378f29f2b2845589683f28ba7430c67e102e95e2f2d74588ef2e640345830678e709ea3462 SHA512 f8d83f2580f0241232719f648d7f1f619d8998a20d1f33f2928ef60619d8aeb6ab7085eaa1327b9fa76e8f9d657e9345f75c2c7b902766f43b07391abbfbf30d
+EBUILD nrpe-4.0.3.ebuild 2766 BLAKE2B 482c7ed7765f9bb3d80073bc02a2bd9e9107d8098839df3dce9418079496bf5e8b66232ae34b711df056ea0b0ac2e97bdacbbcff0dcbfacee86dd00f7bb05dc9 SHA512 e64b136a99e7bf2dd15578e092d94e3b8dff3f29ea0029ad88ded307a46d93869af0e1e22a541107d74a7edeae86af5c81e62316dc7eeb2223e6dc1dfce396ee
 MISC metadata.xml 771 BLAKE2B 9b17330fcebcf67300104f9cc916b4e2bc10abeffae54210596b0275a7dd2d60ed5bce6f5d1edaae24eaa0de00e5d04c91279a779646d26475d468d6aa04210a SHA512 b0e6d469ad8b6b546fc05df8b4c6224ee3306f7fb19f5c5f5eda9e3bf98a089ee570a74dd60abe1bfe4726ab6cc762bbe64c7b49955a834ca20f99eea8fd2313
diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
index e39d700be6fd..1012fda39070 100644
--- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="command-args selinux ssl"
 
 DEPEND="acct-group/nagios
diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
index 585fd858b111..27d333e85049 100644
--- a/net-analyzer/nrpe/nrpe-4.0.3.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="command-args selinux ssl tcpd"
 
 DEPEND="acct-group/nagios
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index 551ba9e3cd3b..8e747215c952 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,5 +1,5 @@
 AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2
 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224
 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010
-EBUILD nsca-2.7.2-r103.ebuild 2008 BLAKE2B ff80c71588eed60158e78636aef991cbcaa143a4b3645a7eb69abc13e4b96502b7e7d070371c62fe0c1c76fe20a5b7c5251dffc024966890b7d935b31b558949 SHA512 11cfa59fd4e36ff0174354848fff571b2147390fdb5993e85f0671b521dc67a623e3817909cf57805abf466298f9b55960009d62720d3c90500aac06c8f51d29
+EBUILD nsca-2.7.2-r103.ebuild 2009 BLAKE2B ed36bd989380bf6aa176553ff733ccd8f686bb76364b8090e7ddaa2bb825803bd6211ee82cc90255fb13dbe628e6c25bfe8976445d2fc2c01bb934b0d838c57d SHA512 c246301402b6de3bc33b0bf608860f627cfb00cb99b2005236643b4c2cb5c361077d5f2a8ce02d2bf45c89af668bc42c7cf5864f907d77da041101fb37c639e8
 MISC metadata.xml 1733 BLAKE2B e7d987509bf4066ee0b6133dd34fdd98a0260ec436f3b24cad2f447584aee21568a1dae311fbadaaf47560bee8f3113e45fdfdea908934b5cb78d7300111be72 SHA512 24221ae962c2d500dac72c87186cd6e70adfaa04d3f2fd43638c0d1b1bf34d2ce7d564593023ef442c15302b8b2ddaf2b601a9c30bc05221722160aec4255251
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index c7120d06b665..bb6a49ecfbfa 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
 IUSE="tcpd +crypt minimal"
 
 DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 117da5e87e91..ad832ea786da 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -3,10 +3,15 @@ AUX ntopng-4.2-PKG_CONFIG.patch 4622 BLAKE2B b88f0d52ce1784b03caa2929b31bc2165d8
 AUX ntopng-4.2-mysqltool.patch 567 BLAKE2B b788a433213c2b29cc27869649fcc60cb8e88542b4797fe20a4641f560067cbbdd578e6fb02172365bbdbf31490dacd9324af1dc53ffa473a6bb55a8eb245687 SHA512 378fd97264c9f7c4e997e7f2319ec9e8e7c359393b8ac333b23a7406e2756de49b4adfecb1baa0d340a2f2cf86c164a41341fbb6f4450fae786acce168ebc2df
 AUX ntopng-4.2-nogit.patch 1522 BLAKE2B c6d445a4b8ba2b4229073f6ab3b0bac1dc7cfa805ec75ce7addcf08a7963bb5028a6f0a36650194199def5ef7b885f04817a0dfbfe014156e7d2cb54d9cb1588 SHA512 d33feb7c6109ff5728ff21b704d6e08d2ae6ea70563b1ac4d89d8f69123c77989bdb764d99ce2c9b36690bed07486b9f3b7e0d7ff6059b3cb75965343695b778
 AUX ntopng-4.2-parallel-make.patch 352 BLAKE2B e2411060d85820b0808c735cabdeb1f4e372dbd199e2308b3cac463c706b4a8c255bb838a0ba160f80d600ad8e569401fb5de57637737be3485df301862fb06f SHA512 2c6987006ea2f60a9f46e5b2cd7e94e55ad93e866a8ef935ebb40067cc4082f96c4918e4a13c618f2a2d0e7274ccf741457c198f0dd65dfa76c172a222f60b2e
+AUX ntopng-5.2.1-build-system.patch 2624 BLAKE2B 5fa408c42203009152d20b207e64b411ba9fa36687d4ec9264cfb0250ed5d701189b4549e8c147ca437d19fe92334b71c315ccc71074dcbe32e44b6ec2dbf510 SHA512 fcc46ee8c0173dd04e51c93cea009295fd636b7c9ad8aeb43bb96ef31e3a4a45763a6732fceb901ee58646f47067411faf600d5dba8820acfcba4b3ceec0c98b
+AUX ntopng-5.2.1-mysqltool.patch 494 BLAKE2B cff0845f604a0c73a025043417a2b70e7d8f36feb73684230e410dcf3b67c08432b79e852018299c829d36fce6d082fb7b9172d216477c8f928f720c04cba643 SHA512 0aed88a94fc21888e468c71212389f89765f5b394411e6a2838299a280a9cba8e996ebe652b8d116ddc8b9c51b66a463c206917187b138badc76246ade3a780f
+AUX ntopng-5.2.1-ndpi-linking.patch 474 BLAKE2B cacf4f42af93bc656558873f732734bac70f6732325686b8c4f4e38c9f9fb39e6fcfc3b189da29b27b155c55249717c546d408d27ba488682e364e794caba2d9 SHA512 cc5cd78e7ed6499c91f16695f45d0284ed6430a435364919d320ca80f4c7c25bbb68cdea070b8710535fd327faa6f0d62b6c0dfa605e34555c14a6cd8b4dc36b
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
 DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f SHA512 e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
+DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
 EBUILD ntopng-4.2-r1.ebuild 2007 BLAKE2B 11fc39c77829db81cee9c8f598151a0ba056dd40f03482f042cd8885ba81c4237a07addc8100cc65ceeb366e6411a5ee819c51131b614e4c0c4cd45496ecd9b2 SHA512 64371bfa4a1ba20b5650ab65f4f673b85e98704b4a8cac59751eea645d870d9f63a68480ce2fefcd12075bfe06768771fc2d735c6973fde0bb087b62ee36c780
 EBUILD ntopng-5.0.ebuild 1928 BLAKE2B 4f105b044967cf595e184229e4dd5dee5b03a6c453d00c16478d05f18fced9517c8954c75aae25b45cc30701512313bd9e717f95c6bdffbb0c8037168a0883ef SHA512 573cb8e2cb1db7652788451a428acc0b92bcf34937a2521bea8d5305be9149770e3c8c3f7fa0e94f422bb09ff1574c3aeec32c43d4bb9fcc0910967c35a7b892
+EBUILD ntopng-5.2.1.ebuild 2210 BLAKE2B bae2e642a9a3c989935371ec31e9f4906c9417e032ddef260b0e190fd077cb9ee921d48358c504aa7cb03c4e8ddfb07ed4ec4239298dc5d94da9ebe58728acfa SHA512 86adb96b03e60caf6ec1548983d146ef9a6eeba851660268fd91a28d55fd0a94b52962a99f9f80349a491f069a488e832db3b3f7080dbb069c0954b08df47160
 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
new file mode 100644
index 000000000000..ff05d103f22a
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
@@ -0,0 +1,89 @@
+https://github.com/ntop/ntopng/pull/6288
+
+From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:07:21 +0000
+Subject: [PATCH 1/3] build: fail configure if ZMQ can't be found
+
+We already "fail" (makefile won't be generated) when ZMQ can't be found but
+the exit code doesn't represent this until now.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index b032d7faa34..0b30e9480c7 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -132,7 +132,7 @@ if test "x$ac_cv_lib_zmq_zmq_socket_monitor" = xyes; then :
+   AC_DEFINE_UNQUOTED(HAVE_ZMQ, 1, [ZMQ is present])
+ else
+   echo "ZMQ not present or too old (< v. 3.x)"
+-  exit
++  exit 1
+ fi
+ 
+ AC_CHECK_LIB([sodium], [sodium_init], LIBS="${LIBS} -lsodium")
+
+From 75206e5a3fdc289a2229770595fbf588de79402b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:08:02 +0000
+Subject: [PATCH 2/3] build: avoid bashism in configure
+
+[[ ]] and == are both Bashisms and /bin/sh may be a POSIX compliant
+shell (Debian notably uses dash for /bin/sh which wouldn't be
+happy with this).
+
+This will continue to work on Bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0b30e9480c7..3dc6ef4a539 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -187,7 +187,7 @@ fi
+ 
+ if [ test -f /usr/bin/lsb_release ]; then
+   CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+-  if [[ $CODENAME == "wheezy" ]]; then :
++  if test $CODENAME = "wheezy" ; then
+     CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
+   fi
+ fi
+
+From 6e355cb98078dbfc379ba178ec99b7e351afdfe9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:09:44 +0000
+Subject: [PATCH 3/3] build: use $(MAKE)
+
+This allows parallel builds to work properly as we'll be calling 'make ...'
+with any additional arguments it internally passes down rather than literally
+just make.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 3dc6ef4a539..3ff06c4efd4 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -720,10 +720,7 @@ fi
+ 
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+ 
+-GMAKE=`which gmake`
+-if test x$GMAKE = x; then
+-  GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+ 
+ GIT=`which git`
+ if test x$GIT = x; then
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch
new file mode 100644
index 000000000000..48551589f022
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then
+   if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+     MYSQLTOOL="mariadb_config"
+   else
+-    PATH=$PATH:/usr/local/mysql/bin
+-    AC_CHECK_TOOL(MYSQL, mysql_config)
+-    if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+-      MYSQLTOOL="mysql_config"
+-    else
+-      MYSQLTOOL=""
+-    fi
++    MYSQLTOOL="mysql_config"
+   fi
+ 
+   if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch
new file mode 100644
index 000000000000..4940cb44b733
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -236,8 +236,8 @@ fi
+ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
+    NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
+    # Use static libndpi library as building against the dynamic library fails
+-   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
+-   #NDPI_LIB="$NDPI_LIBS"
++   #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
++   NDPI_LIB="$NDPI_LIBS"
+    NDPI_LIB_DEP=
+    ], [
+       AC_MSG_CHECKING(for nDPI source)
diff --git a/net-analyzer/ntopng/ntopng-5.2.1.ebuild b/net-analyzer/ntopng/ntopng-5.2.1.ebuild
new file mode 100644
index 000000000000..b1e0ebb11864
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-db/sqlite:3
+	dev-libs/hiredis:=
+	dev-libs/json-c:=
+	dev-libs/libmaxminddb
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	>=net-libs/nDPI-4.2:=
+	>=net-libs/zeromq-3:=
+	net-misc/curl
+	sys-libs/libcap
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	acct-user/ntopng
+	acct-group/ntopng
+	dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
+	"${FILESDIR}"/${PN}-5.2.1-ndpi-linking.patch
+	"${FILESDIR}"/${PN}-5.2.1-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	# Follows upstream's autogen.sh
+	sed \
+		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@SHORT_VERSION@/${PV}/g" \
+		-e "s/@GIT_DATE@/$(date)/g" \
+		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
+		> "${S}/configure.ac" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	# configure.ac.in at least has some bashisms(?) which get lost(?)
+	# in conversion to configure.ac (like [ -> nothing?) so just force
+	# bash for now. It's still not quite right but at least upstream will be
+	# testing with it. TODO: fix this!
+	CONFIG_SHELL="${BROOT}/bin/bash" econf
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	insinto "${SHARE_NTOPNG_DIR}"
+	doins -r httpdocs
+	doins -r scripts
+
+	insinto "${SHARE_NTOPNG_DIR}/third-party"
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe "${PN}"
+	doman "${PN}.8"
+
+	newinitd "${FILESDIR}"/ntopng.init.d ntopng
+	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
+
+	keepdir /var/lib/ntopng
+	fowners ntopng /var/lib/ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index d8146e1dc042..cfac08bee8c4 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,4 +1,4 @@
 AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b
 DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449
-EBUILD ostinato-1.1-r1.ebuild 775 BLAKE2B 548ca6c48ee9e5ca47426a7e105f954d7d6383d0f53e2fb6ad8bd40f20b1a75ee65d35d122e4a2c5926406133d1bb80770c7c838a7c68932626b14b83bee7dde SHA512 1299fcec49927749b838615dc3d45a68e6b2e4c877ae4c4d26c0b93ea93e58434732ac30e23ba5bcb0c0ead45fc850223cfd2213528571a42c80c185f752f01d
+EBUILD ostinato-1.1-r2.ebuild 843 BLAKE2B 8bf98c6de835ee405126378ade475c14d92547bc3b597e387c41cdfcdfc335f9682de20a51a802c1c2a8118555b14858ffcc59d21b52d0801005c94992fdf226 SHA512 c5cec6152d0a1ef4973efe94a680d0a3a05e171a716914783fb1f4d6793ae34e9b6df19ced5e88dda5d1e5f14477e798ddbaec3b832fc7e4e60d871e3a96d0c6
 MISC metadata.xml 330 BLAKE2B d7fd03dae0df59956949953d5d9a18111ef8866c43908cfa09248e7ef2966407b879f5357fb5d6a427710f90fdb36f556bcdc359a7b93a8503e9d69db47a6aa5 SHA512 f27cd8dcddb1ca6f5721edacd8acd4b94042ace9a7800ab9601cefda00b0658ba18e200c14ad2cec02240b8eda6c58eec881c018175f94f8db5e46214f1bc149
diff --git a/net-analyzer/ostinato/ostinato-1.1-r1.ebuild b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild
index 2b835a9bcecf..bccd03f406c0 100644
--- a/net-analyzer/ostinato/ostinato-1.1-r1.ebuild
+++ b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils
 
@@ -24,6 +24,7 @@ DEPEND="
 	dev-qt/qtscript:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	dev-libs/libnl:=
 	>=net-libs/libpcap-1.8.1-r2
 "
 RDEPEND="${DEPEND}"
@@ -33,5 +34,9 @@ PATCHES=(
 )
 
 src_configure() {
-	eqmake5 PREFIX="${ED}/usr" ost.pro
+	eqmake5 PREFIX="/usr" ost.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
 }
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index 5be4a990e976..e10effacdff4 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,6 +1,8 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
 AUX packit-1.7-configure.patch 2331 BLAKE2B 0d679c4361d9cc66bb15dcb4d8d6df86d6c4790919bc49f898ec9f489a6e7535db9d1887db30664c6119948701d048cbd0dfd3272be7ecab89fc04b5fb01d41b SHA512 dd82380b482e72fbbf8678cfc21e4117512b35e62946f9600f57710158f45152b61e712e487c07100fa2b5ce1a84f86af7c5092bcaba5bdea9308ea076119d41
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
+DIST packit-1.8.tar.gz 150410 BLAKE2B d0a0926643b6b595159d1fec703295a880c1fcad188e2d9a6719b879bad0b1f081ab75031550257d5c8573f2d8ed9960e7d46fdbe4c4c19c669015b048509a24 SHA512 1873c687c8be489966d5f8868def3cb824264dcfd8c6572b03fd51f15f8920965c8682b13cc6a9d6fec62bf9fe3b4e91f5a9d3d4c6441232d3f6f51a244a8baf
 EBUILD packit-1.7.ebuild 696 BLAKE2B 79f017339ebf1f13cbad3d3520700602667d85e1e56fb6018cf0f71ae75aa46618336ea23a578e7e4a600c469f08c5adc46b1f2068d18b0f30eaaa1a601025fb SHA512 00dc5a054a9ec939fab3ba7f5b01bdc665045b9ec5cbf2a2ec8ae9db78d51d9e45878eca34ffa8acf1cd0b245ef3b20f49a89d6184b1e375b9dd788f1c4dd464
+EBUILD packit-1.8.ebuild 607 BLAKE2B e9b28ce1b93ff026abf3b5ce576460f54bdca7ca0997c7317d809bf1c621422fc85fe81216c143c333f522a205f3366df059a68616cecb7a9cd0f98159e1d130 SHA512 a93d48bd9afd935602ed59e398e0a55abea5cbdd65120dc4a29ee8af581969f293d9dc9bcbadba7c932813e644326dd658eec3417f0e47a89744d89466a9f6a4
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/packit/packit-1.8.ebuild b/net-analyzer/packit/packit-1.8.ebuild
new file mode 100644
index 000000000000..77ed5d2691ae
--- /dev/null
+++ b/net-analyzer/packit/packit-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network packet generator and capture tool"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
+SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="net-libs/libnet:1.1
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc docs/*
+}
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 40da77b97cd8..81603b13d370 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -4,6 +4,6 @@ AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0ea
 AUX pnp4nagios-0.6.26-magic-quotes.patch 987 BLAKE2B 02bc9b3f3c8d3289593147530d8f7f41927e301e9af854c0c57840ea769b3db2fef1222ede7c125f22e1d0ea7e1c62e14bedc387b6e9f185d0bafcf6b1f2532b SHA512 80fdb4013740dabfc31cf990f4c1a517c0002b94aec7f48d408230045ca696147763fedb04cff5da4954962305fe026bf4bcbc575f04cb16e7d96f49536b0715
 AUX pnp4nagios-0.6.26-sizeof.patch 15528 BLAKE2B f6db44720ef2a68dc5d617427fd9d0813ce34e5fe922bd25153df482420a5b2d718ccd90a09a6073e803345a48e6545e39430522d45b6fea4f4924617ff4583e SHA512 02e671a31371662a1e0958dd704b7918360d20bd2fc4171d2d8c7d0332bc37356b24929834ae910858072812f7fa6d61ba4097ff1f93848e0d02b55aee515290
 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
-EBUILD pnp4nagios-0.6.26-r10.ebuild 3074 BLAKE2B 4ba7815161da54bf4e9e66e0509d1c2cd1acc070d2c66ec619a560b13a496c72505a8f28183054c2b3d3efb354c608d866c86cc1ff177c868da18fddca04f912 SHA512 726614c8530d171320acc7909b1b3e735759983ed77e10361b6d9e3c61d8b51744d668110a887c723935e6351497518d4401d73c887d2978bb6e72b71f3cf4b9
+EBUILD pnp4nagios-0.6.26-r10.ebuild 3075 BLAKE2B 96e83b274e13bfe9f30f43b931eb2b8aadba2ae69611c40d67a286d479e88b2711bd9b6bca389baa53031cd40efbacad69476f696ceabd73ae9a3ce02d5c7e6d SHA512 177ad812bfd764cd9bc19ad6e84a9be6b15e32f6506056c6a8cc6cc1698c163e679b76d1ed40cd44554ea7565e8c1d311b7d2514eaad8b551d5294bec779be1e
 EBUILD pnp4nagios-0.6.26-r11.ebuild 3167 BLAKE2B 81d5d18234042e730d7430d9780a782c85091337d5e4011f04abe9ad4809c56f748bbf9b9453961a18e51c9660055b4c52baf03b9f4cac85b760477816355181 SHA512 935b3a92f92787ba4c74da329bed1fd363d0e5302c1a3796a0a30d8ca14ca5a49431b09812f7eb379d0669d604cca7e1c99cb5f31b95b5b3ede634c1616b035e
 MISC metadata.xml 677 BLAKE2B f58a0350bbf34f21834181d537d1e4906c91b9eea8187b10965578fa6fa82abd3de727754b2f62987f078aad6db146ec00a0437c48edd4411b23b1ef780abb0f SHA512 9843fd05d441d4324ceab6f99f67c7eba266b9f6cad7a28616c7ef094bd8345ef573ac4b5f83ee8f049f3dbf3067df1c1005fff803db9560f10f8b05f11fceda
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
index 21b8ec9aacf3..ab4a072f70b2 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index b17830fe67e4..20197139f9a6 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -4,10 +4,11 @@ AUX sancp-1.6.1-gcc6.patch 864 BLAKE2B 4ffd10b108e268e46ed71ff2930bd990df8f6d66d
 AUX sancp.confd 382 BLAKE2B 1e333a9ec995e733ee3ae7db19e2479dfe87da9a1e1cd3c8e610d0873fab5825a602fee083c87cd0ef40813f98994d1a73b2a7a2c571c850522fba01b3f91afa SHA512 4ae33d655ca0a81a3bf71a382241bca90b1e58e121695041ef5210bd4abdcdbbc4385dfe673a4367898303ae64f9998453c95d2e71d8271ca322473ee61368df
 AUX sancp.rc1 859 BLAKE2B 624ca79a7bb4efd9e6c9513ff53c7f999e85481b2b5555b18c62e27693f371a4098865243fb6aff88d756ade4c988e94b3eda326c7a3539668b1d117a9b55167 SHA512 16c713cf009d597c67981caa5f159b5597732c7f984fb9e91568d2956abdfdc2afb3ef6c35f8189dcca3e89757622c67c1fb67a9a6390851d0db118fd92efd0e
 AUX sguil_sancp.conf 2123 BLAKE2B 161ffda8054a825c10ac792222bbb702c1dac57c14b8500a3a731980cac892c8a66a11a0deafdec5f905b9c523660b9b08858828053c1f4cf7f129ac20f68e94 SHA512 13a6b2573cc239328aabd6b582fcdd6b2102a4fd5380474ab5a3b85e5e4de6547c26aed888baf204e442dbe8be69c11422404c83ac0a2008cad8b6de542ac95e
+DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2
 DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e
 DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r7.ebuild 1808 BLAKE2B a7dba20da834ab99cebac5e15e5648ef173075988dd7f81e42f2651fe73e3dd286f7913dda797812dbfbdb6de987c8bc1f17df95ebb46ede47652b17ba2bab45 SHA512 e452694838979d828a255aaead1e9f1d9511bccefb7c37c1a5012000856a84c4c0cbc039be1f7f402dbb9e607bba80d67aa81f56738707a4dc9ef361965979e6
+EBUILD sancp-1.6.1-r7.ebuild 1866 BLAKE2B 956d0cb9edd31b05043d9805269623e82d9ff7a3ba76fb6db96f5a6ad1d34268ec35ad25230ed0aa46729fcdf8bd0dbe9d2b32ccf63133fc506a23474d0defa8 SHA512 9c21b4cccc4b0353604ea80468e80b7eeaa5bc95054c5406e3622ee2a7105964d5670c4c1626d53c88203747c6fc8fa20ad98a49d76404b82fe5c2f1d236fa46
 MISC metadata.xml 474 BLAKE2B 295c523017c01b7bbc19a0812bfbbc8016c508de39486180ccc974a01bd51019fa75e5f4754dd03e4b981e5d05eb6b07c65607499f038d30f9deb75be32ba897 SHA512 f59d62c7408bf041e6b2c035463fa22e0f9abc38f0a696f3d8be65dd5c54454deb4a3e60938fce2cbb9b18600a9adb7ed55afdec3bc27f05e32f4433703375dc
diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index e18588995cbb..f3ea7b0a3461 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,15 +7,14 @@ inherit toolchain-funcs
 
 DESCRIPTION="collect network traffic statistics and store them in pcap format"
 HOMEPAGE="https://sourceforge.net/projects/sancp/"
-SRC_URI="
-	http://www.metre.net/files/${P}.tar.gz
+SRC_URI="http://www.metre.net/files/${P}.tar.gz
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
-"
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2"
 
-LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
@@ -27,20 +26,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	"${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
 	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
 	"${FILESDIR}"/${PN}-1.6.1-extern.patch
+	"${WORKDIR}"/${PN}-1.6.1-musl.patch
 )
 
-src_prepare() {
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
-	# bug 138337
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
-	default
-}
-
 src_compile() {
 	tc-export CC CXX
 	emake CFLAGS="${CXXFLAGS}"
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 0230e0669553..7ad4fd0da9d4 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -2,6 +2,6 @@ AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a88344055
 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170
 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
 DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
-EBUILD scanlogd-2.2.7-r1.ebuild 903 BLAKE2B 81092044beb603269002db1767c42c2d9a1028842307f012699ca8f2d2c5673f7d4ffe30346e349e667b9c7d0a3e901fbdaf7ea5eddbbb75b52a4e68807a7625 SHA512 eceb8f2d589dbcc0e4786a34e6f8c9ef3a7037715cdfa133da2e4e1b697222ae224056a537124b95e7032e684165c99e47661561d9342a8d64d5c1e0342ca3f7
-EBUILD scanlogd-2.2.8-r1.ebuild 917 BLAKE2B 68d4b6ee3ef7b23c02f38656f199be2c346ccc49426b36f8dfbfc013d61b5f4a339b9a453a678e1575f517128ce341910b9c3ce3745ee65bb8ee3a1f4a02fe80 SHA512 1c1d6719679b061aa361fbdf3170416adfcaf1c7464fd1699fb40345e32038a59a8b6f279da6f06bb2d8e439e758232bc06b4595a04063dd725cd7cbda40a2dd
+EBUILD scanlogd-2.2.7-r1.ebuild 904 BLAKE2B 5da1f58de5e6cb0c1f1b968f4bd9e6c8d380166e61bac683ac9edf118198c03fa1eaea4bc3e39064bc79598b47fc695d7abb86127b5aacdb625059f491c50631 SHA512 5f084a33b8544d6210800cfe99a341ddba83a66c4e6bfdc25fe680b8f7d7aa5601cd2274b94bc62a733719d91989be8b2cb4f66e608467df3e2ecb2912e89809
+EBUILD scanlogd-2.2.8-r1.ebuild 918 BLAKE2B 7197a611e61c2eb8fb23d648fb1ceb6a7eaf346ff317c39d9e0227e05bd0aa0956aa3ea458a4388da8a606827e2069d7ae8936cea03207f1ed56df176c8f3d8d SHA512 18b088bbca2017f80d879c0721e6ab0b95d7db8fc66fbeaf16b2449c2ed0a3452086f9e82dd6c5538ea3d156a480ca642a3b1c948a6b90db4dfce5c217fbcfef
 MISC metadata.xml 444 BLAKE2B 311531fa01cf8b3e80b424f6bdabc9bf95ff66bed3953f24c978f36a98f5e08ecd674a5b7b414d2bb626bdda800e9d81f0388af5f11408b27f5bf6a7a097dcae SHA512 6def253f68d2423834a6d13b9b99f03a511da11a831a4b83151d3d310a769ad56ad9d848a02f4b2d3f2806117f1d7a47c5c2fe444e365d622f0fce0bb65d3b68
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
index 7598563d3815..425d76c6c154 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.openwall.com/scanlogd/"
 
 LICENSE="scanlogd GPL-2" # GPL-2 for initscript
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+nids pcap"
 REQUIRED_USE="?? ( nids pcap )"
 
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
index 0e6c20df4bec..c4c0611a002a 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.openwall.com/scanlogd/"
 
 LICENSE="scanlogd GPL-2" # GPL-2 for initscript
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+nids pcap"
 REQUIRED_USE="?? ( nids pcap )"
 
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index f56bbff588c2..140c7b6da4b6 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,7 +1,8 @@
-DIST sslscan-2.0.10.tar.gz 110417 BLAKE2B 88c095096dd615b13e3c68e6ece7eff8588e7debe65c5c6b228392d78c806029a2bc18a6c42bee480e2bb669b39753b39de160917eafbb654f5d8b64ba50d309 SHA512 d6adc76579dd99648359e9694b615bf1d9be90d71736e49305fefa0c0e1e386af2457c534136d8da2219c080b1119873f54a4cdf1b82675f0ce24f4e6ae068ee
 DIST sslscan-2.0.11.tar.gz 110704 BLAKE2B 4d4db6fa7b8f6f611e752d0f97ff1219fcbd064280bc4133dd38d1268cb268847801d25403eeb6bc475579a931e944c9a21d90e40fed6bed2a6a6bc535540f7d SHA512 99681cd8b7240cf85dedfaf210cae11ba3dbf2d56c3fa8ef3f3cdcabb6b29916b640e5955a7876ebb9be36dbe326da303e5bda7537b48743ff0a8c1bd35dbf0c
-DIST sslscan-OpenSSL_1_1_1k.tar.gz 9996510 BLAKE2B 755bbdfa5738e2f2d0a72b0e01861acb2df33f499e140b46a40562b0d6035992f5aae084c480d9fe4e82e4a4f74929e686c31b04f126859375357a0f9c207b5b SHA512 b963e24f598d4c95455733a1b06f73b802ccf18c3a4aa8e1436ef597aba3daa6020d032051439b35f72bd566e9e62d24aaacce770567e2b9e5c82958698d3d97
+DIST sslscan-2.0.12.tar.gz 110785 BLAKE2B 4c7ec58b7e454bb661f05da58eff55dad940ae1a8fb28daf8056114402949e6712e59e13e7128dec0eb45e3e21c2b349e0ac5b2fc7a3a334807b6fc4e2aeb595 SHA512 3758b5e697a1b53e4c574deabfe366d0796d6cb2481a644ec6139cd11e9b4cc2878b094ab9bf4e700ecc73cce6a374a1cf9f487967de3a038dacb985aebee948
 DIST sslscan-OpenSSL_1_1_1m.tar.gz 10023608 BLAKE2B a6951bfcddea224a4920f18b7352feb427b979965f8f563b9adf3dc3152133fd44d7a3c490c522986066db6b23c2e878f135a7a9160f564d435e66c2cce0c51f SHA512 af85d15c9db06eb9cdfa9e16ef9f859df752d823aa7c7f0c1b334cd71ba924878c686a65e756fd09c7630b650aad1a2bbe02acdfd6c389b52c2560d32d4150fb
-EBUILD sslscan-2.0.10.ebuild 983 BLAKE2B 8b6e43d3730bb5e65816b674d7c003ff65b1371384e6d9cb8894fcefcaa888e27ff9bb9ec301ed91f220c51e046f4bd26c32935d853816680844c5563329b6b4 SHA512 769b197f27f6054f219e8730a68d901692c60a99c2ee44662f7b6b57f7935cb459a799479eac9fde86cd331ee44df28ba79c9bd4ca6bbe90717da81cf3b5bd00
-EBUILD sslscan-2.0.11.ebuild 985 BLAKE2B 4de0ba50ec8d5c7f2e3cb36c4c4f82d45da1334d2bb18e7446c637db362a1418538dd56b74d0af586fd5e06518d82e43b9354c737b4678e7710a3d33d033a212 SHA512 aa0fdfa0296b353760733359f964993a65a0f95bc14b2126d82291a3a8cc0160970ecf3d24c25d1a4f2dd195eb31865b1da8f0476d5388ff6f8cbdf527e7023f
+DIST sslscan-OpenSSL_1_1_1n.tar.gz 10031245 BLAKE2B 8af659fc9eead7b91a7553c17570dabb17d15fb37a77e7eecfa2a9dffc9eb0a331dd3f11a193907d16e535594eb8c31707ae91d91db91e99c75d75bdd43a7774 SHA512 bfe45e4cbe082e45d165212caa8e660c8af68559675c42461aba5685a7baa7e16c9c0096557106706114176dc31142c760fe835022f796e4341eb08d1b20408d
+EBUILD sslscan-2.0.11.ebuild 983 BLAKE2B 58a4c15afea3ec7b7ca0a5a9abbcf34b091387c27713021fd63e52b5dac3f252bb942659b4445b773adff21f29f9c8c289b051ad73d9ae0de0395067f5367162 SHA512 92d02a25e68b9c36fac4d4fdb1b720ce595066c2beb4818c7c127c9f03759a1cbf6fd42e5a8a469bc99ace37305a8904374204178d8272e43cda3c40c229988b
+EBUILD sslscan-2.0.12-r1.ebuild 985 BLAKE2B c60444c030824333de7bde2996904795b5ad690209bb4d05cbf55d737b45f814f8745eb2e11f7222b63b600ece7f5fe5bc294115a699bacda85abe61086ffe97 SHA512 91a2b53f77f1b1f09f2c6546e7a8ac56c07c9b7681c45fbf04a095057c46b00e308a0a49dfabd3353c5e6cf583d3b5e3575563587ff8f668dee88a5081018f16
+EBUILD sslscan-2.0.12.ebuild 985 BLAKE2B 90e92ffd6339ca75f63c6c67408379402af68460c56d067df6682e2cb2abbcfce81afd4d1816e81751bbe4023e83f91df2f39771e0c4815e947ed46b1cfb226c SHA512 6e9aadd016eb0f8dfa9133b12cef5c529e431143fc1d4fa7e4246bf20c1d32d262fd8e983e2898f9045513bdfbed9070ff387cdc5a9f28ac0429fd049210e8c5
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.0.11.ebuild b/net-analyzer/sslscan/sslscan-2.0.11.ebuild
index 52fba6fc3921..76d7f078f937 100644
--- a/net-analyzer/sslscan/sslscan-2.0.11.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.10.ebuild b/net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
index a404662eae73..69df855c7e64 100644
--- a/net-analyzer/sslscan/sslscan-2.0.10.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # sslscan builds against a static openssl library to allow weak ciphers
 # to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k"
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1n"
 
 DESCRIPTION="Fast SSL configuration scanner"
 HOMEPAGE="https://github.com/rbsec/sslscan"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.12.ebuild b/net-analyzer/sslscan/sslscan-2.0.12.ebuild
new file mode 100644
index 000000000000..d9d16ed46086
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1m"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 130d7f4eed0b..3e03a2ea2909 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,12 +1,6 @@
-AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
-DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79
-DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803
 DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
-EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
-EBUILD tcpdump-4.99.0.ebuild 2306 BLAKE2B 51e64fa4328031af8cbb2e9cf12b5e5d62fb26557913f0f0b4ea852eb84d386b324fcdb6883b97e17a7468e0deb452e0ba139841a0235d880e02b0bfafa82b1f SHA512 d16178ff054b69ef611ef457ae713a66a89ccde5e71db25670ad0d8bfbf778c2077074f79fe423ab551d6834fbd0e141b57500feef311dab0a48216a39fc1f48
-EBUILD tcpdump-4.99.1.ebuild 2347 BLAKE2B 9f986b438a62f514ebff61f73ef799ecba63321fc51b1f6b5b77a1a920df4dfd0b0c7e0f857cfbd6ce060af2dbdc333b8cdc66b7e06acc3f691c8c90963ee135 SHA512 4a68ffa9e9a4ec85f1e4b208d1d99603bb0a020a11285640554cd0efd534f19a3568d5cdb327f78786108b78b6fe82750760251e26c1d104e59512bf98638a5d
-EBUILD tcpdump-9999.ebuild 2151 BLAKE2B 226eff7cc104f92a92540b5cc7cec51eb35b1a464e9212a85efd6b7bfab931c41cf03fc6f29b326aead2a93d0518e5cba793a85716f1decf499b88adc6aaebef SHA512 9f148b2b06db1df1a82bc1334dfdfcd4535fb3e4293c0f0183682bb43a78436ac164d64800e7653e8f741b74775e37a2cdc60cfc2fdbb47de0cc806ca60d8311
+EBUILD tcpdump-4.99.1.ebuild 2329 BLAKE2B 4dc8d991e0d6b479565d8fe7d59f9f6cf519b65a22226cf0ec25447f640ac9237b4db65cf92cb2f0462c9c6eb17d7c441b0c7649a782100ba5a983cfaf2fe182 SHA512 d4122ee6542f6555f85a6609b8ec787b3e3362c8037e234691d1039a19204f555b2e08a43e2c4f316245812d8296762dd8d8e9207e38c573cbbfc77192a2be80
+EBUILD tcpdump-9999.ebuild 2133 BLAKE2B ea2847f868a097d49e941ee3146376694b4800f7ec08081c7e3d527caa7fb9cab0ce0a498dfa56a2e930bbf280bafdefad4d9b27303f6bf5b4dbaf411ddbab63 SHA512 859f01e2a1301ea04efd0cd97fa1d9f3c2af724774c8e53f79ea6a6c2187b1d9392b0782174b0d41d59c4dac11ea909074552dc07c682cb82805e2c024df0463
 MISC metadata.xml 701 BLAKE2B 0e637bc6e801996414b02cc17023641e07a7b81c4b50b6535fd4668f3fc7e3750f3cfa2e138e5c3c5d1fce8b2b89543f99cbee499c0ecf0960862e5a6f5c86bd SHA512 f891a980cb348222d83103a746354374beef485d9072cfe61eb1a6285dd5b282200490ffe8c7b953ef30958316e12a24dfe86b0c11bf7b7519c61f68d0f27737
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
deleted file mode 100644
index 2852845eb748..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sat, 18 Apr 2020 14:04:59 -0700
-Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer.
-
-The buffer should be big enough to hold the captured data, but it
-doesn't need to be big enough to hold the entire on-the-network packet,
-if we haven't captured all of it.
-
-(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334)
----
- print-ppp.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/print-ppp.c b/print-ppp.c
-index 891761728..33fb03412 100644
---- a/print-ppp.c
-+++ b/print-ppp.c
-@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo,
- 	return 0;
- }
- 
-+/*
-+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.
-+ * The length argument is the on-the-wire length, not the captured
-+ * length; we can only un-escape the captured part.
-+ */
- static void
- ppp_hdlc(netdissect_options *ndo,
-          const u_char *p, int length)
- {
-+	u_int caplen = ndo->ndo_snapend - p;
- 	u_char *b, *t, c;
- 	const u_char *s;
--	int i, proto;
-+	u_int i;
-+	int proto;
- 	const void *se;
- 
-+	if (caplen == 0)
-+		return;
-+
-         if (length <= 0)
-                 return;
- 
--	b = (u_char *)malloc(length);
-+	b = (u_char *)malloc(caplen);
- 	if (b == NULL)
- 		return;
- 
-@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo,
- 	 * Do this so that we dont overwrite the original packet
- 	 * contents.
- 	 */
--	for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
-+	for (s = p, t = b, i = caplen; i != 0; i--) {
- 		c = *s++;
- 		if (c == 0x7d) {
--			if (i <= 1 || !ND_TTEST(*s))
-+			if (i <= 1)
- 				break;
- 			i--;
- 			c = *s++ ^ 0x20;
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
deleted file mode 100644
index 2a3d3a399dae..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root smi ssl samba suid test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/libpcap
-	drop-root? (
-		acct-group/pcap
-		acct-user/pcap
-		sys-libs/libcap-ng
-	)
-	smi? ( net-libs/libsmi )
-	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
-	)
-	suid? (
-		acct-group/pcap
-		acct-user/pcap
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=net-libs/libpcap-1.9.1
-		dev-lang/perl
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-	"${FILESDIR}"/${PN}-4.9.3-CVE-2020-8037.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:pcap /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
deleted file mode 100644
index e58bf2bc9cf6..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
-REQUIRED_USE="test? ( samba )"
-
-# Assorted failures: bug #768498
-RESTRICT="test"
-
-RDEPEND="
-	net-libs/libpcap
-	drop-root? (
-		acct-group/pcap
-		acct-user/pcap
-		sys-libs/libcap-ng
-	)
-	smi? ( net-libs/libsmi )
-	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
-	)
-	suid? (
-		acct-group/pcap
-		acct-user/pcap
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=net-libs/libpcap-1.9.1
-		dev-lang/perl
-	)
-"
-BDEPEND="drop-root? ( virtual/pkgconfig )"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid ; then
-		fowners root:pcap /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index 06157bef920b..6dc1d3f43826 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 #RESTRICT="test"
 
 RDEPEND="
-	net-libs/libpcap
+	>=net-libs/libpcap-1.10.1
 	drop-root? (
 		acct-group/pcap
 		acct-user/pcap
@@ -52,7 +52,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
 	)
 "
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 7fb2b1d8d0c3..ac9b01e80aa8 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ REQUIRED_USE="test? ( samba )"
 RESTRICT="test"
 
 RDEPEND="
-	net-libs/libpcap
+	>=net-libs/libpcap-1.10.1
 	drop-root? (
 		acct-group/pcap
 		acct-user/pcap
@@ -49,7 +49,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
 	)
 "
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 615d72e505d5..8951dbf9d6e2 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,8 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
+AUX tcpreplay-4.4.1-fix-bashism-configure.patch 988 BLAKE2B 847d6f241a84b456f96c2ea58a0e15df98f41befcda0a46fcb0a6e1f46b8ac3f6fb5fd8454ec91eb7696601bc015b821dd2fb3452a1dd7c79260e518ca0d2d2d SHA512 e711bb603eb490c34439557c663c31aa267cccaa47db5b40b74497771b5c7daff2e1211a19773d9b0ed2826a578f373261db2456b9747330b17e7ac3f9c3e4a9
 DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124
+DIST tcpreplay-4.4.1.tar.xz 751036 BLAKE2B cf6a4e23f68fd0d6f23392c3ded14ea6486d275eeb8e278ce02d6b34e8b426e69841858cac49cc5ea952e0398f2960049789d16180b0896e38d665511237b352 SHA512 25a4a94b7c0c416b8ef57aba5640803dcd6e271fe8789f3f6e281529e336e326b35738d7673fd44ac4ded0faf577dc4c6255b926bd67b8ba5104a8bad81a98f1
 EBUILD tcpreplay-4.3.4.ebuild 1925 BLAKE2B 00949edc8ccb707a26dd93ace9d298eeb1cf9167870d130f3b335e12ec88ae7842f13b560ea1e6005cc3892b94e1d7a7aff6ea958b82efa43e25a63c19951dec SHA512 2c64a85b0e9c6b6da59264d235c8c4025e2ffa58e0efa5f4b8325937a94fd3874bea8920043f28faae7eb408bf84140f1744e8fad58ed19eb9c6478bc0f83b7c
-EBUILD tcpreplay-999999.ebuild 1875 BLAKE2B acf0bc3fb3e2d84f598d8ed6e13c42bfc642da1aedf8036362e52ab0bc7709beb81d9e57517d26b2b9507ec1cf89c577b0c40993f8faa63babcfaa2d11dbdc6e SHA512 be4c895b20ee5898dc182fdf8f45de64bb9c28fb4b581c07ad29a1f03d3ed953f6bc2e6b596fac66a6290a83dcdfdab17fb01de0042b82cdae86deefcf6be062
+EBUILD tcpreplay-4.4.1.ebuild 2092 BLAKE2B 3d915076248fbe81ee43ae7221d3646caa73b47a05abe3b9821ef538b6fa5461d847bb4b0d706c0d8aa1c1a8f3c4d7ae69be287a6fb1316c3d32a9761aac51ca SHA512 e19ed257c2dfec8ecbb248635093fb2af1599e289f4be5c61a3b0cfb66e6b0f806835ef1b09a74a18c3fe3af1476463de80038d5af1afaa2697d287632a5b3de
+EBUILD tcpreplay-9999.ebuild 1875 BLAKE2B 8244388ce37dce3dc063c1238d9302b702fb63a6d3972c37691e61f5ebe1c16312c00105862f41ffefcc520735392bd801ce8b9a626f20c32db8cebf354ea7fc SHA512 5694f8d1263a34d1dfd189a42b630f33fdec017cde7980eab1d530f3ffd00fa5fdadd050a46d42f1b56de53aeb4b6878dcb4d602724a6f59f35272d5fae00180
 MISC metadata.xml 1117 BLAKE2B f269c4d3da94e3fb52ad80b840c6d5b8d4acb0181dd1c370bedd88bcf75e6933f21f304f3ed5435dc601978acbef6396410d9beb96e4ec1ba1a7a53458b540c9 SHA512 bff9425e1ae71f5d106a5b2c844591db726192f356f54c6347fb9a6c10fef6b7b11cc59695b4f712d87f0359112b98ec514ce481fd824d6e343975631b105ea5
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
new file mode 100644
index 000000000000..f1d424274333
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
@@ -0,0 +1,34 @@
+https://github.com/appneta/tcpreplay/pull/714
+
+From bd93776c50ec1d0574c72f253095afe22eb6bf73 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 13 Feb 2022 16:09:23 +0000
+Subject: [PATCH] build: fix bashism in configure
+
+configure scripts are run with /bin/sh which is supposed
+to be a POSIX-compliant shell, so if /bin/sh is provided
+by e.g. dash (like on Debian) rather than bash, we hit
+errors.
+
+This has no effect on functionality for bash &
+retains compatibility.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11a1e4ea..4c577c42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1808,7 +1808,7 @@ fi
+ dnl No 'make test' when cross compile
+ 
+ AC_MSG_CHECKING(for 'make test' profile)
+-if test "$host" == "$build" ; then
++if test "$host" = "$build" ; then
+     AC_MSG_RESULT([yes])
+ else    
+     AC_MSG_WARN(Unable to do tests when cross-compiling)
+
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
new file mode 100644
index 000000000000..f3f9e2d4d05c
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm ~sparc x86"
+fi
+
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+IUSE="debug pcapnav +tcpdump"
+
+# libpcapnav for pcapnav-config
+BDEPEND="
+	net-libs/libpcapnav
+	>=sys-devel/autogen-5.18.4[libopts]
+"
+DEPEND="
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	pcapnav? ( net-libs/libpcapnav )
+	tcpdump? ( net-analyzer/tcpdump )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
+	"${FILESDIR}"/${PN}-4.4.1-fix-bashism-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug #252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
+		--enable-dynamic-link \
+		--enable-local-libopts \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]] ; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep
+	else
+		emake -j1 test || {
+			ewarn "Note that some tests require eth0 iface to be up."
+			die "self test failed - see ${S}/test/test.log"
+		}
+	fi
+}
diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
index 52407c59ac72..ab3477f795b6 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 156bc74d431c..092cd1695e8a 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -4,5 +4,5 @@ DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed9
 DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b
 DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5
 EBUILD tcpslice-1.2a_p3_p4.ebuild 882 BLAKE2B 6c4cb82b914f111c4fdeb5c28a33d40e52427817cdec12cab8c60a28b90d3ecebdef276db8f3af2203fd20a48a9cf7160898d6c7cc9a796c2663aacffa1f51bc SHA512 724644057f7c5e9f7970b5c8dbd4958182c9b9cf2e51cd1b7926f6483b95959f33b2c8b3cda16ae870ab3783c6bd1364d6e7a12c69e3d43568abb08e6cf23212
-EBUILD tcpslice-1.5.ebuild 625 BLAKE2B 0f5c8cb441f1931f401d1b2e086f286245586c13128d0e73ca5e1e353a2fb41eb61704e5ef29d7ccb147235ec983d2a1c35cd2275184eb4f88b5b676599bf9c1 SHA512 ebe38063bfea7b7391898c819a209b9811c1213797bb2d60645933abc22b71b36c26f129f938e3139c87f074501807a9370600272e850749b1a9d2181d51ec48
+EBUILD tcpslice-1.5.ebuild 624 BLAKE2B f3c83c31ff2993f9b19d2abf998420c031311c32112e1b93349ed90e8d4b59d12f68fe80b376f41f758e364bcd31170ff15fbf31f15cdf8fec7fa7cc25039710 SHA512 822c308e07ec3d5377779622ccda9cc4eeb70157ddd757a6e3e32da48b40878f447436db7a1ed63079759e060a897960ae357d9e5b2b5f1b70b51ee3b397dc67
 MISC metadata.xml 372 BLAKE2B c2e297cfa3dfa8458ff52fee54990962c94e9a06e8e180302f735e84b49a68d1b252bd1bbd3ed8f7882d4dbc70706dcd55d50f7fa87a32ebc44fa1ae952a54fe SHA512 aeba6817feb7095adca5beb16df6d14aea57d773b6a82a6d99dda19b28de89fa8e64d75b018e7d346b59c7014df34c0a45c3725361227ff709617da733be76bc
diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
index 3a527c4395da..f845244e6e0d 100644
--- a/net-analyzer/tcpslice/tcpslice-1.5.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index b68a1f5c2af5..9eae04f305b2 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,7 @@
 DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
 DIST testssl-3.0.6.tar.gz 9217988 BLAKE2B 840eb0027f6b3e9ae919c9d8765c138a10ef9789e14dadc7d1e6e27fef2e906e8182309b2ef504312fc7577fc84b25d4efa59121c4c641a6bbaf91ab14259f18 SHA512 a118cd3e6d8e560f6c739356551091e6186e87bdaec24c8bc987c3503b5c22276f69a5fafc1f73cfd65528844ca7c37f3ee473cfb1de0646067ee0a48089eb26
+DIST testssl-3.0.7.tar.gz 9219774 BLAKE2B d3b6abd5bb46e26ccb13afd9c9440e80fd80566db2bf04bb72b254dbebdc69957a0bae82436ce0b3f826f7c829a0cf73589eedc60735c629d010c8cb76e196a0 SHA512 703099f3c7d7d040f064466c721e30ee594a8d495add113b899b14d21848c8488e2d447c1af87ecd3d0d2b00dbeecc3a7914c26721b5b1936cfa818cf6599d53
 EBUILD testssl-3.0.5.ebuild 1508 BLAKE2B afa8231522f3c74583cf7797859ef851eee280702d7d5c642188add2114e2ead7d653e1837f0f973ec77861be077f11ead26a05bd0743e7e8a13a4adf3e998f5 SHA512 8f60fce722b2dc13c5c1079f7434c55fa497261bae039bcceba1ba728c0c39910c87a174f2b58a68be1fc6013c9eeb926ddf208dfc432338f1062323e7a81359
 EBUILD testssl-3.0.6.ebuild 1511 BLAKE2B 327260cf8374e38b0296e34b277f430f0bcf9b175e746e83077712b2d0e4329c2863b1d8594f364d3c039180256dec33651c44a2e2da93366d422748e2dc136d SHA512 56aba1c500c354280909770470b9bb1528dace03ef1862e94e28c2a7762fb749044fbf8a2f5f75e43a088dabaf0153322262978e5de20668cea6f5914368f5ef
+EBUILD testssl-3.0.7.ebuild 1511 BLAKE2B 4894c27fbd011061820d4c1b439aa317a61907315e16ff16c05d9b4a3c4e74a61a2ae65c41348a88dcc91e4ddc9be798cce312b563ba75d20843f8909dff6003 SHA512 de871bdc0786285553bfb8d359c6d42a6b5fa5c4e3f2c712a69096b248eb0e1fc69edb8c0527554dd06bb24c9f1ab3d891c347d4a80edeab5d70e8c7f0c195a0
 MISC metadata.xml 428 BLAKE2B 70142594046143c3a60e555b8e6dd361257c2bcafe57f98562735201a2da4eb2fe56531e9dcb3428259e99809c136732848b48a898ad5c30f6fb84486b40bede SHA512 1eeeda8d3017eaf49471766ae67550453b8097868115d1a247cb4a18bd67df88e78115aaeffbae7c9ce2da139be8eb0cc87d8561534dc8f1192a950580e7cd93
diff --git a/net-analyzer/testssl/testssl-3.0.7.ebuild b/net-analyzer/testssl/testssl-3.0.7.ebuild
new file mode 100644
index 000000000000..6a9b6f823763
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/v${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.krb"
+		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/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 6b4a11a9ca28..22eb0e43d72e 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -17,7 +17,7 @@ DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf7
 DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
 DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
 EBUILD vnstat-1.17-r1.ebuild 1712 BLAKE2B 012f0dbef26d826428b2ffb018307a0f8c9cbd1184e1593442fcea313c100240a536b01ea67be9f80b56b5e3824a6c6ce7b532f4b1580142d6fe3e312a94e024 SHA512 0f12a9c2e8176cbc602d19262441a8c5f4c5367bf0ce3ebb4812f8ba7796768acf676f414cf9d00fac2df8fd5105129e235be081669d6e13bb1026c38e233bce
-EBUILD vnstat-2.8.ebuild 1885 BLAKE2B 06fc6aa3980bab2cf4b99c21d975b71dfe2098989c8f11e269fccfb19430c686622fecbf51d293df867a426502817d64a5e6f4d6d875379792fafcfc8e87312f SHA512 96b4e42f6d52cadbdd5a8f7c18d80b34e6a355abd51ae4f3ebdf00c140120221a0afb26974c1a116f8539c15317925f2d61f6afa4739f9523c18b248ab0be8cc
-EBUILD vnstat-2.9.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11
-EBUILD vnstat-9999.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11
+EBUILD vnstat-2.8.ebuild 1884 BLAKE2B ada1df4d41f0d2ebcc3856c0da3cd723054db79ac2a804e8f9f8e956fbdef95a28d10d4d271ca966ba9fd6727fd23367babbfaea3e8b1ba55def7324182e473c SHA512 3cee02efbedd440ff941d40fcf2555cd57a449ab444ca89368239680736ce8e5ae8a2f7e2c93a87677651352a6785817b80e74c8de4c3d76b19e797a6942aa86
+EBUILD vnstat-2.9.ebuild 1815 BLAKE2B 9be3168b107e6104b5cffba20c184deb102d1d0e0c65fe801c6d00924ff22b53f560b5a746babc84a16818b0c02ceed587036cdcbae0895a1ef79150283491e5 SHA512 ef0dadfb970c72a758faded22a3dde9c229c9e9a69ae4ae39dae6567873add83432ea097f07faab68b5c82a375c0daf32775fb5e882043cdc46cc0d3b237411f
+EBUILD vnstat-9999.ebuild 1823 BLAKE2B b8d0a5fabc933e6be298e19ea314631e24dd4fac256c4c22dc5b164dbf593bf17fd80a8a123b95af77ee68b1f8683e975b48af88a97cf2ce7b86707d91c3a4cf SHA512 d39be391d90d488dd8c26ccc523cd81fe8ba2f9a2c3c01c750b1c2b05ae1e2e4de402e9d52e9f43abd4e3ac3a6d57110b3d02fa45c60aa2f59f6cec68df96d5c
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-2.8.ebuild b/net-analyzer/vnstat/vnstat-2.8.ebuild
index b596f789e0c9..3abe8761ff15 100644
--- a/net-analyzer/vnstat/vnstat-2.8.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
 
-	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
diff --git a/net-analyzer/vnstat/vnstat-2.9.ebuild b/net-analyzer/vnstat/vnstat-2.9.ebuild
index f9877e7f008d..b2186d2f4e6a 100644
--- a/net-analyzer/vnstat/vnstat-2.9.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.9.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index f9877e7f008d..3ff50568be35 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 16c004d600a2..530209d04acf 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,15 +1,12 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
-AUX wireshark-3.6.0-fix-no-tshark.patch 1133 BLAKE2B 05172dd9379550dd50e853e1cbc4c0a4958bdcecd62f9aa1148cfee73e42ff2ec73113cec102d885405235c62e539939d5b786975f74bdea201a07f0b2ada7bc SHA512 532c239c9d9e2a1eaea995b276361cf8e21a52c5577dd5de04ca1ac4d520a0a4dce61f08eef245b60c8162a7ad9a2cef7519444aa8ab0d900774932da1314829
 AUX wireshark-3.6.1-fix-build-no-zlib.patch 2586 BLAKE2B c38506c9ef34cc4f82c402a4d8bd9962bd89e8ebff3ca5d1ce732c9ad29f0c55a2c4f0ff21a75dbd1fe4eb2ee7384a1fc3c5fae4f8df6af8c6b5888a3011b742 SHA512 9b93e947053301c893afbbe17348cf87d81e0a6a99115f61965431cdf19a75be4241e56b2f5fa73d15d3fd7f6844473af5dad7022519efc1b7eb46c8fa6a3888
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563 SHA512 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
 DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
-EBUILD wireshark-3.4.10.ebuild 7361 BLAKE2B 65370daecce9dffe999ef0099dea5aedd5e7b4a28689c0cfb76847be380ac1d7b0ff09433bc446c3ea0a545bedce0d8ddb259d7d55c2f4492ed4e8dd4f48aa9f SHA512 03549a3ae6ec4e00c16c4d48f016801a848aa8d7d7913c0800c8376d74b31117deeacf442cc901f5c938b82673eec887b00ff695414d9d2873388b79d0995c12
+DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
 EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509
-EBUILD wireshark-3.6.0-r1.ebuild 7239 BLAKE2B 71572576c94fdd09acd7eef362b055e3379544533d153a2076e05cec90dbaec98cd152969507723c49ea7fcd5bdc4f46743ef6d334d2393aa46d4a55ec4962ab SHA512 498b426faf4c297950e8aecf71b1409dfb0de1ed2a8f345d386d6c7b91860ea11107637ec55a54a76a8872eb7cc4dcb8c54c69f420078252953fffcc9f085830
 EBUILD wireshark-3.6.1.ebuild 7303 BLAKE2B 9458f05cd1c435afff4377ae7cadab850394529a86388d8ca7f3b7ce59668b69089fd87d50b6eb723d82386492160e43f720976473531c5851de5d6bce1cf391 SHA512 6f89417eabc853120ec481d1b6271832699571372417267099d8b8d487c66917c67df906d4617f76dd4ad0900b8eb75485e3b3adaeb759ed557b77ce25d03a69
-EBUILD wireshark-9999.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
+EBUILD wireshark-3.6.2.ebuild 7258 BLAKE2B 32c295bd798526fa0c406e1662e8dc941e402c322696c7d9be524e21a4066b2671d94ffb9e1fe1df854869eab2e9c32c25cf2f43c3a512f2c25fa57af7a1fac7 SHA512 59fdf0864bf220784ced5496adc1bd15a6e0a6a992fedd1e3138e38221734b0a97c704b7dd750477990c3a81153878c7275c9486cae5b0fd2a38d06243119431
+EBUILD wireshark-9999.ebuild 7263 BLAKE2B 40e92053e2153567197333756bd75dfaeacb1810011086bedec392054184697f9b60fc8f33814419884b028a07de0117728de29af6b4da1f5fea5c296383f151 SHA512 07fb21d14891731a3c0d8ca5e4782f5c1ca9afbd58bf3bb10298b129c57f6f24cbd261bbfd1631b77bea9316a876c44070ba4c7fe85ee787eb4e31d0902f2fc4
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
deleted file mode 100644
index dd497c51391c..000000000000
--- a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
-https://gitlab.com/wireshark/wireshark/-/issues/17766
-https://bugs.gentoo.org/823720
-
-From: Gerald Combs <gerald@wireshark.org>
-Date: Mon, 6 Dec 2021 19:01:10 -0800
-Subject: [PATCH] CMake: Remove the update_tools_help target.
-
-Remove the update_tools_help target. Despite the comment, the weekly
-update job doesn't use it, we don't have targets for our other update
-scripts, and it currently causes issues if BUILD_tshark is disabled.
-Fixes #17766.
---- a/docbook/CMakeLists.txt
-+++ b/docbook/CMakeLists.txt
-@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
- 
- set(GUIDE_INSTALL_DIRS)
- 
--# This is automatically updated each week. You probably don't need to run it
--# or depend on it.
--add_custom_target(update_tools_help
--	COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
--		${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
--		--program-path $<TARGET_FILE_DIR:tshark>
--	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--)
--set_docbook_target_properties(update_tools_help)
--
- set(WSUG_TITLE "Wireshark User's Guide")
- 
- set(WSUG_FILES
-GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
deleted file mode 100644
index c3e28e4115a4..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=(
-		--disable-capture
-		--skip-missing-programs=all
-		--verbose
-
-		# Skip known failing tests
-		-E "(suite_decryption|suite_extcaps|suite_nameres)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 520a2dc646a6..760d4c694ac1 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
 PYTHON_COMPAT=( python3_{8..10} )
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
@@ -96,7 +96,6 @@ RDEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
 )
 
 pkg_setup() {
@@ -192,7 +191,9 @@ src_test() {
 		--verbose
 
 		# Skip known failing tests
-		-E "(suite_decryption|suite_extcaps|suite_nameres)"
+		# extcaps needs a bunch of external programs
+		-E "(suite_extcaps)"
+		#-E "(suite_decryption|suite_extcaps|suite_nameres)"
 	)
 
 	cmake_src_test
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 98c2b9131b7c..7d40549271cb 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9c3f61749167..f435ff80407d 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -17,6 +17,8 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod 36 BLAKE2B c4bd514ce347b1cef3c84d6a9b0c50c30f627ec96a01b083c240770618fc6ec4a66d73aef4dd3f40426fcce60be02a6fb620c023c56f88930925e71a4b842a83 SHA512 1d855074be6ecc48804f3d70d54a92617864fbcdade80deee03fe29f046d05901628bfe11c37a30838177801aa2bdb8247b7a8ad18bdd4d1d3a2d85d3342b304
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip 3289 BLAKE2B 9ee2622ac02197b10ee4798bba13513b6cbd319827ec14688f5950de6d8784813397155694e54ef756ead56791a669a61c190c4d3adbe4bf9795ead4896dcfb4 SHA512 953c2b7b855a5798948b52e82c7cae799b9310ca5978bf3168fdce310b6695647f997c7a9d70e7156870977be2de26479865980acfa36d765bd21fb4fe823bba
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.mod 46 BLAKE2B 4c69af06863f7fad07d58c25d89f88b2b5f6f86b0d23244b1613eac55b086fe8c0e68f9c71c258c52223f4a011632a9ed6514be85b9761d278141b6dae229087 SHA512 6bdec112be0531feae4b7704dfbe6e757eea511d3ee8af973972496d069d9c6b101babfef868a4df80c4b471cbf91a9b716ba46a164ca946db1fd10ac44623bc
+DIST github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.zip 10079 BLAKE2B 0d4395568b3659dbe1241f53aa840075b803f99eeb73a1bd775769d671420007e9864986f3dfea0527ceac03a55ecc9b23dcb6367dcf31c75467aee1c37ebb7c SHA512 726a19c1e7a26746e54ec0ba5b20741d6c95f46ec29fcdc3adbc687116ebfa42c0cf114a5adcd4025da4c1adf474cc47bb7934497d336337447acbe3b4e2c1a2
 DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod 128 BLAKE2B 4d1baeb3d0a629cbb1fecf51e584ed575dcd8bd5244845f487b884304fb669a16f2b69f1d1e249665f4f493e57d6eb08d315ef1eea2d5180b94fd23b6fe5241a SHA512 2c35c1d5198cdae7437add88eaad34195f29bacc8a59c10ced04994fd15426374ea95a272e0f2988b360a5514d874971c211d8b1812facb4e84e82725077ff55
 DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip 478041 BLAKE2B 70c36b8f41f50cc3a22f82650edd42a97509f04cb3dc2b57efd5b7eb76a25300f2dabef41799512f144497a8fdf86a34b59141644f29094838c9b0d68d3f906b SHA512 a3e1b173c11397bbdd9f09fa0e58a876e71791811c52939f99efb91d86c5a5d9adbd5d9b7b02d673fbbf18d380a77db1de3e0e21aac32847905271ef7c7f1780
 DIST github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod 341 BLAKE2B 1d74ad6644ee8955e4895d837bf0edb326aa66463852c870ca136c72493fdae768f0026842bef993ef39c1dcf6ef242fa201324983892eed82f088a3dcabd7f5 SHA512 12935a598ddcee53eb6d0eae07fbed13f991ec81f2890f460fc33bbebfeee5d174ced3cc8882812e8231fad41dd545f0106cbbe6c80f5be11df4e579014d1a35
@@ -150,6 +152,8 @@ DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod 254 BLAKE2B d34a
 DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip 118409 BLAKE2B 47181974e809744cfcbe8b4a73d5bfe8d96c06cd273473a1b4e08a10f9cb670a2be052b3320be50883f11186308010c2da6e09611c16e834853e5bf820bb25e9 SHA512 3d4832b0f709d7059dc71bf6a63878eca72bc8aa3b6877825972fd75549598655af4484d956b342641938b692ecfb67c5d8be80d1a2207619cd34f5c2563e8cc
 DIST github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod 44 BLAKE2B d8627452a1bff0b607125e33bee0ef71cec55b0bf0a220d755226bae8c7a910c799b6cfa85981ae7fbef04b8acf005dcda53e2f1c49a3f138f7516cca0cc4b68 SHA512 b7ad8b8fb9c091aae75beb141c55ee3edfca64e874e4d52fda76e8146c4b574d061f2ca4cd3b0b0f127f05279a3e75ac0657c45e185651835c91d8f48342bab2
 DIST github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip 26613 BLAKE2B fb95e308f850b8ccf6bfc7809aed0eb34f9128b63398fe442f063c22af95668ea81157edfa32161f1a71c72f03dd3deb41020122760829437c13c6b48d556ed1 SHA512 e354a6dd3e46857c9a55aec0e7362ebc58e18c38e3d8b8cf7277cd75eaff556b897b71ee9c8ba3cf7570d0dfe2cef036e6535edb93a8a2a76aa409cee7d1b773
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.mod 210 BLAKE2B fed94d9122ba026bcaab9c4b54425ca6ab054452981cb2c1d007c069b46a6df74aaabf2e5711864d53455b259208181215a7a4ee47cd4f43b7781b7168150fcc SHA512 2b16b7814601de871aec90dfdd1a56d763cdb7132816ceef18ffe94e7862844353044430a49f20305278e6d5e3b42aef11428b88e4b4d17469a38946fa859ea6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.zip 236767 BLAKE2B 8272123411e7df6fb2d55f4d81874148a671e6cb576f2c01e9b4635a748f954be524717e745ed397719ae5d5f486d9a2ee7bf5a0b274817202cccd907242c03a SHA512 d1b5da0e352db04818770174d784c4a6f52cdd6e4a3c360d32d8aafc51c0e004590e5e89d7f872f2708807a0fcad448546d1014ba1f2ac74540ab6d1bb389346
 DIST github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod 34 BLAKE2B 3916e7eab36e455ef8f73b4eb026a0b4d5c04780a2f987530c3446233e627f00c87bad3db2d759c6427faccaea609be4b522553c338e0b9de58fce31293f2cd4 SHA512 c0fd9b298a72d846474932cdbabcf3133257b1f16120329efa2ab7ce2358a2c48604257f67ca7bee1d8b83e75a263330de796f5ba94a899f5260bd6af6385cce
 DIST github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip 17199 BLAKE2B 38b247888ad647071971aa321b9ddb9e7bfd1129c03e3aac188a67e5b86442dbf1d969e1c07383f3570dfe54fc4b19bfda4689b2f371493c46e8d8b118533e56 SHA512 e16ffdc58a017d4c6f6fb7444b300cf6f20ebc6a1a81792a3fcad633d004b1183646cf86b74673f25c3bee5da72967fbe2adc161924be92d43ba18e3eda3a167
 DIST github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod 41 BLAKE2B 30a6bf094208d9cb937a1cf1df4bc7229e2fafb2e5f6d0472d1e25c963f816ef98b5d248ed1dc9ccff89fa338f584bf7879b103f0c097ed688a6fd37a1106d5e SHA512 1dc4c57c45851a3a9a9018a0145c6a13689672ac2b1bf01527566df0e22ffed3a8caa9371a1195b8117e66cb1d4493b3ddac4643c9364ccaee0f906b22ec0338
@@ -201,9 +205,13 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip 1422376 BLAKE2B 5995b3bf9ad143a950acb3ea20e416518d8f90fa1486416b23895f7e8f8decda87cea64757616d8df1390c714ea5a50f4b2a1d1e4338157867da72f72b4c3f65 SHA512 fe2575eb7f3ca98d19db88886f0812f46e93151037b1286a89e9da22ea8adf1d27ad9243848885e3d309830a3fbbbd40f343a9333ef4cc57e66311d61d8ab638
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -217,8 +225,12 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip 1473712 BLAKE2B fe3a040968f3057669b04e538374c5b57a3394c7fc65ef9883fe298dfdb42329a56351afb887a7921a4612d4d58399c2fb7f5d68e43466f0f9cb4d876b9802c5 SHA512 61f2308d243b69ef923f66d1d7498d8774621dfb1ce02ad6bb4e2752eb11fff5ad4b67c56ed57167c88ad8408aa4ad34ee32751d84671c9ce1046b340aa04901
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip 1533790 BLAKE2B ade51a0080dbf82fcf320d06e65ed77ed824f22309892b55340bf6af20e88b704d34f253138ba91b87194fb7117f6145a7c2b76513f3c9a6d259e92e9e4ec6ce SHA512 b7a191ead0d85752296cb87f90664bfe552dc02d554c3aeedb28108d77e722fb44a3d8b305460c2f819e7cccdef9d94d270e629fed579ba6fc570c08d7c1f3ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.zip 1664835 BLAKE2B 5a05a5081c28ed36de591ed24ba08ab70df777f0b84fb84988941cb0c40d3d339f04cf356d29ec68c6b0f804d796ad19eb3fc692bf708c4a4a5e7498bb917c0c SHA512 350eec26a24a627c267c7603ec0b05667d2ce8be7a34e3a814c604ac238dd954542a16fe4c5f7bcaba6f301fc0087da812e14e00469484a7f02f46ead95526be
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
@@ -252,16 +264,12 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
-DIST zabbix-4.0.37.tar.gz 17552391 BLAKE2B c5f3b200e8dda2b4a961a78a3ba8cd97a6e07744c4e16acde3a740559cb70649660b5652d36cf42e87f28d03e14803c4efe9e585583834f7a765fcbf0e5953b9 SHA512 007e7664a6fe1e9b3e76f95c5cfdb9744a27139d243b6fcb78c2e84f01ccdc788130f824514d29f1557724761557e459924d22cb33bb35fe740b5fdc6746ef0e
 DIST zabbix-4.0.38.tar.gz 17558387 BLAKE2B 1ddf27d76734128ddd197eb9dffeb59018282464a7322973dc4102992c0ade003d4d0291194f5b5a487d83a702917d6f0036636e56acc424bd7a7d6beb3f787c SHA512 0d38a74336c9e46b3f9985aca3508312dd5b15affeadee3497ebf8d5e59b4fa7b99ff28819b01878cbc5c9c304c1992a6a91d73f35bf1a333ae2ee561e0d7e1f
-DIST zabbix-5.0.19.tar.gz 21367685 BLAKE2B 4e6b52d4ace766f700894d1eb6c7adf8e13ac72fe2534a48625302ffa6aea02734f8e81ee781a1d1aa0e6e375428919609edfca6094f17912123a7ed96e22af0 SHA512 b7223c656f8830e302ccc6321ff19e580eed199355ca9070ac2b59375e0794d17de1dfa4e1600ef6ac5a72e8abd2b80191b2f58fa77f25096dee52e6e40940b9
 DIST zabbix-5.0.20.tar.gz 21434290 BLAKE2B 8203d9f8831c081af05fa306ce3363ea3d1afd72587459a941e2a20de27e97dce21e34b59e21884f87f6238469c2293dad9e6e5436a9ef82c0139a18a4b0c206 SHA512 af625ee69926b1f0860d4e5e5f4348b3630c642027f5f08f876207cf705d46741c21aacbdde1367b8014c705508236281ba8556700de43c1ccf2b7a9b7f68390
 DIST zabbix-5.4.10.tar.gz 24510838 BLAKE2B 37e8561e031b9267dbfeb786da7d88487142262c3f9063e83b2faafeabd88baa1a0f2e7ffa333d2e29c1b11e09ca995f42442aa60b0b994617b276152d46590c SHA512 452513c56db1778d49a32543814ed83836b480047ebc747e588b5cea8f9b199650824b9ea2042695c5551a81f1f3b2e8d98d0f658003f483bf8edf8ed5427c48
-DIST zabbix-5.4.9.tar.gz 24382685 BLAKE2B 3ec6fac5a7dbdf6b0527e7686a57d3d107be5ec4fb9f5a36254199f9e1ac656459b6582b2b8968e9d8c00a9d1167d03df9b5854584070b74ff5ef8518798a21e SHA512 e2e0dd01b4c2a571f554a60d2b88023ff209111a6e71f2f6dd04173ee2a1c4f31a2a0f19f10f73a43e40634351eeaab0c0e98b0b6a020f39af6cabe7f764409b
-EBUILD zabbix-4.0.37-r1.ebuild 9376 BLAKE2B 6de3ede88eee61034b75748dbd5b7fbfc7e73bb441f40b267f38d763671a9a9136e5ebad66009b9e5c2219431373b1382051cb963a01862c5969c303aba9184b SHA512 be8aeb179a403d46ec060557b51676906ec2e4747cff286ddb4a3c36d5b6e1267cac9cb38ae71e30e1ea641980a5509d7f83c5813acccb5c0f34bb6d7a5f7db1
-EBUILD zabbix-4.0.38.ebuild 9378 BLAKE2B f1881dc4a7ecc9c8f25a66d566092e8ada4d74c21cb8e11283b82d74355513a1ae7a70e391897ed3f04051f5b1da12a0e3493a3999b631f2fc7c9df86b35cf03 SHA512 114f75c7c8b4672042b58b8f1629d6d72b1aa36b9d2c02097a0836d03fbb134605351d8aaa3eca7e9c04d56620b7d4bb55acbfae4342a50f9dc76c9f2d6bd812
-EBUILD zabbix-5.0.19-r1.ebuild 31286 BLAKE2B 1f04ff0dea70bc8ce6843b1d9a6f133c9a98c52bd18ccf49a4c3e9dac9af39c257f8a9ed3671d57045b73b518c0234f554f1f34b9029e698656422fe70dae376 SHA512 27d0d0865a7e7d0316a847a2f08c312ed578b1531234d55aec8751ef688d8c5bc2abd2171b97dd2c433d1591c6a23875f45501d82a75d45a5f8bb875b9b9d613
-EBUILD zabbix-5.0.20.ebuild 31288 BLAKE2B 58520ae4c590267516c70b445c02b802c0f82420d96fff21c3a3e137e6146e7892fc1d830bb2e736a79b6f358ddebc4c4eaef5a76f9baeb478825cde70ddffd2 SHA512 c38a1bd7b088231e0ad183ef924fc05dfd6fea614e5d686b2235dd3ff3ea22e04dbfc2ef31ce82ae764f5fcab561ad1c3563df8d7be8cb5aeeddac32d9390d2c
-EBUILD zabbix-5.4.10.ebuild 33678 BLAKE2B f0c8e81548005609e5d7d9eb9cd637fe672850d141d6a8987a089dcc5803b5a4261a87a32f815eb8886aaa05fe1230afa3452b2ba570313262c0dbbc86a99e03 SHA512 6ec314195482e6c42760ff913e1d00436cd8542d61f70c11d5dbfa56e2c6df14005d1d7f629c1cf8805a076b70dccb6fbb5c2638c821c2e6446b3847f9458b5b
-EBUILD zabbix-5.4.9-r1.ebuild 33676 BLAKE2B 46a40006b0d39af0a19699236fe94c59b40d6f0db19e165af650a3325a178b731868a6930ceb92930f5bf2d630ac0293b74e5c86c513015ce181d05542e5b61e SHA512 c16a6092bd660812a20e20e5f7b20ab18a7284438da96eead8ed055d303cbc6baa1b49a73bd8987d9ae97f9846b1f8ed9429dacabda33282053b4817ef86ca95
-MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
+DIST zabbix-6.0.2.tar.gz 33082787 BLAKE2B 53bd7574683e1166aa223ba5e992d951b5a1f1fc14e6555ebe402eb5e9f4845c3e9edc01c78e230d7120289b0e6c9a5ed87865c0541fa5095f23f6b6916defd5 SHA512 618b1705f4e1689af4d234e877ea4136d52de39bfedf6512f396b79278750bfaf994d132a7876420705690045bee78ebc2c7297ac31ac4ddd92f00d8f781267d
+EBUILD zabbix-4.0.38-r1.ebuild 9404 BLAKE2B ec7ac0082bd2457925d34ac639e132c4285c634234da89dcdbd01048596251df3a520cbf7645e4c9cf6922772e4d5ab6d44b63053fac56d179354eba0f753911 SHA512 077dbefa68a78b7532a58172fc8822f24a32bec3a156cbf7b9d0ffffcf23dfa578dbc9ce551bea6e5b3d5e984e50e25128153e9a4d15016b73a89200ec0567ad
+EBUILD zabbix-5.0.20-r1.ebuild 31314 BLAKE2B a2f08550a2c6b370f7bbf902263df1e6c28b54d8b44ee9bcf50dcdcf01265aa9d92dd248bad0ba0dd8d5d8e4f25046cbd8222e31fde412b2793649f4855a719c SHA512 baa86cdff5b2a4b2a6f9ae4f433496e5d88f4a8de8b158154a9fbfc8b35c60768b35fbcebd864bcbc6117a79ef7294b68ece6685f6e2f2324bae55603d6445e7
+EBUILD zabbix-5.4.10-r1.ebuild 33704 BLAKE2B b6c8c968b6c0f495c992b056fcb06ce75eb01367559e5129123cfb306cfc320aaa426d91aafb196d198425dba762d59d002b9451a2a1e9548ecd792e1e115b88 SHA512 de3006af12a851aff2d9a65d14bb25448d9b4033ebe3e4c5db70e958b2c7185799fa52afe106f067f97849d8267183858648aea8de09a2653e34b31cc47a08cb
+EBUILD zabbix-6.0.2.ebuild 35381 BLAKE2B fe844a9b57409cf0a5cd028b9bbd21fe5b86656288626ee814658b08384e816c1b45e53f493d80f93ec20994ae45f78f59196fd922f294728dfc079aa79fd572 SHA512 235016a0be73237edc7734c0af0a5b90a411853d3ca560ed35de7f18d196a59106ff5b8bfc2c2fdce1b622a6132c9fdd92e6e7e8f9a2d20a5a1a668ea2db547e
+MISC metadata.xml 1713 BLAKE2B d0c1fe7a3627dca5b11601ac5bc360f43476d4a14aefaa7eae021faa636cdd5b5054a4556c8c81933ad6d3638781942e51c01a550463e7b14946004fa8be3366 SHA512 8e5be31d41c1f749cda5b889ec7a1185428d88e21201c02d7066b4416ba3c6d4a9ddc23812e7caeb313dbc2b3ad7c9fd39eae141498ed137b8048fd41d6520d8
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 0e9bba15c9c0..c9d7312534c6 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -26,6 +26,7 @@ configure different types of notifications for pre-defined events.
     <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
     <flag name="openssl">Use dev-libs/openssl as TLS backend</flag>
+    <flag name="pcre2">Use dev-libs/libpcre2 instead of dev-libs/libpcre</flag>
     <flag name="proxy">Enable proxy support</flag>
     <flag name="server">Enable zabbix server</flag>
     <flag name="ssh">SSH v2 based checks</flag>
diff --git a/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.38-r1.ebuild
index 9dc2fb3e59fa..bb7265b117e4 100644
--- a/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.38-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
@@ -125,6 +125,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-4.0.38.ebuild b/net-analyzer/zabbix/zabbix-4.0.38.ebuild
deleted file mode 100644
index 3e38c3cbb0e9..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.38.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-
-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/${PN}/sources/stable/4.0/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	ssl? ( ^^ ( gnutls mbedtls openssl ) )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	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[odbc,sdk] )
-	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? (
-		gnutls? ( net-libs/gnutls:0= )
-		mbedtls? ( net-libs/mbedtls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	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
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-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 gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mbedtls) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(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-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${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
-		newtmpfiles "${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
-		newtmpfiles "${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-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.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.7.32.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
-		tmpfiles_process zabbix-server.conf
-
-		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
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	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
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.20-r1.ebuild
index f9f281b0e09a..b97d5fcc1f6a 100644
--- a/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.20-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GO_OPTIONAL="yes"
 # needed to make webapp-config dep optional
@@ -357,6 +357,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-5.0.20.ebuild b/net-analyzer/zabbix/zabbix-5.0.20.ebuild
deleted file mode 100644
index 0969478dcc2d..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.20.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-# content of src/go/go.sum
-#   sed -E "s/^/\t\"/g" src/go/go.sum | sed -E "s/$/\"/g"
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
-	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
-	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
-	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
-	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
-	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
-	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
-	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
-	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
-	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
-	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
-	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
-	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
-	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
-	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
-	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
-	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
-	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
-	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
-	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
-	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
-	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
-	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
-	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
-	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
-	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
-	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
-	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
-	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
-	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
-	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
-	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
-	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
-	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
-	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
-	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
-	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
-	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
-	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
-	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
-	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
-	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
-	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
-	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
-	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
-	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
-	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
-	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
-	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
-	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
-	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
-	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
-	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
-	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
-	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
-	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
-	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
-	"github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU="
-	"github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU="
-	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
-	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
-	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
-	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
-	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
-	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
-	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
-	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
-	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
-	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
-	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
-	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
-	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
-	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
-	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
-	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
-	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
-	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
-	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
-	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
-	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
-	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
-	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
-	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
-	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
-	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
-	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
-	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
-	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
-	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
-	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
-)
-go-module_set_globals
-
-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/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( ${EGO_SUM_SRC_URI} )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	ssl? ( ^^ ( gnutls openssl ) )
-	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[odbc,sdk] )
-	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? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	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
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-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
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-	if use agent2; then
-		go-module_src_unpack
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2)
-}
-
-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-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${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
-		newtmpfiles "${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
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.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 ui/* "${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-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.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.7.32.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."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		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
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	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
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.10-r1.ebuild
index c07b19ad752b..22950eb616af 100644
--- a/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.10-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GO_OPTIONAL="yes"
 # needed to make webapp-config dep optional
@@ -382,6 +382,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	econf \
 		"$(use_enable agent)" \
diff --git a/net-analyzer/zabbix/zabbix-5.4.10.ebuild b/net-analyzer/zabbix/zabbix-6.0.2.ebuild
index c5ea8a8848dc..7ba5d4cec3da 100644
--- a/net-analyzer/zabbix/zabbix-5.4.10.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.2.ebuild
@@ -13,6 +13,8 @@ EGO_SUM=(
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
 	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g="
+	"github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5/go.mod h1:jtAfVaU/2cu1+wdSRPWE2c1N2qeAA3K4RH9pYgqwets="
 	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 h1:XeGYLuu3Yu3/2/FLDXyObe6lBYtUFDTJgjjNPcfcU40="
 	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0="
 	"github.com/chromedp/chromedp v0.6.0 h1:jjzHzXW5pNdKt1D9cEDAKZM/yZ2EwL/hLyGbCUFldBI="
@@ -146,6 +148,8 @@ EGO_SUM=(
 	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
 	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
 	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
+	"github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg="
+	"github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4="
 	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
 	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
 	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
@@ -197,9 +201,12 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
 	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
 	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw="
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg="
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ="
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
 	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
 	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
@@ -213,6 +220,10 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
 	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad h1:MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo="
 	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g="
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo="
 	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
 	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
 	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
@@ -261,7 +272,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
@@ -287,7 +298,7 @@ COMMON_DEPEND="
 		dev-libs/libevent
 		sys-libs/zlib
 	)
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
 	ssl? (
@@ -305,7 +316,8 @@ RDEPEND="${COMMON_DEPEND}
 	server? (
 		app-admin/webapp-config
 		dev-libs/libevent
-		dev-libs/libpcre
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
 		net-analyzer/fping[suid]
 	)
 	frontend? (
@@ -382,28 +394,42 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
-	econf \
-		"$(use_enable agent)" \
-		"$(use_enable agent2)" \
-		"$(use_enable ipv6)" \
-		"$(use_enable java)" \
-		"$(use_enable proxy)" \
-		"$(use_enable server)" \
-		"$(use_enable static)" \
-		"$(use_with curl libcurl)" \
-		"$(use_with gnutls)" \
-		"$(use_with ldap)" \
-		"$(use_with libxml2)" \
-		"$(use_with mysql)" \
-		"$(use_with odbc unixodbc)" \
-		"$(use_with openipmi openipmi)" \
-		"$(use_with openssl)" \
-		"$(use_with oracle)" \
-		"$(use_with postgres postgresql)" \
-		"$(use_with snmp net-snmp)" \
-		"$(use_with sqlite sqlite3)" \
+	local econf_args=(
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
 		"$(use_with ssh ssh2)"
+	)
+
+	if use pcre2; then
+		econf_args+=( --with-libpcre2 )
+	else
+		# If pcre2 is not enabled, then use the old pcre library.
+		econf_args+=( --with-libpcre )
+	fi
+
+	econf ${econf_args[@]}
 }
 
 src_compile() {
@@ -581,6 +607,12 @@ pkg_postinst() {
 		elog "This will convert database data for use with Node ID"
 		elog "and also adds a local node."
 		elog
+
+		if ! use pcre2; then
+			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
+			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
+			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
+		fi
 	fi
 
 	if use proxy; then
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /net-analyzer
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)