gentoo resync : 28.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
commit: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree: 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-analyzer
parent: d934827bf44b7cfcf6711964418148fa60877668 (diff)
156 files changed, 84 insertions, 2448 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 691916998478..f827958a1d96 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
index 14db19686077..8b1e5dabc6a8 100644
--- a/net-analyzer/apinger/Manifest
+++ b/net-analyzer/apinger/Manifest
@@ -1,8 +1,5 @@
 AUX apinger-0.4.1-fno-common.patch 193 BLAKE2B c13aa8e654dc58b9802a4b2b56b2bb4f9004a5556c46997dcee1e028b67d226057d9e09e779f91d08629bb5ff447ed6cc70739d8bcd5da39b5e59fa3bedf3e38 SHA512 f80653f38f9d4e5d6196f3c4d7643c8b9ed4198b56125a1348ea458faba7e202ffce8d36b5cc58223b76bbb5a4957405b4087d26cc67e203b55be7fe1eb1bf7a
 AUX apinger-0.4.1-stray-backslash.patch 435 BLAKE2B 1a2cd0437152455ae965cdc86220a2eba3a3f30b8bb7515077982c03ba44a17a0e4de059432e0bcefc790d190d69bd128c192c01addc938a249a9573080fcaa2 SHA512 433521183c32c6bd414d5317e9c69fa2b28f3afeadaf47fdccb238a24cc245d347581d021e167bb58b191825547e349bee8b07d8a071f30771262e0abb62bb09
-DIST apinger-0.4.1.tar.gz 26328 BLAKE2B 72eb19c043642dc00e02f24bfd8f3f9f704cc8a2fb5b5937756706db561dd7dc5173706c7ede73dde778964a516b7b138fe664c243db5351ac440fc80244c843 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f
 DIST apinger-0.6.1.tar.gz 134127 BLAKE2B 8f54d5514a5410973b5f44166741582fc16a2b0b1398eab001943e2924704ae5400e2c0ce4ca1694cadfc6fa3e47d395aa3d6affd7e4873fb172bf027c26c251 SHA512 eca6cee186d538200619188d9481154114ef9d7eae4f11f389eb61382f507d108bc64622fe99b1bae17ecc3ca7b2bc4ff4d0a3156ebf2913803e7be24b0d3f94
-EBUILD apinger-0.4.1-r1.ebuild 733 BLAKE2B 51db5b417614c778eb4ec100eed95ddac2d8049756cba6e45a97be97a11126a969a3d4f9355cd93a74f1b75cc92cafbf16dac4f37238adfae4b85128197d2fc7 SHA512 23c71ab5e2d1582b0b0f69b7044d1c6a5425f98bfa60a5a874ceb1e81764520ce96ab73e224e9c98a4fa0af519a9f9d648477c7bf8bcf0d42188c3c390b7e07d
-EBUILD apinger-0.4.1.ebuild 743 BLAKE2B 57eb7e4a4ce2dfbe0a29b4e78c901253b5ce423295818411b83d4abc7c4fa14e442fa89d63d0826ea8442470922c06727e9e262bf977b7ae838213203800be0b SHA512 adfff7423e594620a5697c86dce8fc3a274f31041fc1886a135622b299f1a809bed79d4bb64288e899b42702228559919cf88353bbf1d3a7b57de313e9736376
 EBUILD apinger-0.6.1.ebuild 653 BLAKE2B ec8919aa06aed60b9d708db4cebc956f33b1edd4cfe3a9747ab18692cac5e6e3e87d25d7cb35a87c6bf6dbffc6e91a74660bab96c53527ac9c4b0050dfdd2a7b SHA512 35a1debe8187771a35beea8771698bea355e3f27388b2c4bd4efc3d53a34f49fe67a007f5f2555b13b1aebbc18a58fd9beb3d5be407d149cd99743c4d91c1770
 MISC metadata.xml 359 BLAKE2B 929365ca07ce887876998e51742a78e8f4a9250c42367ad458458d450b4f08ccc91d510bd6269b916f788ffb59c3ec61f0792722c83cfd54020b2913b7ea8773 SHA512 d4166ecf10d6c588adc68ccd871986e7de28191c76a18b45922925552d30534e1631b61974e21a477f9c9facedf698a964256f08b04ad3e0bbdfec87c5246d8b
diff --git a/net-analyzer/apinger/apinger-0.4.1-r1.ebuild b/net-analyzer/apinger/apinger-0.4.1-r1.ebuild
deleted file mode 100644
index 9126a208502a..000000000000
--- a/net-analyzer/apinger/apinger-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Alarm Pinger"
-HOMEPAGE="https://github.com/Jajcus/apinger/"
-SRC_URI="https://github.com/Jajcus/apinger/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.1-fno-common.patch
-	"${FILESDIR}"/${PN}-0.4.1-stray-backslash.patch
-)
-S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	emake -C src/ cfgparser1.h
-	default
-}
-
-src_install() {
-	default
-	insinto /etc
-	doins src/${PN}.conf
-}
diff --git a/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild
deleted file mode 100644
index 2d71fd4dccf5..000000000000
--- a/net-analyzer/apinger/apinger-0.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-# Switch to ^^ when we switch to EAPI=6.
-#MY_PN="${PN^^}"
-MY_PN="APINGER"
-MY_P="${MY_PN}_${PV//./_}"
-
-DESCRIPTION="Alarm Pinger"
-HOMEPAGE="https://github.com/Jajcus/apinger/"
-SRC_URI="https://github.com/Jajcus/apinger/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	sed -i -e 's|\\$||g' acinclude.m4 || die
-	eautoreconf
-}
-
-src_compile() {
-	emake -C src/ cfgparser1.h
-	default
-}
-
-src_install() {
-	default
-	insinto /etc
-	doins src/${PN}.conf
-}
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index e1e8b8975de5..e1f520078481 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,5 +1,3 @@
-DIST arpoison-0.6.tar.gz 8646 BLAKE2B 7e9a7aaf9fb184ffed4e69d1d709f3ec242423dd699014e89ce7eaf99cb225299110b3a6fed4059db89c3bbd05b30262d56dec4bf60bed367f01700f40fde883 SHA512 7c14a15b9b85f777e5151fae82dfbdb44dbfc85ce8f632b7d76727bce79ed7f958f725f39348489bc4659cb5e3b7ab5370e88e33c03277e16ab2f9ff00bb4038
 DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
-EBUILD arpoison-0.6-r2.ebuild 777 BLAKE2B c94d7ac7a0ae6afc7472f4e5152d65adadb9868af82e722b7744be7ef674ac4586297d8245dc46ef5fd1b3d33ecd52334f633d8ffa74465cff96962a539d63c2 SHA512 91565961d5cf3148236dd4522ac5343e46eb3bc76dda80d8fc5b35b0d9d5a21cfa1c3716207b580a7fde7127b596295cceb7f14a9b52bbbf67afa0d170b988bc
-EBUILD arpoison-0.7.ebuild 685 BLAKE2B 463d1b2114786f82ef451fa97d62513e8a85e9eb7127e39187d2841fd8c2ab1243740a37614fdb950318dd6f3a8c19fdf42e446193f0ca6dc754730253558d85 SHA512 19c323c2d36dc7797b437ca8304d0181f2aa51f87bee7e04ae95b772c2d999fc1d024d530ca63eea5bb42a3a399825499c6f94d63fb20510683fe01d665ad30c
+EBUILD arpoison-0.7.ebuild 682 BLAKE2B 07b902eab99e1eb73d41c4c6b969b590ca546af9a67cdaf207cd0fb8cb9afa270ff438e1abc6c59c02412029a21528bf6e00295beb4bca7f545fd1ba84d3e63f SHA512 43f2e47ddbce39799b11f4bf45027f3f3eb8abaa3554719b9b3510fba45ecdc8d4f2448f942581f020cfc22b72042958d2984a653ce5aa6f11fef4db21cd51d0
 MISC metadata.xml 358 BLAKE2B 8ef81a7500bfd11eb443af7fdbe30ce89f91875ddd9434367e7eafb73604d13e6702fd34c88bb863bceeeb95822cff1354313d2146117c1ef32166527bd82716 SHA512 9a11704d5314e9ab1a061a179e757146b29c52334511578fe958455d417652c0ab523a58a17580ea6892e528d44b06aa8510293664d78ed01f35e32ef1d7bc18
diff --git a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
deleted file mode 100644
index 628bef5fd8bf..000000000000
--- a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="A utility to poison ARP caches"
-HOMEPAGE="http://arpoison.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-RDEPEND="net-libs/libnet:1.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# respect CFLAGS, LDFLAGS and compiler, bug #337896
-	# fix for crosscompilation, bug #375655
-	sed -i Makefile \
-		-e 's|gcc \(-Wall\)|$(CC) \1 $(CFLAGS) $(LDFLAGS)|' \
-		-e "s|libnet-config|${ROOT}usr/bin/libnet-config|g" \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin arpoison
-	doman arpoison.8
-	dodoc README TODO
-}
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
index 49817cdd9dc7..811f1ecb2690 100644
--- a/net-analyzer/arpoison/arpoison-0.7.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 RDEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index fdab36185a64..bc410ed2e4a4 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -1,7 +1,5 @@
 AUX bigeye-0.3-overflow.patch 364 BLAKE2B 35f659abba86474fb2d87eeb926952ba0e9c394770c17a964cc8d723de700484a889469f33b3d66f3c40df184dbfcd3d953c29c2ec13a4c4d833231fc0e97dbe SHA512 4076e00b11c5c11d432f52a536f6d32a6329b8946ea6a8db64d61c395728483e9631fd93d136390d3e34e7c05ce113f3b2e7ef2113f686bd0184b8a5cb436d18
-DIST bigeye-0.3-gcc34.diff.bz2 2774 BLAKE2B 51b1c4702b65b3e6b484d17e500b00d26bd137c74a8eb16b8521ffa621263ef89b650f1bdc967c50a8e5200cc857d42597e1f93279ec4acd01efe8ad9802cae0 SHA512 8ed54aa7b95aac8703e2bf99fde985cbbe7e62f7a6b549e58b2b54856336c5560c450a8c6ad9cbcdcd6bf61c842797c1abca001cfca20ff82614d8c328cab4ba
 DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af
 DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0
-EBUILD bigeye-0.3-r3.ebuild 826 BLAKE2B 256f3468799929d0d3d15a4502756bb3c867aaf4e7b43e36970b3b8e0a8acc4d7af3f21d1a27873af05a2df33b5c9c7fc69b6a4a9b022ab012231e9dc5ebd504 SHA512 5e55b334a0201118cf00363a29c86846573666bb01709858d1f8955473aba0526da6e52c7b59dcb34dabff0081946a262afca27c6fe0dd0f004aa8e9b15efaf7
-EBUILD bigeye-0.3-r4.ebuild 874 BLAKE2B ecd30f594b2ad015732344e249776b964a7fea18afc2668581cf710e1a08393290e6aad5925bb44441ca3339cbbc220da3436c216ebc3ea9ae9c11d5c68c7c97 SHA512 86a3afa38971842b7765731931c107e460fffbc1df0fbc075e23028a83f343a1eaade1cd84df8ca15741ab97dd0d4f1e3931778ced23a9bb7ea28d17945bdf12
+EBUILD bigeye-0.3-r4.ebuild 872 BLAKE2B 081eea9dbbcbd4c068be2d8839f9604019dbc8014f854474f67d83c35b2c43b8ad4da0af0e0eeb3a19ea1341326987001344e3bbed54b9305f765cfcbd18e280 SHA512 cc2df3f8ec764e8cec4a0d426f3eb7cf50d6f7bb57679109282b4132cb7f4e9f88cc67e11efed4482d9793161eb2792adc4c091bfa2f746ebcfe4d6a98bed51f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
deleted file mode 100644
index 597005a10170..000000000000
--- a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
+++ /dev/null
@@ -1,39 +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="network utility dump and simple honeypot utility"
-HOMEPAGE="http://violating.us/projects/bigeye/"
-SRC_URI="http://violating.us/projects/bigeye/download/${P}.tgz
-	mirror://gentoo/${P}-gcc34.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-gcc34.diff \
-		"${FILESDIR}"/${P}-overflow.patch
-	sed -i README \
-		-e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \
-		|| die "sed README"
-}
-
-src_compile() {
-	cd src || die
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} bigeye.c emulate.c -o bigeye || die
-}
-
-src_install() {
-	dobin src/bigeye
-
-	insinto /usr/share/bigeye
-	doins sig.file
-	doins -r messages
-
-	dodoc README
-}
diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
index b349042d1ded..e9382d08ec47 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 PATCHES=(
 	"${WORKDIR}"/${P}-gcc34.patch
 	"${FILESDIR}"/${P}-overflow.patch
diff --git a/net-analyzer/braa/Manifest b/net-analyzer/braa/Manifest
index 10252371a172..f8af51c547eb 100644
--- a/net-analyzer/braa/Manifest
+++ b/net-analyzer/braa/Manifest
@@ -1,5 +1,4 @@
 AUX braa-0.8-gentoo.diff 451 BLAKE2B 3ec683de9a698fac9d3e675cadabf8de65a1659f4bd8469ab75dfa5c643b27a7c09305781457ab0eeb40fa305e193d3530cb9a244e63b60c2ac1d0f3862de411 SHA512 cb3981542c50076beff544f68cf4596e62fe199d68497f0d1b03fd70b90344fec8f7bc00797cb40de699028a56b37708dd1bfc405e8d85a3977b1fcd0ed99b2a
 DIST braa-0.82.tar.gz 39927 BLAKE2B 411a106118b2b3e135542ca507ccd07e910f19b256a12336119c3a088eca16b9a8c715840b633461523fd05881a522b083029f3c498588f7c4c38f518165840d SHA512 8c88d288287a12c19c8d49606c8d2b70531b7f2be1aa3c4ccc6b01739aead751c03c56dc3f1a346b3dd20730a8bd0d30e33167a5f7c676f629348195762e23d4
-EBUILD braa-0.82-r1.ebuild 514 BLAKE2B a789825f6c723bdd95239257a3d4c06d5b7987bae16b2b1a731ed6aef242d7d5e2c62b47179648da029a5221d0c75a5606a34993b46051d147ae0d0cb7a908d0 SHA512 5d471285f3ddfdae99f192d7d9d0631dde8a1fcfbb2d444da5db555c11c2b4ffb23efd5954d57992270ad0e7519e9adc33c27e66fc8a0a922ac8a56bcc0d17c9
-EBUILD braa-0.82.ebuild 509 BLAKE2B 6232872afd4e5b63cbc9c7fd4d4594661e7d98a624492415dbdae5fba0d81933830c009247191b56791d9443e7ef126014d564cc4870f0f919683182429efce2 SHA512 c8c4d8d74dcb1108f930eaf394a216f63fcc7972298a5b82d9592e0bacfc547c1cf80c912d24bbf933aa7a4a99d49c5831b75b11501e010fdc0f5afefb61f6b6
+EBUILD braa-0.82-r1.ebuild 513 BLAKE2B 7d0edc2ca17573f71178b2ac00a27793df98eda04ece244d869e3431937080b3a18072b4cdd3a7194087e9ef523c60f05c5b9d0930dc41372256752f90af865d SHA512 6e52f80bca675b4beff8cf93bec7931535e1708d89c1d95185840b2e110a3ada2e745181cb98624969e429967c08533f7c2c9cf426c71cd3e24fc831b55d1a6b
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/braa/braa-0.82-r1.ebuild b/net-analyzer/braa/braa-0.82-r1.ebuild
index c22f36d87117..0e0c7cd4ced5 100644
--- a/net-analyzer/braa/braa-0.82-r1.ebuild
+++ b/net-analyzer/braa/braa-0.82-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://s-tech.elsat.net.pl/braa/"
 SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8-gentoo.diff
diff --git a/net-analyzer/braa/braa-0.82.ebuild b/net-analyzer/braa/braa-0.82.ebuild
deleted file mode 100644
index 574816f9353c..000000000000
--- a/net-analyzer/braa/braa-0.82.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Quick and dirty mass SNMP scanner"
-HOMEPAGE="http://s-tech.elsat.net.pl/braa/"
-SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8-gentoo.diff
-	sed -i braa.c -e 's|0.81|0.82|g' || die
-	tc-export CC
-}
-
-src_install() {
-	dobin braa
-	dodoc README
-}
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index 62ce3244d757..4df05b27e1d8 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -3,8 +3,6 @@ AUX cbm-0.1-gcc-4.7.patch 195 BLAKE2B 2c909deab45b4ecce26e243f0d65e838b67ee7fd7b
 AUX cbm-0.1-headers-status-line.patch 1724 BLAKE2B 12a8fd6edfbe34eaacabf4e4093173b429a0307099dc56260d6a87a4c914719afcaf24dac2761ed30d3f3dff003edd0e15159b4df138a1d1c0b00d1ee3b705f2 SHA512 06a4614ece7d265b5604e4021671012d0ec8cece3f77025f9866c6c4193f85a5b7cbea740952dfd7d16cae6798708428fe5be4c06f5684baf9493c30effb867e
 AUX cbm-0.1-tinfo.patch 463 BLAKE2B e985b2f962247dbe2f230580149abccc7a1d8b7ed069791bf30780ca61aa881f4f58c98aed2aa851dd0f78ac5da2587ba316cccc60277d09ae700864812fbbb8 SHA512 51509006d183634a4322ace7de01fde57bbd0d18a991dfab43e7189227f88edc7201d47e3a38826a15ba67047357f39d7a1298788268bf2db6b27aa2a048d903
 AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
-DIST cbm-0.1.tar.gz 310247 BLAKE2B 08d2b7c79795217e6f6e2c72bbf1a4e5af096ddd9ed76c9a61093cd790d7ef2429d2db3d94102c334f1433803d4b91cb297f57185b666554ce84eee5c2295322 SHA512 24bf6a4d68fed253977b965d7e5b6aff4fb9db502c47b4a2b3b36f8c2963c9648b78ae607e9753fe4792a73ddbc29b86b3a1acc3c431a9355b11ff348566add4
 DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076
-EBUILD cbm-0.1-r1.ebuild 700 BLAKE2B 6eadd3da686a4eca79e4e727ac249f6d847da8720afb0529b22df613a450b0fc4ca498585a3156b7c4c1cf809dd9f77f5d11ca1e4b21daf4af4a8de8bc29121b SHA512 fc42b5a193f2e0ee6d2f172f172d5a6c3bbc6c02572785e1471fd8101e1e735480a31e8f06821e12dd5d1a7a8734e607920c6831b4bb93cdadab3d7e858f8e6a
 EBUILD cbm-0.2.ebuild 644 BLAKE2B 4d8d12be2e0f22df0671682acb74db9b0664b16fa69397c080c85e390d2288577d2b210d73f1f533dd1dd0bd0935600e7a086e071451985765931c65c4fc0143 SHA512 b7230fa1e1ceb8abbef8f2de5a77173c7b73cd2fad7205abdc6da649dc18c45230a76506b4167fc421d555e7b4c7fa7952069cb68bd5cfe85a70d8de1f5e6215
 MISC metadata.xml 387 BLAKE2B 0cb8910fe08af4b1b9a874dc196724cd4e7d7f65d3112ec24bacc6d338d2931afbda0755cafc89e2ce844893e1649675e34f37c0baa6d141faf45a7ca77f866b SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6
diff --git a/net-analyzer/cbm/cbm-0.1-r1.ebuild b/net-analyzer/cbm/cbm-0.1-r1.ebuild
deleted file mode 100644
index 3e3c60fb9e6b..000000000000
--- a/net-analyzer/cbm/cbm-0.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Display the current traffic on all network devices"
-HOMEPAGE="http://www.isotton.com/software/unix/cbm/"
-SRC_URI="http://www.isotton.com/software/unix/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/ncurses
-"
-DEPEND="
-	${RDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-gcc-4.7.patch \
-		"${FILESDIR}"/${P}-tinfo.patch \
-		"${FILESDIR}"/${P}-headers-status-line.patch
-	eautoreconf
-}
diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest
index 60c8868c41bc..cbd4f92c8d0b 100644
--- a/net-analyzer/cloudshark/Manifest
+++ b/net-analyzer/cloudshark/Manifest
@@ -1,8 +1,4 @@
 AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74aa87460abbe4348b09e666fb6ec413f77fa9123ef22b00363d61610777824272758745f90c588dfd6e SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9
 DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86
