gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /net-analyzer
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
91 files changed, 471 insertions, 1621 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b7341380616a..649bc87c3dcd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index b6a3dd151743..aa5e638208b9 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -8,7 +8,7 @@ AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
-EBUILD argus-3.0.8.2-r3.ebuild 2018 BLAKE2B 2e7f691e6b4d711ab805f8274b5cccc62afffb5ebc16640bc1121dd403d087a5385c5b1b95688371e8a2f21c661193f8263bb73b5d6c1f9da3484837ebdd18e1 SHA512 0c4f385b9d913aaa7870d3196625a166f38fa18b5eb4948f9e4ae5cfd2e6bbc162ba2e796a9b19df3f0fca20828000c6bbf6eac75c98781edbc8dc6b1b5d3e87
-EBUILD argus-3.0.8.2-r4.ebuild 2048 BLAKE2B 14495922f1c06df64278e94a75d1bedf97a2314ebdfc4592aaac74c45b2fc1bb9ab035d3b0aba9796fa47fcbe898bb9cfadd06fd4092fff8a9e21f1ca9c6e61d SHA512 b556f3de56e86c46786f3830ebe7aae0979f2d7f508c80d5ef22ba3ca28e5b81b8b5742e76e3f1b773250df8dfa00e8b87c488e4bd1d84598446dc49afa9fdd6
-EBUILD argus-3.0.8.3-r1.ebuild 2041 BLAKE2B 5286684a9d56de8fb3d79fade6f97243b844a112022edf7a2e7a98b763fe264e70a6a660e508b4cc679e6ee6f476eb6e317a46cc26856b9791ad30c5a9de186e SHA512 404cae82d5098a0fa30165adf153c37139eafb1eb59e99583bb3925fccb179bdab3f5459c5a3509c0a849cc927ee8967146c49cd4ab78f09ef2a76b362283e16
+EBUILD argus-3.0.8.2-r3.ebuild 2007 BLAKE2B 03b484f6869b6064be1ffaf660a8a402f51d7c5454b9395fe427284ef4fbb3ed0af2cee5cb4e5f7350e15e0d1e0a775c5834b948bcaa689adf391631b63e5898 SHA512 4d8ec76f190e380ad59c01e15e6eeff645edeea8d57143afbbc2b99228f80f35ba06c0adb8f752599d5b09165063f2fcd62433c0035ce225cbf12ab8d2751144
+EBUILD argus-3.0.8.2-r4.ebuild 2037 BLAKE2B f6a3ea728f7c802b79551a91a776f349128d06d46965cacafebc5dc7032b7cca8c33c29f3b5c8d78dfc492f2dde817cc86a722dd097dadbff62540fc778fdcb7 SHA512 1e72858634af6236619d4fa33c047f3dabddc50325611d0dbd537942785ecc8d845c178888974726220012143fea8c066d2bf269f55ada729b8ea311d6d5770e
+EBUILD argus-3.0.8.3-r1.ebuild 2030 BLAKE2B 0f3d466fde3694ed0238b803f6002b32fca67e8ee23169dde2c66a65a12fd40a8005240ea7597e3d536c8a3877757e0af7ff6795413c5903ae485140c95b3b65 SHA512 2d30dd9e69fce9eae94d7c671f41a52d7e73d7b900dbfd974d8078363ad8ccbabf60571349d07b4135e90987f6fa8a6b4e641282586dbec19ec53c8611e84e00
 MISC metadata.xml 378 BLAKE2B f5479fe68336ff3ee37d9e325b9b2c1a70eb399746512fec7e08e603c82c1183b8229e0b9ee1fae073f027ca7a7eabbf9e4607c9ab1b2fa6bb6fc8b6c9bdac6a SHA512 cbd4b2e58b229b6fa82e1b3628153113b611d7370e2f4fd3e662541f07d79c01aa5974cb797bcc67017034dc7f52373648b2cdb5a7f64a89391c7028303f591b
diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
index a0f306223745..47656c47be5d 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
index 3ca4a4b18ff6..dd6e555ef544 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index cc378b5cf4b8..9dc4905b07a7 100644
--- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 7a24abbe4d53..8d235176a392 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,8 +1,8 @@
 DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2
 DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
-EBUILD arping-2.17.ebuild 719 BLAKE2B 02aacf539ab963b0ebed80e7320949679a5f6d7136b19d02089f488011c9cffbb079184c59e4b3ece2af784be9023047b88cfe2ea7658e9c560d559a1251a91a SHA512 e2767da52261bae9403f2dacb846a93a72038316828838bd8520e3b24e66fcb958aadbca1e3c92991c69c311b3344f074b51cacba69ef8bbc17f2024f52e4eef
-EBUILD arping-2.20.ebuild 807 BLAKE2B 4dd3667f883eb173f8dfcdb57a64f69f90a84972af6c0b6b4e46b3e92a4511e44a3928e34821d2951f883515c0f75bafbb03225303c47c383e4382a258d0328d SHA512 aeb3bcab144934c1aff8fe6506252e2e26cfff8cf3c7d9087c00dbd4a7e49f9f56ee1b8bfb22112ce61bbb06e4329ae75284761e838f97f39667c44a59d90cbc
-EBUILD arping-2.21.ebuild 807 BLAKE2B 4dd3667f883eb173f8dfcdb57a64f69f90a84972af6c0b6b4e46b3e92a4511e44a3928e34821d2951f883515c0f75bafbb03225303c47c383e4382a258d0328d SHA512 aeb3bcab144934c1aff8fe6506252e2e26cfff8cf3c7d9087c00dbd4a7e49f9f56ee1b8bfb22112ce61bbb06e4329ae75284761e838f97f39667c44a59d90cbc
+EBUILD arping-2.17.ebuild 708 BLAKE2B 3f42edd2ff6cbcba37db121428174f06a7a88c0d7217918509b962b2f5da6f9db020102989bbdd4fb28c9a5077dd77e58bc5d4995712b7c71d37add6064ef122 SHA512 dbc00430158b3633e3b35fd2d72e17f27a1ec42c8e306a8d40e149cca5b909db5792d3f21fad1b7463803c4831b405a27a871c6db45f4df76157ea5408d1bcc3
+EBUILD arping-2.20.ebuild 796 BLAKE2B d4637d26d201b66e4dd1a2c60efb22e5b60f239d6c538df33959d04d9ef69b3b6bc3c877ea731bc92544485b99abab067e20504af60820256740c41f9a00ba64 SHA512 dcbc382a2b8e77aeea9e945b3d1f3ec31c19c6b045d1c537f2e725ab9a89bbf73d9fd1194aecefc354956cafbd852b37b27968a427b381af5680e22f3d29e967
+EBUILD arping-2.21.ebuild 796 BLAKE2B d4637d26d201b66e4dd1a2c60efb22e5b60f239d6c538df33959d04d9ef69b3b6bc3c877ea731bc92544485b99abab067e20504af60820256740c41f9a00ba64 SHA512 dcbc382a2b8e77aeea9e945b3d1f3ec31c19c6b045d1c537f2e725ab9a89bbf73d9fd1194aecefc354956cafbd852b37b27968a427b381af5680e22f3d29e967
 EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index 78d487844d14..7e92c98a37a5 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild
index 7c39a6fb1a52..889b70b2de49 100644
--- a/net-analyzer/arping/arping-2.20.ebuild
+++ b/net-analyzer/arping/arping-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index 7c39a6fb1a52..889b70b2de49 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 4924b0ae16f9..4acf7e078fce 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,7 +1,5 @@
-DIST bwping-1.17.tar.gz 104254 BLAKE2B 29db75f69c195f69df1131a0f096678e2e8c7aed603b16bedd269ac6bd8493016af27658248b40f2e551006c669d929a36dfa2cf37ddca69d4b9e9db5c3575b3 SHA512 b8337a714e3a51e6f999bc5a924bbb91498d614f858a7e532111d7cd27efbfacedfcff7d10650e84c66c74d3e7eeb5015e7491e61f44d738e941bb42769716a5
-DIST bwping-2.0.tar.gz 106255 BLAKE2B f3ff631a1d9d5aed9645558c639840055bb041612e3f587ba2f7253d345e371dee165e170f28595684a7e269e58eda8f506f070f7da05643ddd0b6a3b6316a7a SHA512 5012cce8633c390989d0ad508a7b075945a30adfa60961946349a34cf734ac8a24e485a6bebb1c89199a1e27caf6cc6fdecce31016912f83c7f660db2abead95
 DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
-EBUILD bwping-1.17.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
-EBUILD bwping-2.0.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
+DIST bwping-2.2.tar.gz 119688 BLAKE2B e30afc404f73aeff28e2775349eed9e6a113a7c0ef33798de9dc983f2ecb08ea1dc0838067aa83bd83e513fa9640bf38fd04a924c382bf770779892dcc39f8ab SHA512 4c0338359fce039357d763a0bdb8ea133a8c63f0e7eb2cbdc294454cad97b6e9010bf8898948aa2572418e4ae667d25dd54475a162f029c052b9611795ff4230
 EBUILD bwping-2.1.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
-MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
+EBUILD bwping-2.2.ebuild 464 BLAKE2B b8f2d8f1e1b62095c483789296c2d5687a22e1ec57ef3cd9aca9e15b15e1b280315c46063165212519e1812001d691947aec09b946275df73c86ff4b4fea9d44 SHA512 c20cb8e0c954e27abb3e4f20754722939accefd8603c79c02dfd544a2a2524bca626e45498d03a9c32a049224ad158e5318a6d53e261f395f85adcf168c317ed
+MISC metadata.xml 713 BLAKE2B e9792f974ce687d37a8faeddf987f0eda5086097fdf8db3d9ad5cf240bd65059232cee613fd1eec064916361fdced304f08134c3bfade7953f94ce2cfae90352 SHA512 199486090bd90174304b130e5c84e2092c535fcb360ab911ad44308f6a4ba1ad822d824cf370942a5ffceb30f86d4ee43eba25ee56d344acf572592b142bf156
diff --git a/net-analyzer/bwping/bwping-1.17.ebuild b/net-analyzer/bwping/bwping-1.17.ebuild
deleted file mode 100644
index 4743efcd1e43..000000000000
--- a/net-analyzer/bwping/bwping-1.17.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="https://bwping.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-src_test() {
-	[[ ${UID} = 0 ]] && default
-}
diff --git a/net-analyzer/bwping/bwping-2.0.ebuild b/net-analyzer/bwping/bwping-2.2.ebuild
index b22cf8d14539..34866c961db0 100644
--- a/net-analyzer/bwping/bwping-2.0.ebuild
+++ b/net-analyzer/bwping/bwping-2.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
 HOMEPAGE="https://bwping.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/oleg-derevenetz/bwping/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-RELEASE_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index a5d9e36f9669..529ddfb22ddd 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/metadata.xml
@@ -10,6 +10,7 @@
 			<email>oleg.derevenetz@gmail.com</email>
 			<name>Oleg Derevenetz</name>
 		</maintainer>
+		<remote-id type="github">oleg-derevenetz/bwping</remote-id>
 		<remote-id type="sourceforge">bwping</remote-id>
 	</upstream>
 	<longdescription>
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 40e322ec58af..a9fb5e5a83d1 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,7 +1,9 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.2.13.tar.gz 107543 BLAKE2B e0de75688334d27604a76c00a09ac53587a1e57f45df925e30a1a88a5e0449df803dfad901328c65b55484bc9022bf81d53880f17d4bd4efd9214315f01f7e92 SHA512 86d44195847c7b3acb1f6aed2bd6a57f562645b20724560d6b4bf7962707be4eb2f5326731453937b64420b5d51b714aecbd8dbea58d95f29ef4341515df8b00
 DIST cacti-spine-1.2.14.tar.gz 107577 BLAKE2B 5865d93ffefeeafac1d2245000467deac79f8008e81b66de310bf08e7aa31f17299a82fc107ad49c3741bc2f183bdbc9554f814bf9e3e4b1dc85e267e4f16112 SHA512 44dec1077b419dfc987a1d423f2df597bf2026ca7f39aaafabfc7de9e6fdc616f505b86ace43bb2ad628f220cf8d8cf136a04f00c4fd23ab73da75068f804999
+DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
 EBUILD cacti-spine-1.2.13.ebuild 894 BLAKE2B d87521d5b3d0604e61f08853356c86578647cfec8b59ef347eed64920a9d0aba57bbda986b24afd4ec8a0442a81827b143f9d3dbd2387cbd2fcf31e0fbacce8e SHA512 a7d0cd71b0a3cfa669c240df7bdffa91069e2d84b5185c20aef4b41da7640f4d82e38633fb4c26035eb8343878008e95c3f3231e060b02d8de4313a0d0a5e329
 EBUILD cacti-spine-1.2.14.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
-EBUILD cacti-spine-99999.ebuild 845 BLAKE2B e4faf97751ec27cc7f06aab5045c016b25350d568d75fe6448709ffd7df34ac04e7e05b7534212209adbbe44bccb27334a58a0f2e062e99c2178332355044916 SHA512 cff261fd1325fb23d4388e336aebfd9ae4ec78b54c2c9239284482beda8d0900ef35b9649b7ed5d049239fab958ee8380a671b6b9dcc6cb9e7644eb962817884
-MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
+EBUILD cacti-spine-1.2.16.ebuild 882 BLAKE2B c709f867fa511ba0f9955efb6321a722f55b567cec654ebb42d87ff6c21a4e0287ab1798699c94609e6c800dc145c0be44c32c8b96d6ffb1f88f2c36a6b67462 SHA512 17b8ebf52c22eeed05d3b5e20e510c849fc10c1f34a150d0a55f3e591e33f5c34696f9b5ca982925dfecc91ca33969405e03d263bec144e998696403ff89e31c
+EBUILD cacti-spine-99999.ebuild 830 BLAKE2B df76efd7eaf22a36b96c6b834089f5e6916b4ac95d34b07e3db6a93d84bac90124c94d67586078283f6a3e6fc817501e34083b426982f0694fa7a7179cb269a6 SHA512 903233605ded071a0eebb0e17b25bd0cd61b20b54c0d85a2fc230058e64e908e4b8eac3ac7f566f7d1f4d0c68cb2be0c6f38de7bdf344c9e6e3df81b2af10ee4
+MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
new file mode 100644
index 000000000000..86a76185c475
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
index 34e6c184a65d..1367debdc14e 100644
--- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 MY_P=${PN}-${PV/_p/-}
@@ -15,27 +16,24 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libressl"
 
