gentoo auto-resync : 01:05:2023 - 17:20:35

77 files changed, 19 insertions, 3034 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b55e7668efc3..564d0691a36f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 0dfc9aedc339..fe3a8a3fcfc9 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -5,8 +5,6 @@ AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51
 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
 AUX argus-clients-3.0.8.3-configure-clang16.patch 1231 BLAKE2B db60b5a763e4399f17804f0b31bc7b6a14d3ef6c8a175c92c561a286653b4c8f96f5248d3f7de03c09b856c1aac29590c1ff15e0ed9e39ea0d3403fd2a882baa SHA512 a4c487c6c28ce1abafcdb188b427bf64efb983bfc3f6860588526be9b5c38285a5a0fb86c79ce1222ad069fe8bb2e7d961e371273d926ddbf32cb226a7325cde
 AUX argus-clients-3.0.8.4-autoconf-2.70.patch 1991 BLAKE2B a427573acefd042e7a1b4971a79cad08c79ffe94c4ff3f8583ffa3ea3180d920a001023a6a80df8293c8bbaa3cb16f50b0b508cb92c383ef044971d5b6cc2ccf SHA512 2ba0048229a695d72eeb9662fe7bc368ab21897b8092f6aeeac923fc4e484d1eef5fa2e5b19449a74755626989127c0461dd65f84957e17581303dd418c9667f
-DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
 DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473
-EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 0f57ac0135c8f41a205a91f4f58c7eeea3fc08fd6458b456716f24ad1c9673e00cb222f182115a7c67f47dd4becd114c48140dea4c604aee9399d8216f27835c SHA512 94cd545aca182702e25b29774bbb7cd191a96e709ad882a8434a2b09b482496d7865938c82006f6473a27b2c3771a5816868c1e58d3c112ca32ab9103e8b6d5d
 EBUILD argus-clients-3.0.8.4.ebuild 1657 BLAKE2B e3f042cced512acba61c2a4027ea8d79d425e7555535291441463013686d14e0d11c46280dfdea1e53af48b254b4aaad2ff39984817dbe958f705a51cdba6c3b SHA512 10137a423818e3f0986a21f4b8053350ec262b2f57e16d0c1407adf099bfaf9b73fd33527c8cde489d59308aaaa82941596cdeead70aeaa892729743d3372e07
 MISC metadata.xml 478 BLAKE2B cf272a8304aac515a3d31880a655e5d3425df1977666466f9589981d0b4add05f5a7b263a39ab2d1eb3b7099e07db0e0a518088e709521c52dde4ad45d8cd21c SHA512 bc5f2c51bbddbdbab7e4737e699c9f71ba43f342a164726bbde48f31de83ef124d8b303491a2bf4f440b58e7a2fbcbca1f6ff2b3d0c2fcef9f48d5033585d727
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
deleted file mode 100644
index 55425715a1ae..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://openargus.org/"
-SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-ARGUS_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	net-libs/libtirpc:=
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="
-	${ARGUS_CDEPEND}
-"
-DEPEND="
-	${ARGUS_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR RANLIB
-
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql mysql /usr)
-}
-
-src_compile() {
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB="$(tc-getRANLIB)" \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index c161f9660347..7183a44ca1d5 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,6 +1,4 @@
 AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec6520058c42e517f80dffae1bb15d063e32adbf1688929a21da5af78374e1966b4f0c29e0ad0b7b0b50c9844182d SHA512 47f601284da95f3148322157292a86f425cc4846d17547025fd5677e6ffc8b2f6f01cdf4403cf6ca5d701b0ab322ce9c345e26e3382afc6dea189afaa57b77aa
-DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
 DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8
-EBUILD bwm-ng-0.6.2.ebuild 699 BLAKE2B 6b4d4ba5ccc497d0193500eac4812a8927737f24c017a3e9e8de2ffa20e9bef87f10c06305d1712c4031653db870b04616f5c333244382dba8bb00d6184ae45d SHA512 3600129dc614250c3617f2c526605e9f8acabbd50d9bf03b8933f5325babdcaecaaeb8ed96b02838b082cbcbc13d5cbce638f45be50240bec8f664efcd8c6bd1
 EBUILD bwm-ng-0.6.3.ebuild 698 BLAKE2B 01712cdc0cb55b387d96a8842ed88044c135eede318062ecdbd543bf598536cc566c6d1f1d989af105b417a9d9f1886f2bbec5b23cbbddd27ebc6451130b0356 SHA512 68ad2747299244cf55b13128cf58dc5acc8c32bf7301408847bc2f148a55cd8f49d0e3730ec55f7876749e2f1d7fc5b850b7d8c3848425ed253f225c98849799
 MISC metadata.xml 464 BLAKE2B 95e80f2df460e80890b4a85419ceb2bb19a15a399f13fb26af3ad4acf6709545696076ee7a7f3f25b0e160dd134afa9dfd76a31248ed24086badbe114c7a5f0c SHA512 9e482f24e7e64ba1d1387c56b9788d658f0bdc63aedc26c6ea56f23455e6f49211197758d56fb7dc00fc7a2b4b26bf97cc730aafe5425ea30a4f42cbe471f088
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
deleted file mode 100644
index 2b7bf683dc9e..000000000000
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
-HOMEPAGE="http://www.gropp.org/"
-SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+csv +html"
-
-RDEPEND="
-	>=sys-apps/net-tools-1.60-r1
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable csv) \
-		$(use_enable html) \
-		--with-ncurses \
-		--with-procnetdev
-}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 7da163db3896..f66d046747e1 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,10 +1,5 @@
 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.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
-DIST cacti-spine-1.2.19.tar.gz 113974 BLAKE2B 6ec71e1480e9dfd2636c61bcea10c6581009908334fddbaab5cf4bf6948bc6f8ffb27b0325ab1f325b9ad0b0f2ba7e018373c34534ca5d4967f66100fba76934 SHA512 407a4e83aabaa62693c2f7c3d3952da9178bb28e2b8b914a5649e3eaccb9ea77d0c7db8e251a113a308bfaaa0674be941abfb2fc4f8e50d43fb73c8cd9deec63
 DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c
-EBUILD cacti-spine-1.2.17.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
-EBUILD cacti-spine-1.2.19.ebuild 869 BLAKE2B 9e4b4b35400f7cdb298e9788c9aaf1a8db283d5e312aeecd0a804b73cd80fc4b53eae0b822e4ed5f060f94b60c1f617af54c8f9e6dda2d57868ca2dfd7211e08 SHA512 a56cca2de931d2d536b16e105c042057b4793c2533c93b242b5818a9f49829d1be29803147d267a6afc766c15401cccf30babc988a6287407e565a0380f2166f
 EBUILD cacti-spine-1.2.20.ebuild 870 BLAKE2B 429c82db00bff6b69a6b77d5e9ce549349d909d3884eeb032ebaabaf4d17ec735ee858fed8c92f4c75dbe872af40c8706491f195e89ece3af4cd18eaa44b0d9f SHA512 ad6175e6f4576cbcdd0ea2612c4446b59e9680361d73999fd959aca19ddb57d0a0faede9805ffaa70481b0f4d9ae86eb86da882313076089b6a60b20bca57a6a
 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.17.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
deleted file mode 100644
index 6c9200ecdceb..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-
-BDEPEND="sys-apps/help2man"
-DEPEND="
-	dev-libs/openssl:0=
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-RDEPEND="
-	${DEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
deleted file mode 100644
index 97df3de4d3d4..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 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/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
deleted file mode 100644
index 53a220fbf0de..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/cbm/Manifest b/net-analyzer/cbm/Manifest
index b7efeb0ce86d..0071305288da 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -1,6 +1,4 @@
 AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
 DIST cbm-0.3.2.tar.gz 17448 BLAKE2B 21acdfb2e125b31f617bd3204cc11ef199647552b67671e62bec7a94ea4a5c213a1099c72261e6370aee06e4a6686392878a30a863778387c08a1a8095855940 SHA512 7a597467203786023a8efee23ea1ed65195f872f6287ed2767f9be449cc47757980703f629222f37309c25cc5f201d9581a713479d954ddc99347d641ab4ac34
-DIST cbm-0.3.tar.gz 16473 BLAKE2B 165b01ec6d0fdd691763d990e1fe81b010942077f593e64fd3ccf5f070960612ddb2ccd1aef87530b0d0fe4c40e5d758c55d33b4b6e1c4b850769ef46b8a6b79 SHA512 dd4845465b34b978e6c696d6b0fa61969aead4bdd4474a264667af63cd99c5a1035f4961645237c3870dc366ea4b131c2e005d2abb2774814d127a61ecae8e29
 EBUILD cbm-0.3.2.ebuild 606 BLAKE2B 752d1992fa52d9275d1739bdc46639273083c181760574d9e7c00c2f28b352b13087f1e655b8e4ed45ecb2327e6c5c4c8ecc170f978143a5ad65601f1246c0a6 SHA512 06a35f093d78379b0b308031b341587ab3b55f02eeae34849dbdce7cf703f5da1a4cf6cbb8beb8d61719207ce8827998f6ca08dc2860dd31a071214479d22a54
-EBUILD cbm-0.3.ebuild 606 BLAKE2B 752d1992fa52d9275d1739bdc46639273083c181760574d9e7c00c2f28b352b13087f1e655b8e4ed45ecb2327e6c5c4c8ecc170f978143a5ad65601f1246c0a6 SHA512 06a35f093d78379b0b308031b341587ab3b55f02eeae34849dbdce7cf703f5da1a4cf6cbb8beb8d61719207ce8827998f6ca08dc2860dd31a071214479d22a54
-MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
+MISC metadata.xml 383 BLAKE2B a38cde5e72bd4abb99f12fc0667db6188f0222b9156cd7a2ffc37d731a4347c74d457971624c40fac52f04a080084a75659ffa76619750981ccec6193bdd86ac SHA512 b34c3bec7a778a8a981e98a02f298c49ceb5bb2dfbcdaede9901a41b28190d1552e0804a661dc916e4951ba6aae3d3ac7f409fd0b97791850a67f029698a7014
diff --git a/net-analyzer/cbm/cbm-0.3.ebuild b/net-analyzer/cbm/cbm-0.3.ebuild
deleted file mode 100644
index 9c8f5b01a4b2..000000000000
--- a/net-analyzer/cbm/cbm-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Color Bandwidth Meter"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/cbm"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.4
-	app-text/xmlto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml
index d5af4bcfaf13..d5554963005f 100644
--- a/net-analyzer/cbm/metadata.xml
+++ b/net-analyzer/cbm/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">resurrecting-open-source-projects/cbm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/dnsmap/Manifest b/net-analyzer/dnsmap/Manifest
index 78bb32f9162b..6c06b7a5c1a1 100644
--- a/net-analyzer/dnsmap/Manifest
+++ b/net-analyzer/dnsmap/Manifest
@@ -1,5 +1,3 @@
-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
+MISC metadata.xml 324 BLAKE2B f07a7105179e5f83e6326ea28a9f185dfc4683e3826d2a4c04906b76a83df9894dba04e9327cbee86711fe7c109575ef088f66d5c3265b90af326aaa10f41200 SHA512 c4194f76b2e54700c77a80636b566a835fd3e7a95b6df33d43d4854ad88a1ce836ba135e88897f705cabde05f4dc239a86579059ff85021257ef7271d04ff0e6
diff --git a/net-analyzer/dnsmap/dnsmap-0.35.ebuild b/net-analyzer/dnsmap/dnsmap-0.35.ebuild
deleted file mode 100644
index d6cb5787b332..000000000000
--- a/net-analyzer/dnsmap/dnsmap-0.35.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-}
-
-src_install() {
-	default
-}
diff --git a/net-analyzer/dnsmap/metadata.xml b/net-analyzer/dnsmap/metadata.xml
index c73b0839b368..9c17f50421ee 100644
--- a/net-analyzer/dnsmap/metadata.xml
+++ b/net-analyzer/dnsmap/metadata.xml
@@ -1,7 +1,10 @@
 <?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>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">resurrecting-open-source-projects/dnsmap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index d25774624896..c0972d877322 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -2,6 +2,5 @@ AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9
 AUX fail2ban-1.0.2-configreader-warning.patch 844 BLAKE2B 3dca580b50c7fa425765ee28fd07d033e738e81ac08f1b66a9b328c7fdf24227c0dca81927e61933c3c3d0c7b6895aed797642f15b449bb6485c8bef6c2315a7 SHA512 119f6b06c099f1dd147859408714fdfe3c73e254ad0d4bf04e535a1f6cbaf08ba368f3e616df792579528e5b6e26bd1be5408258a807d7e2ba36020b211d8e9e
 DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
 EBUILD fail2ban-1.0.2-r1.ebuild 3721 BLAKE2B 91d110536739b2844f4d643e2a817caeab74d4a5062cc4ffa720eb643d8badc0275163914f940b9c9ff6ebf894e6f73e743765b798417f85767bfe2730f0b62a SHA512 c329269e3f1f6703deb4cd9f7a06acb8790816708fc97e4e7ddaa8cf274e3ae82daf27948e76812405d040044ca9111a0d0f92e1a6ad1edf1c75a820e5ed7d17
-EBUILD fail2ban-1.0.2.ebuild 3660 BLAKE2B 4afdb26014e00f40bb809b31037307f603008ccd0e7d646a82fa749bc9e324a22cf2d11fc831c45c607c3ce3ca899662340cbb04d279ade738cfbf44a03f2303 SHA512 5505d02a844797e68c2576fa4393ab357af611fe0a1dbf401b4dd3b91c680eb185b7e7d927ef85a4dd00e59ee2dd687bcb0fa31e0df7c61ced7dea6cb1134532
 EBUILD fail2ban-9999.ebuild 3682 BLAKE2B ef42c66e102750ccfe920c23d2922b2b0de0b9ab9978fbaabdaf84a9f4632a329aa4ae81cc483ce75bd1aa9171b89312dbde9ed931c1fd134b7ba0224375ec25 SHA512 aed88a4f56effb9c1c26470f1c5b46057ae7b442718f7aca9305746eaaeb75142b258cb08fdf93b93408912966f77462f1a4053460435e7f1d9a7ac54173c7a4
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild
deleted file mode 100644
index 4d8875e9a447..000000000000
--- a/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/fail2ban/fail2ban"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fail2ban/fail2ban/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}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-)
-
-python_prepare_all() {
-	distutils-r1_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
-}
-
-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}"
-
-	# Workaround for bug #790251
-	rm -r fail2ban.egg-info || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
-	newconfd files/fail2ban-openrc.conf ${PN}
-
-	# These two are placed in the ${BUILD_DIR} after being "built"
-	# in install_scripts().
-	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
-	systemd_dounit "${BUILD_DIR}/${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/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index dd53345186a1..ff6a4a231cc0 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,7 +1,4 @@
 AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8
-AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c
 DIST graphite-web-1.1.10.tar.gz 1192965 BLAKE2B cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04 SHA512 fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9
-DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
 EBUILD graphite-web-1.1.10.ebuild 3151 BLAKE2B 381f6da2fdcd52bf1ebcb227ea1aa60b28903a28e0c3fab95adc6cc85f3490e02f4648724cd29ff60bce32c70618ecca811428d7ac192d8800a4e3f5f1615aaa SHA512 12463dbec6ca7a3bac33ebd67203228a16918e06ce3bdcb4a99736c3f6fea4f5772221291a5c59a5d91494b132ef4761525dc72991fb7b90e5543a0dd7686e5c
-EBUILD graphite-web-1.1.8-r3.ebuild 3268 BLAKE2B f1337d6b597690be3f0d29fac629b0945a8f76af49a027cea66db6eec906b1d0768e10e58a400422edf38e77b3429629cae26e2da19930b6f26eb5c03ab7291b SHA512 f7303604d341619bf6f33f842e09d2c2ccb74db735cd1451a006bc6b22e69a55cf2304d835252c31958ae69ec5d374767a12fbeea3bb98a4d3e838aa40f6ffc9
 MISC metadata.xml 593 BLAKE2B 35159475d570570bde9acc2dd8d6abdf742d03ced88259125cc474f9ea2b9bfcf80c64da1dd44bcb69e55390d72c11c8aaa3b947f68571940c3b8676e6024387 SHA512 7a07c214a85f09ded5ecb5a353d96fc746c5c67f5c71f7539647651fd1519e78e1a3887a4865e9dab59d9804a9b0d801cc1ee72e0fd7225fe75273790e31e28f
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch
deleted file mode 100644
index 6a1c44ff0109..000000000000
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Modified to apply on 1.1.8 release
-
-From 5de8405307ded14930b3381380e9f91e583172a9 Mon Sep 17 00:00:00 2001
-From: parrotpock <51694161+parrotpock@users.noreply.github.com>
-Date: Mon, 15 Nov 2021 17:39:23 +0100
-Subject: [PATCH] Fix pyparsing > 3.0 compatibility issue. (#2727)
-
-* Fix bool() issue in recursion termination check.
-
-The behaviour of ParsedResults seems to have changed in the way that
-the usage of pop() along with the bool() check on the object interact
-wrt checking if there are further elements in the parsed structure to
-consume. In version > 3.0 bool() checks whether either the internal
-_toklist or _tokdict members contain items left to consume and returns
-True if either do, whereas pop with no arguments will only consume from
-the underlying list. That means that we would get a True in the if
-condition in this code, whereas a subsequent call to pop() would throw
-an exception. Calling asList() forces the use of the list representation
-in the bool check here and so fixes this issue.
-
-* Fix pyparsing backwards compatibility issue.
-
-* Remove upper-bound on pin.
-
-* Add pyparsing3 test target for versions >= 3.0.6
-
-* Remove try/except, use dictionary key index syntax
-
-Co-authored-by: Ubuntu <ubuntu@ip-172-31-7-19.eu-west-1.compute.internal>
----
- webapp/graphite/render/evaluator.py      | 2 +-
- webapp/graphite/render/grammar_unsafe.py | 2 +-
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/webapp/graphite/render/evaluator.py b/webapp/graphite/render/evaluator.py
-index 748626ed0c..12179dcc44 100644
---- a/webapp/graphite/render/evaluator.py
-+++ b/webapp/graphite/render/evaluator.py
-@@ -58,7 +58,7 @@ def evaluateTokens(requestContext, tokens, replacements=None, pipedArg=None):
-     return evaluateTokens(requestContext, tokens.template, arglist)
- 
-   if tokens.expression:
--    if tokens.expression.pipedCalls:
-+    if tokens.expression.pipedCalls.asList():
-       # when the expression has piped calls, we pop the right-most call and pass the remaining
-       # expression into it via pipedArg, to get the same result as a nested call
-       rightMost = tokens.expression.pipedCalls.pop()
-diff --git a/webapp/graphite/render/grammar_unsafe.py b/webapp/graphite/render/grammar_unsafe.py
-index f25b5eff8f..2481176b53 100644
---- a/webapp/graphite/render/grammar_unsafe.py
-+++ b/webapp/graphite/render/grammar_unsafe.py
-@@ -80,7 +80,7 @@
- 
- 
- def setRaw(s, loc, toks):
--    toks[0].raw = s[toks[0].start:toks[0].end]
-+    toks[0]['raw'] = s[toks[0].start:toks[0].end]
- 
- 
- call = Group(
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
deleted file mode 100644
index ecd178a9d3d0..000000000000
--- a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon ldap mysql memcached postgres +sqlite"
-
-DEPEND=""
-RDEPEND="
-	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
-	<dev-python/django-4[sqlite?,${PYTHON_USEDEP}]
-	>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch
-	# pyparsing fix, can be dropped from 1.1.9 onwards
-	"${FILESDIR}"/${PN}-1.1.8-pyparsing3.patch
-)
-
-python_prepare_all() {
-	# Use a less common name
-	mv bin/build-index bin/${PN}-build-index || die
-	# use FHS-style paths
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-	eprefixify \
-		conf/graphite.wsgi.example \
-		webapp/graphite/local_settings.py.example
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /var/{lib,log}/${PN}
-	docinto examples
-	docompress -x "/usr/share/doc/${PF}/examples"
-	dodoc \
-		examples/example-graphite-vhost.conf \
-		conf/dashboard.conf.example \
-		conf/graphite.wsgi.example
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-data="${EPREFIX}"/usr/share/${PN}
-
-	# copy the file once, to keep the timestamps correct, #808863
-	if [[ ! -e ${ED}/etc/${PN}/local_settings.py ]] ; then
-		insinto /etc/${PN}
-		newins webapp/graphite/local_settings.py.example local_settings.py
-	fi
-	pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
-	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
-	popd > /dev/null || die
-
-	python_optimize
-}
-
-pkg_config() {
-	"${EROOT}"/usr/bin/django-admin.py migrate \
-		--settings=graphite.settings --run-syncdb
-	"${EROOT}"/usr/bin/${PN}-build-index
-}
-
-pkg_postinst() {
-	# Only display this for new installs
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to configure ${PN} to run with a WSGI server of your choice."
-		elog "For example using Apache, you can use www-apache/mod_wsgi,"
-		elog "            using Nginx, you can use www-servers/uwsgi."
-		elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
-		elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
-		elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
-		elog ""
-		elog "If you want to update the search index regularily, you should consider running"
-		elog "the '${PN}-build-index' script in a crontab."
-	fi
-}
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 8713390e73a1..e91f168b7d17 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -1,9 +1,4 @@
-AUX ifstatus-1.1.0-gcc43.patch 177 BLAKE2B eebb05af9a80e552ad162231a22cb6ae2a65f80f788fc863aa6a8f330fdca710e49cdb0974c8ff1271338c8b38e580b6db76e947a96d022dee7364195c74a724 SHA512 9241cfcceef902ee52ca6ee1fec4e84823b4c75fd2e8329b2644f6c776d77d298c0f5943aac4b901409117720021d595abb79ac8473a3dca18f2cf78e1ecf769
-AUX ifstatus-1.1.0-gcc6.patch 397 BLAKE2B 2b723cfec0fcd087606b32cbf8eced77f6e90e6bf20cd61ca43f0f5dde33a43bb8eaa7aeed699e1ab57e458aaa48f9689b2be623320a6c931768371d937bd4ab SHA512 f90abee913b3e16c44015e3f61a0b1dc120043293cdf439640443409d1b862e9881f5599a481db32b557a04e7f161cfbd378307e611a2499dbafd857ec00c47b
-AUX ifstatus-1.1.0-tinfo.patch 472 BLAKE2B 180f38fbeb7c820db4e25204e60719eb66acd193e12ceb3ab5c955a251a42f86f742970af4994472e215f40bc4f300ddfcf8b30ee8537bffb117446e2aef48f6 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c
 AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b2463f3acf309475d88a4d30d2fe88839d3f41e250a80dc45c5c37022be2edd31b0e82db3c64bcc2e7b626408846 SHA512 febc844be240323844fc0b7f29b4c00ef4c0cfb29b50cad8501be05271d21733529f1725b0e5980f2c973663f9953e242b4f6bd4bb567d9a13701f0c7cca30ea
-DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
-EBUILD ifstatus-1.1.0-r2.ebuild 923 BLAKE2B 94fbf50de6b256cf4752b7aa589004d8b2f740e0f7a6b0c9809a7368a129fd3015bb0430a448787f2ffb01e77ba6402e9d4ecdee5263bc3b832cbecb7c582007 SHA512 f83e52bf3eeebbd30b7a50dd7b88d0c659bce4515d93481ec9349c03fe251a7a209a7ee9d5839e08bbeb807d47309de324189cc2aa684c483c8247ef62204ce4
 EBUILD ifstatus-2.0.0.ebuild 904 BLAKE2B 35a7c27dc34bee5079597b98fc6697880a609f7131c51a013df95fbca6839923229e0b838b15e1c812c1e9a3211e84dc8d3aa18bf7f1a06a8b815c599a2c8bcf SHA512 d884bb335fbcf282f4f90c02988a3d4db86875957e1dc1fb8d704fd64d652c1bbc9eb95d6807828b02612c209f40ac36d30e03e32eda9af4c0c6edbcdf0130ea
 MISC metadata.xml 359 BLAKE2B 8ee76d6419c0c099dae50da470c8094cc9f348f9f348367d01dea9fdf6d8b33a6cbf8f5c0054afc9497d58f6cc377d692ee9e690acb9525895cd557e0a090efe SHA512 e40a8d7c224c67677c91d81a391d75b03f6913db6d65fd93a828eae55c97f7d324e862009c89437d891e85c5de3726565ac40c8176c99ced420e4e186cb847cd
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch
deleted file mode 100644
index 27111d7576f4..000000000000
--- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Main.h
-+++ b/Main.h
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <curses.h>
-+#include <stdlib.h>
- 
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
deleted file mode 100644
index 760a09fbf2c6..000000000000
--- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Interface.h
-+++ b/Interface.h
-@@ -57,7 +57,11 @@
- 
- 	InterfaceData & operator=(InterfaceData & rInterfaceData);
- 	InterfaceData operator-(InterfaceData & rInterfaceData);
-	
-+#if __cplusplus >= 201103L
-+	InterfaceData & operator=(InterfaceData && rInterfaceData) = default;
-+	InterfaceData(const InterfaceData&) = default;
-+#endif
- private:
- 
- 	unsigned long long m_ullReceived[eTotalTypes];
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch
deleted file mode 100644
index e2c14e6add71..000000000000
--- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,7 @@
- # Makefile for IFStatus
- # Gabriel Montenegro 
- 
--GCC = g++
--LDFLAGS = -lncurses
--CFLAGS = -O2 -Wall
-+LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
- 
- BIN = ifstatus
- OBJ = BorderDecorator.o\
-@@ -30,7 +28,7 @@
- all : ifstatus printdone
- 
- ifstatus : $(OBJ)
--	$(GCC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-+	$(LINK.cc) $^ $(LDLIBS) -o $@
- 
- printdone:
- 	@if [ -e "./${BIN}" ]; then echo "Compiled.."; else echo "Error compiling!"; fi
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
deleted file mode 100644
index 986b1e4ad565..000000000000
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple CLI program for displaying network statistics in real time"
-HOMEPAGE="http://ifstatus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-
-RDEPEND=">=sys-libs/ncurses-4.2:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-	tc-export CXX PKG_CONFIG
-}
-
-src_install() {
-	dobin ifstatus
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	elog "You may want to configure ~/.ifstatus/ifstatus.cfg"
-	elog "before running ifstatus. For example, you may add"
-	elog "Interfaces = eth0 there. Read the README file for"
-	elog "more information."
-}
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
index f4e75fd03330..63821e11deff 100644
--- a/net-analyzer/knocker/Manifest
+++ b/net-analyzer/knocker/Manifest
@@ -1,10 +1,5 @@
-AUX knocker-0.7.1-fency.patch 5350 BLAKE2B 936b898918d794e3065eec8d867e467246c5b4e33ca3e92c5d37c0d3c66644ae1edb2d246e26c7178639f8295a0a67577e29778c5f8d99d650151b34d99ef4de SHA512 6836be77417fc4a5e98c9a5aa619a66eae012037162b78532fd0269ebeec54c7f91537c159d9a1374b1c9b470a632ba1a90d28cd7514155d98752bc59ab6d17b
-AUX knocker-0.7.1-fno-common.patch 6208 BLAKE2B b8a77d7763f8725240aff2c49499fc9a16b52435cd859905540653dc08583b9f37b2172895b73735b35a15924b49d25ecab69dfc538015c38c45576073c3aa9d SHA512 f9f0292e8ee2d1dc91f17899fd911072325fbca80ae3bb0cd5aec7c6d3120f9ebbd35dc40acec34927927822f5685fd90a208c873dae82b65b42d3ff4ad26d38
-AUX knocker-0.7.1-free.patch 607 BLAKE2B c19a36088b6cdce6b9e79555c349871e0aa47a9bcd9285cfa8944a267548e20fdc7df6f27c6dc3d8d123a8350b108325bbe754984b4cc9a05764a31daffc894c SHA512 f1f237747394a2ca6b14105be5461c98e441ecd3c4da0c1475ac6dfa717d2a0b004d3fb702b026b45f5f873c88d3f60b4fd5234dd445fd27346c95bc4c5c5671
 AUX knocker-0.7.1-knocker_user_is_root.patch 221 BLAKE2B 45143bc54b31b1cce735499836682cc006dc2288bd927bf2269713582c3189ebd6ebf468bd019b00b8a31aa47f6f423b0a2c5fbc70719bb663c49ff525f6b6ce SHA512 42b4d4de839e0a606d091909f7bbba0031a6e337fa7b766bb737fd60006afdc87c368cdb642e9bf14ee1d7d0c5bd7b6193006ab0240230f819b67df155f1822d
 AUX knocker-0.8.0-fency.patch 5847 BLAKE2B 29e630a560255f28fc0130639e50b30c5016c721a9fac75e43a863cadf76b4ceb534d212ab2de58c68860320bb80288d042ba7ef5e86e9173d98598d019c500e SHA512 327fa4982d579a4c2dce59605106112868cedb3bb29b2afc1f0fc1e05f1a6a85386b543bd6fdc7c078dbbd521500f685971ae771eecf5e02d9f8b414f63ae1b3
-DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2
 DIST knocker-0.8.0.tar.gz 117380 BLAKE2B bb6b344efc0c7b22266b59430eff3b7982d328b54277085cef9709f9f41b7e6e40b1cc22944b36f927db00cd7f15afc1774be20df504e1f3f4eb2b2b1c293973 SHA512 127fde05f2f331e7a4489c4612852fe841f0981b737be1d871de33355a0b55f2ab50d2c083ef857420b4af81909d5cc8fbe6c89174e141f77e6bf25719b6bf47
-EBUILD knocker-0.7.1-r3.ebuild 608 BLAKE2B 3175166968725797d46f00947f67485e616436527926cd9dc1bbee4a04795c9af92f6cc1389a11d2bc1cdc7cdc39d64dfe62328e4956824510750b48ec2278b5 SHA512 72e82125db8319e9bcf183502a77c36f4f0bee383154e92e256f10d96b1f2d4ad46d8b4dc41e8bc8ec382db97d85eab192c27f6c6eeacd191346916f6d9ca0d8
 EBUILD knocker-0.8.0.ebuild 557 BLAKE2B 8b6580607c57516c25cfa8fe4be0844a3a85ed4c1dc3db5d9b92a0a5a6e8c8adc647178c2e633934ef03bff5b840988612867877375c4ab5596c92513103b161 SHA512 4b71c05a073c6e8ccede04cf457a99977b74c7163432ceba755652cafd40ce933975709e8886618d4cf34c4546310130fd78e9a97f32fdbf4013f91ab2345cc8
 MISC metadata.xml 412 BLAKE2B c42292c6b27c00bd4e780e92630c7488dfa69051a81fb66d7c804f0a1fc81b3fabbc5a35fbaf577ce9cd93aec70549dfc30f899844f714957c2165341dffa4be SHA512 e42c91c6e21606048dcfc9cf6508db125791a030e581c1a6bea449494c2b2c342ea2203194cea8b75f7ca4844db22a8b33988d2341374b044d93b21c0103a970
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch b/net-analyzer/knocker/files/knocker-0.7.1-fency.patch
deleted file mode 100644
index 6051d87b2e68..000000000000
--- a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -23,7 +23,7 @@
-    .conf in the user ~/.knocker subdirectory.
-  
- 13 May 2002
--  - --no-fency (-nf for short) option added. This switch tells knocker to show
-+  - --no-fancy (-nf for short) option added. This switch tells knocker to show
-     the output in a "polite" way. All the lines and stuffs shown in the default
- 	mode, will not be displayed using this option.
-   
---- a/src/knocker_args.c
-+++ b/src/knocker_args.c
-@@ -82,7 +82,7 @@
-   fprintf (stdout, "Extra options:\n");
-   fprintf (stdout, "      %s,  %s             quiet mode (no console output, logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT);
-   fprintf (stdout, "      %s, %s <logfile> log scan results to the specified file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT);
--  fprintf (stdout, "      %s, %s          disable fency output\n", NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT);
-+  fprintf (stdout, "      %s, %s          disable fancy output\n", NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT);
-   fprintf (stdout, "      %s, %s         disable colored output\n", NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT);
-   fprintf (stdout, "\n");
-   fprintf (stdout, "      %s              let you configure %s\n", CONFIGURE_LONG_OPT, PACKAGE);
-@@ -111,7 +111,7 @@
-   args->logfile = logfile;
-   args->quiet = quiet;
-   args->colors = colors;
--  args->fency = TRUE;           /* true by default */
-+  args->fancy = TRUE;           /* true by default */
- 
-   return 0;
- }
-@@ -189,10 +189,10 @@
-             }
-           return (0);           /* we should have all arguments here */
-         }
--      else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FENCY_LONG_OPT)))
-+      else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FANCY_LONG_OPT)))
-         {
--          /* Disable fency output */
--          args->fency = FALSE;
-+          /* Disable fancy output */
-+          args->fancy = FALSE;
-         }
-       else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT)))
-         {
---- a/src/knocker_output.c
-+++ b/src/knocker_output.c
-@@ -48,7 +48,7 @@
- {
-   time_t timenow;
- 
--  if (!knocker_args.fency)
-+  if (!knocker_args.fancy)
-     return 0;
- 
- 
-@@ -104,7 +104,7 @@
- */
- void knocker_output_host_info (const char *hostname_str, const char *hostip_str)
- {
--  if (knocker_args.fency)
-+  if (knocker_args.fancy)
-     {
-       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
-       knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
-@@ -134,7 +134,7 @@
- */
- void knocker_output_resolve_error (char *hostname_str)
- {
--  if (knocker_args.fency)
-+  if (knocker_args.fancy)
-     {
-       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
-       knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
-@@ -157,7 +157,7 @@
- */
- void knocker_output_ports_info (int sp, int ep)
- {
--  if (!knocker_args.fency)
-+  if (!knocker_args.fancy)
-     {
-       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
-       return;
-@@ -183,7 +183,7 @@
- */
- void knocker_output_open_port (int port, char *service_str)
- {
--  if (knocker_args.fency)
-+  if (knocker_args.fancy)
-     {
-       knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
-       knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
-@@ -216,7 +216,7 @@
- */
- void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps,  int open_ps, char *secs)
- {
--  if (knocker_args.fency)
-+  if (knocker_args.fancy)
-     {
-       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
-       knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ",
---- a/src/knocker_main.c
-+++ b/src/knocker_main.c
-@@ -75,7 +75,7 @@
- 
-   knocker_core_init_portscan_data (&pscan_data);
- 
--  if (knocker_args.fency)
-+  if (knocker_args.fancy)
-     knocker_term_clear ();
- 
-   knocker_output_open ();
---- a/src/knocker_args.h
-+++ b/src/knocker_args.h
-@@ -53,9 +53,9 @@
- #define QUIET_MODE_SHORT_OPT "-q"
- #define QUIET_MODE_LONG_OPT "--quiet"
- 
--  /* option to disable fency cool out put */
--#define NO_FENCY_SHORT_OPT "-nf"
--#define NO_FENCY_LONG_OPT  "--no-fency"
-+  /* option to disable fancy cool out put */
-+#define NO_FANCY_SHORT_OPT "-nf"
-+#define NO_FANCY_LONG_OPT  "--no-fancy"
- 
-   /* option to disable colored out put */
- #define NO_COLORS_SHORT_OPT "-nc"
-@@ -88,7 +88,7 @@
-   int logfile;     /* log to file TRUE,FALSE */
-   int quiet;       /* quiet mode TRUE,FALSE  */
-   int colors;      /* no colors, TRUE,FALSE  */
--  int fency;       /* fency output, TRUE, FALSE */
-+  int fancy;       /* fancy output, TRUE, FALSE */
-   int win32_frontend;
- } knocker_args_t;
- 
---- a/docs/knocker.1
-+++ b/docs/knocker.1
-@@ -38,8 +38,8 @@
- \fB\-lf\fr, \fB\-\-logfile <logfile>\fR
- log the results to a specified file.
- .TP
--\fB\-nf\fr, \fB\-\-no-fency\fR
--disable fency output
-+\fB\-nf\fr, \fB\-\-no-fancy\fR
-+disable fancy output
- .TP
- \fB\-nc\fr, \fB\-\-no-colors\fR
- disable colored output
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch b/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch
deleted file mode 100644
index 0b5247a653a4..000000000000
--- a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- a/src/knocker_args.c
-+++ b/src/knocker_args.c
-@@ -34,6 +34,7 @@
- 
- static int _have_last_host = 0; /* tells if we've got the host with the --last-host option */
- 
-+knocker_args_t knocker_args; /* command line arguments structure */
- 
- /*
-    ============================================================================
---- a/src/knocker_args.h
-+++ b/src/knocker_args.h
-@@ -93,7 +93,7 @@
- } knocker_args_t;
- 
- 
--knocker_args_t knocker_args; /* command line arguments structure */
-+extern knocker_args_t knocker_args; /* command line arguments structure */
- 
- /*
-  Initialize a knocker_args_t type of structure
---- a/src/knocker_conf.c
-+++ b/src/knocker_conf.c
-@@ -31,6 +31,11 @@
- #include "knocker_user.h"
- #include "knocker_conf.h"
- 
-+int KNOCKER_USER_COLOR;
-+int KNOCKER_COLOR_1;
-+int KNOCKER_COLOR_2;
-+int KNOCKER_COLOR_1_ATTR;
-+int KNOCKER_COLOR_2_ATTR;
- 
- /*
-    ============================================================================
---- a/src/knocker_conf.h
-+++ b/src/knocker_conf.h
-@@ -46,11 +46,11 @@
- /* The actual values variable */
- /* these values are read from the conf file */
- /* by the knocker_conf_parse function */
--int KNOCKER_USER_COLOR;
--int KNOCKER_COLOR_1;
--int KNOCKER_COLOR_2;
--int KNOCKER_COLOR_1_ATTR;
--int KNOCKER_COLOR_2_ATTR;
-+extern int KNOCKER_USER_COLOR;
-+extern int KNOCKER_COLOR_1;
-+extern int KNOCKER_COLOR_2;
-+extern int KNOCKER_COLOR_1_ATTR;
-+extern int KNOCKER_COLOR_2_ATTR;
- 
- void knocker_conf_configure ( void );
- int knocker_conf_parse ( void );
---- a/src/knocker_core.c
-+++ b/src/knocker_core.c
-@@ -50,6 +50,9 @@
- static void knocker_core_free_host_ip_string (knocker_core_host_t * hinfo);
- 
- 
-+char *knocker_core_last_hostip;   /* string of the last resolved host ip address */
-+char *knocker_core_last_hostname; /* string of the last used host name */
-+char *knocker_core_last_service;  /* string of the last service */
- 
- /*
-    ============================================================================
---- a/src/knocker_core.h
-+++ b/src/knocker_core.h
-@@ -164,9 +164,9 @@
- static const char knocker_core_author_email[] = _KNOCKER_CORE_AUTHOR_EMAIL_;
- 
- /* allocated and deallocated within knocker_core_init, knocker_core_quit */
--char *knocker_core_last_hostip;   /* string of the last resolved host ip address */
--char *knocker_core_last_hostname; /* string of the last used host name */
--char *knocker_core_last_service;  /* string of the last service */
-+extern char *knocker_core_last_hostip;   /* string of the last resolved host ip address */
-+extern char *knocker_core_last_hostname; /* string of the last used host name */
-+extern char *knocker_core_last_service;  /* string of the last service */
- 
- 
- int   knocker_core_init ( void );
---- a/src/knocker_led.c
-+++ b/src/knocker_led.c
-@@ -50,6 +50,9 @@
- #define LED_VALUE_SCR   LED_SCR
- 
- 
-+knocker_led_t knocker_led_status;
-+int ledt;
-+
- #ifndef NO_LED
- static int initialized = 0;
- #endif
---- a/src/knocker_led.h
-+++ b/src/knocker_led.h
-@@ -65,7 +65,7 @@
-   int sequence;  /* used in knocker_led_sequence() only */
- } knocker_led_t;
- 
--knocker_led_t knocker_led_status;
-+extern knocker_led_t knocker_led_status;
- 
- void knocker_led_turn_on  (int led);
- void knocker_led_turn_off (int led);
-@@ -75,7 +75,7 @@
- void knocker_led_reset ( void );
- 
- #define led_delay 1
--int ledt;
-+extern int ledt;
- 
- #endif /* _KNOCKER_LED_H_ */
- 
---- a/src/knocker_log.c
-+++ b/src/knocker_log.c
-@@ -30,7 +30,7 @@
- const char knocker_log_header[] =
-   "+-----------------------------------------------------------------------------+\n|--=| k n o c k e r -- t h e -- n e t -- p o r t s c a n n e r |=-=[logfile]=-|\n+-----------------------------------------------------------------------------+\n";
- 
--char *knocker_time;
-+FILE *knocker_log_fp;
- 
- /*
-    ============================================================================
---- a/src/knocker_log.h
-+++ b/src/knocker_log.h
-@@ -33,7 +33,7 @@
- #include <string.h>
- 
- #define KNOCKER_LOG_FILE "knocker_scan.log"
--FILE *knocker_log_fp;
-+extern FILE *knocker_log_fp;
- 
- int  knocker_log_open (const char *filename);
- void knocker_log_host_info (char *hostname_str, char *hostip_str);
---- a/src/knocker_output.c
-+++ b/src/knocker_output.c
-@@ -38,8 +38,6 @@
- };
- 
- 
--char *knocker_time;
--
- /*
-    ============================================================================
-    ============================================================================
---- a/src/knocker_services.c
-+++ b/src/knocker_services.c
-@@ -28,6 +28,9 @@
- #include "knocker_services.h"
- #include "knocker_core.h"
- 
-+int knocker_core_services_db_init;
-+char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES];
-+
- /* this following list of services has been automatically
-    generated from /etc/services */
- 
---- a/src/knocker_services.h
-+++ b/src/knocker_services.h
-@@ -29,9 +29,9 @@
- 
- #define SERVICES_DB_TOTAL_SERVICES 30000 /* was erroneously 231 */ 
- 
--int knocker_core_services_db_init;
-+extern int knocker_core_services_db_init;
- 
--char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES];
-+extern char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES];
- 
- int  init_knocker_core_services_db ( void );
- void free_knocker_core_services_db ( void );
---- a/src/knocker_time.c
-+++ b/src/knocker_time.c
-@@ -40,6 +40,7 @@
- static struct timeval timer_start;
- #endif
- 
-+char *knocker_time;
- 
- void knocker_time_start_timer (void)
- {
---- a/src/knocker_time.h
-+++ b/src/knocker_time.h
-@@ -30,6 +30,8 @@
- 
- #include <time.h>
- 
-+extern char *knocker_time;
-+
- void   knocker_time_start_timer (void);
- double knocker_time_get_ticks   (void);
- void   knocker_time_delay (unsigned long ms);
---- a/src/knocker_user.c
-+++ b/src/knocker_user.c
-@@ -41,6 +41,8 @@
- #define KNOCKER_LASTSCAN_FILE   "lastscan"
- #define KNOCKER_TOKEN  "|"
- 
-+knocker_user_t knocker_user;
-+
- static int _dir_exists (const char *path);
- static int _dir_create (const char *path);
- static int _file_exists (const char *path);
---- a/src/knocker_user.h
-+++ b/src/knocker_user.h
-@@ -30,7 +30,7 @@
-   int    super;  /* user is root or not */
- } knocker_user_t;
- 
--knocker_user_t knocker_user;
-+extern knocker_user_t knocker_user;
- 
- int   knocker_user_is_root ( void );
- char *knocker_user_get_username ( void );
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-free.patch b/net-analyzer/knocker/files/knocker-0.7.1-free.patch
deleted file mode 100644
index 5381d2fd83e3..000000000000
--- a/net-analyzer/knocker/files/knocker-0.7.1-free.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/knocker_conf.c
-+++ b/src/knocker_conf.c
-@@ -223,6 +223,8 @@
- {
-   char *tmpp = malloc (strlen (line));
-   char *p = malloc (strlen (line));
-+  char *tmpp_orig = tmpp;
-+  char *p_orig = p;
- 
-   /* Check if the option is present in the line */
-   tmpp = strstr (line, opt);
-@@ -234,7 +236,7 @@
- 
-   if (!_isblank (*tmpp) || *tmpp != KNOCKER_OPTION_TOKEN)
-     {
--      free (tmpp);
-+      free (tmpp_orig);
-       return 0;
-     }
- 
-@@ -247,8 +249,7 @@
- 
-   strcpy (value, p);
- 
--  /* free(p); this cause knocker to segfault */
--  /* well I have to know why... */
-+  free(p_orig);
- 
-   return 1;
- }
diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
deleted file mode 100644
index 0e56cfddb098..000000000000
--- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Knocker is an easy to use security port scanner written in C"
-HOMEPAGE="http://knocker.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fency.patch
-	"${FILESDIR}"/${P}-free.patch
-	"${FILESDIR}"/${P}-knocker_user_is_root.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
-
-src_configure() {
-	tc-export CC
-	default
-}
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 7e10245df6cb..98d42df5cb5b 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,7 +1,4 @@
-AUX linkchecker-10.1.0-version.patch 947 BLAKE2B 50ba94c0247bf4045d826e138e3608d69c8a15aa87c47567354e964bb6f691f659b2343a62f46fbc7dcba93f7df65fb3bed13f2ecd89546bddf241951b57126a SHA512 e1f0f43940e0a18fe4a093218cd504acc29b3a5339923347e6593a80e741f0de215a41382abbb68a91fe8d9937c65b436fc9b5e9069c25c9d319d6587b217abc
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
 DIST LinkChecker-10.2.1.tar.gz 545530 BLAKE2B ddbf22d9cdd04d89257b92d032cff24e4dde866b4be115f7b5b878bf2a42dd08159eef451b33ed621d747f06dffa445f4258975b932e5ae0eb8b79cfb8203549 SHA512 6410aff11e94cbf001979a85dd41e50daaa6a3577689d4256a0a5627a29253baef24ed7739dbafe91f58c0841923ac3094aa558e91f34629e3e6c008e461230a
-DIST linkchecker-10.1.0.tar.gz 521214 BLAKE2B 767c1176751a2011e0e175eb7c9e7b3704bda0d469bad7b38ac1481db62b470fbb69a62bf11316699e15fd1ca822f801a1237c798754353aba5c559ccd9d3274 SHA512 a6ba57ef9c617ece2c53d54cf460571561bfa60831e038e31e520e7fbee789566616b6e5b0b98529376510ef4e228bebdb6e6e011fb986b74d837ebc69323085
-EBUILD linkchecker-10.1.0.ebuild 1445 BLAKE2B c1143e5886b7508498f680a3051335eee23ced5036becaba4ddf666ca95c74c3e6ad2f8a56f03640dc866722d9f6bf717cc1e60ef73df19f7e900b1231db0e4b SHA512 6006b5c738d4f0e057882a71b68c0b72536bbd54ce69886bdf77b97a573d587b859185dd9c89c3e715710e371cdfaa1d9765a5dc03c8a50ee56cb0622076eec6
 EBUILD linkchecker-10.2.1.ebuild 1669 BLAKE2B 2d5830ef0ff6c022b72be321cf2d9a20f16219afcad1edaff5f40fa35f9f7c043fbe479e6d8e90411f086ef8e9d4784f6e234c345ee53c3bfcf8e264699ad64c SHA512 03cb5587b06db39cef6a1321a2eaf81678c81e9548f6148e010f68ae05d8a634b829cb4dabd9496522c078ab69d0abcaab5c5eeb8880f7a66d5e14a888657c72
 MISC metadata.xml 575 BLAKE2B 6996e2d330f7c0e9976cf1cc2964ce3d426f5527c491dfb0630630bddee0c932f28b0ff9fe1c9d4778ad7d73bbb69816d8740f7b3b1b5fb5545dacd073c51aaf SHA512 567a432bd5410dddf0589eaadc6ea81f516c131ce84c3ba2e1a42757d32362821f3ea1bb832d4f41381d4ee62152c019b8daa46685353cba8a6da89bb892a989
diff --git a/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch b/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch
deleted file mode 100644
index f0132a8a8089..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c00bdc0..8493d09 100755
---- a/setup.py
-+++ b/setup.py
-@@ -56,6 +56,7 @@ else:
- 
- # the application name
- AppName = "LinkChecker"
-+AppVersion = "LINKCHECKER_VERSION"
- Description = "check links in web documents or full websites"
- 
- RELEASE_DATE_FILE = "_release_date"
-@@ -340,10 +341,7 @@ if os.name == "posix":
- 
- setup(
-     name=AppName,
--    use_scm_version={
--        "local_scheme": "node-and-timestamp",
--        "version_scheme": "post-release",
--    },
-+    version=AppVersion,
-     description=Description,
-     keywords="link,url,site,checking,crawling,verification,validation",
-     author=myname,
-@@ -383,7 +381,6 @@ setup(
-     options={},
-     # Requirements, usable with setuptools or the new Python packaging module.
-     python_requires=">= 3.6",
--    setup_requires=["setuptools_scm"],
-     install_requires=[
-         "importlib_metadata;python_version<'3.8'",
-         "requests >= 2.4",
diff --git a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
deleted file mode 100644
index 228488bd17f2..000000000000
--- a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://github.com/linkcheck/linkchecker"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/linkchecker/linkchecker/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="sqlite"
-# requires libs not present in portage yet
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-	"${FILESDIR}/${PN}-10.1.0-version.patch"
-)
-
-DOCS=(
-	doc/changelog.txt
-	doc/upgrading.txt
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "s/LINKCHECKER_VERSION/${PV}/g" -i setup.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp config/linkchecker-completion ${PN}
-}
-
-pkg_postinst() {
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 59c1ae45b526..0c0959e1832f 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -20,7 +20,6 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
-EBUILD net-snmp-5.9.3-r1.ebuild 6255 BLAKE2B 8b30492799dfec7f7e44e2ce22d3fc8ae7dd67801933b4d2fd2f705a45e49d6ddb7913f85a3a9656ee60ff8a28decb7b7355d9262d61d7754e70657b6905465f SHA512 52f33d593d218eefc821d7a701a7ee1b833874b82e2f54de86c57cff0704fb772f53371dfbbb0a77e7aef453c125a4553d6e069db1c810eebd86a80251d14141
 EBUILD net-snmp-5.9.3-r2.ebuild 6351 BLAKE2B 879b478aab24af05650d2249010c1fa82f4b1481e085c4c8464a3f5852044e4856992471d5121bf160b0dffcd55a0fd109a83fe216afcf7489ce340a7689a116 SHA512 7c1cf490a95223dfd474175653b97e2a4878d120fdcbc3ee37b922db6759a64293a0e5f51b95125bd21cdac7af299cc30406f1873a2ec4c7430513c068af22f2
 EBUILD net-snmp-9999.ebuild 6358 BLAKE2B 6a4a042b286b705e3ccc329e32462e125a475da367c1adf701fe00e9c811f2047a6107d610c738a4b0f52d1338fed1454234db28bcb90c7d57f8af6c401f8e45 SHA512 6898a380aeb322f3cac6a276c8f104edb4474825255d9996d93a80ec706d3acefe2ac58e4411a2e15b942ef03207e4b976ed202fec82183854902d9004d33db3
 MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r1.ebuild
deleted file mode 100644
index eedf5f643045..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=yes
-DISTUTILS_SINGLE_IMPL=yes
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{9..10} )
-WANT_AUTOMAKE=none
-
-inherit autotools distutils-r1 perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="https://www.net-snmp.org/"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-	inherit git-r3
-else
-	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/40"
-IUSE="
-	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		>=dev-libs/openssl-0.9.6d:0=
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? (
-			virtual/perl-Carp
-			virtual/perl-Data-Dumper
-			virtual/perl-Getopt-Long
-			dev-perl/JSON
-			dev-perl/Mail-Sender
-			dev-perl/TermReadKey
-			virtual/perl-Term-ReadLine
-		)
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
-	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
-	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
-	"${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-	"${FILESDIR}"/${PN}-99999999-tinfo.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared \
-		--with-default-snmp-version="3" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake sedscript
-
-	local subdir
-	for subdir in snmplib agent/mibgroup agent apps .; do
-		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index b0f2b3158eba..d4d1cb06d3b9 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -7,6 +7,5 @@ AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r3.ebuild 1917 BLAKE2B fdb4b339cf43b49a4182a9a44facb02f3c32c0cff27e277b138ed1fbd5dd36bd87859eacb4c84ace8274376a4064fbb854645c6c6dbd629cad230c65117ae8a9 SHA512 9eae6cf5bc8de678e65a87b41b45193b8a5e82ea63c01a4abc142d9e40034f7b25a18bad80e5a78910bcc8350ed6ecac251fe7533c996c81e8343a736f1164a2
 EBUILD netperf-2.7.0-r4.ebuild 2009 BLAKE2B 842cf2169d8dd6e35cc75970d9acc0fdf53d7daefafba47017459bcf17918fc6266d4185b7f2378cb38db78abdaa80c784dcbfeab9564793a9bdd6d5fc2bf7e2 SHA512 eb70c99b4293ea66f892c3ac3508ce987f68ae6568563f2080eade9d9833b5b1cc50390995e2c5fb1be9ceffe9b30cb240720082a0177e5607a770f68d3948b3
 MISC metadata.xml 856 BLAKE2B f1f2ac4a59c7c5e180ad68dd84bce5563a6ba32af6d5a0c6314e9ad153d5fa80ece9d5d9fecb4f7f62e4a615531e9ba7aed6cd180064e32d9f2951e655d5c337 SHA512 5f0e528830a267e8e2c900f670306d9d7602060fcce34b8367e9bf2be3e57a81be7a9e9b32e4457287224c9dd5d9e1915e9e8d67a55d0db85cea3ce7fa8c396b
diff --git a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
deleted file mode 100644
index 950df8cd767b..000000000000
--- a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Network performance benchmark"
-SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE="demo sctp"
-
-DEPEND="
-	acct-group/netperf
-	acct-user/netperf
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-scripts.patch
-	"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
-	"${FILESDIR}"/${PN}-2.7.0-includes.patch
-	"${FILESDIR}"/${PN}-2.7.0-space.patch
-	"${FILESDIR}"/${PN}-2.7.0-inline.patch
-)
-
-src_prepare() {
-	# Fixing paths in scripts
-	sed -i \
-		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-		doc/examples/sctp_stream_script \
-		doc/examples/tcp_range_script \
-		doc/examples/tcp_rr_script \
-		doc/examples/tcp_stream_script \
-		doc/examples/udp_rr_script \
-		doc/examples/udp_stream_script \
-		|| die
-
-	default
-}
-
-src_configure() {
-	append-cflags -fcommon
-
-	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
-	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
-	append-cppflags -D_GNU_SOURCE
-
-	econf \
-		$(use_enable demo) \
-		$(use_enable sctp)
-}
-
-src_install() {
-	default
-
-	# Move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv "${ED}"/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	keepdir /var/log/${PN}
-	fowners netperf:netperf /var/log/${PN}
-	fperms 0755 /var/log/${PN}
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	# Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die
-}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 9de19a6f521a..79de5daca3f7 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,10 +1,8 @@
 AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
 DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8
 DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003
-EBUILD nfdump-1.6.24.ebuild 1757 BLAKE2B edf62d46671fd56bdb9553704ce06b5981c17f1ec2353644e421a3db487ded72a4029f29d003cf13214d9fe9c93257ef74cd5c198dde17ef0d21deed697bbca2 SHA512 8122bac1d504e7e9b53dbffc7ae373257ee69af7b7480a3f94d4b68f0718add9fb3bf3afe5313bc28d35e60b199dca75da4f53b3a3fe20f89673a8017e9c55f2
 EBUILD nfdump-1.7.0.1.ebuild 1757 BLAKE2B edf62d46671fd56bdb9553704ce06b5981c17f1ec2353644e421a3db487ded72a4029f29d003cf13214d9fe9c93257ef74cd5c198dde17ef0d21deed697bbca2 SHA512 8122bac1d504e7e9b53dbffc7ae373257ee69af7b7480a3f94d4b68f0718add9fb3bf3afe5313bc28d35e60b199dca75da4f53b3a3fe20f89673a8017e9c55f2
 EBUILD nfdump-1.7.2.ebuild 1759 BLAKE2B 98b34c93d09c1e338b23b1b148eafe3e62028572fdebf5a58dd686ef4c8cfe8f3aadea6152618b34ee9982136d385a6b59ea02c6cc333c2bc51f64f49566bb9c SHA512 480ebd9a767b4e5c776413990534a4a60bacf57cc628eaf79c46b001d2532138eb8909af0bf511fa8e76cffd550bbbc4b119362759d1d3e84ec85535a8e6f3e2
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/nfdump-1.6.24.ebuild b/net-analyzer/nfdump/nfdump-1.6.24.ebuild
deleted file mode 100644
index 4fad577222f0..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.24.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
-
-REQUIRED_USE="?? ( jnat nsel )"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	elibc_musl? ( sys-libs/fts-standalone )
-	ftconv? ( net-analyzer/flow-tools )
-	nfpcapd? ( net-libs/libpcap )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	app-alternatives/yacc
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use doc; then
-		doxygen -u doc/Doxyfile.in || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	# bug #853763
-	use elibc_musl && append-libs "-lfts"
-
-	# --without-ftconf is not handled well, bug #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfpcapd && echo --enable-nfpcapd) \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable jnat) \
-		$(use_enable nsel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
-	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 4c8c18f1d1c1..c3c7ecc9646b 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,7 +1,3 @@
-DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005c08e903f478666359c34bb0d30c0645f5ab9a19109718dbbd2f6015dcb64c3a98b832b5412c9151720dedd102fb1936d1 SHA512 88b9e681ce4588e3473f90c93ea41d46fc99a54b895185465cfe1a28152ad944edbadfcf5cee4540b4ec48eb78ca73a1952637c3da9038e52d837c0de5d0260c
-DIST nikto-2.1.6_p20210304.tar.gz 521719 BLAKE2B 66715e109dfb47bb5ed6b64cfff4dbdd0667883e5ce28c26a7325645fe42ccfdcb6f9bcf956adce6f626c51ff363122724955eda86c715d4f8ec4894ebf1ae4a SHA512 d78cedad0b2f96d02964097699d5765fdb895b7ec1a9e196cbf9181888dd19cfca7d912f172a870e4b8bd2b53e4fc41407a60ed129ef24592909ef6111d04a0e
 DIST nikto-2.1.6_p20220602.tar.gz 455528 BLAKE2B 71094c786b274069eb17aac7d367bdc8535c7730afde7c7bf36d40719e2799561eb31ad9cc09ee39c47101880795eee0f1c46ca51c00644cdc23916033cc5f7e SHA512 5c8ce194951c10b8a5f4299e088928022193aa8ae7ed4fb6b9be76bcf03a405d776d6e30274f997ad9eeb95c012c7e09b6dec7cbecbe0ab4049e5d15529ae814
-EBUILD nikto-2.1.6_p20200901.ebuild 1101 BLAKE2B e1a67234ccdb86ba5f58bf6a7e639d7d7a838066f422333c75c91ff724805f5bf5c364ad70f51aa411e7927435644feb68fb45b8909a06e993ef38503a3b8cd0 SHA512 69a4b4ac1a8a07d13975999b46cc43ca768fe44d8c2c6af27187aa1f3e0ac7c8f457c52ff6d6956238096369422cb476e7e4cac51b9d49061314f25293d2e8a9
-EBUILD nikto-2.1.6_p20210304.ebuild 1101 BLAKE2B 0a6e63c0bff031c54951ada0f3569a8deaa8237cfaac8409ea53bc487ec96c91841e0bc4d4b4758425adbbe86e3ac9ee727ea4629dd6dc2abaf18d6733aec4ef SHA512 bcfa7414aac47ba18bbbdfa196067740a6d998bda53f7547c5e9d8360b17f2beff7462520282382c12ad410b787b4a1400de60b6a64242cd5290e8b2df09a5f9
 EBUILD nikto-2.1.6_p20220602.ebuild 1132 BLAKE2B 3cd901506be50538e7513e0fa7461dfc7c39f253d070c47a47e8032eda81887129f4ffeff9dafd46a523fb987affc4b8fd2a5d4a478e497a4037beb7f4467c83 SHA512 d740bd3e058f2b4262f0fd611fabce3c88b76aeac0a0834e8e21f17bd5a4e2618095731274e548859745366304f016937c370e880cdb4475a3976154e526848f
-MISC metadata.xml 399 BLAKE2B b21eaabd2c31573db50cef4672245e85d3135d5a0015a1c97c4d7caecf84c6440d781cb771620ef78db66ddd3f6c5cf321aad1f0449cbc68137653539e85ef32 SHA512 df84899e7889b352c631ff56ca7e6d8cbe011e20630c780c095950f7c58de618fdbe6caea2f5b3c30844fb7a00692ccfc803f0e29afbe367e85668c4ed7fddd8
+MISC metadata.xml 475 BLAKE2B 6218a2c00b817c7e2ea1b7e05f8875924ac4f4cd7ef1a0546db1903fc67fe4fcb936735466d8a6d7986b89af3d7c762ccc0585dc179f4cdd01c4fd6e4d23dce1 SHA512 3673e2d8d30dc8327d4ec8c89cfe1acdc12ff691fc4866059b0831f723eb8ebe9ee6c633bb5a7b95775cfdedaa57b5472b730a2f0461b535f538f25e44bb6347
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
index 5d0e012895fd..80c4aed49624 100644
--- a/net-analyzer/nikto/metadata.xml
+++ b/net-analyzer/nikto/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sullo/nikto</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
deleted file mode 100644
index 1a807b7834ea..000000000000
--- a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web server vulnerability scanner"
-HOMEPAGE="https://www.cirt.net/Nikto2"
-COMMIT="fb2655b8316097723d4977c792817a21117b2736"
-MY_P="${PN}-${COMMIT}"
-SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
-# https://bugs.gentoo.org/533900
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Net-SSLeay
-	net-analyzer/nmap
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}/program"
-
-src_prepare() {
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die
-	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die
-
-	default
-}
-
-src_install() {
-	insinto /etc/nikto
-	newins nikto.conf.default nikto.conf
-
-	dobin nikto.pl replay.pl
-	dosym nikto.pl /usr/bin/nikto
-
-	insinto /usr/share/nikto
-	doins -r plugins templates databases
-
-	dodoc docs/*.txt
-	dodoc docs/nikto_manual.html
-}
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20210304.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20210304.ebuild
deleted file mode 100644
index 4465e68730cd..000000000000
--- a/net-analyzer/nikto/nikto-2.1.6_p20210304.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web server vulnerability scanner"
-HOMEPAGE="https://www.cirt.net/Nikto2"
-COMMIT="8a4b5fb86ae8a1b4f31c32da0bcedd3bcaf4deb8"
-MY_P="${PN}-${COMMIT}"
-SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
-# https://bugs.gentoo.org/533900
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Net-SSLeay
-	net-analyzer/nmap
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}/program"
-
-src_prepare() {
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die
-	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die
-
-	default
-}
-
-src_install() {
-	insinto /etc/nikto
-	newins nikto.conf.default nikto.conf
-
-	dobin nikto.pl replay.pl
-	dosym nikto.pl /usr/bin/nikto
-
-	insinto /usr/share/nikto
-	doins -r plugins templates databases
-
-	dodoc docs/*.txt
-	dodoc docs/nikto_manual.html
-}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index ef636ebdddcb..1d661f786f4f 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -5,10 +5,8 @@ AUX ntopng-5.4-ndpi-linking.patch 1567 BLAKE2B 822c91e973562621665f5385ee5ab831c
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
-DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462 SHA512 3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb
 DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAKE2B 5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0 SHA512 cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e
 DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
 EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352
-EBUILD ntopng-5.4.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b
 EBUILD ntopng-5.6-r2.ebuild 2678 BLAKE2B 977136893448e4acca79f4ada05909de7b011b8a8feea0ea185588078a5aa02ad70c09e9756c64a11cf35ad06063223e75eb4211a323dd9fe3ae97ab73c2b12b SHA512 3028809586a4f729c4fd06e4a9c19afd8b2f72a3fb23d3581cce82c1393c652652c0cfe1574f40b7ce09f95482890d9e31e42e46149c1631f6cb7615813ed646
 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f
diff --git a/net-analyzer/ntopng/ntopng-5.4.ebuild b/net-analyzer/ntopng/ntopng-5.4.ebuild
deleted file mode 100644
index 57a01e79f4ab..000000000000
--- a/net-analyzer/ntopng/ntopng-5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/mysql-connector-c:=
-	dev-db/sqlite:3
-	dev-libs/hiredis:=
-	dev-libs/json-c:=
-	dev-libs/libmaxminddb
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	>=net-libs/nDPI-4.6:=
-	<net-libs/nDPI-4.8:=
-	>=net-libs/zeromq-3:=
-	net-misc/curl
-	sys-libs/libcap
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	acct-user/ntopng
-	acct-group/ntopng
-	dev-db/redis"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
-	"${FILESDIR}"/${PN}-5.4-ndpi-linking.patch
-)
-
-src_prepare() {
-	default
-
-	# Follows upstream's autogen.sh
-	sed \
-		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@SHORT_VERSION@/${PV}/g" \
-		-e "s/@GIT_DATE@/$(date)/g" \
-		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
-		> "${S}/configure.ac" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	# configure.ac.in at least has some bashisms(?) which get lost(?)
-	# in conversion to configure.ac (like [ -> nothing?) so just force
-	# bash for now. It's still not quite right but at least upstream will be
-	# testing with it. TODO: fix this!
-	CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		MYCFLAGS="${CFLAGS}" \
-		MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	insinto "${SHARE_NTOPNG_DIR}"
-	doins -r httpdocs
-	doins -r scripts
-
-	insinto "${SHARE_NTOPNG_DIR}/third-party"
-	doins -r third-party/i18n.lua-master
-	doins -r third-party/lua-resty-template-master
-
-	exeinto /usr/bin
-	doexe "${PN}"
-	doman "${PN}.8"
-
-	newinitd "${FILESDIR}"/ntopng.init.d ntopng
-	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
-
-	keepdir /var/lib/ntopng
-	fowners ntopng /var/lib/ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default credentials are user='admin' password='admin'"
-}
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 51bdef4c1d62..1c7d71019433 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -1,13 +1,10 @@
 AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43dc960f123e245f46ffb14afdc2ff81f45e6786ab1044152d37997b5d3a18872a230e68073de343d3210ea4a584e378ee733bdee02d10 SHA512 65f00cbcef90d55967a2af70a963d8851292bf13affe4c69f02a508c1e9189591dd9b4d115b73337a46089c81b8503d5cf3281b113160c161b06a38b03421ce3
 AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071
 AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66
-DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
-DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc
 DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6
 DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6
 DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115
-EBUILD openbsd-netcat-1.195-r1.ebuild 1726 BLAKE2B 7a39b11ed5c6b50e934df489464e56fc10fdeb84ddd95bdf5fadf2d7c7046163b1295f5fe369fc6c837a6de57fd03ee6d1ed00bf207ed9ae0611abe291042a1b SHA512 949579a7edd220a4584b76d0179ae1d43b3fa69cd04f8915d4caa36c3390639773ee98faa094d16ae98df53ad9c7ad4991cb6f9b3bdb58bae921801bfe18dbd8
 EBUILD openbsd-netcat-1.218_p5.ebuild 1761 BLAKE2B b4a16c5f9abdbce151c6acbc093d98f38e047af5af44a1b90db220b50216450eac71dd0055533f64828d6da5bda4364254ba8c7ddb93bb3cd9bcd644bbc5ca3b SHA512 00debb58166901d4b4221cfe44c857ea4fe1738aae36856632948d7d517d6209d825c9e2261276a53deb7177f30a25472310409a620c831a3fa91b054ae93317
 EBUILD openbsd-netcat-1.219_p1.ebuild 1765 BLAKE2B 584a9965815a6cc85b9b37f200eef3958b7b0624dfab7c9832855305bcd52a29bc811fde22d94aa4d29d54df7f9c3f0bb4e31a84458a772fda4270dc18422690 SHA512 9eb7914ea552ec8c148b046f6eee6ea59691ee479e81a8e3f6e3177ac21c14042d9ace05fb7e6255aaaf8e53560adc551dcd49e6596db564fa8699f6ae88e148
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
deleted file mode 100644
index 936638785585..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
-	https://salsa.debian.org/debian/netcat-openbsd"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
-	!net-analyzer/netcat
-	!net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
-	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
-	done
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${PN}-1.195-darwin.patch
-		if [[ ${CHOST##*-darwin} -lt 20 ]] ; then
-			eapply "${FILESDIR}"/${PN}-1.190-darwin13.patch
-		fi
-	fi
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch
-	fi
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin nc
-	doman nc.1
-	cd "${WORKDIR}"/debian || die
-	newdoc netcat-openbsd.README.Debian README
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ ${KERNEL} = "linux" ]]; then
-		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
-		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
-		ewarn "to the running kernel will do. See bug #490246 for details."
-	fi
-}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index fa966cfba5ca..6ee635dbce6e 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -5,9 +5,7 @@ AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05a
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
 AUX pmacctd.service 382 BLAKE2B 32bc56cffd69785a8ecc13b6ed7592c729f1d829ba5ad92c7928b54dc7f8e04a605806427ef9834f7d196c29ae77dbe31a51019e9ea95f745835f71c4e5f0730 SHA512 203aaa83ee4e194a11476a11e6b2eb787bcddcb8b3b5853c80520bbe1287286dfc56a28d3d34db03627a58e4923b7abf0ac41185d79a231061848cd990693cc7
 AUX sfacctd.service 370 BLAKE2B 49a18ae94d108d043f1e67f7c2082f7f154c2a7c5e795f457e6bf2b48fb8d43d9e94bbd9b07a0765e4f27f3b5e6339491701a470622b3d51fc031af91751a648 SHA512 89833651c56b63098ba93965470e7450ea44e43a10790e4bfed050031dbe8c5e15965721c20b0c7e700f693428f65a98e9737dd944efc477abd9776b18fed0d8
-DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b
 DIST pmacct-1.7.8.tar.gz 2175335 BLAKE2B 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f SHA512 df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2
-EBUILD pmacct-1.7.7-r1.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0
 EBUILD pmacct-1.7.8.ebuild 2408 BLAKE2B 58251696cfadfd5779b1f370a1854f03d94c417b747c7769c72241dcd2fa4f1f259e5aa6eaeb8435c9bd039c1a8bdbc6934f1c5af1e68212e488d146ed3be77e SHA512 4fef73a456d9f2196721ad5acd0e6127e0ee60bb5780925ec02eeef3c5f3b85ea4182f16f560e8ca641728a7568a4025729a0b1ef0472ffbf9f5f3a7bef48a41
 EBUILD pmacct-9999.ebuild 2408 BLAKE2B 58251696cfadfd5779b1f370a1854f03d94c417b747c7769c72241dcd2fa4f1f259e5aa6eaeb8435c9bd039c1a8bdbc6934f1c5af1e68212e488d146ed3be77e SHA512 4fef73a456d9f2196721ad5acd0e6127e0ee60bb5780925ec02eeef3c5f3b85ea4182f16f560e8ca641728a7568a4025729a0b1ef0472ffbf9f5f3a7bef48a41
 MISC metadata.xml 1319 BLAKE2B 0c53f8db498bcc1837e4f99ee751c5948eacc6cb513efcf7fc63f160f863a6995048b5e7987f28be2e5b0d190b7830a6d5a3f740392087371bd977ac1a50ba9a SHA512 a767f13848e711702a32586ebb02401d93e9ef65eca1d5a7f1b7951d4875638b730d074a8c09cbdc0d14b1b9b641472102ea91d1c52b4108201f7a382b2b142a
diff --git a/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
deleted file mode 100644
index 55db903b6abd..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs systemd
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pmacct/pmacct"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz
-		http://www.pmacct.net/${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq"
-
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="dev-libs/libcdada
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson:= )
-	kafka? ( dev-libs/librdkafka )
-	mysql? (
-		dev-db/mysql-connector-c:0=
-		sys-process/numactl
-	)
-	ndpi? ( >=net-libs/nDPI-3.2:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
-	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	local myeconfargs=(
-		$(use_enable bgp-bins)
-		$(use_enable bmp-bins)
-		$(use_enable geoip)
-		$(use_enable geoipv2)
-		$(use_enable jansson)
-		$(use_enable kafka)
-		$(use_enable l2)
-		$(use_enable mysql)
-		$(use_enable ndpi)
-		$(use_enable nflog)
-		$(use_enable postgres pgsql)
-		$(use_enable rabbitmq)
-		$(use_enable sqlite sqlite3)
-		$(use_enable st-bins)
-		$(use_enable traffic-bins)
-		$(use_enable zmq)
-
-		--without-external-deps
-		--disable-debug
-		--disable-mongodb
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 3144e18fd896..bb8e7ed6b38a 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,3 @@
-DIST pypacker-5.1.tar.gz 623638 BLAKE2B 329e8ec2af336118a4ff8d200ced2e356a10dae5217582fb69b77be336e830d3c2356165ea42be6224ef8fd2291637b23fde35733652969affae1f81eb2411dc SHA512 427d2afc45735e920867098c77be8256e28840031a7a01dfae5c9817ff78d2ddb699bf94721eda3b1f4b568bb70bd3bd25ccb8cb77076b84e2aa71898ba0bf57
 DIST pypacker-v5.2.tar.bz2 544026 BLAKE2B 3401b47a496e8c76d2b925e63c43838d2a05af01655a3e470ddfd0c2c57ab6b37ba1b9acd49386232b5c0fb4bc8d061f8992eac07f5729306502fa76413c51f5 SHA512 3ccb82ff2a352553819991c0e24fb6da8a26091f5cdced3d3358192ecf6598153fb3b36d48b1f51cdc1dd7f54e136c073e8e5a2f3fb050af24f83c77e1bda3b4
-EBUILD pypacker-5.1.ebuild 704 BLAKE2B f5761a10f60bfe9f7ffc32ccf91ff313fc8165adbe48410f87db50d59fd802095b11c869345ca570632e66a0b278489f8f068d93472e1cd842d121fddd4ce27f SHA512 f9e0114f1392e628d6dbd56144565fb5c337853c9aa94bb8305274806f61820f1bc687f47c9ce753c49964d9fdc434280dbd72675dc6f1782f419bb2b40fe81c
 EBUILD pypacker-5.2.ebuild 705 BLAKE2B 3d927a0a40949801612cf8bae21e23172be581fa13e432f98e5725bb786331c2ea4403c5bb3ea71bc2951543759979803002c27a46807373f94fdef77824b55f SHA512 808e9a63967b166e3a5bec2edd8e16237ac4309efbfbbb35e6f63295a80aec764a738b8fba44b166c8e9ccd47bbb3bb352364254c61eff57a5125bdc6963fbd3
 MISC metadata.xml 472 BLAKE2B 1c41ed1bc52f86d76dfc1496a381cb78288f817fce1e5cc2d4e6d89f9833b4940ec21bf9ccdbe94006efd23257e412a63de8ab311d6f07e9064e175fd64c7b75 SHA512 ed9530f6ffe8cbee6687b8be7b4f08e8ed9ba9547e285af0106ef830d8f1402f721242614e10a615799650d01ddad0ce50663a166a88f751127a2df7837f07df
diff --git a/net-analyzer/pypacker/pypacker-5.1.ebuild b/net-analyzer/pypacker/pypacker-5.1.ebuild
deleted file mode 100644
index 8037229d234f..000000000000
--- a/net-analyzer/pypacker/pypacker-5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Fast and simple packet creation and parsing library for Python"
-HOMEPAGE="https://gitlab.com/mike01/pypacker"
-SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DOCS=( AUTHORS CHANGES HACKING README.md )
-
-python_test() {
-	"${EPYTHON}" tests/test_pypacker.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 7ad4fd0da9d4..15be8e54ab89 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -1,7 +1,5 @@
 AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a883440551db1fd7a46613ce1c16229f9245f3312ee1a8577e98623850264e6e338d80c78e579a337b9387607577432a011c9 SHA512 e395e5b7ad59b57959060a1a4abc4cd2f3245a127975d3e780f8af9849df109b4e34d68594dbe6d2978ca62d0676c06dc6fb185effa734b958fa5c8b96e332c5
 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170
-DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
 DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
-EBUILD scanlogd-2.2.7-r1.ebuild 904 BLAKE2B 5da1f58de5e6cb0c1f1b968f4bd9e6c8d380166e61bac683ac9edf118198c03fa1eaea4bc3e39064bc79598b47fc695d7abb86127b5aacdb625059f491c50631 SHA512 5f084a33b8544d6210800cfe99a341ddba83a66c4e6bfdc25fe680b8f7d7aa5601cd2274b94bc62a733719d91989be8b2cb4f66e608467df3e2ecb2912e89809
 EBUILD scanlogd-2.2.8-r1.ebuild 918 BLAKE2B 7197a611e61c2eb8fb23d648fb1ceb6a7eaf346ff317c39d9e0227e05bd0aa0956aa3ea458a4388da8a606827e2069d7ae8936cea03207f1ed56df176c8f3d8d SHA512 18b088bbca2017f80d879c0721e6ab0b95d7db8fc66fbeaf16b2449c2ed0a3452086f9e82dd6c5538ea3d156a480ca642a3b1c948a6b90db4dfce5c217fbcfef
 MISC metadata.xml 444 BLAKE2B 311531fa01cf8b3e80b424f6bdabc9bf95ff66bed3953f24c978f36a98f5e08ecd674a5b7b414d2bb626bdda800e9d81f0388af5f11408b27f5bf6a7a097dcae SHA512 6def253f68d2423834a6d13b9b99f03a511da11a831a4b83151d3d310a769ad56ad9d848a02f4b2d3f2806117f1d7a47c5c2fe444e365d622f0fce0bb65d3b68
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
deleted file mode 100644
index 425d76c6c154..000000000000
--- a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="A port scan detection tool"
-SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com/scanlogd/"
-
-LICENSE="scanlogd GPL-2" # GPL-2 for initscript
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="+nids pcap"
-REQUIRED_USE="?? ( nids pcap )"
-
-DEPEND="
-	nids? ( net-libs/libnids )
-	pcap? ( net-libs/libpcap )
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/scanlogd
-	acct-user/scanlogd
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	restore_config params.h
-	tc-export CC
-}
-
-src_compile() {
-	local target=linux
-	use nids && target=libnids
-	use pcap && target=libpcap
-	emake ${target}
-}
-
-src_install() {
-	dosbin scanlogd
-	doman scanlogd.8
-	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
-	save_config params.h
-}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index e6aab647ceee..de35d3d03f1f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,4 @@
 AUX scapy-2.5.0-no-install-tests.patch 339 BLAKE2B 0702c8c40d3358dd1e05eeb98ebf990925b61f8d572f053cccf3bab5111265c3d0f5c4908c1efe70c1d33525dba3553b2ed2bf2818b5d8e4fd4cbd87c55fa26f SHA512 cdffcb0b78bcb261d28c8f970e7032a116b37e818affc88009fb82c1208d812edb870d9740004ccb8ff7070407aa12a0949ff535f0ce6b5a2dc78e20d33d97a2
-DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cbbf132d3ed07b5bc73b95e4298bf250e65157bdb7851226fd0ac039367892a9a14d844e5815832ad4ab556819 SHA512 b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
 DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
-EBUILD scapy-2.4.5.ebuild 1093 BLAKE2B 089fb2b7a0d01930e115173cf767f8db013152c28fc5d8474726ac339c087044fcf1cc65518b64cc7e3f60ea1c0722f9ce14324b54afdaada5bdfc6feb361bb0 SHA512 fd644a3e9b5f133424aa10a45df4e77b5b8cdeb8d18a04c16aefbd1eb0933707f81be6890f877764040f58b88e068a3976bfc9ae8a7f289c79a34db482a82eb2
 EBUILD scapy-2.5.0.ebuild 1852 BLAKE2B 215446aff6507a54dd2fa9f777f0756a4da06371857d064225f4dfb77ae6a6078d69a15c7e03afbfb4624d5c2da074870f0bf6d9abfef2a7c6ab1d70a74daaca SHA512 62aef2797bf28f4845ef88f6d5c700139820f5664048f090935f6fc4514f79546c27bb8053ee6bf931bacd250bbe18d9ac168fed3a477a9f71f94112add65800
 MISC metadata.xml 494 BLAKE2B bb5ea4ee5cdbc940e503d4f8eb8e54185bb9bb7f1160810d4448f275a072cef31d7e3c1cfe167ef84b180a7b9a2c6b3babe8c767831fe97954381dbd38bf090b SHA512 74ec713bccc253ec16dd0178e04275a456df12ff485cbde8323b8b05ff96679ca747334441bf621d0762dd1a235f5cdcb07e4207c30d25a909d8ffefd1f29852
diff --git a/net-analyzer/scapy/scapy-2.4.5.ebuild b/net-analyzer/scapy/scapy-2.4.5.ebuild
deleted file mode 100644
index d169c87c10d6..000000000000
--- a/net-analyzer/scapy/scapy-2.4.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
-	dev-python/cryptography
-	dev-python/ipython
-	dev-python/matplotlib
-	dev-python/pyx
-	media-gfx/graphviz
-	net-analyzer/tcpdump
-	net-analyzer/tcpreplay
-	net-libs/libpcap
-	virtual/imagemagick-tools
-
-	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
-"
-
-src_prepare() {
-	if ! [[ -f ${PN}/VERSION ]]; then
-		echo ${PV} > ${PN}/VERSION || die
-	else
-		die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc -r doc/${PN}/*
-	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}
diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest
index 82dd7666e0c0..8475947901f9 100644
--- a/net-analyzer/snallygaster/Manifest
+++ b/net-analyzer/snallygaster/Manifest
@@ -1,6 +1,3 @@
-DIST snallygaster-0.0.11.tar.gz 25238 BLAKE2B 11867c0a71cd1701205f499cc7e492520018d39dcdeae0d8e8ae130e2034fd15d20039ed2c7325c879b1640b67a02515685640d5278e0aaafba864fd9d47a7a0 SHA512 6c050f8d67748fa148a578e37f3788305251d210691047f045d63dd531eca4ef4eb9e1d74a22ce9db13c71e471ced304d8138b8f283a1fe4841381532baab733
 DIST snallygaster-0.0.12.tar.gz 25234 BLAKE2B 69082fe94fc65d78b99519511b6850d569401d326788448dffac2baca3e359e166b161e69b5169dc0772c4eba5e3cf70968ed75fe09efad7924869971a0869c8 SHA512 507b5bbaa8a013bbbb18b53778781e1e212e295f113ea91b1b73d5162f93d35be74780fa0cba7499d62f40c8cd27b4cdfd79526bd0ab07018090460ca937eb48
-EBUILD snallygaster-0.0.11.ebuild 636 BLAKE2B 94937787c2156cb04090fd9e08d920794689db138f8fefb0b0e9d5ea68a17d6e740a17cd6a1ee98643660c6d537cac33fc78091dd11f1d03c3c2592a3d8ab8a9 SHA512 27a7735980c43f6f686c1319ea1c7bc381a57aa3b18929c41bdc2c0cc78acc0801b73a0d2021995dac9f1007f138536ff839b03cd5ff283c6af8432655d124a2
 EBUILD snallygaster-0.0.12-r1.ebuild 629 BLAKE2B 2f203816f023cd62826fdc5d62dba0cea616906e966e2fc26efd3a2242b2863be0349bd2314209c5dd877e80b0adc158a910e88f09ec4b61faf3837440b6defe SHA512 f260589e48e2bfcdbdd8fddb4da25e80765da64cffd162cefd0a2497457343cd198be8df8b83b697d3d7f69a7b68a90ed3d6d38b12aaeb68186f4826bae5dfa9
-EBUILD snallygaster-0.0.12.ebuild 641 BLAKE2B c624863c794c7741b9089df09ad31e1469fc0ac3755af39ad4ec2a26e1707a8ce725eba05d117c041769cd6e6dc5476169ddb0e36547f727653e38fcaca495e5 SHA512 8513f560b0f737412e9e46727aa06a922f1e181ac895ef53da41c4e1f95891ade17cf7d5665e40b00d4efeaf7129687458651fd4d66bb3c53dacd98d859681cf
 MISC metadata.xml 339 BLAKE2B c2f1c9e6e138fce62eb7107388c85cf3203f226a1d9d64d55d399c9ae27d62029ed80e6989b176a1832fe0ffa2b1f6c6deae75e0329d8171cd2712c866ff7b33 SHA512 9008dfa443771432e7cec014d558ff1cbea017e47ce5f5f3677f12ebad8166b124a579716f668009e2f208775507299a3802ea000a517fc7a613232f23eeed75
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.11.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.11.ebuild
deleted file mode 100644
index 21ae30abcff9..000000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
-	dev-python/urllib3
-	dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
-
-# Only codingstyle and similar tests, require dependencies
-# not packaged in Gentoo
-RESTRICT="test"
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
deleted file mode 100644
index e8e505e61bf4..000000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
-	dev-python/urllib3
-	dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
-
-# Only codingstyle and similar tests, require dependencies
-# not packaged in Gentoo
-RESTRICT="test"
diff --git a/net-analyzer/snmpclitools/Manifest b/net-analyzer/snmpclitools/Manifest
index e4b2b89a80a8..0ff31c73deec 100644
--- a/net-analyzer/snmpclitools/Manifest
+++ b/net-analyzer/snmpclitools/Manifest
@@ -1,4 +1,3 @@
 DIST snmpclitools-0.6.4.tar.gz 50853 BLAKE2B 23b28395c1b4d376e4b39f8ebb6d9acf8329da8c9bd6403d0670236ed89a783c0145ceb3ed31a653055bc6fbde785f911e6eeb30f32a587b80878b26ea2a8ba1 SHA512 42c0905f65bc855f7f0089ee7e944543e29ca0ca5a8d7185f5fa877f9c97cae1f1952477e85c614db9785deabad1770f1a046c4e6e98a7832097581f8e14748c
 EBUILD snmpclitools-0.6.4-r1.ebuild 571 BLAKE2B 684052db1ef3f22d3dd4e30aa3d75587d1dcb50e09b9aefa9b72b5d503b00afb28e15319563555d096bf0e0175e6050ae2c9f119b2c6fec49fd32ca0ef570dba SHA512 1786193596b79bea9a9737f92300dfb9265870caf1254384f46e38e0abd6017c48576466d640d77c3b08f3b0e9fbd09ad043bd8befcd8fd3a911a24eafb6942d
-EBUILD snmpclitools-0.6.4.ebuild 535 BLAKE2B 69ba2463396131e94f7a32d0433842f82000c7e0c7a2cf3f5245ca4d3128574750eeddb03015dd2ce701e67c62457fb40897776cf9868ef0c860094a7f2fc383 SHA512 5eca3bbd5cf8dcc51259dae31698a005d65ea56044afde43e811cb92aa2ee914b8445f09feaecbdf8542adba6bddcb6bd0ab0257b238b4b080ab8ae88897076a
-MISC metadata.xml 406 BLAKE2B 5ea34a0295aad3ce33c2db63baac0027b6d1d3c67652ea41f39c54494ba54cede5e87abafafceb5fc9cbd5affa1dd15b2a52313e693823d971f64735f90d2b88 SHA512 354892600ed003bd3132534fc1771dc2e319c208bc48cb5fc3aba5245c10d60d942f7c83ace430b65e0995301d79bf893e8829408dd6595c28a923616f113f13
+MISC metadata.xml 491 BLAKE2B 20e675710552e5d229af173ae9743de7d9b2b07985243a868dc16a96aef22d2d418309424ac5c7a1eeae57f912f366cc7174775c596af4852fd933d83e541fc4 SHA512 97e1096c46e30816979447e0ac8ce83540eb911da43b32361b19eeca3f494c4164d65f4f5c4ac5361bcef74c597894f79af1a4c5e2544ae124ed54b8ee06899d
diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml
index 19a37218bb7d..3da2544f338f 100644
--- a/net-analyzer/snmpclitools/metadata.xml
+++ b/net-analyzer/snmpclitools/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">etingof/snmpclitools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
deleted file mode 100644
index b9eac9f25651..000000000000
--- a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps"
-HOMEPAGE="https://github.com/etingof/snmpclitools"
-SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!dev-python/pysnmp-apps
-	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
-	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 209bdafe3e9d..57d23f868771 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -7,5 +7,4 @@ AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666
 AUX snort_at.service 322 BLAKE2B 14cc63b941b4931ec42bdd1abd5ac1ec2b67aff4d36db3fb6fbbdae5dc0e6bdf1398699fa3f7cf595c5545270e749d6d22fadcf6a55d721551f8e323ee6e3177 SHA512 7173ec7fb71ae5b2368ea5bbffd562afdc0ddd990071bc08d61577a8754452d200eb39710e7b9cca4792bb2f8572fd50fd771ff0233daade4fde0149bab365c7
 DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006
 EBUILD snort-2.9.17-r1.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
-EBUILD snort-2.9.17.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
 MISC metadata.xml 4036 BLAKE2B 63694245b4389785af4beef5134f10c069f28cce573ade1e6a0424f34420b38c72e1f611f220c1e8876d76a8d5ab23fbe6f678d4890d3d0be8453de3ed600488 SHA512 90fa5b28b1e90483d07f86ad933f9a9da7660d584fe9f5e1f146abf32b70f136e5b90662093d36542dc6863d459bf6152546a8f7bcfc833d26c24c8b165dd5d5
diff --git a/net-analyzer/snort/snort-2.9.17.ebuild b/net-analyzer/snort/snort-2.9.17.ebuild
deleted file mode 100644
index ba2c56393269..000000000000
--- a/net-analyzer/snort/snort-2.9.17.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit autotools lua-single systemd tmpfiles
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="https://www.snort.org"
-SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
-high-availability inline-init-failopen large-pcap-64bit +libtirpc
-linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
-reload-error-restart selinux shared-rep side-channel sourcefire +threads"
-
-DEPEND="acct-user/snort
-	acct-group/snort
-	dev-libs/libdnet
-	>=dev-libs/libpcre-8.33
-	net-libs/libnsl:0=
-	>=net-libs/libpcap-1.3.0
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	open-appid? ( ${LUA_DEPS} )"
-BDEPEND=">=net-libs/daq-2.0.2"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-REQUIRED_USE="!kernel_linux? ( !shared-rep )
-	open-appid? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch"
-	"${FILESDIR}/${PN}-2.9.8.3-rpc.patch"
-	"${FILESDIR}/${PN}-2.9.12-snort.pc.patch"
-)
-
-pkg_setup() {
-	use open-appid && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# USE=debug exposes a macro whose name apparently wasn't changed
-	sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \
-		src/dynamic-preprocessors/appid/appInfoTable.c || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gre) \
-		$(use_enable control-socket) \
-		$(use_enable file-inspect) \
-		$(use_enable high-availability ha) \
-		$(use_enable non-ether-decoders) \
-		$(use_enable shared-rep) \
-		$(use_enable side-channel) \
-		$(use_enable sourcefire) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable open-appid) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_with libtirpc) \
-		--enable-mpls \
-		--enable-normalizer \
-		--enable-reload \
-		--enable-targetbased \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-static \
-		--disable-so-with-static-lib
-}
-
-src_install() {
-	default
-
-	keepdir /var/log/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# preserving them incase the user needs upstream support.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/etc/snort
-
-	newinitd "${FILESDIR}/snort.rc12" snort
-	newconfd "${FILESDIR}/snort.confd.2" snort
-	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
-
-	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Remove unneeded .la files (Bug #382863)
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-	tmpfiles_process snort.conf
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index ffc01044815b..94bfe053b84b 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,15 +1,8 @@
-AUX tcpdump-4.99.1-clang15-configure.patch 2723 BLAKE2B 29f5b08e7c11fbc7427ac8b22856544665b1f8d5ef9d7e228d4b2077ed76bcb81d5dc3f4e75b8c6d31dbe3f2408036adec0a014967e6773f2495966cb0428ce9 SHA512 19542ac98cb3f955ac2c7c42eca887bbc3011c474bef5659ade18d7aa8886bd3fd3db805760de676f210bf3347530962bdfb7c24b3bdd79a4aeff78c4bea8675
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
-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
-DIST tcpdump-4.99.2.tar.gz 1897480 BLAKE2B be13fbf493478270c8ebc034a3c1467907a008ce2ed9632a87b7d7b9104b9fda248cd535da7313a1c3d57ca21f324c25593812590b96ec334c474d1ce06f3fd5 SHA512 7986e7517441872d4461da23dc546c01e23449108974458a4e5e493db6f066f9e7da801623a6c43cfa2079ac3d409f813d1ffde2ecc12b6dba661dae0693b735
-DIST tcpdump-4.99.2.tar.gz.sig 442 BLAKE2B 011c93803a1c339f9ce46dedb8e3420d77c5362575061c9b852647d8e8de6936079150240b444f660a84b9e45337960b8878e7c4de1f4e6ad2fff16225811d24 SHA512 33704e9b2ece65ca8a1fbf8234088e561f132a561ac859da32c7fb4d4caaeabd9a4b50ac8f939e48c18e672dade9393c7e56bc838ec8ac9828be5360e99e5692
 DIST tcpdump-4.99.3.tar.gz 1901814 BLAKE2B 8e8adda6df40f3a79cbeb80bd01d43834e0b3ec44c8227bda2260b43ea0852f76beb02199120cca16adae0d793841cf684e7e276e520f49479a1b04ab1dc4821 SHA512 e1442e923d89f367cfe403dc460d0d46e19a241470d56b30b7a411bedd8d21a78c428f20ffe725cbb4fa5068f7dcc5c93d206e1a8d53feb9bccc6f0cda8bf0f9
 DIST tcpdump-4.99.3.tar.gz.sig 442 BLAKE2B 97dbac4534f9b9daf0ab89d6a230835690737827330d4a6f15e7450bd8aed24af2bc097bf41511bb40534687623ffe63fb766c5e344ce66483c9dd5f34427155 SHA512 a7dfd95c11fa9066740552acc9ebfa1c674ba9242dfb6dddf27658845245b8677b4c2da392cfe1447f32b929e108e9ff5326a94cdc0be9502a05e0efc15a5934
 DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
 DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8
-EBUILD tcpdump-4.99.1-r1.ebuild 2381 BLAKE2B ff478905635a0873ef9c13e27716e4eff5eb733fc4984904458e8400898161474a33aea7aacf3b0b108feb98e283af845e1be8e2a66d36ca9e046fe123833372 SHA512 1ff9d8b7ccd4929d61d48d1f2b7cb5cf2055bfeccd91634664be803d337cad8e5a412dce88ae59a9c26deb6c6bf0ae88197d9152e79b57db3f5dfbd9c1e82349
-EBUILD tcpdump-4.99.2.ebuild 2146 BLAKE2B fbe007af365c3d9438939fe17f8f903660f07edf994f9341b79f61d10912f89a256f3421e525ea8866fca106f18b2ff55687910263f9be7f6acee60d0736e8df SHA512 8f4b54c4660cdb10f2b4be882161cd3b5a17c56e5603ef059f1a2c4c3580faa0917d264f8152538dbc2bb8e32d7fb9448da4041147985cc73657b26d9aa1ed3a
 EBUILD tcpdump-4.99.3.ebuild 2115 BLAKE2B 37bda3fe4cd04cb8fd791544687481366b4d0f4b1fb191ba5db84ef18e245a5bcc5dc08dd4c64762181414f9496defa0dc1c12205bccbf5dc0b1daa68ab83ff6 SHA512 3948eee9b67e478a3f79c6239e5bc38dd62b421880f61dbe063d8ef7ec92d1a1dbfec0679634bab4153e2f34fbf91856620eef283334cfc645956c4107e105b8
 EBUILD tcpdump-4.99.4.ebuild 2122 BLAKE2B faf5926fb5ce40c6e7357664dd142c8ae74c892a9c059500e85a81e7db977d8ba3638d3d4fa4837da758f9bd1dc6a04b200fcee9c9a4c037593a0f72e0c6541c SHA512 9a15c2c766c1fb8471545b6aa5988596e166b4f0a7d0b12dcafdf2cc2cf99037f54ef9ce2e9bd11235840451598a3a2f81557e3fdc057b13147ec8412e03cdfb
 EBUILD tcpdump-9999.ebuild 2122 BLAKE2B faf5926fb5ce40c6e7357664dd142c8ae74c892a9c059500e85a81e7db977d8ba3638d3d4fa4837da758f9bd1dc6a04b200fcee9c9a4c037593a0f72e0c6541c SHA512 9a15c2c766c1fb8471545b6aa5988596e166b4f0a7d0b12dcafdf2cc2cf99037f54ef9ce2e9bd11235840451598a3a2f81557e3fdc057b13147ec8412e03cdfb
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch
deleted file mode 100644
index ed8a353d8c98..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/the-tcpdump-group/tcpdump/pull/1007
-
-From 4fa4e8db882b6298f5504d866665441ba7594df3 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Sep 2022 17:28:58 +0100
-Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
- (implicit function declarations)
-
-Clang 15 makes implicit function declarations fatal by default which
-leads to some of tcpdump's configure tests silently failing/returning
-the wrong result.
-
-This adds the needed #includes to various tests for the functions used,
-resolving the following errors:
-```
-net-analyzer/tcpdump-4.99.1/clang15.log:47:error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
-net-analyzer/tcpdump-4.99.1/clang15.log:51:error: call to undeclared library function 'strcmp' with type 'int (const char *, const char *)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-net-analyzer/tcpdump-4.99.1/clang15.log:55:error: call to undeclared library function 'sscanf' with type 'int (const char *restrict, const char *restrict, ...)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-net-analyzer/tcpdump-4.99.1/clang15.log:68:error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-net-analyzer/tcpdump-4.99.1/clang15.log:112:error: call to undeclared function 'ether_ntohost'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-net-analyzer/tcpdump-4.99.1/clang15.log:115:error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,8 +87,11 @@ if test "x$with_smi" != "xno" ; then
- 			AC_TRY_RUN(
- 				[
- /* libsmi available check */
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <smi.h>
--main()
-+int main()
- {
-   int current, revision, age, n;
-   const int required = 2;
-@@ -264,6 +267,7 @@ AC_COMPILE_IFELSE(
-     [
-       AC_LANG_SOURCE(
- 	[[
-+#include <string.h>
- /* AF_INET6 available check */
- #include <sys/types.h>
- #ifdef _WIN32
-@@ -473,6 +477,8 @@ AC_CHECK_FUNCS(ether_ntohost, [
-     AC_CACHE_CHECK(for buggy ether_ntohost, ac_cv_buggy_ether_ntohost, [
- 	AC_TRY_RUN([
- 		#include <netdb.h>
-+		#include <netinet/ether.h>
-+		#include <stdlib.h>
- 		#include <sys/types.h>
- 		#include <sys/param.h>
- 		#include <sys/socket.h>
-
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild
deleted file mode 100644
index 071975347aa4..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
-REQUIRED_USE="test? ( samba )"
-
-RESTRICT="!test? ( test )"
-# Assorted failures: bug #768498
-#RESTRICT="test"
-
-RDEPEND="
-	>=net-libs/libpcap-1.10.1
-	drop-root? (
-		acct-group/pcap
-		acct-user/pcap
-		sys-libs/libcap-ng
-	)
-	smi? ( net-libs/libsmi )
-	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
-	)
-	suid? (
-		acct-group/pcap
-		acct-user/pcap
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lang/perl
-	)
-"
-BDEPEND="drop-root? ( virtual/pkgconfig )"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-	"${FILESDIR}"/${PN}-4.99.1-clang15-configure.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid ; then
-		fowners root:pcap /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.2.ebuild
deleted file mode 100644
index 23a741b12925..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.99.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
-REQUIRED_USE="test? ( samba )"
-
-# Assorted failures: bug #768498
-RESTRICT="test"
-
-RDEPEND="
-	>=net-libs/libpcap-1.10.1
-	drop-root? (
-		acct-group/pcap
-		acct-user/pcap
-		sys-libs/libcap-ng
-	)
-	smi? ( net-libs/libsmi )
-	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
-	)
-	suid? (
-		acct-group/pcap
-		acct-user/pcap
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lang/perl
-	)
-"
-BDEPEND="drop-root? ( virtual/pkgconfig )"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid ; then
-		fowners root:pcap /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index dff5abf053dd..3279cc3de3a2 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -5,7 +5,5 @@ AUX tcpflow-1.6.1-wformat-security.patch 907 BLAKE2B b65f44d8400fc20a8dd3f6a3b4b
 DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
 DIST tcpflow-1.6.1-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b
-DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c
 EBUILD tcpflow-1.6.1-r1.ebuild 1541 BLAKE2B 9b87924c524cf79ba5d37c446e4c5b28dba4591c2df5bdf384bfef1fd2f75a7d0d646d4291832d0c35086aafa8649eee3d9e190088c282733f4768b5a44ad709 SHA512 a83c69d967c232bf323bad0b7c2da08bff759c887ee8d320e4fd55d127440b62ec4008d079da9c85d87c77191744d759811e8933a29108654956ae92477263cf
-EBUILD tcpflow-1.6.1.ebuild 1490 BLAKE2B 582097c26c2fdfbfe320a860558612b34099075f4f008c882814fc9bc799760210c9e8451f945e4f3c1b06cc779d63b5cd6d345d63fded2998e660db46a8545c SHA512 ef293c3c753fd37583c0cfeb6a8bcafc4e9f2f640950e9a8ddb2b17ce9577cec79ac1003568430ad10946a6b508aa0252b68a28ae6b668d8555934dd1189b37f
 MISC metadata.xml 361 BLAKE2B 28668976bf5eb66e6a4b4b35062eb985e18d72b27682a9de2458b4472a6b06e2b25230e20c26b98883f05ea278584b974344685449f5e18a93a21dc8ddd91054 SHA512 1cfbda2c61c3ef4bf0b7779eb845e9e3cab3c672e681bb008b1939aa2d0dddbd8a1ee6b04eda3c3c96644d9ec67cc5285ee8f1ea6ad4fb171ea990b0843eee35
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild
deleted file mode 100644
index 78935ae93148..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-inherit autotools flag-o-matic python-single-r1
-
-# 1.6.1 wasn't tagged
-COMMIT="a5965b11a332fe908ab1ed136b14803920e8ecdb"
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow"
-SRC_URI="
-	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
-	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
-	https://github.com/simsong/tcpflow/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-db/sqlite
-	dev-libs/boost:=
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/libcap-ng
-	sys-libs/zlib:=
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
-	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -fpermissive
-
-	econf \
-		$(usex cairo --enable-cairo=true --enable-cairo=false)
-}
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index df5c7cac2d5a..fe623b8d13d6 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,8 +1,5 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
-AUX tcpreplay-4.4.2-configure-clang16.patch 1913 BLAKE2B ab0413d0cd3677b91fa9987a63faf1e41d305a8ff275538fd1a2c6e10829bd66ecb518b3795691779202081cfc431f7d76692c2247b0ddc09becfd6550da8a60 SHA512 1cc0a9b847b90a56942041c36c0f1e9eef747fd9b2dd2e51440c13e53baf5b91d1be40460739551a0ab49ef7346a36eb76389ca8db445a2e3fda7b5da004da23
-DIST tcpreplay-4.4.2.tar.xz 750592 BLAKE2B c1f0bad69eca7e086aeb7100c4a35e2984a81412f81eaf981d969d24510736788e4657b511308b38ffbf88021c23272c51b9265eb2fb08318352d3eb8bed0a2a SHA512 78e5482c0cd70a55aa80167c602b33811fa01203860fab4b2d504da71a95e218356ea0cc85254e12be7cb13b611487a150f13df94f9da274661f71e921bd6045
 DIST tcpreplay-4.4.3.tar.xz 750072 BLAKE2B 218fe1c5faab0fdd75a031afce8f468c85886a4cf21a4d9bd34089bd106756ee0e65e0df605efecb3260ccff266553a44d8ee10249b35524a044c6c5db86fcc7 SHA512 d8186a5faf3fbe5505da34cfc466c0375c4f298c997fe85505ea898c8c1241c16f98269596b682983a3e5cbd8493882334c925ff750d95995f3b13c5b83357cf
-EBUILD tcpreplay-4.4.2-r1.ebuild 2182 BLAKE2B 73d268dc758ea86b4d89e4173730b81195d351cbfe7722c9e27eab991047cd51c3f1c410af2b3217e70df876eff2ad7947b786c40c299f34fe5f01669f4cc50f SHA512 1f41a2773b5b44f58ec4ccee64908dd3db27d0aea06932d97fb94709f56cd656a880b137a7cbbb0ea899833f099464be5c23b10f87ad51e021f27a2a64c03586
 EBUILD tcpreplay-4.4.3.ebuild 2131 BLAKE2B 07d302b1b525d49b2ca6a89faca08a55458ee6444e66914e73310aa749ba1934fff2bec38e01d986acfeefb2def4215ff7802042219527a2938adf7a32a6726b SHA512 727a8f56c3390ed18f54e89a14a0a2a066e0436522fc332d5f7a433e9c52a7671b7965efddb572c542004e06af847cf31d3a5c333a02879fc07de4465e63af6b
 EBUILD tcpreplay-9999.ebuild 2133 BLAKE2B 24055b46b8746954e05cfaf88695389ef7e17171ba16f4b6de166f40e23ce3a7ef5f82f2915fc016bd6cc637ecf473fc90ed791111e87e7d905f83d0ca380629 SHA512 033159087ec5edb13a1c87a94489ffcf30b085b58707581b1de8d5f176511204a1e907e19c70b1aa46ec81678c0cb16b7bf086eb4d6c0f0562a6d74218d02718
 MISC metadata.xml 1117 BLAKE2B f269c4d3da94e3fb52ad80b840c6d5b8d4acb0181dd1c370bedd88bcf75e6933f21f304f3ed5435dc601978acbef6396410d9beb96e4ec1ba1a7a53458b540c9 SHA512 bff9425e1ae71f5d106a5b2c844591db726192f356f54c6347fb9a6c10fef6b7b11cc59695b4f712d87f0359112b98ec514ce481fd824d6e343975631b105ea5
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch
deleted file mode 100644
index 81a5a0086958..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/appneta/tcpreplay/pull/757
-
-From 096197e584ebb7d646eef75e5a8654f7192a0af2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 24 Nov 2022 07:30:28 +0100
-Subject: [PATCH] configure.ac: Avoid implicit int, implicit function
- declarations
-
-Do not call exit without declaring it.  Add #include <unistd.h>
-for fork.  Add missing int type to the definition of main.
-
-Implicit ints and implicit function declarations were removed from
-C in 1999 and will not be supported by future compilers.
---- a/configure.ac
-+++ b/configure.ac
-@@ -1681,8 +1681,8 @@ int
- main (int argc, char *argv[])
- {
-     if (strncmp(PCAPNAV_VERSION, PCAPNAV_TEST, 3) >= 0)
--        exit(0);
--    exit(1);
-+        return 0;
-+    return 1;
- }           ]])],[libpcapnav_ver=yes
-             AC_MSG_RESULT(>= 0.4)],[libpcapnav_ver=no
-             AC_MSG_RESULT(< 0.4)],[libpcapnav_ver=no
-@@ -1726,26 +1726,27 @@ case "$host_os" in
-         #include <sys/types.h>
-         #include <sys/wait.h>
-         #include <stdio.h>
-+        #include <unistd.h>
-         unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
--        main() {
-+        int main() {
-             unsigned int i;
-             pid_t pid;
-             int status;
-             /* avoid "core dumped" message */
-             pid = fork();
-             if (pid <  0)
--                exit(2);
-+                return 2;
-             if (pid > 0) {
-                 /* parent */
-                 pid = waitpid(pid, &status, 0);
-                 if (pid < 0)
--                        exit(3);
--                exit(!WIFEXITED(status));
-+                        return 3;
-+                return !WIFEXITED(status);
-             }
-             /* child */
-             i = *(unsigned int *)&a[[1]];
-             printf("%d\n", i);
--            exit(0);
-+            return 0;
-         }
- EOF
-         ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
-
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild
deleted file mode 100644
index 2cc1e8f862c3..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
-HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~sparc x86"
-fi
-
-S="${WORKDIR}"/${P/_/-}
-
-LICENSE="BSD GPL-3"
-SLOT="0"
-IUSE="debug pcapnav +tcpdump"
-
-# libpcapnav for pcapnav-config
-BDEPEND="
-	net-libs/libpcapnav
-	>=sys-devel/autogen-5.18.4[libopts]
-"
-DEPEND="
-	dev-libs/libdnet
-	>=net-libs/libpcap-0.9
-	elibc_musl? ( sys-libs/fts-standalone )
-	pcapnav? ( net-libs/libpcapnav )
-	tcpdump? ( net-analyzer/tcpdump )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
-	"${FILESDIR}"/${PN}-4.4.2-configure-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
-		src/common/sendpacket.c || die
-	sed -i \
-		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
-		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
-		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
-		src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_musl && append-flags "-lfts"
-	# By default it uses static linking. Avoid that, bug #252940
-	econf \
-		$(use_enable debug) \
-		$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
-		$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
-		--enable-dynamic-link \
-		--enable-local-libopts \
-		--enable-shared \
-		--with-libdnet \
-		--with-testnic2=lo \
-		--with-testnic=lo
-}
-
-src_test() {
-	if [[ ! ${EUID} -eq 0 ]] ; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep
-	else
-		emake -j1 test || {
-			ewarn "Note that some tests require eth0 iface to be up."
-			die "self test failed - see ${S}/test/test.log"
-		}
-	fi
-}
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 092cd1695e8a..abf12dc30275 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -1,8 +1,4 @@
-AUX tcpslice-1.2a_p3-exit.patch 148 BLAKE2B 630ab0a2f57eda36d148c9338bc1a6b95feb4867f27bef5bc0ba4144a7778ab3a080bc13dce964c56fed8fd723f6ba3247aafd1d878cbb276f3d17ed58ba724f SHA512 7506ce229cc1e0d44570c62a77e0e96adc3936d8464af6c79abbd9b1fd09559b627fa4f27f905cc5e7fd39f246e818a445406ac9439b6792223671f0f1f77864
 DIST tcpslice-1.5.tar.gz 136597 BLAKE2B 04512feb49d905458b06150846ea1ae5439db42567e652afb49ddfca179f60fef425db71c0a1ea0aa8c4863e170385bb0f57599ae50cc2417b2fd16e57bd02da SHA512 b9d8192c6aea60661898633a47679c8890813530c7ef7a331c1e3b711127028ccc90e6748cbf23666d74f1639ce8f71d4d7703aac707821d8abf9b9c73f2402e
 DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed95a21c1e0476e0ed2a7b32eff2c8cf848fdb52414162e7c7df480e722f28063905e9e03093814590a474da86bc SHA512 4b948ac72672066ba679aa58b6e7fdb672d5be36ae24a503fe4093b67185d0f9466c7fe820199fb1043e6c21e015be07cf9ed020414ebf0c801aac30e3b84afe
-DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b
-DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5
-EBUILD tcpslice-1.2a_p3_p4.ebuild 882 BLAKE2B 6c4cb82b914f111c4fdeb5c28a33d40e52427817cdec12cab8c60a28b90d3ecebdef276db8f3af2203fd20a48a9cf7160898d6c7cc9a796c2663aacffa1f51bc SHA512 724644057f7c5e9f7970b5c8dbd4958182c9b9cf2e51cd1b7926f6483b95959f33b2c8b3cda16ae870ab3783c6bd1364d6e7a12c69e3d43568abb08e6cf23212
 EBUILD tcpslice-1.5.ebuild 624 BLAKE2B f3c83c31ff2993f9b19d2abf998420c031311c32112e1b93349ed90e8d4b59d12f68fe80b376f41f758e364bcd31170ff15fbf31f15cdf8fec7fa7cc25039710 SHA512 822c308e07ec3d5377779622ccda9cc4eeb70157ddd757a6e3e32da48b40878f447436db7a1ed63079759e060a897960ae357d9e5b2b5f1b70b51ee3b397dc67
 MISC metadata.xml 372 BLAKE2B c2e297cfa3dfa8458ff52fee54990962c94e9a06e8e180302f735e84b49a68d1b252bd1bbd3ed8f7882d4dbc70706dcd55d50f7fa87a32ebc44fa1ae952a54fe SHA512 aeba6817feb7095adca5beb16df6d14aea57d773b6a82a6d99dda19b28de89fa8e64d75b018e7d346b59c7014df34c0a45c3725361227ff709617da733be76bc
diff --git a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch b/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch
deleted file mode 100644
index befcfdc9defe..000000000000
--- a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/util.c
-+++ b/util.c
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <stdlib.h> /* exit() */
- 
- #include <stdio.h>
- #if __STDC__
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
deleted file mode 100644
index eca9e30b0bd3..000000000000
--- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)"
-
-DESCRIPTION="Extract and concatenate portions of pcap files"
-HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz
-"
-S="${WORKDIR}"/${MY_P/_/-}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/[0-]*
-	eapply "${FILESDIR}"/${PN}-1.2a_p3-exit.patch
-
-	default
-
-	sed -i -e 's|ifndef lint|if 0|g' *.c || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	dosbin tcpslice
-	doman tcpslice.1
-	dodoc README
-}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index e43f309086c7..fea50985550b 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,5 +1,3 @@
-DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 DIST traceroute-2.1.1.tar.gz 73063 BLAKE2B 89a828f7a0fec30ece599ee7fdd13fd93db0668f6c9f930f1d6d7d94140bcfdf0c75d2d8c5cc52d699e5c4377239f1a4123ad73a98b619968955d029d0842d9f SHA512 f3358e57ffb4a8dc40650e941da879c60407414e44f9887ae65820d1089491dbfac579bd06c1df296738af89a6c61c1e7944ae4495464f8c9ae21afb19b8f296
-EBUILD traceroute-2.1.0-r2.ebuild 857 BLAKE2B 9a19183cbc97b945ae53531ec5e60e38b88f85b63342427384b6d8e62c6d07bb06bd043468d6242ebe614ec810083d347287d8a772f3180a6d1ec7f7f097494e SHA512 17091ce57449fd0e11bbebc4b8f458bc7b5d77a142d89578ef35821eaab0e7433b54e068c0fa74475d1bcbd7675fd4f00395f25b26d982d27479a7cff8b6dc80
 EBUILD traceroute-2.1.1.ebuild 857 BLAKE2B e953d4fe8760e8d2aea40f27efefc2e0a67089dfe88c497918cd2fe118427201429e764c4235324e4b6af95d69e4c4e3b077f2af65c5080b0db62a2dd27bd97d SHA512 7f010cbdbc01bd02b55ad27d6a183815f0eefe928a47e8bb95d1bc9fee1f33924baa8de033d837b77ecb01f084d4327b27749212edb7c6f6e1a46352b7113b0a
 MISC metadata.xml 361 BLAKE2B b60204801c379608dfce0a04007e5cee10344c9088df0ca272b2a28ed8ccbdf7b262239667282bd534a8b1e4faa01dc19e9336277fc1aef266a0898fc684357e SHA512 56dc2934532a25edd164a98ac97808388e828b824456e800809c7e2ea45c007d622d0c12366d30acfeb40ead802b287449673d6283330007e4513721e3759263
diff --git a/net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild b/net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild
deleted file mode 100644
index ca9e2e6708c5..000000000000
--- a/net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Utility to trace the route of IP packets"
-HOMEPAGE="http://traceroute.sourceforge.net/"
-SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-RDEPEND="!net-misc/iputils[traceroute6(-)]"
-
-src_compile() {
-	use static && append-ldflags -static
-	append-ldflags -L../libsupp #432116
-	tc-export AR CC RANLIB
-	emake env=yes
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	dodoc ChangeLog CREDITS README TODO
-	dosym traceroute /usr/bin/traceroute6
-	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
-}