-DIST cloudshark-plugin-1.0.2-174.tgz 143067 BLAKE2B 629ce8ee1fc4f50945228f6ada55a6f4ef88c8aa52cdbccf851a97581d9a2939d4322933747c090aa9261c6bffc619d6f250fa2dfad6583f0830457165ceb8f1 SHA512 42445e67630b1bd2968f0836f625acb3792f22257de104ec0b90c59fa8d2096649eba2252cd6161ce57c8ff79095d52c5663d2fa018c650667896c9905e9dd7e
-DIST cloudshark-plugin-1.0.3-180.tgz 143381 BLAKE2B ed27e2a7102f72e12da9908160a365f511fc3ea568cb9d8b5a2796d3f85bb1c73ca5be7c82ad4de9abb42267ceef4739cad66e369b06a480c85a80b411470474 SHA512 765144e6a2c7ce17eaa05f8170216e08ccac224ba6c11750893ae5caa8f40a2b6bee883fd9be91fa800ad3b45dc42d2ec81e564aa573015a91a8537be8384c73
-EBUILD cloudshark-1.0.2.174.ebuild 1674 BLAKE2B dedf98fdde4cfb800cb2ef1360dc9ee92dd1b66386d1816c6a72571de7e4e136ead887116d4664becd753ace673f47438027a827376530d9ecd703fb50206a18 SHA512 303e58648779f332d5b41ec15f915d65799fd3da007c24b478813a26dc849e0257cb8a8d37952228b1a1048a850a76af29b0730b72ff941c9133238cfd366ea2
-EBUILD cloudshark-1.0.3.180.ebuild 1671 BLAKE2B e3524389c07ae4698131135775ee8ea2bfbe19f5cd819df361b55353f5d3282cdb7831d74864bbe5455a471604edcbcd741a855afd4cf13f087995151e090066 SHA512 12c8ccacbf8c7f25e5760b9541b6f32200a08267a7dfeaf8e8ab8586ced97b7770667feb9089d7571e77b5e7ff2b2538ce8fed1f30d50e0e7a205f7e29e585f9
 EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e43313f5c67e64091bbb681f1ff13e4e10def9b80ed55df1ec0d462239efe67a27fb22a314118d22878b0cad13f8ca8891d2e7ac56d28a64bb2434860777e54a SHA512 7fa81e8be152c47922e249a247e959e3518c85ff4ef47192a337a2b7dae5c7db8cbc994e302286782f65c7897b2369f095786be19d89ab5fe65575a822510dc7
 MISC metadata.xml 339 BLAKE2B 449159f04e85fc4eebd7f95580b2e0f006d4927a5b7891c65fec216f329f2cd6d4ff7af02bf23a82b5925a80d17ed0295c712c3c1d945732e1ab0a77e91ce7ab SHA512 6f455d12f82e69560c68af083929907b4ba2d5389bdd7acc08725609bde578d8081245185a2c4f1571cf89c7693cbd49ce713ed4f4cb529f58758bdfa8b08272
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
deleted file mode 100644
index 14e9a59b9b81..000000000000
--- a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-SV="1.0.2-174"
-
-DESCRIPTION="Easily upload your wireshark captures to CloudShark"
-HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin"
-SRC_URI="http://appliance.cloudshark.org/downloads/${PN}-plugin-${SV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-PDEPEND="net-analyzer/wireshark:=[lua]
-	net-misc/curl"
-
-S="${WORKDIR}/${PN}-${SV}"
-
-get_PV() {
-	local pv=$(best_version $1)
-	pv=${pv#$1-}; pv=${pv%-r*}
-	pv=${pv//_}; echo ${pv}
-}
-
-src_prepare() {
-	#cloudshark isn't meant to be installed systemwide, we fix that
-	epatch "${FILESDIR}"/cs_log_dir.patch
-
-	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
-	#causes errors, looks like it expects windows paths only
-	#echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default
-	sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua
-
-	#stuff to fix cloudshark_init.default to be more sane
-	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work)
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
-	doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt
-	newins cloudshark_init.default cloudshark_init.lua
-	dodoc CLOUDSHARK_README.txt
-}
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
deleted file mode 100644
index 2925d93b8e5b..000000000000
--- a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-SV="1.0.3-180"
-
-DESCRIPTION="Easily upload your wireshark captures to CloudShark"
-HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin"
-SRC_URI="http://appliance.cloudshark.org/plugin/${PN}-plugin-${SV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-PDEPEND="net-analyzer/wireshark:=[lua]
-	net-misc/curl"
-
-S="${WORKDIR}/${PN}-${SV}"
-
-get_PV() {
-	local pv=$(best_version $1)
-	pv=${pv#$1-}; pv=${pv%-r*}
-	pv=${pv//_}; echo ${pv}
-}
-
-src_prepare() {
-	#cloudshark isn't meant to be installed systemwide, we fix that
-	epatch "${FILESDIR}"/cs_log_dir.patch
-
-	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
-	#causes errors, looks like it expects windows paths only
-	#echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default
-	sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua
-
-	#stuff to fix cloudshark_init.default to be more sane
-	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work)
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
-	doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt
-	newins cloudshark_init.default cloudshark_init.lua
-	dodoc CLOUDSHARK_README.txt
-}
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 6f9e659b88c2..66944ffb1d23 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,8 +1,6 @@
 AUX cnet-3.3.1-gentoo.patch 4936 BLAKE2B 18796d6fd211d1539c6e1417aa49d46d68f24df9a9e4116ea83d8bc5d10389d15bcbabdd6cf336db9832d1b695c725ff0f55df1d1316d5783bfa80add1e45f0f SHA512 a0d8e35e998befa7c145ce79e92f8725b6343269a84f8b34a4787cedcf4df8e9f7723c4e44223f556df99892ac0fbd313dcdae1f8e88e2b000cd1eb393fd2753
 AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1
 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
-DIST cnet-3.3.1.tgz 2684531 BLAKE2B 5cb2cf545ccf1e2adb1e50f4220b944361ed44d61857ef4bf0ce30ed9e6346e0ed709bfbcfa339751bf2abc67d930b19decdc6355803426fa1eb4d097a6eed73 SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8
 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
-EBUILD cnet-3.3.1.ebuild 976 BLAKE2B 335d2d78e4fc2e69ca6c733d37b9d5d9a72a2c026564142c30c9b25bcdbad12de43030c364b5a792edd56c436356284974bb17a2955d5ad66cc3ea1431bc6067 SHA512 2aab1f7b7a2041b9f74ddf81b95183dad5cc3e3d7781faf6c9a61581ab3e3854969f30e465bac8e18eba937ce0c2db66028def45b2d35f821dbdecbcf8338601
 EBUILD cnet-3.3.4.ebuild 941 BLAKE2B 888da30d1a962b0f8f30697e70dadc30f362feb3058d3c259ad2317505d92fadef8a7e12798266336b6d3f4e105e2cabe2bf2563e9a7a83cb7044b5d2b9c77ae SHA512 4737df21d2d7a891c53be4ed2cac8ceb72b4eb92d1ea37525a750c6105e85cddc4aa6028a2d9704f5ec4dc3334755f937db33df39ef95a1c3f283c0ee4e329ee
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild
deleted file mode 100644
index e5765dba0c8d..000000000000
--- a/net-analyzer/cnet/cnet-3.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Network simulation tool"
-HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-lang/tk-8.5
-	dev-libs/elfutils
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.3.1-gentoo.patch \
-		"${FILESDIR}"/${PN}-3.3.1-tcl.patch
-
-	# Set libdir properly
-	sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die
-	sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ANNOUNCE
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-}
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index b749c125385c..8f604c8644b1 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -3,7 +3,5 @@ AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af33
 AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52
 AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525
 DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
-EBUILD echoping-6.0.2_p434-r2.ebuild 1338 BLAKE2B 7bd40239a5dc169ed8ba501b81c6993deaa99284be480e5af35481dacb58558abb3f4a525ef2fd85cdef8ac88a6ecce1259c1a657f74b3c6f2bb1ac4eb36dd4d SHA512 816e419112f7bb521881bda550026868b2496f6828d9c975b848fcc46b51758a65c3dba4b0d5856a3d83e09c0a6529bfb5f158ab7d4310921a1aded9c899b2db
-EBUILD echoping-6.0.2_p434-r3.ebuild 1399 BLAKE2B f9a04a415c4db0ae91a3dece244a7d1809c0184b98e09f44fa61adeb582f15d84ba708dda179b32037b5f940bbf7f7547dcd11d033859f049a6a000886b84db8 SHA512 0b3871be5a68ad2884999437362e1b2d16419a3e08081af9b7e321a85445abf1fa4af7c83ca913c2fc52f648a50ba73dbfbbcf2f10d33bceea218da05f1b1bbc
-EBUILD echoping-6.0.2_p434-r4.ebuild 1458 BLAKE2B f4a9acdba9ae31df1aaa776a0361124fef086369072d0ad30de97f31535e5f688e86592a0d5b2200585979daa47a77fe845d4597f62da2932ce7e75f33a37e37 SHA512 7f358016dd82ebf6897136173a604b371b5dc7093a9a6a60d4ffd9f80029f06a8dec1fcd24b2830e56ce288565cb280bdcadf2a4ae9bd621296fa3570637e7dd
+EBUILD echoping-6.0.2_p434-r4.ebuild 1456 BLAKE2B 9be51cd3fad8b56de5be073624526c0f43d4f7072cae3c5436f5c0fbbc93549ef030a2fd1f05b393388231046dc49fca39f200e0b42fb08a177e366e0956a925 SHA512 35bc3f7a304ed977527bff99b7d3e21451020a1736656ebb7b502c5ce561cbed26832569aed15800278755929f75088ba1baed2262ba3c98a1952fa907a61f63
 MISC metadata.xml 702 BLAKE2B 7a3a21935981a54b2fea15c7e02163bedc02e519a1aeca06bf08e61b237bd152cb999a9b1aae62f98499956bf36e2bbf610cf11b1803a25f9f2957e3cc419020 SHA512 db906d89ac30011c740e44f73fad23a4f9b8d8c318b6a0b9240e17dc31c897850ed2f22890b8516633c6a10f44154b77a4c198e851eb8793a55c36497ebb702f
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
deleted file mode 100644
index 3ef54165ba6e..000000000000
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql:* )
-	ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3:= )
-		!gnutls? ( >=dev-libs/openssl-0.9.7d:= )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable http)  \
-		$(use_enable icp) \
-		$(use_enable priority) \
-		$(use_enable smtp) \
-		$(use_enable tos) \
-		$(use_with idn libidn) \
-		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
-		--config-cache \
-		--disable-static \
-		--disable-ttcp
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
deleted file mode 100644
index ea9b234861eb..000000000000
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql:* )
-	ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable http)  \
-		$(use_enable icp) \
-		$(use_enable priority) \
-		$(use_enable smtp) \
-		$(use_enable tos) \
-		$(use_with idn libidn) \
-		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
-		--config-cache \
-		--disable-static \
-		--disable-ttcp
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
index 17e0727353a8..3557e9a751a7 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
 RESTRICT="test"
 
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index 825f542c3196..15e5958685ab 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,6 +1,5 @@
 AUX ethloop-10-gcc45.patch 712 BLAKE2B b7a58c136663860120467fef7e752b957383d8e5e84325bfda20873581673937e669044a67a61b02080570397e5599e207162e430c910e319d4f32db30a9b412 SHA512 c10c7b723698dc6426478b7e9d861a7a88c887a6df3033c8080f51149882925952ff6cf0d0c7ca1d35dcda2c43cb278d8c4475a37d8be3a5a653c974b48bb7b2
 AUX ethloop-10-misc.patch 1760 BLAKE2B f3e22dc20e87bae4d9deab283581f12330ab4535394c1fb1fb787dc7d550a63da64ab936c3b89f06aa3dc218357eaa7ce8a41de9006b62a31c7026f2c75cf51f SHA512 0bb1bacf5103e9b3715c0242844e90007ea68715dbf51abc12c14c845277f6520023c59f4e014cb955552d7dc7854ebe46524e6f5dc2faf47cb145a844fe5ba1
 DIST ethloop10.tgz 3912 BLAKE2B 4cd0ad93693afb2302627b9fcbefa94eefec3d29c55e583c5126aed9cfb20aa7a2d68834fa138debaf767972e7e898245d7297567b322953e1df03b3817a5609 SHA512 82ac0114d0d539f5c057101e1e1f0e2eac32e0bd482bd62e6305f7c4863d0776dcff7bc85167dbcfb136d0b430c9008241c2c0250713beb2703cb052b9b71e63
-EBUILD ethloop-10-r3.ebuild 592 BLAKE2B 7ed809c6d8b0ad043e25edd6d4299a756c5f2b3194f5b3cc806867dcf697656537bb8b0fbcb24dcad0384d0e115c5a17e9b8e9f74fb281718055b7db4818c7c9 SHA512 5e5761dc8ccb7bbe860372ec80ce9c5eb94775a9f4ea62ad7395276e5878d21ccb85b1c990d9a7d1baf4d2e4389532a81e9e0f5ec7204d0264ab73229fef8e34
-EBUILD ethloop-10-r4.ebuild 566 BLAKE2B 910631366a94edb0c6ced18743538cbc6b0db4d87421df030097d85fd535d6295adc92201b3a4f92758425046c195fecf676d6ccfe48edfaf9c2bd915e2453e6 SHA512 ff4c6306d6f61a5c457e343a41035f53e785c75dfba7d9d2378f664d84e72ff8543f6ad4b543a73841192f7e5e86300cbab529b1ff541491a6c119c72491e004
+EBUILD ethloop-10-r4.ebuild 565 BLAKE2B ed6cfa4ee8fc45e88898ed4805c5eeeb841a22dc6d738a4c6d3b6bdb8d3c86575fbe21975a6a3e77d37aeecc9bab377a2613f7c323c8f214bd18a36ee8355096 SHA512 0ac1d22150a61d075392e20a4fa91b744cad5989f0220e26f08909a6312332238f516bfcf960aa6f53038f5e0a641b9fa8eec165ed6927ecbcbf1d3affd5c90a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/ethloop/ethloop-10-r3.ebuild b/net-analyzer/ethloop/ethloop-10-r3.ebuild
deleted file mode 100644
index d49ae392f80f..000000000000
--- a/net-analyzer/ethloop/ethloop-10-r3.ebuild
+++ /dev/null
@@ -1,29 +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="Local simulator for testing Linux QoS disciplines"
-HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
-SRC_URI="http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-RESTRICT="mirror bindist"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin ethloop
-}
diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild
index 4067bea8c944..17108d444276 100644
--- a/net-analyzer/ethloop/ethloop-10-r4.ebuild
+++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 RESTRICT="mirror bindist"
 
 S=${WORKDIR}/${PN}
diff --git a/net-analyzer/firewalk/Manifest b/net-analyzer/firewalk/Manifest
index c6b77607b0b4..f48cb84d295f 100644
--- a/net-analyzer/firewalk/Manifest
+++ b/net-analyzer/firewalk/Manifest
@@ -1,6 +1,5 @@
 AUX firewalk-5.0-gcc3.4.diff 336 BLAKE2B 0ac2e06b910df060f25b892ea782bbb90c94d04c56cf02b297597717b5804a956667ca655b614b291747a6b4988b03d185a1a28e218930e81a4e2ba41b459a59 SHA512 7e6868951f4de1be0572ce1328fb8dd0d787cbd21198cdd84233db80aec40ad17d2748ff2afd98986fc4687357e0c7c411b80c0557aabcb73369ff1d1495cb5c
 AUX firewalk-5.0-usage.diff 489 BLAKE2B b1607306ee554ad0f069d2a2c478bcfc86561e481ad40319088405bba2a223012f0b6b95cda15294885ed16de0a8892b8d22d3a8a86528998f0f784002b8ae82 SHA512 46fd81b4363ff09de7c1d13983c85239a9c7fc9d3aa139d2c0f600bc4235d53475e3f737e41cc56181b876ab9d70cc56cba2b872a619449c2ce60e0af1398b6a
 DIST firewalk-5.0.tgz 80446 BLAKE2B 22580800fb21347fda6ff6290c0fd2f177e266778c2d6ce1087839b5484dfcf8e2ffbb415d90012d71e6d345ba4c95f888fecc902adaaa2903124605c1fcf427 SHA512 919aa6e464dac72a02f8967ccf7109de7d0b3a574f0a396bcf69bacc988ab8e13e8e25932d749eadc898cae2546f8f81014d53ef51429e6c784a16d40da90ff2
-EBUILD firewalk-5.0-r1.ebuild 588 BLAKE2B cd376b361b1339eae396fa450c6ff041481fb5f0550fcd9486a0f70eae6fd24140d504e2bb54b4c35846cf2f161fad3ccb86a87e8f08a7f94dbbb53e37922f87 SHA512 c8d5152dab5ca3b1f28f3314eb32dba2cd6e529e2bda0a4dfd33442b6a052579ef4590487d3a4d9e60c57dd5e3f8f733fec655142a835963cdc7994049614c46
-EBUILD firewalk-5.0-r2.ebuild 586 BLAKE2B 475f1b6c69a00d51ebb4d8dfde3621fc618f255d12c89f9a9c2629c6aaf287ac9d7964d3c9dce71cecd7d4f1b2f952098af906464e8100a3729606c9f4f104c5 SHA512 a90c91e1fe6f9e205bb3c0c48ff8f15636c33b065dc7bfac6b461483388946cff57749145ea4271e41255e2fb311ab84456ec7351b38351ca2e6f969927a70ff
+EBUILD firewalk-5.0-r2.ebuild 584 BLAKE2B 4ca022eed4c11ef50f4c8f9875f18b100cc86a8993601276a800e92ef26e6024c7edc9b4216cf1cc55c5bf03228b4acc683978fdb50312866c7c7b6740f197bb SHA512 d80402af3dd17e0b09969a6f474223122ee233ec14ac77419b2ac970b9c612a077b7ca9d66300613512a92f5bb1a0ce16ff6e09bd1778f868c017f5165fd024e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild b/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
deleted file mode 100644
index e43aa7500b1c..000000000000
--- a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A tool for determining a firewall's rule set"
-HOMEPAGE="http://packetfactory.openwall.net/projects/firewalk/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="
-	dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Firewalk"
-
-DOCS=( README TODO BUGS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc3.4.diff
-}
-
-src_install() {
-	default
-	doman man/firewalk.8
-}
diff --git a/net-analyzer/firewalk/firewalk-5.0-r2.ebuild b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild
index 40b2b60d3a86..f074571d7ec3 100644
--- a/net-analyzer/firewalk/firewalk-5.0-r2.ebuild
+++ b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index 51bc55f08070..7f1c4c88bb58 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,7 +1,4 @@
 AUX flowgrind-0.8.0-fno-common.patch 744 BLAKE2B 8b7f9f61b875a69e0087c526be21bb0c9cc917c38072b1dda47c77d3e5aa9ba9176742314ead8c03b9cb11e9552e78823f85f6d868f7210b3cd86db5f3df5789 SHA512 98ad53bffd36a7241c4091f5bd86699a699c0edbd4044ffc5861118fcde71ed17278ae3bb56ca95c9444eca04394a592bfce2c1dea35b1574d7fd42568b1797f
-DIST flowgrind-0.7.1.tar.bz2 224678 BLAKE2B e5a6759e57950b2484879f6259f9e17ae3fb5a3b49e1e27dfb6c1c89d476dbc693f29b87bf8ab4975fdde30f57dcd9c279ad6508168136b6e2ddd335bba6fc31 SHA512 fe1bc82d8b1b5bbe37989c0d8f24ba87bca73522983b855e249a3fa5e5fc96d9a63190aa94627db2b1bfea63304e453b4bc1c5fd18260fad9bda38313ad912b8
 DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a
-EBUILD flowgrind-0.7.1.ebuild 597 BLAKE2B 0f4c02b4269c21553c217e736b12d3da21c6271cbb49434c71eefc067dd1e989788e94bc7c17756a76a7395d852bf3b7dacbb9726d0d08fe0bbd6b18f6f9c785 SHA512 726e2858f0869f1022957e48feef2fe2f4b7ae6fc2f366791c73e3ceddca03f715b3882688a288d872e2d7a1f9c99d04ec68bc943f7bcda0718a802e6cb4c5f9
 EBUILD flowgrind-0.8.0-r1.ebuild 854 BLAKE2B a5630fad5729ea7c67756cb9b3e79d495c88774067eb2ef0a27740ac1536514309473267b742dacde853f7d2844b4812588de9e3665131e7dc92a4bb56329512 SHA512 ad9e4b5bae3f2a2dfa2c8264017ba24cb1a8f3223bf4be775d428dda09e887482ef2d64c1d474adcb1ed0a0bcbd98474cb7a608772ef9c635020576cadcd327a
-EBUILD flowgrind-0.8.0.ebuild 789 BLAKE2B 07691d97c3ede3cafc3c40a8e43aaf8059f7da5bad4d010c937dcfc1b857f657c1ab4c33303133499a8991d67a1029fa1652949b6eb89c8f48b9c8077cdbc409 SHA512 b4ec07d9ac0b46f139c92d0e18d5ea74c13f2adef5050ddb236d956788e4abc92329d2ffc2f3c700dbb34cf1d2672306a4e5ac8ee2fbe5c51b271e347836b996
 MISC metadata.xml 472 BLAKE2B 8d6d1e17c6f022d5075f2334dcdb92d25f93c81bdb73b182263d87b97796b25859413db86052579a543bdc31eb50de25fe904cf4c396e5c12ce7847bc7b26f72 SHA512 03d9245e17f1411d2c1e45edf41bc7c5fdee8388bfb0f7db01f3ebb91330d80a4055cfac84ce10e7be1090a44320ce7ead685a7420bb96edba6e094d183c9b7e
diff --git a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
deleted file mode 100644
index 4acc5ca2d459..000000000000
--- a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Network performance measurement tool"
-HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gsl pcap"
-
-RDEPEND="dev-libs/xmlrpc-c[abyss,curl]
-	gsl? ( sci-libs/gsl )
-	pcap? ( net-libs/libpcap )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gsl) \
-		$(use_enable pcap)
-}
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
deleted file mode 100644
index 22232ba540d3..000000000000
--- a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Network performance measurement tool"
-HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
-
-RDEPEND="
-	sys-apps/util-linux
-	dev-libs/xmlrpc-c[abyss,curl]
-	gsl? ( sci-libs/gsl )
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_with doc doxygen) \
-		$(use_with gsl) \
-		$(use_with pcap)
-}
-
-src_compile() {
-	default
-
-	use doc && emake html
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/html
-}
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 72d192dc1e87..8df90af737d4 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -18,5 +18,5 @@ EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc9
 EBUILD fping-4.2-r1.ebuild 729 BLAKE2B 0e09d1adf6f798e073347356e687d1bf7d31b950d8dc0cd8630665bb6558bbd259d296156597de1a4f2cb7f933144007610ac7a10fc270fa56205cbb6028c325 SHA512 576c28d07fac7010c5febdeea586e5a0e4fbbfb217a7560eecc07f44308e071b15a95277e969d88469bd4e8a438b85fe918357bb12f6628d204f86503c60aa91
 EBUILD fping-4.2.ebuild 578 BLAKE2B 570b1faf781599b7ad1b5cffbd226bef804fbf808ccaab33712f7cc4874e1434fee0c4ae8c19e6930df4144d5fbd9ced8ae3dc4555f7f2a601dd40299eeff161 SHA512 bcd33d815cc898b6a806560047b584af353f00515bbc5f3a9c2203083b2faf7eefeaeaf58b800803d1c8f939fe94b50377654f4d448da36a3ff257a7138e1eef
 EBUILD fping-4.4.ebuild 724 BLAKE2B a51d93dd39d228d94a28c2a28bb5559ee7560927ac5fcb6b7bdcdcd8f2c8d85aee2d52c69ff114967761cefb0803cc1ee30f00afd8897b6fad527f06a4311ce5 SHA512 025d2cf95e10f8ed4a9e6f04848d546c9840af60be844a964e2da03405ea542f6f09c3c97e3136037a53f4964491e07c56f14030e7894c30bccf1126c8330313
-EBUILD fping-5.0.ebuild 724 BLAKE2B a51d93dd39d228d94a28c2a28bb5559ee7560927ac5fcb6b7bdcdcd8f2c8d85aee2d52c69ff114967761cefb0803cc1ee30f00afd8897b6fad527f06a4311ce5 SHA512 025d2cf95e10f8ed4a9e6f04848d546c9840af60be844a964e2da03405ea542f6f09c3c97e3136037a53f4964491e07c56f14030e7894c30bccf1126c8330313
+EBUILD fping-5.0.ebuild 719 BLAKE2B 98ced5b720717b803a90cd638c197df5507d59038d6a948eb8d3f2c6d8d5f44998d60ae5c7004779fa0af70cf1a954f03bc38b132fcf83a4c8814b473c04e73e SHA512 a66671876fdbba80c0f12e82a6378b7615b61682a3bd7f9205195ead0738ddca9d13205fb41330e50fa06607087edd0ca2607e4ec1378391ae6a3053c75e5fd8
 MISC metadata.xml 355 BLAKE2B 6e4fd15cdfa76be00db905cfbff100e3ba30fbc04f0e5fe42cecdd7f66e3c2478ef626b11d5f0be2f43e5526dc6022b1334a5c51253396f3b582cf56b28b4a8f SHA512 036f801bf73918249011ac68a06d0b1e29e5f8685209cd70a0df02b9f43271d57222f4250f973b2b65b7b0c0811598ff0179e0ea09ec70683abf99a14dbe48d6
diff --git a/net-analyzer/fping/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild
index 4233263233bf..facd0f94df8c 100644
--- a/net-analyzer/fping/fping-5.0.ebuild
+++ b/net-analyzer/fping/fping-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 suid"
 
 FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index 457d81c75a51..e84cef49aad0 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -3,10 +3,7 @@ AUX hunt-1.5-flags.patch 507 BLAKE2B 2eccfe6119d07770fa6ddeecf7de405ec8fd2f3d283
 AUX hunt-1.5-gentoo.patch 377 BLAKE2B 728df0a5a8eb29c039fab217825acd3162e9ec58ec1f73e854d3e10b981b6835f387592d0be81c622676fdeb6966b28243e4adb57d4e4e9863b9e3c759e4f542 SHA512 f2f499ee496112fd89e632565d393ce4af6e358481a47de4418490e87c90128870cf201274a39fe92b7e01044e3d182fb0c30d370161917bf2bdbb8961491799
 AUX hunt-1.5-log2.patch 387 BLAKE2B ba98751feb2a4c7544ac6c238016071fb01dbdbd81ab8a6a08df64b3adf8ac1896a8e883a4295c5681ee806c6528191ceb2ccef293705ab188ed5ea59efc872b SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff
 AUX hunt-1.5-tpserv-log.patch 3426 BLAKE2B 23ef690623d82440e5749c42eb78c48e3226ffbe9b8aa1b59e1f63bf0595aa9f52c091c0897ecc8fa28d974d0356c472227416ed51d0909b3d3af9c22d94c1d4 SHA512 7690f0e1089b1767a1d4349fac66fc9897c542482677c54f77732b4377f561387301982c7aed60a15973ec2f08d2901d936fb86d6ad516594639441eeb81f289
-DIST hunt-1.5.tgz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61
 DIST hunt_1.5-6.1.diff.gz 4556 BLAKE2B 74c27722ae61494ca922b013cc691c0e835d7cdcc01399aaf7fe9bc7da4532954c4da2023fc92e3a4f664bb2b5ab8ef22ff1c04694dc1ab7c205125ccea1ff84 SHA512 45ff3f977a32202d8ab9b7daa76a0ebb507d0b73d635c0f3649cf3b2bcb9fdc3094c9631d696dfaf27371bc5fb5eb62dbdc258795979755c7713a45357938a05
 DIST hunt_1.5.orig.tar.gz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61