-CDEPEND="
+BDEPEND="sys-apps/help2man"
+DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	net-analyzer/net-snmp:=
 	dev-db/mysql-connector-c:0=
 "
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	>net-analyzer/cacti-0.8.8
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index 3c9260bb2907..4a1f31008219 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -13,4 +13,7 @@
 		replacement for the default cmd.php poller so you must decide if using
 		Spine makes sense for your installation.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">Cacti/spine</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 3e6f404780ea..7d629d85d571 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056
+DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
 EBUILD cacti-1.2.14.ebuild 1011 BLAKE2B c9c42e80eb588faec3c8c16337905c5006fabe200bab3b0d1c8dfe6ff02391a52947d9efa30f331bd3352030d8d48bafbfe90d1b11ff9de1fe3eeffd7d2fdb16 SHA512 2b58b91c60e77448d15b8fd91b05692a3102e0ce699452b11a71b0c9767820e65a47e1feb816dfad6a0a16f3869e8f765ef97e67f08250a47a49f6cdadde92a8
-MISC metadata.xml 858 BLAKE2B a26fc18f14036255564696b9d0f683dd6d91009437018e455817430996889966afdaca195948e74d0bd27e3b5e9dc8f7d7ea84b0b9f500db8120c816e3025fae SHA512 c4310c412735e5d41e1c3139de4ba42afe188efaa2e52b25fb1e88ab200e0e259bb119ebd725891b2fae055d22915bc794fe8b15a62faff8150b996012d2d403
+EBUILD cacti-1.2.16.ebuild 1019 BLAKE2B 57e9066fc7f369946454a5530453429401e567d96dc29cccd805ddbfa08f39714ab4b96ca25fa4ac39e59f7745b5e4a0ef446c996da87cfcfdf5a96b2b80cf9e SHA512 cb2c4ee15777689a17bcade0e8c51ed6aeee1a28f177aa4236fbe223df080fe115f7f0c45826908d5e4d212dd1afb72eab9d06c70662f67dd7d27c14412c28b5
+MISC metadata.xml 934 BLAKE2B ddf6460296c62f7aef96152fb724b1cdff7a846ac33e9119a935b63d4eb6d9aaf4ab077487300be4d38dd1a005e80de34bffec8a72bc34460e1f772c8e18ed56 SHA512 a7139b430dfe53fca0684b33e8f5e2e496d5b16deb0b5da52e427066b9388eb487273b166c53dc77a2db1770d39fd6669bff61cd70c65c94de35ce3acab0acc3
diff --git a/net-analyzer/cacti/cacti-1.2.16.ebuild b/net-analyzer/cacti/cacti-1.2.16.ebuild
new file mode 100644
index 000000000000..1dfa8747632d
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${ED}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index dedf38ac9c19..0f56fca8650a 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -18,4 +18,7 @@
 	<use>
 		<flag name="doc">install html documentation</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Cacti/cacti</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 39345c302456..478702fec53d 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -2,5 +2,5 @@ AUX chaosreader-0.96-chunkcheck.patch 1048 BLAKE2B 81aa846daac3aa098d6699c6542c4
 AUX chaosreader-0.96-divisionbyzero.patch 661 BLAKE2B 529dce5b432e6636aee92526ce1e9edfaf900d64b7d4daed1163570d5d30d649987b453350bfba49bdb839256910e3849558fd7283e5a23d563f521304be35df SHA512 77fbb6e7b75055320e1cdd5e88fdadf10cc619e0ec3315640c579c6dd490be07dd504e8204ad7f35e260dbd42d82f596458cece701173aac0a5023274d56f380
 AUX chaosreader-0.96-zombies.patch 343 BLAKE2B 85dd641d9c20a5f90a0f102fbae1abee3042974c40b166a1c8f6fc8e78f2f3a6eafa8ac2ffd1de66baf751bc05b581bdf6742df68cac5254b0a363a6d99ba9a8 SHA512 7aa70a9e5dc543cc583ee825b0bee00aaecc7dbb12c0888376354cbdc403e194af37685b10e339f7fb59e031ff92b6b0f24634311572a5ba43e89706d700ec9c
 DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4
-EBUILD chaosreader-0.96.ebuild 724 BLAKE2B 33936dddbff112b78e99ffb0d2f4421d317c354434b870bb30b33a49ce1f7293ff349d6f11771956533eeda20d1b1bbef9b0f5f5954419c908c52e84e573daf0 SHA512 0ff77d9619e81f3fde969c781620c117ddcab6cf8cd2f892550bb7d835c64a20bb7a5f06876830737a3c6335db90e9c64d740bb7d342bab940eaa2ecd18fea95
+EBUILD chaosreader-0.96.ebuild 713 BLAKE2B 14e0a55ce2bd59080965da49d9f0e559cd5fd34901f9aec673698e5bb99efcccf8e10983bbd31300ffc1e1def041632661cd642e801042ceab199e01d1032c1c SHA512 ead0c2c4d6a76cb76efdc665183f12a6e3947a93e3b3a018e1d523bc3a320e57f9ed3b415e9c54806df0708ccec7419a930e244e83a30561ef74907a416a7d56
 MISC metadata.xml 311 BLAKE2B 16163cda4ba6d5bb0f4c5097d3f22fae81ac0773c5aca21f977e7bb6af4c10ae06fa7338f1a06643d3f69198fca706637c035ba6961b6d06fdac5635aa9cab23 SHA512 1c625899136728927cff843345d4ed4f48fd67eafa7dd5caba5db4f79b2163519f8db6726bffc7e01fff531a4e9540ff92f77a5ce9eba960acb6270e1ca5c123
diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
index 09f3c3382e7a..7c26038eeef2 100644
--- a/net-analyzer/chaosreader/chaosreader-0.96.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="http://chaosreader.sourceforge.net
 SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2+"
 
 DEPEND=">=dev-lang/perl-5.8.0"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 481e3ac81b27..83e50f1c2942 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
 EBUILD fail2ban-0.11.2.ebuild 3350 BLAKE2B dd5869547e647b3c9ebb24f1788521d1aad8e03ebd460e6aa8d93e268e3d5cd57398138da17b09fbd042f05a1e05b32982c9716fe094a738ed110238ca24e851 SHA512 8630e3ae9e440d8300d49fc11e51cc459875351486b18686b043a4d14f9baecf5e068022c61040213e64c0f9465a1dbbf053185833326dc9023a936c9b2748a3
-EBUILD fail2ban-99999999.ebuild 3235 BLAKE2B 68151b88460a56e1caa151bfe38a5e5f8e3338ef9c3d67e80463d4cada9036656b48c896c7fe88eb7f60ef6122f2921cf3472abe3676d07be32ec3ad65469cc7 SHA512 c51672b159da9332469c04b92b7e94deb7c87346aabc011ecf6a2fbbc600df6cebfb4e1eab5525a459903f30335ce20da466d79f56f20ea3d02b6562d4bac261
+EBUILD fail2ban-9999.ebuild 3279 BLAKE2B 91e8c88696bc6565b0b3ed6746dff89575d098c59957325db4c836ae631220f2d62a10f2681e830bdd9f379f4e9c0087a1f9fa40997f7f6ed441dc568d145eb3 SHA512 0f820bf9312e37d05d05be59fe21358131aa0be31b6e0f8b28699b659baf46b381a679fb8965f78ddf7935bee1ef39b25d59a9a7e3282af9954e71363c7a0433
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index ab7e2cb0ad8f..75cf1cc7136f 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
@@ -15,6 +16,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="selinux systemd"
+# Needs some work to enable them right now
+RESTRICT="test"
 
 RDEPEND="
 	virtual/logger
@@ -26,7 +29,6 @@ RDEPEND="
 	)' 'python*' ) )
 "
 
-RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
 python_prepare_all() {
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index f03457f21d2e..6395aadd19cb 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,6 +1,6 @@
 AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78
 DIST fping-4.4.tar.gz 182921 BLAKE2B ddf84d5576170f0279e1d801fbb4afe491c698e5fba3ef4ac6fe25b2dc9b72605c23b6d33559d04170a885ed9ab423cbc1b853110dba93d5d250b6008b0c2a3e SHA512 8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0
 DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
-EBUILD fping-4.4.ebuild 724 BLAKE2B a51d93dd39d228d94a28c2a28bb5559ee7560927ac5fcb6b7bdcdcd8f2c8d85aee2d52c69ff114967761cefb0803cc1ee30f00afd8897b6fad527f06a4311ce5 SHA512 025d2cf95e10f8ed4a9e6f04848d546c9840af60be844a964e2da03405ea542f6f09c3c97e3136037a53f4964491e07c56f14030e7894c30bccf1126c8330313
-EBUILD fping-5.0.ebuild 719 BLAKE2B 98ced5b720717b803a90cd638c197df5507d59038d6a948eb8d3f2c6d8d5f44998d60ae5c7004779fa0af70cf1a954f03bc38b132fcf83a4c8814b473c04e73e SHA512 a66671876fdbba80c0f12e82a6378b7615b61682a3bd7f9205195ead0738ddca9d13205fb41330e50fa06607087edd0ca2607e4ec1378391ae6a3053c75e5fd8
+EBUILD fping-4.4.ebuild 713 BLAKE2B 599dbd8e5e187697cd75e359266e8b743e15a7920d7ca4899331630171b02ce64b5801bbc9055f65b953be04866520f7093be33068e27298a1abb7c0d5310937 SHA512 7329a0cdc3539348d133ef7332267203afa777a92c731c7ff3f636aa2f8e68a9ce5bc217bd93bb74e7944eff2a4e0a153b7d2b8a6c8113eb52bef438432a3624
+EBUILD fping-5.0.ebuild 708 BLAKE2B 575ee108895981cc84fe0c816dcb45e9a9f0772368ea3bfd8fbd22e0f321224b6608fb369974ce0879e403eac13c1a5ec173a2c8fcd75a34d172ab90931c896a SHA512 46353758ba632252ef3ed62e38a5a546209355856c77c8fc5ba59e56cafb1b8967859684f43be86505098a61866f77161e05956a41032b978c695f99de31020a
 MISC metadata.xml 355 BLAKE2B 6e4fd15cdfa76be00db905cfbff100e3ba30fbc04f0e5fe42cecdd7f66e3c2478ef626b11d5f0be2f43e5526dc6022b1334a5c51253396f3b582cf56b28b4a8f SHA512 036f801bf73918249011ac68a06d0b1e29e5f8685209cd70a0df02b9f43271d57222f4250f973b2b65b7b0c0811598ff0179e0ea09ec70683abf99a14dbe48d6
diff --git a/net-analyzer/fping/fping-4.4.ebuild b/net-analyzer/fping/fping-4.4.ebuild
index 4233263233bf..7ea26ec93e2e 100644
--- a/net-analyzer/fping/fping-4.4.ebuild
+++ b/net-analyzer/fping/fping-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://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"
 IUSE="ipv6 suid"
 
 FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/fping/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild
index facd0f94df8c..da4e623accc3 100644
--- a/net-analyzer/fping/fping-5.0.ebuild
+++ b/net-analyzer/fping/fping-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://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"
 IUSE="ipv6 suid"
 
 FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 8f0e961bfa2c..d70f4306445a 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1,4 @@
-DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
-EBUILD goaccess-1.3.ebuild 1512 BLAKE2B dfb4a092095509a7e6a335a7568a3a8b48904ebf95aaa6671c42194a42ea68a17448f3555aadacf455b5ed85456a11990c83b403ebf52706337dda1f70128212 SHA512 310a8f624a6d3404e14bc8fd1ecdb157c993b9f69390e7ade4e7b0bab3a47c4cbdc27590bf196c64f48fb8ebc2cbfa5230d812ffe4cca2def6d71761c415d281
 EBUILD goaccess-1.4.2.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
 EBUILD goaccess-9999.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
-MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
+MISC metadata.xml 937 BLAKE2B 29b9031c3c7172d88404d602952a6cb297f7762759461f4052f6ae1cc4de81d97ec9b410c10d47ce7813f99859117bae62fdc6b4090d08af85f074ef86c4e76d SHA512 6e09c8752f8f98ee352f6477d17c9ca8b86ffa1795b02faacf4fddb38141ceaca4cf3250089346c27595eb0e49e444be608f28f3e2a909cb69fe73e33178fe96
diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild
deleted file mode 100644
index 5d70b028d3d3..000000000000
--- a/net-analyzer/goaccess/goaccess-1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="https://goaccess.io"
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet[bzip2?,zlib?]
-		btree? (
-			bzip2? ( app-arch/bzip2 )
-			zlib? ( sys-libs/zlib )
-		)
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		"$(use_enable bzip2 bzip)" \
-		"$(use_enable zlib)" \
-		"$(use_enable debug)" \
-		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-		"$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
-		"$(use_enable unicode utf8)" \
-		"$(use_with getline)" \
-		"$(use_with ssl openssl)"
-}
-
-pkg_preinst() {
-	# Change path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i "${ED}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
-}
-
-pkg_postinst() {
-	ewarn "Upstream moved config to /etc/goaccess/goaccess.conf"
-}
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 708d4dfe667e..43a4da78f81f 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -16,10 +16,8 @@
 	that require a visual server report on the fly.
 	</longdescription>
 	<use>
