gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /net-analyzer
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
256 files changed, 1255 insertions, 4124 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ffec2de4159e..e7bc59641382 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index 8c2a0d8dfc87..c12b05a8ea13 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,4 +1,6 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
 DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e
+DIST alive-2.0.3.tar.xz 187396 BLAKE2B 0614ae8d0707abf59dd1500d986ce21221092d118a40ae92e838bd11b81a2b5fd261a531843f99992746a86a31bbb494a9f35f9fa0ad5c0ea896d68edec17205 SHA512 3b2f14d84682466e02fc6678ba26eb4c0b9378f1c938a7463cc5736501cbf144baaeb7dea2c8343a916891ce4e2d580bac946c913c01d7c25e12bfa611c89422
 EBUILD alive-2.0.2-r1.ebuild 534 BLAKE2B 373d867ca88524aafd8e90352eb11975543b5a39abd4d7092b6ba3565bf17d42772fa52875563d123ef65df69318e8d26335597d91557eaa6d6fa75504fdd603 SHA512 3a74d3aa466c820b9e6646dcd10ede837177eea419ec0be6bbdde3546f7f7391a6808c532b2bea4e8109c1484fc71e1bc7ec1491691514d181200f541ff63264
+EBUILD alive-2.0.3.ebuild 518 BLAKE2B 0c7e1a4f1816b54cbc699cd79ab83832af6f5dc6ce3718bd2eee0a24e64791c6004d274e330364df57529e8fb8ece2db56a3f73525d0a7902595851d61a956d0 SHA512 42e5124b1527247bb12ee74ab2549b90f9c0de6d212d0931b22d299ef95b0f74a5a683bddef81cf94e2d1dba61044e38d91780534b379098a937e93a37ebfcf7
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/alive/alive-2.0.3.ebuild b/net-analyzer/alive/alive-2.0.3.ebuild
new file mode 100644
index 000000000000..89a15d6ada23
--- /dev/null
+++ b/net-analyzer/alive/alive-2.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A periodic ping program"
+HOMEPAGE="https://www.gnu.org/software/alive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/xz-utils"
+DEPEND="
+	dev-scheme/guile
+"
+RDEPEND="
+	${DEPEND}
+	dev-scheme/xdgdirs
+	net-misc/iputils
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.2-ping-test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 1bc805f57c4b..ae51e75f62db 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,4 @@
 AUX 4.8-system-pcre.patch 1232 BLAKE2B b659a49c80f5902718160f41f70a595607e70b80ad5c332952365bca9d09e5fd63bd7b6f4f737c5803cd49189e0030aef835cfc5cc7c2615a2705ca286443cff SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934
 DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
-EBUILD amap-5.4-r1.ebuild 1630 BLAKE2B 5449df4394abc60542a06ad5d7b010befb0599eeba37565f9886c50111cb3b66e58c1412423e7984310c04acb2cf6bf6f011d98aef18665cebf8202f79185dab SHA512 e60ffc4d76af9219c5efd2b1da76d0487b48c45a0504d13be3a5fbf543325b0e1be9f92025fe5f3ead83f4d02f81c1ee21971a9508ff7c25a8b0f986bef46dff
-EBUILD amap-5.4.ebuild 1568 BLAKE2B 8f2e5d3fbc3dd8cf87539984198212a56ff8a68549bee6ce9f659b85b026f9d4c8803dd026d001d46513c07e239c68313cec366b17606051cb5fa7c1314d8ebf SHA512 d4a516be2e3826a6b8aba3ee0a13cd5ee3ae61b16fb4b33c1d2457fb1c5b4417802b24fd26463c9ee6020b3a8681145bdb6aa1c45cad021bbdb3af185ab1d54d
+EBUILD amap-5.4-r1.ebuild 1637 BLAKE2B acf1f1646c7c5425252787e6dfc6a6dcb17534ac8ee3c10f2b6bd39e231a428a5902a0ba41f6c343fbf7795d57cf8478a6ea24e52621f38c9f4e594be0a1a867 SHA512 198b03eb65648f3d2e0b43161768c9dc02bad82a4252264e81b956c41cc16331b4a0b46c293167208f1c04d505ba5da98a5fba9193c0edcba5d06a77221177cd
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 9848a4c18f2d..2703bd6e4bd7 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A network scanning tool for pentesters"
 HOMEPAGE="https://www.thc.org/thc-amap/"
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="
@@ -26,23 +26,31 @@ RDEPEND="
 	!sci-biology/amap
 "
 
+PATCHES=(
+	"${FILESDIR}"/4.8-system-pcre.patch
+)
+
 src_prepare() {
 	rm -r pcre-3.9 || die
+
 	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+
 	# Above change requires below change. See sources...
 	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
 	sed -i 's:/usr/local:/usr:' amap.h || die
+
 	# Files to be updated are at different location, bug 207839.
 	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
 
 	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
 
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
+	default
 }
 
 src_configure() {
 	# non-autotools configure script
 	./configure || die
+
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -50,12 +58,14 @@ src_configure() {
 		-e '/^XIPATHS=/s:=.*:=:' \
 		-e "/^CC=/d" \
 		Makefile || die
+
 	if use ssl ; then
 		sed -i \
 			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die
 	fi
+
 	sed -i Makefile \
 		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
 		|| die
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
deleted file mode 100644
index ef97cd2aec15..000000000000
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )
-"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/amap
-"
-
-src_prepare() {
-	rm -r pcre-3.9 || die
-	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-	# Above change requires below change. See sources...
-	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-	sed -i 's:/usr/local:/usr:' amap.h || die
-	# Files to be updated are at different location, bug 207839.
-	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
-}
-
-src_configure() {
-	# non-autotools configure script
-	./configure || die
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		-e "/^CC=/d" \
-		Makefile || die
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die
-	fi
-	sed -i Makefile \
-		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin amap amapcrap
-	insinto /usr/share/amap
-	doins appdefs.*
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 841a34fa9e29..ba856bf18a61 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -3,13 +3,6 @@ AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b
 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
 AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
-AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
-DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
 DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
-DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
-EBUILD argus-clients-3.0.8.2-r2.ebuild 1519 BLAKE2B fbd75810aa28eeaa2f9e71cdc3eb9576f0f4819cecfed3c39595e374c800870f877ec5cf82d6ba9e792fc0cba2a88cf6e1725ee74d7312a4b43939212972f4d6 SHA512 a5109d04f041dddd80e7b0de7d1fc1539eb3c5fcd10ca2e68592c54d11a7be2132996265aeb38a21fccdfaa8572c876353262c722a75f27f3d840bb4024ddc98
-EBUILD argus-clients-3.0.8.2-r3.ebuild 1562 BLAKE2B cb0d32880096b5c421b690567bdad37ffda750e08f18ace6818a98c5d8608fe3cb6fc69def073dafacd68f0158e10894ff0c9fd92b30d3fde04af59ff62eba24 SHA512 bcf1a4da98180e1b841f14e4ff992a8b9003e38bd2ad5b584a4d46262c7edb68d384fd00bca5e09cde7929dc36dd40ec33c284c42c821fba6f1e9b10738c0afb
-EBUILD argus-clients-3.0.8.2.ebuild 1452 BLAKE2B 52eb69a7b9cd55066c118503866915b361b30f0fa0d6732e4bf31d20e9029b9a5350bdce7413fc768b9a552782b30731de6c20f6a7cec6740177a7e80007c033 SHA512 15f49d72ad76e88745bb3e0fe2966348edc220ea6af06eb65b0e3274f626fbf73931d53f47ac3681874e2d51ad2f5f53958d9bd77f717ed821b0157003bf6ffc
-EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 20dd3ce043f786f5ed0d86b46d677a5fcc4de995f928ca664c373f16dbc77ae4dd04751f6259a4153bce107a13b9e32bb87690274c350ab552069658838a4eb9 SHA512 972c666d58895e0677098d38977f9f31ba9eb1fb1aeeaab45972a2ea7ee85df33987952bb61e5ddb6c94a402fee902af2536231c2702c2f72997061b92985225
-EBUILD argus-clients-3.0.8.ebuild 1445 BLAKE2B 572a61f3c2b3b86886e984c1ca6ca25945289d7be5f6b8efc240bebb1c070c7399f7c1579317c77f3b92278c9bdfc72f66d6b3e5159b97e370e224149590ea34 SHA512 fb741600733cfe208ea70861b17f34bd238d26d95cd09f233e6febf49793e2e2df816f26fef5f69f44af69d0fdd17ce269666c4bf319c8efceea3e9f55f776a0
+EBUILD argus-clients-3.0.8.3.ebuild 1512 BLAKE2B d527d817e7a131b920dfa731c67038a7c6fb18e3c6041c04507b586003766a60f5ba7c12f2e9b56c24467155eaf4abb4c82bde6fa953578dffb791f84d779138 SHA512 7a1c7b40b918dafb1a126766cc20ef2d20525227caf2200a9d29f8035037b9ab27d775adc41c8f10ba82af32bdbe559a8c6a1a3359937b42bc710a56d2ebdc80
 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
deleted file mode 100644
index d87060d87bec..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-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-rpc.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.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/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
deleted file mode 100644
index 637ef50ad05a..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 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://www.qosient.com/argus/"
-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
-	"${FILESDIR}"/${PN}-3.0.8.2-rpc.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/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
deleted file mode 100644
index d16c7f6422a6..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-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"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	# racurses uses both libncurses and libtinfo, if present
-	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/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
index da05b0364a68..382122ab0c5d 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
 ARGUS_CDEPEND="
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
deleted file mode 100644
index 742c6cbebee7..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-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"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	# racurses uses both libncurses and libtinfo, if present
-	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/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
deleted file mode 100644
index e140fa96b2a3..000000000000
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,7 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_PROG_YACC
-+PKG_PROG_PKG_CONFIG
- 
- AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
- AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
-@@ -82,6 +83,12 @@
- AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h])
- AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h])
- 
-+PKG_CHECK_MODULES(libtirpc, libtirpc,
-+	[LIBS="${LIBS} ${libtirpc_LIBS}"],
-+[AC_CHECK_HEADER([rpc/types.h],,
-+		[AC_MSG_ERROR([Cannot find <rpc/types.h>])])]
-+)
-+
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -48,7 +48,7 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@
-+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@
- DEFS = @DEFS@ -DARGUS_SYSLOG
- 
- # Standard CFLAGS
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index aa5e638208b9..676e7404c921 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,14 +1,9 @@
 AUX argus-3.0.5-Makefile.patch 437 BLAKE2B 95d853328925c46dcf9ff3edc98be0ce581cf9349f75f94cfb3eb122b9e78c353187ec5a26d646468df55bbd1d63106f33908f0c8395d4b8f08addaa5e5e3916 SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7
 AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f3ea76ae5449c682b7727237ad8a2ee6d55d6da8f45d34581f393464ae9c3a4a5f74aad7dcecee0f3c5378581d3fd92 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037
-AUX argus-3.0.8.2-fno-common.patch 929 BLAKE2B 9fee5b11eb3d0436547e6d26fef654e6c9bfc2929cac2cfb411710ff28fd4110e5a90ebf02f46f6b71f11ba1d46d0164c8e41ac32e4953e5267bc7361e46a357 SHA512 1f5501095f712dc3107753849e91736a15768060b71f18dbe2ef9c0c4015ecc78481fc97d05fe821a4191bb9b04346f91734b75625ef967685f65a94f5859475
-AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
 AUX argus-3.0.8.3-ar.patch 240 BLAKE2B 28cfc93b87a7dbad663f10b1686b51344c1bcec23e2ad83863798b22f56dce1f76e496f864b1d8b815f12ab016e3c161ce234d01cea296437e000761a63f5cf4 SHA512 4aadb3a5c4f65d0a11e7eeecb66bae7dfbbbe9ddf933319788a2b4f109df3971c24b85a6932a9e29f5c8a39c26b854dbe015de84206df36bd91a3c076638eec7
 AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c1d99b1bc2bdf2e7c94d45f323ef98835ad4a1fd303dbe84006ce0099584c081f2c3f482996e31f5ef4d51ac29860bf SHA512 c8ce35d80e784ca09b46dfcb804cf103b5263e48a0009aa3e7a2a1c6bdf4158c8276136a0086a7b8d3ca5414cf40aa67e86923bf59a7b9398368ba08fbc4d4bd
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
-DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
-EBUILD argus-3.0.8.2-r3.ebuild 2007 BLAKE2B 03b484f6869b6064be1ffaf660a8a402f51d7c5454b9395fe427284ef4fbb3ed0af2cee5cb4e5f7350e15e0d1e0a775c5834b948bcaa689adf391631b63e5898 SHA512 4d8ec76f190e380ad59c01e15e6eeff645edeea8d57143afbbc2b99228f80f35ba06c0adb8f752599d5b09165063f2fcd62433c0035ce225cbf12ab8d2751144
-EBUILD argus-3.0.8.2-r4.ebuild 2037 BLAKE2B f6a3ea728f7c802b79551a91a776f349128d06d46965cacafebc5dc7032b7cca8c33c29f3b5c8d78dfc492f2dde817cc86a722dd097dadbff62540fc778fdcb7 SHA512 1e72858634af6236619d4fa33c047f3dabddc50325611d0dbd537942785ecc8d845c178888974726220012143fea8c066d2bf269f55ada729b8ea311d6d5770e
-EBUILD argus-3.0.8.3-r1.ebuild 2030 BLAKE2B 0f3d466fde3694ed0238b803f6002b32fca67e8ee23169dde2c66a65a12fd40a8005240ea7597e3d536c8a3877757e0af7ff6795413c5903ae485140c95b3b65 SHA512 2d30dd9e69fce9eae94d7c671f41a52d7e73d7b900dbfd974d8078363ad8ccbabf60571349d07b4135e90987f6fa8a6b4e641282586dbec19ec53c8611e84e00
-MISC metadata.xml 378 BLAKE2B f5479fe68336ff3ee37d9e325b9b2c1a70eb399746512fec7e08e603c82c1183b8229e0b9ee1fae073f027ca7a7eabbf9e4607c9ab1b2fa6bb6fc8b6c9bdac6a SHA512 cbd4b2e58b229b6fa82e1b3628153113b611d7370e2f4fd3e662541f07d79c01aa5974cb797bcc67017034dc7f52373648b2cdb5a7f64a89391c7028303f591b
+EBUILD argus-3.0.8.3-r1.ebuild 2027 BLAKE2B c42a9d8f32014719a0e14ca3d1bbcde1ea1502d017b2e6fc65976f8347babc8d730563873ceb697c2d2a8eff2178c84c533078d8d47e06f874ca41702ca902d5 SHA512 ed897208fddef0e11e7436851eb8bd3c95d8d5195928a9a8c6994c6acfc2622d4b3a639de0abd09a5e32bb1f51e905d532f1f0ff8b1c34cafbc56263e105aac2
+MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
deleted file mode 100644
index 47656c47be5d..000000000000
--- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-	acct-group/argus
-	acct-user/argus
-	net-libs/libnsl:=
-	net-libs/libpcap
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	sasl? ( dev-libs/cyrus-sasl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-
-S=${WORKDIR}/${P/_rc/.rc.}
-
-src_prepare() {
-	find . -type f -execdir chmod +w {} \; #561360
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \
-		"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /var/lib/argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that the init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
deleted file mode 100644
index dd6e555ef544..000000000000
--- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://openargus.org/"
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-	acct-group/argus
-	acct-user/argus
-	net-libs/libnsl:=
-	net-libs/libpcap
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	sasl? ( dev-libs/cyrus-sasl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
-	"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch
-)
-S=${WORKDIR}/${P/_rc/.rc.}
-
-src_prepare() {
-	find . -type f -execdir chmod +w {} \; #561360
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /var/lib/argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that the init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index 9dc4905b07a7..a4176cf571c4 100644
--- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
deleted file mode 100644
index 66f950d0c04d..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/argus/bootp.h
-+++ b/include/argus/bootp.h
-@@ -45,6 +45,8 @@
- 	unsigned char	bp_vend[64];	/* vendor-specific area */
- };
- 
-+extern struct bootp *bp;
-+
- /*
-  * UDP port numbers, server and client.
-  */
---- a/argus/ArgusUdp.c
-+++ b/argus/ArgusUdp.c
-@@ -40,9 +40,6 @@
- #include <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--struct bootp *bp;
--
- void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *);
- 
- void
---- a/argus/ArgusUdt.c
-+++ b/argus/ArgusUdt.c
-@@ -40,9 +40,6 @@
- #include <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--struct bootp *bp;
--
- struct ArgusSystemFlow *
- ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt)
- {
---- a/argus/ArgusModeler.c
-+++ b/argus/ArgusModeler.c
-@@ -43,7 +43,6 @@
- 
- #include <argus.h>
- 
--#include <argus/bootp.h>
- #include <signal.h>
- 
- #include <sched.h>
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
deleted file mode 100644
index 96af0caf140e..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -35,12 +35,12 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
-+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
- DEFS = @DEFS@
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @RPC_LIBS@
- 
- INSTALL = @INSTALL@
- RANLIB = @V_RANLIB@
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,6 +120,25 @@
- AC_CHECK_FUNCS(floorf remainderf)
- AC_CHECK_FUNCS(timegm)
- 
-+AC_ARG_WITH([libtirpc],
-+           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+           [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno], 
-+      [PKG_CHECK_MODULES([TIRPC], 
-+                         [libtirpc], 
-+                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+                       )], 
-+      [AC_CHECK_HEADER(rpc/rpc.h, 
-+                      [RPC_CFLAGS=""; RPC_LIBS="";],
-+                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+                     )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- AC_CHECK_FUNCS(xdrmem_create)
- if test "$ac_cv_func_xdrmem_create" = yes ; then
-    AC_DEFINE([HAVE_XDR], [], [Using system XDR library])
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index 025cfc82ece2..74c2baebb4ec 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/metadata.xml
@@ -5,7 +5,4 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
-<use>
-	<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
-</use>
 </pkgmetadata>
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index a4107c97b33c..27c3013b575d 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,6 +1,4 @@
-DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
-EBUILD arp-scan-1.9.6.ebuild 466 BLAKE2B df0472c3ab4b460912fdf6c2cdee09db76a33c10c550d701f3a598abd5508508a26b2204bf099a1a820fa7c32068576b00525d4c65957279a51d54ac7b22fd90 SHA512 69c822f1d85edca29c4c4943978ad85f55940f8545c69027b24bc8d19ed65199bbcd0849aedb66b20aa7136d71f5faab1f96380dcd8219849a9559d77f70a1e5
 EBUILD arp-scan-1.9.7.ebuild 472 BLAKE2B 9e1d1d684de88508e55728e88bbe1983baca6b270553657766df91e6a33ee3d833fb3f3c371d9f706105f207e4412eb7ab9a9c87a1db78cf8d480198ea861625 SHA512 71dff6ec3626642fc15632a2f1e76f50eeb4d0e3ef2503ceb541dcfe4455001040fd601ba3d87240894aac982037a9e27a1e8a4c2de6045e521504ef92faa194
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
-MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
+MISC metadata.xml 362 BLAKE2B 3f812777c8a9dff2088b34b8aee211726af3c08ae94980169a99596cff8cce2f5c3b876a4f059a8b29868d4d7879d8b33237d4544a157611d24b5d428eda02ec SHA512 abdb943e2a29ad44cad2b8bfb4c5479c0d7ba2bf4c7142dac9c156eeafa6e0f779a72a7db253539299f697c3c1c939420ddf1798e696c364ff58c1854d0d463b
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
deleted file mode 100644
index 96432c7a989f..000000000000
--- a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="ARP scanning and fingerprinting tool"
-HOMEPAGE="https://github.com/royhills/arp-scan"
-SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 2c12d90c2aae..390911250168 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 3165e717a51e..34e3ad166de9 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -4,6 +4,6 @@ DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ff
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 EBUILD arping-2.17.ebuild 708 BLAKE2B 3f42edd2ff6cbcba37db121428174f06a7a88c0d7217918509b962b2f5da6f9db020102989bbdd4fb28c9a5077dd77e58bc5d4995712b7c71d37add6064ef122 SHA512 dbc00430158b3633e3b35fd2d72e17f27a1ec42c8e306a8d40e149cca5b909db5792d3f21fad1b7463803c4831b405a27a871c6db45f4df76157ea5408d1bcc3
 EBUILD arping-2.20.ebuild 796 BLAKE2B d4637d26d201b66e4dd1a2c60efb22e5b60f239d6c538df33959d04d9ef69b3b6bc3c877ea731bc92544485b99abab067e20504af60820256740c41f9a00ba64 SHA512 dcbc382a2b8e77aeea9e945b3d1f3ec31c19c6b045d1c537f2e725ab9a89bbf73d9fd1194aecefc354956cafbd852b37b27968a427b381af5680e22f3d29e967
-EBUILD arping-2.21.ebuild 875 BLAKE2B 40e671d37c22221b5667818445217f9448e44de8e38beabf5d71e825613ec25b991d7e92a8ec505d5fb238e0eae9988ca9367b228525128065c07c45e3eae812 SHA512 ddc1e289e55669ae807d5804e5787566d07cea094fb0bd14fab3c8d1b1b67f3c106226676f26fe0b3f5aa5ab21c578eca2bcb839340e16ded3724452e79f7417
-EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+EBUILD arping-2.21.ebuild 855 BLAKE2B 6b9fa215468571ae71aff90ce9623e1357eb28c984ade20ae14bd09feab974ffa42ccd4f9a0cf2a9259203fe49a94aa492c25b40c396c48d914270042a44c826 SHA512 0e0712484992fb5e332230cf0b3053f25914019f7fd04ac81a6838fce8512f021990ef093c4f55b80cf0068d2f1036b49f6a2982ab8937891ac5feb6c8574321
+EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
+MISC metadata.xml 364 BLAKE2B 8043df9ad04acc43039d3ce6527d8f45e5698b00b81e177fd7bb9333fbd302ff5ad1a6da0e00d2cde5c7ab73093c335ff1cc97255957310ea4bd1857edbdbfed SHA512 41c5624a14ec28f709ae59a37f1fa0c67fd0cb02b731017224fc780a22e5e244d5a43bfce05676b29d06a835d736bdfa01f2679b6364febd87967a707a2593b0
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index 23dba4eacaee..f36e89f11369 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -8,6 +8,7 @@ inherit autotools fcaps
 DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -15,21 +16,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+RDEPEND="
 	net-libs/libpcap
-	net-libs/libnet:1.1"
+	net-libs/libnet:1.1
+	!net-misc/iputils[arping(+)]
+"
 DEPEND="
-	${CDEPEND}
+	${RDEPEND}
 	test? (
 		dev-libs/check
-		dev-python/subunit )"
-RDEPEND="
-	${CDEPEND}
-	!net-misc/iputils[arping(+)]"
-
-FILECAPS=( cap_net_raw /usr/sbin/arping )
+		dev-python/subunit
+	)
+"
 
-S=${WORKDIR}/${PN}-${P}
+FILECAPS=( cap_net_raw usr/sbin/arping )
 
 # patch is in upstream master
 PATCHES=( "${FILESDIR}/arping-tests.patch" )
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index 20b7fc882067..13d8502fc949 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fcaps git-r3
 
-DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+inherit autotools git-r3 fcaps
+
+DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="
+RDEPEND="
 	net-libs/libpcap
 	net-libs/libnet:1.1
+	!net-misc/iputils[arping(+)]
 "
 DEPEND="
-	${CDEPEND}
-	dev-libs/check
-"
-RDEPEND="
-	${CDEPEND}
-	!net-misc/iputils[arping(+)]
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		dev-python/subunit
+	)
 "
 
-FILECAPS=( cap_net_raw /usr/sbin/arping )
+FILECAPS=( cap_net_raw usr/sbin/arping )
 
 src_prepare() {
 	default
diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
index 74c2baebb4ec..0b479293e236 100644
--- a/net-analyzer/arping/metadata.xml
+++ b/net-analyzer/arping/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ThomasHabets/arping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index 7d81613d26e6..0b59610ae4d6 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -1,14 +1,7 @@
-AUX arpon-2.7.2-CFLAGS.patch 407 BLAKE2B 5cb747ba4f8153a1f1e13da49fc9cb8f55b75b8f80b17ea3c336d4feb863f23dfe08d93209a646b85301d8d0ba7d76a958e5d5468b47b08dcb6ec8be307d7b92 SHA512 9029ddc9b024e62f21a49faab5c39008bec22b88cd6fac5f31ebb7327357159d6ec36f0f750bb4d5e985115d553b95b8c1daf2794e9edb7c40dae06fd8872a07
-AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f50d3b62c611fa797abf3f866fca7f4f2e8d880544effa5411c1fec408ef4e43d96af2859bcb16215ae4121 SHA512 2bafa030d87d9b216902246053d2521ed4395c89d12b2bddef4e38671442a5d1e54afc8bde3a77944e93f93b703f1f60b0f6f84535fefc8331ec59aecb69e492
 AUX arpon-3.0-CFLAGS.patch 1787 BLAKE2B 234bc1d6d991e17458c4abbdba64afcc4edde4cdd70f734fade44e50059545b453f2ce93b9f46b180db8e671287045aeafda9158f78541b699a888d81effe8c4 SHA512 032959619ac5a33aa52ef589661659d4ad3842a7778bb40dd1c8d45fa6f1edac02dc8b4078fbdb41b8af52d2f7423c1d54ac2246582aec563fab42ae8859295e
 AUX arpon-3.0-gentoo.patch 4736 BLAKE2B 854efd88ff29b13defdae4d57ca97f00066a9a21528d23df2014f031dfe6467fe60de06bf9f99f72eed8745a9c1df86bb6f9d362ce0e637a0d221c3ea59ce304 SHA512 63f9122d1cfb5e05bb32f7dbf9a9fde9e7f155b16d0f42fc890cbccaf8409773bbcd2907e08f69fdc3739d0683c7495d132a663f8f9f6ce83405b6380f02f807
-AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
 AUX arpon.confd-3 75 BLAKE2B 3a054d7d5392a9a877aafc25687f15ddf6a483122fc29ba34a4399e31be2ce009b42a5a8b69fd4a1486f1b37d917221a7c7121449006210b8a38213709c1a2e9 SHA512 c13b5fd267ac0e96a30d235917ba644035d05e13c4cd8121081fa7a0d97fc921a1f828727e462245e701ae84b75738fb39dbc95c133f11d53641412669d3c584
-AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 AUX arpon.initd-3 472 BLAKE2B 159774908987a99ce884248d1a972d0c74395b29637f7adc638429925daa98bcd52b6393a73d7e81177c0b9c108ebbc251087587e866d484cd10d60a18af68b0 SHA512 22216841bd716052a25195e2ae693c13b9f1da503195b2a22a1fc0dcab3377c94a02c4e9c1115359b4e40eb63a56fe207767815edb11c42d01bdd75411b5a057
-DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
 DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af
-EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B e401df619a1da645dad882e67b69451a01d2837475d39a755b453575698f90cf021bb7165016aff0805f4fa7d6fd2852ac6ecfeddb43deb7cd86b68d0aa94965 SHA512 a81ed2f8a530ffb3a9781ca5785c58d0adc01867f650eedda0511fc94376b3f077ef8fb99e221ce1e82b04c796a466c0c2c579203820f5ee8a400867f236b8b6
-EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-EBUILD arpon-3.0.ebuild 834 BLAKE2B 7ceebb9368abdd8a5fdcb1acd0bb6db73c0eba5ff88e83f2d2cc787ea3462b27f45a3473d3c92aa7b3ab12dc745093c2f7b36a28fa81274dbc28203b92dc5bf9 SHA512 1d259119942237615a5a51286a73d4b90d37fe2c0ba4c8f11294e6f215b922f74a48bbae86b3a3e5909078a816ffbcb511cce7d4146a286ef35913a1cd291859
-MISC metadata.xml 285 BLAKE2B d232c837f5b78009aedc859ac2aa78da0775cb937b3742bec976767463c738db4054feb51e08725449432ef4c74add9697e2781938819d6e35cdccdfaaa2b590 SHA512 16762a0e8ae17a8f288d969f0f8d9dc15ce522c2c0e007007830dd3efe1ae96dc53f0d034f591fb6b6f7eb039fbde52f37f596bf9a34805900952391540bee4a
+EBUILD arpon-3.0.ebuild 835 BLAKE2B 458d57ce6eec80b95227aba083b12db3139a4fc20036ad887dcc9991dba269c68da9c1ece15a570a108c43a52a273284e1ac74efa6db1f45954dd8c5557c2a7d SHA512 714e729fc1a5daadcb20a10de3b1b526989ade6a6c0b279379a6c594027f5171a7f53bdab3362294c406d0f02a3192b2f48b8fd72fc232c5fe3ab589adb3aeba
+MISC metadata.xml 285 BLAKE2B bc100e6f3ecf9093f8f4c0011044820375e4f90c2758bd85831ae68f9f5c670326b48605532bc397973be9d725e65390f85b2fa51662ec031b75105fd62f02c2 SHA512 30275bd57675bbf1d25ac46ac6112fe553a25927a41254a8453448f3e578d6c00533c464ba3b680f922d90eb65b1360f7fbee39ccd8b4123f44df9d719159fbf
diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
deleted file mode 100644
index f2bc485b6fd2..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch
-	"${FILESDIR}"/${PN}-2.7.2-etc.patch
-)
-DOCS=( AUTHOR CHANGELOG )
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild
deleted file mode 100644
index a79e9de5e0fa..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die
-
-	DOC_CONTENTS="${PN} now installs an init script. Please edit
-		the /etc/conf.d/arpon file to match your needs"
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	readme.gentoo_create_doc
-}
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild
index f84ce3dfbc6d..c800c3568c29 100644
--- a/net-analyzer/arpon/arpon-3.0.ebuild
+++ b/net-analyzer/arpon/arpon-3.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
 DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
@@ -10,6 +11,7 @@ MY_PN="ArpON"
 MY_P="${MY_PN}-${PV}"
 HOMEPAGE="http://arpon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz"
+S="${WORKDIR}"/${MY_P}-ng
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,18 +22,18 @@ DEPEND="
 	net-libs/libnet:1.1
 	net-libs/libpcap
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.0-gentoo.patch
 )
+
 DOCS=( AUTHOR CHANGELOG README THANKS )
-S="${WORKDIR}"/${MY_P}-ng
 
 src_install() {
 	cmake_src_install
+
 	newinitd "${FILESDIR}"/${PN}.initd-3 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-3 ${PN}
 
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
deleted file mode 100644
index 525f03740dd9..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,11 +51,9 @@
- if(cmake_build_type_tolower STREQUAL "debug")
-   message(STATUS "Build Type: Debug")
-   set(CMAKE_BUILD_TYPE "Debug")
--  set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g")
- else()
-   message(STATUS "Build Type: Release")
-   set(CMAKE_BUILD_TYPE "Release")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
- endif()
- 
- include_directories(
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
deleted file mode 100644
index 03e80f9d5955..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/CMakeLists.txt
-+++ b/etc/CMakeLists.txt
-@@ -14,7 +14,7 @@
-     COMPONENT Etcfile)
- else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
-   install(FILES ${arpon_etc_src}
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
-+    DESTINATION /etc
-     PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-     COMPONENT Etcfile)
- endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd
deleted file mode 100644
index d1ce050fa4cb..000000000000
--- a/net-analyzer/arpon/files/arpon.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-METHOD="--darpi"
-IFACE="eth0"
-LOGFILE="/var/log/arpon.log"
-
-ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log"
diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd
deleted file mode 100644
index dc69135c26e3..000000000000
--- a/net-analyzer/arpon/files/arpon.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting arpon"
-	start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
-		--exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping arpon"
-	start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
-	eend $?
-}
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index 68ff631bb172..6d6d1a8b6656 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
 <upstream>
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index da11b063c5ca..35da1fd37921 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,11 +1,13 @@
+AUX arpwatch.conf 416 BLAKE2B fd74ff5df7a18dab34246d2a643b88353651aaa21825a0824d9adf54b252bc328da54efe5f4acc0054c27c66bd2e966719c22be4fceebac3da9584f3967a00d1 SHA512 c209a8184ac1b447035eaad083e74fe278093dcd7ac28ec2aabe806c6ee1d1ed6072153f27537a7755639ad3e7d95b4b02a9e0c31dae8f940f3128b4532dc371
 AUX arpwatch.confd-r1 559 BLAKE2B 291acbd1ebf7ab4f9f6ca19dfe1b445fc610c1b0961c895f5ccee3fe25e0536ef81e2530ff2151dceb52d113d1e13ab9185a0d83577d9258d57613112bb616d7 SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c
 AUX arpwatch.confd-r2 577 BLAKE2B 5876819ee028fe4a77ffca0e359d73492bc6ff82ad89f7ad24e38b9167c6d7858ae186115ac3fe0d594a93e0197fd2eea0daea5c0d49674b0770836d7cb2fb68 SHA512 9d6086f9e1bd27976117b408e1a604b9544a5acf80cf69cbac00516fe36f93dd600a2876039dbfa023b12a35d01439fe25845304474add1bfa059c97383aae7c
 AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9345b0d9b983aeb299e51849eb04b0df0627252ab65db1adf706f181aee61f471a1af87a3c1b3653e80 SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04
 AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bba1a5a8aea227c30b2fbb4425cf4d6fbaff1fe23493b58b211d4f6a6328bfe9a20e1020709db1cacb57 SHA512 b3518e24c839bda3292ff9f8dfb7c9bf12f4483637590875f281116cc1a453266ffb22507383fb71cf28b889141b355f077df8e7937ac571ab72924f5f2014f7
+AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
 EBUILD arpwatch-2.1.15-r11.ebuild 2230 BLAKE2B 889e3e63758098ba0f118865f8eb79d9ef90918bad7bd4489c51ecb542c755b2e39b97ab53aa82a221b4c49ec4448382e4f879ed1af1eb0357880db9d7d57f93 SHA512 c5e42b41147f62ae73a5dd659a69c1605c3298bd5d2f36153b706e940284a074532fa4ebb0349ed665aca208c85e7819444ab57888dfd1bc79cdf7d385e4f0ac
-EBUILD arpwatch-3.1.ebuild 2060 BLAKE2B 74e15d6a6b4b7e994d557756a0662dbad1d8c8a44fa09b431eab77c33c8b831e93ccfc287c96c9e5a341618e2f52d54c414465afccd69dac92608dee98c479bd SHA512 de10526bf59ce55f7ec8fb67d4de5eeb002237b151bbc1be11a62f3d0cae757a5fbfeda3f64d99dbcf95fc4eac197e7b759c114bc3dff93ec6605494b73a7c16
+EBUILD arpwatch-3.1-r2.ebuild 2105 BLAKE2B fd08a9f1e0e520c2585772e3c73cad82a183083369cbaff0b7bd54f773318330568203157081763ee58308be6733b5fb71cca66229d4c65e16459b0d4019fa6c SHA512 55136ed09a11254c51813dfa10ba65484d99ad14a5c9a36dec6f0078cd3b759a8de57fbad9c23a72bbbef095ccc09c9db306e7ae98c37ce911127c035b6e3464
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-3.1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
index 64ae0f6ef45b..74a75dcce777 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit user
+
+inherit systemd user
 
 DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
 HOMEPAGE="https://ee.lbl.gov/"
@@ -15,7 +16,7 @@ SRC_URI="
 	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
 "
 
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
 IUSE="selinux"
 
 DEPEND="
@@ -39,11 +40,6 @@ pkg_postinst() {
 	enewuser arpwatch -1 -1 -1 arpwatch
 }
 
-src_configure() {
-	econf \
-		ac_cv_path_V_SENDMAIL=sendmail
-}
-
 src_install() {
 	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
 	doman arpsnmp.8 arpwatch.8
@@ -60,6 +56,9 @@ src_install() {
 
 	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
 	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
+
+	systemd_dounit "${FILESDIR}/arpwatch.service"
+	systemd_install_serviced "${FILESDIR}/arpwatch.conf"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/arpwatch/files/arpwatch.conf b/net-analyzer/arpwatch/files/arpwatch.conf
new file mode 100644
index 000000000000..070f0edad80b
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.conf
@@ -0,0 +1,16 @@
+# Config file for /etc/systemd/system/arpwatch
+# see arpwatch.8 for more information
+
+IFACES=-i eno1
+
+# Location of the PID file
+PIDFILE=-P /run/arpwatch.pid
+
+# Additional options to pass to arpwatch.
+OPTIONS=-N -p -Q -D
+
+# Where to store the data (default is /usr/share/arpwatch)
+DATA=-f /var/log/arpwatch/eno1.dat
+
+# Comment this line if you wish arpwatch to run as root user (not recommended)
+RUNUSER=-u arpwatch
diff --git a/net-analyzer/arpwatch/files/arpwatch.service b/net-analyzer/arpwatch/files/arpwatch.service
new file mode 100644
index 000000000000..943e3146f8df
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Ethernet monitoring program that tracks net/IP pairings
+Documentation=man:arpwatch(8)
+Conflicts=
+After=systemd-networkd.service
+
+PIDFILE=/run/arpwatch.pid
+
+[Service]
+Type=forking
+ExecStartPre=/bin/rm -f /run/arpwatch.pid
+ExecStart=/usr/sbin/arpwatch $IFACES $PIDFILE $RUNUSER $OPTIONS $DATA
+Restart=on-abort
+
+[Install]
+Alias=arpwatchd.service
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 414a82a393c3..554e5e04972d 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -6,4 +6,4 @@ AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b8
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r2.ebuild 872 BLAKE2B 71560cdde0fa460b22953a85ea0f6a2b3d8c8d149acd4c31224c02c2fde9b8df903d01ed74dd1ec7aaeaa9cbf9ead9e7a8dfba688ad74e71a813332a97e6c2a4 SHA512 64920923498c8532fc64f8147a42383c0d60a1abbeb8cb3305fa36b14086fcd94103dfcadf3b63c1dde23e05c467e55163f3fae902dadff5f4372047b800a7e1
 EBUILD authforce-0.9.9-r3.ebuild 1045 BLAKE2B 724aa9e3200fab9ef3061465690647f8ee81e9ab87c759381e844e5805e11dfa3fdf70927afe1b3518e097157681ed40e1085a3ace6b20a2bbf5fda6040cc59b SHA512 cd191392127fbf0f32fc1d58ac4172e4c0987469146f5638701996cd43ad77bfa473a04998504f17a678d3c1dc9f5c0eb113c8baa655c666e0e31938c5b30ec8
-MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
+MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
index 78e1c2f9528e..84aeb359eebd 100644
--- a/net-analyzer/authforce/metadata.xml
+++ b/net-analyzer/authforce/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 9f804876c501..6cff56250d9b 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -7,7 +7,5 @@ AUX barnyard2-1.13-pcap-1.9.0.patch 944 BLAKE2B 143d2cc61e447d5c493a3d503e7e2020
 AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
 DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246
-DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
 EBUILD barnyard2-1.13.ebuild 1957 BLAKE2B 92d9eda2ed0dd725467be041c80940563c7d29a8562971a8eddfe0fb3cab2b3b706780800c28815c34838513f02471485c598e7351929b9e7b71e2efba9f6fab SHA512 d5ca8ff12221717f2cbd211ab7c5df748ae7fd257731e5e13f8bbd0b85d4dd93112fabbd1a998ad3cbd4c858a0462dce382c2b639d11a6b3e02b7ea393d50ac9
-EBUILD barnyard2-1.9-r2.ebuild 1719 BLAKE2B 7e4bd72ca6fe1b7d08a90aa727808a4afbd426fdd17a54ceaa02fee737ce6529504eabb1d0a8b5db8d0960af64bd2952fc3187d48e38d2eb75e29a04c6b37f22 SHA512 cfcb840afcf1ba4f31d22ad391cd222556974deea51bf81f9654180948270fb5c0e5539d1a18be04741e7fd754a29e6964c17ec24cdd55d677ad6b96f9d73eda
 MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce
diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
deleted file mode 100644
index 7a9d865754c7..000000000000
--- a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Parser for Snort unified/unified2 files"
-HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects"
-SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gre mpls mysql odbc postgres static"
-
-DEPEND="net-libs/libpcap
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:*[server] )"
-RDEPEND="${DEPEND}"
-
-DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*"
-
-S="${WORKDIR}/${PN}-2-${PV}"
-
-src_prepare() {
-	default
-	sed -i -e "s:^#config interface:config interface:" \
-		"etc/barnyard2.conf" || die
-	sed -i -e "s:^output alert_fast:#output alert_fast:" \
-		"etc/barnyard2.conf" || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable debug) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-ipv6 \
-		--disable-prelude \
-		--disable-mysql-ssl-support \
-		--disable-aruba \
-		--without-tcl \
-		--without-oracle
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}/barnyard2.confd" barnyard2
-	newinitd "${FILESDIR}/barnyard2.initd" barnyard2
-
-	dodir /etc/barnyard2
-	keepdir /var/log/barnyard2
-	keepdir /var/log/snort/archive
-
-	rm "${D}"/etc/barnyard2.conf || die
-}
-
-pkg_postinst() {
-	elog "Configuration options can be set in /etc/conf.d/barnyard2."
-	elog
-	elog "An example configuration file can be found in /usr/share/doc/${PF}."
-}
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index 5516b113052d..8b85b52bd958 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,8 +1,6 @@
-AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 BLAKE2B 6484e256f77efdfcf7e52bb4137601d214a099c0ace750f326a2b3c21acce57e107354cc9fb4fb175b4b10c0ede098c88db7d1ab91aba1f0a15dcb764dc3e554 SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e
-AUX bwm-ng-0.6.1-static-inline.patch 9852 BLAKE2B df28ff66f2ccdac422803b119ddbd3385cabb615a8e50233162e82277e7a0ad6a99313e49689237ec82bd54c12edbbde2db6a72c90bcf0590397c8f21dd173bc SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba
 AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec6520058c42e517f80dffae1bb15d063e32adbf1688929a21da5af78374e1966b4f0c29e0ad0b7b0b50c9844182d SHA512 47f601284da95f3148322157292a86f425cc4846d17547025fd5677e6ffc8b2f6f01cdf4403cf6ca5d701b0ab322ce9c345e26e3382afc6dea189afaa57b77aa
-DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
 DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
-EBUILD bwm-ng-0.6.1-r1.ebuild 741 BLAKE2B fd85473caf7dd8e2e969ef87c0add7359ee90c32ccc92e5f69b77453976b5fa823756af1b45fce884ced51ad4f94d6d435a209c251869ab1a39952b5c8b8ba0b SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f
-EBUILD bwm-ng-0.6.2.ebuild 702 BLAKE2B f254640c5d92d6c0117cc5cf466b3b4710c6ea4d9fbe2eea5d919f14b295c719fbd797decd1c72d75c71b1d6df1904d254906bfb18faf053b89d103abe67c159 SHA512 552032878a9f18660318a343b8fed3b0004b873cfe8d36b2dad7914b64f8c04b1ef55497f216ab01652cd2c4e8a118c4f9a436cd1cc33a6a3c2d31b229202b9b
-MISC metadata.xml 373 BLAKE2B 81fc968d44df8cb58d98e139757ec6290640c64702c7b184123cf6e9edcc330d7789099453bb6865d728779fcb674080be65b86c68f1f1cdeda2e05068d7ccd9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0
+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 701 BLAKE2B 85e6fdb19c20230b7865e57399e8f247a9bf997ea9c80bb264b4155a9b22d04a8ce80d47e9d573d713f2820b5cce756e0a9f6a2801cc7fdf4edf9da7bb4064d0 SHA512 b1910b155acc1dc077e33aa395b10c0da314fd63dabe607596a7926073479568e147c75947760fbd0376c7aa4cffa7c5c9d20391a984d05132c5edc120ae1421
+MISC metadata.xml 463 BLAKE2B 1bbaff010b068efc83f690257a28b0a57b564c353f525f9b62764d2f241f8ebf43a10afab26eb2d787af2f4e0fde956df4c02ffea1529e7ec0fc1ccb5faf0a77 SHA512 af0924dc4db40f48722b0ff91c605f978d59166d51c0e7550ea460bcc9f498e9d0ec432d0e546ebdec39c8204c8c30caf6e5dd85d868eedaf7e1bac253312d74
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
index 23c71582d272..2b7bf683dc9e 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth
 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"
+KEYWORDS="amd64 ~arm ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+csv +html"
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
index 51311ad80550..d7770f571f23 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
-SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
 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"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="csv html"
