gentoo auto-resync : 20:12:2022 - 19:52:06

48 files changed, 19 insertions, 748 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6495b4ad90fd..8eaf2dc4c916 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest
deleted file mode 100644
index 1c74418f8736..000000000000
--- a/net-analyzer/angst/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.4b-flags.patch 551 BLAKE2B f8abf1a56addf80157155dfdf1cad5f2fc49d9b554c1e65baf69a64ef90c5337522635878704fe867f51e9dcca4b46b45a9e2a6a16c36a6bf92709d32c4f3494 SHA512 4552e16344bfa8fab9952c55891ea1ecbaaeec38df4fa459959f7db54b7197282b8d6436f250002c05db5abcc75c640f87bdff66261812afa82ef8f2b6e96965
-AUX 0.4b-libnet-1.0.patch 372 BLAKE2B 56df2ea477503005c28c32bf852675fe428beb07334bce78d467fbe3977c1aec82fee34935157160fbb9563fb2a1b385e93b28e76a030496e07c86b052ef4d81 SHA512 aa135c5e1e0daf54a2ff72eff465f0f3f26e06bf7da76fca48ffb145ebfc10e09d29fa45ae0c84009ee2535a06d093e0fc0936993ab9034025e1c68136168b25
-AUX 0.4b-sysctl.h.patch 183 BLAKE2B a8eaa002d49b9072fb48f7fbea3738d94aacff831daab7f22163f8e7427d25521183123f512bc218508f63518f7ee0271520aa48b0ceb230214fc22abcb7cd96 SHA512 dbee5d362e55c8ef2cf5ec76c10bb2b305d7aeb733cd882cec9ea6ad7438a0c0fc6b025e4536e17d0962b3332e189c965c37c7df859553e476f6a77b805a0f10
-DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449
-EBUILD angst-0.4b-r3.ebuild 871 BLAKE2B 430b694b8c5093eb52934193775cb46ec0e57f9939eb201220db2649ba9fee9541fd2b1c11176a5ba62b085e92a48a275dbf3d674777ad1a5360478d1b5ccb7b SHA512 f0a337e986c893e064a064818a2a6b1644135615fce53a0572fb23dd1fb10b067c19bec37a5913553c08079f315f208f68179455942f09b153a2a693ed45a7b2
-MISC metadata.xml 356 BLAKE2B b926dc98ea0de85f7d35c7a72e9eb43250de12a8e0eede9bb9dd82fd1048b7b039bbce513f66ca1ea419d80d1c733801babddf77974f737617fa2a4d40ee7a2a SHA512 dbd36437e09dac5274aedb169d081d79d03d1e22b8a565454151d402541d8e03cbf30ed6bc1adb8e15e179b0e58e275e9e3a37277cc2f7bb4844515900ceadb3
diff --git a/net-analyzer/angst/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild
deleted file mode 100644
index 42a093440109..000000000000
--- a/net-analyzer/angst/angst-0.4b-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs"
-HOMEPAGE="http://angst.sourceforge.net/"
-SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND="
-	net-libs/libpcap
-	net-libs/libnet:1.0
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PV}-flags.patch
-	"${FILESDIR}"/${PV}-libnet-1.0.patch
-	"${FILESDIR}"/${PV}-sysctl.h.patch
-)
-
-src_configure() {
-	append-cflags -fcommon
-	use debug && append-cppflags -DDEBUG
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		-f Makefile.linux
-}
-
-src_install() {
-	dosbin angst
-	doman angst.8
-	dodoc README TODO ChangeLog
-}
diff --git a/net-analyzer/angst/files/0.4b-flags.patch b/net-analyzer/angst/files/0.4b-flags.patch
deleted file mode 100644
index 1021faa5b539..000000000000
--- a/net-analyzer/angst/files/0.4b-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -5,7 +5,7 @@
- #
- # $Id: Makefile.linux,v 1.6 2001/02/08 13:44:12 argp Exp $
- 
--CC = gcc
-+CC ?= gcc
- INSTALL_DIR = /usr/bin/install -c -o root -g bin
- INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555
- INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444
-@@ -21,7 +21,7 @@
- all:	angst
- 
- angst:	$(OBJS)
--	$(CC) $(CFLAGS) -o angst $(DEFINE) $(OBJS) $(INCLUDE) $(LIBS)
-+	$(CC) $(CFLAGS) -o angst $(DEFINE) $(LDFLAGS) $(OBJS) $(INCLUDE) $(LIBS)
- 
- clean:
- 	rm -f angst *.o missing/*.o *.core core
diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch
deleted file mode 100644
index a2bcf1a18696..000000000000
--- a/net-analyzer/angst/files/0.4b-libnet-1.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -14,2 +14,2 @@
--LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap
--DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG
-+LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap
-+DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG
---- a/angst.h
-+++ b/angst.h
-@@ -12 +12 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/angst/files/0.4b-sysctl.h.patch b/net-analyzer/angst/files/0.4b-sysctl.h.patch
deleted file mode 100644
index 16d8b53b6a3f..000000000000
--- a/net-analyzer/angst/files/0.4b-sysctl.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- angst.h
-+++ b/angst.h
-@@ -8,7 +8,9 @@
- 
- #include <stdarg.h>
- #include <sys/param.h>
-+#ifndef LINUX
- #include <sys/sysctl.h>
-+#endif
- #include <libnet-1.0.h>
- #include <pcap.h>
- 
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
deleted file mode 100644
index f36942917258..000000000000
--- a/net-analyzer/angst/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">angst</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
deleted file mode 100644
index 61888bd0204d..000000000000
--- a/net-analyzer/carl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r5.ebuild 506 BLAKE2B 944d5dec096f0bd2bd5e1d34286a675dd021ee566bfb947e56a38b78d01a19494bbaf14974697a322eecbd6727ccbc5d6db4b7046f3652283ad1e3d6e9b427fc SHA512 1950f4688fc00e44bcd405b24882054b84f51384847689d5543b42020d09f1adb51831647bcad9a4819092f664b02a9479a43b1743ca7a4eba73f5c3c9102a23
-MISC metadata.xml 279 BLAKE2B f6f6aa89e1006ff0d57c3894fde1d9837a8b19286a8299ee3878431d45b789280e3d818dcf4ec22a013f6ef23c6da793158eefa92d058fdb0547f6a62de9a4b3 SHA512 49337b6016288844d78dbbc7c34d92e3665e3ff737782187b656784d5c1af0b5fdc0778f319dc5b1d888deb27e6d1377370f4c4bc6aa457fefabf514ea6a22e0
diff --git a/net-analyzer/carl/carl-0.9-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild
deleted file mode 100644
index a8d33e657707..000000000000
--- a/net-analyzer/carl/carl-0.9-r5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="An rsync logfile analyzer"
-HOMEPAGE="https://www.schwarzvogel.de/software/misc/"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-
-DOCS="README"
-
-src_prepare() {
-	sed -i -e "s|(__version__)|\"${PVR}\"|g" setup.py || die
-	default
-}
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
deleted file mode 100644
index e48a5ab0e03c..000000000000
--- a/net-analyzer/carl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest
deleted file mode 100644
index 7f6881364b9b..000000000000
--- a/net-analyzer/egressor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0-flags.patch 578 BLAKE2B 18df2e1acd88224555288e23f1c21dbab799b92f442a66b5f879668a10a93c42854573bba136718586a4bc5d7cdcc8fc6ba53b34a2117bb87016c9e5d1b57f51 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a
-AUX 1.0-libnet-1.0.patch 250 BLAKE2B e7790e2d6a92517e2a3ffee68aa98b894a965458f065fb5854f4b7b018c759f444c2590cd227bc139816f891d5c731409f49cc68489f9f2258a62df131ba0a01 SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089
-DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec
-EBUILD egressor-1.0-r2.ebuild 797 BLAKE2B 715267f9afc94103661f8172f1575f97d1a5c9d8f07afa8a15772979d88ab72bf8c9c2b76bbc7d2c8590d9f8d09b672e4095a5a452a4e4fc5a577ba996d21d6a SHA512 fc85611405cec5c27a23986c108cd5e3a991f55bf100f1be263dce4013cb085b2d2b5bff05373cebe9459cf376a2b7e94907dce69211b7308a22c4bf645fccd6
-MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
deleted file mode 100644
index 6a3ea8056e36..000000000000
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tool for checking router configuration"
-HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/"
-SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="egressor"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3
-"
-RDEPEND="
-	net-libs/libpcap
-	dev-perl/Net-RawIP
-	dev-lang/perl
-"
-PATCHES=(
-	"${FILESDIR}"/${PV}-libnet-1.0.patch
-	"${FILESDIR}"/${PV}-flags.patch
-)
-
-src_compile() {
-	tc-export CC
-	emake -C client
-}
-
-src_install() {
-	dobin client/egressor server/egressor_server.pl
-	dodoc README client/README-CLIENT server/README-SERVER
-}
diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch
deleted file mode 100644
index 03368b05dbaa..000000000000
--- a/net-analyzer/egressor/files/1.0-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/client/Makefile
-+++ b/client/Makefile
-@@ -5,8 +5,8 @@
- #----------------------------------------------------------------------
- 
- 
--CC          =   gcc
--CFLAGS      =   -O3 -funroll-loops -fomit-frame-pointer -Wall -DMD=5
-+CC          ?=   gcc
-+CFLAGS      +=   -Wall -DMD=5
- #CFLAGS2	    =   -O -DMD=5
- OBJECTS     =   egressor.o md5c.o      \
-                 
-@@ -21,7 +21,7 @@
- 
- 
- egressor:  egressor.o md5c.o
--	$(CC) egressor.o $(LIBS) -o ./egressor
-+	$(CC) $(CFLAGS) $(LDFLAGS) egressor.o $(LIBS) -o ./egressor
- 
- md5c.o: global.h md5.h
- 	$(CC) -c $(CFLAGS) md5c.c
diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
deleted file mode 100644
index be7cb4f15c6f..000000000000
--- a/net-analyzer/egressor/files/1.0-libnet-1.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/client/Makefile
-+++ b/client/Makefile
-@@ -15 +15 @@
--LIBS        =   -L../../lib/ -lnet 
-+LIBS        =   -L../../lib/ -lnet-1.0 
---- a/client/libnet_test.h
-+++ b/client/libnet_test.h
-@@ -36 +36 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
deleted file mode 100644
index dce3f3be66c0..000000000000
--- a/net-analyzer/egressor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 658cfcf22cfb..7140f028ea42 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,10 +3,10 @@ DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961ca
 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d
 DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf
 DIST netdata-1.37.1.tar.gz 25160143 BLAKE2B 9efd0edeb6d2d76338c98c794c4e81a00a951e40e9fe4682030f04c28b1a9895bac0c06a695b055ce94cbf1fb55c516364daec026759134a590e645a2c380ca6 SHA512 fa60f11b79c89fb8b1d825c7d395b294f291e6b72acb1c9b47212c145ca2e6c28b9370ebdbb1c8666884e2b714e2fd8ba498ffc6b428361b93471e4d555cdfa7
-EBUILD netdata-1.35.1.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
-EBUILD netdata-1.36.0.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
-EBUILD netdata-1.36.1-r1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-1.37.0.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-1.37.1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-9999.ebuild 3932 BLAKE2B e826718e33e68458671e0e53fc0caee4d2f3c9d43f40b93c5db545e20980b7666daae00d855bdd9dc5d9fc4896fabf27c5ced0b3f16b6a4561be643abfb5aaf7 SHA512 6a60a4bd493efd848f0351d1b554690873e53552c473d3ce7362f4f549d1ea051a1ae04c1728c808be5cb8365c6a170768db7edcae0a876102290a71799ed94d
-MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
+EBUILD netdata-1.35.1.ebuild 3860 BLAKE2B 459b712cae1d92d4d1c8ca685517bd62f8958b2193ed627a54c7caa416470fb941849ce7d5d445f1c94b7a83e921e58e8d3047d486229f682cb1475192067cdd SHA512 902fe41e227c5a1e67ba7feb9aeb9ad71384a4cafa6de3fc47a0cea8e0992e93bfdbb3edf698cd196acf25695cc9877641bd021c83094516931d06106b310fbd
+EBUILD netdata-1.36.0.ebuild 3860 BLAKE2B 459b712cae1d92d4d1c8ca685517bd62f8958b2193ed627a54c7caa416470fb941849ce7d5d445f1c94b7a83e921e58e8d3047d486229f682cb1475192067cdd SHA512 902fe41e227c5a1e67ba7feb9aeb9ad71384a4cafa6de3fc47a0cea8e0992e93bfdbb3edf698cd196acf25695cc9877641bd021c83094516931d06106b310fbd
+EBUILD netdata-1.36.1-r1.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-1.37.0.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-1.37.1.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-9999.ebuild 3868 BLAKE2B a6ebb3447cd87efb356a9103ea0e9367e1ee06b99e2de5c7f6f1ec6b8eb5d9a068902812b6bb019b3086153c4aef52611ae61e843f116679a0a2421f83a504b7 SHA512 ef2721a10c28e3d65862c0479d412860fa13126a6b7e2fc700ed5ece46ec94920d8a7983e0bfdbbbfad24c18298c13f5f0e6d6935ad439981a7e43a09d429673
+MISC metadata.xml 1210 BLAKE2B ac344469cba5d26dea18c43f9387c4e8de92d39dae04d70e80de49584bcfad11f01287ed6634fafb85d73acc08942a4bd250105fe0abe11ddb45da826f4f21db SHA512 ecb8c9976479a31a90789b2f6d336b533d7fe16b0995634fa3eb015e3bfbc57eeeafa91dc13c943a1cde41fd73679c55f16bd3ce749bf0f82d23899531544f3e
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 666206a17892..e43c89607178 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="dbengine">Enable the Netdata database engine</flag>
     <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
     <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
-    <flag name="kinesis">Enable support for Amazon Kenesis as a backend</flag>
     <flag name="lto">Build with Link Time Optimization (LTO)</flag>
     <flag name="mongodb">Enable support for the mongodb backend</flag>
     <flag name="nfacct">Enable the nfacct plugin</flag>
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
index d4f2ab18da89..e18bd1cca21c 100644
--- a/net-analyzer/netdata/netdata-1.35.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
index d4f2ab18da89..e18bd1cca21c 100644
--- a/net-analyzer/netdata/netdata-1.36.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.37.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.1.ebuild b/net-analyzer/netdata/netdata-1.37.1.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.37.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 1c367c2b30c4..e674facfb747 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
deleted file mode 100644
index d9ca3990be18..000000000000
--- a/net-analyzer/prelude-correlator/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prelude-correlator-5.2.0-fix_siteconfig.patch 333 BLAKE2B 8146762e1e277cab3ffe4517967a938083ddbda2a43f0e97c09e783094f025961a69e426adae2e0454d0a662215f3bc509d9f609995b06f13a408f4cb23964a4 SHA512 e423c37424ce80df6e448d04dd084eb40b90741a8acc35b91a1470f88d04531fedd8b8ccdbdbef3756ce5e7d285303608f8c794f2d60a00ab550b0a0f49134f8
-AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
-AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
-AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
-DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-5.2.0.ebuild 929 BLAKE2B 6e537c11c71d2d517b166fa3b6d57bd6c46e1f46e4d4e9c270b3b8e11b637d6c538b4c81802d0ee4eac0f3c5d6d59c02962f1068f3087d3c222ee1131af6eea7 SHA512 36d0ab00c987b09563d6e3a8168a3f4a14fff004a3d1e00942a9c5772ad555ba8d7ea8fd1364649d075a26a615d34b0b1c4147288b261bcf7acbef69ac994636
-MISC metadata.xml 619 BLAKE2B 397a3f2ab9a78d9d8f0b343567ab6b1da5a955605526ce8f3adb3a4a892ff58032dfca025d198e6be08395af3865a2d09e08fed3a503747b2a9cebe05838c56c SHA512 c50ad9083696ecf370f1a8a03ca5021131c6f8942ca04654160c97248f2253a5cd934ba1d76e84a0cb4214cfc80e627a202382e09546d8bbebfee74c3ec0958a
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
deleted file mode 100644
index cdb55dfbac95..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py	2020-09-29 00:30:57.407653336 +0200
-+++ b/setup.py	2020-09-29 00:41:37.813997273 +0200
-@@ -67,6 +67,7 @@
- 
- class my_install(install):
-     def run(self):
-+        self.skip_build = 0
-         for dirname, flist in self.distribution.data_files:
-             prefix = self.prefix
-             if self.prefix == "/usr":
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.initd b/net-analyzer/prelude-correlator/files/prelude-correlator.initd
deleted file mode 100644
index 6e75689ca03c..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_CORRELATOR=/usr/bin/prelude-correlator
-PID_CORRELATOR=/run/prelude-correlator/prelude-correlator.pid
-
-depend() {
-  need net
-  after prelude-manager
-}
-
-start() {
-  ebegin "Starting prelude-correlator"
-  checkpath -d -m 0755 -o root:root /run/prelude-correlator
-  start-stop-daemon --start --exec $BIN_CORRELATOR \
-    --pidfile $PID_CORRELATOR -- -d -P $PID_CORRELATOR
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping prelude-correlator"
-  start-stop-daemon --stop --exec $BIN_CORRELATOR \
-    --pidfile $PID_CORRELATOR
-  eend $?
-}
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.run b/net-analyzer/prelude-correlator/files/prelude-correlator.run
deleted file mode 100644
index 8bec03f78704..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-correlator directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-correlator 0755 root root
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.service b/net-analyzer/prelude-correlator/files/prelude-correlator.service
deleted file mode 100644
index 7b763c30c13a..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prelude-Correlator service
-DefaultDependencies=no
-After=remote_fs.target prelude-manager.service
-
-[Service]
-ExecStart=/usr/bin/prelude-correlator -d -P /run/prelude-correlator/prelude-correlator.pid
-Type=forking
-PIDFile=/run/prelude-correlator/prelude-correlator.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
deleted file mode 100644
index e5b33cb13b41..000000000000
--- a/net-analyzer/prelude-correlator/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Prelude-Correlator allows conducting multi-stream correlations
-		thanks to a powerful programming language for writing correlation
-		rules. With any type of alert able to be correlated, event
-		analysis becomes simpler, quicker and more incisive. This
-		correlation alert then appears within the Prewikka interface
-		and indicates the potential target information via the set of
-		correlation rules.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
deleted file mode 100644
index e317719f5e8f..000000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
-	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch"
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/${PN}
-	keepdir /var/spool/prelude/prelude-correlator
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
deleted file mode 100644
index 3e8d74906dfa..000000000000
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
-EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
-MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
deleted file mode 100644
index fcf1cd64f680..000000000000
--- a/net-analyzer/prelude-lml-rules/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
deleted file mode 100644
index e93bb67f9786..000000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~net-analyzer/prelude-lml-${PV}"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto "/etc/prelude-lml/ruleset"
-	doins ruleset/*.rules
-}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
deleted file mode 100644
index c63517de92bf..000000000000
--- a/net-analyzer/prelude-lml/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX prelude-lml-3.0.0-conf.patch 716 BLAKE2B 0d25e6d9bd4a884be7b3143fbe4207e7fb8ef4ced40d0a145108cdbeb132a4c8453df17ab0de029e007f77b041c8c1c80422a64111ac17ae48484e17e2656acb SHA512 6394d55bcbc68971ec35161618bb6c7ccde0aa1e9ae2149b38f41117ddd2559ce5992803be7209d34ac20e2c5c30970bd34d39b1e510ed34655d345a3bf0c6e5
-AUX prelude-lml-3.1.0-run.patch 551 BLAKE2B 53ab37798c7d3efef60d3186ba8183a2b5fb9fc67ae7a0d1316359615838ae0e4e632a4f00a2dfd149dadb4b827c2b2ad7f32597ba8e0169de3ff96871e4f7e7 SHA512 20614c83925ec233d2fc5bf1c30df8b17031eb0448ef39095de6bce0c1ea489c82c542eb6b684afd26f05d6bc8f68ff5b6c0d04030de60036ef8bd2ed24a91d0
-AUX prelude-lml.initd 563 BLAKE2B 3a914e5cb52d2f137e6dbbd4a66e8de280ebad362b80e1dafb3c7df3d9cff1798421fec2d62b65c5324a4fa810616d69225b4b512ea2b9209a81e79f20c90c55 SHA512 b49cac24757000932e0d0ef8b98ab543d12b3efef0944f57f6c6bb23c04473d2a1cfbeccaaffb456e4d5306c12b412a1809aacae00edf535a7f3d944dcef10ec
-AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aae447870eb8ca8c7b8acd21e0664753511f7d659eb70d4f5ae80e20dcbed7addefd5d97967265fd3d SHA512 876f3c9c2c005cf146590e3c8718ae4fc04f80594ad2f279f6794e035a8ebed6b6499c6d8ac8268e8c953e615a79743eb24bf992a9857a743f75ca253aab95ad
-AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
-DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
-EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
-MISC metadata.xml 530 BLAKE2B b6ffadec6e37f5d7699b1906a79b4eb7597b72ff5e0e55435ec8b32c8786f645129abfe3e4277b814c0b4be9f2351fcc64d601d30f99c4602abae50e8bbd4eb5 SHA512 24f7464944a7ace53050d99d83663aaed86eb449026311ea8dab2ee9385d2cfa96c3bfac48446ec6917a637d439d8455679f5ff30a5ff1d54913fc8312d18b91
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
deleted file mode 100644
index dab4ea8a6bb1..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/prelude-lml.conf
-+++ b/prelude-lml.conf
-@@ -92,7 +92,7 @@
- time-format = "%b %d %H:%M:%S"
- prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
- file = /var/log/messages
--file = /var/log/secure
-+file = /var/log/auth.log
- # udp-server = 0.0.0.0
- # tcp-server = 0.0.0.0
- # tcp-tls-server = 0.0.0.0
---- a/prelude-lml.conf.in
-+++ b/prelude-lml.conf.in
-@@ -92,7 +92,7 @@
- time-format = "%b %d %H:%M:%S"
- prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
- file = /var/log/messages
--file = /var/log/secure
-+file = /var/log/auth.log
- # udp-server = 0.0.0.0
- # tcp-server = 0.0.0.0
- # tcp-tls-server = 0.0.0.0
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
deleted file mode 100644
index a9eba7760d36..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -209,9 +209,9 @@
- configdir=$SYSCONFDIR/prelude-lml
- prelude_lml_conf=$configdir/prelude-lml.conf
- regex_conf=$configdir/plugins.rules
--metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
-+metadata_dir=$LOCALSTATEDIR/prelude-lml
- plugindir=$LIBDIR/prelude-lml
--lml_run_dir=$LOCALSTATEDIR/run/prelude-lml
-+lml_run_dir=/run/prelude-lml
- 
- AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file)
- AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory)
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.initd b/net-analyzer/prelude-lml/files/prelude-lml.initd
deleted file mode 100644
index 0e1dd2e0f4fc..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_LML=/usr/bin/prelude-lml
-PID_LML=/run/prelude-lml/prelude-lml.pid
-
-depend() {
-  need net
-  after prelude-manager
-}
-
-start() {
-  ebegin "Starting prelude-lml"
-  checkpath -d -m 0755 -o root:root /run/prelude-lml
-  start-stop-daemon --start --exec $BIN_LML \
-    --pidfile $PID_LML -- -d -P $PID_LML
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping prelude-lml"
-  start-stop-daemon --stop --exec $BIN_LML \
-    --pidfile $PID_LML
-  eend $?
-}
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.run b/net-analyzer/prelude-lml/files/prelude-lml.run
deleted file mode 100644
index 75f2ef89adda..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-lml directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-lml 0755 root root
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.service b/net-analyzer/prelude-lml/files/prelude-lml.service
deleted file mode 100644
index 9d9230c6ff4c..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prelude-LML service
-DefaultDependencies=no
-After=remote_fs.target prelude-manager.service
-
-[Service]
-ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid
-Type=forking
-PIDFile=/run/prelude-lml/prelude-lml.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
deleted file mode 100644
index 60708d8389e8..000000000000
--- a/net-analyzer/prelude-lml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Prelude-LML is a log analyser that allows Prelude to collect and
-		analyze information from all kind of applications emitting logs or
-		syslog messages in order to detect suspicious activities and transform
-		them into Prelude-IDMEF alerts. Prelude-LML handles events generated
-		by a large set of applications
-	</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
deleted file mode 100644
index 554623ae6606..000000000000
--- a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="icu ssl"
-
-RDEPEND="dev-libs/libpcre
-	>=dev-libs/libprelude-5.2.0
-	<dev-libs/libprelude-6
-	icu? ( dev-libs/icu:= )
-	ssl? ( net-libs/gnutls:= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-	"${FILESDIR}/${PN}-3.0.0-conf.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with ssl libgnutls-prefix)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED}/run" || die "rm failed"
-	keepdir /var/${PN}
-	keepdir /var/spool/prelude/prelude-lml
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
deleted file mode 100644
index 20ed95dc7c06..000000000000
--- a/net-analyzer/thcrut/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX thcrut-1.2.5-configure.patch 2088 BLAKE2B 413e67d125ac4dcf086b06a63519d79d4d049ee6d94455f20a74c02a1ef9a2c8c9be99a268febe14ae2eab6c7a7c4d61a9861d2b6c4cd71f4ba5067ffb4b9c1e SHA512 0d3e77959f534d3231037c0cb71e602842f19dbbf33864100b854931ceb3b47c95017dc84f5f6b557562c338864f8809e20f96ff7f7fa88dafb930a443056d3a
-AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308fee387d0579107be9a295c88e100f6a2157b9503dff5185ac1a2d270cc116230645491535436fbd94d3e337f2 SHA512 4ebfafb9f9d9610b1ed695ca471f5a5284d06069db7a9635bdf29a72032c052f8e60688853048ee7ef90c2c99c3e34a4dcce0b88d2f1e1716a1a4ec3411578d6
-AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
-AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
-DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39
-EBUILD thcrut-1.2.5-r2.ebuild 757 BLAKE2B 11c2b66b4f194b53ce010771bb41bbeb04f7c10c3c0e44bf5bf46702ce62ae8ff7f999f80cdd7a6ded964e2365b71cde05fcd8c5d5763f12689aab657969e095 SHA512 a3f96c49d51cf08008317668cd509b6ac424ce022337a891cdab515b9b1a2dbf96df9321897bac4efd6e59a4f0c36a39a71aeedaa63fad766f789ece0f9cdca7
-MISC metadata.xml 367 BLAKE2B 0c4e99f47a17490bed90f97d4e81750952fe079f3cbdca4b0aae7a34e40a255949eac94b7d0a1cb848cea8c80a05a1477230dea2fd2091d2af94887c352a5946 SHA512 98e4882394c8b9e1cba204dfefac51c9069e790d7a516c29097a050eada6ce265d1aa3ef34a3e1e7743d4fb288a57eb6e8b7117459efac4cd091016e090f43ec
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
deleted file mode 100644
index daa069e22afd..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -153,10 +153,8 @@
- dnl libnet_init_packet only available in < libnet-1.1.x
- dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet.
- dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR))
--AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no])
-+AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no])
- if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then
--	AC_CONFIG_SUBDIRS(Libnet-1.0.2a)
--	THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a"
- 	CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}"
- 	LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}"
- 	PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '"
-@@ -164,14 +162,12 @@
- 	dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
- 	dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
- else
--	CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
--	LIBS="`libnet-config --libs` $LIBS"
-+	CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-+	LIBS="`libnet-1.0-config --libs` $LIBS"
- fi
- 
- AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no])
- if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then
--	AC_CONFIG_SUBDIRS(pcre-3.9)
--	THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9"
- 	CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}"
- 	LDFLAGS="-L../pcre-3.9 ${LDFLAGS}"
- 	PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags"
-@@ -199,8 +195,8 @@
- AC_OUTPUT(Makefile src/Makefile)
- 
- dnl Just to show the correct values...
--CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
--LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
-+CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-+LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS"
- 
- echo "THCrut has been configured with the following options:"
- echo "                 User binaries: $B"
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
deleted file mode 100644
index 0a6bcaf4ebce..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -23,7 +23,7 @@
- dnl
- dnl Use these compiler flags if we have gcc.
- dnl
--if test $ac_cv_prog_gcc = yes; then
-+if test $ac_cv_prog_gcc_not_on_gentoo = yes; then
-   CCOPTS='-O2 -Wall'
-   CFLAGS="$CCOPTS"
- fi
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
deleted file mode 100644
index a934048f341e..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/discover_dispatch.c
-+++ b/src/discover_dispatch.c
-@@ -81,7 +81,6 @@
- 
- unsigned short ip_tcp_sync_chksum;
- unsigned short ip_tcp_fp_chksum;
--struct sockaddr_in ip_tcp_sync_addr;
- static dispatch_func_recv_t dispatch_funcs[] = {
- 	dis_recvdummy,
- 	dis_recv,
---- a/src/discover_main.c
-+++ b/src/discover_main.c
-@@ -22,7 +22,6 @@
- extern struct _opt opt;
- extern char ip_tcp_sync[];
- 
--struct sockaddr_in ip_tcp_sync_addr;
- int rawsox;
- 
- #define DFL_HOSTS_PARALLEL	(5000)
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
deleted file mode 100644
index 87488c8c5196..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/src/arp_main.c
-+++ b/src/arp_main.c
-@@ -18 +18 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/arpg.c
-+++ b/src/arpg.c
-@@ -12 +12 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/dhcp_main.c
-+++ b/src/dhcp_main.c
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/discover_dispatch.c
-+++ b/src/discover_dispatch.c
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/discover_main.c
-+++ b/src/discover_main.c
-@@ -8 +8 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/fp.h
-+++ b/src/fp.h
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/icmp_main.c
-+++ b/src/icmp_main.c
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/network_raw.c
-+++ b/src/network_raw.c
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/packets.c
-+++ b/src/packets.c
-@@ -6 +6 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut.c
-+++ b/src/thcrut.c
-@@ -87 +87 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut.h
-+++ b/src/thcrut.h
-@@ -7 +7 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut_libnet.c
-+++ b/src/thcrut_libnet.c
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut_libnet.h
-+++ b/src/thcrut_libnet.h
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
deleted file mode 100644
index 1e77e950754e..000000000000
--- a/net-analyzer/thcrut/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hackerschoice/thc-rut</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
deleted file mode 100644
index 0e41e8ac8281..000000000000
--- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Network discovery and fingerprinting tool"
-HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz"
-
-LICENSE="free-noncomm PCRE GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND="
-	dev-libs/libpcre
-	net-libs/libnet:1.0
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-libnet.patch
-)
-
-src_prepare() {
-	rm -r Libnet-1.0.2a pcre-3.9 || die
-	default
-	eautoreconf
-}