gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /net-analyzer
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
88 files changed, 1065 insertions, 2267 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 31326d64d1e1..72e456f44651 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 8314bb4ca72f..f590cbf33c6c 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,7 +1,10 @@
 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-99999.ebuild 763 BLAKE2B 5fa057bba01f62088350268e440768f9275c50606a3948dd00c5189a8aa801c0abc3bff41785dc829e3b1fa1313c53f1c42173595ee7bd33a01620fff6cd9e34 SHA512 1068671693e9aba8adb9d9264557985f914a6c557e2f6a5aa5412d02cfc11a1464a21efc6aa6dd35b6bbfca4a20612daa91e51f03dc69bbdb3c550f564a36683
+EBUILD cacti-spine-1.2.19.ebuild 872 BLAKE2B c9f52dec0abd1d85cc49bcb8d02622fc06e335755016cfb8ad1b4bead3215192618cd6240e520cb63c27b0451b60ce11954ace1e6f31395222a219766e53ffc7 SHA512 afab552e38810e6bdb5dfab30c6361edd11a872094fc3a81b31b63482ed95e6c5ac757da4886cad2c61c15e1a25f788550cfb0a85ffaccc829a1e5b8471d0215
+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.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
new file mode 100644
index 000000000000..d70a52735b10
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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:=
+	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
+	"${FILESDIR}"/${PN}-1.2.19-configure.ac-fix-bashisms.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-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild
index d929a4df7fcb..cfc27aa3907f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
@@ -13,18 +13,13 @@ EGIT_REPO_URI="https://github.com/Cacti/spine"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 
 BDEPEND="sys-apps/help2man"
-DEPEND="
-	dev-libs/openssl:0=
+DEPEND="dev-libs/openssl:=
 	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-RDEPEND="