-EBUILD hunt-1.5-r1.ebuild 673 BLAKE2B 52bc3e41d1e9a0e49bf7d63a7e6b1d1f56e75d0143176a52d9fc4f3fbd6d5637f1d716bbe852945183cdee39ec3b9ba340f0c00afd84dea09290a0e6639f3601 SHA512 a9efe3c17f62afd6b7cec5f468f60494da5bce16dc2ef3a2af2cc93c27245ea5f67f1456ef3e3a76c21a894a65611b2640151c437aed8103cbb6c6a6f0e7f757
-EBUILD hunt-1.5-r3.ebuild 689 BLAKE2B 0504ac8d1999897fd5e0509d5c6e522df144fd0b258d63f165f57411332da7776b85fa6e1bfd64289b34e7cc88d1298315edb617131ebe5326beddffc19fdd9b SHA512 4e459769df7a4c42d1b2a269b01ca5ce51a47666ce73a4a983e62b27df284b9950e568a8b95c2c3ecd274ea3021499b37f8ba3673cc7a0134ce17a995c98a9f6
-EBUILD hunt-1.5_p6_p1.ebuild 1144 BLAKE2B d9194774128ad2151134216b39de45a55e31790e50c10adf028983bd41eff38211c493d4ea4dd04dd276cd780ce7caad363d4c4754ccfc8e3a62117a3a9579e0 SHA512 8aceb3a846a4f01f8611dcabdcd7517522878c8272f7431acc4b72a9a61372f6015be65f36090a378cc2c37ab80205e51578d66eeeff873ef4a9a6a487d1e494
+EBUILD hunt-1.5_p6_p1.ebuild 1143 BLAKE2B 2b785ce5b583608ba118f3415f23dae20047a905053f4bf914a7dc0e1ab3d706deb281abff92f0d1b81c30ef446e47800260755e8d5930fc4e57b6dc46284ce9 SHA512 f1287e460f7197fd616c1f6492aa1cd6e2e10449033dc6397282366e621666090ecf902b7e9c7d26e18ce2bdbd4fa376907af0e2370d9533cc0613e0370cf22a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hunt/hunt-1.5-r1.ebuild b/net-analyzer/hunt/hunt-1.5-r1.ebuild
deleted file mode 100644
index 299342dba80e..000000000000
--- a/net-analyzer/hunt/hunt-1.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
-HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
-SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's:^CFLAGS=:CFLAGS += -I. :g' \
-		-e '/^LDFLAGS=/d' \
-		-e 's:${LDFLAGS}:$(LDFLAGS):g' \
-		-e 's:-O2 -g::' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin hunt
-	doman man/hunt.1
-	dodoc CHANGES README* TODO tpsetup/transproxy
-}
diff --git a/net-analyzer/hunt/hunt-1.5-r3.ebuild b/net-analyzer/hunt/hunt-1.5-r3.ebuild
deleted file mode 100644
index 7e824be3caa3..000000000000
--- a/net-analyzer/hunt/hunt-1.5-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
-HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
-SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-exit.patch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-log2.patch
-}
-
-src_compile() {
-	append-cflags -std=gnu89
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin hunt
-	doman man/hunt.1
-	dodoc CHANGES README* TODO tpsetup/transproxy
-}
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
index bdcca2f3eaf8..ec3c6e7a044a 100644
--- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 PATCHES=(
 	"${FILESDIR}"/${P/_p*}-exit.patch
 	"${FILESDIR}"/${P/_p*}-gentoo.patch
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
index e296547d75ed..ac954d84bfbd 100644
--- a/net-analyzer/ibmonitor/Manifest
+++ b/net-analyzer/ibmonitor/Manifest
@@ -1,4 +1,3 @@
 DIST ibmonitor-1.4.tar.gz 17025 BLAKE2B 33dcd54d3750b5e0dc70caaaf30f58f1dc2215cb2ba24174fafbfa356f27ae98133407505038df19104e9f8e1971ed4f8bf9ffeff37196d4640e90a4054970c6 SHA512 ef74dee22dbb88d07c37af9aaa0a0a49b6c49ff1b45a1637d06acbe32e4bc4e84d79cfe06ee7ba2b04d62fa3cfa0a10605eccde549d2fe04890dfa179adf20db
-EBUILD ibmonitor-1.4-r1.ebuild 434 BLAKE2B d89504185f9f6c378b20b20fb64e411e7220e079643d58b2c0fdd4fd67f401948a337fa566e656a75f1da317550b18928bd2cda0466d512b543d146c108c6e2c SHA512 49ac733724de8c67a929dc2799ab9706b3e639116c967c44935e988e9ba66cf0105c1a27693c3e1c3efcd70b440bccef874d144ec956f8396c7e1cf871d4c1c9
-EBUILD ibmonitor-1.4.ebuild 439 BLAKE2B 76e0911b86cda1372f75e177b9f4490db3d92c21831d5fb195c5e2101d79b208bd06e12ae0b8f6bd67810398305edad111f3956266731e91a0829504d483c18a SHA512 53f8da152024f2eb3db29855ddce44365c213e931901d7b567484d1977cb8ee8475447e9fb50c12ddfbc0ffb9383024b6285e5da3fc95b9785e302515c84196c
+EBUILD ibmonitor-1.4-r1.ebuild 433 BLAKE2B 76b16d31ee5e6f44923651c2161762dd0772210f6142a2df332d81027045c8ce41539ac4a532d12247db9bb0eb83dc9c23de50f6796ae5f5a106cfa14e90084e SHA512 7bddd623b45008ff4500af1f14e515f2fec75402d354a3f77b4200798e78240064d846fcb9afaccdd2d2ac7832b28ef84712a9490ec0a95d3f58eb8f61a3a31c
 MISC metadata.xml 359 BLAKE2B 8885ea2805f5ef76dbec58e1cddbbaf2df2ae0447ed5448788afeff96f35b51d62f07fe05e86f7ff34f6890b2b88bd66155c815c6681c6dc7753e08c70b8b0cd SHA512 a86cf3607c903fcc1ce55ab441ddc138653d40eb196e175d211998e11bc850427789d00ad466a3d2ddf990e9a61876938914499992b5a1b56595e7b220a8a31d
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
index d40390197c37..4b5b559a57ba 100644
--- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Interactive bandwidth monitor"
 HOMEPAGE="http://ibmonitor.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
deleted file mode 100644
index 6e388ee87fa9..000000000000
--- a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Interactive bandwidth monitor"
-HOMEPAGE="http://ibmonitor.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~hppa ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-S="${WORKDIR}/${PN}"
-
-RDEPEND="dev-perl/TermReadKey"
-
-src_install() {
-	dobin ibmonitor
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 0598c1778a1e..d9701255b8a9 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -7,8 +7,6 @@ AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a91
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf
 AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
-EBUILD iftop-1.0_pre4-r2.ebuild 931 BLAKE2B e39c863df202fa76f0923696ac9abc9d2e3ff69251726e82649329212ae6faeea587e192684a0ccfffaea43c84ed671254822feea7bf2e6bb9355f9bd4255728 SHA512 986734bdbdb493b2e8c630827df7558caa34b2ab45483f989d7ced5318f0c5ba057b1a0fc9a2e5a767d3240a0b293c0e4d6b7cea3173d8161ea84d08319a0176
-EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6
 EBUILD iftop-1.0_pre4-r4.ebuild 1101 BLAKE2B 3920c705944d92899631b3ea460c77e6f2971d6dab0a0bcd5a937cd5c4c7539b5455165591d32e34342fe6e99f40ac371e74ff87f4206c775ef6385d8fd89f72 SHA512 97b4e382d2dedc6269997c057fe3788d9dab07fe5c5431469e21114eab38f1b15e7838d74d4354c0ae05be1e24491135c53d10ea553c8cc85cd35954ba238b11
 EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
deleted file mode 100644
index 7ab2fdef1a8d..000000000000
--- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="display bandwidth usage on an interface"
-SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P/_/}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.ac.patch \
-		"${FILESDIR}"/${P}-Makefile.am.patch \
-		"${FILESDIR}"/${P}-tsent-set-but-not-used.patch
-
-	# bug 490168
-	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
deleted file mode 100644
index aede14d946f8..000000000000
--- a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="display bandwidth usage on an interface"
-SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S="${WORKDIR}"/${P/_/}
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.ac.patch
-	"${FILESDIR}"/${P}-Makefile.am.patch
-	"${FILESDIR}"/${P}-tsent-set-but-not-used.patch
-	"${FILESDIR}"/${P}-ip6.arpa.patch
-)
-
-src_prepare() {
-	default
-	# bug 490168
-	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 2471322dfa2c..b32f8f349378 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,6 +1,4 @@
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
-DIST ike-scan-1.9.tar.gz 1412689 BLAKE2B 97a18ca35a80b66859e2ab99de916041eb9c9d869f96bbd799be88079b84022dcc2ecb5df2cecefff793192333da915957adc6b0c3d4bb376397941d4a731323 SHA512 c586ad4d485f04398c2800af5ced1392eee0f7f7d7d117602be45134a47442b38c4fa23fbbf137af5a37298b471a6bcdd6e94559dde695d06e96dd39f0681906
-EBUILD ike-scan-1.9-r2.ebuild 854 BLAKE2B 0c43f0e6fd898b87dd661ed1ba724abf70c5c7643868ef5beedcba5d1def1099c7e9a8940dc095d195c4ce31fe120e44623c96cd12d200c45954d6ae34427566 SHA512 25548c44a017fdfa1d8cf891046b9f978c4b6e592c204a1148d5321e2891da374e0e7763a4de8f85c18a6998b3d68e16203f5eabae1606daa067602b40f75958
-EBUILD ike-scan-1.9.4.ebuild 800 BLAKE2B 60f3c73677ffcee8c43580ebbede9e175a2925bfc9f9048b6ee40a515ea4a833d6f1b7f20a3ec198536626cd25886e47e73e05583a703f905b01237568620694 SHA512 ca6824eaf9e7692dabf7058c7bfb80a01e3e8336c4bdfc9c356cb9a1cef58e5b9c3273ef56cad6a20f094f27b25f2a0a67a3a9e400c6562d577aed553457ad46
+EBUILD ike-scan-1.9.4.ebuild 799 BLAKE2B 60b375af9cc66b4a08e63c50b96122c9462ecd4b1496bf5664c8065710bf8aa22d95f14bfd94edb35ae11b30ef881f7451e2b802fe14e2c41956cb0439c6c5ce SHA512 a30d6ed9efcd5e1856aeb5fe5a1338737250a737b802cc6c665256c8790eaa4e127fc7f69639cee45a8e59ab86f7f91193b001486782a61ea808b5e0cd0ab618
 EBUILD ike-scan-99999.ebuild 761 BLAKE2B d1f557c9c7ae94406351c2cfde784b333dc73d960e49614b697589c5c36c7edc07f4de92f25f7561717caebbfe220e30a28306d34ed1796fe1d4407474fa5fe4 SHA512 c9946c1673cef61a6589e800eb343397742511659da254b2f2ad0927bd94e71de91ab283d60f148c4da0c717ddea2d20481ebfddf7e1e878df9c512d6a909056
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
deleted file mode 100644
index 8792715b52a2..000000000000
--- a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
-SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="libressl ssl"
-
-DEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix buffer overflow, bug #277556
-	sed \
-		-e "/MAXLINE/s:255:511:g" \
-		-i ike-scan.h || die
-}
-
-src_configure() {
-	# --disable-lookup prevents ike-scan from phoning home
-	# for more information, please see bug 157507
-	econf $(use_with ssl openssl) --disable-lookup
-}
-
-src_install() {
-	default
-	dodoc udp-backoff-fingerprinting-paper.txt
-}
diff --git a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
index 8fbaa0ed31e5..9237de4dda56 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="libressl ssl"
 
 DEPEND="
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index 14155df43543..de9df2e49c91 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -3,6 +3,5 @@ AUX ipband-0.8.1-gentoo.patch 353 BLAKE2B 5f8b29a75aba4c673bf6573df4f03f864d636b
 AUX ipband-0.8.1-postfix.patch 447 BLAKE2B 4c9f9b89b401e3530be636b87c9ece2fe80b63a60627e1eaf4909ec9cd63b6d21bed34ed30354b4466d959cdd866253d8316db75172061580c18775c8fda318a SHA512 9f7948e6bbaba4c7bf9c0fde4c21735a176b522a5765f8c05b4747dabdef1a80f600d2dbb95a24561346edde294f5ad8f3d60a139130149fa320f03701fee9a3
 AUX ipband-init 449 BLAKE2B 5307c6e1aa5c0d1165737a3ad2c01eeb3ef338ac30ef8496973cc5c1d340b0e805093bf357ebd84c7970aa9f6b36cc048fed1911809b69e06e18466c65d4470b SHA512 0a95f80bbfcc26c089a196ba359812a3292e08f378e94140605d2e4d378c60528af013738268055028c40d45b769317f6f631f1af9330f983172c92180999467
 DIST ipband-0.8.1.tgz 36675 BLAKE2B ab0bab6a455fd7fc8193be8b94d7de6c8a781cf3ad7b3a79866deb5fddff834dd5e752163e55007d34c0852fc8ba7ff5b20095b9d5d62bb0db7ca62c72c83b72 SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f
-EBUILD ipband-0.8.1-r1.ebuild 735 BLAKE2B af55a858f1663175871afb4fc64bc16e87403c2208d1769c5e50b4991f6f8f6cfe76a9a6ed62bf5956cc87283f9a48993d1612eff33226d2233f278ab5388f44 SHA512 6439330ff316aea465e36cc46aaa7b975fe1d80be4c48cab259b907f2cf442338b3f7507b4d08b3cbf045b6c9f148918719ada77edbc9d8d898dcf1944c19e55
-EBUILD ipband-0.8.1-r2.ebuild 725 BLAKE2B b221424abc864193473068eae1ffbe8788855b16ba2f53456d5bbdb477c10b6265a4a829b8766d494444af193e29ae977f5e3e54790c019da8de322df522dce4 SHA512 6a6459f90c73453d6309c204b90dc90e85abfa8f6b0d897e4754bce5803f00962ed3aa73c3c763fb9f83627543bc5feb40faea117651636cd8a845956f6a9649
+EBUILD ipband-0.8.1-r2.ebuild 724 BLAKE2B 2a01ec0fa01513c3ce992dcf8b856b34c087ab69c8b3919fe0e5b25caee2b227089d09928b05093d2a8ca26abcd61bc7f5644451af028dafd801195634d94f9f SHA512 a94a81d539ffbe4bd650a5b1b841920d1856c4b4b997011040da10f8512880b5a40da86c7609ae46641cb57cb6d6862dcd1f712ec924ab3eddaca003a7e89c77
 MISC metadata.xml 356 BLAKE2B 2a7264932ec2f44d0f36309d4c4cdcac45257f4d5fd6d61a6feda0f8ba2be066ef497b4021dc27f7802271d1ed3d7bba0e8a41d44a123c5eac7f6f6a6004b804 SHA512 6c8c90ab34232d8be24772a9dca38941823d65270cff167a9ac3eff89c00d447e881fa2dade1201dccece369a7c6e52fb265ff15e33799c8fccfe3adf2c56399
diff --git a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
deleted file mode 100644
index 1e0feff597c1..000000000000
--- a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,36 +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 pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities"
-HOMEPAGE="http://ipband.sourceforge.net/"
-SRC_URI="http://ipband.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND=">=net-libs/libpcap-0.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-postfix.patch
-
-	tc-export CC
-}
-
-src_install() {
-	dobin ipband
-	doman ipband.8
-	dodoc CHANGELOG README
-
-	newinitd "${FILESDIR}"/ipband-init ipband
-
-	insinto /etc/
-	newins ipband.sample.conf ipband.conf
-}
diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
index c0d621602ceb..9c04a837c52c 100644
--- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND="
 	>=net-libs/libpcap-0.4
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 3d513ecfb7c1..8a12ae8654eb 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -4,6 +4,6 @@ DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10ea
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1325 BLAKE2B d27a62d5195b922cb586cf4fa65b6e5af4f4deb81ac4b854c0eebead7b6cda8a2e9a21fc94e184f6a2e02aec33a28964aebaca1620fa4f17b5a56d9d0a276a1b SHA512 62c3d031eeb0629adec93ef8347f8ae252633092a0ed372806304979e450ac7ed3513873d598795a98c564b6d847e698f3c0e7808adc3f253791f21b49e6ccf7
 EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5
-EBUILD iptraf-ng-1.2.1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5
+EBUILD iptraf-ng-1.2.1.ebuild 1217 BLAKE2B 86b513e6512d3e50e84c137f7411aadd460263ae0f146921fced0bebba4d12f15148d802ebd692c6b6ffc4c7d6d25f8a5a2de403d8b44328b0065f7a1da8f43d SHA512 3d8b85657fa9f99eca7e2c9d7e5722d1744634aa51d1aa610471e7d8ffb4dfb016892afadc9b2334acbaa9c5d9c993f54722e19c30b743af229848352ac3b127
 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
index bda05a1a02a4..643acfc262e0 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 0572fda1ebab..9ce56c5c36d4 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,6 +1,4 @@
 AUX iptstate-2.2.5-gentoo.patch 675 BLAKE2B e24ec3afa9c75a097d0a1d27c4e63e125b909590db52e49a8789ac66e00ea308f5e63b2f7d55a09fbc6de728db5812563ea3e31b9908386cd5ad76330b4e862b SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c
-DIST iptstate-2.2.5.tar.bz2 28270 BLAKE2B dd9369462b689a2e4fe7059666d384c34a265f03c7f6133d1f27e61eea7f8db4d3e96633b1b273584b6097c452da502d88b417d4fe23f83f494c767e377799e4 SHA512 044bbcf96225cc52b82428792d685d19f964520f7f20a9d3fa7e53430c1f552c0f09338a5d347b08e2500206cd7634a6b4a3acffbfd9e59e4657afb6df461795
 DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
-EBUILD iptstate-2.2.5.ebuild 734 BLAKE2B 16b20401bb0ce96455bcf5453504700dda4b38af21fc54bb9d6aa99fe37a197c7a601fb771682d1f7b2118da126142de9b260cd52ec879e463ae880b9efa9027 SHA512 1631187026134fde778974dfa8368c00fec587c32292738e82b32dc70f5e214c5e7b25c5b8d65f8ee8f47f0c48d43376ed4698338acda8188321a6df61c3d784
-EBUILD iptstate-2.2.6.ebuild 783 BLAKE2B f31fbfb0580d7bf0a71b49764e9cba33c873f5654395b1f18b234c56278811a102982053c9117ddf90d1ed80d6c215b1c860ea61389aa746e9fc380b194958ed SHA512 69400711cf96bfcb0bc7c07af93db76d7da28a8c031454b2a3e443e15a7acc5946b527d78278845c9658e82723e8d69e888b60f811ac64df4b5ece1f31ba56c8
+EBUILD iptstate-2.2.6.ebuild 778 BLAKE2B 253e3316bf2dba271b93c401b40588a70049a4aa4e758557e86fe22d4528cebbb9f06717e6fc6143ebd99fef296f9dd0ab111870aff7e38112cab583a7e1606b SHA512 9b13e2253bc7cfd1adf7e95c19064c73f933b683245f32e0cba10148ee827d5fefbb96ee5c898cecb7a5d4c51da36f724938a1087823f13c13f979674b81b5c6
 MISC metadata.xml 413 BLAKE2B 4290cd85dc47c36f7f77914c9efb8031d0ebe9324112318fa4529daeff17c4df442aac7b97978fa399c6dc17ad65307f19ca7de70f9c3c21d07a9c96de69bac0 SHA512 d2bc802f6220c831ecf4c13c95d24e71032aea4b81e54a359eba2c6212df5cbb0c2ae00d2687bbc94d917b863917905b862bedd3f27a3eb7dc9239c06315bf7e
diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
deleted file mode 100644
index 0731ad67040b..000000000000
--- a/net-analyzer/iptstate/iptstate-2.2.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-	>=net-libs/libnetfilter_conntrack-0.0.50
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	tc-export CXX PKG_CONFIG
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr install
-	dodoc BUGS Changelog CONTRIB README WISHLIST
-}
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
index 7a073736f1e6..0f85670270ce 100644
--- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:0=
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index eeb6a901bdfc..41988854dc4b 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,7 +1,5 @@
 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-r2.ebuild 797 BLAKE2B e951f243097015fd039e03711f83346cd65b57b9d9b1ea799df0182093b34581c6c0f75eca3833eaa87826a59eb5330a18a924c6164e00515e07d53faef28062 SHA512 e2d5cdf2c81b941f62c54832a8f2b03774540474491694b243581693fa61391174c14ce2947d4cfa7d95e1450a8d7ab075ab26001f96f6b5d5518cd4db10afd1
-EBUILD labrea-2.5-r3.ebuild 845 BLAKE2B d4a799401c9aac57385191dfef319bf17a92dd836db1bd10266d0b902e41c7dbeb7f7781482f6885d84dd84998e9602d349a96017bfd77675f409e465cf3c2ab SHA512 9c0f79e5552afb66cf0900582f4cf0dbe2c61a331dc0a9e563628e0ebb415f6d03c4de285c3dfcdbba01fedb61cdd7837ce2d25bc06aa24bdecfbc4f2250413c
-EBUILD labrea-2.5_p1.ebuild 903 BLAKE2B ecadc9d77f4dc4e372a767268bf8e792a6495d8dc1f4d4d63800c7b61337ee05ee0632a767691e792d84f9e409fc9d08f86ab75ac1238ca2aa72fc079a90b0e4 SHA512 767b6eb21e1db806ce432ad98a218ae242ec3f536995f6d726d946ac0922947c3d84b47eb5f251a2118cb198d713d772454761e31ac34e08dd84f4eab9d704e3
+EBUILD labrea-2.5_p1.ebuild 901 BLAKE2B 70891ed7bf83635f59a2f9aa715ea1509e6cdd21e698245d7c454c55d8ad8c99dcdb93a99ed27b2bd1df9f1863e1cef3c833a716b9073ebcfa2a1bc9ecb8f4a3 SHA512 f679291c0d3bbe7ebe3c4e1d1fd0c64fca5be0c1c709fa9a48babdc3c2a9fe496ea5051cd7fbff58c9b6a320d13b62b988014da51c7e77005177ea57dd25fae1
 MISC metadata.xml 356 BLAKE2B c78b737ba6e150b7abd18c22da130c805177c64bcb197c2d7909b5a74a35484d87a5a45b4b968cbb0aea0bdc3af6499d9f8376f39dab4df33bdcf3cf82f28e2c SHA512 1b4738687beee35bb3fd628d1d5c1fa9e16b7d938f21644343b23a6c7aaa5b6e760c5342cf88485265ae11f6d00c073e8564b37fe1dde4543323de069f8115a3
diff --git a/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild
deleted file mode 100644
index cdbff85668a0..000000000000
--- a/net-analyzer/labrea/labrea-2.5-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="'Sticky' Honeypot and IDS"
-HOMEPAGE="http://labrea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap
-	>=dev-libs/libdnet-1.7"
-RDEPEND="${DEPEND}"
-
-MY_P="${P}-stable-1"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stable-1-incdir.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newdoc INSTALL README.first
-}
-
-pkg_postinst() {
-	ewarn "Before using this package READ the INSTALL and README"
-	ewarn "as the author states that it can cause serious problems on your network."
-
-}
diff --git a/net-analyzer/labrea/labrea-2.5-r3.ebuild b/net-analyzer/labrea/labrea-2.5-r3.ebuild
deleted file mode 100644
index 1d43736622c7..000000000000
--- a/net-analyzer/labrea/labrea-2.5-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="'Sticky' Honeypot and IDS"
-HOMEPAGE="http://labrea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	>=dev-libs/libdnet-1.7
-"
-RDEPEND="
-	${DEPEND}
-"
-
-MY_P="${P}-stable-1"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS )
-PATCHES=(
-	"${FILESDIR}"/${P}-stable-1-incdir.patch
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newdoc INSTALL README.first
-}
-
-pkg_postinst() {
-	ewarn "Before using this package READ the INSTALL and README"
-	ewarn "as the author states that it can cause serious problems on your network"
-}
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index 5c375b86225b..5fc9881601f9 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index 7a80fd51c62c..f33235d352d6 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -3,5 +3,5 @@ DIST macchanger-1.7.0.tar.gz 396848 BLAKE2B 7a6e5cbf302568884363ab4023033b53b1ad
 DIST macchanger_1.7.0-5.4.debian.tar.xz 25084 BLAKE2B 65d39333e07a4c89da7e622aaccc0f2cab45af8d84721c3d39c457dfaf3063df872812d07860cbe78634159b0a2944e75aa54c11f46eadc37b9d4a23fc81b629 SHA512 b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc
 EBUILD macchanger-1.7.0-r1.ebuild 827 BLAKE2B 37ea254281948010006d9c4d8a2bc367890ce5f3f01018c8948d6bc11619ea0c1b0bf9dedba72f166c44c4b7130084552c53c4db89666322f008c36341318be5 SHA512 e4ea29afaae5fef4772bc7f35b050047ab4c0b8338dcd99c3e1ae9548a2f484b75796161e07de1d774b723080fd349c06e44d4a64f1293bbc850d2b594c7fdc8
 EBUILD macchanger-1.7.0.ebuild 786 BLAKE2B 5c254408e09b2c9ac7d3be4f7c96f50619dc534b25de339b8bac9281c250bd5d9f5dfa73120e2d9b01c27a54cfe8735314cb5fe7594d3d650f82b6d71ead6497 SHA512 f41d16d66bb5bfa112b988fbda7d70a0ef21f8d638811bfb2eacfdbd392170c1fc3767e702804c2e2d62f54efc2d4509e0cd8404eca7532d6872b443bf8b76fc