+IUSE="+csv +html"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=sys-apps/net-tools-1.60-r1"
+RDEPEND="
+	>=sys-apps/net-tools-1.60-r1
+	sys-libs/ncurses:0=
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-buildsystem.patch
-	"${FILESDIR}"/${P}-static-inline.patch
+	"${FILESDIR}"/${PN}-0.6.2-tinfo.patch
 )
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -33,6 +33,6 @@ src_configure() {
 	econf \
 		$(use_enable csv) \
 		$(use_enable html) \
-		--enable-ncurses \
+		--with-ncurses \
 		--with-procnetdev
 }
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index 04c14392d66a..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-* Fix broken buildsystem
-* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
-https://bugs.gentoo.org/show_bug.cgi?id=561718
-
---- a/configure.in
-+++ b/configure.in
-@@ -3,7 +3,7 @@
- 
- AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
- AC_CONFIG_SRCDIR(src/bwm-ng.c)
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([gnu subdir-objects])
- AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR(./)
- AC_LANG([C])
-@@ -28,44 +28,12 @@
- AC_CHECK_TYPES(unsigned long long)
- 
- # Checks for libraries.
--CURSES_CHECKED="0"
-+AC_ARG_ENABLE([ncurses],
-+	AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
- 
--AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi  
--])
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi
-+AS_IF([test "x$enable_ncurses" != "xno"], [
-+	PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
- ])
--fi
--
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_CHECK_LIB([curses],[initscr,timeout],,[
--	AC_CHECK_LIB([ncurses],[newterm,timeout])
--])
--fi
- 
- AC_CHECK_FUNCS([wattron])
- AC_CHECK_FUNCS([curs_set])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,12 +2,10 @@
- 
- bin_PROGRAMS = bwm-ng
- 
--bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
-+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
- 
--EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
--
--bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
--bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
-+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
-+bwm_ng_LDADD = @NCURSES_LIBS@
- 
- noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
- 
---- a/src/defines.h
-+++ b/src/defines.h
-@@ -48,7 +48,7 @@
- #define LIBSTATGRAB
- #endif
- 
--#if HAVE_LIBCURSES || HAVE_LIBNCURSES
-+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
- #define HAVE_CURSES
- #endif
- 
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
deleted file mode 100644
index 88e15ecefe3f..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Make all 'inline' functions 'static inline' such that
-the compiler can emit definitions when needed.
-http://www.greenend.org.uk/rjk/tech/inline.html
-
---- a/src/bwm-ng.c
-+++ b/src/bwm-ng.c
-@@ -26,7 +26,7 @@
- 
- /* handle interrupt signal */
- void sigint(int sig) FUNCATTR_NORETURN;
--inline void init(void);
-+static inline void init(void);
- 
- /* clear stuff and exit */
- #ifdef __STDC__
-@@ -98,7 +98,7 @@
- 	deinit(0, NULL);
- }
- 
--inline void init(void) {
-+static inline void init(void) {
- 	if_count=0;
- 	delay=500;
- #if EXTENDED_STATS	
---- a/src/help.c
-+++ b/src/help.c
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
-     printf("  %-23s",long_c);
- #else
---- a/src/options.c
-+++ b/src/options.c
-@@ -30,12 +30,12 @@
- char *trim_whitespace(char *str);
- int read_config(const char *config_file);
- #endif
--inline int str2output_unit(char *optarg);
-+static inline int str2output_unit(char *optarg);
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg);
-+static inline int str2output_type(char *optarg);
- #endif
--inline int str2out_method(char *optarg);
--inline int str2in_method(char *optarg);
-+static inline int str2out_method(char *optarg);
-+static inline int str2in_method(char *optarg);
- 
- #ifdef CONFIG_FILE
-  /******************************************************************************
-@@ -65,7 +65,7 @@
- /******************************************************************************/
- #endif
- 
--inline int str2output_unit(char *optarg) {
-+static inline int str2output_unit(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
-         if (!strcasecmp(optarg,"bits")) return BITS_OUT;
-@@ -76,7 +76,7 @@
- }
- 
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg) {
-+static inline int str2output_type(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"rate")) return RATE_OUT;
-         if (!strcasecmp(optarg,"max")) return MAX_OUT;
-@@ -87,7 +87,7 @@
- }
- #endif  
- 
--inline int str2out_method(char *optarg) {
-+static inline int str2out_method(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
- #ifdef HAVE_CURSES
-@@ -109,7 +109,7 @@
- }
- 
- 
--inline int str2in_method(char *optarg) {
-+static inline int str2in_method(char *optarg) {
-     if (optarg) {
- #ifdef PROC_NET_DEV
-         if (!strcasecmp(optarg,"proc")) return PROC_IN;
---- a/src/output.c
-+++ b/src/output.c
-@@ -25,13 +25,13 @@
- #include "output.h"
- 
- inline static const char *output_type2str(void);
--inline const char *input2str(void);
--inline const char *show_all_if2str(void);
--inline ullong direction2value(char mode,struct inout_long stats);
-+static inline const char *input2str(void);
-+static inline const char *show_all_if2str(void);
-+static inline ullong direction2value(char mode,struct inout_long stats);
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
- #endif
--inline char *dyn_byte_value2str(double value,char *str,int buf_size);
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
- char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
- 
- inline static const char *output_type2str(void) {
-@@ -59,7 +59,7 @@
- }
- 
- 
--inline const char *input2str(void) {
-+static inline const char *input2str(void) {
-     switch (input_method) {
- #ifdef SYSCTL
-         case SYSCTL_IN:
-@@ -121,7 +121,7 @@
-     return "";
- }
- 
--inline const char *show_all_if2str(void) {
-+static inline const char *show_all_if2str(void) {
-     switch (show_all_if) {
-         case 1:
- 				return " (all)";
-@@ -262,7 +262,7 @@
- }
- 
- 
--inline ullong direction2value(char mode,struct inout_long stats) {
-+static inline ullong direction2value(char mode,struct inout_long stats) {
-     switch (mode) {
-         case 0:
-             return stats.in;
-@@ -275,7 +275,7 @@
- }
- 
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-     switch (mode) {
-         case 0:
-             return (double)(stats.in/items);
-@@ -288,7 +288,7 @@
- }
- #endif
- 
--inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1024)
-             snprintf(str,buf_size,"%15.2f  ",value);
-@@ -306,7 +306,7 @@
-     return str;
- }
- 
--inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1000)
-             snprintf(str,buf_size,"%15.2f  ",value);
---- a/src/process.c
-+++ b/src/process.c
-@@ -26,19 +26,19 @@
- 
- short show_iface(char *instr, char *searchstr,char iface_is_up);
- #if HAVE_GETTIMEOFDAY
--inline long tvdiff(struct timeval newer, struct timeval older);
-+static inline long tvdiff(struct timeval newer, struct timeval older);
- float get_time_delay(int iface_num);
- #endif
--inline ullong calc_new_values(ullong new, ullong old);
-+static inline ullong calc_new_values(ullong new, ullong old);
- t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
- t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
- #if EXTENDED_STATS
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
- void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
- #endif
- 
- /* returns the whether to show the iface or not
-@@ -74,7 +74,7 @@
- 
- #if HAVE_GETTIMEOFDAY
- /* Returns: the time difference in milliseconds. */
--inline long tvdiff(struct timeval newer, struct timeval older) {
-+static inline long tvdiff(struct timeval newer, struct timeval older) {
-   return labs((newer.tv_sec-older.tv_sec)*1000+
-     (newer.tv_usec-older.tv_usec)/1000);
- }
-@@ -92,7 +92,7 @@
- #endif
- 
- /* basically new-old, but handles "overflow" of source aswell */
--inline ullong calc_new_values(ullong new, ullong old) {
-+static inline ullong calc_new_values(ullong new, ullong old) {
-     /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
-     return (new>=old) ? (ullong)(new-old) : (ullong)((
- #ifdef HAVE_LIBKSTAT
-@@ -133,13 +133,13 @@
- 
- #if EXTENDED_STATS
- /* sub old values from cached for avg stats */
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in-=data.in;
-     values->out-=data.out;
-     values->total-=data.total;
- }
- 
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in+=data.in;
-     values->out+=data.out;
-     values->total+=data.total;
-@@ -148,7 +148,7 @@
- 
- /* put new-old bytes in inout_long struct into a inouttotal_double struct 
-  * and add values to cached .value struct */
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-     data->in=calced_stats.in*multiplier;
-     data->out=calced_stats.out*multiplier;
-     data->total=(calced_stats.in+calced_stats.out)*multiplier;
-@@ -198,13 +198,13 @@
- }
- 
- /* add current in and out bytes to totals struct */
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-     stats->in+=new_stats_values.in;
-     stats->out+=new_stats_values.out;
- }
- 
- /* lookup old max values and save new if higher */
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-     if (multiplier*calced_stats.in > stats->in)
-         stats->in=multiplier*calced_stats.in;
-     if (multiplier*calced_stats.out>stats->out)
diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
index 7d30b17df0f1..95c98a2c1a89 100644
--- a/net-analyzer/bwm-ng/metadata.xml
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="csv">Enable csv output</flag>
-<flag name="html">Enable html output</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="csv">Enable csv output</flag>
+		<flag name="html">Enable html output</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">vgropp/bwm-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 74acd6cd3450..8d218eefaf62 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,5 +1,3 @@
-DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
 DIST bwping-2.2.tar.gz 119688 BLAKE2B e30afc404f73aeff28e2775349eed9e6a113a7c0ef33798de9dc983f2ecb08ea1dc0838067aa83bd83e513fa9640bf38fd04a924c382bf770779892dcc39f8ab SHA512 4c0338359fce039357d763a0bdb8ea133a8c63f0e7eb2cbdc294454cad97b6e9010bf8898948aa2572418e4ae667d25dd54475a162f029c052b9611795ff4230
-EBUILD bwping-2.1.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 EBUILD bwping-2.2.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
 MISC metadata.xml 713 BLAKE2B e9792f974ce687d37a8faeddf987f0eda5086097fdf8db3d9ad5cf240bd65059232cee613fd1eec064916361fdced304f08134c3bfade7953f94ce2cfae90352 SHA512 199486090bd90174304b130e5c84e2092c535fcb360ab911ad44308f6a4ba1ad822d824cf370942a5ffceb30f86d4ee43eba25ee56d344acf572592b142bf156
diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild
deleted file mode 100644
index 4743efcd1e43..000000000000
--- a/net-analyzer/bwping/bwping-2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="https://bwping.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-src_test() {
-	[[ ${UID} = 0 ]] && default
-}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 948256b649ff..927a0da47cfe 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,9 +1,5 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
-DIST cacti-spine-1.2.13.tar.gz 107543 BLAKE2B e0de75688334d27604a76c00a09ac53587a1e57f45df925e30a1a88a5e0449df803dfad901328c65b55484bc9022bf81d53880f17d4bd4efd9214315f01f7e92 SHA512 86d44195847c7b3acb1f6aed2bd6a57f562645b20724560d6b4bf7962707be4eb2f5326731453937b64420b5d51b714aecbd8dbea58d95f29ef4341515df8b00
-DIST cacti-spine-1.2.14.tar.gz 107577 BLAKE2B 5865d93ffefeeafac1d2245000467deac79f8008e81b66de310bf08e7aa31f17299a82fc107ad49c3741bc2f183bdbc9554f814bf9e3e4b1dc85e267e4f16112 SHA512 44dec1077b419dfc987a1d423f2df597bf2026ca7f39aaafabfc7de9e6fdc616f505b86ace43bb2ad628f220cf8d8cf136a04f00c4fd23ab73da75068f804999
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
-EBUILD cacti-spine-1.2.13.ebuild 894 BLAKE2B d87521d5b3d0604e61f08853356c86578647cfec8b59ef347eed64920a9d0aba57bbda986b24afd4ec8a0442a81827b143f9d3dbd2387cbd2fcf31e0fbacce8e SHA512 a7d0cd71b0a3cfa669c240df7bdffa91069e2d84b5185c20aef4b41da7640f4d82e38633fb4c26035eb8343878008e95c3f3231e060b02d8de4313a0d0a5e329
-EBUILD cacti-spine-1.2.14.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
 EBUILD cacti-spine-1.2.16.ebuild 879 BLAKE2B c40f69d0353777ceb2e43a1196e9b7263e88187ce80fd0828f1b91119383f1ee9352cc5a8ea99e140572c206dbe2961a61669bdd44f2887d628289f749b5d1d7 SHA512 78c3c7510157708223e1b24b8d2209883fa457ac49d626930c9daeeaf28dc45957b0e95dded4fd55b64a9b7f27b66b0daa898466b490fd85351e15267243a87b
 EBUILD cacti-spine-99999.ebuild 830 BLAKE2B df76efd7eaf22a36b96c6b834089f5e6916b4ac95d34b07e3db6a93d84bac90124c94d67586078283f6a3e6fc817501e34083b426982f0694fa7a7179cb269a6 SHA512 903233605ded071a0eebb0e17b25bd0cd61b20b54c0d85a2fc230058e64e908e4b8eac3ac7f566f7d1f4d0c68cb2be0c6f38de7bdf344c9e6e3df81b2af10ee4
 MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
deleted file mode 100644
index c78a19983352..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="libressl"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
deleted file mode 100644
index a5c1da23c064..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libressl"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest
index 7818064e4b83..0433382c8e11 100644
--- a/net-analyzer/check_mk_agent/Manifest
+++ b/net-analyzer/check_mk_agent/Manifest
@@ -1,5 +1,3 @@
-DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f
 DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b
-EBUILD check_mk_agent-1.2.8_p27.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
 EBUILD check_mk_agent-1.4.0_p31.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
 MISC metadata.xml 1097 BLAKE2B e84f46161fbb1e01bebf32135b8f794d5f82d68657be9064c088f61a8b3699d838282553a0443db3a27190796e2cd1eefe3f39fdaa28c0a951284e6cba48ef3e SHA512 844aabdeb511686e82ee2ea51791c1536a35e64061900dae5cad45cb076f3d713ea88ef9aab365dac0d30c60bff247da94327c8b5dda22054bdf9c0ea4dd05f9
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
deleted file mode 100644
index c41c9b1f3484..000000000000
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Agent to report data to Check_MK for monitoring"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_PV="${PV/_p/p}"
-MY_P="check-mk-raw-${MY_PV}.cre"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper"
-
-RDEPEND="!!net-analyzer/check_mk
-	app-shells/bash:*
-	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-	"
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz"
-
-src_unpack() {
-	# check_mk is a tarball containing tarballs
-	unpack ${A}
-	unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz
-	mkdir -p "${S}"/doc || die
-	cd "${S}"/doc || die
-	unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz
-}
-
-src_install() {
-	# Install agent related files
-	newbin check_mk_agent.linux check_mk_agent
-
-	keepdir /usr/lib/check_mk_agent/local
-	dodir /usr/lib/check_mk_agent/plugins
-	dodir /etc/check_mk
-
-	dodoc doc/{AUTHORS,COPYING,ChangeLog}
-	docompress
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins cfg_examples/xinetd.conf check_mk
-		systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service}
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins cfg_examples/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe plugins/mk_logwatch
-	fi
-
-	# Install any other useflag-enabled agent plugins
-	exeinto /usr/lib/check_mk_agent/plugins
-	use inventory && newexe plugins/mk_inventory.linux mk_inventory
-	use smart && doexe plugins/smart
-	use mysql && doexe plugins/mk_mysql
-	use postgres && doexe plugins/mk_postgres
-	use apache_status && doexe plugins/apache_status
-	use zypper && doexe plugins/mk_zypper
-	use oracle && doexe plugins/mk_oracle
-	use nfsexports && doexe plugins/nfsexports
-}
diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest
index cbd4f92c8d0b..e727ba47ae41 100644
--- a/net-analyzer/cloudshark/Manifest
+++ b/net-analyzer/cloudshark/Manifest
@@ -1,4 +1,4 @@
 AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74aa87460abbe4348b09e666fb6ec413f77fa9123ef22b00363d61610777824272758745f90c588dfd6e SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9
 DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86
 EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e43313f5c67e64091bbb681f1ff13e4e10def9b80ed55df1ec0d462239efe67a27fb22a314118d22878b0cad13f8ca8891d2e7ac56d28a64bb2434860777e54a SHA512 7fa81e8be152c47922e249a247e959e3518c85ff4ef47192a337a2b7dae5c7db8cbc994e302286782f65c7897b2369f095786be19d89ab5fe65575a822510dc7
-MISC metadata.xml 339 BLAKE2B 449159f04e85fc4eebd7f95580b2e0f006d4927a5b7891c65fec216f329f2cd6d4ff7af02bf23a82b5925a80d17ed0295c712c3c1d945732e1ab0a77e91ce7ab SHA512 6f455d12f82e69560c68af083929907b4ba2d5389bdd7acc08725609bde578d8081245185a2c4f1571cf89c7693cbd49ce713ed4f4cb529f58758bdfa8b08272
+MISC metadata.xml 339 BLAKE2B 9cb074760517267c2a84e4c538b7cc645727acfd7b0d738b905d51e38be2bebdef41dbe689e6272af890ea898c8260da2ec96c5c72e175bbebc916f101f83d08 SHA512 9b0f0f90882087febab5d144d1bdbf93db3533369f54bd7213ac781cd2eed2d81dae345e965f5c31d4f9e8c4fdd2c66d0587c9bc53bab8d207a4e6dd16e0d9d3
diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
index bbafcdbcbb95..ef98c82dc6dc 100644
--- a/net-analyzer/cloudshark/metadata.xml
+++ b/net-analyzer/cloudshark/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index 5d6eaf469fef..056528b40f93 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,6 +1,4 @@
 AUX cutter-1.03-debian.patch 5160 BLAKE2B 1e3b007515aea319b66843b232d731a8f0264908e50e6e3521760cb2925302d106ed2fe56aa17121cc34cde43df9021b6dc14f9247708b72afe80849ac5fbc57 SHA512 05eb0c5819687bbc6de4f4467013bae16b5faf470da062a847fe74cb0abf27fadf62dcf76760f43096db446a11f1b40107dd94c6003e24b50d5a3150a87327b6
-DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea
 DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a
-EBUILD cutter-1.03-r1.ebuild 640 BLAKE2B b6cc80c6ea0f78894b3b22c8dfcf4f46245ffbe209251883db23f48324684b69c37229f1dc3cab3872d57e5773bbcef80a9874affd4c6b6d2a35db02fba34afe SHA512 852a2a7eaf494ab58a29226aaf592626b0cca232583dff4995699a8ea3ad8aab074a5908da58ab0277f7647a70cf749d7712dd6bf2f5e0e65178a9833428ceca
-EBUILD cutter-1.04.ebuild 648 BLAKE2B 7fc4314ea247ceb100b14fbc2bda8eff9c85870b2f79c8af8f1854f476d92aa8d610f4d41279c2d2f73bce2e97a11c157d20d11f8be850cf0f8facca6fb0229b SHA512 bcde52fb15a880c4f80fd2b2d8e6c5ae4a077681733d44fb98d026cecce257e665cc53810ff3d23c5591f985ae6713e5bde77cd7a5d09f053ab137557c8ae985
+EBUILD cutter-1.04.ebuild 661 BLAKE2B d38e59539f25d53c7e583f524bd14bd180e712b985e96e349bd6d005f506310ce0ad6d0b5cc2502e1a70afde343357dc545ce2c454b83c051c5ac7056df1e31a SHA512 36c08faa41b64a7ff139bc7399b91ac753c065e5ebaae55a61e16f2e8209423ead051d625641f22b6166b8bf534a07daeb0c662f95f9b9e6922af89a79bca43e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild
deleted file mode 100644
index 7e3806ff08d3..000000000000
--- a/net-analyzer/cutter/cutter-1.03-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
-HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
-SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch
-	rm -f Makefile # implicit rules are better ;x
-}
-
-src_compile() {
-	emake cutter CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin cutter
-	dodoc README
-	doman debian/cutter.8
-}
diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index f11002ca418e..46cc52cc6f2c 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
 HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
@@ -10,11 +11,17 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.03-debian.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.03-debian.patch
-	rm -f Makefile # implicit rules are better ;x
+	default
+
+	# implicit rules are better ;x
+	rm -f Makefile || die
 }
 
 src_compile() {
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 627ba27cfd7c..8cb460294ac9 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -2,7 +2,6 @@ AUX darkstat-3.0.719-strncpy-off-by-one.patch 471 BLAKE2B 45e738a9a777173924df26
 AUX darkstat-confd 911 BLAKE2B 35cb512c3727176218a16508d3b61ddf003081997d8f52918c5b9b7e762c882f878bd3317c737931d29cbf3aba1a7c375ebf067a394da41d15b95b3d97768437 SHA512 cf5b222a45a406d4e6b03860a9053a9c25c88d793e86525ebe38dbf292a69f00dc073b12179818e7e7b669f4a706d70eebe9bfeda363c7c5003c035639f41bbc
 AUX darkstat-initd 1461 BLAKE2B 4f0aca1bb12661de4ea1c2d5ea7dd9733833aafbe012ea0019d536ee1d45fa0cffc5a7a210783e9bbd3c5c5b236dc6f505ee0807b8ad2bd6ef78e48fa676a386 SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226
 DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
-EBUILD darkstat-3.0.719-r2.ebuild 1693 BLAKE2B 8d739222a60aacd47dfafd7b913db182fe533afa20bc470ae29f2d09af8e965cc0aba4158be19f81cedf6ae59aeb138b9095151da040378355fc6464589a8eec SHA512 64bc9d1e189d7d16de8fda9083aa30ad6aaf3dce43ab3855a7ac0af9ce00ad6f67085e2ca62794db61bb9581e585d105fb094a7bbee03bfc8ec08792ae2b6686
-EBUILD darkstat-3.0.719-r3.ebuild 1780 BLAKE2B de855346a7375bd48572d2cd0f49923649b36572674af6fd0a70e7c3291b2f4b9458bd6b3ba2cc73518ede1c6ac6a89db2cef08a8b029113dd1548311cbe2943 SHA512 5de532416453b855f829fc28048b88d15b0aba65348b3d4f3972be2f7d651f7b87174f8f0dc9b41691fe46b683eb111dcae083d03dcd174140f630e3a4090ced
+EBUILD darkstat-3.0.719-r3.ebuild 1777 BLAKE2B 0d6445bd2e0dbd6400e45448998d1f1c667bcbcb4875330a59f20fe89eb02085b0f7d1108e06bdc95396d39a3b01a915857e8527bd79ae401ff8e74b4707cfc1 SHA512 e26b44fbb230eacbd38ad1e9acd381b43c61f488493a81c4e8389f1b4d08d056a20e36b3de50b95819b67eb5c0e08e04ce03192f8b49570c69b45ef095a7986d
 EBUILD darkstat-9999999.ebuild 1809 BLAKE2B c4464879938ea296aa2f67b5d617587317bc199e947547dd5e2588603633536821f06608d2dca04ae2497b25d7905d7afb9d5f0affd08e025ea7c604c7c8d071 SHA512 061052f55525bb9f6247459e7f585224d05036fc6e444ac0635c57847fbeca9c9179e619169c1f401e1b01211e73922ee45c5e0f6f3f5e755ef920a84c2ae00e
 MISC metadata.xml 536 BLAKE2B 7ff89764c1281848b7345be779d1694d4a439fc0a211fc10feb37302a184ce78d984c941e374192bbefb1a22e1ce13ae63a1ab96c37fb4ff539aef0edeb7a58f SHA512 5950789030e76ea0a95fbf8cd53e702ee8d55af96ed12aef4d6e6ae658ba01e949f875283a2f5c0c12f15fe7beec18704bf14bea1d89c5321df505cd2ae3d5bb
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
deleted file mode 100644
index 041df6e159de..000000000000
--- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="https://unix4lyfe.org/darkstat/"
-SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	acct-user/darkstat
-	dev-libs/libbsd
-	net-libs/libpcap
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-flto||g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-debug --with-privdrop-user=darkstat
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/darkstat-initd darkstat
-	newconfd "${FILESDIR}"/darkstat-confd darkstat
-
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
-
-	keepdir "${DARKSTAT_CHROOT_DIR}"
-	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_postinst() {
-	# Workaround bug #141619
-	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
-	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
-	elog "To start different darkstat instances which will listen on a different"
-	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
-	elog "darkstat script where 'if' is the name of the interface."
-	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
-	elog "and edit it to change default values."
-	elog
-	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
-}
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index d67ebb1e93f5..f14539d204ea 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	acct-user/darkstat
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index 9156b52bca6b..ae50650b8354 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,6 +1,6 @@
 AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
 DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05
 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
-EBUILD dnstracer-1.10.ebuild 678 BLAKE2B 82841c2e0abef131577d632693f65be2e6102b64e599d28d8cae1e648293c2ac2e96b16eb4f4e72b172dff8fe1e5d49643d525ae9f9f95e1cd4dc3c30516ebcf SHA512 5378dba0eba308532f288cd457b83b8dd292589bf4d66f8bcfa5b5bfe7a1416f375b6782a0f8eb4d3f7bef716b512b01adba8033e5772d5ec449c7dbdbbfdb12
+EBUILD dnstracer-1.10.ebuild 676 BLAKE2B cc96e42210ed468bc289a9d9571dd4a0fbe8b9253c5d23e0196dc5e8144ff07afe65c25a1808a5143e2d06afc411a8ca75f47b313c5860397c90e1c03af75f6c SHA512 326e24d8cdb98acd4a2eb878b29b4c417f9eed2664c8465c135b05325e6ad63aba76f62567d22a4f2865be8988b47b34de4f85fb6f81791d7ad64e79da23088a
 EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B c4008d5c48dbfe6bd0a7a6ecc23913fe4a21e6d0287ddd55c7d5f8fdd8b018e0d376457ee2d9349e2fa3d477d3d8b106fe3535b6b92a95904ec12d6678441f19 SHA512 b361a72cf4e5d04031799a0d7e7be1e2f138b71229800a93fdbf17ca205bf2f241f85f588ae439fc7a50bde2c3beaa02bf930b0f6aa96e0e1272a7d0c3e71301
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index 733c4c9cc2d7..c989ddeffa15 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Determines where a given nameserver gets its information from"
 HOMEPAGE="https://www.mavetju.org/unix/general.php"
 SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz"
-LICENSE="BSD-2"
+S="${WORKDIR}/${PN}"
 
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
+
+BDEPEND="dev-lang/perl"
 
-BDEPEND="
-	dev-lang/perl
-"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-argv0.patch
 )
-S=${WORKDIR}/${PN}
 
 src_compile() {
 	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 62d086b96d8b..053d64cdad65 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3348 BLAKE2B 3318126f249274798dbd5537336495be4baba112c013ca4550f21337a57788459562f6b33bebd8d212cae2fe58795a3d69e546ad8d10a02927d29cfaf6e8e6cd SHA512 0ef6bfc5cdd19deb6ff57761034b32ccc6142570ec3b244d9ece99996958350f797b744d02cc586af2d7270c28f0240faf947958c46bbbd25347746e31c6c248
-EBUILD fail2ban-9999.ebuild 3277 BLAKE2B 07de0de93e7d87a49d82b8590da903bbd9904fbaf12245e45149e7542c57cb9bbda6fcdde2c91a7b7e4f09252dc132795464b34c08de9daeb26251c5444ca31f SHA512 749cda31a0439f22079ed3a35720b23f1a1fcf3a952a6e36f16f1cc908111bdd60bdbbfac8ae760fd680cf8c291ffc388d0fd513f6d2f098e43150b23a51affb
+EBUILD fail2ban-0.11.2.ebuild 3348 BLAKE2B 884a823df13614a5f6b30d57dbbfbcd9174dc4063422fa9f0c7bf24834b385292f93f03beb9d4cb025c99262ac64492679f46eb4d9e7bb3c5f0894ce79082ac7 SHA512 93b38332ada7aafec33efc191655bda76f85237911a641e4465bc71dd90c763aefff51337fcd9cf5a91b6111c3882fa208e7bbc6519e3040624b50e2ea050412
+EBUILD fail2ban-9999.ebuild 3265 BLAKE2B ae5c6e8584db8e7f0bab76f26f58984991d568ff9e9bb2446a1359eb8dd6ead7ab769c2e9422452678beb89414908d303cd439b360ca23a937486549e8717325 SHA512 b065b962ed7a760229c9da5c9ab8676374041fe504bea5bb8cd4e8e2da1dce28550b2fa053cd15ba84989cd58305c62b7ddb820d834a4c97f94637d634255c73
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 5ed0a845c74d..5e9fd5b53171 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd tmpfiles
 
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 5e5fb78a51f6..4a13926cd46f 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -8,13 +8,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd tmpfiles
 
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
 EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="selinux systemd"
 # Needs some work to enable them right now
 RESTRICT="test"
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index 82a2dd064ecd..c56e7e660db3 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6
 EBUILD flent-1.3.2.ebuild 615 BLAKE2B 1d07580727d43e3722f568ef185ac20a60999869c1d472517310bb0b649e615c8e249918846b8dc1585f3b9f4823c1f8b37998a247a3498c92571b9abdcfa130 SHA512 d7e3449faf6b1167cbb319719400ff74ae8b4ed51276232def55c0f073ce79545cba6eaf4fac398135a4026ccaf24f91beb159829fd7231d4192fcb7b2c61ab4
-MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
+MISC metadata.xml 391 BLAKE2B 3698ab2afa9a0dae991c683d763d40ffc2f14f4a77f86161e6db8184ace0b277e7af0571201b317fb0ceea3de783ffb18f6ddb0fe846986b419b628992c2121d SHA512 b80f126bf735fbe0abf283fbec21cd66522a4bcce702d1418a90b46d063bde317d72520ddcb9e230786363ffe1484d8c0c16faea12252f22e4b081c2b0f19c03
diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml
index d33bba3bd96b..a5a955fe23c7 100644
--- a/net-analyzer/flent/metadata.xml
+++ b/net-analyzer/flent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index db2a7db25ea7..ceaeb20fea1f 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,13 +1,10 @@
 AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B f15d1d6fc60b9ba916ccefa44f30b683d93931770a3113b533b51a52146f63e56fe0db864a03a5df0fc1ecd5a58e464944c5df28cd929556d6615617f3b975d2 SHA512 ec26e4ea284e0b2aff3a73b6b76e0a87c336dbe81d0492db3b7809de17103c47d220d2d20bc9fce853bb10e7b11c35dd6943b6cb1ef305bd8ffe147bc7bec18c
 AUX flow-tools-0.68.5.1-openssl11.patch 1039 BLAKE2B 2787119195c98ad92260b282b60fbb2bfb56d09a0ae7c999238d61d3b1e25dfb7e02590f8f78910e5b85111899db72f7d3bb3ce96c6c357f7ab4e6b01a67f109 SHA512 03a48e6e297d701b04259bf354b5a032ed660d99fb6941054f8d02f215681561a152ed10411bc0fa93b27be223b874316f989dff779aac458db87b0118947590
 AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d
-AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537
 AUX flow-tools-0.68.6-mysql.patch 479 BLAKE2B 9c22f8aae5bc57c2d86e88d69bfcac438e8d1fc2f5d6bb4fe61612e3042709d46edc0e1a4159b54bf98e153ae1e0acf08b06b317b4029a9605933dfef41d40f7 SHA512 fbdbcf7a716375a70a6677d35aa81f0f07fbf67d3de7ace72cc4b0b548d5b7fed32d0f0f4420672a88ec60ea2f72e109f9c3a3903cd66be7dbec85fa445dd9ec
 AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d1d18403fbd0bb95ec3a58faf04e164d97e6eefe4c1b2f526ed96ce44b7a410cd6e3efb0c3b98e15b3b0 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05
 AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
-DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740
-EBUILD flow-tools-0.68.5.1-r11.ebuild 1570 BLAKE2B 9777743a331cda77929b901175b8c9fce0f0619d28bbc6263bbbca6a22931de0bd7077176cbf27a0a5004f491d3dcb4878f7802a17a162016b8a7e9aa70621b1 SHA512 e95fb5cc31790bda2a7f3384ff76d2c140b359d9f321c09c8127ad77a995d07333bf18941ae54a29be1940fd411383c9cae8ad0a6c629b3d052ebb1429beaaaf
-EBUILD flow-tools-0.68.6-r1.ebuild 1821 BLAKE2B 4c62192f40635eb9afcdc3eca578deebde35e5a28c5ee25e1eba927ef9d34131a42cf662a81debcd783394a407d79c7a0f17f2b566d066d092c40aed83a22efd SHA512 5aecaa30e76eda57314d959e90d78a4a87983f95fb9a3ca6c8d951a95d9948c2d6a3a6ef814965e08e997c3a06fa4adb21f26f3014d124b737583192f986a65d
+EBUILD flow-tools-0.68.6-r1.ebuild 1818 BLAKE2B e7b5806a2eef33155305e65fddb654b985cb0c7c1d81c29a5e517c8a03cbb0bcd181ba444a83f8cae586ee2e071a465cc13afaf7d5e7d9f1bdec7b4032c7c0fa SHA512 23ebdeb9de9ab64fa3865100561373ce9a48f7ebc4a736bc1ac579b0d98ea61b2958cde5b63b1eb766746764b8f7bf9392d0e57aaec979e7a8d1526ce7b9b7ab
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
deleted file mode 100644
index cb17471072bc..000000000000
--- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/lib/fterr.c
-+++ b/lib/fterr.c
-@@ -112,7 +112,7 @@
-     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_info */
- 
-@@ -134,7 +134,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
-     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--    syslog(LOG_INFO, buf2);
-+    syslog(LOG_INFO, "%s", buf2);
-   }
- 
-   if (fterr_exit)
-@@ -159,7 +159,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
-   if (fterr_exit)
-     fterr_exit(code);
-@@ -183,7 +183,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_warnx */
- 
-@@ -205,7 +205,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
-     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--    syslog(LOG_INFO, buf2);
-+    syslog(LOG_INFO, "%s", buf2);
-   }
- 
- } /* fterr_warn */
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
deleted file mode 100644
index d1f4fc95e62a..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="
-	acct-group/flows
-	acct-user/flows
-	sys-apps/tcp-wrappers
-	sys-libs/zlib
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-run.patch
-	"${FILESDIR}"/${P}-syslog.patch
-	"${FILESDIR}"/${P}-openssl11.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(usex mysql --with-mysql '') \
-		$(usex postgres --with-postgresql=yes --with-postgresql=no) \
-		$(usex ssl --with-openssl '') \
-		--sysconfdir=/etc/flow-tools
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	exeinto /var/lib/flows/bin
-	doexe "${FILESDIR}"/linkme
-
-	keepdir /var/lib/flows/ft
-
-	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
-	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
-	fowners flows:flows /var/lib/flows
-	fowners flows:flows /var/lib/flows/bin
-	fowners flows:flows /var/lib/flows/ft
-
-	fperms 0755 /var/lib/flows
-	fperms 0755 /var/lib/flows/bin
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index d8ee002d2ccf..0f7a1e00b1eb 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 6395aadd19cb..c66f67668283 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,6 +1,4 @@
 AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78
-DIST fping-4.4.tar.gz 182921 BLAKE2B ddf84d5576170f0279e1d801fbb4afe491c698e5fba3ef4ac6fe25b2dc9b72605c23b6d33559d04170a885ed9ab423cbc1b853110dba93d5d250b6008b0c2a3e SHA512 8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0
 DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
-EBUILD fping-4.4.ebuild 713 BLAKE2B 599dbd8e5e187697cd75e359266e8b743e15a7920d7ca4899331630171b02ce64b5801bbc9055f65b953be04866520f7093be33068e27298a1abb7c0d5310937 SHA512 7329a0cdc3539348d133ef7332267203afa777a92c731c7ff3f636aa2f8e68a9ce5bc217bd93bb74e7944eff2a4e0a153b7d2b8a6c8113eb52bef438432a3624
 EBUILD fping-5.0.ebuild 708 BLAKE2B 575ee108895981cc84fe0c816dcb45e9a9f0772368ea3bfd8fbd22e0f321224b6608fb369974ce0879e403eac13c1a5ec173a2c8fcd75a34d172ab90931c896a SHA512 46353758ba632252ef3ed62e38a5a546209355856c77c8fc5ba59e56cafb1b8967859684f43be86505098a61866f77161e05956a41032b978c695f99de31020a
 MISC metadata.xml 355 BLAKE2B 6e4fd15cdfa76be00db905cfbff100e3ba30fbc04f0e5fe42cecdd7f66e3c2478ef626b11d5f0be2f43e5526dc6022b1334a5c51253396f3b582cf56b28b4a8f SHA512 036f801bf73918249011ac68a06d0b1e29e5f8685209cd70a0df02b9f43271d57222f4250f973b2b65b7b0c0811598ff0179e0ea09ec70683abf99a14dbe48d6
diff --git a/net-analyzer/fping/fping-4.4.ebuild b/net-analyzer/fping/fping-4.4.ebuild
deleted file mode 100644
index 7ea26ec93e2e..000000000000
--- a/net-analyzer/fping/fping-4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/"
-SRC_URI="https://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 suid"
-
-FILECAPS=( cap_net_raw+ep usr/sbin/fping )
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-fping6-6.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid; then
-		fperms u+s /usr/sbin/fping
-	fi
-
-	if use ipv6; then
-		dosym fping /usr/sbin/fping6
-	fi
-}
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index b698f758af42..6cf778d1bac6 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,5 +1,3 @@
-DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6
 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
-EBUILD fwlogwatch-1.4.ebuild 1620 BLAKE2B 2ecc86069f004a55ebdb5977e69c238eb6d7530dc24a481286e77abde84aaf231be0e1d14a6c153ab896aeaa7bc103cbbabee8f9fbdd4b686c3e09154a0ca9b2 SHA512 e9d3dcf9c862b7088111ef5b72c405d8650b577245766eeae2a725458c3cf7ba6c38d3efcb9babf69e70bf95ed0edfdd6d8fac6b8c2f25ba52ad75fe733e5970
-EBUILD fwlogwatch-1.5.ebuild 1766 BLAKE2B d931f1a22b0f4b5fd63ffc4c82de623726d1b7d04297ec230238430418ed2e09c425f22c1841716aa060aaa036eca4aff4895f2b4cead8078799691598652310 SHA512 8914d7daa87bb4e1d41e946d7637bb2aeb4bd6cac974fcb67ea48fdaf71b8b6061df436e93102906d6767b81f854c2147a76132f4505a6f612814cedc075078f
+EBUILD fwlogwatch-1.5.ebuild 1778 BLAKE2B db89bf6716b60763d6fe07cf7ef3bf37766b00fda87e3adb9c198810bb99c8b13b0eb2c0925007fc712f0d8f976db4b875b43b8fc65fc91bd1a90e0374e0d3de SHA512 e1551363a1f65fdaf559c0d4805fbc6da9b6912344c4eb818f9e5144e30384ea35dabb423d4f74fc4e8e0545d30d1a4933d911c88c18f4987e8ee1d77f78fc28
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
deleted file mode 100644
index 54a2095f9c3d..000000000000
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A packet filter and firewall log analyzer"
-HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-1"
-SLOT="0"
-IUSE="nls zlib"
-
-RDEPEND="
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i po/
-		local lingua pofile
-		for pofile in po/*.po; do
-			lingua=${pofile/po\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				sed -i \
-					-e "/${lingua}.[mp]o/d" \
-					Makefile po/Makefile || die
-			fi
-		done
-	fi
-
-	sed -i \
-		-e '/^INSTALL_/s|$| -D|g' \
-		-e 's|make|$(MAKE)|g ' \
-		Makefile || die
-}
-
-src_configure() {
-	if ! use zlib; then
-		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
-	else
-		append-cflags -DHAVE_ZLIB
-	fi
-
-	use nls && append-cflags -DHAVE_GETTEXT
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	use nls && emake -C po
-}
-
-src_install() {
-	emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install
-	use nls && emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install-i18n
-
-	dosbin contrib/fwlw_notify
-	dosbin contrib/fwlw_respond
-
-	dodoc AUTHORS ChangeLog CREDITS README
-
-	insinto /usr/share/fwlogwatch/contrib
-
-	doins contrib/fwlogsummary.cgi
-	doins contrib/fwlogsummary_small.cgi
-	doins contrib/fwlogwatch.php
-
-	insinto /etc
-	doins fwlogwatch.config
-}
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 93b1e6a2a352..1f4f953ecd59 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE="geoip nls zlib"
@@ -18,13 +18,15 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
+	default
+
 	if use nls; then
 		strip-linguas -i po/
 		local lingua pofile
@@ -62,7 +64,7 @@ src_configure() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 	use nls && emake -C po
@@ -72,6 +74,7 @@ src_install() {
 	emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install
+
 	use nls && emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install-i18n
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index d70f4306445a..2474c6e510f1 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,4 +1,4 @@
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
 EBUILD goaccess-1.4.2.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
 EBUILD goaccess-9999.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
-MISC metadata.xml 937 BLAKE2B 29b9031c3c7172d88404d602952a6cb297f7762759461f4052f6ae1cc4de81d97ec9b410c10d47ce7813f99859117bae62fdc6b4090d08af85f074ef86c4e76d SHA512 6e09c8752f8f98ee352f6477d17c9ca8b86ffa1795b02faacf4fddb38141ceaca4cf3250089346c27595eb0e49e444be608f28f3e2a909cb69fe73e33178fe96
+MISC metadata.xml 967 BLAKE2B 7f8a5a613fad521ba3379e0b034173cbe1b3847c737d0b6f17f9b7ed5f4c95af11c1702049c7c6fa23cf1fbed0f0a615c4ac8c130f8c8399d923a43d41d3853c SHA512 2ccfb0fefddfd0e116983e1129b02638879b313c4c494a6c3e99dfb5443728b3929b36d6dcdacc72898dff17186850c7adf87d660ddbf4d894a9c1633e8fe290
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 43a4da78f81f..3a1e5396510a 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index a82ed8429483..1c8062583f62 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -9,4 +9,4 @@ AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6
 DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028
 DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
 EBUILD greenbone-security-assistant-9.0.1.ebuild 3168 BLAKE2B ff7eccf999d89c8894579050728f999ab60d6e94e1f976d597652dba151b7f2129143349952386f8fb323e744afea4cd931755561e2722d44194e643d6545d36 SHA512 b78193863dc3e290b6a29cc0a429ec6bec13f3224a3b53e81e2b8deedf923b92fe075c19ad36bc51950123984ef489df99e54249435c6e0c77b5653c3ed9a9bd
-MISC metadata.xml 953 BLAKE2B e7c1cc4d11ed04f7d034d6d8b6db37a27ad130ce2fbbff8036ea331df68ca7be2fd368bc45e09901d776b91e4bb83e457607182d60225a8c3d4daaa5f2199f7d SHA512 3d5fda98924d8f45711fc3b6283fdf968fb70f44d7a5dee06640c3386ab404905c25e033f5754810d8ea9bdf4f6426348014a30f6bace937654739cc695a350f
+MISC metadata.xml 983 BLAKE2B 64406a37c0938a62b929cbedf6c16425dd999633cbf8a068afac38fa48de7e6cc05a5dcd03371c57c6f5c5a46c7de266c1e815fd97494bd8bf25ac3820904956 SHA512 c10b98354c2e9015086df0abd3961b006709104dee4f6f6eff682bc1ef4fdaabd35e8e8cb9454e966111c867bbc88a08dca0993545bd18cac02e4113b5225307
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index f6df02262b86..0983784769da 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index ef37ec938af9..9780f2266c98 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -3,4 +3,4 @@ DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4d
 DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46
 EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428
 EBUILD gvm-libs-11.0.1.ebuild 2025 BLAKE2B 5dd6df6ecd1ae6bc3440c79af86a9adcd44c24bee7b1fccb560ae1ef0bde0f0c2bb432b3d6d370b02105e292df901681bc29f740444969fee3f27f9152b97622 SHA512 04d2a392e9f7e684838c7ae0a5159a62378c444559d64ad210b6c124891f991b8fb6af2d4f3f95f79450a807d76f8754c98942a2f8f1577b6ede08f051f487cd
-MISC metadata.xml 782 BLAKE2B 002fcba6357c321932dc1506bdc826eb848ae9959e1bbbeabb9f3c4348eabd3aedf34df68af834221ed4f7c7f8b5a5ecf69c3ee657706342f9161b810ed68f60 SHA512 33d2c86b3e5bd9261a78ed7bd726d01d677f715c675caee8868adbfe80b408d3f155779faecdf1124a00b3b72167966111bb5ae1c9849725a7de76fa46e5f7b4
+MISC metadata.xml 812 BLAKE2B 2af4a17e02930d1cf034a60b0300366e8a5ad2948a5c9627b644f543560254a99b52b9153f0a7cb2ae2a93e8f1d0462579778ff822b414ebea787e24683a0498 SHA512 d5a3accce742736336dd7af6722cb093ab58218bedb0cc8d244269234eef330a5f87bd42759298e57139b5796a648227d7c21ae517282d508d00832d2365269c
diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml
index 3fc9918d9918..ebe1515c15cc 100644
--- a/net-analyzer/gvm-libs/metadata.xml
+++ b/net-analyzer/gvm-libs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index dd7f8ee667dd..b0e8889eeaae 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -2,4 +2,4 @@ DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504b
 DIST gvm-tools-2.1.0.tar.gz 128144 BLAKE2B d9dd1857446912bd26a0b5efa38cc34c77bfe9959aaa9ab42ea8518ef9231e5877317319ac8e924b14a5382c80cb00c70d0413635506355eb111b84b5715bf4e SHA512 80933ab8303c1ff77451a9fafd9331b6a0b4c3ae40c4ea318171b6b9e969fb6f20c6970d021a14db1bf8ff816c7f779e2eb750bf84f9093055273f58ad04cda2
 EBUILD gvm-tools-2.0.0-r1.ebuild 1203 BLAKE2B 40af74b0c324424888dde0804dcd5a0682d9d1526d1bfbac089a43d7986d33b14e89b86d4f3dc569a46f55028477d8429f8a6a7971c0b78e9ee2fbc96be19eb4 SHA512 4d38d1bb3893cedcec1bca8d4bc170646383fd50627ba546dc87394882f6eea54fce71e89b1d561f26216b32887b512a27d4e65864cfbdb793ef793429c854bf
 EBUILD gvm-tools-2.1.0.ebuild 1003 BLAKE2B 52cfc80890f0ec9ad9a47ebca378dcc0ea7171cb3a1fc02847b3b0c5f12a3a5c9063b2f5f7d2357897ad4a65b31fcf85f0ef2f4eaab233a8e79e2f32dcf23012 SHA512 ec6ca139544605318dd9f7d6a518967e329f5b8c40a7293520bf0c1a7067320178369fda6df40a71692639de64dfa9c7623a832e63030f1bf4616d22085ddd79
-MISC metadata.xml 871 BLAKE2B 65fdc24c170ca52b75a45f89d0f56447f83ce23f8860af2c87d3bf02178fe637e49fc94005f4383a576728514d78f59f6a62fc9a893b18dfe3bf9ef696738ade SHA512 66e5e2b493223a23276ed57c7685f8a151b4fdd4dfb4854d283c0f82a5b923bcbc2688bb1b9701e7934658a6ecdd0d9e036993f4f18aa5d160b330aec2bb72a5
+MISC metadata.xml 901 BLAKE2B cff38bf64d7b6a7ecd7f5100ec845c5c704fe33734e7e396b11a1fc8814c87121f61b733eca0c467b512be81e70ee20fa1acac75f664b3c1056c3ff94a89c2a0 SHA512 ddfda9b82910c11a826e40d864870ac9cc4de279dc06f7f8e6d7b92af9d9374b11d3d78e2a2e2af35ad3f7712c57e2adaea6f53e88ff3daa3a0d5fb2cb2574f1
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index eb6dcb63c5d3..18c296090054 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 70a36aa1db9c..066b8134bb33 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,3 +1,3 @@
 EBUILD gvm-10.0.1.ebuild 1295 BLAKE2B 9240153601838b17b327635c08a7fa64e40f90a8aaccdb5ffa23c113f18bd5a8cabf3db228f7490d6dfce0d0f8c7baf49ea47ccbdeb4010429afd9e451718f4f SHA512 f83060baf1d636711e1268376c05d04e07e673c2d5728166b8f01c1a610250c81fc2141cbe324ad082f4e878d253c5adda19e60dd244a7748afb488bca359ea1
 EBUILD gvm-11.0.0.ebuild 1222 BLAKE2B da5b755c260012f0001a1fca72b83bfb394f7fef5189efed3e46ea1fcd414f32ebadc33f2773781aab4fc5c7c18a7c7448ceb03f4ca15b641a93db922d24362c SHA512 bb53a87e9b1b6f8fe3e28113a2ae24070cceab6a86356a55a89c5bec47e4513dfaccda094ff4d157b9030b82b6a4a20604fc9c934fddb519c6401adbef8f3bc9
-MISC metadata.xml 1170 BLAKE2B 2c1758e283daf2d72e61cc1eacf6312c4131b7f89a8a10ec924573f1dfab865c7e66992ffa4591036f183d20e9b73594d61dd213e5adfbd1e428836920df6d6c SHA512 c7f720bce7ee7e6ed5efee259423e5750528c4e7ec9bf3bec443abc67f2412ca05f98a6bee67352ccd053f1ce26b9f7279e78ed5646aacb1bcff2918a61a0279
+MISC metadata.xml 1200 BLAKE2B 4773a833f5e00f25615c7cd169a79368299f1583a3d363c37d2b4255382945016fb7927c29e63e5c92049a342841a6d3be4524542dab8a391b566d26387c9da3 SHA512 965cb0f141434702e7f3cfd385bf3270437fa36d13de473c8229094dd7ee049f2d75186e9ff41811932f9ba4ffb3883a603f18abf584b9055813a43983054b8c
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index eeb4ec70aac9..45968d46e787 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 78813c663cd0..1dcb5350c083 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -9,4 +9,4 @@ AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f2312
 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
 EBUILD gvmd-9.0.1.ebuild 2836 BLAKE2B c4273957354ac5cc8b51a6e0b47a00439d866b0fae51ed5f866db2fff0003aaa891fdfe768005ef35f25f554eb750af742308ff37f7f8b0da0a8985119aa25e4 SHA512 28ac31a09bd31c2bebe92baf3f671d9431040cc7037081ac9993f5383085eef074a43ddeebc15920aadf903ef4ccf223fd26df3e116d46a83396d1f44c375d5e
-MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed
+MISC metadata.xml 1073 BLAKE2B 7f2ab5c71762e48fa92cdd15a009961d5302d44a3b39f5e936b1b2eb190141d3136b617c451c2ccaf028813a85db0aa21470546de44e37709f0e21b6cbd28361 SHA512 3b980f843d6e8ea1472b951334a6bf528eb077e718d9a75ed7a07d6857754686611f088f001a77d6b7e5bed3e28fd670dc50f47d3b6c62baa477a80ba6777b67
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index 072f33914919..6fe00407f06c 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index e4dc0bcb89d3..71116522c182 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,8 +1,5 @@
 AUX hexinject-1.5-fix-build-system.patch 433 BLAKE2B 203e2f72950d9caad552f1bd79facdb334a3fd9430aea2499b125686f18dd361d40b92ab183b0acc5c8e3dc7759393feb70bf1b36521a66f89937f1d0fc9c293 SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1
 AUX hexinject-1.6-fix-build-system.patch 462 BLAKE2B abbd87f2ba9c8005649ab50cb16c0fbe78d0be06beae297a5f68d876059e4f86b42fe985f97f0d8ad1ff5c4224f3cb213f3635d6b30cb932e4d09af59e04aa54 SHA512 5cf816c71789d6c487acd757e62d44c4ca0ada32393d2de138311e61eb22c0ca5c49a9e539a7fe333b4fc8ea48ec29b49c4e14db97bc267c45aaa39f8fab04d1
-DIST hexinject-1.5.tar.gz 14449 BLAKE2B e7c3fc34cce5b004622d6fe30584d90d8739fcc218d485317ddab178807caa4bf82e86b66f45df3311e05ca96c58aa9590108ffaa53c703feaafa64af8804e2e SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a
 DIST hexinject-1.6.tar.gz 16876 BLAKE2B ac2951a5b4705ec84ed72fa5513e84b8bf031bd7e43b05c76fe83fc601cf3a245352afb0f226cc128bb028124ba898bc67394f2d839554ee01e25ee25c8f0c4d SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad
-EBUILD hexinject-1.5.ebuild 756 BLAKE2B 873cd8b5d9aa09e024f4b34f65d138bb3619bc5b7ed8aba8abf6af311d373017366b02bfd836094ff83451493861773a4f4a08f8361fe8a5a9990c399b707c30 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92
 EBUILD hexinject-1.6-r1.ebuild 697 BLAKE2B fab22b1a5b3d00881da6fe0ddbc91c5678d1ad9dc910fa7689708c4dcf31982c94194279a09475777333e17d17ff8202032d3b8ed59c5693549a5298cf0919fa SHA512 89ca26ae193bca85ca9fe8ca0e5075f96254887666f24d84ae2e194d941d3e50bc7f46a40bbde3c319b3cdf977080e29b5924a1d2e11dfadb601f23c9914f2a8
-EBUILD hexinject-1.6.ebuild 696 BLAKE2B f3e096a3145c844f7e41926072df85a7eaf9351f4da02b9d0c39517c129dc688c2c8c8273c875b8487bfef920f1ba6092572c6c1fa87f5c14b4097f9abb59afa SHA512 0a41dbb13e7551603261a7c40ce956779a62a1bb6e35fa35530d957f3872fb223cd961cf6e1734fcd7bc6ce9c91b81e799b18699e1ac5c8d82eb42c55beb91f5
-MISC metadata.xml 1004 BLAKE2B de0d6ef7dfa696f6260482932246ee5c10391d243890af3b992e4f39cbce7e6452e3b1b7bb146d7a53546f397f5b45ea29e5cf5044e09e0e80fd014b1409e2c2 SHA512 e9e01a46cc45ab6625e4d444d857a31340b93879c24cb7e2a1d420e644b376f484ad4076bc36302ab536bf88a9ffd7c1850115d3c2433181b82c948e84077ccd
+MISC metadata.xml 1034 BLAKE2B 95f51302f1b6880e3d4af3056591c094d97ea5327ff176c95c89623ccab77da581c9a262ef9686340386b38921e4c7eb97bafaf99394e6a251edaa421d7e2d64 SHA512 2e512a634789c5d9becbfaa448eab8fcbceb6a3e926987b340462c201b1047b5a861d701a722d1576c3be2fcfb499daff5f10264a8028d17a3ef262415507b0c
diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild
deleted file mode 100644
index b33f5f0bda0c..000000000000
--- a/net-analyzer/hexinject/hexinject-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network packet sniffer and injector"
-HOMEPAGE="http://hexinject.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools experimental"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	experimental? ( dev-lang/tcl )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5-fix-build-system.patch )
-
-src_prepare() {
-	default
-	append-cflags -std=gnu89
-	tc-export CC
-}
-
-src_install() {
-	dobin hexinject
-	use tools && dobin hex2raw prettypacket
-	use experimental && dobin packets.tcl
-	einstalldocs
-}
diff --git a/net-analyzer/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild
deleted file mode 100644
index 5d8011ced352..000000000000
--- a/net-analyzer/hexinject/hexinject-1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network packet sniffer and injector"
-HOMEPAGE="http://hexinject.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools experimental"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	experimental? ( dev-lang/tcl )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	append-cflags -std=gnu89
-	tc-export CC
-}
-
-src_install() {
-	dobin hexinject
-	use tools && dobin hex2raw prettypacket
-	use experimental && dobin packets.tcl
-	einstalldocs
-}
diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml
index e3ef4f8b00b1..c5a81e6e30d8 100644
--- a/net-analyzer/hexinject/metadata.xml
+++ b/net-analyzer/hexinject/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 0f7a5aa14b50..fda5771e865b 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,9 +1,12 @@
 AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01
 AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf
+AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
-EBUILD hydra-9.0-r1.ebuild 3780 BLAKE2B 98de0efd400e19c14e9575d3fb36e082ff3ae10d6f7f67ed941bf1520cc25e29ded776e7b9d174d58ad63f0246c1bb5f4d58d62d6fe6c91803d942e7484db799 SHA512 7ba1f10e2da24b8f0c3ceb86a0f0de42a50105e4cba7d21edc12bb10c6133e3152bfcc655eebcd5ad2473bcac9c6ddb9213f552c42284488b9dbaf0c0f548399
-EBUILD hydra-9.0.ebuild 3684 BLAKE2B 17861c610ba56b6133b245439d04b01b10db505a498c4b0ee0e2f4f0ea7ca2816a53563b7d4a9269684f71d0b90fdc988b3ce2b84dcef351a69d04c433d49b11 SHA512 87217c0d0de474557768d062fcbd03d59da88ff132029090a4088c397528a0ecfa1f65e3c6f49d7ab26b0e85587aa1dad2ae06e25666d6e94e47c88936bcf9ba
-EBUILD hydra-9.1.ebuild 3691 BLAKE2B 402fce711e3e7d311da07aa88f955ff925780cadb5a5afd7f646eb64cb78946acf3a928febd9add769c463ad1ef49a9df4f62689531025e701c4a8b48217d7d8 SHA512 b97a807535b50108c9af8405d166f82b3ec3dbb557edf66e7c91087ef0585358cdba9130b158796a0d9b843d4280c4424a2b8060fb3e76cf2819da88e27f4bcd
-EBUILD hydra-9999999.ebuild 3629 BLAKE2B a4067027c780bc3bf3d2bd3b662b79e7ff90c0c909134a7d739fd34ffe373e7447048b7fdf5b60cec6614e5dbe29843a4b6534c61709e3db8a5f4170e1ed84cf SHA512 74ee710cb68a48abba67f2edcd4f89229cdfbbeafe6c6815d5eabe9bc482f0e409d42be5b7b05051872ccf02011dcb0342b7fd12a2deae4397048d41ce7d1520
-MISC metadata.xml 552 BLAKE2B 01b49284c869dbbe415552bca3bb8dbc807eb9a362b6378954e0cf5de1265f9f107f13e0ee27cb035c1e5652c7a712c210dc2db0f8f470011eedb52ce6fa043d SHA512 0f438e21490b870ab4b247f55fc7c3c413bf8598225492306e32b27d4aa3a4a5ff2621118bbafd49d570f95f91011e88ce78d1cbe575d5aa05ace68ac3ab7a9c
+DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
+EBUILD hydra-9.0-r1.ebuild 3716 BLAKE2B 2d9d455c9f620808543630a784c382f4769521e81141cca5821ca25d90536023376a874077ed1c91e775e8a89f9044329b9897f9d0519949c2755988061e6e28 SHA512 d8e95cb07cc08d6ef37fa1c4a975de86c777cdc5b48fd3ea585dd9cd4b0f6f553b3f09a91d4e9d0ff13f39e71bbb241cd389af1109424fe0dc3d5dc3e8be0730
+EBUILD hydra-9.0.ebuild 3620 BLAKE2B 79f6117e6de4892d9597bd431020151abfd11c9948235051e5abdb45cb21329e37ebe998ae318568c3a29cafc371464d7f37700fe43e726367fab8b255e40fa8 SHA512 12fc637a1e756c26eaf396c353cabf0295d15f078cb9b48441f99532e31d62d8f7ef086894ddb493f23bfaab845304cd0f5a76c8a6985de1d13f42b433b44968
+EBUILD hydra-9.1.ebuild 3626 BLAKE2B d89f6e3dd2a8040183551e96f51012dcb8ddd2277873f83294f789523848ac893e5e4471476edac35a299611d7e9b116715510d55d7ca6cbbe9a04538f2ed124 SHA512 5a835262af5aee665550955909549fcb5838a8d9ba0a5226d659576c56ddf7d984cf6a8bc97839c8f15340edb67609c8e2ef3279d1fa2df33e8bce7d9d946387
+EBUILD hydra-9.2.ebuild 3662 BLAKE2B e49f162de992b218bd65ae480f52887188caa337ec0202b6ff19f52dc967e7ad93a7112203754541b2e065ce00fe245550b519bb7f47fa8c42fdc3d957379cea SHA512 f4db9ae074d853275a1a4fddbcaf7b81af05fdb91c3594327aa6dd39b51ad5f5513d0d7f6c65b4862ca184903be75851db361e317f7c8efd3cb58af25a87ade7
+EBUILD hydra-9999999.ebuild 3586 BLAKE2B d510ae7b3a31e0064563f7858c87b5830849ffb68fd4277e0716bf927fb2a879786844aa840c54c7da4beddd56b7518a9ade811ad26b3b63f55e44eae717fdf2 SHA512 73bd694d30bc004c10ff5ab4a61ff610e5830db180205991a4ba5e066904b663afba91554fe728496bf5f67d2bcc6383d1bc668931965cb996185369c3e3ad78
+MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
new file mode 100644
index 000000000000..8d158640803f
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
@@ -0,0 +1,26 @@
+Don't inject hardening CFLAGS. We already have these by default in Gentoo.
+--- a/configure
++++ b/configure
+@@ -1376,22 +1376,6 @@ if [ -n "$CRYPTO_PATH" ]; then
+   echo "                                  ... RSA_generate_key()$RSA found"
+ fi
+ 
+-echo "Checking for secure compile option support in $CC ..."
+-GCCSEC="no"
+-LDSEC="no"
+-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+-echo '#include <stdio.h>' > $TMPC.c
+-echo 'int main() { printf(""); return 0; }' >> $TMPC.c
+-$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && GCCSEC="yes"
+-grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT"
+-rm -f "$TMPC"
+-$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; }
+-rm -f $TMPC $TMPC.c $TMPC.c.err
+-echo "                                                  Compiling... $GCCSEC"
+-echo "                                                  Linking... $LDSEC"
+-
+ echo
+ XDEFINES=""
+ XLIBS=""
diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild
index 402929ea2301..f1397694c8ad 100644
--- a/net-analyzer/hydra/hydra-9.0-r1.ebuild
+++ b/net-analyzer/hydra/hydra-9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -93,7 +92,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index 3a812ec881b5..190b5ed145c3 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -89,7 +88,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}"  --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}"  --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}"  --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}"  --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}"  --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild
index 0b2eb5c879d1..edfc864a713f 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,9 +10,9 @@ SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -89,7 +88,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild
new file mode 100644
index 000000000000..ff6615335797
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallelized network login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/thc-${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
+	oracle pcre postgres rdp libssh subversion zlib
+"
+
+RDEPEND="
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	firebird? ( dev-db/firebird )
+	gcrypt? ( dev-libs/libgcrypt )
+	idn? ( net-dns/libidn:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	memcached? ( dev-libs/libmemcached[sasl] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ncurses? ( sys-libs/ncurses:= )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	rdp? ( net-misc/freerdp )
+	libssh? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	mv Makefile.unix{,.gentoo_unused} || die
+	touch Makefile.unix || die
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	# Note: the top level configure script is not autoconf-based
+	tc-export CC PKG_CONFIG
+
+	export OPTS="${CFLAGS}"
+
+	hydra_sed() {
+		if use ${1}; then
+			einfo "Enabling ${1}"
+			if [[ -n "${3}" ]]; then
+				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+			fi
+		else
+			einfo "Disabling ${1}"
+			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+		fi
+	}
+
+	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH'
+	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
+	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
+	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
+	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
+	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
+	# TODO: https://bugs.gentoo.org/686148
+	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
+	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
+
+	sh configure \
+		$(use gtk || echo --disable-xhydra) \
+		$(usex debug '--debug' '') \
+		--nostrip \
+		--prefix=/usr \
+		|| die
+
+	if use gtk ; then
+		pushd hydra-gtk || die
+		econf
+	fi
+}
+
+src_compile() {
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README.md
+}
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 3ff5496cc9b3..fd067f1b4ca5 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
+
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
@@ -10,9 +11,8 @@ EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -41,10 +40,12 @@ RDEPEND="
 	subversion? ( dev-vcs/subversion )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
 
 src_prepare() {
 	default
@@ -64,7 +65,6 @@ src_prepare() {
 src_configure() {
 	# Note: the top level configure script is not autoconf-based
 	tc-export CC PKG_CONFIG
-	append-cflags -fcommon
 
 	export OPTS="${CFLAGS}"
 
@@ -87,12 +87,11 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
 	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
 	# TODO: https://bugs.gentoo.org/686148
 	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
 	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 0c88bc63e93a..edfd01784ed1 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
-<use>
-<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
-<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
-<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
-<flag name="ncp">NCP protocol (NetWare) support through ncpfs</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
+		<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">vanhauser-thc/thc-hydra</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index e00bc2bb340a..111b114f7cc3 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -5,5 +5,5 @@ AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b
 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 928 BLAKE2B 9646aaa3eeb56fa383563286a786142efeb0381552423eb4916671c6cc00d87fde4ea45427c70a484951ab2cce17b07d229d5ed4e6eedff375b325ecc1a5dabc SHA512 20882c2ebe3e23bedb9ba8ebcc83d5c37be9d9940fe3c51d71fe5f9041f3b6b56e44764134bbb76c696d682bf156a9e923c8dd3854ba4a5b4b1e45a5a1921a7b
-EBUILD ifstatus-2.0.0.ebuild 893 BLAKE2B 8c49738d994275e79823280afbcb24b150e1c82de6ec83dbb172690e1397134fbb83aad052c46ef92aee9f38d84e29736e461c4e2ceaa894d7257c28ce746fa3 SHA512 bf8da74e62af253c57a35b3b15067abbd9cd9cd03e862739e5cf080e4e92a6d89ba5017d518ec9812ed292939aa779377f7f208f6ebe4e5c31a1126287fe8cea
+EBUILD ifstatus-2.0.0.ebuild 891 BLAKE2B c4e496921cbc02785583c4925b480216239fc3009dca26f921da2fd0ce2fa8ae9a0c5220594fd6cf3aa66bafa28cb04cb138bbc0ad6907eb2437e43754d51ff5 SHA512 66dca0c1d8fc07ba210d0be1e648ca550cef24d89b1b56186ba2ddcc4c335902e2c94848c966acf1f122357d3d6857f6a0fa338d6b8cdeeb5af8d2815105614b
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 7b2612d29fee..0b58e01792d6 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index 32e7c2ab050f..0a9cfbf8826e 100644
--- a/net-analyzer/ipsumdump/Manifest
+++ b/net-analyzer/ipsumdump/Manifest
@@ -1,7 +1,4 @@
 AUX ipsumdump-1.86-SIOCGSTAMP.patch 228 BLAKE2B 05abaaba5619f0eac3d0dda66ad948afc7aa3cca3660fa9a89a35252e92408a2ffe9f3add385a851651439dd2bfbfec0164619c1cc22faad8269de4d00b61336 SHA512 bbf0737f8825e309f9fe548b0ea385d5c6926e59aabc90545d72ec301147a14607a648b0be90adf7f81874b9efd8bf6db59ad0103e7f8a54aa62bd61450e8cf2
-DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596
 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65
-EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d
-EBUILD ipsumdump-1.86-r1.ebuild 677 BLAKE2B 485a8ba4d09f00e6a45da680542ce03022b5b37ef00911cbcb5252959f8efa48f47d9cae2131905bc6a267eae8e7c51e34985fcd2827f75bdbaff63a277175e7 SHA512 330fe0ae13c5c83367ba3b00cf7ec3f3355cf006a9d0065e272621aad4e853c5f0bfe6dd1d80f154a5b68b3e9509059f7a48b5f89baf96f71913be64c8586081
-EBUILD ipsumdump-1.86.ebuild 622 BLAKE2B 9de5b2f1a470ab65abd3865eb25930e771c5f25de630f92dd8d286d31bc73cd244f2dd5548506ffd7d14877791686eefbc769b5d42d009243322673ffb6d3b62 SHA512 4a169c2e2b380bd29a040a12f77661b7068daaa75ecfb46f4f5077cbfb0f547c7626b6fb3736fd738f42b637058b625070ac8e5489e6b45f331bbf2258ceccfc
-MISC metadata.xml 563 BLAKE2B 1c76f973fe5a6165461b1822b83462cc49c658ce95d020e38a3f5eb4fd8ae3e5e5a455491ca4e9da2089f439757cd21ec9788c5ce1f845421a3a030255f7bdb4 SHA512 1867ca535fabb5e70808491cea9339e91e21009f30526dccbbf29594bba57261d98a10b43d096f24b84d476a4dedfd9be1ca7fbbc3445ddde928580789914432
+EBUILD ipsumdump-1.86-r1.ebuild 691 BLAKE2B 6ff2d53651b856564c15cd6048b0b95d88780ae77a4fb8cebf97084fe055c30c71e229a6d660a9a5c5694b810eb713490b193e4f5296826a3c83bd10ce530929 SHA512 900fed8ade6f7f8e9bc3c6c6f362b5c07ec9b21acdb72bdfddda3fe2dcc29d44d6c701525d185521afbb0463721aa4b274db9eb66f6d18da3cb2e09c7885b853
+MISC metadata.xml 563 BLAKE2B fc218b2eaa1c6aa346fcd47c1aab6d96191166813117a283c600522ab1e1b6bcdb83fe8bc5bb96dedf93d90c2eb2d645470519bbc6fb63fde5b44ba1ce61761c SHA512 14a43bbe1267045faf215d5446f60efff39e8fc19595c7c0825ef9711270d06ef23a4355c517755cca2d303862c76265830ebd2d135491f9c09c01ffd275f54b
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
deleted file mode 100644
index 371b03c67b61..000000000000
--- a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
-
-LICENSE="the-Click-license"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ipv6 +nanotimestamp"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/expat
-	sys-apps/texinfo"
-
-src_configure() {
-	econf $(use_enable ipv6 ip6) \
-		$(use_enable nanotimestamp)
-}
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
index 8b367ee4b4b7..983cf1d190ae 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
+HOMEPAGE="https://read.seas.harvard.edu/~kohler/ipsumdump/"
+SRC_URI="https://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
 
 LICENSE="the-Click-license"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ipv6 +nanotimestamp"
 
+BDEPEND="
+	dev-lang/perl
+	sys-apps/texinfo
+"
 RDEPEND="
 	net-libs/libpcap
 "
 DEPEND="
 	${RDEPEND}
-	dev-lang/perl
 	dev-libs/expat
-	sys-apps/texinfo
 	virtual/os-headers
 "
-DOCS=(
-	NEWS.md
-	README.md
-)
+
+DOCS=( NEWS.md README.md )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch
 )
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
deleted file mode 100644
index 51f75d48e429..000000000000
--- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
-
-LICENSE="the-Click-license"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ipv6 +nanotimestamp"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	dev-libs/expat
-	sys-apps/texinfo
-	virtual/os-headers
-"
-DOCS=(
-	NEWS.md
-	README.md
-)
-
-src_configure() {
-	econf \
-		$(use_enable ipv6 ip6) \
-		$(use_enable nanotimestamp)
-}
diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml
index 670b2921b9ff..705f4de824d6 100644
--- a/net-analyzer/ipsumdump/metadata.xml
+++ b/net-analyzer/ipsumdump/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
 <use>
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 9ce56c5c36d4..15fb8803ffc9 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,4 +1,4 @@
 AUX iptstate-2.2.5-gentoo.patch 675 BLAKE2B e24ec3afa9c75a097d0a1d27c4e63e125b909590db52e49a8789ac66e00ea308f5e63b2f7d55a09fbc6de728db5812563ea3e31b9908386cd5ad76330b4e862b SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c
 DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
 EBUILD iptstate-2.2.6.ebuild 778 BLAKE2B 253e3316bf2dba271b93c401b40588a70049a4aa4e758557e86fe22d4528cebbb9f06717e6fc6143ebd99fef296f9dd0ab111870aff7e38112cab583a7e1606b SHA512 9b13e2253bc7cfd1adf7e95c19064c73f933b683245f32e0cba10148ee827d5fefbb96ee5c898cecb7a5d4c51da36f724938a1087823f13c13f979674b81b5c6
-MISC metadata.xml 413 BLAKE2B 4290cd85dc47c36f7f77914c9efb8031d0ebe9324112318fa4529daeff17c4df442aac7b97978fa399c6dc17ad65307f19ca7de70f9c3c21d07a9c96de69bac0 SHA512 d2bc802f6220c831ecf4c13c95d24e71032aea4b81e54a359eba2c6212df5cbb0c2ae00d2687bbc94d917b863917905b862bedd3f27a3eb7dc9239c06315bf7e
+MISC metadata.xml 413 BLAKE2B 4d9da6354fe023f7810981af95446eae8fc46f3e56373d91da0a854b80ab87de47ecbfdf09fe3cdeab92b2a559403b8430e8a64d4d9a88d92b0e449ac57a8545 SHA512 dcc74a03d722ecf2ca276f9159e10c28e79de542ea45c388dc617c5cbec5b4333c872c5b0db9968a0d774eca985f63803d338903d183d116f916a57a085046e0
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index bcd164dad76c..7dfb0c5295f7 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index ae456e03bb66..419b825e03e2 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,7 +1,4 @@
-AUX ipv6toolkit-2.1_p20190919-fno-common.patch 5414 BLAKE2B cf9f97ed1155044211e31f7c0d081d283681de63b5f9f00a910f29f91055675f8af8045db7ec77277a9f5bc518063677c9cd0d1cf7df44606a9b253f48089ed1 SHA512 939b9a113867d8a308c4a3802ca55d6c8e5bc050e5dc50ecf8558b2008bca6e734996ee091db33a16a6efbf14a12a00bc213616f0229fb143259d7b069dfe7dc
-DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9
 DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f
-EBUILD ipv6toolkit-2.1_p20190919.ebuild 1222 BLAKE2B 6f5666e4a94bdcfac16aa92f591c14199fd4b2d007adaded56bbe06b6d0648b2d9cb36e228efdf89283247f88267159735648181436c39dd76ee578e109c7613 SHA512 c31766b0b48b0fd62b459bef37a905722612c6f2ec86ab329f6f0cc56643a01b1cecc48aaf9efec6acba257cda496a87f300478991fbe511b67b86659d1bf8c9
 EBUILD ipv6toolkit-2.1_p20200412.ebuild 1158 BLAKE2B 69d0efa873b40f8a7fc99712e0016430c66e4645cdcba74f59279045f692e5e8e4c06545a364b32e11326949d300dc349bf596ff5e7d22a5e6da4951673da226 SHA512 bd1b16447f98146e93ec9735c01fd6b63232b82fb8eade13ab472d5ecd75a4a9b3a72ce91af0a24b33e5d47fc09539bcdd6ac0ac398bcb515c45b3f99ff4345a
 EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
 MISC metadata.xml 362 BLAKE2B 0e39082835dd919eeef2ac3b1c8d1463758985141abccda815524c78320def3362e1ce4916a6db86bd71e7a81ff93cc35ed10c13d3e914dc00470ce7350ea0ef SHA512 7eb6e79213b0ebaf0071d98c2bc60ad0965fd80269c60e4fbfc776ebb77b50bc9704679ffedbb61f76220c6fe9dcc35e5a047b3d4b951c238dee65834185965b
diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
deleted file mode 100644
index 9d4a3dcffe9e..000000000000
--- a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- a/tools/flow6.c
-+++ b/tools/flow6.c
-@@ -85,8 +85,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/frag6.c
-+++ b/tools/frag6.c
-@@ -94,8 +94,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/icmp6.c
-+++ b/tools/icmp6.c
-@@ -114,8 +114,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/ipv6toolkit.h
-+++ b/tools/ipv6toolkit.h
-@@ -2,3 +2,10 @@
- #define	MAX_CMDLINE_OPT_LEN	40
- #define DATE_STR_LEN		40
- 
-+#include <pcap.h>
-+#include <setjmp.h>
-+
-+extern char errbuf[PCAP_ERRBUF_SIZE];
-+extern struct bpf_program pcap_filter;
-+extern sigjmp_buf env;
-+extern unsigned int canjump;
---- a/tools/jumbo6.c
-+++ b/tools/jumbo6.c
-@@ -80,8 +80,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/na6.c
-+++ b/tools/na6.c
-@@ -61,8 +61,7 @@
- struct in6_addr		*pkt_ipv6addr;    
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- char 				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- unsigned char		buffer[65556];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
---- a/tools/ni6.c
-+++ b/tools/ni6.c
-@@ -90,8 +90,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- char				domain[MAX_DOMAIN_LEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
---- a/tools/ns6.c
-+++ b/tools/ns6.c
-@@ -59,8 +59,7 @@
- const u_char		*pktdata;
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- 
- unsigned char		buffer[65556];
- unsigned char 		*v6buffer, *ptr, *startofprefixes;
---- a/tools/path6.c
-+++ b/tools/path6.c
-@@ -88,8 +88,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/ra6.c
-+++ b/tools/ra6.c
-@@ -64,8 +64,7 @@
- struct in6_addr		*pkt_ipv6addr;    
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char				dev[64];
- char				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- 
- unsigned char		buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD];
---- a/tools/rd6.c
-+++ b/tools/rd6.c
-@@ -106,8 +106,7 @@
- 
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 					dev[64];
- unsigned char			buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char			*v6buffer, *ptr, *startofprefixes;
- char					*pref;
---- a/tools/rs6.c
-+++ b/tools/rs6.c
-@@ -60,8 +60,7 @@
- struct in6_addr			*pkt_ipv6addr;    
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char					dev[64];
- char					all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- 
- unsigned char			buffer[65556];
---- a/tools/scan6.c
-+++ b/tools/scan6.c
-@@ -153,8 +153,7 @@
- 
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 					dev[64];
- unsigned char			buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- char					line[LINE_BUFFER_SIZE];
- unsigned char			*v6buffer, *ptr, *startofprefixes;
-@@ -269,10 +268,6 @@
- 						                 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080};
- 
- 
--/* IPv6 Address Resolution */
--sigjmp_buf				env;
--unsigned int			canjump;
--
- int main(int argc, char **argv){
- 	extern char				*optarg;
- 	int						r;
---- a/tools/tcp6.c
-+++ b/tools/tcp6.c
-@@ -116,8 +116,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/udp6.c
-+++ b/tools/udp6.c
-@@ -99,8 +99,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
deleted file mode 100644
index bff5e134fff8..000000000000
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
-HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
-SNAPSHOT="20de5f297f73b6a8115d1eac52adfe0b6df5b3ed"
-SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap[ipv6(+)]
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwids
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch
-)
-
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt
-
-src_prepare() {
-	default
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		manuals/ipv6toolkit.conf.5
-}
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
-}
-
-src_install() {
-	dodir /etc
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	#remove the included oui file
-	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
-	#fix the conf file to use the one from sys-apps/hwids
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		"${ED}"/etc/ipv6toolkit.conf
-	dodoc CHANGES.TXT README.TXT
-}
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
index ed8814983e17..64200f3d734e 100644
--- a/net-analyzer/knocker/Manifest
+++ b/net-analyzer/knocker/Manifest
@@ -2,6 +2,9 @@ AUX knocker-0.7.1-fency.patch 5350 BLAKE2B 936b898918d794e3065eec8d867e467246c5b
 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
-MISC metadata.xml 357 BLAKE2B 14daef425c693f2b57dd70d7aea0b0e854305052d7751386339e4a34c47b6ff574cc9cfbce4986bab92e639e51760addf85a3517594621f991ba4c148d416ed2 SHA512 e74b8f089a05b739cd6e7864802a5e6759b416d41f122e45ea529feadd69ecd04aff2ed695687710eba64dc24087f4fd364dbda33b59f9983aa453c3d699ba69
+EBUILD knocker-0.8.0.ebuild 560 BLAKE2B 7b5a04f022e206d50a1e6ee83c66e9386d54b91fa822ff03d87928373059a5d17f7141e7be0f0488d54dafb92a237495776da65596d175d96cf2ca29441af66f SHA512 62cc1204e0bfe4298d73a17060803afab0c87b568f1b812b394d559378a3f8549017da7220b3a4c9a2bfb3f5e3c3316528549b54585b093e9723d57d8da821f3
+MISC metadata.xml 411 BLAKE2B 29b26c42040690bf3cc36a84cc37bdaa8de46d819bd0e020ce6ebb73434773286a0033c7e30a8c9d1a8d92bd22fb04cc34ca521dc91b6894304faed4b268a324 SHA512 0cde314018cea789b41958eae169290fa3c50662df7c1c72593c4fe6f40f78d1cb27d6e539d4c58dd74ff13b6b51874a5ad767aff8f69f73e23af3f36dd7f2d5
diff --git a/net-analyzer/knocker/files/knocker-0.8.0-fency.patch b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch
new file mode 100644
index 000000000000..a5ff93fb07bb
--- /dev/null
+++ b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch
@@ -0,0 +1,151 @@
+--- 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_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/doc/knocker.1
++++ b/dos/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/src/knocker_output.c b/src/knocker_output.c
+index 4714c24..613b608 100755
+--- a/src/knocker_output.c
++++ b/src/knocker_output.c
+@@ -46,7 +46,7 @@ int knocker_output_open (void)
+   time (&timenow);
+   knocker_time = ctime (&timenow);
+ 
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+   {
+     knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+ 
+@@ -98,7 +98,7 @@ int knocker_output_open (void)
+ 
+ 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);
+@@ -124,7 +124,7 @@ void knocker_output_host_info (const char *hostname_str, const char *hostip_str)
+ 
+ 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);
+@@ -144,7 +144,7 @@ void knocker_output_resolve_error (char *hostname_str)
+ 
+ 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;
+@@ -166,7 +166,7 @@ void knocker_output_ports_info (int sp, int ep)
+ 
+ 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);
+@@ -192,7 +192,7 @@ void knocker_output_open_port (int port, char *service_str)
+ 
+ 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, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ",
diff --git a/net-analyzer/knocker/knocker-0.8.0.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild
new file mode 100644
index 000000000000..5d60ddc49dcd
--- /dev/null
+++ b/net-analyzer/knocker/knocker-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 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="https://knocker.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-fency.patch
+	"${FILESDIR}"/${PN}-0.7.1-knocker_user_is_root.patch
+)
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
index 490337f25c7d..3fb6f84c7c25 100644
--- a/net-analyzer/knocker/metadata.xml
+++ b/net-analyzer/knocker/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">gabgio/knocker</remote-id>
 		<remote-id type="sourceforge">knocker</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index 41988854dc4b..ce03a8cd927a 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,5 +1,6 @@