-		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag>
 		<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="getline">Use GNU getline() to parse full line requests</flag>
-		<flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">allinurl/goaccess</remote-id>
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 75d585380f60..b1fcc756fec0 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,11 +1,7 @@
 AUX bytesex.h.patch 520 BLAKE2B 137536480eb78d255862ea6a843b834bd64cf8bf163ec553035270ea185a04b36cda586c64ed28ad0ac43bbc863b60b76ba1f3cf73bc78b3e87c219c21556b3a SHA512 f5bf7e1d303824340f667eb0f7335beda354923311b9f65f1b0250d5acdb85a7c6ec15f98c1dc75447e1e0fabeffe51149e99738775845869e099b1409f2b48c
-AUX hping-3_pre20051105-ldflags.patch 602 BLAKE2B 6bb6a8723e1e337f540d94822480e56fca2604301d1a31882db7f627c840934e0eede6c6c44ab89ddfe51be376f3f541b0698eb4a8475128700b28a08d104739 SHA512 b62df43e88724a168e35c21a394ee128d5b7a1870836be18d6327af850d5025bd3c35464c2b8fc0715c3df692996fc41e95023cbc4a778e6e881e9475d25d058
 AUX hping-3_pre20051105-libtcl.patch 507 BLAKE2B f536097a9355501acfe894b09421942b7da955f3bc7aca4f6da559304be21ae4ddf4efc2ca2f5ca9ef61e7b8a84ecf0d6a7263f7e10575abf22fc349b8df6f0c SHA512 282f8934a74ea155596ecdf6f92be5f0c25d535e9b711c32fb015beea746652a7c40444cd1cd03f94b12aeacb0352df304c24153dd11290591143ad7e85ade5a
-AUX hping-3_pre20051105-scan-overflow.patch 299 BLAKE2B 2b6f397328f43c92fd5176e6426e18c0c44b11d8a26fde4fb40a4b2663b98a37dd6df1aeb42db72522aa6f96f91a9f2279f38e2b1df0c151ea8eadd2f6b0ce33 SHA512 632fdc5e48b1ef0924f58c5cf463ceaee26692cedab50869e9d58704948f38b9168a9d88b1c2f89e9d4a562d0454fcaeb6ab3480cb1c76a16bbd0f73ac09af98
-AUX hping-3_pre20051105-strlen.patch 218 BLAKE2B 77d4180b2de3d2eef09413d5e4ce51f13e94dda1e51f82a68d59441e12840fdf7550087179a9abaafa9f931f2f519857726769122d0df15be36d3a9efccb096b SHA512 3029cddbcfa384a551875a5d597bd75763963b08bd86b923637aa6a329ad7a2e73eec8a534a3fa3aa27586b8fda0945c53db455826ee45c067389bd6ff0c39c1
 AUX hping-3_pre20051105-tcl.patch 260 BLAKE2B b8ad9492a1d4a4ff2b45cdf0263457d16e90da809db8485185602d15d7408fea8b5174a2dbc452ee3749efb70336b4ae015a341a9ec51aa8baf8c792f8bb4202 SHA512 67da303e4c4b225607c76cee7cb2b2655b0dce9f2e151dc64f078cc719fcee974566967b1b294c0bab347a58bbfb6f08e3dad91c692dd1c56878c691ef5b7294
 AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 BLAKE2B 463c740662c2477379df97a795afb58725c30258eadbd4e1e3495b5ffa9e9cc04e5d4eec2a33dfa619d6a4450f79cba4c89463f250cdd7bf50bc1a6ed9f77b68 SHA512 349286fe6e22f491debe399bdf68d99f27c1baaf27bc9fd976691fc8bcb6fcfb03dae09b3796c1e181a0deca279c6e8a0721d39862a302d02bb05d7557b505ab
-AUX hping-3_pre20051105.patch 1036 BLAKE2B c06043dbd14fd7f7806a9404f5523a3ece4e9af3b619cb19965cc983191f553d28df1bedae0b534029d374fb2bc49ae6c5bff84a6b4f829081e92a1835a90913 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e
 AUX hping-3_pre20141226-compile.patch 1043 BLAKE2B a58b97bd9404c1c360c5a6604959a91912ac5bc7df9096661cf9bb057d9421ce7170497a97596417547f396f4034dfd587f9e835a82a03c0e352adca656204ea SHA512 bc34affaefddb8515ce3e478b72683937d4a7e64ce7037e827dc957326d652a3c41a6016cf5a25f7f0185316a349d448a87c5f8d343002f833998826f6125c50
 AUX hping-3_pre20141226-fno-common.patch 229 BLAKE2B 75d9474d97444d636dae1012496ac94353b79fec632ffefa5d1e9d86410375fc42edbbfeae2cc5e4cf2cbf25927db8f68c276c659202194896c38593d968f49e SHA512 c994a2a9775556870b4b0ed26147b06773756c97a221c38bcfde01c5defd8736a52dd6b58b1c27632c0960090ad0aa06787573d2c137531a2650012a13be3954
 AUX hping-3_pre20141226-hping2-2-hping.patch 9089 BLAKE2B 319a656267ecff667550940ae2c5be2471c6c0308d4750a53f42c698e442119ddb8025ecdd3fd9835e22eef87d53f73d9bd1bb3de89bf523e25a1f1cbd00d9b8 SHA512 a660375853d37e3dfb3a1ad1e09dfbdd70ed88900d4a9d07d32c8d1cc782e2d4e357eb0fdc78b46711b6c8e5bf21b8572bc2e696874cf6f52a3a14d54b395bd6
@@ -14,7 +10,5 @@ AUX hping-3_pre20141226-pcap-bpf.patch 421 BLAKE2B ff0b48788abe2151c60ab3a99c880
 AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0daa0d206dd30175c8133168fc390b308c3889cf306bcbc1c10265474bbd9397694585b9b16667ca80d91d1175b2daa41aa9ba501 SHA512 ddef839e98f48de04aac8015468808d1e3201f0752cb82a4650e35c27a903d2ceca0603415d8a19f39dd827a8ca249d778312a0f272a4605b3ea67af4a18846b
 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db
 DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b
-DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3
-EBUILD hping-3_pre20051105-r6.ebuild 1596 BLAKE2B 98a30f9e86a119a7f66793717074e18d9b1510e258e1d5be53054ca2b385b18ff8ba2d5806a28a2f203d469c33d97acc852d7c0d1b8b43ba564ebbdfe941f840 SHA512 1b9d3783ecdd143a46c254bcd5a021b588d75b7431b64503ac29b54cf1c4b876592bcb856cb8ed2788e8f9b10288b066c2ec10873dc715ca6fc5a40388504b30
-EBUILD hping-3_pre20141226.ebuild 1570 BLAKE2B d383f47c10f3d2efca53240ee7adc07b2a552112e4086598bacec34c7b3e4ebcd1b04bc5a65dfafda1f9fd8ea251aa296c663b2a9188de170f359766d5062af7 SHA512 c8c10c3d93ef8b94222a66a4e87ca282e3154d091cff24a85877e80fc2e190f6dce427310e0f0e00d4ebec204d1905039cd79b5951e94c7ae25d930bd642fdac
+EBUILD hping-3_pre20141226.ebuild 1566 BLAKE2B 316314c2caa4bca78050582aa520aa0a6274fcb929736839692579ca9fdb5fd5eb8039ee9ce7879ffceedd6c51efc15f818b6714588b89ac613ee014d556c6ac SHA512 ebd41d829135ab4a9daa7f44d8a64a00c81045187dec5e0d1d5689decd58c73c40256e998f4d0685f7bca25731cdafef2f204c573654422a00d5313f823bafcc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
deleted file mode 100644
index 39814bff0d8c..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -50,11 +50,11 @@
- 	$(RANLIB) $@
- 
- hping3: byteorder.h $(OBJ)
--	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
-+	$(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
- 	@echo
- 
- hping3-static: byteorder.h $(OBJ)
--	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
-+	$(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
- 
- byteorder.h:
- 	./configure
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
deleted file mode 100644
index 2c3e01bf697a..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scan.c
-+++ b/scan.c
-@@ -456,7 +456,7 @@
- 				continue;
- 			/* time to copy headers in a safe place */
- 			p = packet+linkhdr_size+iphdrlen;
--			memcpy(&icmp, p, sizeof(subtcp));
-+			memcpy(&icmp, p, sizeof(icmp));
- 			p += sizeof(icmp);
- 			memcpy(&subip, p, sizeof(ip));
- 			p += sizeof(ip);
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
deleted file mode 100644
index 692cd93102fb..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ip_opt_build.c
-+++ b/ip_opt_build.c
-@@ -25,7 +25,7 @@
- 	unsigned char optlen = 0;
- 	unsigned long ip;
- 
--    memset(ip_opt, 1, sizeof(ip_opt));
-+    memset(ip_opt, 1, strlen(ip_opt));
- 
-     if (opt_lsrr)
-     {
diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch
deleted file mode 100644
index e3133f2b6b42..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/libpcap_stuff.c
-+++ b/libpcap_stuff.c
-@@ -17,7 +17,7 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #include <pcap.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- 
- #include "globals.h"
- 
---- a/script.c
-+++ b/script.c
-@@ -24,7 +24,7 @@
- 
- #include <sys/ioctl.h>
- #include <pcap.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- 
- #include "release.h"
- #include "hping2.h"
---- a/configure
-+++ b/configure
-@@ -93,7 +93,7 @@
- 	else
- 		USE_TCL=""
- 		TCL_LIB=""
--		echo "==> WARNING: no Tcl header files found!"
-+		echo "==> WARNING: no Tcl header files found."
- 	fi
- fi
- if [ -n $USE_TCL ]
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,9 +52,6 @@
- hping3: byteorder.h $(OBJ)
- 	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
- 	@echo
--	./hping3 -v
--	@echo "use \`make strip' to strip hping3 binary"
--	@echo "use \`make install' to install hping3"
- 
- hping3-static: byteorder.h $(OBJ)
- 	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
deleted file mode 100644
index 796be56c9934..000000000000
--- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV//_pre/-}"
-DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
-HOMEPAGE="http://www.hping.org"
-SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86"
-IUSE="tcl"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="
-	net-libs/libpcap
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P}.patch
-	"${FILESDIR}"/bytesex.h.patch
-	"${FILESDIR}"/${P}-tcl.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libtcl.patch
-	"${FILESDIR}"/${P}-scan-overflow.patch
-	"${FILESDIR}"/${P}-tclsh-proper-escaping.patch
-	"${FILESDIR}"/${P}-strlen.patch
-)
-
-src_prepare() {
-	default
-
-	# Correct hard coded values
-	sed -i Makefile.in \
-		-e '/^CC=/d' \
-		-e '/^AR=/d' \
-		-e '/^RANLIB=/d' \
-		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
-		-e 's:-O2:$(CFLAGS):' \
-		|| die
-
-	# Change name from hping2 to hping3
-	sed -i docs/hping3.8 \
-		-e 's|HPING2|HPING|g' \
-		-e 's|hping2|hping|g' \
-		|| die
-}
-
-src_configure() {
-	tc-export CC
-
-	# Not an autotools type configure:
-	sh configure $(usex tcl '' --no-tcl) || die
-}
-
-src_compile() {
-	emake \
-		DEBUG="" \
-		"CFLAGS=${CFLAGS}" \
-		"AR=$(tc-getAR)" \
-		"RANLIB=$(tc-getRANLIB)" \
-		"LIBDIR=$(get_libdir)"
-}
-
-src_install() {
-	dosbin hping3
-	dosym /usr/sbin/hping3 /usr/sbin/hping
-	dosym /usr/sbin/hping3 /usr/sbin/hping2
-
-	newman docs/hping3.8 hping.8
-
-	dodoc AUTHORS BUGS CHANGES INSTALL NEWS README TODO
-}
diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild
index d58de2c0ec2a..b624b83ffd18 100644
--- a/net-analyzer/hping/hping-3_pre20141226.ebuild
+++ b/net-analyzer/hping/hping-3_pre20141226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/antirez/${PN}/archive/${HPING_COMMIT}.zip -> ${P}.zi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86"
 IUSE="tcl"
 
 S=${WORKDIR}/${PN}-${HPING_COMMIT}
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 2b526df0bfec..0f7a5aa14b50 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -3,7 +3,7 @@ AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 EBUILD hydra-9.0-r1.ebuild 3780 BLAKE2B 98de0efd400e19c14e9575d3fb36e082ff3ae10d6f7f67ed941bf1520cc25e29ded776e7b9d174d58ad63f0246c1bb5f4d58d62d6fe6c91803d942e7484db799 SHA512 7ba1f10e2da24b8f0c3ceb86a0f0de42a50105e4cba7d21edc12bb10c6133e3152bfcc655eebcd5ad2473bcac9c6ddb9213f552c42284488b9dbaf0c0f548399
-EBUILD hydra-9.0.ebuild 3659 BLAKE2B 73561294de0efbb296de9ca04086bc9de56f06aec0e90ea7e3bffb90fab06032abf8ff4e0b775f732e8319ddf0abec76bc4126be79c5ae68182cf7af7c921564 SHA512 040b4f624eda2179d5968350d2bd07492d974f8fd8aa29930031b1337b1b6434a2af48e8ffcba8bbb25630158ad7d8a7bec49b50c81e1f6923786ad256421e96
+EBUILD hydra-9.0.ebuild 3684 BLAKE2B 17861c610ba56b6133b245439d04b01b10db505a498c4b0ee0e2f4f0ea7ca2816a53563b7d4a9269684f71d0b90fdc988b3ce2b84dcef351a69d04c433d49b11 SHA512 87217c0d0de474557768d062fcbd03d59da88ff132029090a4088c397528a0ecfa1f65e3c6f49d7ab26b0e85587aa1dad2ae06e25666d6e94e47c88936bcf9ba
 EBUILD hydra-9.1.ebuild 3691 BLAKE2B 402fce711e3e7d311da07aa88f955ff925780cadb5a5afd7f646eb64cb78946acf3a928febd9add769c463ad1ef49a9df4f62689531025e701c4a8b48217d7d8 SHA512 b97a807535b50108c9af8405d166f82b3ec3dbb557edf66e7c91087ef0585358cdba9130b158796a0d9b843d4280c4424a2b8060fb3e76cf2819da88e27f4bcd
 EBUILD hydra-9999999.ebuild 3629 BLAKE2B a4067027c780bc3bf3d2bd3b662b79e7ff90c0c909134a7d739fd34ffe373e7447048b7fdf5b60cec6614e5dbe29843a4b6534c61709e3db8a5f4170e1ed84cf SHA512 74ee710cb68a48abba67f2edcd4f89229cdfbbeafe6c6815d5eabe9bc482f0e409d42be5b7b05051872ccf02011dcb0342b7fd12a2deae4397048d41ce7d1520
 MISC metadata.xml 552 BLAKE2B 01b49284c869dbbe415552bca3bb8dbc807eb9a362b6378954e0cf5de1265f9f107f13e0ee27cb035c1e5652c7a712c210dc2db0f8f470011eedb52ce6fa043d SHA512 0f438e21490b870ab4b247f55fc7c3c413bf8598225492306e32b27d4aa3a4a5ff2621118bbafd49d570f95f91011e88ce78d1cbe575d5aa05ace68ac3ab7a9c
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index 3a35af9c7dba..3a812ec881b5 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,6 +66,8 @@ src_configure() {
 	# Note: the top level configure script is not autoconf-based
 	tc-export CC PKG_CONFIG
 
+	append-cflags -fcommon
+
 	export OPTS="${CFLAGS}"
 
 	hydra_sed() {
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 788b00befeb4..19dbfb18eac1 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -7,6 +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-r4.ebuild 1102 BLAKE2B d3ffad38b5cce025e79204a51037e480ef4fa0412a76b016f34618a7fa1d74f89d08db9dab68a03c22e1f8f71e3621a51dd2e1337b997505d0c1957b8574a218 SHA512 447899d4923508953844aa03cba6cf2d5c06675320dcf6a2aba5f11c43a8976b69049ab9f226413142845b43e56d6494defd44630e06a2103d03413eab485f70
+EBUILD iftop-1.0_pre4-r4.ebuild 1091 BLAKE2B 72447043e053ba9761337e26139e96e12d469c9b25a5c488c741c5fd1bd5f2f39fdab14a81255d7cc6dcaa6217bca8bf9e3e23564704598f1927f3440e74bb4a SHA512 fab094b9f06d3b05376bdd67404a739c89cdd208f1246aafcd8cd03c0e469c3015d66e5802677807344b73458a0a55a06ac5dc29e9138b1278fd041e39846da9
 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-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index e46376dd33a4..45a3bfa2dd16 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index d1110303b4e2..8aada94d5f24 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,5 +1,5 @@
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
-EBUILD mtr-0.94.ebuild 1390 BLAKE2B c95c3d5ae610411f6fc1b1387330c9962fef76e330fbb79da725b9f730cc9e8b67b96a152b2468674d384c36e7379055c01cf16406dcb4b6878dce16c3fcf096 SHA512 19390bc6f71ad175d159dc6a117c5354b085f09cddcbf8f9d5c696ee7290c18fc936c77a0cc0b11ffee04ae8d3cd4714a92841f0e6ca50c01b219b3bce236574
-EBUILD mtr-9999.ebuild 1241 BLAKE2B 5c4b500e1ef1995947154e627d262b79ca135a6ee6c231e2f865b955952bb5f968f227d82f9a4217d963b4387a2afc379ef46c90fc88c43eff227676b34e78e7 SHA512 e954551e3a37dfca502d2c76e77134193ae7cdba68e74dd755a1f853ddbbe274488bf7bc758711805875f06e80e1790b638d2adfb247421c06c0aa706b9bb163
+EBUILD mtr-0.94.ebuild 1426 BLAKE2B 5e54c4c3017cdc6570c8a5e0b8959b8cf2d34d4599b45df2d26f3d47af432f0f5ad4b00dede2d54bc743a8750a4cd190dc14d2635d2c1599f1e809a69156a7e9 SHA512 79481d57db2fc582d3f730e58dd7101618d7f0f095d98ab1d486a0cee344347688b062a4e8eebea7b2d2128772a525e62971f8a0448aa162a75969e0fc80ce0d
+EBUILD mtr-9999.ebuild 1282 BLAKE2B a9451a299afe9c557b3400d19f39b33dd6cb4cdcdf60fa58edb551e3736d8af261a76516caa9b39561d57c36c74d1eb26fa63c3ca96908c97310adf118a2b173 SHA512 e07ee53e8e2aacdf43cc8fd0d5e1adb773fd4d3c5d47cea982f8104c81d29b7040335d10e201ddda106b8a330381d38d76ea0190d2c56d617d1709b6e3d83319
 MISC metadata.xml 636 BLAKE2B 6ac1437dc7b42ef712ad3a851f6dc8df59f7a354e99db5bf564c91f90786a9eb3e90d2d131592047e5499eea5e5238150525e61ddad1a5ca72c594edc7c8f9f8 SHA512 85a0425e6ac71a544d6a8a0cbf270e77afd6dd41ed226650b122977b6288dee8d894c30d6c31425dc15d2b58d19d87050bf28320553a1993dc4f28184fe61aa9
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
index 7f9e0050a0cb..b23e88ccf2cc 100644
--- a/net-analyzer/mtr/mtr-0.94.ebuild
+++ b/net-analyzer/mtr/mtr-0.94.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools bash-completion-r1 fcaps
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
@@ -10,8 +11,10 @@ SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gtk +ipinfo +ipv6 jansson ncurses"
+# This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
 
 RDEPEND="
 	gtk? (
@@ -21,18 +24,15 @@ RDEPEND="
 	jansson? ( dev-libs/jansson )
 	ncurses? ( sys-libs/ncurses:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
-RESTRICT="test"
 
 src_prepare() {
 	default
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 7067fbb688f5..bf0d00068f92 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools bash-completion-r1 fcaps git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
@@ -10,8 +11,9 @@ EGIT_REPO_URI="https://github.com/traviscross/mtr"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="gtk +ipinfo +ipv6 jansson ncurses"
+# TODO: This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
 
 RDEPEND="
 	gtk? (
@@ -21,18 +23,15 @@ RDEPEND="
 	jansson? ( dev-libs/jansson )
 	ncurses? ( sys-libs/ncurses:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
-RESTRICT="test"
 
 src_prepare() {
 	default
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
index bec87e1e6816..f91ae0439f76 100644
--- a/net-analyzer/nagios-plugins-snmp/Manifest
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -1,4 +1,4 @@
-AUX nagios-plugins-snmp-0.6.0-fno-common.patch 2557 BLAKE2B 66e77015b81449bfa13c422af4eb5e110fa7650b08f09877b23f96ffd8715655a9851786225e545cb2260f11e3b0338d1d799148e5bdaa1ce3157630005dae4a SHA512 7809f8fa2cbac92ed0bf34d2de954d91e2a21a3e54e3593fb2e9e4bce0f6fe86853a81c7cc403fffe3a890f403a13e86ad87c9f90845178e051a8911b4a1c1dc
+AUX nagios-plugins-snmp-0.6.0-fno-common.patch 2815 BLAKE2B 1789ce85f8a1c637468f50eed3344e859e0b8d06c0c0569cc4b827a2392b6a02a40402ac29321985d9025aa816c10f2e542f341db120e79831e09577e2f177eb SHA512 a3d6303ba748f26ad5d7820ade40697b2797b2af27dd093af3f4877d4cccb5fcc1327b9ad327ec297cab47502e5a2170553d3ae4131b6ddbf65f3e90be0d7bbb
 DIST nagios-plugins-snmp-0.6.0.tgz 381664 BLAKE2B 1a6124b5aa194123b17a1ce98a4e023a8d71f70a6c5ae61b8b54b204050f7914f100e1e639630955e45905f86282cab6a7034e5927b3db5b609beb315a66c748 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529
 EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 913 BLAKE2B 4a8227c7770e50b27b86c796d838fd52a737c0367c8781ad4078f780a81f3307600de13e7ef15e2ba1be94033cde203916a5b944c162203508c3dfe663a5b257 SHA512 ad6be9c5ce70708b816e55b93cd5579145777722aea2d43b5b2564ce837b0944144a5e95fb967c3794aa970aaed4d6fec9b20d7ae6cc5be61fa310ad14260907
 MISC metadata.xml 271 BLAKE2B 7231d9dcb020ef6bb73db6e7038abab171c5ac137e457e50bd730b126a20a8af0a21b1cb987b00b8965af807dde7b0431dfacb6066d15d08b5bfbfbaecf3e5a0 SHA512 f323a192c090757e24caa9352b8be964050a00a86d174507c858c2a3a61767c243dba99ac37571779128d73e9bf6817f056d6d590be2b2ec8a8e3f3a92a4f304
diff --git a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
index 5fd2ff1c2351..926a96d74d1c 100644
--- a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
+++ b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
@@ -1,83 +1,86 @@
+diff --git a/src/nagios_common_snmp.c b/src/nagios_common_snmp.c
+index 5bdc571..73f96e8 100755
 --- a/src/nagios_common_snmp.c
 +++ b/src/nagios_common_snmp.c
-@@ -1,5 +1,22 @@
- #include "nagios_common_snmp.h"
- 
-+char plugin_name[30]; /* plugin name */
-+char plugin_tmp_prefix[50];
-+char output[MAX_OUTPUT];
-+int output_overflow;
-+char *p_output;
-+char *o_host;
-+int o_verb;
-+char* error; 
-+int o_port,o_timeout;
-+int o_help, o_verbose,o_version,o_v2c; 
-+int retries;
-+int o_snmpver,snmp_bulk;
-+char *o_community,*o_login,*o_passwd,*o_privpasswd;
-+char *o_protocols[2],*o_authproto,*o_privproto;
-+struct snmp_session session, *ss;
-+
-+
- int init_plugins_gettext(){
- 	if (setlocale( LC_ALL, "" )==NULL) return 1;
- 	bindtextdomain( PACKAGE, LOCALEDIR );
+@@ -1,5 +1,21 @@
+ #include "nagios_common_snmp.h"
+ 
++char plugin_name[30]; /* plugin name */
++char plugin_tmp_prefix[50];
++char output[MAX_OUTPUT];
++int output_overflow;
++char *p_output;
++char *o_host;
++int o_verb;
++char* error;
++int o_port,o_timeout;
++int o_help, o_verbose,o_version,o_v2c;
++int retries;
++int o_snmpver,snmp_bulk;
++char *o_community,*o_login,*o_passwd,*o_privpasswd;
++char *o_protocols[2],*o_authproto,*o_privproto;
++struct snmp_session session, *ss;
++
+ int init_plugins_gettext(){
+ 	if (setlocale( LC_ALL, "" )==NULL) return 1;
+ 	bindtextdomain( PACKAGE, LOCALEDIR );
+diff --git a/src/nagios_common_snmp.h b/src/nagios_common_snmp.h
+index 8903fd0..1b3fa3a 100755
 --- a/src/nagios_common_snmp.h
 +++ b/src/nagios_common_snmp.h
 @@ -56,8 +56,8 @@ int init_plugins_gettext();
- /*********************************** Utilities ****************************************/
- /* cache utilities */
- 
--char plugin_name[30]; /* plugin name */
--char plugin_tmp_prefix[50];
-+extern char plugin_name[30]; /* plugin name */
-+extern char plugin_tmp_prefix[50];
- 
- /* defined in configure script */
- /*#define BASE_CACHE "/tmp/cache"*/
+ /*********************************** Utilities ****************************************/
+ /* cache utilities */
+ 
+-char plugin_name[30]; /* plugin name */
+-char plugin_tmp_prefix[50];
++extern char plugin_name[30]; /* plugin name */
++extern char plugin_tmp_prefix[50];
+ 
+ /* defined in configure script */
+ /*#define BASE_CACHE "/tmp/cache"*/
 @@ -71,12 +71,12 @@ int write_cache(snmp_table **descT,int num);
- 
- /* maximum caracters in ouput */
- #define MAX_OUTPUT 500
--char output[MAX_OUTPUT];
--int output_overflow;
-+extern char output[MAX_OUTPUT];
-+extern int output_overflow;
- 
- /* maximum caracters for performance output label*/
- #define MAX_LABEL_SIZE 50
--char *p_output;
-+extern char *p_output;
- 
- /* Put data in output */
- void strcat_output(const char *string);
+ 
+ /* maximum caracters in ouput */
+ #define MAX_OUTPUT 500
+-char output[MAX_OUTPUT];
+-int output_overflow;
++extern char output[MAX_OUTPUT];
++extern int output_overflow;
+ 
+ /* maximum caracters for performance output label*/
+ #define MAX_LABEL_SIZE 50
+-char *p_output;
++extern char *p_output;
+ 
+ /* Put data in output */
+ void strcat_output(const char *string);
 @@ -143,18 +143,18 @@ int get_options (int narg, char* const valarg[],options_nagsnmp *liste, int n_li
- #define TIMEOUT_DEFAULT 3
- 
- /* standard options */
--char *o_host;
--int o_verb;
--char* error; 
-+extern char *o_host;
-+extern int o_verb;
-+extern char* error; 
- /* snmp options */
--int o_port,o_timeout;
--int o_help, o_verbose,o_version,o_v2c; 
--int retries;
--int o_snmpver,snmp_bulk;
--char *o_community,*o_login,*o_passwd,*o_privpasswd;
--char *o_protocols[2],*o_authproto,*o_privproto;
-+extern int o_port,o_timeout;
-+extern int o_help, o_verbose,o_version,o_v2c; 
-+extern int retries;
-+extern int o_snmpver,snmp_bulk;
-+extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
-+extern char *o_protocols[2],*o_authproto,*o_privproto;
- /* snmp sessions */
--struct snmp_session session, *ss;
-+extern struct snmp_session session, *ss;
- 
- /* Common options definition and check */
- #define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] | (-l login -x passwd [-X pass -L <authp>,<privp>)  [-p <port>] [-t <timeout>]"
+ #define TIMEOUT_DEFAULT 3
+ 
+ /* standard options */
+-char *o_host;
+-int o_verb;
+-char* error; 
++extern char *o_host;
++extern int o_verb;
++extern char* error;
+ /* snmp options */
+-int o_port,o_timeout;
+-int o_help, o_verbose,o_version,o_v2c; 
+-int retries;
+-int o_snmpver,snmp_bulk;
+-char *o_community,*o_login,*o_passwd,*o_privpasswd;
+-char *o_protocols[2],*o_authproto,*o_privproto;
++extern int o_port,o_timeout;
++extern int o_help, o_verbose,o_version,o_v2c;
++extern int retries;
++extern int o_snmpver,snmp_bulk;
++extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
++extern char *o_protocols[2],*o_authproto,*o_privproto;
+ /* snmp sessions */
+-struct snmp_session session, *ss;
++extern struct snmp_session session, *ss;
+ 
+ /* Common options definition and check */
+ #define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] | (-l login -x passwd [-X pass -L <authp>,<privp>)  [-p <port>] [-t <timeout>]"
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 723772896685..d2ddbbecadcf 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee
 DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
-EBUILD netcat-110-r9.ebuild 1623 BLAKE2B 75cc0da4b3bdf527a322ddaee028386a5438f0af98eb40c6815bfefb2e634bceb6b35a99120b23c4b19fcb039f2669cf3aeb3ce9dc01869621d6bdc9a8956ae0 SHA512 518e9027a6dd8e42a36741011a0df538646478084e09a1a48f6f9363c3691ef7aa4df7b1b9290081e2d93a4550ef32a206e531e2d05e64ff4829dd754e375997
-EBUILD netcat-110.20180111.ebuild 1272 BLAKE2B b58aad81ff3d298a022954308c3b8e7405fe8542b5f658fb57331919406e2a682fb66455c19f319c41427d01619ec88c4bfa6278b595029e24f1e6fc7f560c25 SHA512 3e05c4a06f4a44ef0a2c8e36c26be838420d127226c36644b3b7cd6b25c122f5b19cdbd767e343313498ebc6ffa14e43ceef94c0132127b30dcc87037ac97d0c
+EBUILD netcat-110-r9.ebuild 1612 BLAKE2B 8cdcf8bd576edd3587c959ddb1278be99b6925abc4fa23e3de527dd8ffd6b46aa4b709e89fcea9957704557e13824d6414054ac1bf50a150f55c86a373948f4d SHA512 777acc5d9a681eccf49e2d6c109df9b5d63d03436abf834dfc0d6072a2a51b716bc5db0dacebde1976b6da9900f5452cbf0b11941495df10f03cd07be125606e
+EBUILD netcat-110.20180111.ebuild 1261 BLAKE2B 71eb1b57311795dec1a37e7d3804587534860f7da5408507cd88296cc2b3488dd9543a7693421734d6f5aafc0e18722d245528fcc1ace0d5e6176ae7f3c57912 SHA512 92f7ade32cc5111109acd0374a80dea4ddee1aa65112c7ed6fe340f97e3dba23b91e8f241db62c546683ac4afdb9c8a63dea9b798ad0217551c03014537b22cd
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 3e36674e8555..78f65ab4a9e0 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="crypt ipv6 static"
 
 LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
index da20c98247b7..fe1f70df7679 100644
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
 S=${WORKDIR}/nc110
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index 27ec745279ee..b27a5cf1e953 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,3 +1,3 @@
 DIST netdiscover-0.7.tar.gz 356514 BLAKE2B de880e124d1ee52c5466cf843ad3fc7077c9a673867f117f255791da9fcc8444599bf703515ef04eaa0f3fbc8ed50951bbd6cb147b1eb18020e06d35a90ccee4 SHA512 e526c1560c4054c6a2761d392997629b301c50db2c408719e84a820f9ad206825b9a4620e6721dcdebbb5c7479cd239e85de2d0657f97015b103805e8f9c05b4
-EBUILD netdiscover-0.7.ebuild 666 BLAKE2B 4b8b7e603e5e211cab03b8cb7b3f64a6121b26e511377054ce4bd8053c9d6cd8fc320e62c2ed76aa5cce97c6941f609dd304b561c0e8e2c51cb274a366bdc081 SHA512 5d867270a314032b76b01c6ca1e3e03eb941e3e7c1309484aafed0fbeea4270993567382fc35561c05b90375980218c5c89a4298a8d1d4f519eb711910e8ecab
+EBUILD netdiscover-0.7.ebuild 655 BLAKE2B 38592759f7d6a144616b6d8e539a0c4a12e12bbd749ca85f99b775f05cb6ff85a0e988a44c780a8031d6f3b45acb0345095952c6b765941e21e34a9aa8f47390 SHA512 7ea256730c8974400ab3ad4ee0620de8ff244a56b3c61ad863270b6b88a24a3d564697a5dd9be0e178203b56b3bd8cbcd2106da8dd054e8b0a5cb717cdee2b64
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netdiscover/netdiscover-0.7.ebuild b/net-analyzer/netdiscover/netdiscover-0.7.ebuild
index 08c7f4e6b20a..028445fa0e28 100644
--- a/net-analyzer/netdiscover/netdiscover-0.7.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 "
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=net-libs/libpcap-0.8.3-r1
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 799325c05985..f3775c6781a7 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,5 +1,5 @@
 DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908
 DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f
 EBUILD nethogs-0.8.5-r1.ebuild 706 BLAKE2B 4d5958912d3128b15899ab0f72ea4363acffed6bf16316cf61a4331b97f0eb6b9741d912897d375026650d78a9c390e332f2ad12b78a8506fff27cf2ef30ab5b SHA512 aa90d744970ff58ddda6ae28807b3295d644790d580aac44ae137f838e712608b3697ff2cb0a39a34b81c269a653ffa0b98b20ea7bdad31ebef9834925ee950e
-EBUILD nethogs-0.8.6.ebuild 697 BLAKE2B 5f281603dd5005a0e39e4b58204cd959ab199d1c96cbc4840bb93703bc1fac5cbbe4189afdf7af869e6ed72b28a7f3b26e31a63a04fa7d11998ab2c70988fdb4 SHA512 c884aa2fb1dfa4a801acaed65ce39a93fe1f2f66ef28b6f9349152f596ce81a920ebe77be747a6caec69fcb9ade96364eb12f4aa9fc38ace5ea70d391260d0bc
+EBUILD nethogs-0.8.6.ebuild 696 BLAKE2B 9855a6a15c52845be2fa5394801f1a51fafc576ac8261b21fdedc6bb7408d636c6a65d2913c7acdf24466fa0230af39a1eae313895fc8d1e8b857640c9059373 SHA512 46adcf47a6d972158092f47dddfe70065b1577adeb40ee1ebd6ecd9877e02b274fa30445bfa7812a72f67045ace0b35905686ec9004fba0cad908d6bf4a1db83
 MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild b/net-analyzer/nethogs/nethogs-0.8.6.ebuild
index b24bab4c9213..bef9dec145fd 100644
--- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index 4008dab38b09..edf1f633667d 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,6 +1,6 @@
 AUX netio-1.26-linux-include.patch 195 BLAKE2B 4f6837a9194692658f82f50e3d3a59b4f815af2a0d32ec5d24f09c14e06cbf93a2f09e8d149dd9e65c58b41cc2bb55ff0beeb9c701304c37f6d1f95639678aca SHA512 719f65026c4d14b2f2252a9ca917fe7b46a1788d0ee84c763313f0e40fed7027c7e6d73de298735c05160f2ce0f08c8f5a49503369d3cd80d8ea26ce6c82263d
 DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232
 DIST netio133.zip 235931 BLAKE2B e664700b5991e38ad056333b13ba6ec40efd2a9a496dd9235ad40482b281f21ca54f49e037a0155d3ca0b1d77bd54330462d08abe5f809c6ee337b672c979995 SHA512 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232
-EBUILD netio-1.32-r1.ebuild 922 BLAKE2B 14c181aadf3992d6e06de81354320c5bb842ac86d36281f664f0d6df021f49e822c13430a3c18ed15d920b66c71af256fa196ead1144af45dd2a9f8fa79a7e9a SHA512 fec36c735b6a6d7ba12c53bf5bc26ddf02fae03c1f4e3dd56f79de173a247969798506e99400b802e2bb1a6f9ad20172a0e8f2abd63039e514bb54cc1832b705
-EBUILD netio-1.33.ebuild 822 BLAKE2B c42c4fc4661ceee1240c9033d4393f42b03b4f9a6bbf59c99e2323fac1ac0ae897616a41d097513228223cabe5f05dded0f2d46e9d7d8b81d4f25592c8be7eff SHA512 c3fb33cc1265afbf3c1ddace19b1b30e810a44d06ba039b731b0dc13eb082c00d0ec5b180597b37978b033183d210692f43a81ff1cf0ed52f96412674018723a
+EBUILD netio-1.32-r1.ebuild 908 BLAKE2B 6848f05e30ee341f3ac22754679a43a25312de4baa95560ead9cd0772524d4c176d68fdad39d163f2ae24947eabc30a261738d0b1710eea41306e2fa341a2d66 SHA512 5b07d36442551b989469ec86d6c51678d780363ebf6ee9803e5ce1a09e06d1e731548c2c78f32c411c662bee15c0dfe35d11bdaeff9909efd762384eece0ff3c
+EBUILD netio-1.33.ebuild 811 BLAKE2B 35ea68531bbb37a529f736c481beb889759a529134bf59fe71ce3dc2db899c47d2658aaeeb8c4dc2f3583db0c1557a8308e6103ca10a046c3846223e622c52ee SHA512 1929b0356d9e9c67877f95e812b5773322ef6609a017199aee3317c59ec30f834af82ee2294ca2d7d60f370eb832f68b0fe274a9a2cb7cdb23d5ae5a02f866fc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netio/netio-1.32-r1.ebuild b/net-analyzer/netio/netio-1.32-r1.ebuild
index afba5e9baeba..a2016af62465 100644
--- a/net-analyzer/netio/netio-1.32-r1.ebuild
+++ b/net-analyzer/netio/netio-1.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://web.ars.de/wp-content/uploads/2017/04/${PN}${PV/./}.zip"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RESTRICT="mirror" # bug #391789 comment #1
 
 DEPEND="
diff --git a/net-analyzer/netio/netio-1.33.ebuild b/net-analyzer/netio/netio-1.33.ebuild
index b1b367dca376..a5a43f45b6d2 100644
--- a/net-analyzer/netio/netio-1.33.ebuild
+++ b/net-analyzer/netio/netio-1.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.ars.de/${PN}${PV/.}.zip"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RESTRICT="mirror" # bug #391789 comment #1
 
 DEPEND="
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 5c81417a025d..e8ddf803d59f 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,6 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.4-r1.ebuild 969 BLAKE2B 0d858ad36a4dc512e6e2a9adf458d814a24ddc11987220de50521d2c4becd06f315341c7666604960eb3cfe23339490ea0f4e090c5ad50e392246eaefe6ac22c SHA512 2963cb6e195b9a2659b7b0fe65dcb2da98903a5efd30f48c25ad7ac29ce82df0a13ff8f80a5024e8d29e98a60f59655a6db44f0e91c02521a19d4a6fcbb47cfa
+EBUILD netselect-0.4-r1.ebuild 958 BLAKE2B de3233fbf07f2fb59d4361deb7fe16bb6355817f509b765a68a3e2c626b2ba66ee7a798e6fd4d31d044f04854888af9ca17e46dad1b6f2d0eeadf1375accf2a0 SHA512 54d574ba626ef2f7c23348d58ba8863cd504854e06a0bd230dee0de2983a0b93f07f7738e2428859cf2332a787645f09e87241861be68dc07191b2c0231165cd
 EBUILD netselect-9999.ebuild 899 BLAKE2B 3ba6abea554f5c72ebab839ae1649c326a6bb76483dad1ca9f4731637a77fb75ff71746e0560cbb0140921f90e1aeecc85b9f1b3ba18aba85e68fb7a5cf7342c SHA512 3eb340cc66a031be74b83bb77d78fd80f77eadb8c8dd3394987e8651a70f78d008d497a78ed3e7725b88deb08b301df705e06e5fea3a90d3ca8d38bfd403e66f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index 8cdec08646af..11fd0ab2cae5 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index eee995aa8e10..5053ce1da9d2 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,3 +1,3 @@
 DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005c08e903f478666359c34bb0d30c0645f5ab9a19109718dbbd2f6015dcb64c3a98b832b5412c9151720dedd102fb1936d1 SHA512 88b9e681ce4588e3473f90c93ea41d46fc99a54b895185465cfe1a28152ad944edbadfcf5cee4540b4ec48eb78ca73a1952637c3da9038e52d837c0de5d0260c
-EBUILD nikto-2.1.6_p20200901.ebuild 1112 BLAKE2B b3969fd79c055b84513820eff4d1c8b5675a8f40044be1d145f1421555153fc82ab1ef1f86d80fc5f38578c5d55139efeaa3d01e25228a7cfb51544c01ddf11d SHA512 182e2651e059a4d12e26bc7c49eb1555364d7a536879d86312efe91a518ad10f4c7c16652c9a356a2c9bf0deebacb8b868d729d6fa7f4bd554ef31dfa7d4f35c
+EBUILD nikto-2.1.6_p20200901.ebuild 1101 BLAKE2B e1a67234ccdb86ba5f58bf6a7e639d7d7a838066f422333c75c91ff724805f5bf5c364ad70f51aa411e7927435644feb68fb45b8909a06e993ef38503a3b8cd0 SHA512 69a4b4ac1a8a07d13975999b46cc43ca768fe44d8c2c6af27187aa1f3e0ac7c8f457c52ff6d6956238096369422cb476e7e4cac51b9d49061314f25293d2e8a9
 MISC metadata.xml 368 BLAKE2B 1b830b9fc3837ed7b4706a646f08e1edb316c264b82232740467c341b54c14d49d4dd936d8c24c32256f3235dde2ee5ebbdfadb0fb117136d5e49af353590fab SHA512 2f1a7954d7f6360a4b83f22933cb45e800ab2fc7a7725569736fcc4e64d3d3603dcc64a0ebe888ebb824a51fef81d7220599f525a8e316df762e874ccbd51efd
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
index 5d64088ea896..1a807b7834ea 100644
--- a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
 # https://bugs.gentoo.org/533900
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5c29a3e5458a..5b0d80d7b157 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,9 +12,9 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-EBUILD nmap-7.80-r1.ebuild 3281 BLAKE2B d277a1597097ea347b9db3df69f31bb6066026be423700713465eed02ae248f8f74d3551676eca6c187568ff349989151cbfd67fac3f206ec73d05cc6c8011cd SHA512 01f28d2fce6ddb1b59fd6b7004b153e0ecbd8683b34531fae2d4c27ab7cd4f1a6a122244af4dafe76b9e58615283da89dd15259458ae39440b078ca071e7579f
-EBUILD nmap-7.80-r2.ebuild 3404 BLAKE2B b180659a51f2083041e8171220661b4ac917a9244717baf740a7d4b664e7f3ddf023dae8cc24518e672d6dd55dffff5fb4633946d0128cfa506239237a7ee5ff SHA512 9efcc8d4a1ab4dfd65bae55ce7a670c5d79b9afd1f920635975af40cd566f0717ceeb1af5d387d71a71082cf431012de722d93fdb8e87318c35ca962ef62d4a9
-EBUILD nmap-7.91-r1.ebuild 2805 BLAKE2B 00d6834383ed8847adb5076cfd77a5196798d79f50ff0fa2f7852b654f7d4117db1d598597abbbef075ced5e971e5eb6bc015ca5a05f9960817e1fce17778f65 SHA512 af5e870b4748c2a0273ba79b074b0c7e23d40350cfa70de7314a066556d94b09637ada85606c7c9fb52f36619cd525d04153facf1f569d3f4940ac8bff75a8cd
-EBUILD nmap-7.91.ebuild 2682 BLAKE2B 823a879c2be6f0af191bad0def13abb115803983e7c53c03e7fd301378424c93ceab6e389ce9978c4382b1e8def9ec1dc3a1cba5b056d51937cfb2ee07a91162 SHA512 b5cee4212391eae167b987ec441fb00464827e042f4783e4fb82b6455bb2d842a6b13bc168f4446a0add7e5f144c9c804c9a2b6c79dd951f8f6e10251ca134c9
+EBUILD nmap-7.80-r1.ebuild 3270 BLAKE2B d3e505d33d6c14069bacdaaf7a5197ab03fac726f4728dc807ccd864da4fea89958e4cc199cb6e63d5c1de7c7f159e65ae3a620715d6b7d64a1469963e3bedaf SHA512 ee325f3747bdac7f8233adbc7e884090ceda7069d9b5f9ddd7ff2db7edacc80c8eaa3dc99727a3a2785e0504d6d4e4ef90f028c7baee35adfa0b93b886225dc7
+EBUILD nmap-7.80-r2.ebuild 3393 BLAKE2B b23daae026f4475e6cdb1b1c326c8ef8c89fc42f18c2c067a1cca166ad06d8b0f105df9d0c3afa679ce088ac54ec93702f08f740cf50418c233ea4e9550de6fc SHA512 0c419aa8acf7ecda2805be23c6528199112d0f6698657c012f86b45de9e4085b4bd0950b79e018e81caa60c09acb7e88bb261e9c978f735976e769436bb92fa5
+EBUILD nmap-7.91-r1.ebuild 2794 BLAKE2B 1a96a018a430df55d10775b3f682cb310d88d1c2b7aca46e20479cfc8611649e5f39f1a36d9580ff2a39546fbb69dee9dda76a0e4ac7cc84f8ff2cf1160dee68 SHA512 524e159f8d42cd11de672577f76c5278d1ae4e79bca4cd38f78b07dce5b97bd460799b58fb2698192895eb22f0ba429335ca50cb0998d2170c1e47e3a80d8a1e
+EBUILD nmap-7.91.ebuild 2671 BLAKE2B 3247aac2abd7f3166a84afebf6cb316287ab4392f77b177ee476a3eead52eea41a1ac7365423720e9bcd78cb109d08721dcb5b2157fd12b357cd4ff9e95384a2 SHA512 4ecdb4a0e024b38ae382c9d6c677ab9c9295dbeea43f4f32431f8360969685b446d11ba752dca06cfb5da1bda78db0595a7af795a9b20d26cab68ab3d445f8a6
 EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824
 MISC metadata.xml 1012 BLAKE2B b759966f2b8f8beab43c892441824430605fdd2fda075af8a0fbeebdec6bc781496ca4da93767265a18727d35d287f53ab00da17ac30ca7fec83e01d5cd251c0 SHA512 238dbddb537409cd4f3ff2f0146f3b917206209cd87435cb495eb8f12807b5df91e210f28d2a60326fd3a2bcf02068fd3b1dddca2b2a8874db91956bd7d9781d
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index a70d5648057b..41fbe9aca700 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 7b40515497d4..86253e24991c 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 3b611d01445e..29cae90c6f0d 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index ecd6339ffe97..006cbe5ee03c 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index 875710065ef0..eae82460489a 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -3,5 +3,5 @@ AUX nstats-0.4-makefile.patch 611 BLAKE2B a876d89f3ecc8c7dddf8ef5b83342bad300acd
 AUX nstats-0.4-tinfo.patch 469 BLAKE2B f75ad2c31a66a30c3bbf2cd667a60914289e228ef7a356132f6d5abb93e40c9786bdbf99e2899f735c3c78ed0c87de3a8c30ff363678174de4af8155898d7e8d SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843
 DIST nstats-0.4.tar.gz 71526 BLAKE2B bc9e4baab1c425d1248b8669a598f85843465c62a3990ea8ea99f979bee9be8eb351111e58b0ece4748b3e199278acd4f0a06ddde2b4cd6e55ca9ff99096e7e8 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315
 EBUILD nstats-0.4-r2.ebuild 664 BLAKE2B 7e6f520f564989ce45210266a76bdb51a3af535d77874b65c1b0429d5425b6400311c6d1621c771212081eed7b624ef6153d6aab8bb21001669f97b1e251c706 SHA512 b9e11a53db8356ca4999f22f81e67ee8077d3c21172a251cad5770e15589166bd9fca12a36da83d54132d141f4064e49f5df1fd7070fbc2717d3a7cd8a4d45c0
-EBUILD nstats-0.4-r3.ebuild 727 BLAKE2B 73b58dbeb327c6c54e26f4dd54c4022d45114f6efab4a10c6159409a1f831bcf58a4137f25fc58b2bc23cf7d4872c6bbcb5b8631c262f0a1777e1c72873de61f SHA512 182068a5cd4fb3e60749b8d292f6545fd7f4fe0942688e0a6874c92a8a4c73cea354fda6c1e8c8df78489033d82a8108a6163f969e3e4766945093eacc1f4541
+EBUILD nstats-0.4-r3.ebuild 725 BLAKE2B f5f01d63b00dc45b3d80cc7f6995375213ed34cfd9e153a8b107432f739a7c9a9fc4001a1f891104d45f3f34453b4b30a6ed75b191e296e62520bb03ddd6c0ea SHA512 e3d3472060b5d7b75f03b69bb53a68d4a33ff621d7228346efd86b5f61f7c644572d57642629602f1854ffec503608d7b1dd8c60cf763d571d5ca068c176322b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r3.ebuild
index 2fd06e90cf7c..65b96057aa7b 100644
--- a/net-analyzer/nstats/nstats-0.4-r3.ebuild
+++ b/net-analyzer/nstats/nstats-0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://trash.net/~reeler/nstats/"
 LICENSE="Artistic"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 9e602fa777c4..bec63d69b08e 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -3,17 +3,9 @@ AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79
 AUX pmacct-1.7.4-nDPI-3.2.patch 1712 BLAKE2B 103650626f7e4cb8f7f76738c3b151f38c517d27ec0c5b4c1b2ab14f6a22fb20150b01c0bd171e99c70749d8cd62aa6f04cce229d3056e0382bedd6bd9e28b24 SHA512 3ed43f04bc7aa709390748c503f390f98a6b057825fc6d608730803ffd70e6a081c455085067507567b7f43f49c8e6ebc00d4762bc2aeee66a9784ebfdb80c80
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
-DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
-DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
-DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
-DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af SHA512 09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2
 DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
 DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
 DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
-EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
-EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
-EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
-EBUILD pmacct-1.7.3-r2.ebuild 2220 BLAKE2B 15f3fab589baa6544681cfff7f5d0a7c8582eacc4ad880764b9dc8702bc56fc19c7e128304f555e1695173c8a98b25550a4c8d439cc2e254bb86071cc0e468e8 SHA512 54ffea328edcc50c4cc4212ca044db234defa0287db3fad4e07f9e3ac103af96bf6d3c2c2322b321e6bae59cc92ec87f8d81a3144ca43aad8c2e699565c7672c
 EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f
 EBUILD pmacct-1.7.4_p1.ebuild 2335 BLAKE2B 5b7c57caed2f2e96817f247a719e90f05bb3f30b715c053b07ddce3738f8e54ad35eb17edd94c385cc1dcb804dcce16c72282d70f572237f8e55cb06e70d827f SHA512 04c0c6fed8c5d81affd3eb3b65c3959934880cc38c5d5cbc67e269d399cea7a41da889d8e984630f2399138680a8bd4e885e716647097cfb06a8030f4364d2ac
 EBUILD pmacct-1.7.5.ebuild 2102 BLAKE2B 2c075143458f53bf9186e7ecf6b65e806f099a573e5d1a14ccd5a72224c8665ad0f1d25b4f343b0dcd56a0d32dab65bc0445b22c242740b8584d6608a0be5d6e SHA512 afc89ef6d76d06ce7da4634e39b2e62b3f1a574dc291803a13e5ed882168f5c680ab7cb69b5c6682dc2ca28f11d988f18e7cb1b0bf1468140698c5c503bce4a8
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
deleted file mode 100644
index a2934f5a2a94..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild
deleted file mode 100644
index 15ef9922c121..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb
-	mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( net-libs/nDPI )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cppflags -DMYSQL_SERVER_VERSION=99999999
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild
deleted file mode 100644
index ec5a692ea2e9..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb
-	mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( net-libs/nDPI )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cppflags -DMYSQL_SERVER_VERSION=99999999
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild
deleted file mode 100644
index 29e8537602fb..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
-	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-2.4:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cppflags -DMYSQL_SERVER_VERSION=99999999
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index d7a5b7fade94..808b09d8d9a1 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,7 +5,7 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r1.ebuild 4298 BLAKE2B c3544426f7988eee417285de01eb5dc3f7eef7b93cece34a6fd0367e9674dc1e6f5d9e96503d704123fa94c94a2ee65cd79cbf13912d3a5020eb0f3c0129f9dc SHA512 8a46316c9a69180eaab0b78fd01b14a6f3cdffedd0bdce169c859ec618080221862f04543396dee0c7fb2a470ef2a3d8c10baf07de7121de4e201215b39ac594
-EBUILD rrdtool-1.7.2-r100.ebuild 5688 BLAKE2B a67ba4d12f5557b6a4ea937f4f64d121908ac018aa83a537099961d168b38eddd4ce8a62548e1a1a5bb99895164246bd0528a8e693ffd6cbcdf283e85ca4a57f SHA512 7088e634e9df85169cca3449a765ab722e983ab13fa0f7dec62ebcdc53ef21b908a1183a4d33dcb80b028e3dbfed09cf6e5afc153d63375aba4d0abc98ff4ea9
-EBUILD rrdtool-1.7.2.ebuild 4303 BLAKE2B 05597581a939f134663db634976647ab57abaadfc12a63c9a77f824b4910b017936bcc9c6997a1117471d019b503896588975707d115480553706f4945211677 SHA512 5c32c5ac065e682f354443d7969aa818a937d5fd99306a0aec0573285fd99bae5ce2549d970a4d5aec3cfc545165fce274f305c51fe3e183c784e5b06f2ab07b
+EBUILD rrdtool-1.7.2-r1.ebuild 4287 BLAKE2B 7f0cd689bc80ec247e5e779ed10e872e681b1344fb3694d1394f5092c9c5d6dcd353de417643d884321465c17af91f29e597ba13480ce3885a79caa2fa61307b SHA512 95ea2f82666eefc1d8daab2230c9f127343c1ff98f3fd58acdda4b22878e297e9d1d6cd3dcce665caac1dc819d1fabe16308872e4d44a4eaa5ea1193f9d2d580
+EBUILD rrdtool-1.7.2-r100.ebuild 5677 BLAKE2B 0554a7851c47b34dc4bcfe7618cf05ececb7a3957740683bcf73996493bb3e3781afcc2d5429d3055391dff7f004e3678e8a653f365d3f7f43984484712a23ff SHA512 9f51028f3c4be9e3170aba764dfa9c2898ce0c7434651d96b3bb1e6532840c2d847be33b7e1c403ce255802f42ccf881a6045fddcdc68a90fffa3bd905e39a1d
+EBUILD rrdtool-1.7.2.ebuild 4292 BLAKE2B c163c2ca39a26a1640e526afc11c191bec38f6d79e99067239b4beeae5297b22e672b6eab9b4bfe83eb72e006e2852697b2668883cf551e297d5a63283022dbf SHA512 2971a0a7a607f72abb2479ed567dc6b2625261c4b2c00a2b22313cb954e54405f21fe1b47a79778a9f8b69f3ad123b19db6a401d7117d99abadb59270efa7186
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
index fa7ddc30fd67..ddf3e474c0fc 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 9618fcae7a45..247d9db32683 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index d09f07e3fb76..1335788aeb0e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 8794c64e58b3..58c0f009b600 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -6,15 +6,9 @@ AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88
 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
-DIST snort-2.9.12.tar.gz 6456877 BLAKE2B af5584fe01caf9af2f2188e1362bd927a884354ddcb3026af514dddc1264b557691e1644d3c24e85c3b5b5f515dd9fccdd8d38ebc7c28d2f384fb822e27d8bb8 SHA512 6f759b321ca5496abf27c9e4f4fa003cd5167f8c8a160bf5f0b1aee1a93aa8d27de89b84bdf993a0bfb3a93c6315cb2bdbdc3fdb3b09b8d4d1d3c22b69c6783f
 DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590
-DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
 DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75
-DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
-EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
 EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
-EBUILD snort-2.9.15.ebuild 8815 BLAKE2B 884fb9f7275d056092b24695acfe1dec49cd58282be6d4a229f0d15c1354ff5fcdb8d3add6c42669a0484702f2dc8fa64f958ed1f21a641b70a98a1b24930abf SHA512 bad67ba43f442bf74c81f268b59fb7c1eff3028fec0224800bd4a672aad95c01bf33105fe4f0f27c65e9f5214e8228735be4a186498c7b151cd1bf59cebbb575
 EBUILD snort-2.9.16-r100.ebuild 8403 BLAKE2B a0e34374c8d1fcebf79e67cbde006350fbb063b6fd0f1312033b9246e0c4aba78ed33496471a997e304506249d74fd1d3499024aa6af9c398111769090c600ac SHA512 373901f5995fd2393758c041314bf2d8bc052dfa75b7c5e13f1fb06c912e0fc99df2372fa522497b732e19bbcb65411033225a339d32038d2d71d78b2b2bd804
 EBUILD snort-2.9.16.ebuild 8290 BLAKE2B c79c137cb7bff4c3c0b55f3d73b52e25a10ef61b268e178948f36da4ec70be3d8834cdbe679a6e6c86cdf0f5244e912d25493d0ec1121dd29875a25a82cfa983 SHA512 9211178da2253e549c096f1c553a7a63fb8bea6071079d34c3db709abe1524f39d8f4936703e32802a073bd7407fb3945ea4f0216616ea33cfc312319a7a0a47
-EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba
diff --git a/net-analyzer/snort/snort-2.9.12.ebuild b/net-analyzer/snort/snort-2.9.12.ebuild
deleted file mode 100644
index 0a355d731945..000000000000
--- a/net-analyzer/snort/snort-2.9.12.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools user systemd tmpfiles multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="https://www.snort.org"
-SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static +gre +ppm +perfprofiling
-+non-ether-decoders control-socket file-inspect high-availability
-shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
-+threads debug +active-response reload-error-restart open-appid
-+react +flexresp3 large-pcap-64bit selinux +libtirpc"
-
-DEPEND=">=net-libs/libpcap-1.3.0
-	>=net-libs/daq-2.0.2
-	>=dev-libs/libpcre-8.33
-	dev-libs/libdnet
-	net-libs/libnsl:0=
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	open-appid? ( dev-lang/luajit:= )
-"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-REQUIRED_USE="!kernel_linux? ( !shared-rep )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
-	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
-	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
-)
-
-pkg_setup() {
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-	default
-
-	# Multilib fix for the sf_engine
-	ebegin "Applying multilib fix"
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	# Multilib fix for the curent set of dynamic-preprocessors
-	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-	eend
-
-	mv configure.{in,ac} || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable gre) \
-		$(use_enable control-socket) \
-		$(use_enable file-inspect) \
-		$(use_enable high-availability ha) \
-		$(use_enable non-ether-decoders) \
-		$(use_enable shared-rep) \
-		$(use_enable side-channel) \
-		$(use_enable sourcefire) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable open-appid) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_with libtirpc) \
-		--enable-mpls \
-		--enable-normalizer \
-		--enable-reload \
-		--enable-targetbased \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/log/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# preserving them incase the user needs upstream support.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/etc/snort
-
-	newinitd "${FILESDIR}/snort.rc12" snort
-	newconfd "${FILESDIR}/snort.confd.2" snort
-	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
-
-	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Remove unneeded .la files (Bug #382863)
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		 "${ED%/}/etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-	tmpfiles_process snort.conf
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
deleted file mode 100644
index 113430f103e6..000000000000
--- a/net-analyzer/snort/snort-2.9.15.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools user systemd tmpfiles multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="https://www.snort.org"
-SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static +gre +ppm +perfprofiling
-+non-ether-decoders control-socket file-inspect high-availability
-shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
-+threads debug +active-response reload-error-restart open-appid
-+react +flexresp3 large-pcap-64bit selinux +libtirpc"
-
-DEPEND=">=net-libs/libpcap-1.3.0
-	>=net-libs/daq-2.0.2
-	>=dev-libs/libpcre-8.33
-	dev-libs/libdnet
-	net-libs/libnsl:0=
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	open-appid? ( dev-lang/luajit:= )
-"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-REQUIRED_USE="!kernel_linux? ( !shared-rep )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
-	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
-	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
-)
-
-pkg_setup() {
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-	default
-
-	# Multilib fix for the sf_engine
-	ebegin "Applying multilib fix"
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	# Multilib fix for the curent set of dynamic-preprocessors
-	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-	eend
-
-	mv configure.{in,ac} || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable gre) \
-		$(use_enable control-socket) \
-		$(use_enable file-inspect) \
-		$(use_enable high-availability ha) \
-		$(use_enable non-ether-decoders) \
-		$(use_enable shared-rep) \
-		$(use_enable side-channel) \
-		$(use_enable sourcefire) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable open-appid) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_with libtirpc) \
-		--enable-mpls \
-		--enable-normalizer \
-		--enable-reload \
-		--enable-targetbased \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq
-}
-
-src_install() {
-	default
-
-	keepdir /var/log/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# preserving them incase the user needs upstream support.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/etc/snort
-
-	newinitd "${FILESDIR}/snort.rc12" snort
-	newconfd "${FILESDIR}/snort.confd.2" snort
-	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
-
-	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${ED%}/etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED}/etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-	tmpfiles_process snort.conf
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
deleted file mode 100644
index 2dc9971f77c8..000000000000
--- a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib user
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="https://www.snort.org"
-SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static +gre +ppm +perfprofiling
-+non-ether-decoders control-socket file-inspect high-availability
-shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
-+threads debug +active-response reload-error-restart
-+react +flexresp3 large-pcap-64bit selinux +libtirpc"
-
-DEPEND=">=net-libs/libpcap-1.3.0
-	>=net-libs/daq-2.0.2
-	>=dev-libs/libpcre-8.33
-	dev-libs/libdnet
-	net-libs/libnsl:0=
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-REQUIRED_USE="!kernel_linux? ( !shared-rep )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-implicit.patch
-	"${FILESDIR}"/${P}-rpc.patch
-)
-
-pkg_setup() {
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-	default
-
-	# Multilib fix for the sf_engine
-	ebegin "Applying multilib fix"
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	# Multilib fix for the curent set of dynamic-preprocessors
-	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-	eend
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable gre) \
-		$(use_enable control-socket) \
-		$(use_enable file-inspect) \
-		$(use_enable high-availability ha) \
-		$(use_enable non-ether-decoders) \
-		$(use_enable shared-rep) \
-		$(use_enable side-channel) \
-		$(use_enable sourcefire) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_with libtirpc) \
-		--enable-mpls \
-		--enable-normalizer \
-		--enable-reload \
-		--enable-targetbased \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# preserving them incase the user needs upstream support.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/var/run/snort \
-		/etc/snort
-
-	newinitd "${FILESDIR}/snort.rc12" snort
-	newconfd "${FILESDIR}/snort.confd.2" snort
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Remove unneeded .la files (Bug #382863)
-	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		 "${D}etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/traceproto/Manifest b/net-analyzer/traceproto/Manifest
index 5fdc371cbe3f..c23d62a1a62d 100644
--- a/net-analyzer/traceproto/Manifest
+++ b/net-analyzer/traceproto/Manifest
@@ -1,4 +1,5 @@
+AUX traceproto-1.1.2_beta1-fno-common.patch 2575 BLAKE2B 307b1480fa0a1c13e3ed0b3903909399fa742061d02ac621ec667ca0579ccea8d6462beb01e4a3a57e0fd83fc9f2888aee5c8a537e4163da956d9f23d91304c8 SHA512 70537e2ddcb7be3c55144ba7966ff34fd8c98a74ae4eddf285f90d909f6e98816915f5b91ce8608ba98468bd536e395fa61c0758f94229f310365e031e521d68
 AUX traceproto-1.1.2_beta1-tinfo.patch 804 BLAKE2B 5cb11304467e6a29a398f952d7526378243b402c25d7e76b6123b60b5bdbcc5cdf9f574b428e7f2e8cde3f54afa5326a0c92a5fa6f55b259388b2279495bb245 SHA512 d1c6653637b2d5ed812bd3999ae3f5456fb36621b7d2ed3c8502b9a25abd6303b1b3fff268a557ad288b35a9075079376f533f4a76dcada64d92b85c2d351b3f
 DIST traceproto-1.1.2beta1.tar.gz 192288 BLAKE2B 6b122fe84a3a2581792256c6be7a5ccdb2b42da923ff70fc2ec07956d2a95fdf882e381954b0b6e5de27e06bc713a40a9abb5bbac52ac796f34b6ec337790843 SHA512 e7c99fd0ccc6a8e21901d538b9a05ff26807afdd749ab53e958722ad7fa54c27545c95e4bc390a6a06130e7a123f8fa4c7f794ca7b25180a4d3ca5044d1e7364
-EBUILD traceproto-1.1.2_beta1.ebuild 758 BLAKE2B 655d1f682d9d8a28822655ca7b82823e9d4fa370183a874aaefb7d8a13ecc30f50f30d0fbb3ea322ceeec6ffb3a723adea9c81657ddc89faf6861ca187dd11d0 SHA512 d8f78fa49625affccaaa0ed7246318d6dc6ffd325b555a1069b55705927f2a9ef1821f0bb6b5a07e90aaa73740f3307b06c3cdeb11429728789bc9b798c9e796
+EBUILD traceproto-1.1.2_beta1.ebuild 813 BLAKE2B b3aeb0f9a04d250e7160d6bfb63cfba0f8b451bc4937c4d18b7b6cad1e4aa12ca432989ea308f8c918f31002da3e08c108a1c126db17ee537d450746811ab33d SHA512 1522bc703686b7f47b94ee7cc29c2c977094854dfc7aa75daae6fed7ffdff6f1905422c5f2ddfacd3993628d66221f578e018b9daa76a6de3dc23ca7708ac0ea
 MISC metadata.xml 360 BLAKE2B 0f362693cec18bfafae2e7f86116101904e9fb65722bd08c1879efb4d9e862e6db1368898ccbd1fee868ee9fb52ecea5f8c3e20e141474406a45cca2c6911fcb SHA512 09c1bdd4747222c72f8db8e0486a93b67ece13643ef4532175af88ae7a550a44c5a7533b9926c4898a6aefaff069c0d43befd781430927a199489901553456e6
diff --git a/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch
new file mode 100644
index 000000000000..8d95517ab27c
--- /dev/null
+++ b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch
@@ -0,0 +1,122 @@
+--- a/tp_as.c
++++ b/tp_as.c
+@@ -50,6 +50,7 @@ static char * ra_service;
+ static struct hostent * ra_hostent;
+ static struct servent * ra_servent;
+ 
++char as_string[1024];
+ 
+ int setup_as ( void )
+ {
+--- a/tp_as.h
++++ b/tp_as.h
+@@ -33,7 +33,7 @@
+ #ifndef TP_AS_H
+ #define TP_AS_H 1
+ 
+-char as_string[1024];
++extern char as_string[1024];
+ 
+ /*! Initialisation function for AS lookups; returns 0 iff successful. */
+ int setup_as(void);
+--- a/tp_miscfunc.c
++++ b/tp_miscfunc.c
+@@ -52,6 +52,8 @@
+ #include <dmalloc.h>
+ #endif /* HAVE_LIBDMALLOC */
+ 
++struct cleanup tixe_cleanup;
++
+ /*
+  * take a comma separated list (sans spaces) and give them a miss
+  * (ie don't send probes with the ttl set to these numbers)
+--- a/tp_miscfunc.h
++++ b/tp_miscfunc.h
+@@ -32,7 +32,8 @@ struct cleanup {
+ 	unsigned int libnet_cleanup : 1;
+ 	unsigned int pcap_cleanup : 1;
+ 	unsigned int addrinfo_cleanup : 1;
+-} tixe_cleanup;
++};
++extern struct cleanup tixe_cleanup;
+ 
+ int parse_skips ( char * );
+ 
+--- a/traceproto.c
++++ b/traceproto.c
+@@ -55,6 +55,12 @@
+ #include <dmalloc.h>
+ #endif /* HAVE_LIBDMALLOC */
+ 
++struct tp_align_ref tp_align_freelist;
++struct behavior behavior;
++struct packet packet;
++struct state state;
++struct debug debug;
++
+ int main( int argc, char * argv[] )
+ {
+ 
+--- a/traceproto.h
++++ b/traceproto.h
+@@ -104,9 +104,10 @@ enum tp_tstamps {
+ struct tp_align_ref {
+ 	struct tp_align_ref * next;
+ 	u_char * ref;
+-} tp_align_freelist;
++};
++extern struct tp_align_ref tp_align_freelist;
+ 
+-struct {
++struct behavior {
+ 	unsigned int continuous : 1;
+ 	unsigned int continuous_accounting : 1;
+ 	unsigned int do_skip : 1;
+@@ -148,9 +149,10 @@ struct {
+ 	char timestamp_str [ TP_TIMESTAMP_LEN ];
+ 	char timestamp_style;
+ 	struct addrinfo hint;
+-} behavior;
++};
++extern struct behavior behavior;
+ 
+-struct {
++struct packet {
+ 	int dst_port;
+ 	int src_port;
+ 	int protocol_number;
+@@ -161,9 +163,10 @@ struct {
+ 	long packed_src;
+ 	unsigned short frag_bit;
+ 	unsigned short ip_id;
+-} packet;
++};
++extern struct packet packet;
+ 
+-struct {
++struct state {
+ 	char * prog;
+ 	unsigned int account_hops;
+ 	struct hop_record {
+@@ -208,9 +211,10 @@ struct {
+ 	unsigned int low_ttl;
+ 	unsigned int incr_error : 1;
+ 	unsigned int target_response : 1;
+-} state;
++};
++extern struct state state;
+ 
+-struct {
++struct debug {
+ 	unsigned int loop : 1;
+ 	unsigned int interface : 1;
+ 	unsigned int send_buf : 1;
+@@ -219,6 +223,7 @@ struct {
+ 	unsigned int timestamp : 1;
+ 	unsigned int as_lookup : 1;
+ 	unsigned int memory : 1;
+-} debug;
++};
++extern struct debug debug;
+ 
+ #endif /* TRACEPROTO_H */
diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
index 15e52604060b..28f0ddbe591e 100644
--- a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
+++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools
+EAPI=7
+
+inherit autotools
 
 MY_PV=${PV/_/}
 
@@ -18,11 +19,11 @@ IUSE="debug"
 RDEPEND="
 	net-libs/libnet:1.1
 	net-libs/libpcap
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	debug? ( dev-libs/dmalloc )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-doc/doxygen[dot]
 	virtual/pkgconfig
 "
@@ -31,8 +32,13 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
+	default
 	eautoreconf
 }
 
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 623708153107..d47cfac7aeba 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -11,7 +11,7 @@ AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e949975441
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
-EBUILD vnstat-1.17.ebuild 1457 BLAKE2B 12c17ab149bdc4c7963055eee8cbf3efa2360379a1bdd7230a365b95a508f20c84bd1b77111faa3d3f97034dcd05fd75c9187de8fca23bd7d9c8f7fe3e709c54 SHA512 8070ce34140862b64d1f3d1c5b9eb6fa398cd605513905caf9c8cdb825c0c083f83ae73fd0282cbe0285e5c46e7c0b4dbdedc6a52547b247f673eee1e3eebbe0
-EBUILD vnstat-2.6.ebuild 1559 BLAKE2B b86d3ab528efecafb9f874a8b8c820e7520eb89683a8ed37b248d1ac76bb945c4989b3deb20e12735051f8c85c8f7ee4327ed8ce6e2d09102dfab66095164609 SHA512 62c5cfccd5c8ee4156eca7654124a7eb146f1d77ed60954c836d34faffda8bbaae6143558f4d2b166436b4fce9b1317e5c910fd097ce998110dc2861eebb6859
-EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
+EBUILD vnstat-1.17.ebuild 1458 BLAKE2B 8e0eeae3c66850f4ad564c9e9d334cb8052e2ac760f0f94ab0a1bb244dfdde0bf1bf760ca373317b0797937745b3e74109c1a498893960aa25b8da24dac73d89 SHA512 46ed0c0025ec163d48d031cc65522e102385c34a479ab0f4615c869cdd6e05f9c7ff9837bde2c7711265976f7d7d580c0febdaf00dd9dde52aee3b7fed93b73e
+EBUILD vnstat-2.6.ebuild 1561 BLAKE2B b8013a30f6e9fd14d1d9a0710307a7385c5c54b6ac1d588d7d88252ab686aaa1c09542d395d03c07b32565a4fd73fb777d7aefd4973d6972355e2a05c2c40602 SHA512 79d7b080d0e46a38282e56a34b9ddd2916b5cd59d543fbcde15475337d13561feae24f470dca8af5adafca4ce28fc0fec37e26a12a1136db2324812c04238070
+EBUILD vnstat-9999.ebuild 1519 BLAKE2B 105caa297f45b6f2162ae6430913d035a6c9cce41161d47ebb9a0763434785eb442f9c1e0f3a72d59fd32e530f52146262f6d12bc2ccfabc2c369202778a6acf SHA512 62537294d18ab9acdd3a6a2cd53ce83eaadc2a67cbcac27f664848620643fd2aee71ed76d09633295370c3010e16eba7354488493c73d7396333975dc62e0f97
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index 66f0ce74f2df..161165265750 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit toolchain-funcs user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
index 990a6e1d9dc2..956e883bd178 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,6 +27,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-vnstatd )
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-conf.patch
 	"${FILESDIR}"/${PN}-2.2-drop-root.patch
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 7299c18fe077..dd3a09ddf9ac 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-vnstatd )
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-conf.patch
 	"${FILESDIR}"/${PN}-2.2-drop-root.patch
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index a41405b3e16e..112ccadca7ad 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -24,11 +24,11 @@ DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d85
 DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
 EBUILD zabbix-3.0.31-r2.ebuild 9234 BLAKE2B d40766c26dab73ff0aec8f4a95011d2c3b53385bb439b2d8ea79b94ba95f8759a97aeb840ab0b420c52e03563c41e9b582f36bab9513e9d6f3edfc0c4ec85f3a SHA512 cbd954cc1df0099b73ef4ea897bf8bcfa1ae420a36baab6400327e4232454248fd593bdb153566eae406cf8b14bab4d7e240c5940c6ae58847c9f42c69318e69
 EBUILD zabbix-4.0.26-r1.ebuild 9208 BLAKE2B 1ce623b90d07101b929bfd6a51aed1e8f9e86db5bef7a9f95b47532a829847a49974878e87a6c8573ad7657ab78b3dc117a799fd6d6e2f3ae50241543a1a7263 SHA512 26a79eed372f5e9cc83cc80e5b9120d686fef18199f670692c05afb2db4f1ea34b00a9c5537f9224cd664a66985aaa8a635ed3c891019be5814360ee6836f23e
-EBUILD zabbix-4.0.27-r1.ebuild 9210 BLAKE2B 93792dfad628b1e438677791ee1bc8fc199d0b002dc5f6e120b966c49e3a7ae88dd3c96261dab3a86252a0a49ecd1131a4bf729a8bf58a083dfacf12dd14fffc SHA512 36889438331e3af5960f863d6d48b11babe8ddf1964dabc524cc4a43a65836be1ad99bce37b7b2868d5aa50f81d66db7d4b825b5661ef6c7916b34f5d152c154
+EBUILD zabbix-4.0.27-r1.ebuild 9209 BLAKE2B 891b8cd2a524977a581ddecfa4039ca89e721a4226ffb41c305a1f04b68c2d8e0386da44b5e431009eb0e874572f8ceff0684057c6365b7069a8d8e93160febf SHA512 74e4bd8a3f65d3d1b44fab22d18bf706fcbd2a8875c25d5437d3a0fa69ab66dddf2d21e1e3c33080068dda8ca85e5acf69225e5b29bf6490385f52672b01479f
 EBUILD zabbix-5.0.5-r1.ebuild 9077 BLAKE2B 1cdbb7ef630ef59429d80019a7c59c1c3071b9e959950933f9a3a6fb0b5c2c3f636e3e5d4d01f5636038b2be563db62460ee9b55888ceedcd74f8b7367f7f775 SHA512 b12095e281568016dfcd93ee6395a3b48f8cdcf6e37def58194b5bfb8271e3490d232ba107a37b85b256ae970607e09fd0741fe9ae3a1ceed3212d47b821916d
-EBUILD zabbix-5.0.6-r1.ebuild 9079 BLAKE2B 52e11ccfe19a2f344be0e4d22894c311888f8c3dab251498a32cb1369ba9086b70e74e82adcec860e4d21534fc570627d94f8d53b9618df576603ff4cbe77404 SHA512 e95cb70fe23591ff07a56feb3664e9e99ea5fb5d8faf4a8645b65dac63ff0929edca5fb645a557d4f0bae32cc4842af7258ddd13c730fd990175db9a4072091d
+EBUILD zabbix-5.0.6-r1.ebuild 9078 BLAKE2B d4f8b99938e7d5c234fa87a3e3ef5bc8f04aa26e090b3f5939fad981559c734bfe4771802c59fdcb1b82bb49704f84515f84d42a73ba32c24fae9177a0024c10 SHA512 a7c8725ad105d006a5edddd33ee5b2a9edd92f80da7af1adf238040e97a4d8991dee99ddd9cb14190bbc42866d0d183223a074cebdf6451cf0bcce817cb8cb77
 EBUILD zabbix-5.0.7.ebuild 9079 BLAKE2B 52e11ccfe19a2f344be0e4d22894c311888f8c3dab251498a32cb1369ba9086b70e74e82adcec860e4d21534fc570627d94f8d53b9618df576603ff4cbe77404 SHA512 e95cb70fe23591ff07a56feb3664e9e99ea5fb5d8faf4a8645b65dac63ff0929edca5fb645a557d4f0bae32cc4842af7258ddd13c730fd990175db9a4072091d
 EBUILD zabbix-5.2.1-r1.ebuild 9077 BLAKE2B 1cdbb7ef630ef59429d80019a7c59c1c3071b9e959950933f9a3a6fb0b5c2c3f636e3e5d4d01f5636038b2be563db62460ee9b55888ceedcd74f8b7367f7f775 SHA512 b12095e281568016dfcd93ee6395a3b48f8cdcf6e37def58194b5bfb8271e3490d232ba107a37b85b256ae970607e09fd0741fe9ae3a1ceed3212d47b821916d
-EBUILD zabbix-5.2.2-r1.ebuild 9079 BLAKE2B 52e11ccfe19a2f344be0e4d22894c311888f8c3dab251498a32cb1369ba9086b70e74e82adcec860e4d21534fc570627d94f8d53b9618df576603ff4cbe77404 SHA512 e95cb70fe23591ff07a56feb3664e9e99ea5fb5d8faf4a8645b65dac63ff0929edca5fb645a557d4f0bae32cc4842af7258ddd13c730fd990175db9a4072091d
+EBUILD zabbix-5.2.2-r1.ebuild 9078 BLAKE2B d4f8b99938e7d5c234fa87a3e3ef5bc8f04aa26e090b3f5939fad981559c734bfe4771802c59fdcb1b82bb49704f84515f84d42a73ba32c24fae9177a0024c10 SHA512 a7c8725ad105d006a5edddd33ee5b2a9edd92f80da7af1adf238040e97a4d8991dee99ddd9cb14190bbc42866d0d183223a074cebdf6451cf0bcce817cb8cb77
 EBUILD zabbix-5.2.3.ebuild 9079 BLAKE2B 52e11ccfe19a2f344be0e4d22894c311888f8c3dab251498a32cb1369ba9086b70e74e82adcec860e4d21534fc570627d94f8d53b9618df576603ff4cbe77404 SHA512 e95cb70fe23591ff07a56feb3664e9e99ea5fb5d8faf4a8645b65dac63ff0929edca5fb645a557d4f0bae32cc4842af7258ddd13c730fd990175db9a4072091d
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
index 7ce30397049f..1ab91afa3ef6 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
index 8f6e95562365..5e44bb3b94da 100644
--- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
index 8f6e95562365..5e44bb3b94da 100644
--- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /net-analyzer
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)