-EBUILD macchanger-1.7.0_p5_p4.ebuild 1321 BLAKE2B 3503a74e4b91f35ce59c25b511ea83b08711aa62734c53a52bbff86c790d76e9fc571ee83bf84e7121469e4ea17107ae9368461edeb3495f52a79bea9e3ddbb3 SHA512 75bd49df807321415287dab7165473b9dcb6aff8f20de43d60708867938bfc9c9b763ed7709f68206bc09ba6959e055f90f578ab9d0e40945959a0d977fcd262
+EBUILD macchanger-1.7.0_p5_p4.ebuild 1317 BLAKE2B 672afd58dc3d16cbb3266d2c7349219ee64e81d07483c5b81c37fcf45e4c33ebf550585849fc13e918ebe30b514987d03af123c279ce09cecfbb4685f88c1b23 SHA512 8d09e195e8df485550961ddff8f7adb19fd1789c51112c4c38870642e3bdb0b3c16265f186d6a09f19fa4f6b3205c6ece1d9773c3baf7d5dfbc65a757eeb019f
 MISC metadata.xml 473 BLAKE2B 4bc062f103c20f1f68bcd0242fee42a5e5c1b8ce862f336fda153bddc6294ff7e382edd5fb4aaf7091b1701cfb88b5db82da3f1b0cce7d8bcc4ef0141ef0536f SHA512 f328b70876919441f61939ad0198c98acfcae561b3eb27beeb6d09d565191f64075a63e7f99af6d69493c6100256fb2cec0a3b60b62c7d28fd41c885cedad4a4
diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
index 9a9c1c42dae8..84a233813719 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 	mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz
 "
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
 SLOT="0"
 
 PATCHES=(
diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
index 8fb6a01ea408..6fcac31b5daf 100644
--- a/net-analyzer/mbrowse/Manifest
+++ b/net-analyzer/mbrowse/Manifest
@@ -1,6 +1,5 @@
 AUX mbrowse-0.4.3-flags.patch 344 BLAKE2B 84e36e46bf28cbda61458c9b43df300c691b9e175035175bc751799ac6feca151ab3aa5deae15b1809c1a96da6442093aafac6ee5dccb928cbf7e04ec98949c9 SHA512 46b27bc97436a714f6c36a3690c1c935c76d74ba32bbaa4904a6522654ec61981df58ed48c6255357404a3af904c322fea01658abb1bddec61cf6071dbdc74d5
 AUX mbrowse-0.4.3-fno-common.patch 611 BLAKE2B 6c01824e75927a0d49c831cb6e2e668a25c2da539ec6ed7b9e1dd14acfc9e82ec2297e8bdb5b4baaa2ded7276022f55dbbca471fdec15ed920ccf5c8bd5d153a SHA512 2d6ef84299eeea297926f4366863ae53b1ccca89b4fca8b7d3fefe6a7113000360e5a44be65356d4028f0501ad2fcc4699974b0d65f6d56979d31aa93ee24f2c
 DIST mbrowse-0.4.3.tar.gz 146028 BLAKE2B 32b33dc4ec10a7b7ece07c47280b703c871e83a41f3cd8d60f7a177925da9c269020d927b193e8550fe15356c55bb4faa47c195354bb7784553601fc39ef00b7 SHA512 adccf8de707611034db0cbb6a37117f6a4741eb92656eab0e9e5c6a8268b17cc66080ed9663fe59a3fea9b110d83bcff9094b5fec133ca7ceb2650fd532a6cb4
-EBUILD mbrowse-0.4.3-r1.ebuild 702 BLAKE2B 48616bede69a6fa7eba0c46c66ff5515b6d1c3168f10c8de27e44ad93f779ced3dfbe2388cce3d6c9d8adee27442b65f20bd50b8471fb97969544b23a4f5d11b SHA512 2c4041248c1155c3157f7c007c38a41082f2c8ccba84ad7238da989aeed9f41cf44c8abf8d7ec453ac75920f052468730ff11a7a05c16f4f6d8066c75424b148
-EBUILD mbrowse-0.4.3.ebuild 572 BLAKE2B 88cbf9cc7a4e4dbcf17264eee44137d23e0f3069296fc05700d47158a2263a1b6a8474a83859c31418e2f485fbfbbe7a12b8e2424a5652e2f359985a2334b052 SHA512 c9984d298f30a081068ec8de858c1d7c3a195af2a74c3fc82f4c85f7e801d8aaa1aa27c057fcb8577e95526c98c5b7c1f15786ea556aacfb4c41b80b369e367d
+EBUILD mbrowse-0.4.3-r1.ebuild 700 BLAKE2B 52b224020d704eef88765b076655ccd48e2c044f8234683ec1032298d04ab42fe2ba559d851c5a76e71a39ab4912d75bddd1de40592d26ad2713154b4c2363ca SHA512 b305d49ddfe45471f806a8c17b5cc55eba8a58396467c67caef998ea90ebef2c25595185d6a46da2e836af2da0b6119001a05edc9dfadcd9f842ef7cd77c7dc9
 MISC metadata.xml 357 BLAKE2B 725053ef04034d1a1c6272ed485156e4e2a933ef149a5df00d6a6b8b03bd48d6a1b49564c25d7d91ab78673d49e23f8587b7af091ffe20848b21a0bc157b2ac5 SHA512 5199c9147351e6dc733c1b8f2edaf598d9ae32d0a72de149a2b1550a4aaa1081d80ee5ae175fd9dc4de7e65d177055ee9dad006a81a268f8af6f8497e202261f
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
index ab930a39ba20..e19a12d41812 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="
 	dev-libs/glib
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
deleted file mode 100644
index fea497f3bb7a..000000000000
--- a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="MBrowse is a graphical MIB browser"
-HOMEPAGE="https://sourceforge.net/projects/mbrowse/"
-SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="
-	dev-libs/glib
-	net-analyzer/net-snmp
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	sed -i \
-		-e '/LDFLAGS=/d' \
-		acinclude.m4 || die
-	eautoreconf
-}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index a6016f1e523f..9d4834e07ed3 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 EBUILD monitoring-plugins-2.2-r2.ebuild 3009 BLAKE2B 69a9d48f0d952aa06493cfd5e0bfe86e7d66f12a4211d0809fad6cd462a2fff617c8e9836ffe5af7d9d2c0072ab8d2f107f52e3fedf220fafa0a538649bbc27e SHA512 18f697f1b1737993dbe856a4ae761d133392693e38d5b39daf711988165c394af4365af2ca7e65e7aad23a45a93ff7d2edd465eda3ef35b5ff69eb3de8042e52
 EBUILD monitoring-plugins-2.2-r3.ebuild 3021 BLAKE2B ea60af62f811f8d15b982cdc9ec80994b6321a530f99081f26d60fad1636b9ac62b2258c4c5aab9aa4dcb5787bc29d22761f2fbef55edcd78a27fa916916367d SHA512 747e16b184b92b5fe3e00e8937c09d07a6eafc584d1234b453bfcf2c0c40e1158647b348e3209db6bf536bfe50ad7913fe2258f300d901573b77135a5afa2dbb
-EBUILD monitoring-plugins-2.2-r4.ebuild 3029 BLAKE2B ec56c0c0fa7b861873a9f07ef27eb0cdb4282f19f0a75e676a94c785ebe601df2e0b3f11163af6835c917f4cbccdf7ee01788c17fe70a654dfaf8d8040d3bf12 SHA512 f9607e6a9b3e359a09d09929760a16e7be7fcd02487386ef3a9222c7c2a462fe350ffa501d1b4e9b761e11a09e060f749a1c52fcd205d99df58cda5cea2bc3b0
+EBUILD monitoring-plugins-2.2-r4.ebuild 3026 BLAKE2B 5dcedf383de5985195d90e1d01194dd3414bc05f54b98a058d45bee42dfbcb3238b66d079d968e3912ef203a636182b11ff21c5328fd80359d56ccac965908ce SHA512 664b07c16bc3aae7b76202b4e446633c0df1832306bc315fffcad2f830a7b001a6829d9457b9d9cccf3230e9f49921229f4167b6ae3a407e23052468d4b2445f
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index ae1073c7cae9..405873b347c7 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index 2f301cb1406b..1c5b51ebeb78 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,5 +1,4 @@
 AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
-EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
-EBUILD nast-0.2.0-r2.ebuild 818 BLAKE2B 4e09a57133a58359fcbd250f512f98164b4df85eda000b8d0eaa047784446f16b33a8c2adafc0b4c784564145b14e2df113ee57eadcd314a96fb7ce4d2ce9202 SHA512 0d79ebdc8d3ab3f7e42d28e2177c07006ff47f963ff5d22463deb551a4899cccd6bdae354b8d20856f9e18d3fe2126891bd6ed5fdea004ca3e2db55cf03263f5
+EBUILD nast-0.2.0-r2.ebuild 817 BLAKE2B ed86d93ac0c02e80bb873ba88585b763b3ea11f8f620da406a3dc83cbeffb9ab9b3fc31ff8f77cc8f78427c6f2edbb403c89758f33a5864a0273b40c9bf835af SHA512 7570dd2b8457c12c3b7a63d549c9629d91369e28dd857ff4a1311b60ea0fe8f5fbca1d8c4e7a471dec6c91a23d82803684fe23e960651682a427f9bb69ee1363
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
deleted file mode 100644
index 9eefa451cd9c..000000000000
--- a/net-analyzer/nast/nast-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
-HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-IUSE="ncurses"
-
-RDEPEND="
-	>=net-libs/libnet-1.1.1
-	net-libs/libpcap
-	ncurses? ( >=sys-libs/ncurses-5.4:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin nast
-	doman nast.8
-	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
-}
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
index b2e8f7dd0342..bc1d6e76e220 100644
--- a/net-analyzer/nast/nast-0.2.0-r2.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="ncurses"
 
 RDEPEND="
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 4cf50aca3f4d..2fb5f348397b 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1,8 +1,6 @@
 AUX nbtscan-1.5.1-gentoo.patch 407 BLAKE2B bb761c5eab9b74d8988cae25ddb48662bab855c5ef4682acb29d4e4ca10f8fff4d3ef7d7495e1b684dc6c3d258197f32a04179c959184ea6ec8c7e8b6e994c1a SHA512 3bdfb90ac71eb599ec2eb3a8f83c3ba7d821da8cff9b5692aa03047f8212a88a9730c6ef3f20eb9aa250500aed5b49d287859be1d5b3fd4542a1cdb90c796d9b
 AUX nbtscan-1.5.1-includes-declarations.patch 954 BLAKE2B 7cbac59c29c3472fef5a87abee1bdd456f82dc5893777aaa0afce40d82aefdecefc53e60e822e9e9677a26315f645eee1069f8ac53cabda7eaa0a83361e4de02 SHA512 793499744b91621462802a6c53c1ba3e53de0537549b1f48047b81f7b34aeb1d1fa4b6dbe3c99048139061b05c2b5db19d9bbd9cb4a74c735a756dfb52843cc3
 AUX nbtscan-1.5.1-script-whitespace.patch 3784 BLAKE2B 3d8651982b85f1adc09726e90367ec40fd14db5480f5a96157ff379e54b955af0040d438fe78381284374c7574b803977d8f741616b90244740af33effe49c30 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6
-DIST nbtscan-1.5.1.tar.gz 82107 BLAKE2B dd49ee25995c522f3cf75e35cca427be7a2b5e697b374323b0be4c6a92a2a96c9e30ca1844e953354f3490ed4090682592e1c0ea5192512b2883b1085356783f SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e
 DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb
-EBUILD nbtscan-1.5.1-r3.ebuild 732 BLAKE2B 32fdb12758993dd8756c1ff1c294969625396b6dc81d3e46e39efad2323f10da45092c78b48e993f58f09ec7f155fdac3d4433f9afe53d668fbaab24e10ea586 SHA512 ea8369d076b29812f78a6274e53d48ef58b9b6eff9e982ccd3ab6ace20a6cac69acebf6639a9228fb4ccb6903132f13165e4375465f53b29bc6fe36dff409eb6
-EBUILD nbtscan-1.6.ebuild 682 BLAKE2B 84b949d9ec3fb593588958d8c33ac5fa3723445b156241205d6c6f7b44c9c5372aa7a33b8b789736401f2ea54544e9d5de3add74600050c23b4eaa83daf0c4f9 SHA512 c227ef6f981047dd2be8677747424b352061efcbfc66e242784200138cf4db25a06f481a36f87133dbc826a4ab0639e0cd6b093da9bffb1e332b6adcd1267127
+EBUILD nbtscan-1.6.ebuild 679 BLAKE2B 4296c0705c408a0e82eec941db81158cbfac55ae6169dd6bddef8246d06e942b5b486453945bd1dc3b854b1e347a717d9e2b8ae677dacb0c2c51f4c6abd04352 SHA512 a2e0970efa4336ecf9e71950d12b181042d9c4e7658cd51fbe3c6911ac26816fb1b7c0be459b3aafecbce91e4bbef37c94f0e48cc3dfaa47fd68fa65fdddf052
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
deleted file mode 100644
index a7ad294434ed..000000000000
--- a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
-HOMEPAGE="http://www.inetcat.net/software/nbtscan.html"
-SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz"
-SRC_URI="http://www.inetcat.net/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S=${WORKDIR}/${P}a
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-includes-declarations.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-script-whitespace.patch
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog README
-}
diff --git a/net-analyzer/nbtscan/nbtscan-1.6.ebuild b/net-analyzer/nbtscan/nbtscan-1.6.ebuild
index b1b5e1ef9c21..c8ce98992d77 100644
--- a/net-analyzer/nbtscan/nbtscan-1.6.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
 
 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"
 PATCHES=(
 #	"${FILESDIR}"/${PN}-1.5.1-script-whitespace.patch
 )
diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest
index 5cf6d60ba204..10ba975fa1da 100644
--- a/net-analyzer/ndsad/Manifest
+++ b/net-analyzer/ndsad/Manifest
@@ -6,6 +6,5 @@ AUX ndsad-1.33-strncpy-overflow.patch 351 BLAKE2B cfc16b4b85620a1e20acf228779226
 AUX ndsad.conf.d 286 BLAKE2B 1cb53d5a324ef0aa5e4535299815427d74177d911f517b9d51a201af821623d8990f4e5a57be2a3e8d23065f4ce323dcb97f82ed6d22440208692e3bd6276baf SHA512 2b2718d6cb638ac6b2a75a7b041d0eaf3629bc4698e4d978cdd196866cbbf5f3965ef3e6052d7af1dcc22ca5046558b36393275ec0c2d025dd1cfca8e2dd6f62
 AUX ndsad.init 675 BLAKE2B 3b6eff620021d8be3ab938c8e17adda4488214657e0d80884285cddd702167ad2817ae2df46014962aec6556f2f67af0ed4442c6cf29492ad94bad760833e595 SHA512 f08c02ea457e2067e170cea8c2860ac12ccbbc4dd50a27f308e7b6884afa7e2ca8a7cf2f2d627002c43c13c4bc710727579fd22e043105d1c3f135de9cfdb500
 DIST ndsad-1.33.tgz 214614 BLAKE2B ca8e0f983d14cb43148411cead699dc140ca0cce60266b0aae6cb1836c643bd5c5d7aae6c34ae372af83a20e0e9ab39f92fcc46f2e2edbc70cf3968ee9b824dd SHA512 38ebca91f28d763ce334d92361779f100ee6b98d6d17485bf096f913f777e8525add63bd73aeea43321cee622e10cb88020aca7af492fbafdd50cf740510bd51
-EBUILD ndsad-1.33-r1.ebuild 905 BLAKE2B 540ba5fb53cab1fc45a88831eca7e222882049904c08dd77743c7ccb54065a75ac628b15be67f6376bb9f76f83b7682067776445ccb2b1b6659bbe394094d3d4 SHA512 4fd73c4234e8e08284e2c21501315203feb814d6ce73c4140a9e5f71772f3a2fcdd119f682bce8917ec048876c205db1a6a91c2e56d7794ffb8c09680078adcc
-EBUILD ndsad-1.33-r2.ebuild 854 BLAKE2B 06458be1e1c5665868c257766cdad06a1feca486ceeb3e40f6deb0a53ca01cfdfea99583adac0b122800fcbb76959b644d52817dcc1120bc49837dbc93a04283 SHA512 20be2483348444283a262667b7dce91298af0009e426fbf256c91b6489caf11215ecf6f4f500ad5ccc33311c7d7492c6c7a40874731bce19cd2690e3ac3d9562
+EBUILD ndsad-1.33-r2.ebuild 853 BLAKE2B 411c352c05115ed37fa951dfac997dc21cf3d2051cdcfefeb8c0e633735587b3b3dcc1ec0e61fdf847c4de7db45a6f355acd4fd6aed8d1de622a56fa69813ba9 SHA512 84c0f719a41d87acf65c7a6e670e853794557b982eb9db02f8db2085e3ee9b0312fd517e0e9e937c3ffce3dc77b4be176840338899c5578ef6001696d88c59e7
 MISC metadata.xml 1271 BLAKE2B ae2d1adc298d9987342838550ed7fe1081b88198b7a6f24825a78356db0833013429acdeb6836c4e7f90cf1bb9e2961cc52dded5d2857d6baac2a3f00f5ab0bd SHA512 9db4f4368820e30e5b48f1ad9c49e245348c57a37829aec25b699d863e5e56f565f52c948cb6a2b63efd4c54c4feff204234e2d98bb8525f767d55701d14ce3f
diff --git a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
deleted file mode 100644
index 5ccdff9433d7..000000000000
--- a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources"
-HOMEPAGE="https://sourceforge.net/projects/ndsad"
-SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=net-libs/libpcap-0.8"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-conf_path.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-getpid.patch \
-		"${FILESDIR}"/${P}-log-path.patch \
-		"${FILESDIR}"/${P}-strncpy-overflow.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-ulog=yes
-}
-
-DOCS=( ChangeLog AUTHORS README )
-
-src_install() {
-	default
-
-	doman ndsad.conf.5
-
-	insinto /etc
-	newins ndsad.conf ndsad.conf
-
-	newinitd "${FILESDIR}"/ndsad.init ndsad
-	newconfd "${FILESDIR}"/ndsad.conf.d ndsad
-}
diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
index e7f9a919a4a4..2b5139cf5689 100644
--- a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
+++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="
 	>=net-libs/libpcap-0.8
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index adf9abe5878c..f3ab28e45adb 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,10 +1,6 @@
 AUX netdiscover-0.3_beta6-fno-common.patch 837 BLAKE2B 9b980d3de4565b4c139b7a325873c6602eef4825d7874ef79e94759a71fa07209c607548f89d46a44cad1be52c5bdd49fdb567c10d154cd1701c2a69dd873ccb SHA512 b4ce0c7c3b152a95f08bcc1190b971b632b325af8ef10d0b21ea5ed5b17b890366d7ea79eeefa3422e3906f447fa046051122795738a66574c738d5c629f8ddf
 AUX netdiscover-0.3_beta6-gentoo.patch 668 BLAKE2B fa0f3080a27e41029e604b0018ecdcb5569ddec556cf0ff8da216128b6c598a0f48ffa1a113d92b8c5b3e91d92a75d30552a493e1ae2805fbc62101f7f9315df SHA512 f05aea3f8ef120f3f1a33f1dfff401fc5045cb6e71735dcdc135bb33b5bb338eb90fb442d474a0e8a993df5d67f70fcd676f12c582ca1509d5550724d4f53b99
 AUX netdiscover-0.3_beta6-misc.patch 432 BLAKE2B 740fd53b60002d4c5577a23ad492d268f4c75aa4057b999fd3ebccecd187aba15982c1e94ff9044d1a5fefc46ff51ea31deb57e6df58de72eec24f179c2bf867 SHA512 bf67008aa25558d2a8d1a2a5731fdafb555b5336db2be3ffc6f15e89312341eff9bd351115a2cbd21078d823f4b79a81f0583b0380d44eb617a2770838c07de7
-DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151434 BLAKE2B 14a406b766cc9dd5e3bbf98556077b51c88fe7f4aab46a45291b35a5fa4a38d33d86ee7592c6672d7c3b573893bca285f04ec22cf8735f090d3444e795774838 SHA512 936f030bac30cf54d1b9b6bb23045c2cad201a21529706436ab0732c356dc4ab27e3f2a8472437f9ac76d9b819ebc6d8faa05405be13d3d6beda5e261ebf93da
-DIST netdiscover-0.3-beta6.tar.gz 411018 BLAKE2B 319ad0d4589867ded2747794b6c0074a68285b2abdac57a4f569f92e9bf09c71c7e9db64400dcce9aa44804d202d7d2fc2c0d427b92a9f99ff05a632fe5a794c SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2
 DIST netdiscover-0.7.tar.gz 356514 BLAKE2B de880e124d1ee52c5466cf843ad3fc7077c9a673867f117f255791da9fcc8444599bf703515ef04eaa0f3fbc8ed50951bbd6cb147b1eb18020e06d35a90ccee4 SHA512 e526c1560c4054c6a2761d392997629b301c50db2c408719e84a820f9ad206825b9a4620e6721dcdebbb5c7479cd239e85de2d0657f97015b103805e8f9c05b4
-EBUILD netdiscover-0.3_beta6-r3.ebuild 806 BLAKE2B ea2b8deecd4de9eec8fa06a85b9c93321070a4ec3077d454ba2766a69e979a6b0d8f5181701a22b65c1537acc76b291718f6c5da7fe5395912d31335a89e2fa6 SHA512 0ab1f50c3c82a95996ecbdbbcb61c09281bb58ff4a3561f73327a7ed26cfc0ce2f23ede1e2984b5774e89b36bc9da2d1ff9684c2fc21f54e88b31b8212319366
-EBUILD netdiscover-0.3_beta6-r4.ebuild 835 BLAKE2B 59f29c798abaa3d3b00c69e31d63e4b5f709a99dc872e9342d8f6ece2cfa62f86e351f73649e3bde53bf208adf352c7b149c2ad1696bcfa35179ca7d69c1ae8c SHA512 2a29385c3d687f5d0ef2e9237875af40bb45ba78ee373c1f1391c46660154f7ab1c3d162064f04fe238172958237e2d1fcfec111a7f5f2419de13938918f6978
 EBUILD netdiscover-0.7.ebuild 666 BLAKE2B 4b8b7e603e5e211cab03b8cb7b3f64a6121b26e511377054ce4bd8053c9d6cd8fc320e62c2ed76aa5cce97c6941f609dd304b561c0e8e2c51cb274a366bdc081 SHA512 5d867270a314032b76b01c6ca1e3e03eb941e3e7c1309484aafed0fbeea4270993567382fc35561c05b90375980218c5c89a4298a8d1d4f519eb711910e8ecab
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
deleted file mode 100644
index 77fc58fcf331..000000000000
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="An active/passive address reconnaissance tool"
-HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
-LICENSE="GPL-2"
-SRC_URI="
-	http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz
-	https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2
-"
-
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.3-r1
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_/-}
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-misc.patch
-
-	eautoreconf
-}
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild
deleted file mode 100644
index 264eea20d328..000000000000
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="An active/passive address reconnaissance tool"
-HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
-LICENSE="GPL-2"
-SRC_URI="
-	http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz
-	https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2
-"
-
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.3-r1
-"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P/_/-}
-DOCS=( AUTHORS ChangeLog README TODO )
-PATCHES=(
-	"${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-misc.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 0213f46c469d..f9c6cdd15116 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -6,6 +6,5 @@ AUX netwatch-1.3.0.1-includes.patch 489 BLAKE2B 9528ed80f11b33652824e9239022b85e
 AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc6b89a215c979bc3086b3d4a5834af9a4c461dc24ffee4163c6d544f1e3f2eaf2fba7e638eb0ceecd11e1c00396e0 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54
 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
 DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
-EBUILD netwatch-1.3.0.1-r3.ebuild 1004 BLAKE2B d671a299e4e4ad06b26774c37b4b8fbe3d47bac238927e48c7f9c7efbf62501ebac117e5c7787d82abb57d722586b92bc92b65e8795302f1cd70cbcb49d88391 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59
-EBUILD netwatch-1.3.0.1-r4.ebuild 1000 BLAKE2B 86158179f80a298a250376ed784d0275e8f9e9c54b5c8d390d445fcab3edfe3dc17bd55a13d332a3ef5e4703d5bbd6b887bb9d0d8b9830206bbf729f0abb37f9 SHA512 78b635977bfae6c3997a213ceed364c33b64d76767475f4e37a0d9ce5f42fb13aa9799a1b9a2c5c612df3b753f375f006098f950cf6ddf69ede5b4dc4a6d5cdc
+EBUILD netwatch-1.3.0.1-r4.ebuild 999 BLAKE2B a3b45439e6990af3dc189ecf97ea0fdd9f0bdd85b37282f8e6cf548fa82a03513058fd52fe8738baf2cb2704b7a6c0b458805739aee9baf3995d3b35de6af1ee SHA512 789bceef3363ee9724fda0f52add9abc898122c32ef862ebd535363821ada9dd75ce76c1bc1839e9ec14e547e14969f21990c0cf1eb408cc087b6a03b1f94e3a
 MISC metadata.xml 274 BLAKE2B 75e74aa7e81d0d0097bcd02f91b106e38607e8c17cd10ecf224e3423d3b117d6110bfd0345a723b1e84a4b5d63ab07e8be1661e71f83eaaffcf6164d780e8858 SHA512 1d248e6ffe1a07fd1e2d6ca9f83f8108d8d5941b5067860e8c8daf5cf383446d21008f9fc1555fa6d3b045138173661e0426fb68b923969ffec027bc858bd53d
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
deleted file mode 100644
index dda5375c225e..000000000000
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Ethernet/PPP IP Packet Monitor"
-HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
-SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	sys-kernel/linux-headers
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-append_ldflags.patch \
-		"${FILESDIR}"/${P}-open.patch \
-		"${FILESDIR}"/${P}-fix-fortify.patch \
-		"${FILESDIR}"/${P}-do-not-call.patch \
-		"${FILESDIR}"/${P}-includes.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin netresolv netwatch
-
-	doman netwatch.1
-	dodoc BUGS CHANGES README* TODO
-
-	if use doc; then
-		dohtml NetwatchKeyCommands.html
-	fi
-}
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
index df6024cd6534..df2471e3538e 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses"
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index b5454a3bf76b..e3019aebbaca 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -5,5 +5,5 @@ AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.45-r3.ebuild 1050 BLAKE2B 405266d7b8805ff562241b5ac72e0a0319754884b64934e71c650e63577da53e18704a32648bc72c1aae35a4036606c4922169d10a3e2b8d481632c141a25ce9 SHA512 6bdd2ebb0b45d9c7744243a0f16c193b3d4501b10716ffdf614774a9ba63168be8d14c2b2795322b41469e820a3aeb511e57343ebbbef01abc45292192af93d0
-EBUILD ngrep-1.47.ebuild 984 BLAKE2B 74ff3a0f7b20c56af1b0744cb2a71e0a0f11fee4b74cbead47344ccec5e73a4faca58e0213938072941acb64aebadaa5b65004caebfd8ddc08daf31f1f4da51f SHA512 066075c2dd4e8efc9aae2166cc341b464132135a19ee102e1ad9672de26036f7cd520852e188e088e69c3aa0304313094bed95d0b6e2fa109ac4241b18f84c28
+EBUILD ngrep-1.47.ebuild 979 BLAKE2B 78529aa9d657cb4ae93b4c6c3efe6006cf972603cd20195ac676c85c4524e42c1ef4e6a4ccbe09ae05239acf7fe7cae695bb04a0348546af0620ca7ee5068158 SHA512 b4a45c91ed963233026443fe6505a092b971451fecfc7578b2ed01ffe98d25ec15f1807aed0bbf23d2b76e84e513a3d9b5a37ca033d066bc93bdc40dea9d9076
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 5b7b863658ae..3fe551bd7997 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest
index 78ea3dd69591..650feef6531c 100644
--- a/net-analyzer/nttcp/Manifest
+++ b/net-analyzer/nttcp/Manifest
@@ -1,5 +1,4 @@
 AUX nttcp-1.47-format-security.patch 3620 BLAKE2B c7244ea75abf91297b682ba4a585e463098ab21f54544b67d67ca43b687410ed5bbf4126b2a26b54c2fe1dec25374b23f05e677783f25150907f26c2c1717150 SHA512 7976fb58cbc6f15d93f0e4485cf9477bf03b3794dcebe9b0905c12250279d23ff3f34a6dee30e961d38cbeb85e4a97daaecdffe89adc7136ccabecf31bb794ea
 DIST nttcp-1.47.tar.gz 25693 BLAKE2B d15ae863bc49d2a26ff4b07de0d0dcfd94213126aae5be79fde51df8744316d4a4116ebc13e9cc5be81a87e11730b6e45b65002caa43160c698520756b6f9ca6 SHA512 eb0a5aa0633555a6e4c3834e99666cd0e00d41da5d82fdfd2644a9f59727236f1b24fbe810272cf9cfb96d76361b028bcf57025008570dbd6b0d761df5cce625