+AUX labrea-2.5-libdir.patch 885 BLAKE2B 4f8b255706f053b510b5ef5ae773e2bf6d54558a6cb85d23a89ee4e433f1c38e0a22bd384c2642f3f518be4771fb0d05f00961250cb1c7c2fa0d07e40c0e81b9 SHA512 b0795d81d42e816c41c8f048e0a810d06d9b5ce13739fca55c62b75e03b7047cdf0bfa38e36fce18a622014337ccffc295ffbc7b9cda2339d304776b340e235b
 AUX labrea-2.5-pcap_open.patch 1115 BLAKE2B ba279ea65a905df62a9886ba5db86fb7696d88bfee1309f01ab8b0515809ec88706325e7486bcc3d8b7b6c32d29a1b0270420eaacfe6c825a1e96f65f8780c78 SHA512 336d06bc3db06d19b48a1c5c6b5bc9da31aef6d0103de3c711563e6cb74c650480bf2bfb4606686bc0030140ced2ffd54ad36f24a9bce06bad43d94c33906335
 AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce12551fd8009a51b32af01dfca64202f7ecd22f13935ae84de3ee7ac3949ffafd060cba69503d19726aea51524cccc4984e SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
-EBUILD labrea-2.5_p1.ebuild 901 BLAKE2B 70891ed7bf83635f59a2f9aa715ea1509e6cdd21e698245d7c454c55d8ad8c99dcdb93a99ed27b2bd1df9f1863e1cef3c833a716b9073ebcfa2a1bc9ecb8f4a3 SHA512 f679291c0d3bbe7ebe3c4e1d1fd0c64fca5be0c1c709fa9a48babdc3c2a9fe496ea5051cd7fbff58c9b6a320d13b62b988014da51c7e77005177ea57dd25fae1
+EBUILD labrea-2.5_p1.ebuild 971 BLAKE2B 71afac5d3e31922c557a55fbf3eff929c22e6648d3a7acd4f36f23cccc4766c03695443680c5360a4d834747aaa41ee1b9c454fa21f9b4ce2d65bdfcaa5793b3 SHA512 d3256843a0e506e63fafd6ac7a89982a2c57174e9d057664d336cd6f2fb13d8a8c8fb2f52e6b2ae3fcadeb3b9fc76e780a3f7c8c944113fe9155365c677c358f
 MISC metadata.xml 356 BLAKE2B c78b737ba6e150b7abd18c22da130c805177c64bcb197c2d7909b5a74a35484d87a5a45b4b968cbb0aea0bdc3af6499d9f8376f39dab4df33bdcf3cf82f28e2c SHA512 1b4738687beee35bb3fd628d1d5c1fa9e16b7d938f21644343b23a6c7aaa5b6e760c5342cf88485265ae11f6d00c073e8564b37fe1dde4543323de069f8115a3
diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
new file mode 100644
index 000000000000..039745205c3c
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap,
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval/include"
+ 	if test -f $withval/lib/libwpcap.a; then
+-	   PCAPLIB="-L$withval/lib -lwpcap"
++	   PCAPLIB="-L$withval/${libdir} -lwpcap"
+ 	else
+-	   PCAPLIB="-L$withval/lib -lpcap"
++	   PCAPLIB="-L$withval/${libdir} -lpcap"
+         fi
+      else
+         AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap,
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAPINC="-I${prefix}/include"
+      if test -f ${prefix}/lib/libwpcap.a; then
+-	PCAPLIB="-L${prefix}/lib -lwpcap"
++	PCAPLIB="-L${libdir} -lwpcap"
+      else
+-        PCAPLIB="-L${prefix}/lib -lpcap"
++        PCAPLIB="-L${libdir} -lpcap"
+      fi
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAPINC="-I/usr/include/pcap"
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index 5fc9881601f9..a47abfc9e1a0 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="'Sticky' Honeypot and IDS"
 HOMEPAGE="http://labrea.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
+S="${WORKDIR}/${P/_p/-stable-}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,15 +18,15 @@ DEPEND="
 	net-libs/libpcap
 	>=dev-libs/libdnet-1.7
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS )
+
 PATCHES=(
 	"${FILESDIR}"/${P/_p/-stable-}-incdir.patch
 	"${FILESDIR}"/${P/_p*}-pcap_open.patch
+	"${FILESDIR}"/${PN}-2.5-libdir.patch
 )