-	${DEPEND}
-	>net-analyzer/cacti-0.8.8
-"
+	dev-db/mysql-connector-c:0="
+RDEPEND="${DEPEND}
+	>net-analyzer/cacti-0.8.8"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
@@ -32,6 +27,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
new file mode 100644
index 000000000000..53a220fbf0de
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
@@ -0,0 +1,33 @@
+https://github.com/Cacti/spine/pull/245
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 10 Dec 2021 03:42:21 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure needs to work with a POSIX-compliant shell so we need
+to avoid bashisms like '=='. This fixes configure with e.g. /bin/sh
+provided by dash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,7 +260,7 @@ fi
+   CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
+ 
+ unamestr=$(uname)
+-if test $unamestr == 'OpenBSD'; then
++if test $unamestr = 'OpenBSD'; then
+   AC_CHECK_LIB(mysqlclient, mysql_init,
+     [ LIBS="-lmysqlclient -lm $LIBS"
+       AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API)
+@@ -285,8 +285,8 @@ else
+     if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then
+       LIBS="-lmysqlclient_r -lm -ldl $LIBS"
+     else
+-      if test "$HAVE_MYSQL" == "yes"; then
+-        if test $unamestr == 'OpenBSD'; then
++      if test "$HAVE_MYSQL" = "yes"; then
++        if test $unamestr = 'OpenBSD'; then
+           LIBS="-lmysqlclient -lm $LIBS"
+         else
+           LIBS="-lmysqlclient -lm -ldl $LIBS"
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 9ce5de6b4346..8f9ffe8e4c93 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
+DIST cacti-1.2.19.tar.gz 38477886 BLAKE2B 7d72ecd376c633f1a4e46d3ed69977eb4d342deb900aabcbccbe6213368d67f75909f55c5e1bf21dcd8e422b4504dc1a25a63fe7cf26394d4b43a35db0cedce3 SHA512 076397f4cf048dac6e0c9bb8a4889ba94ca9e40c4d53c2c142ed9e19c7a0dc5c5aa8e2321563b914635a753b59b215926a1a73723fa41d1006473cc34667ad70
 EBUILD cacti-1.2.17.ebuild 1016 BLAKE2B 3fd84d213f5f184e06eb129880a19efa6442e1004534688a7f68a2a72387beded0b1a27e0c7763e7b7c849a50c61400f0a0a2cae4341780c9dd2b011b7481d34 SHA512 33d434610d58e3962fc3f61b17b47bbf9aab2f00176053d497a4572ee2029a493aec9f27639f134ccacdaf1ff4b28cea2ca29699e136a409b30a26a0b3786f53
+EBUILD cacti-1.2.19.ebuild 1019 BLAKE2B 57e9066fc7f369946454a5530453429401e567d96dc29cccd805ddbfa08f39714ab4b96ca25fa4ac39e59f7745b5e4a0ef446c996da87cfcfdf5a96b2b80cf9e SHA512 cb2c4ee15777689a17bcade0e8c51ed6aeee1a28f177aa4236fbe223df080fe115f7f0c45826908d5e4d212dd1afb72eab9d06c70662f67dd7d27c14412c28b5
 MISC metadata.xml 935 BLAKE2B f600d10bd7dfd3bce36a092f31a12a750548866bac21b5b66ff4fc4a876c554ee26d5c4f467830bd3fdcdaf63b0c20c53bf5ca1fb98d6497f84a04b3d8474a81 SHA512 309b48d93e91560458b50ef3c96f1da32a7b7d2dbf38eb4bdaad7b6acb4301528fb9f50b2e79398c7c6026f19efb66d2c79a46afe8e38ecd01f0a4d2d9310ca0
diff --git a/net-analyzer/cacti/cacti-1.2.19.ebuild b/net-analyzer/cacti/cacti-1.2.19.ebuild
new file mode 100644
index 000000000000..1dfa8747632d
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.19.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${ED}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index d479fac0c80e..c258771a6e5f 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -6,9 +6,13 @@ AUX 1.3.0/05-cleanup.patch 722 BLAKE2B 503438de3fe4c793616b32142034e9e4e37b0ea57
 AUX 1.3.0/06-return.patch 271 BLAKE2B 958af1f4ec99a02e50d834904a5dffd611c4d949cc77ae3c548021db262dd1c875c384f879aea852ffd19d85e514e913927cc01dcc6f1fea02ae9f4074850225 SHA512 608588d4b6ab9be136493b5bbfd44461525b3e8f767c0a834b502aebcb418ba620792a29b65568e951f38565a2972cac62d09c4c957ef90f2b11a7991cecb726
 AUX 1.3.0/07-comment.patch 747 BLAKE2B 6232a744729796c4cf0b1f27ae7f9b91b079e9bb9b3d24c7f8eb9dfa96ba62def8f5bd0f37ff226971b7c75c91d361b4cee7baeaff88ab3433415e81caa2c242 SHA512 1509363c088d7a30373d3a93dfb8d702154050de5adcd743f370174d113c54330f5728f970f297a4202ad2b1538cb316325adac267e1079ac3710b2c8dfb86d8
 AUX 1.3.0/08-man8.patch 612 BLAKE2B 9d20491e8f4c138f580fef215b2ee1c30b6b02594fe0a7a2d6d1bd60e920338ec3899c228d78f10f961fd6dc3968c03f3494b33932e289e48a0e05467f4a3cb3 SHA512 5bdd6f26bc60624aaa529b57a6290a9c03ef7ebc3f25881025c4b0cd1a69424249920adaa3ec513c5475808744f49e683965a836eea5fea8321b441dfdc9e8b9
+AUX dhcp_probe-1.3.1-fix-configure-CPP.patch 884 BLAKE2B f1d55b1f89b153a654db9c0f38f1189c928fbaf73ca8dee30619da4253ef809dbc8d1619f060fce9ad078d8f184b0b148de13a7037a7f610925d6b00faaedb33 SHA512 0067420ab9f004af3f09deb8c4a478158848155ef5ee561fcb301db762689acb6b92ed95b39f520075d9f79c32f318ab01887c0d62d883396ee7a6edb8438000
+AUX dhcp_probe-1.3.1-respect-AR.patch 285 BLAKE2B c2b9f6afd5845a3e57be9bd7dff1fc8f0ec652ec13ea0a402a7379f62c3ea9015fa1d5dec11b218f28ae1949bed9561710ffbc9531e3e37a9063c74a8312df79 SHA512 b524de3671390e14792a2051703796e1b09c4e5028c739e5b8bb0a49051119656a250e4420a0a583e6fd8d96906d5c8275de7caf34626e937d4e9e5111c525b2
 AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5b8172f17fa6d3cd682b5458983074456b19f5669aa3d4e09267d0946d5e43637b009d640b1c3059b5 SHA512 c12c574da59c4727470c4add4f1bad1a6787329218f2af5cfa17dac46de1bde546011b24e95c06900c173885eb9d152965d8edaed07117cc36f19755da157f47
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
 DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
+DIST dhcp_probe-1.3.1.tar.gz 246238 BLAKE2B 86c079c4c7951f3a70ced20dbea5d4f0d716335d2f9a18b1b9986965ca0446b5a7b673c7e652405deceeef336218016418a86be1a76d452c7802061403a66e82 SHA512 1002683e6ceb3806289fa9e4879be3d957a9ddc42656d7114942708560f8efba0db058137e04cad092e5a083900987aa1f76c5a7c20db4b57c104dd6a6fcabb6
 EBUILD dhcp_probe-1.3.0-r4.ebuild 1128 BLAKE2B 3b5dcfd15dd977d8f95c5e2cdbc869ee37984c81a503950b3017b40545e86574b82928e785dd4b80599cc283c346abda5cc8031b619cbedf487dcfc47d516a3a SHA512 a43a0cfb7c3c3c784d12ab8b9aef02edc9230f773e8d0ccd07ff46f163d57fede4aae5d84c742ace7578a32053cd1784310cdca200924ad23fff4c0f8d0651e1
+EBUILD dhcp_probe-1.3.1.ebuild 1015 BLAKE2B d21276b135954047bffbafdba70f86e6a00f761ff3bef578391ee19ad786fd2531c654372a8396b3d08228f9214fc964e7f56fafbcf1992a377e5c1f6b47dfd7 SHA512 5fabdf362a49177a36ea72b3d1ab3841d54594c1791885c9d2c66216a7e179bc8c4f4c213e3221fde55de02b1c163035795f73a7f84bc42ce1642c8efd6217e3
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
new file mode 100644
index 000000000000..4bcdb5ae2887
--- /dev/null
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Discover DHCP and BootP servers on a directly-attached Ethernet network"
+HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/"
+SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r2"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+	extras/dhcp_probe.cf.sample
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-respect-AR.patch
+	"${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch
+)
+
+src_prepare() {
+	default
+
+	# for AR patch
+	eautoreconf
+}
+
+src_configure() {
+	# configure uses CPP
+	tc-export CPP
+
+	use amd64 && append-cppflags -D__ARCH__=64
+
+	STRIP=true econf
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/${PN}_mail
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch
new file mode 100644
index 000000000000..fa32f0f73164
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch
@@ -0,0 +1,26 @@
+Before this patch, with CPP exported:
+```
+checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found
+checking how to run the C preprocessor... x86_64-pc-linux-gnu-gcc -E
+./configure: 6512: ac_fn_c_try_cpp: not found
+./configure: 6512: ac_fn_c_try_cpp: not found
+configure: error: in `/var/tmp/portage/net-analyzer/dhcp_probe-1.3.1/work/dhcp_probe-1.3.1':
+configure: error: C preprocessor "x86_64-pc-linux-gnu-gcc -E" fails sanity check
+See `config.log' for more details
+```
+
+... and unexported:
+```
+checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found
+[... continues without dying ...]
+```
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AM_PROG_AR
++AC_PROG_CPP
+ 
+ dnl ##########################################################################
+ 
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch
new file mode 100644
index 000000000000..da32b63718ac
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,7 @@ dnl ##########################################################################
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl ##########################################################################
+ 
diff --git a/net-analyzer/dnsmap/Manifest b/net-analyzer/dnsmap/Manifest
index 8ab7803fac31..78bb32f9162b 100644
--- a/net-analyzer/dnsmap/Manifest
+++ b/net-analyzer/dnsmap/Manifest
@@ -1,3 +1,5 @@
 DIST dnsmap-0.35.tar.gz 73584 BLAKE2B 15de8771f8add66d2598996961cae06670ebf9009d575ad3eaee6e7300163fbc84abf6e9082791de155a9daf5581cf2daf568a7a85a4a55adbf0c81e92639e94 SHA512 9a1bc25500dde22f2c641cd41a83e634dffda06fdfd62d439b9b8656f5e7624ab1d4736ed0d375acc24fb3f12091f7f75190fd97c4b7fa3c237baa0ade871ca1
+DIST dnsmap-0.36.tar.gz 73782 BLAKE2B 94d6aa024979805c81dc5160b213a9e32297283f6b35f91e8eb376db83b5f3627783491530a89d24bbba740ba48870b0073910a1773242f0caedfcfd71e93ef2 SHA512 60f0602314ea6f2b8c16bda1d1d47110c4b2a16f32174882e4406b4ccece39001527337f6ba40da65524287d005c1611e4c14e6a1ec99b25e50f4a20c7e6577f
 EBUILD dnsmap-0.35.ebuild 568 BLAKE2B 3cafa93ee6613ce9329be05b62bfc6d9c58b35e69bde7357863d7ce3786370791ea7f0d524e6aa9faaeca40e1666b717ba4f4d199ecaea3c638709ddc7fda897 SHA512 dd344f94e67545d0e278865ca438edbfdc59113e5ff631c97c8eed7b0bfa5db2a00acf01d4afe2352add6128755bc64723ca034a74989bdba5dd36ac2f565636
+EBUILD dnsmap-0.36.ebuild 542 BLAKE2B efbd303a3685ce62026a8d758f638914c4bd2852f8c68a3bb8e575036f1aec4faafa25943ff5ebcaa2f220035c2cef8927c6829d5c7cf13da6224dcb5c26ddd1 SHA512 eaf34e8ad77c8e5417fae350e92c491d5b3cb3d8098acbb7002e486890dfd4ca930814440861f35b848e790ce89c39ba36ac3faa4c815ab299eb590404daaa6b
 MISC metadata.xml 215 BLAKE2B 6a5d9b4de1cee49342873b9db40bf6e17cb9c852964525866150ce0a58dae2ac013f0d1e6241773421a2ba90a6498f2db118271b5ec9be1025042f945982b8aa SHA512 07d2dca5d5476918fd4eedc0571006852d6f330e52b957bb1ffb7b666eb9a46c5b507f8285e186b7d2e071bca9ff8263e30f323907c1cf72e4e56be5b7f41abb
diff --git a/net-analyzer/dnsmap/dnsmap-0.36.ebuild b/net-analyzer/dnsmap/dnsmap-0.36.ebuild
new file mode 100644
index 000000000000..ccfe8b6421d6
--- /dev/null
+++ b/net-analyzer/dnsmap/dnsmap-0.36.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Scan for subdomains using bruteforcing techniques"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/dnsmap"
+SRC_URI="https://github.com/resurrecting-open-source-projects/dnsmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+	TODO
+	doc/CREDITS.old
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
new file mode 100644
index 000000000000..a4318834ba4e
--- /dev/null
+++ b/net-analyzer/dsniff/Manifest
@@ -0,0 +1,7 @@
+AUX dsniff-2.4_beta1_p30-httppostfix.patch 635 BLAKE2B 1bec7f7441b80b4c3e965395d8b81a47a0b2df1eaa6b54aad3afc4e18a862e191e2cc03f7f2d85f34c819b800a0e54dc38f9d139d5c25f48181695eaedeb6566 SHA512 40c02577a4f1bb0cfdd93019ce968751dbdb55af059dd4537c9eea7103e6d5c89e34bf7bf934a259dd4cf0b78b4a76a7d2cfc44ce2a75eee0e1f460e8defbd04
+AUX dsniff-2.4_beta1_p30-libdir-configure.patch 3810 BLAKE2B dfa3813f013bd3ec0a527ed48d57d545f439dea42243798c8bd85672d17f57391a74c7d86fb87bab88233b45531acef3ee4c8b7b4398208df1deae091dc1e382 SHA512 80719d441ea45a78b3bab7f0fb5747f88d7cd8dc8c96ffc3ec2ffcb6f5ac02f8c889a8538b0ed8b82146cd7200efefd7318950372f27e6d28fd1dff72934e558
+AUX dsniff-2.4_beta1_p30-respect-AR.patch 508 BLAKE2B 585b4e0b959b037f695e191577db9ad99f41e579d1f047810999dfa39101380235b8641e9893ff9de323b00c2376c3cf96b2ba5788786c03d05df7748038c688 SHA512 2a408236f750d47b68b883d55dcf3bb0a2b50c74cf636f2aa61999972081ce6f96186a4fd6fa566928b3d0bbe2dcc14c0f715701e2b4ec417e8f9f5cc0d154e3
+DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
+DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
+EBUILD dsniff-2.4_beta1_p30.ebuild 1716 BLAKE2B 604355e16c5721effd2188c483816bf9c3b28c8ffdd3f132c4e6d311852bf158df21436c53fd4c75080d4d82d404124a1a6ca5520cf9c98d52d388ef06263e74 SHA512 41177a0f130770934bfd7c8eb7fdc7d802561f097c6b7e075f78aa37bdd106b61e21988f6228807e50f3530963cb6acf982001ac67f448e9083e24931537ba5c
+MISC metadata.xml 852 BLAKE2B c391a5fcfe580499b3293b9d74ff563a0e919908b91e493bdee2b718811f16b907156d3f2589f12d1d4303034585bf3979d6943d5fb7a261e72537846421ce5a SHA512 a6f4539e1a85d88915a81b3141e52759140b19f38fc2e89349d8c679e5d2d9261325f71299b2c419572359077a053f09f02172266abb0da72623e98f1e0122de
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
new file mode 100644
index 000000000000..adb46e181081
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p*/}"
+MY_PV="$(ver_rs 1 '.' "${MY_PV}")"
+# 2.4_beta1_p30 -> 2.4beta1-30
+MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)"
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz
+	mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_beta1*/}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# There's a berkdb configure option but we get a build failure if
+# we try to disable it. Not clear how useful the package is
+# without it anyway.
+RDEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	net-libs/libnsl:=
+	net-libs/libtirpc:=
+	dev-libs/openssl:=
+	>=sys-libs/db-4:=
+	X? ( x11-libs/libXmu )"
+DEPEND="${DEPEND}
+	net-libs/rpcsvc-proto"
+# Calls rpcgen during build
+BDEPEND="net-libs/rpcsvc-proto"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	econf \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install install_prefix="${D}"
+
+	dodir /etc/dsniff
+	cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${ED}"/etc/dsniff/ || die
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
new file mode 100644
index 000000000000..487e45321662
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
@@ -0,0 +1,21 @@
+Allow mixed case in some fields.
+--- a/decode_http.c
++++ b/decode_http.c
+@@ -139,14 +139,14 @@
+ 				host = p;
+ 			}
+ 			else if (req[0] == 'P') {
+-				if (strncmp(p, "Content-type: ", 14) == 0) {
+-					if (strncmp(p + 14, "application/"
++				if (strncasecmp(p, "Content-type: ", 14) == 0) {
++					if (strncasecmp(p + 14, "application/"
+ 						    "x-www-form-urlencoded",
+ 						    33) != 0) {
+ 						query = NULL;
+ 					}
+ 				}
+-				else if (strncmp(p, "Content-length: ", 16) == 0) {
++				else if (strncasecmp(p, "Content-length: ", 16) == 0) {
+ 					p += 16;
+ 					i = atoi(p);
+ 					if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
new file mode 100644
index 000000000000..a2309cd836e8
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
@@ -0,0 +1,105 @@
+Respect libdir rather than always using 'lib'.
+--- a/configure.in
++++ b/configure.in
+@@ -127,13 +127,13 @@ AC_ARG_WITH(db,
+     if test -f ${dir}/include/db_185.h; then
+        AC_DEFINE(HAVE_DB_185_H)
+        DBINC="-I${dir}/include"
+-       DBLIB="-L${dir}/lib -ldb"
++       DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+        have_db=yes
+        break
+     elif test -f ${dir}/include/db.h; then
+        AC_DEFINE(HAVE_DB_H)
+        DBINC="-I${dir}/include"
+-       DBLIB="-L${dir}/lib -ldb"
++       DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+        have_db=yes
+        break
+     fi
+@@ -178,11 +178,11 @@ AC_ARG_WITH(libpcap,
+ 	PCAPLIB="-L$withval -lpcap"
+      elif test -f $withval/include/pcap.h -a \
+ 	       -f $withval/include/net/bpf.h -a \
+-	       -f $withval/lib/libpcap.a; then
++	       -f $withval/${libdir#${prefix}}/libpcap.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval/include"
+-	PCAPLIB="-L$withval/lib -lpcap"
++	PCAPLIB="-L$withval/${libdir#${prefix}} -lpcap"
+      else
+         AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+      fi
+@@ -190,7 +190,7 @@ AC_ARG_WITH(libpcap,
+   esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAPINC="-I${prefix}/include"
+-     PCAPLIB="-L${prefix}/lib -lpcap"
++     PCAPLIB="-L${prefix}/${libdir#${prefix}} -lpcap"
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAPINC="-I/usr/include/pcap"
+      PCAPLIB="-lpcap"
+@@ -226,7 +226,7 @@ AC_ARG_WITH(libnet,
+ 	   CFLAGS="$CFLAGS `libnet-config --defines`"
+ 	fi
+ 	LNETINC="-I$withval/include"
+-	LNETLIB="-L$withval/lib -lnet"
++	LNETLIB="-L$withval/${libdir#${prefix}} -lnet"
+      else
+         AC_ERROR(libnet.h or libnet.a not found in $withval)
+      fi
+@@ -235,7 +235,7 @@ AC_ARG_WITH(libnet,
+ [ if test -f ${prefix}/include/libnet.h; then
+      CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+      LNETINC="-I${prefix}/include"
+-     LNETLIB="-L${prefix}/lib -lnet"
++     LNETLIB="-L${prefix}/${libdir#${prefix}} -lnet"
+   elif test -f /usr/include/libnet.h; then
+      CFLAGS="$CFLAGS `libnet-config --defines`"
+      LNETLIB="-lnet"
+@@ -267,7 +267,7 @@ AC_ARG_WITH(libnids,
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	NIDSINC="-I$withval/include"
+-	NIDSLIB="-L$withval/lib -lnids"
++	NIDSLIB="-L$withval/${libdir#${prefix}} -lnids"
+      else
+         AC_ERROR(nids.h or libnids.a not found in $withval)
+      fi
+@@ -275,7 +275,7 @@ AC_ARG_WITH(libnids,
+   esac ],
+ [ if test -f ${prefix}/include/nids.h; then
+      NIDSINC="-I${prefix}/include"
+-     NIDSLIB="-L${prefix}/lib -lnids"
++     NIDSLIB="-L${prefix}/${libdir#${prefix}} -lnids"
+   elif test -f /usr/include/nids.h; then
+      NIDSLIB="-lnids"
+   else
+@@ -309,11 +309,11 @@ AC_ARG_WITH(openssl,
+ 	SSLINC="-I$withval/include"
+ 	SSLLIB="-L$withval -lssl -lcrypto"
+      elif test -f $withval/include/openssl/ssl.h -a \
+-	       -f $withval/lib/libssl.a; then
++	       -f $withval/${libdir#${prefix}}/libssl.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	SSLINC="-I$withval/include"
+-	SSLLIB="-L$withval/lib -lssl -lcrypto"
++	SSLLIB="-L$withval/${libdir#${prefix}} -lssl -lcrypto"
+      else
+         AC_ERROR(ssl.h or libssl.a not found in $withval)
+      fi
+@@ -322,10 +322,10 @@ AC_ARG_WITH(openssl,
+   esac ],
+ [ if test -f ${prefix}/include/openssl/ssl.h; then
+      SSLINC="-I${prefix}/include"
+-     SSLLIB="-L${prefix}/lib -lssl -lcrypto"
++     SSLLIB="-L${prefix}/${libdir#${prefix}} -lssl -lcrypto"
+   elif test -f ${prefix}/ssl/include/openssl/ssl.h; then
+      SSLINC="-I${prefix}/ssl/include"
+-     SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto"
++     SSLLIB="-L${prefix}/ssl/${libdir#${prefix}} -lssl -lcrypto"
+   elif test -f /usr/include/openssl/ssl.h; then
+      SSLLIB="-lssl -lcrypto"
+   else
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
new file mode 100644
index 000000000000..fd2235fada7d
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
@@ -0,0 +1,22 @@
+Respect the 'AR' environment variable.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -103,7 +103,7 @@ $(LIBOBJS):
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+ 
+ libmissing.a: $(LIBOBJS)
+-	ar -cr $@ $(LIBOBJS)
++	$(AR) -cr $@ $(LIBOBJS)
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_PROG(AR,ar,ar)
+ 
+ dnl Checks for header files.
+ AC_PATH_XTRA
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
new file mode 100644
index 000000000000..32fb662b8379
--- /dev/null
+++ b/net-analyzer/dsniff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		dsniff is a collection of tools for network auditing and penetration testing.
+		dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
+		network for interesting data (passwords, e-mail, files, etc.). arpspoof,
+		dnsspoof, and macof facilitate the interception of network traffic normally
+		unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
+		implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
+		sessions by exploiting weak bindings in ad-hoc PKI.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 85c31fee0b32..c8cd38e9f6fd 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,9 +1,11 @@
 AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9d9d15a1b0205a1d86f132e3faa5ea3e5cf91d55082b2d264e558dca4b7fbe62f643601b3315ac31cae387c433c2d90b670965abfa744f87 SHA512 dddff4858431170f5a24daab2d3cedcdcd7a1194b8ecbbcd794dfe00dcaee4af410afef102d3a25f86f541267d7be63e3e1d239c879e95d20cef9f0dacdcdc4c
 AUX fail2ban-0.11.2-fix-2to3-usage.patch 3905 BLAKE2B f159ac35845bb32f71e5f24e8ea9550c240d1245e0620a72a5df2fd76e8021ca4143959a592dd6fe222b23486280a525ac76d76b4918cc549f5876f4352f8065 SHA512 59cd4d13f7d05111096159e295ba294619c29b223c05f7e79eac0762a1aabb29a7f5465820bc81b5a727ce4549e57c51d29a1099cb0a50d7ad6f86770fb47242
+AUX fail2ban-0.11.2-fix-py3.10-collections.patch 949 BLAKE2B eebed48d15c6a1dcbe00744794c47b460d12cdaee408bd19a48f333aeb6bb5aaedc2ec5d3ce46f32b3830d9ad97a98a635d9822b397d1cce0522936c073f63bd SHA512 ec778e5924253a4f1ebb18c49193e9b2db3a9dc18fd239af582d2b6eb3cbc7aafc12008fe008d0e56bfd345709c6aac9388127650dd52e0f3401746f11ba1179
 AUX fail2ban-0.11.2-fix-systemd-test.patch 863 BLAKE2B 4f506097ceb1d62a076d695a5286075847e1f5757603c2c670f7bfdfd9c5ab6e4844300ff2488c0e5ee9a357a79cbdabaca9c591bc3d664f2f548c57b6638810 SHA512 d47b081f4271a645f56a0ccebbb2af67a0b0e278c192cf12345bb22a988330dff59fcbb0ee838245bbcfe1bf69c1dcc8355ef714a48cf2104c154673dc8a47b6
 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 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 3824 BLAKE2B d36184227c44053704df6abcf4055992d24a54e0bfdf30c1412d9bf0e73773590933a77e730e1a3ec33a1034819c99e6f51db8a6451c10e8fffaff1aaac7d0a5 SHA512 0dc0efe83b81a2fcdc01e94ee299f08785f0d0da8b69c5ef8e69535dd0250996a4be1104d6ea22b49fb79e1b5ec16aca4e30c635b57388e5ad3569681783b7e6
 EBUILD fail2ban-0.11.2.ebuild 3624 BLAKE2B d0329d4f393ff4fad9d8a89ea297d1105f50b1756448b5c22df469a01d6f2d07c87b2d0bb7d2c399235a3a06831ef4b11f1bfeaa98c47bc855837037641eee1f SHA512 87b1a06d7ea32e04fd5422bbf4f7845e318fc9938101e1e6b3a39988aa752c2a15d75cffb1c0de47ad0c3ab1202b5a32c26e2f85314b68737aebd395487e7642
 EBUILD fail2ban-9999.ebuild 3647 BLAKE2B d8f991763425786647a84c1323ab5c660be6bf5accbe2a3d97b771b55f83880d59b40205fa4dd70699a15f04c5ab6ef634fc00962b8ed8018da668b6fbf71f08 SHA512 95d57eb6462f8907a9c9bc0632213935f62a8741350c0b8878765399bf413496ece5b1e0b1cf7a3d58e5b7fba0730ff3261e5201f346c11f779eb7973bcc8174
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
new file mode 100644
index 000000000000..e1483b6442e6
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 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/files/fail2ban-0.11.2-fix-py3.10-collections.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch
new file mode 100644
index 000000000000..6cf4e194b089
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch
@@ -0,0 +1,33 @@
+--- a/fail2ban/server/action.py
++++ b/fail2ban/server/action.py
+@@ -30,7 +30,7 @@ import tempfile
+ import threading
+ import time
+ from abc import ABCMeta
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ 
+ from .failregex import mapTag2Opt
+ from .ipdns import DNSUtils
+--- a/fail2ban/server/actions.py
++++ b/fail2ban/server/actions.py
+@@ -28,7 +28,7 @@ import logging
+ import os
+ import sys
+ import time
+-from collections import Mapping
++from collections.abc import Mapping
+ try:
+ 	from collections import OrderedDict
+ except ImportError:
+--- a/fail2ban/server/jails.py
++++ b/fail2ban/server/jails.py
+@@ -22,7 +22,7 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko"
+ __license__ = "GPL"
+ 
+ from threading import Lock
+-from collections import Mapping
++from collections.abc import Mapping
+ 
+ from ..exceptions import DuplicateJailException, UnknownJailException
+ from .jail import Jail
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index 64369d122773..de017e241d73 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,4 +1,6 @@
 AUX flowgrind-0.8.0-fno-common.patch 744 BLAKE2B 8b7f9f61b875a69e0087c526be21bb0c9cc917c38072b1dda47c77d3e5aa9ba9176742314ead8c03b9cb11e9552e78823f85f6d868f7210b3cd86db5f3df5789 SHA512 98ad53bffd36a7241c4091f5bd86699a699c0edbd4044ffc5861118fcde71ed17278ae3bb56ca95c9444eca04394a592bfce2c1dea35b1574d7fd42568b1797f
 DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a
+DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b
 EBUILD flowgrind-0.8.0-r2.ebuild 858 BLAKE2B 1c009318c2cc1da1f7302c99293daf47d0d0dbaba8d3b28bf834ce4111ccfcc4bd15e25c6122c8e3c0bb6f43dfe865deba9e8256edc504a1072e28e35923d9e4 SHA512 3d5cf63b1393e44aded1fb03de87fc8e4203301dc5450e129a568e2d87d9a309a2023b571e1f7b718de876973905cd592059fb3e7943c2cdfc453307b1347bc7
+EBUILD flowgrind-0.8.2.ebuild 793 BLAKE2B b7a388a797adb67ade440d06d85487c2d8184c7c3a4845c8329e0be01919968268ed477a1ae7b0aadce336860c493faebc937df30524bede90c2ca6c6b849d3a SHA512 d82bbdac31b5ef1cb059f805d2c9b5ede8f17d926badd49d19a29d6ef6bf7587964316fbc6d939ce9f6a0278e18e0c916d243377c9d7ced29257e47be10be907
 MISC metadata.xml 473 BLAKE2B 4d0cdeb61e4d8eb2f19305f9daf9c63a997f10ba1325444b59a66141612bc8d4ec5469151ebda8ffd6af227037fec032e8f256cecfd826b832a34495e1002884 SHA512 b4e6e82bd5d4b4f54784184b81d87e4652579233bd351f65d55d02e34a93cce537267de17dc814726ffbc97bbde8d627234502ac6c1864ea944f0be563a056d9
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
new file mode 100644
index 000000000000..6560928a5f0d
--- /dev/null
+++ b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Network performance measurement tool"
+HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gsl pcap"
+
+RDEPEND="dev-libs/xmlrpc-c:=[abyss,curl]
+	sys-apps/util-linux
+	gsl? ( sci-libs/gsl:= )
+	pcap? ( net-libs/libpcap )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with doc doxygen) \
+		$(use_with gsl) \
+		$(use_with pcap)
+}
+
+src_compile() {
+	default
+
+	use doc && emake html
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/html
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4a027a502635..2a6ea7683f58 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,6 +4,6 @@ DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246
 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
 EBUILD icinga2-2.13.1.ebuild 3953 BLAKE2B 3c77b7daa7343916baeec5a8a7bd4562e4e6de07b3edbb457f04f8e5c414d7bbf0f422957a8c11b3363d90185d4eedb1245af05128e109294b3d16c1079ef0dc SHA512 216c9c67fddd1b81e22b87e98bb8ba1972f99d6b75a052669ad7e89d69e15db898405901b147be74a389f27c2b122f7cfe30a9c834594c4bd84afc23d2e76054
-EBUILD icinga2-2.13.2-r1.ebuild 4094 BLAKE2B ff27de26959fc439d064a9010ef83bcde85500c48a191dc0fd88125714135da2a7b23ef143ba356426f2ec7e10f58c1c0dc21be6be93b736d81308ae7cdcf6f8 SHA512 135fcd7e8f5cfb55ae6bc87d3c85aaa4332d2439db4ca337176e61d02dd6d62915f5c6b6aca6a57be353620b9a2710a45bed9b71671b4e289d619f1b6f19ee42
+EBUILD icinga2-2.13.2-r1.ebuild 4092 BLAKE2B d641add44c58c365452ef49a448ebdc7aaa67316350430f1a2e095bd96c7b9a211d0d0c5c58da37eebbcbfc6ec4e55bb9334e132dca7fb78c9a267bc167f814f SHA512 8d189183feec1ca20c770c94168220c277e53705a3225825ab02e7c754e4e773ea9f9e33138486ff64c923d5c7545c8d51e60a310bc49c1f71d8be92c4b96fe3
 EBUILD icinga2-9999.ebuild 3870 BLAKE2B 6f3f86826465ec9e5049b6c712fc0c55558b966da4293fad9e8307dafb5f3830e61859e54525ab4e1ac887a6115eb060e78d95b6b326b7bec04efe89fa47f91c SHA512 5d3987b0c536f04b00f131ab320e353f55f1b3023233468e3702c501da277ecf1cb687d2304672f0ea1576b98841b0b2bc01bbe70b68056e93a5f6d56e9f63b6
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
index a6919631d7f1..17e94fe2b20f 100644
--- a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake systemd
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> ${P}-9092.patch"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index f69fd815ab99..06da4645e34f 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,4 +1,9 @@
 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
 MISC metadata.xml 414 BLAKE2B 614d653c3ef40f47c7b2eb9e2713091f5ff0dcf7ee1f849a22b69c1b72357c0267def97acd94d3409f45fec58f1b2c4473ea79f2357d6f61d28d0a32bdf41150 SHA512 e0a0666e076c9b275398947a0a13a7a2403a0a067536541d42c26d399cb2c56c1827ca202d253113b3d87b507fee2bbd01f8a7f33baa72cf35602daf0786b23c
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch
new file mode 100644
index 000000000000..6b658eac80bb
--- /dev/null
+++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch
@@ -0,0 +1,18 @@
+From: Sam James <sam@gentoo.org>
+Date: Fri, 10 Dec 2021 03:19:45 +0000
+Subject: [PATCH 3/3] Makefile: don't override CPPFLAGS
+
+There's no need to explicitly blank this and it prevents overrides
+from the environment.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,6 @@ CXXFILES?= iptstate.cc
+ 
+ # THIS IS FOR NORMAL COMPILATION
+ LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
+-CPPFLAGS=
+ 
+ ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
+ 
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..41c875453926
--- /dev/null
+++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch
@@ -0,0 +1,18 @@
+https://github.com/jaymzh/iptstate/pull/21
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 10 Dec 2021 03:10:49 +0000
+Subject: [PATCH 1/2] Makefile: respect LDFLAGS
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -49,7 +49,7 @@ iptstate: iptstate.cc Makefile
+ 	echo "+------------------------------------------------------------+" ;\
+ 	echo "";
+ 
+-	$(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(CXXFILES) -o iptstate $(LIBS)
+ 	@touch iptstate
+ 
+ 	@\
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch
new file mode 100644
index 000000000000..3896799f78ae
--- /dev/null
+++ b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch
@@ -0,0 +1,21 @@
+https://github.com/jaymzh/iptstate/pull/21
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 10 Dec 2021 03:10:42 +0000
+Subject: [PATCH 2/2] Makefile: Use pkg-config
+
+Depending on platform, linking against ncurses may require -ltinfo as well,
+and linking against netfilter_conntrack may require -lnetfilter too.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -25,7 +25,7 @@ CXXFLAGS?= -g -Wall -O2 -Werror=format-security -Wformat-truncation=0
+ CXXFILES?= iptstate.cc
+ 
+ # THIS IS FOR NORMAL COMPILATION
+-LIBS?= -lncurses -lnetfilter_conntrack
++LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
+ CPPFLAGS=
+ 
+ ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
diff --git a/net-analyzer/iptstate/iptstate-2.2.7.ebuild b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
new file mode 100644
index 000000000000..4d851b9e14b3
--- /dev/null
+++ b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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:=
+	>=net-libs/libnetfilter_conntrack-0.0.50"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.7-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.2.7-use-pkg-config.patch
+	"${FILESDIR}"/${PN}-2.2.7-respect-CPPFLAGS.patch
+)
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	dodoc BUGS Changelog CONTRIB README.md WISHLIST
+}
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 1d2149243fb2..55410a315e33 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,5 +2,7 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac
 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
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/mrtg/mrtg-2.17.8.ebuild b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
new file mode 100644
index 000000000000..ad7a69595c27
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
index 2a99436b7364..af2ff53cc9c3 100644
--- a/net-analyzer/nagios-check_linux_bonding/Manifest
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -1,5 +1,3 @@
 DIST check_linux_bonding-1.4.gh.tar.gz 24921 BLAKE2B ef582184471e4ca9d4b9a1d5cdee481852f1f452806ca081e04e74b7b469109f3a5998708cdb7ee6d3ffa9240cdbf721f0cbf6b3f4be2c4cc62042fce6647ccd SHA512 e8195d012a3da53983acdb8ea54d87995541e4e303dce28683ca04b6a6f84826c37db42c295b7e121092482a49268f57355284b57bb77a2212c46b834dd57088
-DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81
-EBUILD nagios-check_linux_bonding-1.4-r1.ebuild 781 BLAKE2B a0bc633cf091f8cfaf90e5b1954c721bc357ae978b45027476e92f7a581e7f994bd4149d77c94f5c510daabb909a9cdb899d37a6167d1ebcd59e3632c77858ee SHA512 3e9cb89c4d0b8f150a26fc809e056e7ff4aa1d87e793da524a83b8593fef4ca2fd5b5589b203228b110adad300bf58d54c32a2162ec86e2e5752a60035e5591a
-EBUILD nagios-check_linux_bonding-1.4.ebuild 713 BLAKE2B 6abd0a186a51daaa22173147c5fdcbcbaa55cc7d78e582779f6d94d6d83123e2f86aee250fbae1ab914e820f8a0e136ce5985f4e65d848ed57b7e6a97d2f7952 SHA512 6e787e6b2ac2cae19094712b7680a7eb6323c67159e18ed73aedb279feb856d91c05c35a1efa367d0e7074cc179e4f1482f6e7ba2276a275eb1f719c026f98e3
+EBUILD nagios-check_linux_bonding-1.4-r1.ebuild 779 BLAKE2B 952b18576d9e6a61b3053bc9090a965092234c96c95b8129c0220d610305f41a86d0da88a626487b3448846251ea39443e320b56647c11855181c0359d1825c1 SHA512 40dbac5bdfbfb02d497e9509ffc5dbb91e8934f1632f4509454226e682d6cda5043f4ad5153a54a7441469acf1c7b21989ca436566157f7caea1486f810e413f
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
index 0dfb488a8078..558d1eb00b93 100644
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/glynastill/${MY_P}/archive/${EGIT_COMMIT}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
deleted file mode 100644
index f5b6af3adc6b..000000000000
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-MY_P=${P/nagios-/}
-
-DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces"
-HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html"
-SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	default
-
-	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
-	dodir "${nagiosplugindir}"
-	exeinto ${nagiosplugindir}
-	doexe check_linux_bonding
-
-	dodoc CHANGES
-	doman man/check_linux_bonding.8
-}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 703d9c695fb4..cb068e6100c0 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.0-es8.x86_64.rpm 15610556 BLAKE2B d7c2e761978998374d484aa061ed12a32a5eb1c458ebe56a1e2c27bf2777132d8aa467b9f1bee2668895f7fd1cca84ee947cd8ba8230e803168faed98c6c3005 SHA512 eadbf52e410354771aee27c6b90254727d5764404552c0d3c0326c48421fecc2ed19be8fb118bfc1784a9dbeaaa79f1d1d3e55278814bd4dcd6d3f2613996d64
-EBUILD nessus-agent-bin-10.0.0.ebuild 2361 BLAKE2B 9c2eeacc92af425c8ee90c7fe7dae1d8de389aa7eecb31831abd49d6d44cd99323b08d3f84df158c4d06825ee231c55d9ff5846f26dd484a684954280d77bd92 SHA512 0f4d46b6d030b3b7847048d6e4ff2d35f766052e0051f94f7b7dd17ca699010fe8c00a7bf3a8ffad56d38a402b160eb03be1019aee10cd74de2ee60b73ec30f9
+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
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild
index c347d77eb5a2..8d4c4cdd4e54 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.0.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit rpm systemd
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index e225cdb1843f..7fbf856c66b5 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.1-es8.x86_64.rpm 46334128 BLAKE2B 3ec2a2177978bd07767c9e04c62b4c83b9050d73adbcb18d6bbcd1f60f7e489f06b2d49701a56b4c0c239d12359d63f107fc28439604e10e958f072b7ea6273e SHA512 b97e2231a5f05317416757449b3cae27efcc8ec0a7f30333268bf4dbbeaaef61d6db740a3e389ab2c34ead0eae0a19c400f9bbac26f5bd1e8380ead141e47496
-EBUILD nessus-bin-10.0.1.ebuild 1989 BLAKE2B ac48b9a95507f50cc029de2c9e1ce018bb73f51442e459f7f8e4f4e62540b6d7a9f728534133cd748be6bde5d222494ddb7f68da506c49458dd283df8c5d9bc0 SHA512 5aa02507bf22b6fc7e23e46a1ee51886c64af45b444e5b0a71a3df74da81612b0819771e4960b4a589d4cf4ad719e4edeff169766e1d6ea42b4d29f8bea05811
+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
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.0.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild
index 6620c073f75f..6620c073f75f 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.0.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 0c3f8b88179b..37758060d05b 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,18 +1,4 @@
-DIST netdata-1.29.0.tar.gz 6233326 BLAKE2B b177fba4d6560b289e5a9fbedffe7f3eae53074fea30483a54a682370ab5427bb1002392ea44efd1c7675dd8347116675d91ac47dbd3fb3d0c66d0391d63971c SHA512 adcc450492f769a1d6277b551d318479dac2150b2c92b9ab648bb3f30cfe3cd0717f2febbe5299093f1d0638a90523aad9f6a073fc34bd91990d2c90416d0fdc
-DIST netdata-1.29.1.tar.gz 6233282 BLAKE2B 53fd82c0b904b6d29eac1534e46d856c9b13460fec7b739cb5e93596961753d978dff0a5e08c88f10d974838809d4266b715e442b54e507ae744122d0345297f SHA512 252efece4501d9cd3c71536b96f9487c618f9a2a3445d0bf0d49f0bfd399b80115b0f57f22fddc5567763a9f41e95f24c8ed64b6e1c29f0d7d121d844d8d1176
-DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc5449189d12215c2af4a5c543fb0be9314842430da75547db0bc5f1027fec313703cbc98d21435807d2105d6761372 SHA512 3046fa99725c9ec9b5cac695d2ab66dbad999fc7b1242722592521b0e270fbb32756a7de4aac9ac8fa4ef5dbf455034f7fdbe84f8e281c12471de61e79a0eacd
-DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
-DIST netdata-1.30.1.tar.gz 7153879 BLAKE2B 68553c000ee3a63cbd79cce5fe4daf75239cd76572160e1903f8325548d0cc4222f0c5e43f1488c31087b40de5222115bbe491cc00e36aea331992fc87b9f1ec SHA512 c3d116bf3459ca6224f5cd8341933c2696581178262a37887c532e09e98e5d075217fcd66574e00cc644fc16ec583b7e2fe54be95c98c477fb20fbe7ad9ed1a9
-DIST netdata-1.31.0.tar.gz 12528280 BLAKE2B 739538b26a07f9f607a2f63f50225ce6ea50feaae8bbb2a60e6a2548ebdf36e4bd37f28d43d414cac44eec4ad9459f40e9532ac61f62f947bd0bd61e64803114 SHA512 62deba75e41fca44015a4e36b6791f7f10ea0a2658bcbd640e231abbbdbf56c7317c9fa72218fbd22a3312b33e7ec7886ea254cba331da9b3a51923e45393576
-DIST netdata-1.32.0.tar.gz 22486361 BLAKE2B 45959a367301a9c2b1e77c2cec33063728356095394a0c3241f669f4b0da61ad55a782dbcddbaa52d1bc7e8870ae971f431341678e2fbe4c6e30893774a9503d SHA512 b90e61b76aae8eb4922ff920434b4c454314fe11438c21565ec186a2ccd116161e6830b5093108625517bbce567e9ab87428044e610bc5c9cd4c9d3d4b59c3fa
-EBUILD netdata-1.29.0.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
-EBUILD netdata-1.29.1.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
-EBUILD netdata-1.29.2.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
-EBUILD netdata-1.29.3.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
-EBUILD netdata-1.30.1-r1.ebuild 3456 BLAKE2B a11fb3094aea689d1b3e637967c6ef8e31f0055dd324556b421b4fa26e573c51028c6a1f8c132030582ea87a949df8b46816f4e6e25e521af1b4bb41274d806a SHA512 ac0fc905b45771c2566ab0f1fa9b5d4a6f6f39ade1489483a92cf770516859d43784ed0b3e4a0eb007aa5029cf01f5ae521272efcee6003fb3d5c66f13efafb1
-EBUILD netdata-1.31.0-r1.ebuild 3560 BLAKE2B a9e13b381407f3dcfe7838edaeb5b9ae8395e7f901d44c5d53f7d8f3645e347d73acc9b9108f23b61eba7240fae3879be5b031a0cc1f270bac7a6057be0ec934 SHA512 5a329c86ab57e02f109483477244d4a114eb9625788c856f7efd70c63ceeeb430be009b7689c318601b58c57fdb1451436f1838056bee1cdcf6b8aa47b38ea95
-EBUILD netdata-1.31.0-r2.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
-EBUILD netdata-1.31.0.ebuild 3463 BLAKE2B 1d037e46b9e988c5c6db463f28b28f7ffef76628b85340fefb1f2f6307edaea3a7362e857fd92a54defdca5203a6bf57e59e596d2f33ffb12fea13cab60c45b2 SHA512 44eca85269f4d4335873640d9367ab56670ddb11fe2ba5a0ce2e013f620a275782cb2c9ccb6f0ec6bc7cafb061aeb39f8bd03a001f44d96b36c0fd3bb635e928
-EBUILD netdata-1.32.0.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
-EBUILD netdata-9999.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
+DIST netdata-1.32.1.tar.gz 22472431 BLAKE2B e05e4f29930493ad0c31373dabff57a3fd4f178730848fe4153aebb6219055ef0edda59577fe0c6cc9bd5cf3444b055e8330744f75581804f316f343fc692710 SHA512 869829eadcec4dd9c05cc6b6279830691b6cf9345cdcc0834e90d71f3bbee508c658d16bd379c51ce470c4e735e7c8d607dc045f45a60da2aa3dac36f37b5757
+EBUILD netdata-1.32.1.ebuild 3667 BLAKE2B 10a3392a000c984b49104a8a0057d5417bac886cab1576e46437693373c4dfad3c53800bdce53af6b2aacc3582c8610a922ff07164f1ecfa9eb984a2c1d00e42 SHA512 bfa739528e1814a6099e255514cd3149bef59439cae9df73ff67a15e736b34bce86c0b2a4e6dee8da3821a9f20796cc0dc871c6c9df4dfa13b0c755bf4e02d75
+EBUILD netdata-9999.ebuild 3668 BLAKE2B 3cbba40a0925b78d90c59a10a24d652d22a9af46fa55e1a496a76be88127c78d56747f0151eeeee9443f1245951772bcc6719623cfecb26223a7a3bbf9b63270 SHA512 83b4a716b93df568a2e4e2b650e7e6c5948c7aaa6e06866f80ed95ddc434d2ed08ba391952c8a241c2d0f0e678b2c7b6c94964f6963fbce839cc6487982f5e7e
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.29.0.ebuild b/net-analyzer/netdata/netdata-1.29.0.ebuild
deleted file mode 100644
index 039fb3e3c07f..000000000000
--- a/net-analyzer/netdata/netdata-1.29.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +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() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-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_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.29.1.ebuild b/net-analyzer/netdata/netdata-1.29.1.ebuild
deleted file mode 100644
index 039fb3e3c07f..000000000000
--- a/net-analyzer/netdata/netdata-1.29.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +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() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-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_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.29.2.ebuild b/net-analyzer/netdata/netdata-1.29.2.ebuild
deleted file mode 100644
index 039fb3e3c07f..000000000000
--- a/net-analyzer/netdata/netdata-1.29.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +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() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-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_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.29.3.ebuild b/net-analyzer/netdata/netdata-1.29.3.ebuild
deleted file mode 100644
index 039fb3e3c07f..000000000000
--- a/net-analyzer/netdata/netdata-1.29.3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +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() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-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_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.30.1-r1.ebuild b/net-analyzer/netdata/netdata-1.30.1-r1.ebuild
deleted file mode 100644
index 7719143cc0dc..000000000000
--- a/net-analyzer/netdata/netdata-1.30.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps 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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		$(use_enable cloud) \
-		$(use_with cloud aclk-ng) \
-		$(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 xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.31.0-r1.ebuild b/net-analyzer/netdata/netdata-1.31.0-r1.ebuild
deleted file mode 100644
index 7d3cc3a14ed7..000000000000
--- a/net-analyzer/netdata/netdata-1.31.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		$(use_enable cloud) \
-		$(use_with cloud aclk-ng) \
-		$(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
-}
diff --git a/net-analyzer/netdata/netdata-1.31.0-r2.ebuild b/net-analyzer/netdata/netdata-1.31.0-r2.ebuild
deleted file mode 100644
index d1b0ffa89e2f..000000000000
--- a/net-analyzer/netdata/netdata-1.31.0-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		$(use_enable cloud) \
-		$(use_with cloud aclk-ng) \
-		$(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.31.0.ebuild b/net-analyzer/netdata/netdata-1.31.0.ebuild
deleted file mode 100644
index 490e2fdc191a..000000000000
--- a/net-analyzer/netdata/netdata-1.31.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		$(use_enable cloud) \
-		$(use_with cloud aclk-ng) \
-		$(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 xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.32.0.ebuild b/net-analyzer/netdata/netdata-1.32.1.ebuild
index d1b0ffa89e2f..97b373861b66 100644
--- a/net-analyzer/netdata/netdata-1.32.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.32.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -10,7 +10,7 @@ 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"
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index d1b0ffa89e2f..3de159430f88 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
deleted file mode 100644
index 277d21e8e1a3..000000000000
--- a/net-analyzer/neti/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX neti-init2 375 BLAKE2B 2524fb79e8c30ab3e6f694ae2b5e81b2e8b7d9e66dccee6b7d0c6f27fc5e00cd903a2ab124b45374e22bb38d9f27a265a17183f22cddc30a03785c9d236a8b34 SHA512 37019c01645c720e425354783b6f98a18ad7ec7ee335c393621f4fbb5f04bca8079d47c24f8961abcbcddca8588725e85c6656a4c92ec9749cdbff4ddfe59707
-DIST neti-2.0.tar.gz 383442 BLAKE2B a76977f6eb16b729e67cf4c98c2b1497d76572374b825bd7200b9d8f3b24634b3bcdae5e611dc3fa145f1cc4d5130d5e8501b017c529a72212a865c845cd01c6 SHA512 5a1156195106e8dcb738c5d2efdd88b77803fa16145db182f2d782a21316fac18af6812b264ece3bc49a5d6713b2aa86aca13129edd01753bf5cf0dd33b1aeb5
-EBUILD neti-2.0-r2.ebuild 1032 BLAKE2B 7b28500e46fd5a2cde35bea82f89ec50cce808b5c32574af50aaeb9117963c4d9206ded1aef097c30e828ad07d04c5516cbbd0535e54237a7dd83f633b3a4785 SHA512 08002fad541db76ea13e26c5b9da22411ad998cdda66d055c5346a7fbb8388d2e3b1bbe4a4b77bab6ee052f7008bf615974a557060dacad3a8e5a3c4e7f51dc0
-MISC metadata.xml 355 BLAKE2B b651b3db8b9a00a434d060f9c279e9391e48d03e9f488da836684253465ccaf80c700d890dc9eab58aebf42f76abfdfb49e874292fd163fdfb0880fff42bc228 SHA512 06ad438d330e36c0bf40c39066ea4e4459d179ef8359796380d5fd1968eb8fcab4aaff86ddbff048995f4c5f723a18b6e4137c8764869e0f1e0d74e315f2f225
diff --git a/net-analyzer/neti/files/neti-init2 b/net-analyzer/neti/files/neti-init2
deleted file mode 100644
index 556660cae489..000000000000
--- a/net-analyzer/neti/files/neti-init2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    need net
-}
-
-start() {
-	ebegin "Starting netiathome"
-	start-stop-daemon --start --quiet --exec /usr/sbin/neti -- -D
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping netiathome"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/neti
-	eend $?
-}
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
deleted file mode 100644
index 7a0a72936bff..000000000000
--- a/net-analyzer/neti/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">neti</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/neti/neti-2.0-r2.ebuild b/net-analyzer/neti/neti-2.0-r2.ebuild
deleted file mode 100644
index 54a3f860e4df..000000000000
--- a/net-analyzer/neti/neti-2.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="NETI@Home research project from GATech"
-HOMEPAGE="http://www.neti.gatech.edu"
-SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE="zlib java"
-
-DEPEND="
-	java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) )
-	net-libs/libpcap
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_with zlib)
-}
-
-src_compile() {
-	emake NETILogParse neti
-
-	use java && emake javadir=/usr/share/${PN} classjava.stamp
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install-sbinPROGRAMS \
-		install-sysconfDATA \
-		install-man \
-		install-info
-
-	if use java; then
-		emake \
-			DESTDIR="${D}" \
-			javadir=/usr/share/${PN} \
-			install-javaJAVA \
-			install-javaDATA
-
-		echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${WORKDIR}"/NETIMap
-		dobin "${WORKDIR}"/NETIMap
-	fi
-
-	dodoc README AUTHORS
-	newinitd "${FILESDIR}"/neti-init2 neti
-}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index b3a18f6772b3..d29c4bcedc4c 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -18,7 +18,7 @@ DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166
 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
-EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
-EBUILD nmap-7.92.ebuild 3173 BLAKE2B c544828871eda5b71909c77efadfe48398ff3f1221f408311ace6cec1bf4fa1cafa53dafae9ceddbc6f91bca8e445071b062cd08b347e17fd2834e9e10db87b9 SHA512 b664dd7f90db0505a35beee5874f1468f73ca9dd3a5a2b1d5e69dc5e5dab668ff8fc1ed27172fcda11ba3096d73aeb163b06760f1c462473c7fb5b53cfa85668
-EBUILD nmap-9999.ebuild 3218 BLAKE2B b59927ba96e976a85f28526f15c4453daf0b8976f8882aa0e5f197e0897d541e3208daab4bd9f8c14d9f73e34a12705b1c5dd43c235210a284f34b1e3aea09da SHA512 a2844c0303768c0658897cdcdffbedc2bcdce868807f86a73ec046e9cfb92c04b3b8eb05f1d2ceb69a4ec5c6b00c167f3407e2080b40b87f3ce9018c9332ff44
+EBUILD nmap-7.91-r2.ebuild 3234 BLAKE2B 0a3cd4470a587606dc00df6d90012f58b257b75e30b52ee180c3cafa3f0b450ad130dbbcd170290ad17f41c6fef6d66780d6e0c8d7ccd0ed9f2f10d6884a9c25 SHA512 180591ea5f8b0fbee002abe708433807b54feb4ea2abb5a4a5fb2e634e9f68d82d7795ee233691ff20a84c19633f88ac8523a9d3826e0306689f80e4d7343ee6
+EBUILD nmap-7.92.ebuild 3172 BLAKE2B f79b29edf7d9088773017c53869cee4203fc49bb7bb8fc97c5848674678951424a406aa19eea779ad099f62e59e0f349ad1ee1f935a6b62e10f710118b9707a0 SHA512 c4dfa5e4ba6af747c2980e42c2fb04a019be56f72365bdfba36a8bef2f3aedf2fb7b946af9badbe3a8145f4d4b7198fa218fba043e0cbe4a66f81d19bd5b7c8d
+EBUILD nmap-9999.ebuild 3217 BLAKE2B 0ab336f6e00a06f3062149f757c24d1af2fbf520aa107d342d67ea0fc8a17ca28257e37c3161bd59283822f2705835e89d3e3f53680463856da83403fef44837 SHA512 5a61e495d7a5cd3633815380816d6c389b3a6208b910bb9d062f45bee2c9461c5f4352bf1e6e3ef5feefffb6350efb691505d8d7a4ed414062a59781363451a7
 MISC metadata.xml 980 BLAKE2B 846ba0a3b3f6da9185f8d8ef3a30e76ffa84da73a3714724493359729af26790cdbe7148058a45d289dbedade8a55ef5608c334c6bfb4cbc61b5ae4db15ef31e SHA512 40bf1717c4f450cf0221c6760b03d33282fb500f29afe0bbf72977d0010dfd57e8a0e07ae67e5ee8ebc671f5ad502722ca0b068a527f98e9506be869a603b074
diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index d8498b958689..7beabe6e0b00 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index b24708e3ba63..348adce730a5 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 996ba7b0df85..466e9b414a06 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 7de4563a3920..f56bbff588c2 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,4 +1,7 @@
 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-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
 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
new file mode 100644
index 000000000000..52fba6fc3921
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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 50bec2437522..130d7f4eed0b 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -6,7 +6,7 @@ DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114
 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 2307 BLAKE2B 229d12e8a50be64a4987639fea0483c6438e79b9319c34aff770c5ff3d7048248dc8d43503e32ba608954d6f3f9fc65d76968e1f12d19cc1f67d7fc64f09482e SHA512 6eaee5aae61523f951608def16cce4e8ff34d74be950e033c6054eb4d2b27a7bd44a95c25e93c70dd0339c5a53010a9c0462a48e983b34d8336b09343218011c
-EBUILD tcpdump-4.99.1.ebuild 2348 BLAKE2B cd4123e2e12df59fa980dc6a56c0976f312d42d9c97fd19352871aa21ed4fb3302727031021ff31f0ad6484f009f3587c7b128e9194a90b94a636cd9faa09464 SHA512 d88de7aa2926aae1f582b3d59e4cf9a711e3c0d4b274f0a9b6ae8b545ca0db009ccc31f992b5cf57c1d5439703f6a8ed83a5d4b44854bd066f9c4ba9cc5583a8
-EBUILD tcpdump-9999.ebuild 2152 BLAKE2B 826b40b6b1993e92e19d3be108c8118789304a541b0d2bd969c88b08d32a177e87ef9d8c00f43208128dc44c1458700fa18474f889ad5f5174b6583c84e43209 SHA512 df08352120690b76ba132a5087d39605e7ae0502e20ab9e0e5ecd9fd6a2585622a6ffe6f542dfa279f54e37fcd564c32fc5b9941c83de0fbb0c57553db111444
+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
 MISC metadata.xml 701 BLAKE2B 0e637bc6e801996414b02cc17023641e07a7b81c4b50b6535fd4668f3fc7e3750f3cfa2e138e5c3c5d1fce8b2b89543f99cbee499c0ecf0960862e5a6f5c86bd SHA512 f891a980cb348222d83103a746354374beef485d9072cfe61eb1a6285dd5b282200490ffe8c7b953ef30958316e12a24dfe86b0c11bf7b7519c61f68d0f27737
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index bfc246ebfee4..e58bf2bc9cf6 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -58,7 +58,7 @@ DEPEND="
 BDEPEND="drop-root? ( virtual/pkgconfig )"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index 2d4cb0743860..06157bef920b 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -59,7 +59,7 @@ DEPEND="
 BDEPEND="drop-root? ( virtual/pkgconfig )"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 748778bb057c..7fb2b1d8d0c3 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 BDEPEND="drop-root? ( virtual/pkgconfig )"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index f2253bcbf6df..01de0d629d65 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -17,9 +17,9 @@ DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b792
 DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4
 DIST vnstat-2.8.tar.gz 290644 BLAKE2B 21ff801ce6abb135c26eb937eadb447bea9fd3dcb2af123051edb9861e088d8fc217f84ef2d924fe8b480388cfc761d0259f8abb2312ae49c2840643787d49bd SHA512 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd
 DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf71fca921dbc642735ec8c0bde97f7ab63cd3953718c21687e6f39099cf2446210f41f3698b39b74116c4c025 SHA512 d5448d68da92d434cc6a34e007002c81ed8d97e533bf99364d3f65b4125bd6f21fe2f6f6efb97775ecc4ba4afd09e12add71ae2299a2d990a7a9d0a591c32811
-EBUILD vnstat-1.17-r1.ebuild 1713 BLAKE2B e6a0509d32fc4e01da97664e5917ab3f52936ff64b2355eb3fb5001666ef3cda799b06d9c9371eeec6cc16bfa4f526ed0f16b05604f05dd9d18949175cc944c8 SHA512 3fdf87be74420b698cc5bb3ff61a15d32d2ee0175cb4eabe2b33389364d3a73a32e6e0a618e9ac7fee29af5fe6512b0606e477a37a1c19309d1cdf9bfd69da5a
-EBUILD vnstat-2.6-r1.ebuild 1874 BLAKE2B 13382c3dc9eabd86b0b3f1e078df103e53f623dc6cdd7d30f520b4eee20897a006ff2c19263da66afe5f220f02312f75bfda9c57344d65a28aa10ef19939bec9 SHA512 be34ffdc8d3a3adb5b9a9142563a2d60c8d372a7e0872f57b1a8dfa2663c338d2306a03312c853b2f95388059f83118b886afbcbe489862e7200be163909b9b9
-EBUILD vnstat-2.7.ebuild 1886 BLAKE2B 1bba15cdf65b93fdc053cd97dfc114a75492baa27961a07f12448dc6766e3c9dd20b43f34745bce4e289d59eafc4ad4eb422d7c68e511558007056fee81ecedc SHA512 441cddc095ff8e7e76f25fbb20bef44924cbb228fbb8188ad6b9b04ea66ad0dedd0f888a0e47f4ad6af9b966bbaff7721b4a4a67c19618af19db57db87b38455
-EBUILD vnstat-2.8.ebuild 1886 BLAKE2B 1bba15cdf65b93fdc053cd97dfc114a75492baa27961a07f12448dc6766e3c9dd20b43f34745bce4e289d59eafc4ad4eb422d7c68e511558007056fee81ecedc SHA512 441cddc095ff8e7e76f25fbb20bef44924cbb228fbb8188ad6b9b04ea66ad0dedd0f888a0e47f4ad6af9b966bbaff7721b4a4a67c19618af19db57db87b38455
-EBUILD vnstat-9999.ebuild 1893 BLAKE2B f53aa75d4ddc29eb5487ac9f82d0c3c3a8652945ce25acd4e1addf45d55821c9c8b32424ad6a4b9075e0dddc05599be803df642f2e6d89a2c5f7a0b3bee225ad SHA512 bdca1b74ac946f48d0c58ca4b65f9b3b782b24584ae99e47c4c451644f5dfea583ec123ef499571addbc52343aae0951b385a7001af254d4a72dc967f689c489
+EBUILD vnstat-1.17-r1.ebuild 1712 BLAKE2B 012f0dbef26d826428b2ffb018307a0f8c9cbd1184e1593442fcea313c100240a536b01ea67be9f80b56b5e3824a6c6ce7b532f4b1580142d6fe3e312a94e024 SHA512 0f12a9c2e8176cbc602d19262441a8c5f4c5367bf0ce3ebb4812f8ba7796768acf676f414cf9d00fac2df8fd5105129e235be081669d6e13bb1026c38e233bce
+EBUILD vnstat-2.6-r1.ebuild 1873 BLAKE2B cc354e757f2a1d87da3875cec1e4c0bddb14af8192a4f237f2483385e8249cef3c6b331728c98432444b33065424b311444a934a00a84bcd526cbba1e99bc749 SHA512 a014bc263e4209b58b67d3fa4b5c3709147fc8829e9147828e492d92805f7d940bc2264d2b04e741635253c2c623d82116726d26e3bb0d78d24dec8905b7af40
+EBUILD vnstat-2.7.ebuild 1885 BLAKE2B 06fc6aa3980bab2cf4b99c21d975b71dfe2098989c8f11e269fccfb19430c686622fecbf51d293df867a426502817d64a5e6f4d6d875379792fafcfc8e87312f SHA512 96b4e42f6d52cadbdd5a8f7c18d80b34e6a355abd51ae4f3ebdf00c140120221a0afb26974c1a116f8539c15317925f2d61f6afa4739f9523c18b248ab0be8cc
+EBUILD vnstat-2.8.ebuild 1885 BLAKE2B 06fc6aa3980bab2cf4b99c21d975b71dfe2098989c8f11e269fccfb19430c686622fecbf51d293df867a426502817d64a5e6f4d6d875379792fafcfc8e87312f SHA512 96b4e42f6d52cadbdd5a8f7c18d80b34e6a355abd51ae4f3ebdf00c140120221a0afb26974c1a116f8539c15317925f2d61f6afa4739f9523c18b248ab0be8cc
+EBUILD vnstat-9999.ebuild 1892 BLAKE2B 73fc53b8632521227cbdad344734b826edb3a81114db96ace07d9b143a4fe35360cfa4679104f152b3c4d44073cbb0f4d1f7f944a6e6694f05fe14d7805c0dec SHA512 9429a556b3c5d711dfb03924238399ad9c15ad8c7185c989452fd224f52118a5441d4a89cbfc790422eb524b30c38520e204729b6b2979576f5e082214c26a8d
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index d66538eaedb0..d02d852bedfd 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 RDEPEND+=" acct-group/vnstat
 	acct-user/vnstat
 	selinux? ( sec-policy/selinux-vnstatd )"
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 
 src_prepare() {
 	default
diff --git a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
index 828e302eae17..ab8be1d07e6c 100644
--- a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild
index 5798621a7601..b596f789e0c9 100644
--- a/net-analyzer/vnstat/vnstat-2.7.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.7.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/vnstat/vnstat-2.8.ebuild b/net-analyzer/vnstat/vnstat-2.8.ebuild
index 5798621a7601..b596f789e0c9 100644
--- a/net-analyzer/vnstat/vnstat-2.8.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.8.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 02ba926a4b8b..407176bb06b7 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f5330d3f1101..f9376194d8bd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,15 +1,10 @@
 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-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.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
-DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
-DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
 DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
-EBUILD wireshark-3.4.10.ebuild 7362 BLAKE2B 1aa51cc5aabda25aaba2d339d2a47e9b350addb1fdaf3be3b28d2cd920940291a7a045609f092de07934f9010cf0ee72560c97ddea07f827a274c391b27aae80 SHA512 5bb8dbb307ef8037b8c54dc6d58ce00c2093a61a5855e6b686efc08e1bd24249ed7dfef8e27dde9af2bc8d543fda0f5f9463ef84e0a8d718c1296e53bd02f0af
-EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
-EBUILD wireshark-3.4.8.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
-EBUILD wireshark-3.4.9.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
-EBUILD wireshark-3.6.0-r1.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
-EBUILD wireshark-9999.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
+EBUILD wireshark-3.4.10.ebuild 7361 BLAKE2B 65370daecce9dffe999ef0099dea5aedd5e7b4a28689c0cfb76847be380ac1d7b0ff09433bc446c3ea0a545bedce0d8ddb259d7d55c2f4492ed4e8dd4f48aa9f SHA512 03549a3ae6ec4e00c16c4d48f016801a848aa8d7d7913c0800c8376d74b31117deeacf442cc901f5c938b82673eec887b00ff695414d9d2873388b79d0995c12
+EBUILD wireshark-3.6.0-r1.ebuild 7232 BLAKE2B f395741d0692143517fbb25af1c4819b0eae9bbf9eb9d6cd12f528f164e8ae618fe370f41b325cefdb27a49e4609bd4199dbcdf67535419339888e5ebbd5bf75 SHA512 27ca383bbea68fc82c1ce42ff114572dd4cf12803654d2447f3b0469b3b2049bf4107247cd8d586360421cab284ed7b40ff4ec75fb4cbbedc6cafe29864940ab
+EBUILD wireshark-9999.ebuild 7185 BLAKE2B 810c4b1b77b49dcaa6cfe6887260b8a60e6e17e23c13044dc8a144c84aef012b61657ba57d07e7d921de3060d321a43023579e20c662fb7c2031f4df7a405fdf SHA512 62e3c4b246b5367acceaae0dae4643b70983b1b99359964a9fa02a7b5130cb8b7b276bb00bf76d495bbfcf42cc453ad0bf18f723536bc583f5fc5eba02279e7e
 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
new file mode 100644
index 000000000000..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+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
index 6380c0c2f9ab..c3e28e4115a4 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -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 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
deleted file mode 100644
index f0021c067742..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
+++ /dev/null
@@ -1,278 +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"
-
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	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 )
-"
-
-RESTRICT="test"
-
-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
-	)
-
-	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.4.8.ebuild b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
deleted file mode 100644
index 68cb4ab7a929..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ /dev/null
@@ -1,280 +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"
-
-# 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 )
-"
-
-RESTRICT="test"
-
-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
-	)
-
-	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.4.9.ebuild b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
deleted file mode 100644
index 68cb4ab7a929..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ /dev/null
@@ -1,280 +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"
-
-# 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 )
-"
-
-RESTRICT="test"
-
-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
-	)
-
-	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.0-r1.ebuild
index 145ec1e5d572..4d5832c71e75 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -18,8 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	# Seems to break libvirt?
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -30,12 +29,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
 RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.38:2
 	>=net-dns/c-ares-1.5:=
 	dev-libs/libgcrypt:=
 	media-libs/speexdsp
@@ -70,18 +71,12 @@ CDEPEND="
 	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="
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
-	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -93,21 +88,15 @@ BDEPEND="
 	test? (
 		dev-python/pytest
 		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
+	)"
+RDEPEND="${RDEPEND}
 	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
+	selinux? ( sec-policy/selinux-wireshark )"
 
 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() {
@@ -119,7 +108,7 @@ src_configure() {
 
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
+	if use kerberos ; then
 		case $(krb5-config --libs) in
 			*-lcrypto*)
 				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
@@ -130,7 +119,7 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5; then
+	if use qt5 ; then
 		export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
@@ -138,6 +127,7 @@ src_configure() {
 	python_setup
 
 	mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
@@ -237,19 +227,21 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5; then
+	if use qt5 ; then
 		local s
-		for s in 16 32 48 64 128 256 512 1024; do
+
+		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
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
 		rm -r "${ED}"/usr/share/appdata || die
 	fi
 }
@@ -262,7 +254,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
-	if use dumpcap && use pcap; then
+	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
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 145ec1e5d572..01d79e76e7b1 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -18,8 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	# Seems to break libvirt?
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -30,12 +29,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
 RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.38:2
 	>=net-dns/c-ares-1.5:=
 	dev-libs/libgcrypt:=
 	media-libs/speexdsp
@@ -70,18 +71,12 @@ CDEPEND="
 	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="
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
-	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -93,17 +88,10 @@ BDEPEND="
 	test? (
 		dev-python/pytest
 		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
+	)"
+RDEPEND="${RDEPEND}
 	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
+	selinux? ( sec-policy/selinux-wireshark )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -119,7 +107,7 @@ src_configure() {
 
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
+	if use kerberos ; then
 		case $(krb5-config --libs) in
 			*-lcrypto*)
 				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
@@ -130,7 +118,7 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5; then
+	if use qt5 ; then
 		export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
@@ -138,6 +126,7 @@ src_configure() {
 	python_setup
 
 	mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
@@ -237,19 +226,21 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5; then
+	if use qt5 ; then
 		local s
-		for s in 16 32 48 64 128 256 512 1024; do
+
+		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
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
 		rm -r "${ED}"/usr/share/appdata || die
 	fi
 }
@@ -262,7 +253,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
-	if use dumpcap && use pcap; then
+	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
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f3b0d29d8d3f..9239d5dbef6c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -260,11 +260,11 @@ DIST zabbix-5.0.18.tar.gz 21377940 BLAKE2B 4143dd2b5c4b04795e2f1b43637e541e3108a
 DIST zabbix-5.4.6.tar.gz 24371783 BLAKE2B 3be879a9b0452f2ee1b36c94511d6ee1a79214f14f3e9438da0035f258c70b190671e9991b0691209be9440b0103ec10a8c2a6cc4f3304a4638ebce0d8eb58a7 SHA512 4ca755bd715d5ba70cfe99894351cdf8ee82e8e8b2316fa7b95c083b9f13e6b3d986d87a52f157b00271bed7edaede5cdda020ca43015d7cf848f51ed169089b
 DIST zabbix-5.4.7.tar.gz 24424262 BLAKE2B c89bdd91ad8702d1edb60288013447aee910822d5a877a348f8770e4573906569393bb3e12a1b050f8550f8f5ac35308ec35795c2a1334ada5230c6e72b48286 SHA512 f87fd158d74c289765ddc3394bfa1c009d72d2756596c2060d567b5e44123594f00307f4df28a67b38c0e59a9d26f7d064afe73e7a3a0bd4e9bc02529334b1d1
 DIST zabbix-5.4.8.tar.gz 24431613 BLAKE2B 82279ba2a4515603d50083a391ea2c9d230dcc7459d62841cf003eaa092012cb2e5b5ba7c3a5eeabd4df27a8d5b6e97a90824fb119ee078864c6bf06cfec5cad SHA512 1812142cc949a2886cd1edd4d369934022aa5e89ae31b67641b7263dfbc5d3ee6f99a20a51e5b44e4af5719160f728766c5546e74c8bf9b0cf303867d20fba11
-EBUILD zabbix-4.0.35.ebuild 9609 BLAKE2B 3e1a24b044b8b539fc4fcab0359daba90f67c4e4b1b06e22e689d9f9da1d686c193bc578b513c7222863a947b77ad875beaf0435a2beccaac232b61585a49432 SHA512 9199e01bd6758d456726128705e16525ffbd7e24d27d599a5029f79943cbf58027a146e7dc2df920bfab8cfc622dc99e3b7675d5610ddebe6841008a286e67d8
-EBUILD zabbix-4.0.36.ebuild 9614 BLAKE2B 4adfd5b43cce8506461ff9cfcb50bf03fd099af46bed9505ff8acd266b9eef12e511eec2a7f3933002900f5466475f65872f254886e4126160790fb6979acb93 SHA512 5289e0adce0db9c3440e3f1ed2504f0cc82525905bb2482d43295ef98e6294dcc1c2e10ed800ff38e6b37a33cab6b7d917cb9c014b9222d783511087a07ba374
-EBUILD zabbix-5.0.17.ebuild 31374 BLAKE2B d6817579f1aedc51f76ac6d5136f5dfd5da1fb4e7381535d30a4f43e1ddf1359fbfeaeff4f2e34780617a4559a7beaba15d78db84e5d79652437823023fbfa01 SHA512 df80b919f16b1e573ec196e904b9bc05bcf2cf40b89ec9972dd3630d3321a8c7ad01db88f7fd84ce0d772a3b5318317a77eb99c270200067c1f21a54e843f1f5
-EBUILD zabbix-5.0.18.ebuild 31379 BLAKE2B 8cb7952e6bab5af2920d23fc6733643a67ea1aa37cd505259668d124b238e60655c46c7752794cab41010808957a2cf2ec5a3caebd401aeca5ffd2bb533bf7c8 SHA512 dbd620962a5a33b3c65e280140d08872c1b14349e4320efe89b4b721d18d8a9fde5ac945a0c280d4c51a645327609a5aa3eb1d2dca150b7b64a92ec750ac85c8
-EBUILD zabbix-5.4.6.ebuild 33764 BLAKE2B 16ce3fb691447df4d4e70db0e9b060688257ed2a9ac2ebbcc94be0f85b1d073a3c406232f181de3bab4ea3819cfe34d7fe033bb70fecb354bf8c15a2511e54c7 SHA512 87b6fc8c73dc0911bc362088e0722a1211e94f15415f197f4f2f3047eeb80eab16e4e41bbc8121691a71760a04bc77480516eb20fd096b0d5cdbbf89b3f805b3
-EBUILD zabbix-5.4.7-r1.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
-EBUILD zabbix-5.4.8.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
-MISC metadata.xml 1520 BLAKE2B 4f9851bc026e8d1aaaec68b21be3709972dad92e8b9d6bfa6de5cbac63dc324d74784284fab88227983d77526b21f7b17350f69cff3ef57db3608320b5bc7e7d SHA512 4f60c01cddfa125905c5623e56fed3194fbbc927ba2a5880618bd423f21ce52f910a5dfffdd4204734b0ce8fcb304b1deb77884a0150cbb9c94b386c4db48023
+EBUILD zabbix-4.0.35.ebuild 9581 BLAKE2B 5006cac49a7891198816ffc8a01f7098998adfdb3f182a91ba84414fad67c8dc099e7da1b59b137fb88ecb6c606572335ba98febbaea381c9bff4ef83a28622d SHA512 a9d598499cc71bedd87c610019076e4044b44f841bf8f54433754b5bc42ab83dbd816de978c653668ec0775d43978c82708b4a3e749ad92ed141878db752dc24
+EBUILD zabbix-4.0.36.ebuild 9586 BLAKE2B 96c4fa8408bf03524f507e25315820ccdf03cc72b1143b06365a0e0d7150b30069af2e22a4bb84942f44a4137fd87711b187b92b3c5f1774e9a613039778ce35 SHA512 cf440fe16b38d0ddad9bb5c14501d1fb8b7939d675dc2b73fbed3dc7dfbfc99fdbf7b1e9ca16a0765cfacd5551edffc9645387b3b0eef215494518ed36e186d9
+EBUILD zabbix-5.0.17.ebuild 31346 BLAKE2B dde8e3e6d595f13739af3b835725ff386e5b758ae80950c900102ef89be2640c743ba343369a355954ccd04462c0cf8fe5743ba0a466324f7113504d9bd97c00 SHA512 f8c2d46ae838ab7793e0d85894800226149ca9fc16805602654d73161fbaead3db364a9e5d3699b725a0accc695c5619d859b3d59db301cf67b7a7ce9d162bc9
+EBUILD zabbix-5.0.18-r1.ebuild 31496 BLAKE2B e884f48efa84617fac80e0ac566347711c460694b331136f419a017c7c67f62bb188e4e4b5b9f6f8885a0462f76ddd46d99ad47d4f2c389eb06d0302175fe802 SHA512 30b09fd58bf6ef3c6d59d665b74656c1f9ea8b0d3b50cd9bbca73d6543932949b3ce16f68b816ea24fec17f3e96d65b47f3e538d918a917e1138d00ba271265a
+EBUILD zabbix-5.4.6.ebuild 33736 BLAKE2B f8ef5ad2ffe78c9d6efa728428b93947bb3d976c65c9ed0b1d8776b338a025bc088e7b37af0cd436f2ffb75742734076634ffa877169f7f8e8797583e86db255 SHA512 c8dfc23e37b8f6fae0766cf9f3e01a0669d897997e72a9eefd48ea9fe9be6985aa1b50750b5568434ebbdfc7e3c62bdf6db0761319010785e9a1a486b7bebfa3
+EBUILD zabbix-5.4.7-r1.ebuild 33741 BLAKE2B c3b63e069c5273cb7aba254e89ed816632c47a6ef5a782cd9a56191d5a77e7105aaecfac847a59a6d77e73a83620df374aad5d6a1a6f53a37cb415510bd2e5d5 SHA512 3a39ec83b593b8503ba3f2ea93afb789bbb9bf258d443f5318451944e9675c3911d0f0a39faea99fdf43f01098eacf17dd4bb67df158651e82902a4b59c39299
+EBUILD zabbix-5.4.8-r1.ebuild 33886 BLAKE2B acf48706f509695a817d8330052b3a29984e6e9ce58a175e1d1eba607b76a3b2ce96b3b51333f3f0351d1d0b17acd9b0c08bdadbbbbf9cda0ee80be572c33725 SHA512 1a2fe5933a0305163ea759cbb57d10fc29a895c0255f33bc883f35b07e29cce05aa81e249c94475270e371f1786152bf99ac51f6097b053cd3f3f230929cdeeb
+MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 8cfe48094b16..0e9bba15c9c0 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -5,6 +5,10 @@
     <email>fordfrog@gentoo.org</email>
     <name>Miroslav Šulc</name>
   </maintainer>
+  <maintainer type="person">
+    <name>Florian Schmaus</name>
+    <email>flow@gentoo.org</email>
+  </maintainer>
   <longdescription>
 ZABBIX is software for monitoring of your applications, network and servers.
 ZABBIX supports both polling and trapping techniques to collect data from
diff --git a/net-analyzer/zabbix/zabbix-4.0.35.ebuild b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
index 9b6c9fe12b7b..211d787cfca6 100644
--- a/net-analyzer/zabbix/zabbix-4.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
@@ -131,10 +131,6 @@ 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.36.ebuild b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
index 6313b45e4a61..d3edede455f2 100644
--- a/net-analyzer/zabbix/zabbix-4.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
@@ -131,10 +131,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-5.0.17.ebuild b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
index b4e2c53f9574..7f66cd058cc7 100644
--- a/net-analyzer/zabbix/zabbix-5.0.17.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
@@ -351,10 +351,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-5.0.18.ebuild b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
index 0e9da3be9ad9..49f4cf175e49 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+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
@@ -312,6 +313,10 @@ DEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
 "
 
 # upstream tests fail for agent2
@@ -351,8 +356,11 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
 	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
 }
 
 src_configure() {
diff --git a/net-analyzer/zabbix/zabbix-5.4.6.ebuild b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
index 72d2b869ff39..aea6cc153d8e 100644
--- a/net-analyzer/zabbix/zabbix-5.4.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
@@ -376,10 +376,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		"$(use_enable agent)" \
diff --git a/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
index 6a0d5e421042..325b72f8c392 100644
--- a/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
@@ -376,10 +376,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		"$(use_enable agent)" \
diff --git a/net-analyzer/zabbix/zabbix-5.4.8.ebuild b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
index 6a0d5e421042..a30e0af267b1 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+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
@@ -337,6 +338,10 @@ DEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
 "
 
 # upstream tests fail for agent2
@@ -376,8 +381,11 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
 	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
 }
 
 src_configure() {
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /net-analyzer
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)