-EBUILD nttcp-1.47-r1.ebuild 577 BLAKE2B 8a761fdf6ad936c3f037f886da870f045d433f5e7031649ba68e9a2f7c6b27c0393f222d650652751dff401ac06188d257bf6def40e40c7ee06eca58784202de SHA512 1047838a6a4889deacc9203d2c98d5d62c6654700f70d4402c0c07751c4786092b2f8756305441d50c2dac61f5779ad54621c9f430c39c9d0d0073e7e5a585a8
 EBUILD nttcp-1.47-r3.ebuild 577 BLAKE2B 37ebff0d6b719aa1f619615df708dd64a7e4db7cf46510a945439bd85ff3711b538d9b94819cec4e8878e71abd44e1fb9c1b5db22b21b0c4dc74e12857267593 SHA512 58e74de3d225a95a6523014d32dd631fdc795c19e6d32238305fb8d4d6f9556f12de1c22df3dc7bd5cbe8d3f5cbd1867a34fd46e88fc2b535151106cf03d6469
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
deleted file mode 100644
index 5d6f49f09066..000000000000
--- a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
+++ /dev/null
@@ -1,30 +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="tool to test TCP and UDP throughput"
-HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
-SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
-}
-
-src_compile() {
-	emake \
-		ARCH= \
-		CC="$(tc-getCC)" \
-		LFLAGS="${LDFLAGS}" \
-		OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/net-analyzer/pbnj/Manifest b/net-analyzer/pbnj/Manifest
index c1081b148282..115f30c09d38 100644
--- a/net-analyzer/pbnj/Manifest
+++ b/net-analyzer/pbnj/Manifest
@@ -1,5 +1,4 @@
 AUX pbnj-2.04-ipv4_sort.patch 355 BLAKE2B 86081918c4077cefb114e75009c18d43e16e1debdd27032d4baec9cf5408df8b99377714e154fc4274feca019438e5635736309a69c4d14e94908b737963c198 SHA512 cecdc0ad7348682614ffb22a53a804000a2004dcef2d1c9d172b3fd9a684348dd07134ad1de6c421009d4c67b9571f8ca6dc6eb3095a604e2def39401cdf365e
 DIST pbnj-2.04.tar.bz2 57438 BLAKE2B 43b057fb95e74cd7f4d8d11e905fb6c3734971295db13116e94250a7665d28f5a9bb288b5ba07f50c7426a9a90664ea90bb790ad0aea87c24838398faa3ec0f8 SHA512 7f486c4e16a891d90ff10fa80b85ba68346f37152c5f932832c3760985f0dff5c58e0f23309ed395f0c06ff4287bf4af66d1b39de7f2838a868e6b8335afe206
-EBUILD pbnj-2.04-r1.ebuild 732 BLAKE2B 58eff20a310ae7362cd058b62922722a4dfa45efdc9d038890ad74d94a6c44898fe430932ce59b913ddbf892e0748b261a9023960201891a7e1459567bebff1c SHA512 2030ef6ce558c502ef15f092f1cf16c9b91a957dbce59dfa456be71eb962c2f2fe42c0d155d0817024e487d40fa1be65e323a446bc4eaa09c7075ec61c0b56fa
-EBUILD pbnj-2.04.ebuild 560 BLAKE2B bc62b1c436dcd802cb418520ab05d4ab48249a1eea68ed833da533305728ef403972c6fe969e586513c7b28b3ea34c8118cac6805835747310dd76bbbbbe5afe SHA512 74a9321c4118429e2014596f3802d0840d100440495f5a1a657d4d870d76cde1172fcedbdff6f080f2e5baf3a4f3c2407f5a7b70145cb221b8144cc90f460248
+EBUILD pbnj-2.04-r1.ebuild 730 BLAKE2B 10d048392169c6eeeca733edcadb8628cbe8e0e3efd0017ed6329f0479879cdbc46d12e2d85859100e2401d7263c977e0bc7bcf10d9876c819e46972a8077cde SHA512 333e51a6e9d062c2a69057c2f36e544b55099c02374b86c725c13782d33276bddb2b6211d2c1d8da5e18db5fa40ecfb72c5725fbd87fc139ca92c010652944bb
 MISC metadata.xml 364 BLAKE2B 807335b7d101c779cd839046363f44b2d208636286b4e7013efcc7c2fe257d82391fd5151c098d9bba49bfb371a9cb78759b5280948331ba9b598416fbf17c93 SHA512 cbd77dbb09b911704cd44e430b7513254998eb0fd1853d2c6a158d8c72145df56e71a54229a8c540769bb2cd502195249e23cf3fc38f80268643389617e42b2b
diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
index 22d8615ff550..e62cc418dda4 100644
--- a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
+++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-perl/DBD-SQLite
diff --git a/net-analyzer/pbnj/pbnj-2.04.ebuild b/net-analyzer/pbnj/pbnj-2.04.ebuild
deleted file mode 100644
index 1c04a49c3a0b..000000000000
--- a/net-analyzer/pbnj/pbnj-2.04.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="A tool for running Nmap scans and diff'ing the results"
-HOMEPAGE="http://pbnj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-perl/DBD-SQLite
-	dev-perl/DBI
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/Nmap-Parser
-	dev-perl/Text-CSV_XS
-	dev-perl/XML-Twig
-	dev-perl/YAML
-"
-RDEPEND="
-	${DEPEND}
-	net-analyzer/nmap
-"
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 665c8e7148b4..16e8e9e6b0be 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,8 +1,6 @@
 AUX gtk-2.0.m4 7539 BLAKE2B b129c696c03264551aed12e6c9d0bb46dc83141b6a033280bd4abe0468044ed0384f0cc66a48980ecbce826e3d105cd454f61540a33b8a9990e013df5945f900 SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e
 AUX pinger-0.32e-tinfo.patch 907 BLAKE2B 8b6f43e44ec59353c1c59a4af6de4aab254182e4b55fa1f518f7c4bc053ec9659f44f676df4b4469f380779a1ce2485b05955cb399ac1b7834d63090fcc590e6 SHA512 690b3b669d225c55641fce56d91d287a2152c0546b15f728761ec869afc311a49f831b38642f63f999958e20ba6ce2855efc2a5c3aec6ab2a752349cc375904f
 AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c570677ce60cff01a4ce517f1557256cdc3c440049c68aebd642c4d92d76b29cd56ef18da1d9161e06dac20504ce4207 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730
-DIST pinger-0.32e.tar.gz 239002 BLAKE2B d8fb905eac4cc84271196fb96503be512c18356668ddef943af028eac9aeb61a0836d3e85ee1c45546a0f88725e0a883947d5c3f38030b55b857d4be13af196f SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7
 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1
-EBUILD pinger-0.32e.ebuild 963 BLAKE2B 1c0423ba478c8e01343d5a6e95c5fe7d3a26242dd800f548ff11b6b49e9fedd00581c66d9dd2cd5171e4548b27ad0917b2585b932b1a2512c10221e21ad6c4ea SHA512 fec43c39c305884e437f13b7ee4d9f752ac3b2e650e1778a676fe7099ee421b72e0dfd72a2be72d8351267b6b6faf02f7e8fce675762aa573dd2d198ae05cbae
 EBUILD pinger-0.33.ebuild 1078 BLAKE2B 06914b03d4a01a297ab2076a2339acc5c2fae072f48594a1d19803ef3861c8e9250576e7843724806b1c0bd8ab1bc5d7d36c301fbedb3e92e1a3db4bb6f1216c SHA512 f51daabcbb7e8781955b9232b51d3bd5589be2ce0c724b30f75f9ddd9012168879a51813c93b52a1b185e63c2389027c1483a76078582d9691a1e1e7b6aa9bf9
 MISC metadata.xml 477 BLAKE2B 63658143ec172ecc577c273faae8655ca0e12b4c2e4b518ed7a046875189485904955c4313e69d63bf158a0092b6338fd9673461ccfc358f716e3446e207f04a SHA512 ee9a6e27f4467c86d4f3b2069cc0202f249d2c1d4aa027b6c0a87dad61f7d6b9097faf64848a5d4b5d88300fb5c29cdb7532cb1288bca017d178f3d1e4cd95f0
diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
deleted file mode 100644
index 85b142c36460..000000000000
--- a/net-analyzer/pinger/pinger-0.32e.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
-HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/index.php"
-SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk ncurses nls"
-
-REQUIRED_USE="
-	!gtk? ( ncurses )
-	!ncurses? ( gtk )
-"
-
-RDEPEND="
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	ncurses? ( sys-libs/ncurses )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README )
-
-src_prepare() {
-	# bug #494636
-	cp "${FILESDIR}"/gtk-2.0.m4 m4/ || die
-
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-
-	sed -i -e '/Root privileges/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE
-
-	econf $(use_enable gtk) $(use_enable ncurses) $(use_enable nls)
-}
diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest
index 1a1635dc4d28..d50f7ea88bb3 100644
--- a/net-analyzer/portmon/Manifest
+++ b/net-analyzer/portmon/Manifest
@@ -1,6 +1,5 @@
 AUX portmon-2.0-fno-common.patch 995 BLAKE2B 889ae8a440efcf4c6b9cd9ee6ec3a29a8c0b5ae80d4a5fe119729a19e3f01c6d0faa9220766fc6ffe1522e4c8fc7adc3c80a441026b1c26df99e3139165bd47e SHA512 d79091359494924e8c838695eb79beb215e534dc50021dcf767112545b20cac215056f492a2aabfa5a168de8c07707d8484e3feb5f32df768b68fb53e96027f2
 AUX portmon.init 633 BLAKE2B 1989ff9f35abaf8f5e4ea2b86bec3d7c4a708d70571554518077f3b327f2cac2be7e98a1bb5838169cb6f0b45d351160c9ea31acee96458bfb19aaea7ca8f0de SHA512 7bd26de7d5031c79afd3c2a04ca6f4e95af994c552973c89951a39d49a22b2856d02f7d9eef885fc26fb59a0f7063799230fb161682047debe70764565228eda
 DIST portmon-2.0.tar.gz 107246 BLAKE2B 0f3d33aecca7d41a5af08c656bdb9665c9560aaee78dab7b02bf330d21ddde3fcc916a06b7b48ea1ae305b5188e62073065a8c745fd31310415b47ce3b29a733 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25
-EBUILD portmon-2.0-r1.ebuild 652 BLAKE2B b9d507e4d7a9dc88c079e54d18652aeb5018d361748fd67fc885359f0ece81e554c7ec39b587ebc6c27c522737fa9c55f0bf74499909a0b6e331cc5bf6a92d2d SHA512 5007643b187229e05f586e11c05f08476d4acad8afdd5e92a4d928680cd891ca4ef8e5fb7efb3845b5e52ca1cf5f5b4bf7c27647736b099d85e1694ddfceff84
-EBUILD portmon-2.0.ebuild 601 BLAKE2B 04e888e88c17c06f5544dfd17a1b68e0b5a57d6e70b6798956b8dc3df5a3a93e3788e2ae55cf75a045cf3b8e9791715cb55a1e37e7150eb56484b1301eefc364 SHA512 c10e8f744af6ed081b52839958640c40dc1ea6f5dbc31c3d2b910d5b644b57793ec6c899b3e6b81465f40b399f0b84c4a92dd0463338f897f2f4f3e0a57fa21c
+EBUILD portmon-2.0-r1.ebuild 651 BLAKE2B 695e88a75418de3bdeab753094214ccedb787e498bec43fbb1f927c125509afb7f39913f8b981be04f69189783f35ea6288d3935711694962f585fde509b63e8 SHA512 897df2c9ad82864cd530c50f0d9699920dda1daa212e174208e0072f0c9af6ba4c82fc95757ba11316aa6b6d24667c919efbcd40f95943af6898ff26090463ed
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/portmon/portmon-2.0-r1.ebuild b/net-analyzer/portmon/portmon-2.0-r1.ebuild
index 824a242bbd0c..5c02c83701b0 100644
--- a/net-analyzer/portmon/portmon-2.0-r1.ebuild
+++ b/net-analyzer/portmon/portmon-2.0-r1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Portmon is a network service monitoring daemon"
 HOMEPAGE="http://aboleo.net/software/portmon/"
 SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild
deleted file mode 100644
index b8d639d55d72..000000000000
--- a/net-analyzer/portmon/portmon-2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Portmon is a network service monitoring daemon"
-HOMEPAGE="http://aboleo.net/software/portmon/"
-SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_configure() {
-	econf --sysconfdir=/etc/portmon
-}
-
-src_install() {
-	into /usr
-	dosbin src/portmon
-
-	doman extras/portmon.8
-
-	insinto /etc/portmon
-	doins extras/portmon.hosts.sample
-	dodoc AUTHORS BUGS README
-
-	newinitd "${FILESDIR}"/portmon.init portmon
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 5b1e66ec2fc0..497ad129840c 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,11 +1,5 @@
-DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8
-DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
-DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3
 DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
-EBUILD pypacker-2.9.ebuild 692 BLAKE2B 94ccc3bbd9680ccac4915dc1b15ddd76b07e073ad1eae7cdb2595e4b20d9a505c8e9c8bfd95b2198709e5be1ed884a4903186d123309aab246710cc0af9b3863 SHA512 05d53594e94db18550fc0a53fa78b93d83ee0487a9335b45f2cc4bde175ffd63a70c9b119a1f2629e350cdd7300aad88d1eb1e2a6ea6f7622965c5a9aabe265b
-EBUILD pypacker-4.6.ebuild 715 BLAKE2B a2c48e14a11d229fe0b1add3d6360979b8553df559a85e917705576690d7dd435f166ad92e5f18d90015d92a1970c5c7d6a4ba05227dcb2fb7b36501bc4d434b SHA512 29a072a6e8cf693eb6f5851fb69c08fcf5e091f74b642ebb448b50c7fd4f04273ddcef3430d3ed2335b35315fc184ee3c1e1df474b26e7278bc7919d70c18daf
-EBUILD pypacker-4.7.ebuild 718 BLAKE2B 0ee2fc094e17d53359489d455313732830bed4c28adac28d4417d25ad9ef526e564b8f8488231aa3bbfdda0a70f834d9a5bdd06b3a71b01d52b84ff8e4ff93af SHA512 6a177c503f19cc1ef957ed78e68b966b5621902506e5db425f321e0bd04e3b9447bca54265cfb8a6b079b69ac592824a13b0e50013a4cc22c026d90abfe55f7f
 EBUILD pypacker-4.8.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
 EBUILD pypacker-4.9.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild
deleted file mode 100644
index 67f90fa81e25..000000000000
--- a/net-analyzer/pypacker/pypacker-2.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Fast and simple packet creation and parsing library for Python"
-HOMEPAGE="https://github.com/mike01/pypacker"
-SRC_URI="https://github.com/mike01/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS CHANGES HACKING README.md )
-
-python_test() {
-	"${PYTHON}" tests/test_pypacker.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild
deleted file mode 100644
index 4b7d4924659f..000000000000
--- a/net-analyzer/pypacker/pypacker-4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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() {
-	"${PYTHON}" tests/test_pypacker.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/net-analyzer/pypacker/pypacker-4.7.ebuild b/net-analyzer/pypacker/pypacker-4.7.ebuild
deleted file mode 100644
index 50dc293e909b..000000000000
--- a/net-analyzer/pypacker/pypacker-4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,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/rain/Manifest b/net-analyzer/rain/Manifest
index ae6ba9b7bb2c..077ea711913c 100644
--- a/net-analyzer/rain/Manifest
+++ b/net-analyzer/rain/Manifest
@@ -3,6 +3,5 @@ AUX rain-1.2.9_beta1-fno-common.patch 3313 BLAKE2B 84ced105416324dde778aa1f25111
 AUX rain-1.2.9_beta1-gentoo.patch 1213 BLAKE2B 3017ebfb59b8be96568cb6efa225fe76db91a5a79dc1ad5e7157edd7a3ef994f4d4e6385d4fb417fdaa9f837be270f5da02c7b6d99ccefc51a3b22ce4b8334c4 SHA512 7a7f623ee8d7e72c91fce9f4185c14e5c4ac6764229f63f37a324f5683c4fa8b99c298e04d2fa51d093eb86547fde2c98c4e66e592c3ec92970616684d672a69
 DIST rain_1.2.9beta1-1.diff.gz 1828 BLAKE2B b50743f0eb141c2d07462a717cfd14d6671b1428869398f6220e13adf653df368adb6f421af6d584ab782ef0bd4244f237412ec02f6a16f25c31378eedcf6ebe SHA512 5e871fddbf475d8e73c88a3f7340199cdfae8f54446aced599be7658e0be2c6b7a7ef2626cd13dff577df5c81187fa07bc8ec3a7ab386752e4be321d9a372843
 DIST rain_1.2.9beta1.orig.tar.gz 79098 BLAKE2B cb9302bdf024df0e49a250b5ef5feed07c7dcaf0c734513177ac6161496d7df1fa7b5262a23730f83fe4a237f4108539911318a17cb604efbfe82b50b9ed3485 SHA512 5e61ac26872e453c6da9e600e3fb427425d2f79a7a5f569ab93308c0b0f4509b6a0d5b45b138f04b9f8bee7b16b8b63be28b7ede65a92f5d4a3384e73e12036d
-EBUILD rain-1.2.9_beta1-r1.ebuild 840 BLAKE2B 3f37eb044c27d486c5d72fc71801696eecfd22556f3530dc07887b00ecc3aa9d1dcf8245ca08f66f3911da2b50eff0f4b8b02ceee5bb2597f6815783d2fbfbad SHA512 8741a456519b84073da14c6982de6ce046c51bd4c2d4ad54cf3b9c936edbc82f59d4f57171ae21b6b40b20324f03b018044955fe5bf76978bac9f2ee5752da76
-EBUILD rain-1.2.9_beta1.ebuild 708 BLAKE2B a52913e44e2929f00360bbcb373dc698ac82b79cde22c6c5229a76f2b665898b192127fe3b03c4577da40a7b680b761786c3fa4bc24eea40dabab51fe4016232 SHA512 7a8757eed74b9b3fc790b023f4bdd7e4bf7fc13d3c436f06651610503f0bc2a1e6308ac7bda792d95179578eca7e46764734f342587cef493f43a567f7bb17fa
+EBUILD rain-1.2.9_beta1-r1.ebuild 839 BLAKE2B 2b69ad9ec0efe68b40737c637348fc2d1697fa1a1391e55b27b069c6c6b2c96ea2f576584089659fc58061d63efcb18023a7cffcc1c6deee6d937b82b155bc89 SHA512 62d5603cd39d2696b3602cad374a2e4d07ca5f53a8b905c11bc1f816355772f672b79611b2b1d8acacae88a45070e1eda36c6e23e0827141c2520ccfcbf23648
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild
index 84351e1ba87e..2021fcdea4ee 100644
--- a/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild
+++ b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="powerful tool for testing stability of utilizing IP protocols"
 HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 SRC_URI="
 	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz
 	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz
diff --git a/net-analyzer/rain/rain-1.2.9_beta1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
deleted file mode 100644
index 72284beaad76..000000000000
--- a/net-analyzer/rain/rain-1.2.9_beta1.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 autotools eutils
-
-MY_P=${P/_/}
-MY_P=${MY_P/-/_}
-DESCRIPTION="powerful tool for testing stability of hardware and software utilizing IP protocols"
-HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-SRC_URI="
-	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz
-	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz
-"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-1.diff
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	eautoreconf
-}
-
-DOCS=( BUGS CHANGES README TODO )
diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest
index 96314021a064..c5465e2470cf 100644
--- a/net-analyzer/rrdcollect/Manifest
+++ b/net-analyzer/rrdcollect/Manifest
@@ -1,6 +1,4 @@
 AUX rrdcollect-0.2.9-include.patch 206 BLAKE2B 81b31a4bf3a03f55d9ae4bcf6d80eff86608142b537789788b96d5219d14632d0307230d1b39d5fd8355059b67e152e7f378950fc66c8b15723bf2910067fb07 SHA512 e3092bfe72977cd67cbb4654a44a504d532fbcf3914c3d339e99d9d61d704d7d6954e233d6d5f04cd02ef4fb827cde0835dddca519e3cd26cbc9b7aa74eb72ac
 DIST rrdcollect-0.2.10.tar.bz2 114312 BLAKE2B 8e75a44e6ea2dcf57eec7418912383fe1ed846eda5ac2e402b7ed3b0f47f3f169d84b563821380fcb1ee87b70fcdf881dd48763fbb4ab3c8ef301ca9ef5f2a74 SHA512 c926ccfdbf98a4de114b80012151bf6859644742a97e14ce06f3c44c3b48bb242d47fda54deef8069d57aa8d207389e788e6021ce337559c0185e7cdb680b26e
-DIST rrdcollect-0.2.9.tar.gz 137397 BLAKE2B 5fa7e3c90f168c4839227f4578c0bb309c9e1d5ac440026b10aa5ea9f62ed23db63f20cd506c87fb6bf4b969e9aaa0a0a33e882818bc558e1e99432ce3e6e855 SHA512 5f01b93a469d32f095b501c3611d4e31d354025848aeffd913db9625d0186a3e7d394dae1a2383449836c37e758a39a3473710a1855411288659fa6ac249e10f
 EBUILD rrdcollect-0.2.10.ebuild 707 BLAKE2B 1474b932b1360595674194a6ef4e53ec4e5f6aa71ad03d023849653f436ef64fcb0f96def3ff1e94f52180d3724d4a7047e03fd7dc6a13b9647a5fd7b0076c70 SHA512 c5a2df5dcab7a58c9ace1e4741bdecf3c36ba54301622d5cf4ebdc54a64bc7a09fe1b7203c4032bca15e71637a3bd11cbb650a773e828579c19b69c13ebda229
-EBUILD rrdcollect-0.2.9.ebuild 727 BLAKE2B 23ce3d5c74674a06a9ab5e8fa5c7e1880fc5133d3b7ee5e50d453c3c0c0b616d1ffdb92417ecc96c3b7a96bce3af426b650f5c376de55e2e7a5feacf9fae9365 SHA512 249fabf46c1ba7cc293bf0238b8b0a09eea689746878a3c3d521beee9a58a659a0b5fa5d348cb72232b4b49d42bc3907b5d8ae62260fdd5127b8eaa3b2133a54
 MISC metadata.xml 515 BLAKE2B 4dd541000df2c92fd88fe509cd2f84dc88b2c939af53eda8cf0e9a18e56be6df06a6f8e07b0eba4b7f9d7b285b585d2266ec79bf6243612cb1ee468b59b6b986 SHA512 68fc73d6b069e077b672c34aaa99f0c1a07c861573a123458fd5953efd71134a7b93bb81d93a41b6d1e5b51228e304eed40d6cb36c795f0f20549e700914d051
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
deleted file mode 100644
index e8380ce1376f..000000000000
--- a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Read system statistical data and feed it to RRDtool"
-HOMEPAGE="http://rrdcollect.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="exec librrd pcre"
-
-DEPEND="
-	librrd? ( net-analyzer/rrdtool )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable exec) \
-		$(use_with librrd) \
-		$(use_with pcre libpcre)
-}
-
-DOCS=( AUTHORS ChangeLog NEWS TODO )
-
-src_install() {
-	default
-	docinto examples
-	dodoc doc/examples/*
-}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index 7b97cd1818ba..23d98d94e9b0 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -3,6 +3,6 @@ AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
 DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c
 EBUILD scanssh-2.1-r2.ebuild 831 BLAKE2B 141448c971983f22bbace5a1888e20eef9ee99597ae44092f271689950be50e3c7f527d782e2740eac24d7c36992684f95aec8c559d93cb262b60de197bc3419 SHA512 50d6179496f1896edb14278af86ae7c9452932579073802017394442c4b8d656fd4bb41952b2bb9ceb6b4f0bd755522f94bab50b04f918468bcf48be9d7839ca
-EBUILD scanssh-2.1.2.ebuild 857 BLAKE2B c880339c575cf034d5b9e571636cb18efc7d4e1fdbdc82e657f40c2d399edc2c23bb7ed72d36db1fb3cdbae5baff9ee579b00888c0c12e876c1d0f9b9a28dfcc SHA512 ba46b08a999232cd97a56b536896d614b6ab81251eb44b2fbb3109236da25b028440bae88252b295444e9defc298e6688d44f4e9516ed42eb9ef522f07ef11bb
+EBUILD scanssh-2.1.2.ebuild 853 BLAKE2B f0d75a289370b7d1dca290e1865181eb758bae4a2f740f7cfd8e327ef054262306f74033e0c9bf7551cd57901e83c17bb10155d24068dd0a31dde53c05cb8cab SHA512 c0d3d279f685f27aa46e8194fe00af6b93354157deefb1ec926e38203409a7312b58b9305c96cb3bf5457adbe118f5343f969004fcdb2bedb99b006c18cdcf8d
 EBUILD scanssh-2.1.ebuild 641 BLAKE2B 8023919e0452fdaa5420cf90b59466b04070b9c4b1ff733657d5a0b22ab6c870113a9234b1442d88a02b34d91d8504a41eb101e38fd77e8c58c41bb8d61bd59e SHA512 56e016f7ff11ea334c276f011b73870079e1b40bc2baeab621a141722b1f52c9da7f1d16beedc0952b6722907fe5445d3b40b7252141abd99de10e68e3329baa
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1.2.ebuild b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
index 2e596b229bd5..54e673333041 100644
--- a/net-analyzer/scanssh/scanssh-2.1.2.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 8a553fc7c515..8ecfca16429c 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1,11 +1,5 @@
 AUX sec.conf.d 352 BLAKE2B 7324f809c3fcadaa3755994ae43fda4ff7b9df2282fd68e831de3a798f62c99f3e986829ac42ab92e4698ff1e50e447c427140cc5eb18b0d1b934f27a9214adf SHA512 204fb6f95a8f4d2a4680a1a2493e52d394dece4fe349ac6604d099db701c6aa2f9464109c1bae80f7edaebebd8bd8c2b3b7412c304d5d203fa62d73f231492b9
 AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca86f272206f0d93b3f9984813382a2e4063b0cf0bcee0f3c2ccef1c7cf48c7bb6e535f65738f6 SHA512 9f079d629e21d20e16b4455d6b6b3279a56c0979abdcc90a8b488cae5225cdef4f7d95374b7e5b623196f06d91f2bd3c50691e787b40c90cbe34b478d8b37952
-DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5
-DIST sec-2.8.1.tar.gz 143700 BLAKE2B 4101883ccd947140546659c799f9641d496912f22e08debbae5bc9b8b65301ddfeb4c005a9885063c6381383d1f0581a7b96f56cf53bf2401438cfa6cf1755f0 SHA512 03c7acd1e1cfd6dc11143e0ff35758925ddc75e460987a91d5606564f0caa45afade497b8653ec2d8865cfcfab4d87743777eb104e1a16f79069cf61e17d0661
-DIST sec-2.8.2.tar.gz 144131 BLAKE2B d2c9e33be815c1e2321e94e2f679ca6eb6d272b4f68bbf575508c916293c39a36bb4e675a09986395fb34dcc04e356a0dcbf88d076f4c27f532337b4493138d9 SHA512 846a0671d5d774f74645e5e4f6d7a01c04079be19ea9b2ec9cb862fb48173dac0e1131981bb6e1fae525c74610dfdabc1535ff5818ae893bec35daab46e05c07
 DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269
-EBUILD sec-2.7.6-r1.ebuild 586 BLAKE2B e3bde9b861cc02de2581baf734db4010ebbee161112761bec720b29c6c8adf4edec9cb5ebe91f601ea0b7ff1192275de33bb9c39a540b83613dabb56927d49eb SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d
-EBUILD sec-2.8.1.ebuild 610 BLAKE2B 3f9155a8132891e82596a2d5c432b6cb5da9ac5612b9b1eb0f400429461f514443a31b6233c2e68525d789f4f8aea8dadc9f472deec18b9d3f25a3fdb2b52ac4 SHA512 7d6f6b5eb347797f5dbd8facd3c17e66770d3c995762f97a98ed8a3af11a7b664c68be7ea2ff0d4960c2c7dcea920bab067f1206a65923fea21f4d20d67af959
-EBUILD sec-2.8.2.ebuild 610 BLAKE2B 617400450f6aa79fec80d06d9a8fd45d71e7b5279a36946411a526bc42e6680128a8b3e2f2c432712555c6e6831751000da93bed8b45c19fdeed353f5f57c42e SHA512 5f9120e3fae0f78c32cc0c2cb3fe393bd5e0fc96b0d90cfa18beb09a23802ef186f7bc1b7c12ba7abd12f2126eecce2b19eae44205fe825360f9fbc76ea15130
-EBUILD sec-2.8.3.ebuild 610 BLAKE2B 617400450f6aa79fec80d06d9a8fd45d71e7b5279a36946411a526bc42e6680128a8b3e2f2c432712555c6e6831751000da93bed8b45c19fdeed353f5f57c42e SHA512 5f9120e3fae0f78c32cc0c2cb3fe393bd5e0fc96b0d90cfa18beb09a23802ef186f7bc1b7c12ba7abd12f2126eecce2b19eae44205fe825360f9fbc76ea15130
+EBUILD sec-2.8.3.ebuild 608 BLAKE2B aa1129118698bbf65eada5ebcae0924dac5cb41bef4168fee0f9b433784bc3a6ca641c85dcdeee33086c4336f88ac4617a9553547b2daf22e05fde2fd8c0bb7b SHA512 7b0c594b6e64302bca68c197ebc6b54cfff49b461bf468f601076e5b391ba00f142b2c54d59aab62651dae0724a091b150a4dcd0dbc7920e19fb88ff4ffada9b
 MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
diff --git a/net-analyzer/sec/sec-2.7.6-r1.ebuild b/net-analyzer/sec/sec-2.7.6-r1.ebuild
deleted file mode 100644
index 9d01d54b1552..000000000000
--- a/net-analyzer/sec/sec-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Simple Event Correlator"
-HOMEPAGE="http://simple-evcorr.sourceforge.net/"
-SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
-
-RDEPEND=">=dev-lang/perl-5.8.0"
-
-src_install() {
-	dobin sec
-
-	dodoc ChangeLog README
-	docinto contrib
-	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
-
-	newman sec.man sec.1
-
-	newinitd "${FILESDIR}"/sec.init.d sec
-	newconfd "${FILESDIR}"/sec.conf.d sec
-}
diff --git a/net-analyzer/sec/sec-2.8.1.ebuild b/net-analyzer/sec/sec-2.8.1.ebuild
deleted file mode 100644
index 8d81eebd4d02..000000000000
--- a/net-analyzer/sec/sec-2.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple Event Correlator"
-HOMEPAGE="https://github.com/simple-evcorr/sec"
-SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-
-RDEPEND=">=dev-lang/perl-5.8.0"
-
-src_install() {
-	dobin sec
-
-	dodoc ChangeLog README
-	docinto contrib
-	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
-
-	newman sec.man sec.1
-
-	newinitd "${FILESDIR}"/sec.init.d sec
-	newconfd "${FILESDIR}"/sec.conf.d sec
-}
diff --git a/net-analyzer/sec/sec-2.8.2.ebuild b/net-analyzer/sec/sec-2.8.2.ebuild
deleted file mode 100644
index 89e843baa33a..000000000000
--- a/net-analyzer/sec/sec-2.8.2.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
-
-DESCRIPTION="Simple Event Correlator"
-HOMEPAGE="https://github.com/simple-evcorr/sec"
-SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-
-RDEPEND=">=dev-lang/perl-5.8.0"
-
-src_install() {
-	dobin sec
-
-	dodoc ChangeLog README
-	docinto contrib
-	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
-
-	newman sec.man sec.1
-
-	newinitd "${FILESDIR}"/sec.init.d sec
-	newconfd "${FILESDIR}"/sec.conf.d sec
-}
diff --git a/net-analyzer/sec/sec-2.8.3.ebuild b/net-analyzer/sec/sec-2.8.3.ebuild
index 89e843baa33a..bceadcf96795 100644
--- a/net-analyzer/sec/sec-2.8.3.ebuild
+++ b/net-analyzer/sec/sec-2.8.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 
 RDEPEND=">=dev-lang/perl-5.8.0"
 
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 141e02a58a01..6f7e00584179 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,13 +1,3 @@
-DIST sflowtool-3.34.tar.gz 171613 BLAKE2B 70e55777253af2055f7de57da53bde8f63b6ee79fcd0db7545bbaabf024ea3baf933beb0a62c9a29b073b34f3471faf47ceaca6664d873fe5d91a3fe73b76f54 SHA512 4fd551fc1e03f68c886bf3effaab466c4470f1e3878ed5b94fd5152e81c076b56a6901df878edc95850522cf70458c6c9c4130c12ff071739b1da4725ae1e777
-DIST sflowtool-3.41.tar.gz 187119 BLAKE2B 3ba9d1baf8da4be14361ce82f7a783d7d1dde10264f123688703c4a41eb316d8d917f98150bb64562c3398f49a4a083e35b56402e8e8ea0a140406923bfe0519 SHA512 8758bb7f2ad17db1c8d8c943093edde72efbd4411f8acbba2b97717e447df0b9e771a33307b9fa090da6ca12ba2dac69fd72787795aa878ad3c5d4148100c57d
-DIST sflowtool-5.02.tar.gz 192907 BLAKE2B 100745fb7f4eb4e40edf93e66a0f3fb26e2cdc26d2d3808d6bf5fa4a92d2b973e6fd8947f39a1695898abf647f4012cbb1577af281f8b51fc6d008ed4643986e SHA512 9b2369c8d30b9cdcd1cdfca29e2f8405ac8ea3bba22243ce62d708f943b726865fbf6ba2eee2f0e00e5df1d1b6fd4977f636bbdbe9676424183e1f973bd64dde
-DIST sflowtool-5.04.tar.gz 187733 BLAKE2B 8298bbbf23d2ce30b5954a73fc8fed9e9e3510e77d80e02cff9fdab2330260cd3960db76ed7c1e9266b47f964e5724eb2fef9dd89514d9abbbf050df28e1e133 SHA512 611c3c23ed7a586997b1622b4d1c48eb0e0784a0667e5f7d17f2862c071ff5a34a55c6e537eba99e1c281d9ab870c95c805b764122b623520c81870d730b1688
-DIST sflowtool-5.05.tar.gz 187876 BLAKE2B 895d9ff10cf7fbf7219d18849abe6ffbf6a0b00aba7f50e69beaa15a1dc7aae317bb879a2b4d50a4ad0e88bcb889e1f0f946e18d16f977eda63d5acd98ff5c98 SHA512 7089f075dda7571100aa41e1f016a83a3dba62392e251f4c3f9a1eef0f9f5c02b189ca12b0c3ac77add78b83ca5ecc70b39d7317cd5feea2b4f3580121206937
 DIST sflowtool-5.06.tar.gz 78044 BLAKE2B db4a14d3e94660c803399f99b486bc04579b8dacf4e01f484ebeb31cbeec0ad279efdbd85b5a242a4dd9016e36428992344af50275dfd15c89b3337351d5fdb0 SHA512 365922e09544928bbf5893c04e05bc5b3d632290804711cc248d6bbd52c8ed30646bb9bdfd7b231a357f88bd5592473b95edff6ab3b50121809f909b4b65c7a2
-EBUILD sflowtool-3.34.ebuild 478 BLAKE2B a1e8ad0768cb72a2093dd937ee6a7bd36d6a0fc70a1bbc0b5f663fe4cbef8062c4e6d6e72100670a02c11c9035d572c95efebd4e38d703681f8b20c57bc5d760 SHA512 4089eb7326499d15d3bf2703f3764d35e1db32f5eda2a18b0455685f844f85a599f3ce9c5bc37bf61df08fdd1fb6aedce0e1f509142d870dca89cb1ac6c7ed3a
-EBUILD sflowtool-3.41.ebuild 562 BLAKE2B c525f5cae45cc62891d9647f71c0f1a9afcbe8eb24925244c01ba5c359090c506108658ad0ecba566f02772c9adbacf8d219906036d6466344f4585560c31553 SHA512 93c748e0bc9a40de73df9b4eea7e2bced91f06aa17fadda708e6cb8c8860e65ab54e5b0a22c10e402911e01b5b18ddefc646decbdfd06826786ddd55662cb47e
-EBUILD sflowtool-5.02.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
-EBUILD sflowtool-5.04.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
-EBUILD sflowtool-5.05.ebuild 557 BLAKE2B 334b464adfd17787de5f914a0c052257e697962b7ab781b88fe1d2778f083f0343f7eba7a784190eebbe727027ea966c0d851066b1552debde24f5fd731df364 SHA512 66b4d3002c78e74eab4fe13a44130f7875a0e23f4f31e4705f29606ed9c78e02f21e8202d3a463012c35d406a54849f84bd6648add64b5211b6a12296bf6a7e6
-EBUILD sflowtool-5.06.ebuild 662 BLAKE2B 2d95782d018a9ec75ef6e9af5261ee868f4285948e6c12b3142dbe06b3531907be8a15bad554892c3f3fbd21a31da392aa314027f3d2769f1795a2bbef8aa9e1 SHA512 a1a5920606a2b408c84b88c64e9b6a63f881eb0d747f7ceecb56b266bd84440a7217471243c7f49c0d53c47a4a807838b2cb957bb596322b85e6d5f0f46d1ba9
+EBUILD sflowtool-5.06.ebuild 659 BLAKE2B 68e1b409c6be500bc53514a61083f4be6db8bb3aac16b9f8898bc56c3baea0fd3b8a0c199f8f3c471cc0a96ecb4d973f17251a12505b2183574eca71314d7391 SHA512 052e03668d35a256fec5bd60956b3e4a6d4adeb3e22f1cf37e03f9dc7ded55aef82c4211822d6177caa88957e172edaf1659e512d33d75fad319bb7377335b2b
 MISC metadata.xml 370 BLAKE2B 54ac4c209077f5fa6d73a231013370ac06ce05d5f1ce8704291c0b7631fe8eafe6212065876287850e5ffcf56b532bf2fc7c678fb30dda1c8f6dd969bbb63c99 SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d
diff --git a/net-analyzer/sflowtool/sflowtool-3.34.ebuild b/net-analyzer/sflowtool/sflowtool-3.34.ebuild
deleted file mode 100644
index 96c9498e8607..000000000000
--- a/net-analyzer/sflowtool/sflowtool-3.34.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
-HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
-SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
-
-LICENSE="inmon-sflow"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-src_prepare() {
-	append-cppflags -DSPOOFSOURCE
-	use debug && append-cppflags -DDEBUG
-}
diff --git a/net-analyzer/sflowtool/sflowtool-3.41.ebuild b/net-analyzer/sflowtool/sflowtool-3.41.ebuild
deleted file mode 100644
index 91200811c1aa..000000000000
--- a/net-analyzer/sflowtool/sflowtool-3.41.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
-HOMEPAGE="
-	http://www.inmon.com/technology/sflowTools.php
-	https://github.com/sflow/sflowtool
-"
-SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="inmon-sflow"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-src_prepare() {
-	default
-
-	append-cppflags -DSPOOFSOURCE
-
-	use debug && append-cppflags -DDEBUG
-}
diff --git a/net-analyzer/sflowtool/sflowtool-5.02.ebuild b/net-analyzer/sflowtool/sflowtool-5.02.ebuild
deleted file mode 100644
index 820030971af1..000000000000
--- a/net-analyzer/sflowtool/sflowtool-5.02.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
-HOMEPAGE="
-	https://inmon.com/technology/sflowTools.php
-	https://github.com/sflow/sflowtool
-"
-SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="inmon-sflow"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-src_configure() {
-	append-cppflags -DSPOOFSOURCE
-	use debug && append-cppflags -DDEBUG
-
-	default
-}
diff --git a/net-analyzer/sflowtool/sflowtool-5.04.ebuild b/net-analyzer/sflowtool/sflowtool-5.04.ebuild
deleted file mode 100644
index 820030971af1..000000000000
--- a/net-analyzer/sflowtool/sflowtool-5.04.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
-HOMEPAGE="
-	https://inmon.com/technology/sflowTools.php
-	https://github.com/sflow/sflowtool
-"
-SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="inmon-sflow"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-src_configure() {
-	append-cppflags -DSPOOFSOURCE
-	use debug && append-cppflags -DDEBUG
-
-	default
-}
diff --git a/net-analyzer/sflowtool/sflowtool-5.05.ebuild b/net-analyzer/sflowtool/sflowtool-5.05.ebuild
deleted file mode 100644
index 5ed462acaf02..000000000000
--- a/net-analyzer/sflowtool/sflowtool-5.05.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
-HOMEPAGE="
-	https://inmon.com/technology/sflowTools.php
-	https://github.com/sflow/sflowtool
-"
-SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="inmon-sflow"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-src_configure() {
-	append-cppflags -DSPOOFSOURCE
-	use debug && append-cppflags -DDEBUG
-
-	default
-}
diff --git a/net-analyzer/sflowtool/sflowtool-5.06.ebuild b/net-analyzer/sflowtool/sflowtool-5.06.ebuild
index 1f5a093d2111..52d33b52709c 100644
--- a/net-analyzer/sflowtool/sflowtool-5.06.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-5.06.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="inmon-sflow"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
 src_prepare() {
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index 6323d93aea48..8a89134e4d28 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -2,6 +2,5 @@ AUX siphon-666-fno-common.patch 363 BLAKE2B 7c81ccf4a524693fc567b5d36938b5b6047f
 AUX siphon-666-gentoo.patch 441 BLAKE2B 048df4192f94c80047c95154a8404dee991993219f59123b4c96822e108094ee52299607988ea1311e25e2dd96843c92c03d92e1ab2ce18fc3a58539352d9807 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5
 AUX siphon-666-log.patch 1177 BLAKE2B 7f4e7c9428143558a5ba362526c882f59fac61c4ac4868b3577f9a500aa9ee17c3c1c7d12212dd089c669af1854ecf93c278871cd6f9e5ee9bd8c2124d989251 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce
 DIST siphon-v.666.tar.gz 6951 BLAKE2B 8a37897aa52a73819a92422384252cac4cfecfacb4aedbb91af20592b6b831cd78af1dfc9f6da6f5d555c4d742fc9babe04ec446a3b0d214eab9b4cd0ea64883 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a
-EBUILD siphon-666-r1.ebuild 651 BLAKE2B 73ad60e3d2e7fba8477d5a5150760d116a79415e1361c2b36a9c78e44beccdbaf40e2abd9bf42960ecac9dc949790a362e5f03b5d1e94f1ed2f3ca7b335e7123 SHA512 fcfb276bba369345ccede8d45bd4b3dac888e231ee9e032f5e0e88aec724156bacc79b971c4d5a4f1265914b4e09a2497525fc650e8385efb96a0b1c68a0c0e8
-EBUILD siphon-666-r2.ebuild 660 BLAKE2B ac58988f23b5504a4ad52ec78098a3777f3309617807ecb21637ee656be16e2d1b4350bbe216aba08456898fa836c7f8bbf54da3fe2a070eb8c1c98b022a140c SHA512 91b95433aa67cec74724a630a05d78613036492b7707c71bae691ddde8ea566dbe7e62b87182847f2d5776064e983cb5e564d8072a145755d434dce05b538017
+EBUILD siphon-666-r2.ebuild 659 BLAKE2B eff64afa1ad1a2ceefd6a09234af9e5e5358d310b12c8f0acbaa83d7970b309880a91a96ac9fbde5100a38e023746c5c4674ee9e0732889189c1622848968375 SHA512 f07b85bdee70fd42b56f6ac07423e2410aa58a6fc9e73cfe7ee473298538221a7113048c15b4f7f703792d3e75cdbb605ab4f413488db23917dfc84d585d41ae
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
deleted file mode 100644
index dc691089fca8..000000000000
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-v.${PV}
-
-DESCRIPTION="A portable passive network mapping suite"
-HOMEPAGE="http://siphon.datanerds.net/"
-SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-log.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /etc
-	doins osprints.conf
-	dodoc README
-}
diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild
index 7921c66b9a14..ccd6f70e0ef3 100644
--- a/net-analyzer/siphon/siphon-666-r2.ebuild
+++ b/net-analyzer/siphon/siphon-666-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://siphon.datanerds.net/"
 SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index dac3ff456f5f..d254322496d0 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -9,5 +9,5 @@ DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
 EBUILD smokeping-2.6.9-r1.ebuild 4174 BLAKE2B d9c87bde47edc6665a35152ca6167658ef248e9e8b4a893b53954b553a3acd7af953c193f5f441dab21509e11de4adf91f730c511527c8d57da0c5c10c929533 SHA512 21ecba069f21dadef3baefec04b1ff0d24e732ec4baf99421f6228d498f8b0315bd8b03d4e04c58f51789f4af87c5d05409519bb65cda54e389d0319064c57e2
 EBUILD smokeping-2.7.2.ebuild 4129 BLAKE2B c193fb3280a5a7bde86e64cb3fc593d2f83ee2a57207a30f5ac77b633e486e4797c5eb26e82272e02cc9d76007dbcd774a964b03d6f2601f6a5698c9f7b3d894 SHA512 8044d7d0588d29645f241ffbd3a92210e02ecb0f22259e8b573778a73c69b7e51371b412aead3772622f0b18e37da42c99baa9a0eb71e1ebf3e307486fd04fb3
-EBUILD smokeping-2.7.3.ebuild 4126 BLAKE2B a6178f60eba6bbafa5cebb5755f4011b46e7363579f70d3c18dd34db28cdac4eedf4d86a2529d4b37e7769ee1bc0aba1c66377fd08bc95cb926a1a9fbaaf7797 SHA512 666dd27b11e19c31d0d3cf55c1b99bd282fdc107312551cfeac7245b81b5c9e640bc0adfa514a1df58705d76ab6a5451876319d6e99633003f4657a7698e4192
+EBUILD smokeping-2.7.3.ebuild 4125 BLAKE2B 2a38e163224837d43267c3cd57b558c88065e5391b7993203c017181bfd85e3772929b82cab8c2846710d7f2f08e9ba913f5ad3d317cb4d2007c1ddb68e22b93 SHA512 dc46019e3a83e168f9642efda2c4808485a5e646fb63a1f0ff43e5065a4d5ecfbb608079b60aa856dfc58bee31a8336ebf2137689fdf9ed1eaa937317fed6c01
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index 9dd531b20e11..d28ba3dbe294 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="apache2 curl dig echoping ipv6 radius"
 
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index a7f76cdf8e66..532884180d60 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -3,10 +3,6 @@ AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4
 AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6
 AUX sniffit-0.4.0-fno-common.patch 6287 BLAKE2B 6480ee02366d834b9a6097a36023dd2ea707fc85ba2f6e5dae75cdd6e05c1107ed26ff869d57557d2ac3d3f850e21d99c1eec6d8028ecc7dc8257adae16265e0 SHA512 3b293d71c3b9b9c05d6d2077f6cc759f469af91c0dffe243dbfe75ba93677f18f24e62b78d2a2ca3b5ac99aac318da6802ec4e5c3012569c428662f40fe7f355
 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
-DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab
 DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc
-DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1
-EBUILD sniffit-0.3.7-r4.ebuild 788 BLAKE2B 3cb0cb745eaf958aca7c4f51f33d78e98f1721883b7f4d993601e83c078f2a90852b93ed5bd6556b0e3c065cd183c07ed5bc9986f02e244f9bbdaa0de1a87758 SHA512 8dcde1e3a6c54476303a8726eadfd53456c1711181717bcde0b805746c847db1ca2dc7d72adcb640e39992049111453073b51e1f338605e9f51e08ce4607fef2
-EBUILD sniffit-0.4.0.ebuild 631 BLAKE2B d2411739bbf645031179c22bb82cb6ee485e46aa3e6f73de1ec75e0e38d8700bdafd40ff6fd7e76bbaca72c87bfcf03f46d2cc7d170534289094840250d36675 SHA512 7ca9b61f2da0120d31737c9936901506ec5c51353a500f64efda06d97d4829449b883dec644e48057cfd402661ad93b03b528aa26ca24669936c0d662f2fa94a
-EBUILD sniffit-0.5.ebuild 587 BLAKE2B 70f3b41f380075af20c2ce630bf4752a424d48badd00ce10aff803bc8a938b2e9990f5e47b9f0df82a6ffb1a88bace06ffeb193b7c7d313b1e3fea15934783cf SHA512 590199b70c414ffd649e7db6f790be0aea3395a1de705a50edc652b18e38573b96ade3271a1cb40fd6d925fa043f3f56b8c5f04214ca16664f61d903822b485d
+EBUILD sniffit-0.5.ebuild 583 BLAKE2B 2203a79bd787f3669c808478a1b3cad5593fb7b2b68b9b856f674f41fa5cc8cb6c3f05fe064a59b3099bb3b2f241fbdac618738d25e7b980d33053f41a37966e SHA512 63dc04674e45be650d1376afee4306005e8815cd3e32009575aab5f50c689e4832bb250fa884beb4c1aefc1c9bbdfd475eb82559e3fd513b2f89d06527d4b660
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
deleted file mode 100644
index 7429554093a7..000000000000
--- a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-MY_P="${P/-/.}.beta"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Interactive Packet Sniffer"
-SRC_URI="http://reptile.rug.ac.be/~coder/${PN}/files/${MY_P}.tar.gz"
-HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
-
-RDEPEND="
-	net-libs/libpcap
-	>=sys-libs/ncurses-5.2
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc sparc x86"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-misc.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-	tc-export CC
-}
-
-src_install() {
-	dosbin sniffit
-
-	doman sniffit.5 sniffit.8
-	dodoc README* PLUGIN-HOWTO BETA* HISTORY
-}
diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
deleted file mode 100644
index 6761ff0d80e0..000000000000
--- a/net-analyzer/sniffit/sniffit-0.4.0.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
-inherit autotools
-
-DESCRIPTION="Interactive Packet Sniffer"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
-SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-	>=sys-libs/ncurses-5.2
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.0-fno-common.patch
-	"${FILESDIR}"/${PN}-0.4.0-tinfo.patch
-)
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/sniffit/sniffit-0.5.ebuild b/net-analyzer/sniffit/sniffit-0.5.ebuild
index a4e8e10f5060..3be66ceda23e 100644
--- a/net-analyzer/sniffit/sniffit-0.5.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.5.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
 SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/softflowd/Manifest b/net-analyzer/softflowd/Manifest
index 5230894d7f66..10b34c339897 100644
--- a/net-analyzer/softflowd/Manifest
+++ b/net-analyzer/softflowd/Manifest
@@ -2,8 +2,6 @@ AUX softflowd-0.9.9-_GNU_SOURCE.patch 506 BLAKE2B c3de95b807fb6f7c69c29c75d90d44
 AUX softflowd-0.9.9-no-strip.patch 605 BLAKE2B cafd876892aea44ef8650501e66364b851f35f434e8959f1d85f762799af06ed45223ba191c43607d42a26066d11b1a0c257ac33c75929813b2d9670675c0d39 SHA512 4c42a64634dbe852d5c1563face382553c8091b8c36ce5fb40eab40492338019abb2b26b0e9c47fca602a324827fb130131ce16a32cd2450612ba6ffd3501d77
 AUX softflowd.confd 288 BLAKE2B 2adc2fd3c739982d08266b52e180b07e0e77ce1d1db8f66f935787b4eeee9ce5f419362f1854b5754a7b11cb78b52bba4ff8f39c082ddb5dd612e6ea9a25b795 SHA512 78edfe72bee5998ac6d91e97a119370e223f1fe868de43dfff70e127f202af8f17b3f96c6d0ed8f23ad022e314a1dd3cc0c3da19e85cd7af427671f7247710cb
 AUX softflowd.initd 1536 BLAKE2B b47f50af5ea4aa02a93050d37275c209db5c9d7ff3e09efe7c55f4af2a9b955915debc359f50f5e574086d4a82001e896559a4c61730b41af03d57b4b82eb35c SHA512 42ce99bbcc6ddfbb6a3e4c54100cce05ab1edf4c977c6c97e224b427f64fd8cf42f727dd6f4454919232987f177c6875f0ed86c89712b1a042be340a2d6e8ffc
-DIST softflowd-0.9.9.tar.gz 91939 BLAKE2B 97ef29e5f450f6896d9448359080a64dbe66d4edf031ff7e2b0e8500e9b781b983de6448b8a1d846d4c8c939269004998a090b0b7e7a9367c9c961e0118b8d59 SHA512 4d579c2a087c0f3cd4d2020bcfbddf9dab73254e40678b3509c93bec212bf8b5692f76bfb4e766577e431ff508f0bce0a2cf326184f192e3c5dc8ddf38514dbd
 DIST softflowd-1.0.0.tar.gz 168379 BLAKE2B 97ce677adf8f8278516f25e82db1757ad5fe208fb8923b189698525d58d60c998ea847f29ae91eefed57d7bd1eb42f119a99e46346753539cb3a9584a90eb484 SHA512 01a4f89755c957a495b08c49b572b8b6aa41f5ac7672feb5e31b039fbfab84f3a206b1da95b11de2ec5882123f6ca2387c02efb874ce707c2263bf79b56012fd
-EBUILD softflowd-0.9.9-r1.ebuild 714 BLAKE2B 53475162759518c48fa7100046081fcf9fd9d33d2b82d2d170c3cef8221d454d9d059da8ca3c0029f074d7f75b85814ae5c9ecedd361bbd45d526a82e44add3c SHA512 b985d3acab2f5750f489b4b6726d2caebf2dcc5023ae2049b63cd114d3aa3a7ff58fac78d723bfd522eee8b62e08b01558bbd7359b516d3b706253e6a8a5ca08
 EBUILD softflowd-1.0.0.ebuild 709 BLAKE2B db437c0cce2d3ba366d32c12daf44b6805370205aa82c93c90f7923324470882d9839bb2b6ae0db991036c61776710c3d5bdd82c684b8198ad006b0a36a3fd50 SHA512 96fb05b7243ff8805032fcb90857540764c0d2eda6c6f129e5224696d10a15f81a4d3691f0dd779f5aefe6fcd495ba125ef0b984babbe535abb3d7f41092c721
 MISC metadata.xml 349 BLAKE2B 8020e24d71e221180c5a80bb1d0cf8ec97e5d1d9422f96b511d16d6e8e8673f19d0e0406d792ab6a51327e155436cc16d4a572d7ab437af97c0a26da80709016 SHA512 88f4bf4966aa0b70cf2f7872ae143dbe9f105bb4de34b3d893092183f369002414ae50a3baae6eb314d49ea84764c250e7b4fb3109ad8c179eb93f116417e68f
diff --git a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild b/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
deleted file mode 100644
index cb7d09e3425e..000000000000
--- a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="flow-based network traffic analyser capable of Cisco NetFlow data export"
-HOMEPAGE="http://www.mindrot.org/projects/softflowd/"
-SRC_URI="https://softflowd.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-strip.patch
-	epatch "${FILESDIR}"/${P}-_GNU_SOURCE.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc collector.pl
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index fae072a6d40a..0c017e4227fc 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -2,8 +2,6 @@ AUX symon-init.d 554 BLAKE2B 0bb42706009565db50396176e93931ede24221488db03d5b413
 AUX symon.conf 313 BLAKE2B ab28f18000d5c20b2d2f690d2b77ed1d43339582bf5c7bb44c5b3bc16b9befabd2edb76de42856925cd8e342a3177de59b38ddb8e86c5c2ccbb0ec2bdcbcc18f SHA512 9d83d316a5024c0fc5a9c487113088548e6ba193360d684b162d39e0373bc478ebdb40b7ce508c0de2287de6684c75cfcf2f312e34e9def1dcaaeb0036ecab56
 AUX symux-init.d 548 BLAKE2B 2affcdfeddc941aa1220e00aa5e88fc673f494f591afb3b40d6e67235df2423b4dfdebdb0f389dc4e370c33d379d9c16bc98eb2421036640c2a37efdbb5da16a SHA512 0f494d3d141cfcc800d33dc0ed364fafaf713811ec8a8ccec7a77b421888aff42546ad742bdaf3928c49bf61d76b97fd3f2fc8992fadf1d1c499c9a1aeada11d
 AUX symux.conf 952 BLAKE2B cbe1effaf2b9678575a2ef938432e6bc6aa7f2b13248a111ff2f821e10f6d70d4894d1682dccb2f55a702435d07bf93751f0d1417334fd77bf8bda878f2752da SHA512 5f7aa2d069ed6cb58dfc6ce7ab192f1486256551c1315b86b0216c56d4ee93d84101168c5ee8c1507729136dcd05c7a09cc9c901f132c5fc8015b2502bc15272
-DIST symon-2.87.tar.gz 107607 BLAKE2B 44f42ceff818c0643b02f59715ddc9b886e480233cc63c0c29f6a234b7c510d5e175a964b1cd3fadbf9b3d95642d79f947921e88b979f71650a81798acea7429 SHA512 8fce5cf2312f1d7ba78f693da2df9fea3bbeacae0c1b65f79c5f2444fcf07e07b11a5a7229ba762ac47ce484429a42f37bcbcc9e001fce0e5813a0dffd57a953
 DIST symon-2.88.tar.gz 110149 BLAKE2B 918ecf6c87a363e85ce67f9890b2ff6d326f14f896cb85ee6e501b962cb4e476b8fab9d6a96857e63e34aa2ebd2036fbb507c52d74b66b59ff7d77c7bc571474 SHA512 d2079caefcde4cf017460560826c7bf9e97aee9dcce886cd0a85d671bdad877c513889c9b7cd67844dbb4161ce6b6e6f99709475dd2591141f1bc61ee11e8173
-EBUILD symon-2.87.ebuild 2485 BLAKE2B e4549f452181b1ff6ce2150b31fb17110a842862721135ced72c23c4c4f11eec0667fe49ab8a410d956dbde26a1068701e17668e0f27eea9ec21e85e3eb4c06c SHA512 637d9c30617bd1f4d1ed881d8dc76c34387a2aa4f8ace179e257f9f5b24c6bfb73f3d475390a2fe6f17721c7d39e905e785e0ba10305ce4046abf33c3b9b19cc
 EBUILD symon-2.88.ebuild 2246 BLAKE2B 71d95481acaa47a4f1b6a9b3efd3076acf8c265cb3029afce4f738c58a95abb07011f0254037a577389271b5bfce21507abc2fe2f4c51215bd2a8958592c6c2d SHA512 7e0c78340e188faade6a2dccb95c0c77475663d960ec325ac6bcc873b0389cd8e29a6fc62df5bcbf775d2068d92243d72be608aa13fe22bd12d3c78e193e18f7
 MISC metadata.xml 632 BLAKE2B 2f2eef2301dea13d1714bfa3f092298c90712a8e4d0b0afdf56ac378c4aa3bed952d70ac56793c3b3b71217a9ba999e8491db5549afa2ebb141b12c22757f9bb SHA512 57e46a4106feab37a2f1c4cf5b9260bdcdfe8fa9f06fe850ca03cc3f9f80439e0f2db26c9cf41b2e7a10954241a4fbed68a16b5f8f33a6ed1b2c9ed31ea6edb7
diff --git a/net-analyzer/symon/symon-2.87.ebuild b/net-analyzer/symon/symon-2.87.ebuild
deleted file mode 100644
index 45cfd03c95d2..000000000000
--- a/net-analyzer/symon/symon-2.87.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils perl-module toolchain-funcs
-
-DESCRIPTION="Performance and information monitoring tool"
-HOMEPAGE="https://wpd.home.xs4all.nl/symon/"
-SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="perl +symon symux"
-
-RDEPEND="perl? ( dev-lang/perl )
-	symux? ( net-analyzer/rrdtool )"
-DEPEND="${RDEPEND}
-	sys-devel/pmake"
-
-S=${WORKDIR}/${PN}
-
-# Deletes the directory passed as an argument from the internal pmake
-# variable SUBDIR.
-zap_subdir() {
-	sed -i "/^SUBDIR/s|$1||" Makefile || die
-}
-
-pkg_setup() {
-	use symon && USE_SYMON=1 && return
-
-	if ! use perl && ! use symon && ! use symux; then
-		ewarn "You have all available USE flags disabled. Therefore, only the"
-		ewarn "system monitor will be emerged. Please, enable at least one USE"
-		ewarn "flag to avoid this message."
-		USE_SYMON=1
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \
-		sym*/Makefile || die
-}
-
-src_configure() {
-	# Do some sed magic in accordance with the USE flags.
-	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
-	! use perl && zap_subdir client
-	! use symux && zap_subdir symux
-	[[ -z ${USE_SYMON} ]] && zap_subdir symon
-}
-
-src_compile() {
-	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
-}
-
-src_install() {
-	if [[ -n ${USE_SYMON} ]]; then
-		insinto /etc
-		doins "${FILESDIR}"/symon.conf
-
-		newinitd "${FILESDIR}"/symon-init.d symon
-
-		dodoc CHANGELOG HACKERS TODO
-
-		doman symon/symon.8
-		dosbin symon/symon
-	fi
-
-	if use perl; then
-		dobin client/getsymonitem.pl
-
-		perl_set_version
-		insinto ${VENDOR_LIB}
-		doins client/SymuxClient.pm
-	fi
-
-	if use symux; then
-		insinto /etc
-		doins "${FILESDIR}"/symux.conf
-
-		newinitd "${FILESDIR}"/symux-init.d symux
-
-		doman symux/symux.8
-		dosbin symux/symux
-
-		dodir /usr/share/symon
-		insinto /usr/share/symon
-		doins symux/c_smrrds.sh
-		fperms a+x /usr/share/symon/c_smrrds.sh
-
-		dodir /var/lib/symon/rrds/localhost
-	fi
-}
-
-pkg_postinst() {
-	if use symux; then
-		elog "The RRDs files can be obtained by running"
-		elog "/usr/share/symon/c_smrrds.sh all."
-		elog "For information about migrating RRDs from a previous"
-		elog "symux version read the LEGACY FORMATS section of symux(8)."
-		elog "To view the rrdtool pictures of the stored data, emerge"
-		elog "net-analyzer/syweb."
-	fi
-}
diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest
index 0f30ceca1705..3d74556bdd95 100644
--- a/net-analyzer/synscan/Manifest
+++ b/net-analyzer/synscan/Manifest
@@ -1,7 +1,5 @@
 AUX synscan-5.01-build.patch 2450 BLAKE2B f71bdb916f50de5c40d4c0b374c87b3bb698d5f46ccd4fcb4b6c1218a17fe2eae1e02a9f3d7c90f7839e299e7335b8496e759a4bc8b436483ca4f1d802e30955 SHA512 231420fbc0b306442a8589bc406a9d8f6a206103878b5dde4dc1dd4d2d18ce165863c76df21b24c130895be4dbbc5798deae59044aa1e1d288fb3ffbc7acaaaa
 AUX synscan-5.02-destdir.patch 436 BLAKE2B 8ce7e5a365f2769431864d116a42780b12d68df8247e3a9644f6b9a19bd4c3f1c92e8e6938baf2f532d9de109fb1911d69c9bea0a407e6d986705fdc9f0fcdd0 SHA512 4441e97a177d918b221569046115fdae729f96319abe90c42e94a5bcc04a56f20057923057314c7d61e1d06ab2325d70409765c129db8093d27e8541498e8567