-S=${WORKDIR}/${P/_p/-stable-}
 
 src_prepare() {
 	default
@@ -32,6 +34,8 @@ src_prepare() {
 	# autotools will overwrite this with the generic version
 	mv INSTALL README.first || die
 
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index b152e05a945d..eae368452f5e 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -1,12 +1,4 @@
 AUX lft-3.91-strip.patch 330 BLAKE2B 971a6ab45e125bd9b8848ab52426d0747d8f0d0938ea70b23c6be5322986837754b82dfaa877c5d305107927b217490042430dd30116eb62c97cb10d8abad680 SHA512 9c4e8a3d1c9f943568d9732651b7154fce8b3acb1d451bd0e4b61a28a7766ed2e03a0d55d679e2a40d64905c7a4d435b37c072cc1aaa9946b126a68910e2952e
-DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1
-DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d
-DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483
-DIST lft-3.9.tar.gz 377008 BLAKE2B ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8 SHA512 9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806
 DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7
-EBUILD lft-3.77.ebuild 493 BLAKE2B 49e6ddad7656e1c01304a464eb4c092f1f2e7e423732397645cbc3ed1ce2ada675f59d7668368d6f0e067e39ee875823f4f2f979c34000ddacdfae57449b5e36 SHA512 7d921ace43680f2ead6e1e9a1cd45d8e3a3a505b2b9293ad2940dbe117a3339e1a80ff04b15831459b80a214beaf27efaac57c9696642d4a58933516756c7164
-EBUILD lft-3.79.ebuild 496 BLAKE2B a473d61c76ee7692a243e5fc8bfe20300879aec259336d161ea64c0f62c7ad6b266a3e00e6aa1b84d74e838f3f060265f753c720edbd1f38c6401971f50b68b8 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89
-EBUILD lft-3.80.ebuild 518 BLAKE2B aa43152e115169c697369770cc9ab04deecafc9e8e35bd7ba59b322fd1fe02349c539acfe7a2ad45ce237de954b65739598cfb9455b2ff5fe60c2b900c150f19 SHA512 1ac97a059e628e16ed8f1bdf2b87a66b8d7d377298ea2cdf502486599c8f332b813629d6fc5eabf90a34f0c47672dd9f36d590c28199fe7b25146b20f4e528e6
-EBUILD lft-3.90.ebuild 606 BLAKE2B d55eb2ca5b273475c41bb145a9a3e097fb81cc542345114f4a73f82d9e3a4a4beec902b045a104ea412a5707c6326e68b2e9a4d9b177eea68d529c4adcfe9153 SHA512 d3e98b311159c5ac59548bc142aeb560dc245a55f7de06e2875d44529c1a4b2d8997313bab3cd9a9c4b927cf0e3530fdaf62a3cb191afd2614bca91f473b5f15
-EBUILD lft-3.91-r1.ebuild 586 BLAKE2B a8fc1b01209dd4c61683fb761f4f7825dedba73850cde99cc68852ff08c1c6ee1fa5626a56b9d9fe254f15d62b34e413e9716cbb144fdc51e0bcdf2c9d46b2ac SHA512 8910fecf283e3e6761d58825962d5d634644eada556052874bc43d28533cb0fc283c076931b772bc2efe279b5cb777fe9919c665a1a0dc3813d33160e6c98185
+EBUILD lft-3.91-r1.ebuild 583 BLAKE2B 68be385da2c567bece751cbbd80d300bfad295527c3c0f3e833f0fb37035e370d5d27b4a049b716e9cccbda2cb83049d9c75f66ad66302437cbe66b3cdc756c7 SHA512 7e788a718c2a76195a130293096bdddafee336c6895272d500c6d99b9233eba26d5f5dc7c4e7ff8b39a0f51898b6d2e51540aa99bebe7bec51390a5021a19190
 MISC metadata.xml 2868 BLAKE2B 8ae5df11623eb04065537a289d1565a1ad766d93ebaff9b4fc8e326991331edfd7efa712387633a0edc5436445a1f3748425b7d93191ffb61a36c944cfd32b99 SHA512 13fa9fcdcc8c7e75a9a195d9463fc0456a81cc124302ab06f4caba6f20af0a1551ca76c7a6dc77a2551f0a02fbf29fd1087e9b14d674c1f9e661e52fc298b64a
diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild
deleted file mode 100644
index b79c445424c0..000000000000
--- a/net-analyzer/lft/lft-3.77.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild
deleted file mode 100644
index 58a145bd7256..000000000000
--- a/net-analyzer/lft/lft-3.79.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild
deleted file mode 100644
index bc7acaa2b658..000000000000
--- a/net-analyzer/lft/lft-3.80.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P/0}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/0}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.90.ebuild b/net-analyzer/lft/lft-3.90.ebuild
deleted file mode 100644
index d874cf1a0c8c..000000000000
--- a/net-analyzer/lft/lft-3.90.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P/0}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/0}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	sed -i -e 's:strip:true:g' Makefile.in || die
-	sed -i \
-		-e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \
-		configure config/acconfig.h.in || die
-	default
-}
diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild
index 576eb0a3cc0b..3e57965afb2b 100644
--- a/net-analyzer/lft/lft-3.91-r1.ebuild
+++ b/net-analyzer/lft/lft-3.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz"
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 2d738e04ad98..2489cd23e58f 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -4,4 +4,4 @@ DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8
 EBUILD linkchecker-10.0.0_pre20200729.ebuild 1502 BLAKE2B a885276d7d27d59dc63038c70b3c68feff07af40a662deaf267794acabced3a00fed6d43e946046a5afadb92d955ac168f26564baef3a56312d6a6e88c891600 SHA512 335f87d67ae273f14fe27e21d6191b144cc0ac6e6c547fdb0857bb1d56a970d091b648448d5d8b694f427b6cbc73878b323d933bac98ff8a545fb4c0a7e9e76f
 EBUILD linkchecker-10.0.1.ebuild 1346 BLAKE2B 5b23ef87375ae6ca26d8c33ceb508cf4bb9174fff1c4cef48502f0d35a89e4e31458f077dbfca8e1e14a95165d59f35d9dd147af15537a85f863fdd4581dc7dd SHA512 639676c3b14cb96118088b5dd76df7e9a153afd0c7677b7388e53a6a507eb581a3ab78ad6b3d962c94dd3dddf1b1ed67d17880303fe846c05cbd54b69e748b84
 EBUILD linkchecker-9999.ebuild 1327 BLAKE2B a6b772c6a50d6f526b26619f989fbfad4112af32f8016a071001bf41f6b9972f1c3738e51a36b7cfd96653b203cd7f686d8085c490fb44daf286282077477c66 SHA512 12fb7252b32e5c883815021add488864ee8670f74b773a60eb9f8869373899fba754be7bd3d60929f65603219f9543e4a446b3d228c0e549c99340718a4b1c98
-MISC metadata.xml 544 BLAKE2B 4ab01a5626c5397e7b550b717902525a6e3b5b8e3a7b1c916a48abc7181a1c1486a53ecb9e68e06ece5bcf5bcdf67167b0ab60186291033e84d2ed9237bfa35c SHA512 c0f91900f87cc48adc5628264a1948400da60d444c4c5ca251d4edc23a9042616fd90d60e4493e5e458c47991aeace55725bd181c82d6188be398cda2347a64c
+MISC metadata.xml 574 BLAKE2B cff79651f71473f10e72b42dffd79e68b5b121f584993e05e4d7af0c0f2339121b8179b697e937df26d70f93b2774452546284eb8640454cb182e1006e3c6447 SHA512 5e29131b0c8bc634a107658fa7bd36201af4877a0ac8ee9288820eefb17b746b4b32a55c3bb08b11efc93f9e3fdfd37e4b22d242f96068c29388ea0ed0f7254a
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 34057dbac2ab..3a5339d1f55f 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 70c4d5f896ab..3ec734e9efc2 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,6 +1,4 @@
 AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77
-DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
 DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27
-EBUILD masscan-1.0.5.ebuild 821 BLAKE2B b2db0fe2bcfd8eef6423bd961f451d798e4d5d7420d554b099118a81fbd00ef56cca94ca9f212acae65d58b1292064ce5bd4ffb86ff3371af48c091a368c932b SHA512 4b131f6e8838c2f0b2a541ac98b3b5e6e5eaa5638fae8b0b4e56d75707973add348bf81bc60365f1bf0d5fd05f7f5d1121442c9978f8eb9743245e217d252a4a
 EBUILD masscan-1.3.2.ebuild 822 BLAKE2B a31741d1aecbf883126c3a6b748c69f93aad65b24935e065fcb71a6752c63d50a1f5d0022bf7a60fa383d772dd354494e280146d1d2de6ebc8f928f8ae6b1847 SHA512 9e6bbed3d1cf2dfb57cb482d182e75f0936d942fb949a5e2eecb5f960b46480efead013433ac8d824969ea40271b1f06a49e0f4ec114998cb33b35322c72e8d6
 MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild
deleted file mode 100644
index 96cf9afa0476..000000000000
--- a/net-analyzer/masscan/masscan-1.0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-		-e '/^GITVER :=/s!= .(.*!=!g' \
-		-e '/^SYS/s|gcc|$(CC)|g' \
-		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
-		-e '/^CC =/d' \
-		Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/masscan
-
-	insinto /etc/masscan
-	doins data/exclude.conf
-	doins "${FILESDIR}"/masscan.conf
-
-	dodoc doc/bot.html *.md
-
-	doman doc/masscan.8
-}
diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml
index 58f5863c9fea..9d3f16ec1616 100644
--- a/net-analyzer/metadata.xml
+++ b/net-analyzer/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria net-analyzer zawiera programy do analizowania sieci.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 8221747d0aa1..8a9e84ff1eae 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -3,4 +3,4 @@ DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab
 DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
 EBUILD monitoring-plugins-2.2-r4.ebuild 3026 BLAKE2B 5dcedf383de5985195d90e1d01194dd3414bc05f54b98a058d45bee42dfbcb3238b66d079d968e3912ef203a636182b11ff21c5328fd80359d56ccac965908ce SHA512 664b07c16bc3aae7b76202b4e446633c0df1832306bc315fffcad2f830a7b001a6829d9457b9d9cccf3230e9f49921229f4167b6ae3a407e23052468d4b2445f
 EBUILD monitoring-plugins-2.3.ebuild 3114 BLAKE2B 5d883fe08214a0bc3b41287b9c78f362d2e82c0938c9aff4c468e7eb78b237ee99b0bacd9ff99433c823bc7e964015984a0520267bc43c175715aa5d7583a26f SHA512 be04871537b6ded83dec3deae1dbd21381debdcdc35f9112ca25d9d58201a1443b8cbbce3851fd134d4c01e8347cd0f33a0fc76692724e0e546cf57c7981cb89
-MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
+MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 654cb6c8c64d..a19ea004dcc3 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
       <email>hydrapolic@gmail.com</email>
       <name>Tomas Mozes</name>
   </maintainer>
@@ -9,7 +9,7 @@
       <email>mjo@gentoo.org</email>
       <name>Michael Orlitzky</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
       <email>proxy-maint@gentoo.org</email>
       <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 8aada94d5f24..18227785eb19 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -2,4 +2,4 @@ AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f3842583
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
 EBUILD mtr-0.94.ebuild 1426 BLAKE2B 5e54c4c3017cdc6570c8a5e0b8959b8cf2d34d4599b45df2d26f3d47af432f0f5ad4b00dede2d54bc743a8750a4cd190dc14d2635d2c1599f1e809a69156a7e9 SHA512 79481d57db2fc582d3f730e58dd7101618d7f0f095d98ab1d486a0cee344347688b062a4e8eebea7b2d2128772a525e62971f8a0448aa162a75969e0fc80ce0d
 EBUILD mtr-9999.ebuild 1282 BLAKE2B a9451a299afe9c557b3400d19f39b33dd6cb4cdcdf60fa58edb551e3736d8af261a76516caa9b39561d57c36c74d1eb26fa63c3ca96908c97310adf118a2b173 SHA512 e07ee53e8e2aacdf43cc8fd0d5e1adb773fd4d3c5d47cea982f8104c81d29b7040335d10e201ddda106b8a330381d38d76ea0190d2c56d617d1709b6e3d83319
-MISC metadata.xml 636 BLAKE2B 6ac1437dc7b42ef712ad3a851f6dc8df59f7a354e99db5bf564c91f90786a9eb3e90d2d131592047e5499eea5e5238150525e61ddad1a5ca72c594edc7c8f9f8 SHA512 85a0425e6ac71a544d6a8a0cbf270e77afd6dd41ed226650b122977b6288dee8d894c30d6c31425dc15d2b58d19d87050bf28320553a1993dc4f28184fe61aa9
+MISC metadata.xml 636 BLAKE2B b553bae226e80a85b8cb7c50d3017944e1b86a0085bef3b670db4628b8a03505e3e61a85ef3bb31c25e5585444266147b07a2598bd37bb31573909c17579d61c SHA512 6e5bf3f6f49a341d51de9e3988b9750fa2db80ad4236e845b97f51e10eb962fec6e08a4fee267f14b6783a3e6570ccd083e1bcce058876929bfac9173e69c007
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 88e5dd2b473f..bd0a7b37e402 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name='ipinfo'>Disable support for IP address lookups</flag>
-		<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
+		<flag name="ipinfo">Disable support for IP address lookups</flag>
+		<flag name="jansson">Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">traviscross/mtr</remote-id>
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 1d1e29e95efe..9585f4174cfe 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,3 +1,3 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
 EBUILD nagios-check_rbl-1.4.1.ebuild 1483 BLAKE2B 225aa6cbc698bdc7e6346195e896277dcd2f71730d28fdc4274b30573c41bbb7ec644d8f5804765fd93b71cd2f8e1b38643314498a761249b655648ad1587c26 SHA512 da8f812cec89631714719ad52fa7b065915b3e02568001e2bca277ee9a4556d74f8c6c1a6888a2ec13bc3d55cad9cce98af850e8cfddec1bd508da92047e2380
-MISC metadata.xml 468 BLAKE2B 31fa2c6ba1b1c2860f89c7f1442fb0388e7285183f28e9656576e8c13bbb05298a9bd13dc78ca9bcc1ce47401eb1c83d56786c1f37481e351d1d0e9b32713986 SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05
+MISC metadata.xml 468 BLAKE2B cd550f92e844ac739ba33635a2ca25b41f6b6dcf474b61d5eeea01316efab940df7658eb341b55353a0ffef3c98d8a309b5bf0d3cf0f38d19f83dfa472b76b85 SHA512 1d768e48e62cdf788db6c7444b491bf315344350d5a66a22a73387972cad68d11a233d273512610b7c514da9189e8827ce10dbe9322c7beb5aa8a393638987d6
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index 366e3f343c3c..3892f9c9031f 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 326d06dc1e0d..7929e7d29310 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -4,4 +4,4 @@ DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B b808540623055f3830a38ed79ffbe30fc8a24851624bd6bbd902df293683e6fac78291b6f59529eaab533ff041fe8d89ddd60c3be08d36210aebd823b2173098 SHA512 4733058532beef20606e4f8bf833ce6c4e0932ca69fdef01f25e45f1533004e720b5282045b32582543d52c020d043f59989a954afbea0697a1868951c766936
 EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d
-MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
+MISC metadata.xml 1466 BLAKE2B 07156e2e5f1c26f21a73f932a67896466982941457ee6606519debd1f8f46f3d19982a4a4673fd8aece52eeecc2d00925616097ae08b93eee1220aa00c12499e SHA512 eda3e037295b70633605411dd4400a1b0cf98c528394a79f2f4b999dd3c911a3a8b04be5f3aac85e59242ef29685d1f57b73d60dd65751efb23a489e56a4f5d6
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index 2837e2b7ed5c..f5fe80cb5437 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index a3931f1dd257..8c225a01e149 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -2,4 +2,4 @@ DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d37636
 DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
 EBUILD nagios-plugin-check_raid-4.0.10.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
 EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
-MISC metadata.xml 1134 BLAKE2B 10f73b789386776485af1240eaaa83aec0555ecb04ea91ab5d7ff26ae19be485935ed7460187f4e9b7e9eac64b848f555b92cdf00267696b8a224b2b71dbf0f3 SHA512 9cad7c98ce113e9cb7802e3d55514e8f9548378aa9cbd78e8c8513313eba1f0f1b3f3e25a596798295425edac638fedcae68459ac89767ac2254f5bdffe4ceba
+MISC metadata.xml 1134 BLAKE2B aca2fafdfea4d29d99185b09c4e701d6aacd8871d65ef50ea9b9eb4cc9c1c76c9bd70703307bfe1926816bb77319dcc28cf899333fe75a892e32e24467dded20 SHA512 d0bacddb2750f5da8a274d7d44669cfa83152419499fbf89f7abf1505d1f54249531967ec5cb2f95233fea3bf13dd61e276e9dfc4457ce290e86c6f9f6e07681
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
index 512cb3611534..eb65a158e80b 100644
--- a/net-analyzer/nagios-plugin-check_raid/metadata.xml
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -14,14 +14,14 @@
 		<remote-id type="github">glensc/nagios-plugin-check_raid</remote-id>
 	</upstream>
 	<use>
-		<flag name='3ware'>Support 3ware RAID controllers</flag>
-		<flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag>
-		<flag name='dmraid'>Support Device-Mapper RAID</flag>
-		<flag name='hpa'>Support HP Array controllers</flag>
-		<flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag>
-		<flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag>
-		<flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag>
-		<flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag>
-		<flag name='mpt'>Support LSI MPT Fusion controllers</flag>
+		<flag name="3ware">Support 3ware RAID controllers</flag>
+		<flag name="aacraid">Support Adaptec AAC-RAID controllers</flag>
+		<flag name="dmraid">Support Device-Mapper RAID</flag>
+		<flag name="hpa">Support HP Array controllers</flag>
+		<flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag>
+		<flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag>
+		<flag name="megaraid-scsi">Support LSI MegaRAID SCSI controllers</flag>
+		<flag name="mpt-sas2">Support LSI SAS-2 controllers</flag>
+		<flag name="mpt">Support LSI MPT Fusion controllers</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/nbwmon/Manifest b/net-analyzer/nbwmon/Manifest
index 715a07dafa1a..cbcbc44affdc 100644
--- a/net-analyzer/nbwmon/Manifest
+++ b/net-analyzer/nbwmon/Manifest
@@ -1,4 +1,4 @@
 AUX nbwmon-0.5.2-tinfo.patch 255 BLAKE2B a3a40d76839dd251e40c675dec838956fd6138b2aab3628be50b6d02bd73f8df368c8935f6a646487053732c162eb32da0d32b9cd88ca546f5bd76a063ff2505 SHA512 61db99488e577f202f88a724891f194998c416aa924f8d8a0874925bbda0ca360f606b1adfe4da2c3b0af955791ff3a83a4e21ddf3accdc452c5caf4e666c9a4
 DIST nbwmon-0.5.2.tar.gz 5807 BLAKE2B 09d4a195de209595dac04a53c2ca06874634515f816f8fc6c2e954b9e6bd55bd06745152e537b997fcc2bfdece987f1a0ec04785fe2205bf4102115a060c6ecd SHA512 11502015b8a04d8a65c2f06d9e921c193c2e4968dbbd781791c30f35a2cf1135bbf784280b9070670be2b58c4355bf7bdf631d5932ec3a01637db803a4c88bf4
-EBUILD nbwmon-0.5.2.ebuild 619 BLAKE2B 0412c0ceafe41a15e9ddeec14c4b781f040f41648ad34dfd2dbe5f8efe55ebb40a638af6ba336426ffb820dafa81a22aa824cf587c932db0bace51e05a49bc86 SHA512 34c42aa051ab388941c3840be87f599c55d4dafa98826cbdd1367f0a6142434d73aa93768a1cbd1df25170d05a5f0532f7d1f1011c4c338a224a6053828d4a2f
+EBUILD nbwmon-0.5.2.ebuild 587 BLAKE2B 4de04eba1c9e4aa27da5bf442e57eae51b4a50524462d9968b2d12691fe3fd541a72ef49f61c1ebf67a73737c496fb84617d6af858b87e53cda2f7bbac83907f SHA512 fb2beb7347962aab45b5fc6319793f6ff12c3d6c1bd544cb57f966987b2422758bc38b6127c633521b7b3062cbf13d0734c84d1be5b68fbc48396af015e6a9ed
 MISC metadata.xml 359 BLAKE2B 572d49dc74dab409831a8fa9d5a93e2bb8de61aafc8bf07380dd0fe5861567ce686db4297868102f4d243a92c2cebc7bdb2d4e19a0d6c39e973c4844be8a19ac SHA512 9f6270f390dd2649e7aae19239e590eb9e50ac34db36537de76cb2d01adbcc2afc0ad2983f8dcd0ca5d21d289c1b9e29e85f4d34f80fa625c57ee67833d82bed
diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
index f2c7742f396c..613256373c42 100644
--- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
+++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses bandwidth monitor"
-HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon"
+HOMEPAGE="https://github.com/causes-/nbwmon"
 SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="
-	sys-libs/ncurses
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch
+	default
 	tc-export CC PKG_CONFIG
 }
 
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index d2ddbbecadcf..3e7d33c4b90e 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee
 DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
-EBUILD netcat-110-r9.ebuild 1612 BLAKE2B 8cdcf8bd576edd3587c959ddb1278be99b6925abc4fa23e3de527dd8ffd6b46aa4b709e89fcea9957704557e13824d6414054ac1bf50a150f55c86a373948f4d SHA512 777acc5d9a681eccf49e2d6c109df9b5d63d03436abf834dfc0d6072a2a51b716bc5db0dacebde1976b6da9900f5452cbf0b11941495df10f03cd07be125606e
-EBUILD netcat-110.20180111.ebuild 1261 BLAKE2B 71eb1b57311795dec1a37e7d3804587534860f7da5408507cd88296cc2b3488dd9543a7693421734d6f5aafc0e18722d245528fcc1ace0d5e6176ae7f3c57912 SHA512 92f7ade32cc5111109acd0374a80dea4ddee1aa65112c7ed6fe340f97e3dba23b91e8f241db62c546683ac4afdb9c8a63dea9b798ad0217551c03014537b22cd
+EBUILD netcat-110-r9.ebuild 1660 BLAKE2B c586d3452b9198abf0b9bac20c57043c24f8d4f047413a299d05a78a64774ec547b602fe361913c523bfbf4ad1c774adb8e53d6a5aeb4691649b15873e0c3b60 SHA512 30d2b453a73abcca44b89af888be7ce20f3e9de604d8a397863fdc86944b19506dba652100c6d8d70918b0f5bdca2afdf1a7ddf7a4eb882c96454293cb51df6a
+EBUILD netcat-110.20180111-r1.ebuild 1305 BLAKE2B f5ec48c7a74e96aa8bfa573c36ef8005f24e372bee6d99a4ffbca1bee1cb5015537de4f0684aee3da455c27213e94221926d0b5bf6e27b29dea71faacda6205c SHA512 c4cc71297385a9ce34fac4f4529570a49fa16cd30150e282c26ce3920de9a3a4e85b63afcd78124f44566ed7af4386124febd47344a6283a4a7ec7150f58b441
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 78f65ab4a9e0..2653de68f200 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 PATCH_VER="1.0"
 MY_P=nc${PV}
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
+DESCRIPTION="The network swiss army knife"
+HOMEPAGE="https://nc110.sourceforge.io"
 SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
 	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+"
+S="${WORKDIR}"
 
 LICENSE="netcat"
 SLOT="0"
@@ -20,26 +22,46 @@ IUSE="crypt ipv6 static"
 
 LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
 
 src_prepare() {
-	epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
+	default
+
+	eapply "${WORKDIR}"/nc-v6-20000918.patch
+
 	sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
-	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c
+	# bug 34250
+	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die
+	fi
 }
 
 src_compile() {
 	export XLIBS=""
 	export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE"
-	use ipv6 && XFLAGS="${XFLAGS} -DINET6"
-	use static && export STATIC="-static"
-	use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
-	[[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
+
+	if use ipv6 ; then
+		XFLAGS+=" -DINET6"
+	fi
+
+	if use static ; then
+		export STATIC="-static"
+	fi
+
+	if use crypt ; then
+		XFLAGS+=" -DAESCRYPT"
+		XLIBS+=" -lmix"
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		XLIBS+=" -lnsl -lsocket"
+	fi
+
 	emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
 }
 
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index fe1f70df7679..5127d1c620fd 100644
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
 MY_P="nc${PV}"
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
+DESCRIPTION="The network swiss army knife"
+HOMEPAGE="https://nc110.sourceforge.io"
 SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
 
 LICENSE="netcat"
@@ -15,19 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
-S=${WORKDIR}/nc110
+S="${WORKDIR}/nc110"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/#define HAVE_BIND/s:#define:#undef:' \
 		-e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
 		netcat.c || die
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die
+	fi
 }
 
 src_configure() {
-	use ipv6 || sed -i '/#define INET6/d' generic.h
+	if ! use ipv6; then
+		sed -i '/#define INET6/d' generic.h || die
+	fi
 	append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
 }
 
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index f3775c6781a7..9e80f3936569 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,5 +1,3 @@
-DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908
 DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f
-EBUILD nethogs-0.8.5-r1.ebuild 706 BLAKE2B 4d5958912d3128b15899ab0f72ea4363acffed6bf16316cf61a4331b97f0eb6b9741d912897d375026650d78a9c390e332f2ad12b78a8506fff27cf2ef30ab5b SHA512 aa90d744970ff58ddda6ae28807b3295d644790d580aac44ae137f838e712608b3697ff2cb0a39a34b81c269a653ffa0b98b20ea7bdad31ebef9834925ee950e
-EBUILD nethogs-0.8.6.ebuild 696 BLAKE2B 9855a6a15c52845be2fa5394801f1a51fafc576ac8261b21fdedc6bb7408d636c6a65d2913c7acdf24466fa0230af39a1eae313895fc8d1e8b857640c9059373 SHA512 46adcf47a6d972158092f47dddfe70065b1577adeb40ee1ebd6ecd9877e02b274fa30445bfa7812a72f67045ace0b35905686ec9004fba0cad908d6bf4a1db83
+EBUILD nethogs-0.8.6-r1.ebuild 788 BLAKE2B 2652b7396e85249512babfeefaef816588ad0b50f4eb51091202c17f3f54ed6a0885b545d45517c427c942757d6d4953880b92870145ca3c53c88930a9456df5 SHA512 fa07e0fcd9e8e3252a431611970b52c8831234b2915992e3eb7401d29875cebf820aea290f5768c79317e01af588739c6ba6e7fcf46ea271b2b93d0eb4e04b0b
 MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
deleted file mode 100644
index ac684149d33f..000000000000
--- a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-HOMEPAGE="https://github.com/raboof/nethogs"
-SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC CXX
-	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	dodoc Changelog DESIGN README.decpcap.txt README.md
-}
diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
index bef9dec145fd..e0f115871a58 100644
--- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit fcaps toolchain-funcs
 
 DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
 HOMEPAGE="https://github.com/raboof/nethogs"
@@ -13,21 +13,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 x86"
 
+DOCS=( DESIGN README.decpcap.txt README.md )
+
 RDEPEND="
 	net-libs/libpcap
 	sys-libs/ncurses:0=
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
+FILECAPS=(
+	cap_net_admin,cap_net_raw usr/sbin/nethogs
+)
+
 src_compile() {
 	tc-export CC CXX
-	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" "${PN}"
 }
 
 src_install() {
 	emake DESTDIR="${ED}" PREFIX="/usr" install
-	dodoc DESIGN README.decpcap.txt README.md
+	einstalldocs
 }
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index edf1f633667d..e3af11fcc873 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,6 +1,3 @@
-AUX netio-1.26-linux-include.patch 195 BLAKE2B 4f6837a9194692658f82f50e3d3a59b4f815af2a0d32ec5d24f09c14e06cbf93a2f09e8d149dd9e65c58b41cc2bb55ff0beeb9c701304c37f6d1f95639678aca SHA512 719f65026c4d14b2f2252a9ca917fe7b46a1788d0ee84c763313f0e40fed7027c7e6d73de298735c05160f2ce0f08c8f5a49503369d3cd80d8ea26ce6c82263d
-DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232
 DIST netio133.zip 235931 BLAKE2B e664700b5991e38ad056333b13ba6ec40efd2a9a496dd9235ad40482b281f21ca54f49e037a0155d3ca0b1d77bd54330462d08abe5f809c6ee337b672c979995 SHA512 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232
-EBUILD netio-1.32-r1.ebuild 908 BLAKE2B 6848f05e30ee341f3ac22754679a43a25312de4baa95560ead9cd0772524d4c176d68fdad39d163f2ae24947eabc30a261738d0b1710eea41306e2fa341a2d66 SHA512 5b07d36442551b989469ec86d6c51678d780363ebf6ee9803e5ce1a09e06d1e731548c2c78f32c411c662bee15c0dfe35d11bdaeff9909efd762384eece0ff3c
 EBUILD netio-1.33.ebuild 811 BLAKE2B 35ea68531bbb37a529f736c481beb889759a529134bf59fe71ce3dc2db899c47d2658aaeeb8c4dc2f3583db0c1557a8308e6103ca10a046c3846223e622c52ee SHA512 1929b0356d9e9c67877f95e812b5773322ef6609a017199aee3317c59ec30f834af82ee2294ca2d7d60f370eb832f68b0fe274a9a2cb7cdb23d5ae5a02f866fc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch
deleted file mode 100644
index 591cae323842..000000000000
--- a/net-analyzer/netio/files/netio-1.26-linux-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/netio.c
-+++ b/netio.c
-@@ -199,6 +199,7 @@
- #include <sys/time.h>
- #include <time.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <netdb.h>
- 
- #define psock_errno(x) perror(x)
diff --git a/net-analyzer/netio/netio-1.32-r1.ebuild b/net-analyzer/netio/netio-1.32-r1.ebuild
deleted file mode 100644
index a2016af62465..000000000000
--- a/net-analyzer/netio/netio-1.32-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="measures net throughput with NetBIOS and TCP/IP protocols"
-HOMEPAGE="https://web.ars.de/netio/"
-SRC_URI="http://web.ars.de/wp-content/uploads/2017/04/${PN}${PV/./}.zip"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-RESTRICT="mirror" # bug #391789 comment #1
-
-DEPEND="
-	app-arch/unzip
-	>=sys-apps/sed-4
-"
-
-S="${WORKDIR}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26-linux-include.patch
-)
-
-src_prepare() {
-	edos2unix *.c *.h *.doc
-
-	default
-
-	sed -i \
-		-e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \
-		-e 's|\(CC\)=|\1?=|g' \
-		-e 's|\(CFLAGS\)=|\1+=|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		linux
-}
-
-src_install() {
-	dobin netio
-	dodoc netio.doc
-}
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index e8ddf803d59f..52aec3b3d6f0 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -3,5 +3,6 @@ AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
 EBUILD netselect-0.4-r1.ebuild 958 BLAKE2B de3233fbf07f2fb59d4361deb7fe16bb6355817f509b765a68a3e2c626b2ba66ee7a798e6fd4d31d044f04854888af9ca17e46dad1b6f2d0eeadf1375accf2a0 SHA512 54d574ba626ef2f7c23348d58ba8863cd504854e06a0bd230dee0de2983a0b93f07f7738e2428859cf2332a787645f09e87241861be68dc07191b2c0231165cd
-EBUILD netselect-9999.ebuild 899 BLAKE2B 3ba6abea554f5c72ebab839ae1649c326a6bb76483dad1ca9f4731637a77fb75ff71746e0560cbb0140921f90e1aeecc85b9f1b3ba18aba85e68fb7a5cf7342c SHA512 3eb340cc66a031be74b83bb77d78fd80f77eadb8c8dd3394987e8651a70f78d008d497a78ed3e7725b88deb08b301df705e06e5fea3a90d3ca8d38bfd403e66f
+EBUILD netselect-0.4-r2.ebuild 1204 BLAKE2B 996310fb895d32a007b1008c84953a68a281f424685865d5996fbae678a0950b87ef957c191d139e80b59c9cd78d5bacca15fbd93404287b07f060f298f3fe40 SHA512 06bedc8708ced787284f8f092d982b2c7c9d1683069307df73867d2ba868f27222f1fd1bbe7d55d965145a813a530eb8beb6c32eea00ba957232a558e57c9ca6
+EBUILD netselect-9999.ebuild 1144 BLAKE2B 56afffb99197144cfa811f79b15bcff52992ea6bb539e4eb51a7fc45330f5662476c9ddb14db54e2ebe868ea32ddf0c319eb8b6514dce089b0ef23f6586f32f3 SHA512 5478562b06da2080c5aebecaa267318afa19abd5b2dae30db2ccff0d329e8e0ecf55d548d1b4eb878cd35592f715154f6d958cf080bbfa91f9fb31d9c44e0bb9
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
new file mode 100644
index 000000000000..c0eb61494801
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="
+	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
+	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-bsd.patch
+	"${FILESDIR}"/${PN}-0.4-flags.patch
+)
+
+DOCS=( HISTORY README )
+
+FILECAPS=( -g wheel cap_net_raw usr/bin/netselect )
+
+src_prepare() {
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
+
+	default
+
+	# Don't warn about "root privileges required" when running as
+	# an unprivileged user with filecaps
+	if ! use prefix && use filecaps; then
+		sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin netselect
+
+	einstalldocs
+
+	doman netselect.1
+}
+
+pkg_postinst() {
+	! use prefix && fcaps_pkg_postinst
+}
diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild
index c41a3b0d656e..7fee270c477b 100644
--- a/net-analyzer/netselect/netselect-9999.ebuild
+++ b/net-analyzer/netselect/netselect-9999.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+
+inherit fcaps git-r3 toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
-EGIT_REPO_URI="
-	https://github.com/apenwarr/${PN}
-"
-SRC_URI="
-	ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )
-"
+EGIT_REPO_URI="https://github.com/apenwarr/${PN}"
+SRC_URI="ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="ipv6"
 
 PATCHES=(
@@ -23,15 +20,25 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4-flags.patch
 )
 