-DIST synscan-5.01.tar.gz 61440 BLAKE2B c32984108e7bf618816f29f034d120e322e25816b8aef6aa4a80920bb0555223706c1f916f96f64be7015bedcf4b22c55fb59a54b53ffe03d85575871832e503 SHA512 6a090ceed5ca0766b63a82fee468459a47cc2bbd97c120d0e0b8708f5ce154116d988a42ff29a9b6fa5fd6d699064b1df0e263795c4dcef0f619797289db88fc
 DIST synscan-5.02.tar.gz 60651 BLAKE2B 0ad083d6751234b60ec0428cb3752ba1207a5be5e305a0d26950343c7a7f0572aa9ad5cb16831d862ac43c35a051514bd8fefce4abadbf4c120e4e9add7fa433 SHA512 40ec616e169d0d4150e2213fbdcb985e55dcceefef521b0bf85d8964f5b82892b8abeffcbe9c5e38314c22b86553dae56fb082d546e83efa65755a4d345ea7b0
-EBUILD synscan-5.01.ebuild 722 BLAKE2B 674dfa56b06e3e8d23b7244b1d877d423df89ad3bc883649e2a3ffaf35df7c45f7c072ce9d1f9d06a1e33160660624a70fba47e5cdd9264165b3bd2e2b4ec392 SHA512 6abd15b1dcf875b960044814edb968461e6ae863a3428cc5e5a37f4a0fd1d81bef5849a92d3726c968d1a5289c3c077fc729a771ad3ea0023e3a37f07c03a4c8
-EBUILD synscan-5.02.ebuild 777 BLAKE2B 719dec90e0ecd003b1895cfdb101ec0a7aec4343a11c2368a991d7012980b55cc7ab6d49cbb157ea148d03a7b4f1540934ce0ffb67f69686791426feb0a5741b SHA512 617266198d115bb37d47e2e48531464d5779cc91a97980dd1309b6bce2d6ac733a4223e609c33edbcf5497f1f513efd6b96cc7323ed213dcd8bc86bd9f0dfa0a
+EBUILD synscan-5.02.ebuild 775 BLAKE2B 4d549d8f8090082e5daacdc0b78dd914685829c22cfff94942ba273c7983e80054a3f9fc9e9fad3364864337b4adb12e641bf4b702af18950ac722ae35234da4 SHA512 97ab032246b39a8a7e0eab8f20f797b2306e971f7d8c7f43802fb70eee70c55d34afade0368e00219bd6d01170310e644fdc6b827dbc8f08bda5430a352cf90a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-analyzer/synscan/synscan-5.01.ebuild b/net-analyzer/synscan/synscan-5.01.ebuild
deleted file mode 100644
index 14cfdbfae4c4..000000000000
--- a/net-analyzer/synscan/synscan-5.01.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A fast asynchronous half-open TCP portscanner"
-HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/"
-SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_FreeBSD kernel_linux"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoconf
-}
-
-src_compile() {
-	local _target
-	use kernel_FreeBSD && _target=freebsd
-	use kernel_linux && _target=linux
-
-	emake ${_target}
-}
-
-src_install() {
-	dobin synscan sslog
-	dodoc AUTHORS README
-}
diff --git a/net-analyzer/synscan/synscan-5.02.ebuild b/net-analyzer/synscan/synscan-5.02.ebuild
index 734a7d101fba..d91e0b3141dd 100644
--- a/net-analyzer/synscan/synscan-5.02.ebuild
+++ b/net-analyzer/synscan/synscan-5.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kernel_FreeBSD kernel_linux"
 
 RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 40aa5b6219fa..05d1537de52d 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -1,6 +1,5 @@
 AUX tcpslice-1.2a_p3-exit.patch 148 BLAKE2B 630ab0a2f57eda36d148c9338bc1a6b95feb4867f27bef5bc0ba4144a7778ab3a080bc13dce964c56fed8fd723f6ba3247aafd1d878cbb276f3d17ed58ba724f SHA512 7506ce229cc1e0d44570c62a77e0e96adc3936d8464af6c79abbd9b1fd09559b627fa4f27f905cc5e7fd39f246e818a445406ac9439b6792223671f0f1f77864
 DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b
 DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5
-EBUILD tcpslice-1.2a_p3-r1.ebuild 736 BLAKE2B 6a2fd4f929bb656cb9d232795cb2858e9dc459960cb4c656b3eb5aec86d2b4e35b6363d4632f9b9af7118ebd2bca6a2caf84c3f3ea7cf0a5608191a8debb195a SHA512 8b7844ca28b934c922927da7a91751672d592f4332be1574d18c2818c0def15cf72aed435240ded7699690786f979f5a449cad69c1297bfc7e9d69b185eb7221
-EBUILD tcpslice-1.2a_p3_p4.ebuild 868 BLAKE2B af956b365f5677d212f0bc4a43fab5fb4a061a7efb811c42678b6250b3debf37cf1f18640d82fc1202bf72f3fdd0503ce62052d8426eea82841452dd18a7c375 SHA512 4d5ca1c8a3f5097fe85f68519daabb1b80bf512f9eb33f2c613d80470b8da575092b211d747be4830b3cb0110ccf0d8842c36e2d99ee9dee49d3718de6b00172
+EBUILD tcpslice-1.2a_p3_p4.ebuild 867 BLAKE2B 1365b82ec2286882a4d569883705aa1cf6f43eae57146a980802f759a539c6273b76c7fe222698424df0b53c6139231f5b5f17f51e1b01b591765c188239264e SHA512 98bb83e716d15d7ad79316da7c74d45404ea99c0167af8369e87a1294b537ffb6b91f06d583fb5ccc39895fe1f3f38f484fa1c9a8d6e7448cca94682ffac9944
 MISC metadata.xml 371 BLAKE2B 072028b30fa16126531152222e9589f8ab1060c71124d1f582edd44b3ee3bd28a051a7115237e0dc05fba064b1a1755459736b296523b5d5472b7d1468408053 SHA512 3bd72b08f16ee7ae7c8fb8787de22923118d3a6b311328f4d7819003455312cf47002f9e41c00f68bf8c88f9e6d74abc4d1f8d24fb5ea41c038e4c46cf8b8bfa
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
deleted file mode 100644
index 706c33979464..000000000000
--- a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P="${PN}_${PV/_p/}"
-
-DESCRIPTION="Extract and concatenate portions of pcap files"
-HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
-LICENSE="BSD"
-SLOT="0"
-SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/t/${PN}/${MY_P}-4.debian.tar.gz"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/debian/patches/[0-]* \
-		"${FILESDIR}"/${P}-exit.patch
-	eautoreconf
-}
-
-src_install() {
-	dosbin tcpslice
-	doman tcpslice.1
-	dodoc README
-}
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
index c348b112eb35..e988b2260bdb 100644
--- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz
 "
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 48f8fba632df..3a15f2accad5 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,5 +1,5 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
 EBUILD tcptraceroute-1.5_beta7-r2.ebuild 932 BLAKE2B 27bdd1f9cdf1a458adaa96b26a4dac6cf005b6b2d0014bbd116afb59770dc129c7ce5705491a4ef06d10c4977a3e9e1be8f2f31775a2a4f1df8f961f3f82d340 SHA512 e71e63651dea0d1eb69ae3c3d0e5fc4b265c4b4cf0f57616541e443c34a517a2a9b3ea2b46cfcb67038c2a9e4bad91efed24b8f23266568828f3f2d0fe33697d
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 885 BLAKE2B 84e7fe04b487700cf258db0943dc4909406b33c7f3cdba01a070e7e3ec72c81ce04626b5a8fb1497f9aefc27ec551339292068db3c7dc9eb3db7aeebade29a3e SHA512 92bb694d59492e5ada1d024cbbfa90862c4cb878725ce1dffbf8d2aa754b1877077d0dcdfbb647b225fe676dc6b5d11d462c98c58d136e5e6e12b18f2f511dd6
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index 1479b57dfa88..bfb827e2b245 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
index 16f2024b0a27..d97f615e2984 100644
--- a/net-analyzer/thcrut/Manifest
+++ b/net-analyzer/thcrut/Manifest
@@ -3,6 +3,5 @@ AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308
 AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
 AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
 DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39