+DOCS=( HISTORY README )
+
+FILECAPS=( -g wheel cap_net_raw usr/bin/netselect )
+
 src_unpack() {
 	use ipv6 && unpack ${A}
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	use ipv6 && PATCHES+=( "${WORKDIR}"/${PN}-0.4-ipv6.patch )
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
 
 	default
+
+	# Don't warn about "root privileges required" when running as
+	# an unprivileged user with filecaps
+	if ! use prefix && use filecaps; then
+		sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die
+	fi
 }
 
 src_compile() {
@@ -41,12 +48,11 @@ src_compile() {
 src_install() {
 	dobin netselect
 
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-
-	dodoc HISTORY README
+	einstalldocs
 
 	doman netselect.1
 }
+
+pkg_postinst() {
+	! use prefix && fcaps_pkg_postinst
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index e1f87d0cbe04..6cf66145f33c 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,9 +1,12 @@
+AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
+AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
+AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425
 DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e
-DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137
 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34
+DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
 EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035
-EBUILD nfdump-1.6.20.ebuild 1392 BLAKE2B f9d43b2f41c5c901255e06c391eff327bf2b56bf9af02add91e22ad8a935c682e6e332b252be90dfa9564971f59d908c37ea532b36a08ac7df09106b9ea41218 SHA512 5da3069596339dd040c1573a65b538e1cedc75d30420e84cf0864474a391e5a19a6914a2dafa8f7f4024b491c84799a926bd9b4f4d31cd7fff57788e822b2f9f
-EBUILD nfdump-1.6.21.ebuild 1469 BLAKE2B 932f15a9e9c9b136868fb6365c6fb0933ca081c25787712c50d08c4b49f3d3e90990c3879f7f3883d27b8b37de4e1d1f127b44597cf458ee71c6b6c809e7efa1 SHA512 7a2e14a66f05d516fe6cbdaf2e337ca1b57afb24ea33f583ad1a744b3a6dd3136914a7b41a6dc00b2321aa791989e0024fab6c0fbc25268db5ab1f0ad1eedc47
-MISC metadata.xml 802 BLAKE2B 97d927528f0f645840ea163060c8b3a2f43cd27f6687e5dd1fa9b9fe5b5bb1e3115463b744df4ac4151bcd82e8b6ee3849c5e130e09ed66b14bc16c9aea48f26 SHA512 7549ba2155e5bcb972147b1daf0cb2c44619b4ca13455893bba269c560149c40d17d04bc66ce2c5dc94165ff65e9f97980c4eed7a7d7bb47723a03db6c144bb1
+EBUILD nfdump-1.6.21-r1.ebuild 1536 BLAKE2B 6174400853f6e976b9092b99610ef4b7795e1edad71b43b1a302390fdf94767d8616342ecd055278d329cc5f9a81ca1dca908a1720b34842bb159feff986b75c SHA512 f75118237418884d494e4c3ad3e6accef30a004c4688c2b2b303776fc0ec59459e4ca8e7918682dea7787706758481e9b1bb997a8cfdf5f2ed9c2574de874c80
+EBUILD nfdump-1.6.22-r1.ebuild 1682 BLAKE2B f55767f172e9d8dc112079f2a3aef7df3ed9f824c19438ee2c33634fd7882f3b3ca154c9de7aad3b04a922f87efcf0034c55b45a6a76c293778b50ea90591219 SHA512 fb4438500d299741164ca77004db9bb8bfed3a4a16225b8e835870b5fa8f8a76523f4b091dda393742c8e905899aad3a3e73dc27c569cb97faa98b591450b605
+MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089
diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd
new file mode 100644
index 000000000000..28ea35fd0741
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfcapd.confd
@@ -0,0 +1,11 @@
+#shellcheck shell=sh
+#shellcheck disable=SC2034
+
+#port number to listen on
+#PORT="2055"
+
+#maximum size of collected files
+#MAX_SIZE="1G"
+
+#enable sending of all received packets to specified address
+#REPEAT_TO="192.168.1.1/60062"
diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd
new file mode 100644
index 000000000000..98d388cb710f
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfcapd.initd
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+#shellcheck shell=sh
+
+IDENT="${RC_SVCNAME#*.}"
+PIDFILE="/run/nfcapd/${IDENT}.pid"
+USER="nfcapd"
+GROUP="nfcapd"
+
+ssd_start(){
+	if [ -n "${MAX_SIZE}" ]; then
+		set -- "$@" -e
+	fi
+	if [ -n "${PORT}" ]; then
+		set -- "$@" -p "${PORT}"
+	fi
+	if [ -n "${REPEAT_TO}" ]; then
+		set -- "$@" -R "${REPEAT_TO}"
+	fi
+	start-stop-daemon "$@"
+}
+
+checkconfig() {
+	if [ "${IDENT}" = "${RC_SVCNAME}" ]; then
+		eerror "You have to create an init script for each ident:"
+		eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident"
+		return 1
+	fi
+}
+
+depend() {
+	need net
+}
+
+start() {
+	checkconfig || return 1
+
+	checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd
+	checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}"
+
+	if [ -n "${MAX_SIZE}" ]; then
+		nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \
+			> /dev/null 2>&1
+		chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}"
+	fi
+
+	ebegin "Starting ${RC_SVCNAME}"
+	ssd_start --start --quiet --exec /usr/bin/nfcapd \
+		--pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \
+		-g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/nfcapd \
+		--pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
new file mode 100644
index 000000000000..a36af2242d42
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
@@ -0,0 +1,49 @@
+From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Sat, 8 Aug 2020 16:46:04 +0200
+Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011
+
+---
+ ChangeLog   | 3 +++
+ bin/ipfix.c | 3 ---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a0b2b67..8b92e58 100755
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++2020-08-02
++- Re-address issue #231 - remove strict rule rfc 7011
++
+ 2020-08-02
+ - Release 1.6.21
+ - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification
+diff --git a/bin/ipfix.c b/bin/ipfix.c
+index a730a8b..19c9d63 100644
+--- a/bin/ipfix.c
++++ b/bin/ipfix.c
+@@ -158,7 +158,6 @@ typedef struct exporterDomain_s {
+ 
+ 	// exporter information
+ 	exporter_info_record_t info;
+-	in_port_t	port;				// follow rfc 7011 - matching src port
+ 
+ 	uint64_t	packets;			// number of packets sent by this exporter
+ 	uint64_t	flows;				// number of flow records sent by this exporter
+@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
+ 
+ 	while ( *e ) {
+ 		if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && 
+-			 (*e)->port == fs->port &&
+ 			 (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) 
+ 			return *e;
+ 		e = &((*e)->next);
+@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
+ 	(*e)->info.header.size  = sizeof(exporter_info_record_t);
+ 	(*e)->info.id 			= ObservationDomain;
+ 	(*e)->info.ip			= fs->ip;
+-	(*e)->port				= fs->port;
+ 	(*e)->info.sa_family	= fs->sa_family;
+ 	(*e)->info.version 		= 10;
+ 	(*e)->info.sysid	 	= 0;
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index f785b8973856..f9f3c305c35a 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -6,12 +6,18 @@
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
   <use>
-    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
     <flag name="ftconv">Build the flow-tools to nfdump converter</flag>
+    <flag name="jnat">Build nfudmp to support JunOS NAT event logging</flag>
+    <flag name="nfpcapd">Build nfpcapd collector to create netflow data from precollected pcap traffic</flag>
     <flag name="nfprofile">Build nfprofile used by NfSen</flag>
     <flag name="nftrack">Build nfprofile used by PortTracker</flag>
+    <flag name="nsel">Build nfudmp to support NSEL/NEL event data</flag>
+    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
     <flag name="sflow">Build sflow collector sfcpad</flag>
   </use>
+  <longdescription>nfdump is a toolset to collect and process netflow and sflow
+    data, sent from netflow/sflow compatible devices. The toolset supports
+    netflow v1, v5/v7,v9,IPFIX and SFLOW.</longdescription>
   <upstream>
     <remote-id type="sourceforge">nfdump</remote-id>
     <remote-id type="github">phaag/nfdump</remote-id>
diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
index 4c59fb92baec..f6000c763cbd 100644
--- a/net-analyzer/nfdump/nfdump-1.6.21.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,9 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+	"${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch
 )
+
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
diff --git a/net-analyzer/nfdump/nfdump-1.6.20.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
index d866f89da5b1..67db70201342 100644
--- a/net-analyzer/nfdump/nfdump-1.6.20.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A set of tools to collect and process netflow data"
@@ -9,32 +10,36 @@ 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/1.6.15"
+SLOT="0/1.6.22"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
+	static-libs"
+REQUIRED_USE="?? ( jnat nsel )"
 
-COMMON_DEPEND="
+RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
 	nfprofile? ( net-analyzer/rrdtool )
 	nftrack? ( net-analyzer/rrdtool )
 	readpcap? ( net-libs/libpcap )
 "
-DEPEND="
-	${COMMON_DEPEND}
-	app-doc/doxygen
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
 "
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
 )
+
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
@@ -42,22 +47,35 @@ src_prepare() {
 
 	eautoreconf
 
-	doxygen -u doc/Doxyfile.in || die
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
 }
 
 src_configure() {
 	# --without-ftconf is not handled well #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) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 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/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 4d8abde1e0d8..6500597b17c3 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,4 +1,4 @@
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
-MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
+MISC metadata.xml 699 BLAKE2B a0c81b2cce47cc8c15bc81f24b3f85bac0bb6e33c1bad000946fe66f1508e32e5f314410255d0b0f43c7ec662d339f3b3c0c5e56e4bedc3ea5c311071ca01ee4 SHA512 4967443bea3dc14cbf9bf4fd7d10842adb49b9ed61c1a09e622983beb078e14acff01f7d2f4aaa8933a89dffac6b679976e09b6399dafe05dde9678404dd0ccc
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index a8fcd8f42981..58a7ef6e625d 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jpr5+gentoo@darkridge.com</email>
 		<name>Jordan Ritter</name>
 		<description>Program author who would like to be notified of bugs</description>
@@ -10,7 +10,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 995a5f17a770..dc34ea3c4328 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -2,4 +2,4 @@ DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005
 DIST nikto-2.1.6_p20210304.tar.gz 521719 BLAKE2B 66715e109dfb47bb5ed6b64cfff4dbdd0667883e5ce28c26a7325645fe42ccfdcb6f9bcf956adce6f626c51ff363122724955eda86c715d4f8ec4894ebf1ae4a SHA512 d78cedad0b2f96d02964097699d5765fdb895b7ec1a9e196cbf9181888dd19cfca7d912f172a870e4b8bd2b53e4fc41407a60ed129ef24592909ef6111d04a0e
 EBUILD nikto-2.1.6_p20200901.ebuild 1101 BLAKE2B e1a67234ccdb86ba5f58bf6a7e639d7d7a838066f422333c75c91ff724805f5bf5c364ad70f51aa411e7927435644feb68fb45b8909a06e993ef38503a3b8cd0 SHA512 69a4b4ac1a8a07d13975999b46cc43ca768fe44d8c2c6af27187aa1f3e0ac7c8f457c52ff6d6956238096369422cb476e7e4cac51b9d49061314f25293d2e8a9
 EBUILD nikto-2.1.6_p20210304.ebuild 1101 BLAKE2B 0a6e63c0bff031c54951ada0f3569a8deaa8237cfaac8409ea53bc487ec96c91841e0bc4d4b4758425adbbe86e3ac9ee727ea4629dd6dc2abaf18d6733aec4ef SHA512 bcfa7414aac47ba18bbbdfa196067740a6d998bda53f7547c5e9d8360b17f2beff7462520282382c12ad410b787b4a1400de60b6a64242cd5290e8b2df09a5f9
-MISC metadata.xml 368 BLAKE2B 1b830b9fc3837ed7b4706a646f08e1edb316c264b82232740467c341b54c14d49d4dd936d8c24c32256f3235dde2ee5ebbdfadb0fb117136d5e49af353590fab SHA512 2f1a7954d7f6360a4b83f22933cb45e800ab2fc7a7725569736fcc4e64d3d3603dcc64a0ebe888ebb824a51fef81d7220599f525a8e316df762e874ccbd51efd
+MISC metadata.xml 398 BLAKE2B 0872759a8246728c23897d1d12b8d45e7b4a2cdaffade7a7fe83ec0cc85932362b9f1b8460250c2f8024d383d609ec2c8ef117c6e8d53018390b76309d5f84ac SHA512 6b4316347f0cf34571660a66bc2a7773000a5edde9b1f8d9c900d56c88b129b5b78b5385bc3a7833a0ae10e6df7f1b8ef87b6daaa06087bb3382b3ed5c3992a7
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
index 91f5940d4d0a..9bdfae85502c 100644
--- a/net-analyzer/nikto/metadata.xml
+++ b/net-analyzer/nikto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index a0fa7c60e2c0..a68c5c282a23 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -3,4 +3,4 @@ AUX nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch 2166 BLAKE2B f2c5ba5
 AUX nload-0.7.4-tinfo.patch 264 BLAKE2B aa77538dd412c4956d61449e9c6494de70d42208d806e103a18d12e12751d7619483bb13dab1934b076e5aaf7ea7d3368c9a5b9403340dab7f03c5a0430b3bb0 SHA512 1191ef64ab895402a54d05e4b119627ddc6db884f8385493bf00c030d1c82b88fa77973e3d6ea0bf2e5e7211dc07ddec7d95e426a60d99f216b23b683fd8a83e
 DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af
 EBUILD nload-0.7.4-r1.ebuild 793 BLAKE2B 5d8ea1b075e9dc4a8a9a6cd96b73aab3d39fa357a18c50176bef28e4ed3faeeb446532baeaaa82653bf4ce91c9bb4c089e4841ea4a5b016c7eeed3448a21080d SHA512 769c1c492c1986127ab5201d7686e3144361d69de3c7eb36affb8c2338819fcb1e9bb25e470f7f9577c9010a106c17de20e957cbb0def5aea562b91ea34aa0c9
-MISC metadata.xml 519 BLAKE2B 702f635b7c32996b4ce0dec2ab92b1fac1c8ccf196f8d0b70c877acc6c655bab342ccd633db3a8482832f18551c6c168ae46c8b7325520e9e49fed0580b2de69 SHA512 c80b5274a23376f9b3b78d2141c25310f06a5ba4764ddbe81cc539c0ebab04d536722205df8df04bd335958b25a5aa961ece41eaa89d8bab9a9a1880fb3302c6
+MISC metadata.xml 549 BLAKE2B 19e36d13fd29e0c9f88bc8af72ab2b587f43e6b47833fff74be43d99b70720ba1759c6553faa6f70a3292fb6d18e17ea314c9a8375a169cfdd77f4fba76b3156 SHA512 2704a1e16bfda3b3e05ddbc6768ecd5ed06452971239babc2f3a43ee4e0ca0fa8cbff8c445c2a5a6681f1535c610c5dfe71e20c88d76adc3978fc96a61fe75f7
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index 8e9e21d02085..faf73c253e54 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ahippo@yandex.ru</email>
     <name>Andrey Mazo</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>netmon@gentoo.org</email>
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index fe7e12d281d4..5095364f0639 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -10,4 +10,4 @@ DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da
 DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9
 EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3
 EBUILD ntopng-4.0.ebuild 1916 BLAKE2B d288cc2f2b096a377a00a8814541e79a5328589f43963e118ccfd42c938fca1a7c684b769a81b2753ee2ab9c6431ee425d4d190444767a4b9059ceb6ebb64278 SHA512 37d3c01d11f761d2baec2047e52186a96ba7157cd11857eb7c1198bd6952994e6f1c37d12a20718d4319ac4b294a65dbb2bb96b3c7da0bc351d929769fc1e118
-MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73
+MISC metadata.xml 294 BLAKE2B 81c505fe10f4b55e7a2bf6a01959efd75f9a8bea62afa2ff31f036ef3d999ad6f88d8c4fa7ccbc1852c51c63354cf02cb023a562997f06b8b58699d76bb6761b SHA512 e98be1164a275f023b7f96d6ca2c37fa44733b776c39a2e45839e60881b3ce5bd2f81dd50af97340afcaaa0da0bcc32e144f72e968b1a7e6c06755ea9eb471ac
diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index f31113c67cca..c7555fbc28ad 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
   <upstream>
diff --git a/net-analyzer/nuttcp/Manifest b/net-analyzer/nuttcp/Manifest
index 3935f8707154..8973a680bb00 100644
--- a/net-analyzer/nuttcp/Manifest
+++ b/net-analyzer/nuttcp/Manifest
@@ -3,4 +3,4 @@ AUX nuttcp.confd 174 BLAKE2B 8ca9f6f9abc473e232f650bacb989e4d3a0a3d9e40f239a70e5
 AUX nuttcp.initd 328 BLAKE2B 823ea8ad721e66ad26a5a1d2f43f098721fc36146524ecd3e02185b3da3bb83bad11f20eaed285da8a00289afd27d3bbc01f461e348086c8903c6f3b14d9b598 SHA512 29bf5e158955238a4579e60ae81b47e34ca620c2c69ab41667c35f626993f8c6adfb88c9f7a484551b95f1fe1c7aadb4903c951a30114ba38dc963b614b19ecd
 DIST nuttcp-8.1.4.tar.bz2 13063356 BLAKE2B 374b76bed06615bf5966df5864c8987d5e8336eedd7450ccfef164e575f58ce2a22dbc1e0327e7740799560c30a03f9423d3fd50579fa01cd638059485c7f61b SHA512 ba6ff33bc1790c92f47d760d4588b128f60f0ca09ed43d95fd10b0edfb636a493b0d26b195e688a13b5b79fafc1cc52a0c73455263f921ff8ad0cf087f1d937b
 EBUILD nuttcp-8.1.4.ebuild 1456 BLAKE2B fe278b37f5b923b27365f2f979eaae2f00324ea7b40dfa5f7f9c617546bd8f6ff0293099ff6852dcdad489ce46b8c1bce07c36c3878bec18307bc2474b9f1d1b SHA512 4726a56012dae0e6c46e012b3842bd199c31e29f7eee49c839ae2b475e44e71dab417ea3ea4b44716fe24e2409226dd12341d645f0fad45819bbc145d7e6841f
-MISC metadata.xml 915 BLAKE2B 2011a0921d4de0ce5f7d30cc149751aed2120364b7c74763970b86d67f49eebb4b1ace092fbb6a1f6583ce2b6af75db36c02355a4d74f8724c693b0d5535d825 SHA512 6e3db2f2b940e1ebff18f0bafdab669a9e67c29f4845b171c4cedd50923e5ff5e22839a4c328bf7b8f55d7ee6c5da827f48035816d7e58dda384fec9bee1c59d
+MISC metadata.xml 945 BLAKE2B 44ca8e77405ed9611f2dae93e0d9e33c3d80bc7e703b41141cccd002dad4633aa5e9f0debb9f25c814331841cf00e9132dc8834e9e15e1d0a0d15a8bf0f46041 SHA512 fdc6139fa15c466fed9309ee7e97a00915f9d7c23c34a7a3adade30e87c7288a8f89ae505ad5e4365e14d9afc4998e19492b33337733171ea8b7fadf302497fc
diff --git a/net-analyzer/nuttcp/metadata.xml b/net-analyzer/nuttcp/metadata.xml
index 66e11db82cfd..9466b4e49fb1 100644
--- a/net-analyzer/nuttcp/metadata.xml
+++ b/net-analyzer/nuttcp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 06591685c679..3a3a9bf45c15 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -12,4 +12,4 @@ DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36
 DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571
 EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86
 EBUILD openvas-scanner-7.0.1.ebuild 2640 BLAKE2B f57aed40f1d1dbff974bb10678efd83217e80fe0f8338ff03f1d734db902756ceba435a31b89179b6cb991e0375359c6deccf306aa6f186ced2c7a78ba782918 SHA512 9e129a64e6da6772ac32dfd431fff961252474162fb07cd8d3c9974c0437c9558c83e6cc122b3938b2b31b154b9aa54e225292d659e7fb2bc1605afaf2208357
-MISC metadata.xml 943 BLAKE2B 30afdfefaa60083a3444265990b72e282b8b87167a73f746b3a2f7d5aabe868d9e19864c1bb20f6c9c357f629c3d2829aadcf0096387634868717572dc5fc588 SHA512 f43cf9fdd9062758de6f9ac173d287946226780b57857ee0679687464bf38fb3964765a6a56b1e634a536cf4203ed55933bff8a2088ff4e1e65ab09b2cb8cb65
+MISC metadata.xml 973 BLAKE2B 390941ba04f59d58c28c94dbe8ba603019aa521050188c0bcdfbca46d6fd37d30930ad19393012dfd3c7d4cd4d06417e6d0e031b4c09d73fb9e785967edbf3e4 SHA512 2e5084edcb10d541a916c971d4182cd2c6609fc56ecf26197b1a5c1ec5523dc8f60c6f3c686f42f91ae90344d11ecc55b2bea7f01f28b46add830361ef60c894
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 932077da95e5..7e35c8db9689 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 507d919cb60f..8ae435a16fbc 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -5,4 +5,4 @@ AUX ospd.conf 189 BLAKE2B 7b4e2941b25cbbd4b7d5f913526977c5663640d4b5c208cd48b95b
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
 DIST ospd-openvas-1.0.1.tar.gz 50455 BLAKE2B 06a4cdcc2f51351215fffa5517cb2cae620b9b7ffded738d3c63bda11fa8572fe93e0b5fc1c8c9a1bd27cbea65641b0586c329d1d05a022e1fba79c8782d091c SHA512 bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87
 EBUILD ospd-openvas-1.0.1.ebuild 1109 BLAKE2B 0a734229297237cd501c2656150904e5078116f21ab107d591deb505ed54a7163f916bf3b6a8e958e433390a221570043fcc7b237285f5ea88537692b7186fa6 SHA512 740c37c6ec7f0380e18fc506c170f2edb56247f55bfa975be6e14995ebefd25d0ddcd1e281e7ec4a2d777107fc6cbd50db706afd6d90c850f504690c8a3ac90e
-MISC metadata.xml 695 BLAKE2B 6f7c40458fe05cfe7a4ec7adfc34666c88d225097429f942c3a89842e3b6259a10c5b630a7d993a996b636c674d35237fd7fd1e9d4ea5a5dcf8afe31a27faa34 SHA512 03cd8af210753e2cb74e9e50cb94f6fb66a46e71eb58948bdd575be453e5c239dd26d4c1b42582a9d7f838f3e64c9ad980f9489260aa15de25eb919df697546f
+MISC metadata.xml 725 BLAKE2B 13051c0bdbf286d450777e2e5d4eac7a37617e06bfc856703d111aa29da211332a8601ca1d516f6efc88992df91c33a6c90ac037580d2f1046e4954c5bd35624 SHA512 0693f8d596cc116807b49c0238dc8568d2a1327df0e259bc6085aac23455eda9a299f53840c38708bef673c62c5df2e5be21d17d6d2e4935184c37e5bf432c5d
diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml
index d46922d749f9..3aa1c5136cb4 100644
--- a/net-analyzer/ospd-openvas/metadata.xml
+++ b/net-analyzer/ospd-openvas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index ec030e2a3548..9e97cd9d290e 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,3 +1,3 @@
 DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a
 EBUILD ospd-2.0.1.ebuild 753 BLAKE2B 15b7d6b44a51e4b60f61e198bbe35a4b144a05118ae7ab8dad6eef86af30c86931cd0c4f12015fb1ec0de8494a68ac59970ee0b8122875f91ab8073847ee6de1 SHA512 df7cc56f0c2c32efa25c87c9a6f2914a5a100eda406f145276af2a95a9aadf3aaf280bb6d63e12f921dc2433f84d85776b4706958fd188f9f443aabc8210b98d
-MISC metadata.xml 871 BLAKE2B 6f143ae78bda1d5880f975d8c722fd00da73bf048647e87ff28a7d131f98bf728fbc0d7f15a4bf58e0910ff33c5e14eccc94df930e8813ff7c1c6bb47aaaada2 SHA512 288d246b941a2ad7056548be377ac972ad9a62da9ac7f0557b6d4d8ecad0fe5c3d9f7163a6d8c68ded91cb1896eb92c6054703df8ebccb09f489e468af56e159
+MISC metadata.xml 900 BLAKE2B 1e11a5fe50a57eec411e7b01480d484244266c5fab3814e1b860edb878810cabc49e3359888775e3d30778a0713d0e8a2cb2c3a04639eed316d89adac22bdd61 SHA512 1a7e244a466fef29dee6d46f6dc1eff5e7dce401980c704b4f6ca2a81c3da644b7705f2b0085c960c76ae0930dfb09bb84ca28d078ae7e73af7be2c083238f96
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
index 2a4516f1d3b0..a88173db7775 100644
--- a/net-analyzer/ospd/metadata.xml
+++ b/net-analyzer/ospd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -22,4 +22,3 @@
 		<remote-id type="github">greenbone/ospd</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index be04304c7e92..aebb89fe00d0 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,8 +1,5 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
-AUX packit-1.6.1-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
-DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.6.1.ebuild 698 BLAKE2B 8faf26054fc9ed7274bb041c5670b8d032b11bdedbafc461e5bbb99b4a516bfd4df53b4c458422570ef0f2c9d135ea8870f45f798f335c0b60095a3ec72a04b5 SHA512 ac398634d37e1f9da624496574afe33d0fd0dc59a4a094106d91687355519aa929e694bade1d4681f57b52f98fb8f394b69db1a86d4011d62cf31cfdd769e754
-EBUILD packit-1.7.ebuild 656 BLAKE2B cfefd879b7e17b8d1b063c10681cece5f41a70504419db2cfddd6ddc87b4ee54388c98146862fa494bf6b4c6fdec1fd39f11165f6bd727bf08deee3ed3620665 SHA512 51d3649ad59e0f814c1d688966c8a09ca0647bafcc0a33c8dc015eb6277bb0071f506dcb7794fec45d6bee72e83b5ef2ecde94e75f16659ef57adf29e08742a6
+EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
deleted file mode 100644
index f4813d868ab1..000000000000
--- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- a/src/capture_defs.h
-+++ b/src/capture_defs.h
-@@ -30,12 +30,12 @@
- #define READ_TIMEOUT                    500
- #define SNAPLEN_DEFAULT                 68
- 
--u_int16_t g_display;
--u_int16_t g_link_layer;
--u_int16_t g_dump_pkt;
--u_int16_t g_time_gmt;
--u_int16_t g_t_rst;
--u_int16_t g_snap_len;
--u_int32_t g_pkt_rst;
-+extern u_int16_t g_display;
-+extern u_int16_t g_link_layer;
-+extern u_int16_t g_dump_pkt;
-+extern u_int16_t g_time_gmt;
-+extern u_int16_t g_t_rst;
-+extern u_int16_t g_snap_len;
-+extern u_int32_t g_pkt_rst;
- 
- #endif /* __CAPTURE_DEFS_H */
---- a/src/error.c
-+++ b/src/error.c
-@@ -26,6 +26,8 @@
- 
- #include "error.h"
- 
-+char error_buf[ERRBUF_MAXLEN];
-+
- void
- fatal_error(char *err,...)
- {
---- a/src/error.h
-+++ b/src/error.h
-@@ -33,7 +33,7 @@
- #define SUCCESS           		1
- #define FAILURE           		-1
- 
--char error_buf[ERRBUF_MAXLEN];
-+extern char error_buf[ERRBUF_MAXLEN];
- 
- void fatal_error(char *,...);
- 
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -138,20 +138,20 @@
- #define P_INT64                         0x7FFFFFFFFFFFFFFF
- #define P_UINT64                        0xFFFFFFFFFFFFFFFF
- 
--char g_w_file[OPT_MAXLEN];
--char g_r_file[OPT_MAXLEN];
-+extern char g_w_file[OPT_MAXLEN];
-+extern char g_r_file[OPT_MAXLEN];
- 
--pcap_t *g_pkt;
--u_int8_t g_tr_fin;
--char *g_filter;
--char *g_device;
--u_int16_t g_hdr_len;
--u_int16_t g_pkt_len;
--u_int16_t g_verbose;
--u_int16_t g_resolve;
--u_int16_t g_p_mode;
--u_int64_t g_cnt;
--u_int64_t g_inj_cnt;
--u_int64_t g_cap_cnt;
-+extern pcap_t *g_pkt;
-+extern u_int8_t g_tr_fin;
-+extern char *g_filter;
-+extern char *g_device;
-+extern u_int16_t g_hdr_len;
-+extern u_int16_t g_pkt_len;
-+extern u_int16_t g_verbose;
-+extern u_int16_t g_resolve;
-+extern u_int16_t g_p_mode;
-+extern u_int64_t g_cnt;
-+extern u_int64_t g_inj_cnt;
-+extern u_int64_t g_cap_cnt;
- 
- #endif /* __GLOBALS_H */
---- a/src/inject_defs.h
-+++ b/src/inject_defs.h
-@@ -30,7 +30,7 @@
- #ifndef __INJECTION_STRUCTS_H
- #define __INJECTION_STRUCTS_H
- 
--struct ip4hdr_opts
-+extern struct ip4hdr_opts
- {
-     u_int16_t p;                   /* protocol type */
-     u_int16_t rand_p;
-@@ -59,7 +59,7 @@
-     u_int16_t rand_d_addr;
- } g_ip4hdr_o;
- 
--struct tcphdr_opts
-+extern struct tcphdr_opts
- {
-     u_int16_t s_port;              /* tcp source port */
-     u_int16_t d_port;              /* tcp destination port */
-@@ -82,7 +82,7 @@
- 
- } g_thdr_o;
- 
--struct udphdr_opts
-+extern struct udphdr_opts
- {
-     u_int16_t s_port;              /* udp source port */
-     u_int16_t d_port;              /* udp destination port */
-@@ -90,7 +90,7 @@
-     u_int16_t sum;                      /* udp checksum */
- } g_uhdr_o;
- 
--struct icmp4hdr_opts
-+extern struct icmp4hdr_opts
- {
-     u_int16_t type;                /* icmp4 type */
-     u_int16_t code;                /* icmp4 code */
-@@ -132,7 +132,7 @@
-     u_int32_t ttime;                    /* transmit timestamp */
- } g_i4hdr_o;
- 
--struct enethdr_opts
-+extern struct enethdr_opts
- {
-     u_int16_t rand_s_addr;
-     u_int16_t rand_d_addr;
-@@ -143,7 +143,7 @@
-     u_int8_t dhw_addr[18];
- } g_ehdr_o;
- 
--struct arphdr_opts
-+extern struct arphdr_opts
- {
-     u_int16_t op_type;                  /* arp operation */
- 
-@@ -163,28 +163,28 @@
-     u_int8_t rhw_addr[18];
- } g_ahdr_o;
- 
--libnet_t *g_pkt_d;
-+extern libnet_t *g_pkt_d;
- 
--u_int16_t g_init_type;
--u_int16_t g_rand_d_port;
--u_int16_t g_rand_s_port;
--u_int16_t g_s_port;
--u_int16_t g_d_port;
--u_int16_t g_port_range;
--u_int16_t g_interval_sec;
--u_int16_t g_interval_usec;
--u_int16_t g_injection_type;
--u_int16_t g_r_timeout;
--u_int16_t g_burst_rate;
--u_int16_t g_payload_len;
--u_int8_t *g_payload;
--u_int8_t g_hex_payload;
--u_int8_t *g_s_d_port;
--u_int8_t g_hwaddr_p[18];
--u_int8_t g_rawip;
-+extern u_int16_t g_init_type;
-+extern u_int16_t g_rand_d_port;
-+extern u_int16_t g_rand_s_port;
-+extern u_int16_t g_s_port;
-+extern u_int16_t g_d_port;
-+extern u_int16_t g_port_range;
-+extern u_int16_t g_interval_sec;
-+extern u_int16_t g_interval_usec;
-+extern u_int16_t g_injection_type;
-+extern u_int16_t g_r_timeout;
-+extern u_int16_t g_burst_rate;
-+extern u_int16_t g_payload_len;
-+extern u_int8_t *g_payload;
-+extern u_int8_t g_hex_payload;
-+extern u_int8_t *g_s_d_port;
-+extern u_int8_t g_hwaddr_p[18];
-+extern u_int8_t g_rawip;
- 
--struct timeval g_bf_pcap;
--struct timeval g_af_pcap;
-+extern struct timeval g_bf_pcap;
-+extern struct timeval g_af_pcap;
- 
- 
- #endif /* __INJECTION_STRUCTS_H */
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,6 +30,62 @@
- 
- #include "main.h"
- 
-+char g_w_file[OPT_MAXLEN];
-+char g_r_file[OPT_MAXLEN];
-+
-+pcap_t *g_pkt;
-+u_int8_t g_tr_fin;
-+char *g_filter;
-+char *g_device;
-+u_int16_t g_hdr_len;
-+u_int16_t g_pkt_len;
-+u_int16_t g_verbose;
-+u_int16_t g_resolve;
-+u_int16_t g_p_mode;
-+u_int64_t g_cnt;
-+u_int64_t g_inj_cnt;
-+u_int64_t g_cap_cnt;
-+
-+/* capture_defs.h */
-+u_int16_t g_display;
-+u_int16_t g_link_layer;
-+u_int16_t g_dump_pkt;
-+u_int16_t g_time_gmt;
-+u_int16_t g_t_rst;
-+u_int16_t g_snap_len;
-+u_int32_t g_pkt_rst;
-+
-+/* inject_defs.h */
-+u_int16_t g_init_type;
-+u_int16_t g_rand_d_port;
-+u_int16_t g_rand_s_port;
-+u_int16_t g_s_port;
-+u_int16_t g_d_port;
-+u_int16_t g_port_range;
-+u_int16_t g_interval_sec;
-+u_int16_t g_interval_usec;
-+u_int16_t g_injection_type;
-+u_int16_t g_r_timeout;
-+u_int16_t g_burst_rate;
-+u_int16_t g_payload_len;
-+u_int8_t *g_payload;
-+u_int8_t g_hex_payload;
-+u_int8_t *g_s_d_port;
-+u_int8_t g_hwaddr_p[18];
-+u_int8_t g_rawip;
-+
-+struct timeval g_bf_pcap;
-+struct timeval g_af_pcap;
-+
-+struct arphdr_opts g_ahdr_o;
-+struct enethdr_opts g_ehdr_o;
-+struct icmp4hdr_opts g_i4hdr_o;
-+struct ip4hdr_opts g_ip4hdr_o;
-+struct tcphdr_opts g_thdr_o;
-+struct udphdr_opts g_uhdr_o;
-+
-+libnet_t *g_pkt_d;
-+
- void
- parse_capture_options(int argc, char *argv[])
- {
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
deleted file mode 100644
index 48ba4aeab1c9..000000000000
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="network packet generator and capture tool"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
-SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-noopt.patch
-	"${FILESDIR}"/${PN}-1.6.1-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc docs/*
-}
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 5059d8e159a0..6f454fbc9ba2 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index d64e42ed98f1..94edb13cb32a 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -6,4 +6,4 @@ DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
 EBUILD prelude-correlator-5.1.0.ebuild 745 BLAKE2B e969e6c78e9419821a4d76173ae24e8f9e15c5456b93462af64fc481adf493c375dfa69b37f11792082dfd0a92bf5afd182832f52317f775d8c6ceec1874e3e8 SHA512 3b2374b7fb01f017007e7a3270e49cf70c8470055880859dc67a43fad5113ea4af0813efe40c0d25fd0d36809503b28317b0e3fdd093e62d0632c11d6d9e2f7f
 EBUILD prelude-correlator-5.2.0.ebuild 911 BLAKE2B 89780f9562a124f3fd90ba39a8e7d82c8008acb819c4c064ab579acd397f4ae00b9d4da86a048d81f2d3f381dee17a9b004a02b4f76dee8dd7156b935bdcc358 SHA512 312739c7fd601f936d14f8ee920154e9d9814fd27c91cac4f64015501ecff05371859ba23322d996b591e1185eb3223cbd26883094ae553a791a73b198e00f12
-MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
+MISC metadata.xml 854 BLAKE2B e16af36fd906bd519bd60d82628e1d75c5f27e1da3a5d59c71c4385fcfbfdc5b288f3d56473ba009e151b718516ab195976a845645a840c8c9bbfc613f49b348 SHA512 d336ad2f22f859c19cdaf0cab481115cacd818b85b8c5fad469b388477bdd772d506f56b2214b0a4ac0bf2868c57d26fd9fadd7f32fd04279c04196fe2ab5d96
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
index fa977ec21f47..0c9756704b30 100644
--- a/net-analyzer/prelude-correlator/metadata.xml
+++ b/net-analyzer/prelude-correlator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 00915eda130b..b53f93109030 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -2,4 +2,4 @@ DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc
 DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
 EBUILD prelude-lml-rules-5.1.0.ebuild 454 BLAKE2B 67c1020d0d4180704a80cd78e93ce0b313bae0df77b66e152a0cef1f8de9a6c93fe0505c278dbe583548da257a00d525fbc416f4ab8438cc6ea4e165c7b98bad SHA512 785dd110759a98e7b1679922ff6cc14fac51e3ddd7deda145efe5d591648d6db10aa86ce1e3a0722e9b3ba111fdfc2f9c9129a002bf3fec86e187e338e2f2580
 EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
-MISC metadata.xml 373 BLAKE2B 6fa00bbd4f812187c5808bda963bd017a49083630f19f9eb0966064914eeb3a21389430fa7aac54ce03faad80347a66be473227e933ab8e41c1598160ca7dd45 SHA512 1da0210300b25be42d84914b12750fbea2e7471ad5ce0cb7740e69c1e3c87b44ae76a3bfa57e60498dfd1e0a9ca9fd6eaf9a7a8a664e036bbfe45a2c00c94ad1
+MISC metadata.xml 403 BLAKE2B d8c0e238fd36cbdabe2a8adbcce1ffa7b7564cc1e8f2b3b5e6b669c7bac6e625aa2469a6f4002a88923c32676abe252a136b46ef1e399cdaf7d94b14ed8a1cfe SHA512 64900e8b946f9894e8796e2bc2758d818d922d0cf22d693879d9cb56bd08f6a175acacd595b9da28a9ce955339333613c2edc6fa3da2d2aee4357a75553bfa35
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
index f9f94e2cbf43..4e084bded132 100644
--- a/net-analyzer/prelude-lml-rules/metadata.xml
+++ b/net-analyzer/prelude-lml-rules/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 2c36e172a4a1..7b2671ff6e64 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -7,4 +7,4 @@ DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc6502199
 DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
 EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B 784e15f5493576d8a1c7b432159be81aa0cda97e9be3e5a8f919cd6f7333e9ffdb1eb3d4ace32d6be587982df243aa5d7bc11dcc67cf209654af9c5cf70e6e1f SHA512 1de5bc8adea9fab6044c957433a73c5ba5315c800afa8cb4a06d6336d3a5c8cf6a84cdcf2a9d81a063e6f061fbd99d1a8de76a68aac99f96338d744a91d6869b
 EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
-MISC metadata.xml 735 BLAKE2B 0bd39e9c3979edaf5a13331a34520bb9b25470b0731fd5a1f664e0841909a9c1a00358dbd624a596b53c8b052fa89719af4f4d3363c41914f6bf6aad89b67300 SHA512 6d2a5377d2a77e277c6d3fce58c36173f07681456c6688c4cdfb23933853da5ffa72eeac7a5a9c2b3183df00d13d75485cbb4d9f2253371ebd45fdc5087d0c57
+MISC metadata.xml 765 BLAKE2B 9f85da7f3df6def91ca41f8bf45437bb8ea8d773c1a45140719d7112271294d87234752a8319be0e79b909c0d20b18cc91cc9aa67d2c5abe101e54a1a2574c7d SHA512 36bec921d2b2e315343c8597b1ee3408efbfac0ff660838f5aa4feec6f20b22dca9d07d679d4df9bf887552026ce3516732e28d1cc9efd50d07bce745d69b671
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
index 515391274149..13f5f40e96bf 100644
--- a/net-analyzer/prelude-lml/metadata.xml
+++ b/net-analyzer/prelude-lml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
index c606463071f1..7d766c7f6ccf 100644
--- a/net-analyzer/prettyping/Manifest
+++ b/net-analyzer/prettyping/Manifest
@@ -1,3 +1,3 @@
 DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
 EBUILD prettyping-1.0.1.ebuild 478 BLAKE2B 862811bca0cdb0a40d55b8719379ab0b533f598615890c698a7d9e280d255caa0c95eb2c7283e11acb79d42435d5674fb389fb0ead8a53e00dc51b866fc7e0b7 SHA512 4be1f0f7b70bd5f6f68d15367f3e114aae0cfda3203df97b99353a4e94ff77bc203c826a23c136c94c211b5b6e3ed460b17c2540507f544b4925f36e68a7c68c
-MISC metadata.xml 629 BLAKE2B 97885a7298da53e0f1424b7042090df868ebb865f9a4fcb6d9d041bfebdac0d5aea65bd271601dddfa33922e05c8bb021a89a58eb74092636b8b0f82bbf4d050 SHA512 037fbab4a14ae70bf7bf7acae8fb6b6db7d0a74cf9079db3ab591ad49d518850a491d1305bbf5a0b433961eec346faef5ce739b3df82ecdc98cac09d3b6f6861
+MISC metadata.xml 659 BLAKE2B 3a717a849df8dd2a7a2efad7a0c29c0c8381788dcaa75938e59504f959b94c1a14a41edefdaaf2faf9a3239c6973b838396f47929677db2e72877f623383ec57 SHA512 52397ffbc330456d834bbe38afdb3558e74ba3a9fd1f4012f8a3aaafb7cf483ab312b37086415b7d06e706b7e0edbd7b348db413873d59926c8a41c1ff6b71e5
diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml
index 3799608c0a37..b3fcfa01442c 100644
--- a/net-analyzer/prettyping/metadata.xml
+++ b/net-analyzer/prettyping/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
 		<name>Theo Anderson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 61498a97df9b..0b625d5aaf1d 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,3 @@
-DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
-EBUILD pypacker-4.8.ebuild 713 BLAKE2B fa5a0c6c944c3fc24d9d251e429dbd626034032df7a9fd64bcbc957a8ba45d379139fdf91d22102d6e2c8b3521e088a9e5f673d9b9afdc11481cbbe0ab90dbe9 SHA512 575dcd25e1383e31c67c537fba08c6c22ead405571770e446ee4688504c40ed1a0f199f24e72c3b3e0878923d777e1dc496215601ec6eaf3cab87dc2bcaa59c6
 EBUILD pypacker-4.9.ebuild 720 BLAKE2B 83180695914ced5a1bc9709abc795eaf803b6dc16c854b9182a4ce23c633798ab22d1cb0be3b32d6ca94e9ccba643d8674210f1586dc2689136805a39930eb8d SHA512 01b9f7acb6b054027a4aa0ce25c642e257a758f345ae9130d8e3356db1399aaffd1013ef3e59ba6b5e4a35a4973913551248a03e391a3f0388bfcdec0af0e15c
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
deleted file mode 100644
index 6d7d0041fda5..000000000000
--- a/net-analyzer/pypacker/pypacker-4.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-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"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-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/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest
index aa205d8f016a..18cc393a1020 100644
--- a/net-analyzer/python-gvm/Manifest
+++ b/net-analyzer/python-gvm/Manifest
@@ -6,4 +6,4 @@ EBUILD python-gvm-1.1.0.ebuild 821 BLAKE2B eec8d2684f24c0b11c66ad8d3afc65f3c9f9f
 EBUILD python-gvm-1.2.0.ebuild 825 BLAKE2B 79c71f462dcf069f628694a7fa57e6627d1fda48dafbfaff7f2d0aba855580ec4a3ca0e9e039bb0a001d80739e43ae5ea5c70c4f833482d783c0c132cd7867fe SHA512 ff33e31f548afc8aaeea46bee13c728a0bf7ae12ab04fcd0588dd0249cb9098a9557d71af1f5eae9b744d3afaf293cf555eeaf341b07812239cacf8994a22039
 EBUILD python-gvm-1.5.0.ebuild 866 BLAKE2B 4d6612fad898cf44901b57a77abef0d066112748138c11dc8d170527baf00755373b3d87832a11157a1ab07680b5bb251829253d1f679ff207f95f729b5a3d9e SHA512 4738c70b7316e824249610f52039f8c216d1a3fbfaebe81e3209d39a548b9e5f09bb9f4ea12c2b05d18ef7d34662a49d7399b98bc3670bb8dceaacac1cb3b014
 EBUILD python-gvm-1.6.0.ebuild 642 BLAKE2B 0f04c9a050cbc0e1f767565ebaa58027b44ccab3d89c09b97993c5669451cca4682397d8c2fe00d9f3a5af821871d3cedcd6e02d30dcdcb266571410f48948ff SHA512 9e487c89bde3ac104e28ab61cd469938dd3ebf8b883eb01726fdb9d1479811a3fedb6ed3302438ebcbc5e4255af189c9a8ef39a701670073bb846117994a8247
-MISC metadata.xml 879 BLAKE2B c2b7de38e8cbd8057c326eb81bb0071e864634f46c64c0474e8b13ef5645bc69426c2eb179a92c90200442c40f792da1a563afd1394c88bbb835989bcfa5d856 SHA512 baba7e3527bc2317480bb742a2e3edd092f6da4a19af04598e8a6a2d5b9c45d7a5f10d2afcba27843c2d3e2eb7493950c3659a2ba815166f700147f732d9e524
+MISC metadata.xml 909 BLAKE2B b77ff599081198f1d21399f9909fe8005cfa26c4755943caef76136b6570ca510df9354efa4feccb3eb47b0bbaaf97880851ce2cc0184cd81a47ea30e0c4b5dd SHA512 f949284469a19629a0d9f542c40d2d366de6dbddc946ac3a69ef0366d9a2dcc1e419402da37e56ee51977816b47a7826c90fb4e31d871c0e6f23fb2e1d8ac45e
diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml
index fd0b9228bd46..968b09aa1544 100644
--- a/net-analyzer/python-gvm/metadata.xml
+++ b/net-analyzer/python-gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 67d7f77af1af..e5078056c521 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,7 +5,5 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r1.ebuild 4285 BLAKE2B fa7988df0a282ca8744f67c594eca3e6946d33009aa51b9230a59bce11c73e3b50434a09f831f7ed0445b4b48062934237492276a7a3f217045a321f20ae9384 SHA512 331b0993d3f352187b3e65fe841502fc4cb00f3353b6535d5fdf4c13aed808196c7f3ec6e5b86949c356f2911d4f26e9a2a75761586e585234f20531b4b70b28
-EBUILD rrdtool-1.7.2-r100.ebuild 5670 BLAKE2B fd95afabbd2bb214eac8e8030deace0b142fefdc3b8c021e9e573cc3245637b163e037a482c07dd30f4c4e5a6cebe32e1858d8c06fbb0fa404b442836845290b SHA512 bb07a06155cf801c3dfce92587f736522805efeac21a1f9775f85840f169857537209ecbca97cea7dfb067145988cdd0546f913a4dd8cbf3cba01c5098ed52a5
-EBUILD rrdtool-1.7.2.ebuild 4290 BLAKE2B eb6142d4ab03c640e557639252d8db5818a30944cfc06b19fc7e7b0132cb25b5f22564684fa836750bc0a6695f8cdcd9aa97dcda3a15cd5edbe8b8ab1c34fe7b SHA512 52b56a2512525888b7eb6d40c3ad7f890d5e16a8e19840d099707965915281201f8e9a6db3d501eaa4e850de5963295ae49043a63803393ac98f23ecfd5aeb76
-MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
+EBUILD rrdtool-1.7.2-r100.ebuild 5760 BLAKE2B 3a5cd702f9f5407c4b57d434a875a7afa3fe8a63cfe07eb8375f95897934519593dfeab7c7f3fbd541c35a90aabaee687be9b27f14467ce30cb3f8a39b3ba98e SHA512 028d78b9ffe6cd5698cb5f136f8be19b3b5e293ecdc3294ca4c58a5a6810e2a3c590de106811f7c278dc73c667d4073e44a0083103403e673e450fe1eebafe2a
+MISC metadata.xml 584 BLAKE2B fc6bd75c58c7803f1ab26c41cc2b58dc4e8555dcac7a48428967854a1b8063eb0e745bc7c07672b805ea8adc55df0b7c8acd51576bd7b89ab37b45d9d04b4d11 SHA512 69ba81252477dfd6efc01cfe886d3ca28eec3214348d5bc6bc7f73eb3ff50080977b5c74058a00cf62e504026aa5fa096b0ed1389da121c403bb27bd6d4c2068
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index a6a291c9723d..d2dbe95efd3c 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="graph">Enable support for graphing functions</flag>
-<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
-<flag name="rrdcgi">Build rrdcgi support</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="graph">Enable support for graphing functions</flag>
+		<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rrdcgi">Build rrdcgi support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">oetiker/rrdtool-1.x</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
deleted file mode 100644
index ba8b9c45ce93..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 8e87060d737d..6dbe3765730f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+inherit autotools lua perl-module distutils-r1 flag-o-matic
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
 SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
 	lua? (
 		${LUA_REQUIRED_USE}
 		test? ( graph )
-	)"
+	)
+"
 
-CDEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
 	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -44,39 +48,25 @@ CDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-
-DEPEND="
-	${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-BDEPEND="test? (
-	lua? ( ${LUA_DEPS} )
-)"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+	test? (
+		sys-devel/bc
+		lua? ( ${LUA_DEPS} )
+	)
 "
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
 	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
 	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
 )
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -86,7 +76,7 @@ src_prepare() {
 	default
 	# At the next version bump, please see if you actually still need this
 	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
+	if ! [[ -f doc/rrdrados.pod ]] ; then
 		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
 	else
 		die "File already exists: doc/rrdrados.pod. Remove this code!"
@@ -105,7 +95,7 @@ src_prepare() {
 		-e '/^all-local:/s| @COMP_PYTHON@||' \
 		bindings/Makefile.am || die
 
-	if ! use graph; then
+	if ! use graph ; then
 		sed -i \
 			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
 			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
@@ -122,20 +112,20 @@ src_configure() {
 
 	filter-flags -ffast-math
 
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+	export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 
 	# to solve bug #260380
 	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
 
 	# Stub configure.ac
 	local myconf=()
-	if ! use tcpd; then
+	if ! use tcpd ; then
 		myconf+=( "--disable-libwrap" )
 	fi
-	if ! use dbi; then
+	if ! use dbi ; then
 		myconf+=( "--disable-libdbi" )
 	fi
-	if ! use rados; then
+	if ! use rados ; then
 		myconf+=( "--disable-librados" )
 	fi
 
@@ -158,6 +148,11 @@ src_configure() {
 		${myconf[@]}
 }
 
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
 lua_src_compile() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -189,17 +184,23 @@ lua_src_test() {
 
 	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
 
-	popd
+	popd || die
 }
 
 src_test() {
 	export LC_ALL=C
+
 	default
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_test
 	fi
 }
 
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
 lua_src_install() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -209,24 +210,24 @@ lua_src_install() {
 		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
 		install
 
-	popd
+	popd || die
 }
 
 src_install() {
 	default
 
 	if ! use doc ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt}
+		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
 	fi
 
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_install
 	fi
 
-	if use !rrdcgi ; then
+	if ! use rrdcgi ; then
 		# uses rrdcgi, causes invalid shebang error in Prefix, useless
 		# without rrdcgi installed
-		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi
+		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
 	fi
 
 	if use perl ; then
@@ -236,7 +237,7 @@ src_install() {
 
 	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
 
-	find "${ED}"/usr -name '*.la' -exec rm -f {} +
+	find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
 
 	keepdir /var/lib/rrdcached/journal/
 	keepdir /var/lib/rrdcached/db/
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
deleted file mode 100644
index fb33d065e265..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0=[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/sbd/Manifest b/net-analyzer/sbd/Manifest
index 202dd5d5fddc..1f6029ce4464 100644
--- a/net-analyzer/sbd/Manifest
+++ b/net-analyzer/sbd/Manifest
@@ -1,3 +1,3 @@
 DIST sbd-1.37.tar.gz 83991 BLAKE2B 7dd0f1e3c428e9eed24ca513c99a242ec5bf2a147416b2a979335ff9c55b6d68ca8769ccd00e11637e0411c9537895fd2523a3f237be704d4540db5b4d12bbc9 SHA512 845f3eb20d3a6006f7afc9b60eecaa3049172b3fb2796058f18a13ddbfb7f2c9914bef45bd4f3557db814783717eae24fe13d46d22c65359ba3f816c6d52ea7c
-EBUILD sbd-1.37-r1.ebuild 649 BLAKE2B 008bd41b3377d4b34359c611d140287a3ccb1801ad6a25919be4152be29576f86740783f4609d5e6d5ab0a1aad604d3acd490943accfe3ab49e7da69f943f7a9 SHA512 39e51120c26bbe6eff07b449039009811e3e747d06c06a93c6da8fd480b6170840d9c3980ea713d2697b0ce8b1365d71ca359f954634650c13e4e89f7d958248
+EBUILD sbd-1.37-r1.ebuild 658 BLAKE2B eb895fb5a703a238947704ea57b20179870120c443c898d822182bfc77b31378ae17e0c529727d99b63fc97c1cc7a17ccdd1c66a7060ca643b2c275a129b284d SHA512 2394908299bd7c044f0ad2c0704e87df8a8cbc281efccaeab1e3dbe5a0295f4338287a5eaf9828e2df66d592987b7f161fe772880cb89bdead2a273a168c1759
 MISC metadata.xml 625 BLAKE2B 4e509c997323eb5429fce6bc9a7873fbf8d3b362093efa1bfce58c591f95fdd73a73395e71c0375c96eebbcc85d809a63ce1dffe77ea0bb3c1741c34a7c4f36d SHA512 80da056e231f3f68263ca3d4f44b79990efce1679878923ae39bd31875d19319851e58d5d99a1d21eacfb03c95374ab765d24a3b92aa213c1c23387ad33263e0
diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild
index 514310c7e942..6b87335cd5a6 100644
--- a/net-analyzer/sbd/sbd-1.37-r1.ebuild
+++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption"
 HOMEPAGE="http://tigerteam.se/dl/sbd/"
 SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \
 		Makefile || die
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 081ad7953afe..fba157765015 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,4 +2,4 @@ AUX scapy-2.4.4-libc.patch 406 BLAKE2B deec0a79cc1edf60fb5cae49945e0b3384d3671fb
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
 EBUILD scapy-2.4.4-r1.ebuild 1132 BLAKE2B 9e443884839312921260be7323baae52abf5a85799f6cab9d499cc02ac982b75746f097e48050bbd6ede928d35b5f4c37fb2eebf8baed4b2b6fd4c81af7c7e1d SHA512 9f8d9da8c924689ae39adfa19f5dd30b53e3808aea70e11df8b4a8927eac3d3a4c7401dc194b2df875e67825b25851ce304be4213ac31b1fa48e878a2190ab32
 EBUILD scapy-9999.ebuild 1018 BLAKE2B c892db076650ed6ebdc294a1d3c8edad12b981a910ce0b961d7c5b5bc84b9a2cc7523c2aed1cafdf739b1bc1ab97064d8a2683bb97c18667541fe15cf5946773 SHA512 912e7e95e42842c5c7cda3ac93d7ab7147c9924017d91906e333f896174c08036b97e1ab1500cbe2de54171b13fd0f3d1116902109c929e08675b323c82e4b86
-MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
+MISC metadata.xml 584 BLAKE2B ea0689ea7a708e36148f15307cbabb2a32e018a4442cc58f5da1fc95ebfdb1a9e2a8468a68f3e5f441bd401b59b3d877d27fe651a94b25294c2881e7b5286f35 SHA512 1ce387a001b5bb8ce6acda68d43a9d02f50eda40da9d434ff1e544032a07c6e50f4b5e2d821383cdfd333ed15423f04889fce84f9bba2a19c03567860a7a9622
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index b3243d196ed5..044a35fdb0d8 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 8ecfca16429c..77399ae7ee53 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -2,4 +2,4 @@ AUX sec.conf.d 352 BLAKE2B 7324f809c3fcadaa3755994ae43fda4ff7b9df2282fd68e831de3
 AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca86f272206f0d93b3f9984813382a2e4063b0cf0bcee0f3c2ccef1c7cf48c7bb6e535f65738f6 SHA512 9f079d629e21d20e16b4455d6b6b3279a56c0979abdcc90a8b488cae5225cdef4f7d95374b7e5b623196f06d91f2bd3c50691e787b40c90cbe34b478d8b37952
 DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269
 EBUILD sec-2.8.3.ebuild 608 BLAKE2B aa1129118698bbf65eada5ebcae0924dac5cb41bef4168fee0f9b433784bc3a6ca641c85dcdeee33086c4336f88ac4617a9553547b2daf22e05fde2fd8c0bb7b SHA512 7b0c594b6e64302bca68c197ebc6b54cfff49b461bf468f601076e5b391ba00f142b2c54d59aab62651dae0724a091b150a4dcd0dbc7920e19fb88ff4ffada9b
-MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
+MISC metadata.xml 420 BLAKE2B f5097ddff26bab65d503f2ef9ac66150d9f81d4fe083806f9ef3856f6089f9784ef00202ae2aca5541e3a4c9c1b09a444f1c8db0ccc0bca02ee612b4f4ceac2f SHA512 4eca0374a0ef57e44f8f62123f640da20a3f42122a0a4d250a2dca657605091c860ab7708de0cdfb838b981126d329331770857f09428f2305ae5ab23b26fa9d
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index 2d02138ee2cb..b8e6f69749bc 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 6f7e00584179..8009bb3bba4d 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,3 +1,3 @@
 DIST sflowtool-5.06.tar.gz 78044 BLAKE2B db4a14d3e94660c803399f99b486bc04579b8dacf4e01f484ebeb31cbeec0ad279efdbd85b5a242a4dd9016e36428992344af50275dfd15c89b3337351d5fdb0 SHA512 365922e09544928bbf5893c04e05bc5b3d632290804711cc248d6bbd52c8ed30646bb9bdfd7b231a357f88bd5592473b95edff6ab3b50121809f909b4b65c7a2
 EBUILD sflowtool-5.06.ebuild 659 BLAKE2B 68e1b409c6be500bc53514a61083f4be6db8bb3aac16b9f8898bc56c3baea0fd3b8a0c199f8f3c471cc0a96ecb4d973f17251a12505b2183574eca71314d7391 SHA512 052e03668d35a256fec5bd60956b3e4a6d4adeb3e22f1cf37e03f9dc7ded55aef82c4211822d6177caa88957e172edaf1659e512d33d75fad319bb7377335b2b
-MISC metadata.xml 370 BLAKE2B 54ac4c209077f5fa6d73a231013370ac06ce05d5f1ce8704291c0b7631fe8eafe6212065876287850e5ffcf56b532bf2fc7c678fb30dda1c8f6dd969bbb63c99 SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d
+MISC metadata.xml 370 BLAKE2B 88fd419c519c4f4c8319aa7620ce0570ea2f9b8dd3a5061bae91dec301da3c3331da81870bb0eb353ee0d674c0edb0604437b83bb0997a58114efb509c45bff9 SHA512 c98355310c3887c53d3df65090b3ac387f1c5e0f173c30eb44fa344aebf095e7faba6d5734d2a69c3ee9acbbaafe539a9ea62e376529fd220b2fcdbde009d14a
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index 66b83a2d79ef..5d7fbec6b22b 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index 47a2002f1de2..b283e138f041 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,5 +2,5 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0.ebuild 2167 BLAKE2B af862aedec86528a7dd4b7a1557b09db7f1e3c13a57d310fd931b51a3c8137d89e83983b42739380c4a9ec41d50a1774eb324d595033ba5b47c1adcb2853eff6 SHA512 49f7331ae80c291cd9b7a37c89dbf977f9ce0ea90d13a909752a4d0942e179eda1faa2712165a1b33d7e320cb1ff35497a7b6a655d02bda924201fedb6435cdf
+EBUILD sguil-sensor-1.0.0-r1.ebuild 2177 BLAKE2B 948191fe3834dd5267c701e38a6c03124f3df2b2c24d5010bfc05242473033a638d1f1a441af398985b032d1012138530380f232c552437bebc6599257bd5c50 SHA512 feb73b40ac4e2dcafbd0d6a50d6c6ca6904dc84d86e787fbd78c57512a57528c40fe474df011e7dbac1088fc600b2aeeb9c09543ae76a32ea8316474b4e475ed
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
index 7df0389de138..d07d5ee62911 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit user
 
 MY_PV="${PV/_p/p}"
@@ -12,11 +13,11 @@ SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.ta
 LICENSE="GPL-2 QPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-lang/tcl-8.3:0=[-threads]
 	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tls
 	>=net-analyzer/barnyard-0.2.0-r1
 	>=net-analyzer/snort-2.4.1-r1
 	dev-ml/pcre-ocaml
@@ -32,12 +33,14 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e "s:gateway:${HOSTNAME}:" \
 		-e 's:/snort_data:/var/lib/sguil:' \
 		-e 's:DAEMON 0:DAEMON 1:' \
 		-e 's:DEBUG 1:DEBUG 0:g' \
 		sensor/sensor_agent.conf || die
+
 	sed -i \
 		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
 		sensor/sensor_agent.tcl || die
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 2f96be642ca1..179d9bc03f7c 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -4,4 +4,4 @@ AUX slurm-0.4.3-tinfo.patch 267 BLAKE2B 2cd7d9cb11504b1eaf9b940e82a8baca65bd067b
 AUX slurm-0.4.3-version.patch 170 BLAKE2B 21d810de2df77546c584d66c85d180054b3f569933771d2e265809308d51eb247a1fb74fad7bb6a3c6c8dc8c7386527b27f796bca31d22cdde5f4a8d277f64ae SHA512 40f2e3bc6c2136f7bc91a719a5e8ffcaef4112ff9cacc5a61ebecbf9d3272b1b3aac425b9e22cafb4fc0b630aec2338e1c2ada27d9d2828fbbc90af215cb936b
 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
 EBUILD slurm-0.4.3.ebuild 703 BLAKE2B d8816f08f1be187c170a1f805d3cbe2e5a341cac4b19857f2a37d0a21ce3cc2e9de660f5bc1ce0b2f11dbdd0e462e101d8d4c31a6e003bfc859dc14d5c9f8004 SHA512 c66c994f8d152177499684255e3be582c096f61bda0cf5203bb4952e9bd64a3fe77c11d35f1c17160b72a3cfb1eddfb0f3b1dfeb620b2ae1752497e54797d0d7
-MISC metadata.xml 360 BLAKE2B a7b740796c57e64abb029e278f22e04a9af73827f35a2b1576b4f955d74c23cd1c16c9215b831f46030f55bfa0727bd50ccfa31ca7ad999bc574dd6cc4b575bf SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12
+MISC metadata.xml 360 BLAKE2B 53033de487621be982fd0a6074f5466f96a38c5222c8b4379cc719ad283973dde556b95500a5d4b5ff2b1da93a01b93222fc353a91f5ee4305f2d08d8fa19c90 SHA512 2095f099496ca856597b11fe278894ee0758df59bf46dc1819c5b2399230c4fc63878ccab57cc273f1eb22272a49d68ac0aa95d065af786f343766ee98526f34
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 7312d8a52540..63ee64f6f158 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 907dba68fd8f..24599ee79880 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,8 +1,5 @@
-AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c
 AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
 AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
-DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
-EBUILD sngrep-1.4.6-r3.ebuild 878 BLAKE2B 0fce80e75ed5959ffa4ef3a930028b59b5f09b60aafafbbcf14160485d3d5f542216b5f88490fad2d40b18c5c12821ca98ced7fd7a657ddff6d2cc5348bdc58e SHA512 4db6ee2085e7cd5dadfb24a6ef044c4b2a709b9a3788fd0e33aa352274785576eb489a11dfbf122f6d74e521f00d3e3da4cd03a05988ed63f5461f62c6813967
 EBUILD sngrep-1.4.7.ebuild 880 BLAKE2B 985c02fe8faeb7d69614571dc5ee17b5be9837135243e09d06a370d6ca9c7fa37664ae7a4ba83de58189ff2f35ecf0f3772f37f86beff834706241e3fe52be6b SHA512 553168f488dfbe3f0fd1062d58d5c86c6b67c53d390f3fcb979ae2cba74a52b6bf717a8d12173833ef191c725fa90be7d58b2bcda3b2fdb07292941f642a6df6
-MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
+MISC metadata.xml 468 BLAKE2B a6188410ca42f6552dd8c1bba6ebe2fe427e345f94308d23b98ee8566937256e765e4de9cf4ababdc02cd7d57215673ff0e160c2c56ea17fdcf962bee3fc28c6 SHA512 9adcfea9b56a062815ebb0aeea72302edd9029fb827b28c73414d9bf9c1f2f0643478ba5e32e1398d19d9d68dfc553eeb71902dd31ead7176dd758b259dc8adb
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
deleted file mode 100644
index b61025d25b6e..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/capture.c
-+++ b/src/capture.c
-@@ -191,7 +191,7 @@
- 
-     // Reopen tty for ncurses after pcap have used stdin
-     if (!strncmp(infile, "/dev/stdin", 10)) {
--        if (!(stdin = freopen("/dev/tty", "r", stdin))) {
-+        if (!(fstdin = freopen("/dev/tty", "r", stdin))) {
-             fprintf(stderr, "Failed to reopen tty while using stdin for capture.");
-             return 1;
-         }
diff --git a/net-analyzer/sngrep/metadata.xml b/net-analyzer/sngrep/metadata.xml
index eeb043ad62b3..62fedd1ad64a 100644
--- a/net-analyzer/sngrep/metadata.xml
+++ b/net-analyzer/sngrep/metadata.xml
@@ -5,8 +5,8 @@
 <email>netmon@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='eep'>Enable EEP packet send/receive support</flag>
-<flag name='gnutls'>Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
-<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
+<flag name="eep">Enable EEP packet send/receive support</flag>
+<flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
+<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
deleted file mode 100644
index b9f731a5e648..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Ncurses SIP Messages flow viewer"
-HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eep gnutls ipv6 openssl pcre unicode"
-REQUIRED_USE="
-	gnutls? ( !openssl )
-"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=[unicode?]
-	openssl? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.6-stdin.patch
-	"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable eep) \
-		$(use_enable ipv6) \
-		$(use_enable unicode) \
-		$(use_with gnutls) \
-		$(use_with openssl) \
-		$(use_with pcre)
-}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 58c0f009b600..cb703d3093a4 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -8,7 +8,7 @@ AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
 DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590
 DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75
-EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
-EBUILD snort-2.9.16-r100.ebuild 8403 BLAKE2B a0e34374c8d1fcebf79e67cbde006350fbb063b6fd0f1312033b9246e0c4aba78ed33496471a997e304506249d74fd1d3499024aa6af9c398111769090c600ac SHA512 373901f5995fd2393758c041314bf2d8bc052dfa75b7c5e13f1fb06c912e0fc99df2372fa522497b732e19bbcb65411033225a339d32038d2d71d78b2b2bd804
-EBUILD snort-2.9.16.ebuild 8290 BLAKE2B c79c137cb7bff4c3c0b55f3d73b52e25a10ef61b268e178948f36da4ec70be3d8834cdbe679a6e6c86cdf0f5244e912d25493d0ec1121dd29875a25a82cfa983 SHA512 9211178da2253e549c096f1c553a7a63fb8bea6071079d34c3db709abe1524f39d8f4936703e32802a073bd7407fb3945ea4f0216616ea33cfc312319a7a0a47
+EBUILD snort-2.9.15.1.ebuild 8296 BLAKE2B a85504c132e629fd023de19a6fb95ded3194fe23ce2af9e1fc1284b50cc7a736735a79961bce06ec86ea82072ba2148970ebe28d171218eb1bb40ff7fef37f54 SHA512 caa6697e0725bdfb7d5dc51f3f0cce02fc0dd83af67793a8e7930cd84e7b14535bcb12b09dd8d4e67da178e8e48b7590377d484f1c2bd54e25cbb2346062584b
+EBUILD snort-2.9.16-r100.ebuild 8409 BLAKE2B 8235121f2f81c53aa7b2d58ecb15647062a7cb391ef6aced8351572348b5ef2e9036c9190a29a1ca3e3d2dfc08ed7624de6b15ac03d254b8b748f778c87426ea SHA512 e7ae4bf8fa7b1898c2686664f2993be906ec9e3ccecac34251cc9a8b7099e1633ba20e662d18ab5b4902b595ac491bda5e8c3efc5f546322d3f126d730a2d58d
+EBUILD snort-2.9.16.ebuild 8296 BLAKE2B 11cd245301793f6a4da6d98cb194cac7c2927817eeea81343b86b7f42562cba24950cf9327bb945321c0c21e535f286fe33d09296b6bb3e1c0a00cea7f98e075 SHA512 a75bae48d4aab6f9b3970be191383f575c431459b8b6933ec65ffe01040d75c628f0da191f4593b9140f45f7454e7683a03b3d0a6da0b12c8fc11afc5538c2e4
 MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21bdbd512480..440d87d8359a 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index c3363729e9af..66b2b845e872 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -159,8 +159,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild
index 6e7835a53107..4a3f0392b5c1 100644
--- a/net-analyzer/snort/snort-2.9.16.ebuild
+++ b/net-analyzer/snort/snort-2.9.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index d2225bdde6ed..103f9286316a 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -7,6 +7,8 @@ AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 BLAKE2B 35a7860d59c63d9749e1
 AUX ssldump-0.9-prefix-fix.patch 554 BLAKE2B 797544d1bd63e476379f2c6a9df8e6377cb839a179e3eaee47b00d35c967249e050a5a235efcf4c8606f5c7ec3e354b6a869c372bb0ddd215f1b21ecedaf2383 SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8
 DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
+DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
 EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 4451fa21e460c7554d7cfaa05f1ad7b0cff8af134a619e8262a7f1cb8159218974f5e3034da807818228ce7b93554b616a607a56f924becb12bfe14c60a1e5d4 SHA512 ce3c6eb328a86b04693bdb308ff3debd9486ed3304e0cff38f48d7a076ce4b8ef5394e066887ac69d658fbd29cfa54881a57f5a2b72aed9fe68f19cd80de9480
-EBUILD ssldump-1.1.ebuild 932 BLAKE2B b0941b455b7fff8d0af2a9002dce7139fdfa7ec4bd29905d9d114daf8f33f8e8d4413d74352429f44e66d9b153bc8c3d6b66d9ff7797e667c6c89c3bba92ae38 SHA512 4c8a236aa5f84a61490278627f0e40258e3929e55e0812a29f80ee1ea7c47b2df0c8f954a9cae5142453c6e0965b40d0066e0178e73cb021a121cc4b82c23423
-MISC metadata.xml 359 BLAKE2B f35ef1086c0c3c4aa4f9131d63ce2f014ed376a841502dc0de02f6261b8358f6aa1e01ff55c87f39fb5ad71478c70e98497f1bc3b25034d374ba58064393b495 SHA512 c80158a4a7334b16b28fe0462cc82e70c03674bde862f6858ab6f67645cb3d856fb41bfe5480690fa25c85b0a5205bc2f6cf2febb45fd355a949da92024fc1ee
+EBUILD ssldump-1.1.ebuild 938 BLAKE2B 06f060fa831fad3f474a9ec17143b75f0a775b6e54436213f232f867e18063b876f92037256be91f4f65a10dc79dd0754426ec314691d6112a3825badccd24fd SHA512 d07b96f75e830924757e1b7f3473dc05d907aa1a92fe228495ad10225ae5533d5a31d90da45769e30144ce430830b4c961a3eeab2150adaeceaa88fc88ce9b92
+EBUILD ssldump-1.3-r1.ebuild 671 BLAKE2B a671056fbf79208e795c53ccc693ddc97530cb27af6439739cc80f69c85436e8f7ffd3bf539426f5c252241f600cc8b90413150692403bfaa12afef4b7047761 SHA512 adbb68839511cc2f66dc46fbe4077c46db8a2386f08fdb69edf2f66a83d0494c246c41e5618d218815086d6872ac45f9c8c87e3246ab64cb6226bd8f367aaf22
+MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 12203e1a761b..8d1a6814136b 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild
index 6263f65aa674..84bf5b42e215 100644
--- a/net-analyzer/ssldump/ssldump-1.1.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="An SSLv3/TLS network protocol analyzer"
 HOMEPAGE="https://github.com/adulau/ssldump/"
@@ -12,16 +13,14 @@ SRC_URI="
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="
 	net-libs/libpcap
 	ssl? ( >=dev-libs/openssl-1:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	tc-export CC
@@ -29,7 +28,7 @@ src_configure() {
 	econf \
 		$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '') \
 		$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '') \
-		$(usex ssl --with-openssl="${EPREFIX}/usr") \
+		$(usex ssl --with-openssl="${EPREFIX}/usr" '--without-openssl') \
 		--with-pcap-inc="${EPREFIX}/usr/include" \
 		--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
new file mode 100644
index 000000000000..ddd41125cefe
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/json-c:=
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	>=dev-libs/openssl-1:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README
+}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 9e5ee33a8040..9e6e1b8b601a 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -4,4 +4,4 @@ DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe51
 EBUILD sslsplit-0.5.4.ebuild 1124 BLAKE2B 9ebb355d542cb612248af4a2c4c6d4bda11be3f4c7c19a4aa0907f49568433dff1ece47be11544923078ffb1725be5036468a6b76b207c9d156097ff96011377 SHA512 ed21a23c0c7913e1a3e4507d0c5968cd26b850269dbce03f71213a40c0e02709750934b285cd656d1fd09d933a7206fb0fb9f4b942ad55da9e483dac6566b40c
 EBUILD sslsplit-0.5.5.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
 EBUILD sslsplit-9999.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
-MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
+MISC metadata.xml 903 BLAKE2B 2084a096ce253652dbe19f7390b878a1763361ead1489c08cc20f1d7c18b656f82bddf7ba009197e50e747548fd9a79098e3033a0e5c8652d07df1f651611dfd SHA512 f069b1ecd872409c3f056b096b67d43af37ab321145a1b387e3e085c0c5ae9c40efb6cdb7a67c39521c4f21758769f89df04eef8610c478c9d40dde28db80075
diff --git a/net-analyzer/sslsplit/metadata.xml b/net-analyzer/sslsplit/metadata.xml
index 614c7c40e2e1..196e3388620f 100644
--- a/net-analyzer/sslsplit/metadata.xml
+++ b/net-analyzer/sslsplit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 4ef5a246e9b0..9a3b306fc7da 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -2,7 +2,7 @@ AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
-EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 90dad95e765825652c9e7da84b69f863fc545d522aa14fb9c2994d3b5f1276c0b3d03d817daf57b54140a1d1058ea0c36203e7918851fe4af3f10e964c82ca2d SHA512 cc654bde41b19b3f52616c8c9fb3693307bc21aa4ed1568df7d7b68e28a453272344358a4c13f5258de96a045009875696d734fbde7b2ac73fcf2c89e84886f5
-EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B e03e459e57ab3736c6ece4e9a99c7c320573712909f925a604e4c7ff1b7729faccc2aed2eaec61765abb1851aaca46ad1278563cfc40165f4502c6ae549f24b2 SHA512 2d57452333b322115e4cee5d319cf9eb5e351e9825f9906ed9ca82ce44962b9bb5d93a7ed54c1ca2467bdad93bc3280fd9e2f01e72b3f36db0bb43b455d9c35b
-EBUILD tcpdump-9999.ebuild 1721 BLAKE2B c78759b703923b0b79a81cb79499dd8b1f3a90592eb926f14fa63caa68df2ea93b5a593fb1e4649aa5a492380a93bef800d30aeb5e1f4f90c6f16b1aad3a83b4 SHA512 35ddcf9bd232ed197e33e328cdffc41c2f8cedd5508c4f78abc55b05de3eff0dca43750fa76d7fb52a5455f6e41a5398928c1fba7b573dbac63dcab2f8b68350
-MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
+EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 9de2877989906aa1d870f6d450040da8e6586ee5ecd77c66ff11dfb7848f9538b3739c5c458e4d1bbf8fb811f646909b4b9bc2956c1656c11fc64010355510d8 SHA512 b131e963b567a24763c85b5696e3b633aef1be2ea22d03c3a76c4867bd72aab9bf42d2eba9c2ec2c0d1c151aff016199fcd4085d78f14db0b7b25240793ea684
+EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B 88937ff7ca63caea3a9c84a2ca5e97bd11623de064cf385b28ee33a4200fef8fcfdb8283a33ed4978155d79f3df3c0d6ba0d074289650ea7cf226f9684c36fd0 SHA512 82989ef5c40bb17a4d1efc4df929921044dfc3abfd0fad74934a26fc7608765f0559f055f1d51f1e86ed3a2c8218087c822ed39eac7241117adbec90dc7d5b50
+EBUILD tcpdump-9999.ebuild 1710 BLAKE2B cce77f9bcef21eeb2f6360b2b7d0cca85e4f3f5568c39cb8b3ac2c69fcc8aff2942715d70958d847e7425be2da49a353260287488273a1ebf51c5b0d8238ceb2 SHA512 73a88872fcc171ba0aa074e96742aa937a5b988b3f0c7196b2dec02d566e60201c6b050548175fdc2f30cd0e829dc28e82e21f8ea07c58fda7815814c651708b
+MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 1f6e1c98b574..d9e2e02c82d0 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 6c0d493d0ed5..217b3f570c80 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
 SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 9ddf16dd2aa5..2edd75502e32 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
 SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz"
 S="${WORKDIR}/${PN}-${P/_}"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 4765315651b1..17c0eed4bfee 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 inherit autotools git-r3
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="
 	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/tcpdump
 "
-LICENSE="BSD"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
+
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( samba )"
 
diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest
index 97e92f57c459..ffd085d234d7 100644
--- a/net-analyzer/tcping/Manifest
+++ b/net-analyzer/tcping/Manifest
@@ -1,5 +1,3 @@
-DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d
 DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992
-EBUILD tcping-1.3.5-r1.ebuild 629 BLAKE2B 05cd6050a41c66d83680bef698b122c743c40625f82d9b52c5c1c3ccee1ad56f86ce370fe6e5ed304234e6398bf48d7b5f264b5134eb4fac4ee07605cc7e67d4 SHA512 2114c7fbafe9714a4e37050b04959af00cb78e5cdb26ce8dcc5474d35ddda4ba9c3c442f05e0b304857e6a8231d6b8a565db58e1f7c19c3206ea8780f2a948d5
 EBUILD tcping-1.3.6.ebuild 624 BLAKE2B b1dab34c816c4a4605eb7ea24aa87a48d44b5dbe044ed2a37921b576fe04e929795018f9706e67f5cd9bef6f43de530f4be6ab84c8194ead11bb63734ae5447f SHA512 64161c96305f32c264b4635e48934f13293820b4d5e8f52ef6f235a7e72afb531890b96a529f078de5e33e88517fbf0a730e788e4780e6ea259bbfb6ad298d3e
-MISC metadata.xml 214 BLAKE2B 4dab37301a1db60dcb52e9f891190c6a47df7685658ea2accf8e152430b2ec3162a78bc9ad4cf7836954b10be3897228d998c0436a1179df673c25a87b166a86 SHA512 81de8d9677e88447cac7cfa2b6155040211f235c3186591a08a145b9e711f1e7cfbb133762fc9f54db8ba975e5cdba1f7654775a523150556fea26af6ba116f9
+MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
index 12edb2ee98a0..825589988b40 100644
--- a/net-analyzer/tcping/metadata.xml
+++ b/net-analyzer/tcping/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild b/net-analyzer/tcping/tcping-1.3.5-r1.ebuild
deleted file mode 100644
index 956a3556561e..000000000000
--- a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Ping implementation that uses the TCP protocol"
-HOMEPAGE="https://github.com/mkirchner/tcping"
-SRC_URI="https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	default
-	sed -e '/^CC=/s:=:?=:' \
-		-e '/^CCFLAGS/s:=:+=:' \
-		-e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \
-		-i Makefile || die
-	tc-export CC
-	export CCFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcping
-	dodoc README
-}
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index b4dfdd439519..c55bfa620cf1 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,5 +1,3 @@
-AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9
-AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d
 AUX tcpstat-1.5_p8-_DEFAULT_SOURCE.patch 510 BLAKE2B 37197b4cbd2c957ad06f8f9813675678b1105e5e63664885dc8346ab96a07e3ca55485a472ea7b6c027518be031669ead178c438bb315ae813e47e7d982f4c46 SHA512 36f92f585e044695eaec96c557bcdd42be170d8d2827c31ff1d310931a7f7aaabe8cf0495ce70b110534872d155af9b9934106ac001bac16662cea8c74e257f4
 AUX tcpstat-1.5_p8-ipv6.patch 1031 BLAKE2B 140174a7dc761c1a9c3183919fd3594e61f866282ccbef95840adeba9dab062d73652335761c13183f9df291b854cae2801001ed32be7571c9f744176bbe90a4 SHA512 65bd5be8498317c7a778d56582d716433ae1eeabbccb0ae6b5deab7de067927db23e4cce0115bf7ece5e410851cd9d74c9523a1ec802bcea4cd7933bc9121095
 AUX tcpstat-1.5_p8-libpcap.patch 191 BLAKE2B 2bc5d3cb2abf84459e4eb0869ff41b295415c9075b69faa97c27eb604658dd9ff8a7a8f8b0f8515cb26f3554672bd3222a8cce0a4538dbd3e1931df6506d07a8 SHA512 e94799b018178c92541e33afaf297fe60039344392fe2629bc82af691df5c14f3e629e2728d87f323ccb191a1dd7d0d501967d73f0d2142e20b4d13bc93467df
@@ -7,6 +5,5 @@ AUX tcpstat-1.5_p8-off-by-one.patch 1299 BLAKE2B 651fddce0312ecf6c7c6d55f1bf7d65
 AUX tcpstat-1.5_p8-unused.patch 2731 BLAKE2B d1d120953a68cd5fa1dddaf3b6521c953fcf3772fd5d52cafca2fbbceffa0c1245a4e882b6cad17464ecc003642efd54fe00413eade52cf16adc1985c0c0431a SHA512 5c9a058dc299b04e8cd7b875643200efbcdfa99cfbd33b5527bf4b0960cdeb44767bd3da3df91c4ba8b4ec9dcbd1d5a313c880c7d32ed5ded9201432ff871c09
 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab
 DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41
-EBUILD tcpstat-1.5-r3.ebuild 901 BLAKE2B ba69175b94aff336df71902cf519a6b6bdb9f5a7da838755f954f43de30c51cf9d27e1ea3089994b61eadde7ef9fe9ce65c91309a06ce217646c5a47a30586f6 SHA512 6a124f03a3f57e31a9459b53c5df803270d459e665284bd20726db326e91dea000adbd5c1f95678ea44d6a4ec0042dd1e5ff4670a7240c0c6359d59159c02ee0
-EBUILD tcpstat-1.5_p8.ebuild 1287 BLAKE2B 521a7edc1f13c27f712a39d8dc744c2884812fcd8fb1d70875ab846cc07141544bc9ff6c27202b6998866c37456f6aab5376798c39733dcde02d48d54c52eaca SHA512 24fc76424d3a625a85c8048a37ed0b88aa4be31fb2c5eea900c6204b2bd45f8bbcc34983aa7b0c9bd1d666c87aecce747ec62e6e89a4e152703a0519c6ab382d
+EBUILD tcpstat-1.5_p8.ebuild 1283 BLAKE2B 7b5798d2771f6b0f34c60c7d9191dbe055e7c130e3e11617cd8a06540bde1840a343daca1d1d9572d6845ca58b1e8ff773928e14dbcff9709b4a72f09b385466 SHA512 b9e52660890f99819507afbc82df71265e8dead3737c69f964bab96297169f91cb9398be1553e88cd8ae26715e0ffd6d86a73e83440dee803c1db364acdea2c0
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
deleted file mode 100644
index e3e0df933d5c..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -68,7 +68,7 @@
- case $my_build_os in
- 	aix*)		AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;;
- 	osf1*)		AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;;
--	linux*)		AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;;
-+	linux*)		AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;;
- 	bsd/os*)	;;
- 	freebsd*)	;;
- 	sunos*)		;;
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
deleted file mode 100644
index 88e668e1a4a5..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -84,15 +84,26 @@
- dnl #######################
- dnl Checks for header files
- dnl #######################
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h)
-+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h)
- 
- dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it
- AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h)
- 
-+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval )
-+if test "$ip6" = "yes"
-+then
-+	AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] )
-+elif test "$ip6" != "no"
-+then
-+	AC_CHECK_HEADER(netinet/ip6.h)
-+
-+fi
-+
-+
- dnl #############################################################
- dnl Checks for typedefs, structures, and compiler characteristics
- dnl #############################################################
- AC_C_CONST
- AC_TYPE_SIZE_T
-@@ -147,34 +158,11 @@
-   If you already have... then please rerun configure with the option
-     --with-pcap-lib=DIR
-   with "DIR" being where libpcap is found.])
- ])
- 
--dnl look for dbopen for tcpprof
--TCPPROF=""
--LD_TCPPROF=""
--AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [
-- AC_CHECK_LIB(db1, dbopen, [
--  TCPPROF=tcpprof
--  LD_TCPPROF="-ldb1"
--  AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ])
--  ], [
--  AC_MSG_WARN([
--
--  *** WARNING ***
--  I couldn't locate the Berkeley DB library.  The extra utility
--  "tcpprof" will not be built.  THIS IS OK!!!  "tcpstat" will
--  continue to be built as if this never happened.
--
--  If you wish to use the extra "tcpprof" program, please install
--  the Berkeley DB library from:
--      ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz
--    ])
--  ])
--])
- AC_SUBST(TCPPROF)
--AC_SUBST(LD_TCPPROF)
- AC_SUBST(MATHLIB)
- 
- AC_CONFIG_FILES([
- Makefile
- doc/Makefile
---- a/lib/process.c
-+++ b/lib/process.c
-@@ -230,12 +230,12 @@
-  *   calls a user function pointing to the data
-  *
-  * XXX: filter is not used.  capture_seconds also isn't, but snoop is
-  *	always read from a file.
-  */
--int get_snoop_data(char *fname, char *filter, int flags,
--	Double capture_seconds, void (*hook)(packet_data *, void **),
-+int get_snoop_data(char *fname,  char *filter __attribute__((unused)), int flags,
-+	Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **),
- 	void **args) {
- 
- 	u_char *packet;
- 	int fd, len, blen, ret = 0;
- 	struct snoop_file_header	fh;
---- a/lib/tcpseq.c
-+++ b/lib/tcpseq.c
-@@ -54,11 +54,10 @@
- 	u_char	flags;
- 	struct tcpseq_ha test_ha;
- 	struct tcphdr *tp = NULL;
- 	struct ip *ip;
- #ifdef INET6
--	int is_ip6 = 0;
- 	struct ip6_hdr *ip6;
- 
- 	ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
- 	if (is_ip6_packet(pd))
- 		tp= &(pd->data.ip6.body.tcphdr);
---- a/src/catpcap.c
-+++ b/src/catpcap.c
-@@ -50,11 +50,11 @@
- 	if (c == ' ') return c;
- 	if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c;
- 	return '.';
- }
- 
--void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) {
-+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) {
- 	u_int length = h->caplen, i, j, k, step;
- 	u_char *r, *s;
- 	char c;
- 
- 	r = (u_char *)p;
-@@ -90,11 +90,11 @@
- }
- /*
-  * process_file() takes the output of tcpdump, saves packets, and displays
-  * statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- 	int run = 1, i;
- 	pcap_t	*pd;
- 	char	ebuf[PCAP_ERRBUF_SIZE];
- 	struct bpf_program	bpf_prog;
- 
---- a/src/dump.c
-+++ b/src/dump.c
-@@ -37,21 +37,21 @@
- char filterexpr[BUF_SIZ]	= "";
- int	get_tcp_flags		= 0;
- int	what_to_show		= 0;
- int	packet_number		= 0;
- 
--void my_hook(packet_data *pd, void **args) {
-+void my_hook(packet_data *pd) {
- 	printf("PACKET NUMBER: %d\n", ++packet_number);
- 	print_packet(pd, what_to_show);
- 	printf("-------------------\n");
- }
- 
- /*
-  * process_file() takes the output of tcpdump, saves packets, and displays
-  * statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
-         get_dump_data(fname, filterexpr, get_tcp_flags,
- 		-1.0, my_hook, NULL);
- }
- 
- int parse_show_types(char *in) {
---- a/src/tcpstat.c
-+++ b/src/tcpstat.c
-@@ -421,11 +421,11 @@
- }
- 
- /*
-  * process_file() gets the data, and then displays the statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- 	void		*argv[2];
- 	statistics	stats;
- 	Double		x;
- 
- 	signal(SIGUSR1, catch_signal);
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
deleted file mode 100644
index ce12a85db51b..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reports network interface statistics"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-db.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -Wall -Wextra
-	econf \
-		$(use_enable ipv6) \
-		--with-pcap-include='' \
-		--with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)"
-}
-
-src_install() {
-	default
-	dobin src/{catpcap,packetdump}
-	newdoc src/README README.src
-}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
index a7ffbe9723e3..859524d5c260 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index b9a4d5011fa0..a7c1be72e301 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,10 +1,6 @@
 AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c54d3926f2443fb4c62bb37756ad9dbf0010e145421f684eb4ce04cde621f32aa3a6da22e37b5336868647d0bdf4755002c805 SHA512 d20a36a0ca57991f333d783db2442f14fcf06b1e88936b527edcf2973d82dbc88514eae5e051197d7dc4ce25f16bc10799bb91f5baf4a98076c22f60fecb2065
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
-DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
-DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
-EBUILD tcptrace-6.6.7_p5.ebuild 1250 BLAKE2B 786c6ff2d34b2155830acb942d3a37731335ccc81642ab9c43118ea39e3ac01df8cfdb7824c67ce1994cd93572f9cf6b34d75ffe0bce12fa14c9ac3ab05b4a37 SHA512 3ec354b314768b594e3b31eef8df45d41af4faa84db0b0100c30bebfca2e5078eadacad0481da923dac53956f3b385b69ed0d285ae0726382ae4e410756c71ac
-EBUILD tcptrace-6.6.7_p6.ebuild 1250 BLAKE2B f61f5bbfebe1a66782042c56cab408f77b2798e8b78850a31a968751f42507ae9c9fe4b0a70fea5c74fee9df111c8cf63a117f900d588211894eb538f4e3d728 SHA512 bf523deb713bc0abb6df55bbc02dee5cc41c2b77dccf464b0c3881fcf1f025fd3c0ca6c8e9a504e32bd54ba3be8e9141dc4b3c9db0718eddd5c8347a53d2fe8e
+EBUILD tcptrace-6.6.7_p6.ebuild 1247 BLAKE2B 56e12c7951701d56ddbd5302bab3cf6c483d962cf79c144ad1488c998cdb27e0026a8602f1100c80f8b921bf5454c5877df345ece9f5b652a6f9f28880ce740c SHA512 b78443aae2c40aa7d9276ecae12496af52c0939f346562062968619c05ed97d6b680fe64ad79d0bce3688403d031594975d8f28868b19e951527256e5bcb0490
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
deleted file mode 100644
index 9e42190df0b0..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic versionator
-
-TT_DEB_MAJOR=$(get_version_component_range 4)
-TT_DEB_MAJOR=${TT_DEB_MAJOR/p}
-TT_DEB_MINOR=$(get_version_component_range 5)
-TT_DEB_MINOR=${TT_DEB_MINOR/p}
-TT_VER=$(get_version_component_range 1-3)
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-${TT_VER}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch
-	eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff
-
-	eapply_user
-
-	append-cppflags -D_DEFAULT_SOURCE
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
deleted file mode 100644
index acb7c415420a..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${P/_p*}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-cross-compile.patch
-	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	default
-
-	eapply \
-		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index f08f5f8fd7de..a96afb76f58e 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 348feb79b2aa..647acd59bdde 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,5 +1,4 @@
 AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
 EBUILD tracebox-0.4.4-r100.ebuild 1250 BLAKE2B bebc05ecba31e0b71f2e3548e490227a0552d9235c491ef5d2568aa83b2ef5eee88a0c969104d8202098c047f1e9db5f0386fe768c75edf8dd67b51f51cb6a84 SHA512 ec6c1125325177e9e1f15afaadfbf557072d54ddff5b9f01f0f8a0a658a24d46d76f120aa28b86fead73c54e66f1311f3d6139685a734a4e07f86e40faff677c
-EBUILD tracebox-0.4.4.ebuild 1173 BLAKE2B 9e9791dc276fe0f4cbd3361e9a7de4b38340a8baeeb552bb86b1870b255043da11e6df12f01164217cecdb7067a6f90da83ca284ff4ffb7901193682c4c5e89a SHA512 3664196077455fa168ff3c8e0d5ec215ccd6e7b03c58bc73a333e2811fcac031718ba9766e516c243044e1cd84c4ec12e66ba10af42034fb0f39eb11054aff9e
-MISC metadata.xml 575 BLAKE2B 0de780b436640051b1fbcf49505d8975d39b3a4fa0d45a408718b9ca284e7f7f2609cffcda406c84fdc5b6fe2116d579e5624d8557751e3888c5a45ebdf95d54 SHA512 9cfa13bf788534c7bfd4edf945efa310e24229e9d777eecb1ad371ed99c13f39c63af14bf41e441ef94bd75ba53f318f23d48fd4fccd2d49e8d64b9d8fa2d83a
+MISC metadata.xml 575 BLAKE2B 513c1e0904b220151dc961251b8b93223017d423d67c194d4af8ac03c73d4d4d023b377b2b95b7a5a730c8bb6a722669ed4defb2cc822c5ffa69a39d7c380775 SHA512 3b56de905ff16d563e9d69b1306950dcfb5097ed04a1aab5bc69db6242804ad9e5172c4d19f610daaa109bae97871342ef29b037b8e8f8b96bc42b3f5f543856
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
index 1de26c104467..7d75a0a8a878 100644
--- a/net-analyzer/tracebox/metadata.xml
+++ b/net-analyzer/tracebox/metadata.xml
@@ -6,8 +6,8 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <use>
-<flag name='curl'>Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag>
-<flag name='sniffer'>Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag>
+<flag name="curl">Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag>
+<flag name="sniffer">Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag>
 </use>
 <upstream>
 <remote-id type="github">tracebox/tracebox</remote-id>
diff --git a/net-analyzer/tracebox/tracebox-0.4.4.ebuild b/net-analyzer/tracebox/tracebox-0.4.4.ebuild
deleted file mode 100644
index a463e775906c..000000000000
--- a/net-analyzer/tracebox/tracebox-0.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A Middlebox Detection Tool"
-HOMEPAGE="http://www.tracebox.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl sniffer"
-
-RDEPEND="
-	>=net-libs/libcrafter-0.3_p20171019
-	dev-lang/lua:0=
-	dev-libs/json-c
-	net-libs/libpcap
-	curl? ( net-misc/curl )
-	sniffer? ( net-libs/libnetfilter_queue )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RESTRICT="test"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-deps.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
-	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
-
-	sed -i \
-		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
-		-e '/dist_bin_SCRIPTS/d' \
-		src/${PN}/Makefile.am \
-		|| die
-
-	sed -i \
-		-e 's|"crafter.h"|<crafter.h>|g' \
-		src/${PN}/PacketModification.h \
-		src/${PN}/PartialHeader.h \
-		src/${PN}/script.h \
-		src/${PN}/${PN}.h \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable curl) \
-		$(use_enable sniffer)
-}
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index 1bc81e279d50..d7caf3ae8805 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -1,3 +1,4 @@
+AUX xnetload-1.11.3-libdir.patch 318 BLAKE2B e36abfc59a4d7266ac2f76b9d5d6d703b55f696e7044b34b3978767cb86355227645f5a245a5df1dea59021434185d9b9b5cab3a0f6feb851d4b1df8b41bd27f SHA512 78f96d5df50d443190516fbea3af6b31496407f38a9a7a45beeda6077e0ba6df8c5484acae5a88dd9bcf59ab8ff0b2efce56c145895f25c67e92cb3da540620f
 DIST xnetload-1.11.3.tar.gz 24551 BLAKE2B f23ebc6609a2824f2b60aa045f505422df87ed21e622e4267f850f2d5954b312019d68a9738512e92f30e7f1745886743a82d3f08fcae1e1adff3acf4294ec6b SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7
-EBUILD xnetload-1.11.3-r1.ebuild 869 BLAKE2B 722f47fcd35ee4f641356e2d4453c979d7b403ee3f18f192f38d5a3034646c419ef7e866b327e4a47467ffd7c159844c00ece122bcf345a587f796c31aacf060 SHA512 1eaa8dcc4591ffb7662045b6056e16489383c740eef4d7d71a703fa1e333fcd208abff9ee6949d965a76e1eec26082fd4ac9eabfc50554027571b9a8071742db
+EBUILD xnetload-1.11.3-r1.ebuild 936 BLAKE2B 2b2c54db22f56a17b84c43c6387ab0374d2989d43b39d68ee286075a31acc8bbe5ccf5869e6dc44dca4ecaad834addf66953c7af8bb691b820cf82c1ce18ab10 SHA512 b85224ee9f90ef7b90da30172e42d02e9d37549aef8980ce8bfcc1934f0f126746a3b27c7bf1eb255d717b4e97fec921feddc1e33a99e75b445c26e5a0f9d06d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
new file mode 100644
index 000000000000..3bfbd619c112
--- /dev/null
+++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ CC = gcc
+
+ # The next two lines are for building an optimized and stripped program.
+ CFLAGS += -Wall -DNDEBUG -I/usr/include
+-LFLAGS = $(LDFLAGS) -L/usr/lib
++LFLAGS = $(LDFLAGS)
+
+ # These three lines are for building Athlon optimized programs on my system.
+ #CC=gcc-3.1
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index d1caa9933a52..1b3e67000f2a 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
-SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
+DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection"
+HOMEPAGE="https://www.xs4all.nl/~rsmith/software/"
+SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
@@ -19,13 +20,19 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.3-libdir.patch"
+)
+
 src_prepare() {
 	sed -i \
-		-e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
-		-e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+		-e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \
+		-e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \
 		-e 's:gcc -MM:$(CC) -MM:' \
 		-e 's:/usr/X11R6:/usr:g' \
 		Makefile || die
+
+	default
 }
 
 src_compile() {
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index b0a598fed4ef..83509983ea57 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -263,4 +263,4 @@ EBUILD zabbix-5.0.9.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f
 EBUILD zabbix-5.2.4.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
 EBUILD zabbix-5.2.5-r1.ebuild 32917 BLAKE2B 08ddb3e3e2963b2ebd6193866fbb7e85abb6a958c3631c00295c3cd0641e5dcccc9a6532851a7ef10666173a509b423a7ae7147635cf9564c62b07d1cf1bdfaa SHA512 3252082c8917155a02bc76f409c228f276bd04ca877b7c9fe9cbc94554fcac201a8b6ed451face4c61068cbcb216ed721a020679d63044de60546b3026d39a18
 EBUILD zabbix-5.2.5.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773
-MISC metadata.xml 1497 BLAKE2B 9f9090695be732ee5176057c2c896aca48516b60491b7a462272bf150851e210ca28da974e4da2da84107e77365d5517f17e19422e4c131ab899122cdcb0bdb8 SHA512 40fc0dd322f4f9e562b4cbe2a50bd102be7d30353b9cf79399c92fed3818c077bf78567a1c4a864450be93b5c27e766284c71b5318fba6561077960620e02854
+MISC metadata.xml 1497 BLAKE2B a8288bd5ec772d1f54db12727cc9b6659ca7563ce054f8cb63d8f8d2373ef4081e391656eb1178ff06bdc64a5ca420d2c56376e5b1207e9baed17a9766406f43 SHA512 042f4daf2f70de1cbbf7ece57a3d5704878b33257002c8a1d9987e8a9249e8af475e24577069ad315d406ae5c29994881c76638c5bccb2e57d3f8ce3b0b1c381
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index da24309a77b0..fb8c6cf6f2d6 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index be09dd4d71ae..03a9b845ae70 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
 EBUILD zmap-2.1.1-r2.ebuild 943 BLAKE2B 32d8e39e880cf29f411d527b5830963939b95a2e6a019e1290b7bfdfbe83da6d0431e3cb8bf06d289234cbaf6910138c547228a44465eb3ee3b4de1265e05e15 SHA512 e050474a7764ba68f916cd3492fcfc75176bae9cf398d707f4000da43efe2468d5a72634c3ecc210d3c407ed9dd3408236a1728da520771817b149a70ae12ad9
 EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
-MISC metadata.xml 1229 BLAKE2B a7adf10c6b6ee12c6bdca30375582ccba8541bd70321fc055682d12343149d7ac4162cdcde4abab160b760eb04a644045fac14c878fc2219db497055234ec3d2 SHA512 b457bdfbba7318412aac2d759bf616f2417c0946bd534cc0b5066ffc226e586f277ffa6c317e13504766c35d881ad77797321b377e4350a7a4f5dd22624cfc1b
+MISC metadata.xml 1259 BLAKE2B a1e59cc2cd2e58cf939166e0acebef19a6853289b286b633f54b53461356bb0a4034515ea5d3f10e6a39879d9242a3140e29b51a7a2c1578d5a6fbf18b56e982 SHA512 1e6d826ffd69aee962afcf562c09ba74277ac7fdbd48f2f0f5edca487035f08666a1de467fd1194b9f89af7cf8f8cbd266d773bb9ff76efafa816560e3df76f7
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 2204ae3c97cf..80e7bcd54427 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /net-analyzer
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)