-EBUILD thcrut-1.2.5-r1.ebuild 666 BLAKE2B ce4568f14e77e08b29a4737c812fbf11633394f387881f2f09f3ce4566e6d82ba4d8edb4c251021998fc9d702ddf3f673e0950485f87d5c3d575c611c1bcc050 SHA512 e8a585dfee6c4e02420dba3d4a5efd05cf878c0a4e92d1b1530d432da1a90b70acc2eb2af786726e8c138695399e008485cb54d2c4038744c3c31b23e61bf56d
-EBUILD thcrut-1.2.5-r2.ebuild 760 BLAKE2B 8a0fc6699ec8161f1f039f7e4db23db1d31b6a88d7a7e8ba14ff6e3676b7e070ebd861b3bc1c714bc77727f73a271bfebfbe2ef8c34d77a82141786dd02f97e8 SHA512 0871c6b68f68c742e90c522738cbe66356d3968b8e0dbb0ea8fd7593dc4c3c32de0e944fb04bf05d16dbbd3a9a04b176bcdd9cad491c91e6424131468fc4c52c
+EBUILD thcrut-1.2.5-r2.ebuild 757 BLAKE2B 11c2b66b4f194b53ce010771bb41bbeb04f7c10c3c0e44bf5bf46702ce62ae8ff7f999f80cdd7a6ded964e2365b71cde05fcd8c5d5763f12689aab657969e095 SHA512 a3f96c49d51cf08008317668cd509b6ac424ce022337a891cdab515b9b1a2dbf96df9321897bac4efd6e59a4f0c36a39a71aeedaa63fad766f789ece0f9cdca7
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
deleted file mode 100644
index fef8c3f8e44e..000000000000
--- a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Network discovery and fingerprinting tool"
-HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz"
-
-LICENSE="free-noncomm PCRE GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND="
-	dev-libs/libpcre
-	net-libs/libnet:1.0
-	net-libs/libpcap
-"
-
-src_prepare() {
-	rm -r Libnet-1.0.2a pcre-3.9 || die
-	epatch \
-		"${FILESDIR}"/${P}-libnet.patch \
-		"${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
index 3e5ea0999a81..0e41e8ac8281 100644
--- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.
 
 LICENSE="free-noncomm PCRE GPL-1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="
 	dev-libs/libpcre
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 1a8d2fe608bd..3bcff4ed90a2 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,7 +1,5 @@
 AUX tracebox-0.2-deps.patch 1119 BLAKE2B dc1a567aec9ec7cf6d66f3b722f1786d5730c5d351ae4fa2c9d03387fd6cb2c5b04229803ea7ed7fdc075692ca04deb4ec6068d65dfd01d73169ac63a0db887b SHA512 ecfffb4fca07597361170681762ea001a403979a96b8681fa144f7dc86c6d3b508d756863f8b2584f4951c1207a23c6babf7457f5f48dce1c400fe87ab5985b3
 AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
-DIST tracebox-0.2.tar.gz 27954 BLAKE2B 57f4e36c727ebbb19161a6b4c887b64fdd362b033e09116f2e602a01737f19f10e6d0378296e70f683a5b8d53a57dae032e67098dd5989bb094daf3a3382a5d5 SHA512 15bfaede7e4828c14efbf7395f3d1c681b672b47157c370f4fe92d5d306ccc8e3e061107c3d36a505d732451d67ea146c21c299e6e826205725ab12680ee773e
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
-EBUILD tracebox-0.2.ebuild 973 BLAKE2B 8b26b66ed51cb1059a4dcbee1a5cf1167ac5523af0289e538fe9de05e6d042a4765ebf874a557b2659f34461d76e8197a3d1f92a152a9ed384f35739d746a36b SHA512 85a7b38d61154683a1288d9e1e8ef5a271e7840493998a1caa462ce13a3df1327520c3e8dd0be1e4246e4e3d48cca02fee32bc94ceea28dde8a7fff06a3daec1
 EBUILD tracebox-0.4.4.ebuild 1172 BLAKE2B 2808a98a047d80e7166aa165c389e1b93d953ea94c4d35a29a34993f0731a1b794faee9fb51f6b9cf2957faea1237dfefb2610dec57c9d9edf5690a4d200351f SHA512 c463e77f6f2b0db874cfb9aeb6323aa41284765494b248667d81752b184d2f51712da3551f56f1482bc18742957579288553d258f64eb199938346275ffd9a2a
 MISC metadata.xml 575 BLAKE2B 0de780b436640051b1fbcf49505d8975d39b3a4fa0d45a408718b9ca284e7f7f2609cffcda406c84fdc5b6fe2116d579e5624d8557751e3888c5a45ebdf95d54 SHA512 9cfa13bf788534c7bfd4edf945efa310e24229e9d777eecb1ad371ed99c13f39c63af14bf41e441ef94bd75ba53f318f23d48fd4fccd2d49e8d64b9d8fa2d83a
diff --git a/net-analyzer/tracebox/tracebox-0.2.ebuild b/net-analyzer/tracebox/tracebox-0.2.ebuild
deleted file mode 100644
index 6713366d9482..000000000000
--- a/net-analyzer/tracebox/tracebox-0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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"
-
-RDEPEND="
-	dev-lang/lua
-	net-libs/libcrafter
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deps.patch
-
-	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
-
-	rm README.md || die
-
-	eautoreconf
-}
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index a1f327bfdb33..e94860afc806 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,5 +1,4 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
-EBUILD traceroute-nanog-6.4.2-r1.ebuild 908 BLAKE2B 410763ccd772317187ba9bab3b8d75f0c796fb229796294e8f6442a3eefcf2e1fc6ab8973687821f750e91828c49edb74a49670e8624781bea716aaf927f0095 SHA512 8c390c84866ba38e150ce73d3ad126bca4a327064ad9507a12630c1e4de36ec5b453cbc569d368aa92b9e8abeb7a0395cde1149a6945178dfe5d02b553d6a838
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 962 BLAKE2B 4ac3502d8184b05777ac9eb319bdbce2483b63b9f566be52802b62b4764b59f7a883803b1143e5dd718c4e1c22c25b0e0f9ee60d3565841a9bdffa67c6203e6f SHA512 a33b0b909aa1ecf0cceea3efc19e23bf03e43e7db52dba820ee81b4cb8aefe945fd7d59c660eeea516c64a414bd334fd237c5c73e8f250eea99e637d8fdfb379
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 960 BLAKE2B cee2985f53c2dc93dbd4502ee2a7ddaabff4765ce18dbb2ef64648466dc9d231ecf7b46029cdfd3019b21b8afaecacbaf265a2afcfdd36a160ddf01c85aebe5c SHA512 71a07b76da6ffd54424e4705590c201aef0abc041614ec60e3200f5ecf25722b7349a8eaa18230ba34f7aed06f77109d29fa80d1b3118d62b6cc87dda5e54e05
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
deleted file mode 100644
index 5dc3aa31866e..000000000000
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DEB_PL="1"
-DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
-HOMEPAGE="http://packages.debian.org/traceroute-nanog"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${MY_P}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${MY_P}-${DEB_PL}.diff.gz
-"
-RESTRICT="mirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-S="${S}.orig"
-
-src_prepare() {
-	EPATCH_SUFFIX="dpatch" epatch \
-		"${WORKDIR}/${MY_P}-${DEB_PL}.diff" \
-		"${WORKDIR}/${P}.orig/${P}/debian/patches/"
-}
-
-src_compile() {
-	$(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \
-		|| die
-}
-
-src_install() {
-	dosbin traceroute-nanog
-	dodoc 0_readme.txt faq.txt
-	newman ${P}/debian/traceroute-nanog.genuine.8 traceroute-nanog.8
-}
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index d5cb034bcf01..e2c94b97847c 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index 1541c358de3e..568e928501ac 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -3,6 +3,6 @@ AUX trafshow-5.2.3-gentoo.patch 638 BLAKE2B 378c458585d055957976965f2ec6b770a8fb
 AUX trafshow-5.2.3-pcap_init.patch 841 BLAKE2B f338a21de4f75acda08b1fc1f795edca3928ee3ec8bc7bc64ddcf7af5883947be6fda6b8bd5c8b847966e1cfd8c7b826641375dd676d5a72b215785675007715 SHA512 510d7d972cc9a90fc3d39b96d04e588b82409479cf470445cc22e90126cf72cf4799929cbcc8381f6ad450f8ab04af2fef229d9dd9667afae41c3f8b7656e746
 AUX trafshow-5.2.3-tinfo.patch 1864 BLAKE2B c2f908bd07cc31ad5c555e7e4055fb1f3378986cf032e26fbfe33e6213f528120cd9813fa73b0723f1a4f772149e793926cc3daef93a215ae910cd2dae1816d8 SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056
 DIST trafshow-5.2.3.tgz 142615 BLAKE2B c13ee7c39d598dc78e58b65b49a439ecc9e5630a24f78d2bc5a8ec39fc6aa15c084a291f8e932027108176e7aeeebbf5fb7e2380a64718273e67073869b7d5e9 SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540
-EBUILD trafshow-5.2.3-r1.ebuild 914 BLAKE2B 270b9a7a20ddb8d0c6aa99eb88dc4182d01d38f779f76a081ed257d80216b76853c6b5ed25820b166ee57d0e52e6c5f810e8461cb823acd86820c939c89bb403 SHA512 9b228160ab86170ed22d60ba78aeea7bbd8845b941ff0795551838dc99383d5bb64389bdd080d5b1651ec5928a39c02589a593acf3916e74ea7ff33337fa6e5f
+EBUILD trafshow-5.2.3-r1.ebuild 910 BLAKE2B a95d8ba14ae564aa5e815a92b149aca2a80ec52d337ef08d445faaf670b9736de00d094e503116c90703dd17c4be62e09220b0ff3b5381024a5629bf0f61af1d SHA512 a7c762f521e209c3064a3d095f9231554d5900a0989b897079c743383ddd763f89c5d5c7c8d85dda815aed9f08f5ec9fad1e298792c52e811a24a27dd9b1a7ca
 EBUILD trafshow-5.2.3.ebuild 846 BLAKE2B 25e04654fe1e4df05bc428e5ef57c8df0a2c87f6b268740cc506f534149c0a09f347b74a31a812f0ad56c2618aee28c64ce7abea460d68a2b93acf9651bb2c43 SHA512 548e0a060fd84841d71720c80f09ef2b13eea314d07522b534f2de7eb30669bd21b6d47a0c9331fad1e398e922d6e1e0719435367c27b0fd68a1ff50fe3a7943
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
index ce61398d05f8..227dc9117fdf 100644
--- a/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="slang"
 
 DEPEND="
diff --git a/net-analyzer/webfuzzer/Manifest b/net-analyzer/webfuzzer/Manifest
index d6e37b56798d..b2b7b2b243f0 100644
--- a/net-analyzer/webfuzzer/Manifest
+++ b/net-analyzer/webfuzzer/Manifest
@@ -1,6 +1,5 @@
 AUX webfuzzer-0.2.0-flags.patch 640 BLAKE2B f403d4505c912314e9966b17ac20b1c883c2bfad705dde711105fd10f20c7ab71dd3b29069398e1ee8532628893e94273e9eff9e710039aaa6f5c4e913075cdf SHA512 3c9827a44b1a3c6aa8851eb791eb61b43d7760cec4d77366491afeebf3db6d32ae836a7dc5ab475cccf70020d90ec96a9cf98ef933cb9d3e205cd84ae3352bac
 AUX webfuzzer-0.2.0-fno-common.patch 896 BLAKE2B 018272d0921634b669211a32f5a31e05abf5a6822701f3e3fc17034a6d3a3095cc7325b36b91041a889cc8e038531e02f32958849995903dcd539e0cc7ca4236 SHA512 5c62759e17809be3f26efd52043608408b1dbc493e07b72bc514cb0e73f92461c6c14994e0597c2efd1a1b0d44544e74b1aca9221025f7859b5e10a1ede8060d
 DIST webfuzzer-0.2.0.tar.gz 29664 BLAKE2B 38c03f826c99887d8e8531a19634b250a73dad5cfa92386a033015c354739ba403c90faf9b0e99ac705ecd42cafe564d11edff9bdb71b9c4b29c048cbe64c1cc SHA512 7cb858178dd11e7b6020f2b0db1092462401aab552af6bdb8b8c95c018bd35572a981338226def07dc45ed8f0b5a0b282ad681e9d86bec14d14ffd623518082e
-EBUILD webfuzzer-0.2.0-r1.ebuild 613 BLAKE2B 364a247e782af1584e2bd3f4c899367a7ab92880d2bb58e847940b5615c0e06c3bf4b0f62d0f30c4a249015dc898639863dd517fffc2254824f17b3fafa930d8 SHA512 e70b8c6c76fa58c93e90b3924d7a98ffc3da0f23e8c09943e12946a44f54dba5a6e61fd596e7bee475bc20796beef27903ccebba6da7c83cdd05a77cd090615e
 EBUILD webfuzzer-0.2.0-r2.ebuild 571 BLAKE2B a73aead55c7f50d0a45593af1bd07071dd4b86c849d2d63ffb7d605b8820feb89ee8b7648c1674a8f2458927f7c1ed1d2662b8a0d145c1ea661e89a8e61d151c SHA512 95bbc014327b4807ae76bc318c1faf11c4be82538ad3a1933a2f8271eb2c1d8edb5ae9ee22cc516f4735d771b0ae1d02ae7e94fce03e6c4786640bb65807a85f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
deleted file mode 100644
index 6b40638cf0bc..000000000000
--- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,31 +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="Poor man's web vulnerability scanner"
-HOMEPAGE="http://gunzip.altervista.org/g.php?f=projects"
-SRC_URI="http://gunzip.altervista.org/webfuzzer/webfuzzer-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/devel
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's|CFLAGS=-g -O3|CFLAGS+=|' \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dodoc CHANGES README TODO
-	dobin webfuzzer
-}
diff --git a/net-analyzer/xprobe/Manifest b/net-analyzer/xprobe/Manifest
index a71544fe392e..0bb2975a200a 100644
--- a/net-analyzer/xprobe/Manifest
+++ b/net-analyzer/xprobe/Manifest
@@ -1,6 +1,5 @@
 AUX xprobe-0.3-cxx11.patch 251 BLAKE2B 568fed378da0f4943a328a8f662cf8d02e489a78ff77815b3a73618b7f15ac1a67d71784a8c67d8af54eeb33c51b01b86b8c032862654c6e9e51b1d6ac13f1dd SHA512 f4b6cf1048b9868d4119b063babbf91caa7b98f9ad8a511e4652c053be2d9692b03c62c3be3ea10831d55ddfb5b5f989c029237ce8d7a48da3c05ce9fd96c429
 AUX xprobe-0.3-gcc43.patch 655 BLAKE2B 83831f0420e69a4d673eef69a5f81b63b81ad3897078f60ff761064e31552dafc16b35f93cf83c75027bfdf8485f201c4fef1339b89cc73c5dad51e27f1bf229 SHA512 7ab58b18fe7593f2389d72cc5d9160a65500866f44045c219e8a4fc6d860e34080a50d9e295d38d801c8af3d1b0ceab4f98fec296aa2eb49415561bbe9903950
 DIST xprobe2-0.3.tar.gz 533636 BLAKE2B 1f106a3c08bfc6e205731a2e8c64f7e9f2e52caba38374ab7980fcae95113b6790297a59f5d4d6ad8e09d2145b68801403472b07690ff27b42dec8c6b7d97895 SHA512 fd499ada22be5df3e01630948cb72d1a9e648e0c7bfaf2a688386a61c67bb36a326a9e2f3f2b9960a6a49128343010aafe8a3f04ec05e89420a1384215e41f21
-EBUILD xprobe-0.3-r1.ebuild 772 BLAKE2B f9cdbc797c16e28bc00eeeb75234c2825355ca20ca195f4845502f6ae244fc3e2f13e77c6618bf0b2745e9e74b74a794889c48d5ae473279d6b142967d442a7d SHA512 3282fcd2a43cd919f55db23b3d9138ce3de754136d51401a98020224eb29f39b6dd9d1c788191490e8401ab1215094353d467d5a67b1c0354bfc83b33f88f7d4
-EBUILD xprobe-0.3.ebuild 639 BLAKE2B 2ca5d9b885a23429eb2c75ab66ec4f02b9fbe909d280ee5defa9e2664ed9a2d8af32449e4dcd8fc3031e6eb721591d2e74af04c4bf034e29f3dac5ee2489fd82 SHA512 54f5df5388d324e453bf444d9aab21b982bd5c251487ec8782fa8bd1be652641e7ca76fee940de9fa25242a99fee7775cbafc3ca8e1361074ff25c80a0f051c7
+EBUILD xprobe-0.3-r1.ebuild 771 BLAKE2B 26cb564e6153eb06d22359f0a708ffe91b83dc5458c1f6cbc22020b27bbc2ffb7001df4bfef1b5fd8c1bd67cd874071ca6e4d6c44cc0761f0b10966db4637c01 SHA512 822cacdda125bb2833724488dc878c3cce6a28e5b98e80d23f39be6816ce6adfbe2f3317e00a607155247df8a97ee12dc465cc169df4bd5e05d904a7ecd84e49
 MISC metadata.xml 678 BLAKE2B 8d60a009a757bfb8b9557311e759747cd8c70b0520b06c276f31a90b5897a35720b5ed4ba3a284148efc4abdf73c3996c1b63f6ddf4d0a6e5a305604be9717e2 SHA512 54ad9e288eabc0a3b230504a94310fb9477f392ab7138c7d7f6ff252abbfe0e9e0733b29ab757a39729e916cfde43cbf591a7e4fc099be2bc8bcec44b945cd36
diff --git a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
index 209b65fecc78..db0208e8db4a 100644
--- a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
deleted file mode 100644
index fd60ee96cc6d..000000000000
--- a/net-analyzer/xprobe/xprobe-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
-HOMEPAGE="http://sys-security.com/blog/xprobe2"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i -e 's:strip:true:' src/Makefile.in || die
-}
-
-src_install() {
-	default
-	dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf}
-}
diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest
index 282d14232bca..8c8c94de4468 100644
--- a/net-analyzer/yersinia/Manifest
+++ b/net-analyzer/yersinia/Manifest
@@ -1,9 +1,7 @@
 AUX yersinia-0.7.1-no-ncurses.patch 330 BLAKE2B 86c2cb84542012c6424fdcae398e07769647bcdda300d6efdbb263451c8765e23cd272f76e4e0e84751272df3de46a77b32fd2321a0ab3bc70cc8199b457adf6 SHA512 c0a0ef6456727eaa0ae9ea50667e04a72afb01c5b75d13965836657e4d1946df550840afd091ec58e8875b1a551df5966feb98b655183cec6dadaf4f5de23e4f
 AUX yersinia-0.7.3-tinfo.patch 563 BLAKE2B 6203584c6ff7b8e5438f57ad74b5b1ee7ee61d08b2bee21234fd4cfbb6aa37b9b1cb69b4a7af11e57434b215e346f6384a195ffdd47b9504fe6eb93b3d2109e9 SHA512 9a53505e050a9658f49809ad989d534e542fb0cf21ae70a9271b536a9a478a4306e49c9b0493ab522d5ffb82849eed043b212e399505c916792372a64d96c319
 AUX yersinia-9999-tinfo.patch 563 BLAKE2B ef2b554f82037dde165373fd6db71503ee124062cef4689062e7e1799f5ae26afd5758468f3c860690046aa4cb6e12dafd7ed3189a765a52565b5530a322d11a SHA512 a0edb5a47281bc66f0296914597fc4a9901f0e50640b43b6b31a30ddc4b6a5202220207039c3936f32769161f2c61d78afc5a3d7725d04ea41afd301312efa24
-DIST yersinia-0.7.3.tar.gz 378124 BLAKE2B 032015045cd5683c8853504bd821ebb3decbeaeea933a14983eec6498de33db79771ddeb08934c6ddf82db620aba89c84ac8c369af25e7bc19d820395ba68b57 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339
 DIST yersinia-0.8.2.tar.gz 387889 BLAKE2B 67fe92b9cd1253874c61fa38c8e89e023f7d0ec3b83fe3001b5bc203d4033e36cb94b453ed56426b34d942036a143bd135f247466425337478f292797a433652 SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd
-EBUILD yersinia-0.7.3.ebuild 980 BLAKE2B 09c0454f6e0cafef056d9fee8e9ca72f18b220939fd90130fcc4ab2320a063742af2ea9e1536af37cb753c29c7b9dc2006f84e04cd2e804de1a1431c05144e35 SHA512 df6a775cc7761a450f408439dda555f1864384516ee88b7406512b9eef3f6f3beda7cbb75ba4b070e98d4eeefdda152b3206fa04a5855b36e38bf1e874c706e3
-EBUILD yersinia-0.8.2.ebuild 1073 BLAKE2B 4a3e9b457adbc9b58858581562ce2a8e9b82f1ac268b85e4f8bac8c9c495a2b8dd226851d82e6c4f9adbed3818fdada84ef520a4d5215607392632737e3ec56c SHA512 b9bc63584bd24feff8a6344b44b68dbb099e43c60e2c2a6512a7c815c560adc7a8625455615db92c3a0d874341d7ce4ec332e52450f1a5e49460ddd577b4d552
+EBUILD yersinia-0.8.2.ebuild 1071 BLAKE2B e544e5a50c20bb4a3db8bdc6fa84dc6666784c30925ebdb7b479fcbddb24c4e03830f84aa5a16963ccd4cac1faf940aedbc2742847f6e66011a8251c5aa25b5a SHA512 828b8863805b78620ccefdbfa40da0ecefccf9127965ec890ea80b64072a949df57fbe2f4e772818c2e015146c0b0d1c62ee64248d4078d72f3c8c4fc4df524a
 EBUILD yersinia-9999.ebuild 1049 BLAKE2B d39ae8cc02fc3c7196e09d2924278f06eaf7dc229dfd0209a6b60df39f4fd3316638471f608c6ddce08cfb3e1bfc40f6251a9b0ff95dfc395007884f4fd40a84 SHA512 73641e8b11c20b57f5d500da14d9943b39e93b70d8e2551181976c155a60f481c64da39dd250e86c8afc4cd552a291e0c76e7106c422bbbb04b6b6b969f7d8c5
 MISC metadata.xml 513 BLAKE2B bf48a4589a561ec123290ebac68b7c500d17447c10b5c3fe67f39eca9566db84a968598071e84dab84cd159ee927c5e421070ef391a13ea43fe63927454b21ce SHA512 47b3fd2bc0c3c09d142113fcf3ac23256364a5737692f4c5a30f4980325c6a706d95c55d26365ac878e8a34c2a2471984c4c608ac4ecad2606836ea990bd468b
diff --git a/net-analyzer/yersinia/yersinia-0.7.3.ebuild b/net-analyzer/yersinia/yersinia-0.7.3.ebuild
deleted file mode 100644
index bc346d8cf0d3..000000000000
--- a/net-analyzer/yersinia/yersinia-0.7.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A layer 2 attack framework"
-HOMEPAGE="http://www.yersinia.net/"
-SRC_URI="http://www.yersinia.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk ncurses"
-
-RDEPEND="
-	ncurses? ( >=sys-libs/ncurses-5.5 )
-	gtk? ( =x11-libs/gtk+-2* )
-	>=net-libs/libnet-1.1.2
-	>=net-libs/libpcap-0.9.4
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-tinfo.patch
-
-	if ! use gtk; then
-		#bug #514802
-		sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-admin \
-		--with-pcap-includes=/usr/include \
-		$(use_with ncurses) \
-		$(use_enable gtk)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
index 669aa0df2290..e216096f810c 100644
--- a/net-analyzer/yersinia/yersinia-0.8.2.ebuild
+++ b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk ncurses"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
commit	9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree	47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-analyzer
parent	d934827bf44b7cfcf6711964418148fa60877668 (diff)