gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /net-analyzer
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
118 files changed, 1398 insertions, 1261 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6a76b3b41eaf..b7341380616a 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index ae3c3eb8e4de..7a24abbe4d53 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,7 +1,7 @@
 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 718 BLAKE2B afeeebbeb658b4aa5bb74a0696a08a7e18f53a0da4a2349ad8f577aec0af5253e9630c086f065762e1644ecaf0c3406bf243193d095bb05c0e1dbb3ebad8a55c SHA512 85846c582ebc68c58da6829f2ab6e9af532b157de9ddb590015a322669cb3da2e07712609b5635e2dcbac2fe28189592705348fef4797eefef8a4048f9e1c4e7
+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-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index 795d562c6a29..78d487844d14 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -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 ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index d1db983c1938..da11b063c5ca 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -6,6 +6,6 @@ DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de27057
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-2.1.15-r11.ebuild 2229 BLAKE2B 63b3c747a8451a150612f52440ec779ef869f4ab7480c09b141869a8c3f91a9161d36c77025f22868430599007ad7c51c803306d373b2cf7021b13128b77dcc9 SHA512 7e1aa35935ab43542d5d1f6e855b124d61b971666785a14e60281dc666b064fbb6ddfe49904da3b3e635352850e72d68c1ae92eb2ddeb0cb556eae0779278439
+EBUILD arpwatch-2.1.15-r11.ebuild 2230 BLAKE2B 889e3e63758098ba0f118865f8eb79d9ef90918bad7bd4489c51ecb542c755b2e39b97ab53aa82a221b4c49ec4448382e4f879ed1af1eb0357880db9d7d57f93 SHA512 c5e42b41147f62ae73a5dd659a69c1605c3298bd5d2f36153b706e940284a074532fa4ebb0349ed665aca208c85e7819444ab57888dfd1bc79cdf7d385e4f0ac
 EBUILD arpwatch-3.1.ebuild 2060 BLAKE2B 74e15d6a6b4b7e994d557756a0662dbad1d8c8a44fa09b431eab77c33c8b831e93ccfc287c96c9e5a341618e2f52d54c414465afccd69dac92608dee98c479bd SHA512 de10526bf59ce55f7ec8fb67d4de5eeb002237b151bbc1be11a62f3d0cae757a5fbfeda3f64d99dbcf95fc4eac197e7b759c114bc3dff93ec6605494b73a7c16
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
index b12edabc0a66..b11099a93145 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 5f2af23b3d3a..e730e80219ca 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,5 +1,5 @@
 AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8
 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d
-EBUILD bmon-4.0.ebuild 935 BLAKE2B c617ebeb4143f3c55afdd47723188737eace0cd66f6fa80b6f228d4f7f5e848209a2a0e453064a33dd1779ec3b1f4c9b99e74902763dfc8827a425a7c2ebe864 SHA512 a6c746ed42a66c11a450202c0a3a5a840c5f7f3d9a744b2acd0294b87f09fbf3b8d76801fe474516276bfb1bf203710ba04cca4c7120a3fa5919d88535fb2c50
+EBUILD bmon-4.0.ebuild 936 BLAKE2B b2671f70efd71060f743630e2e14535b6e6c7b0965c03aca95fb528656e5e999e50a6566684c0c15298f376a82d44b1bee3d54fe6cede385c0fccf7f03749654 SHA512 b055b8fe965f501faff7f115d5a6ce29ae00d632275d716d2328b3d3561ae098828d1c60bea1a818d8874010ec155168fa7279d21fde31a9c629c48cef4b0d62
 EBUILD bmon-999.ebuild 858 BLAKE2B 82354eb979de0f0983e8651ce4aced9f837ca8dcada384abfc14a6a0ac69428182ea843bcf656dd9413f04f8e6b4467654d3323deea277f69e10c111cd1fa084 SHA512 e2f48435f8242d422e94811f5f9b952517ff12a7d26099c0bbc0279d9210b9aa8013d64b34a5599cb6d20293d72f3b552a85057dfe3d0f245206cbc97b0dc2ec
 MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
index 01d01f88612b..ce39ebbf63e0 100644
--- a/net-analyzer/bmon/bmon-4.0.ebuild
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.3-r2:0=
diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest
index 7ec679913134..8972d850ea46 100644
--- a/net-analyzer/bwmon/Manifest
+++ b/net-analyzer/bwmon/Manifest
@@ -3,5 +3,5 @@ AUX bwmon-1.3-overflow.patch 543 BLAKE2B 31728572f5cb4f6d3eb78801c3aa99100b495b9
 AUX bwmon-1.3-tinfo.patch 242 BLAKE2B 0f9b6625d10ca61f9728441122aa3db10e6a34c8c5e410231bd147a69aaee51378d2043f9eb7eef90994dd722462f579e0271b61ef3054a00da2e834eaac4ab1 SHA512 710f9cb4ff61b84f717603f5b814cfaed90af95c67cbc051eb9535084cb02c26711e3dd9f539165640ffb7bc770a15d77144de9c5ccb1235a6b11c3619b3d0ec
 AUX bwmon-1.3-typo-fix.patch 534 BLAKE2B 1037ebbf21c61ba71bd27b02311c8f8674dddda18fca227c285f91aa3a82315bbbc848f20d4dba54b78bd17bd6944c41f2c8688a068b4e511dfc49310d40efb6 SHA512 4c0a23a7b49a86e35239e1b7e0273d3ffafa4ea1a43918557ed26e4680eb2563aa1635670868ab7f39157118d140844a0706828d9f09f938d21e90f3fa5d6854
 DIST bwmon-1.3.tar.gz 5668 BLAKE2B b73695ad56516e6134c6b6c6012bcfdf71ad51af99fadabf3af95cc7af745b8cd7ffbfd8c9ced6a13e9d05abb9d2ceebee3e0d7e3c54694ecbcd467be75d8b60 SHA512 6552ba03f0cfe7d2adebe7ae49379cc109b4f8da56dafec1264ac39c114809c7cde161f6321a67516b22b04abbad5d1ab3b4efb313479ad131fb20638c6871e8
-EBUILD bwmon-1.3-r2.ebuild 729 BLAKE2B ea987637e5cf81f77fee55f98e4e87596d5362abffca4c6fc0bd0365539f946fd05d2051e733cde45af2c3f1000c31999ead2fa8f538e9a4db977b81cf05753a SHA512 58263d0eb949eaca92198a0bbba0930e6ebbe6de3f7fbcf012fda59ed657b3cfcfc6e08a2dcec2f3348eeed0f020f242db08a64b799ab392a29348fe539e3d48
+EBUILD bwmon-1.3-r2.ebuild 730 BLAKE2B 2ac7b1b8218a5a5d99494cf77c96a01c751512fd32195ea5483a44ba89987a263471602b4b1bffd1c22ed4fbec9c8e37af03d2b4680631c4d67e49769638ba65 SHA512 de5518bea1393264e780e8e17d6acf667f45f8cfaa56626c640ed300d1f1c69c80ae56e550ab8e1bf0e0e20a210c2f035018a824a9109d3fdfa290b6ea9a01f5
 MISC metadata.xml 355 BLAKE2B 9a14c05ae8d113f1094ec3f8e9842b0cead05a4e779d4e001deebb3dfbd4694f2e4ff884439721e829e643b252732e24fe1703ae375f6cb695b7465e343c0462 SHA512 441e039d5d22d70155d6229a29d6ba3a0e0bc82498de7ec97014cdd830ecf3ba4c67a9ae3556a2a9f29a0ff48ce573e576efa48e99660a37a9a132ed9cd2c345
diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
index 6b247db307f2..56fb924c673c 100644
--- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 
 src_prepare() {
 	epatch \
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index e634b4925690..3e6f404780ea 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,4 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
-DIST cacti-1.2.13.tar.gz 25182816 BLAKE2B 934deba81a0ac66d4f6a6efcb254204f3d26b40ee56b3b0b926334cefc99a8dcda688250218b796446e6dc9ad3b0efdbe4a0e408873921ff38977485c3fcf9af SHA512 e111c90b77a43bb3ea7cd5cc90cd95a09be95413443db474c04e30d5b00ff96a69e8cb2792a3995462f4623538fc33b89029ff13c25181beff015c47e506d4b9
 DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056
-EBUILD cacti-1.2.13.ebuild 1011 BLAKE2B c9c42e80eb588faec3c8c16337905c5006fabe200bab3b0d1c8dfe6ff02391a52947d9efa30f331bd3352030d8d48bafbfe90d1b11ff9de1fe3eeffd7d2fdb16 SHA512 2b58b91c60e77448d15b8fd91b05692a3102e0ce699452b11a71b0c9767820e65a47e1feb816dfad6a0a16f3869e8f765ef97e67f08250a47a49f6cdadde92a8
-EBUILD cacti-1.2.14.ebuild 1012 BLAKE2B edd61f2b0d8c3e56408860f60f944b9871c4f5f8b2856c61dadb457aae41609e20c12730f92ad32611c032a29cc6fd7027df233b9366b6660eb44c331ffd9fe2 SHA512 e0a7c40e3adb32df85cdd1a0708392eb56506e17688f8b052aeef2158eb6d591da2b19136f8215f6c79dd820cf6bc7ba0172b70918c26333da0e326f1a1fe8d8
-MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
+EBUILD cacti-1.2.14.ebuild 1011 BLAKE2B c9c42e80eb588faec3c8c16337905c5006fabe200bab3b0d1c8dfe6ff02391a52947d9efa30f331bd3352030d8d48bafbfe90d1b11ff9de1fe3eeffd7d2fdb16 SHA512 2b58b91c60e77448d15b8fd91b05692a3102e0ce699452b11a71b0c9767820e65a47e1feb816dfad6a0a16f3869e8f765ef97e67f08250a47a49f6cdadde92a8
+MISC metadata.xml 858 BLAKE2B a26fc18f14036255564696b9d0f683dd6d91009437018e455817430996889966afdaca195948e74d0bd27e3b5e9dc8f7d7ea84b0b9f500db8120c816e3025fae SHA512 c4310c412735e5d41e1c3139de4ba42afe188efaa2e52b25fb1e88ab200e0e259bb119ebd725891b2fae055d22915bc794fe8b15a62faff8150b996012d2d403
diff --git a/net-analyzer/cacti/cacti-1.2.13.ebuild b/net-analyzer/cacti/cacti-1.2.13.ebuild
deleted file mode 100644
index 2ec9213257a6..000000000000
--- a/net-analyzer/cacti/cacti-1.2.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils 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 . "${D}"${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/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild
index 5c30aa1a848d..2ec9213257a6 100644
--- a/net-analyzer/cacti/cacti-1.2.14.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.14.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index 8fae41374fe9..dedf38ac9c19 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -5,6 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Cacti is a complete network graphing solution designed to harness the
 		power of RRDTool's data storage and graphing functionality. Cacti
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index 6c7323975181..9156b52bca6b 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -2,5 +2,5 @@ AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877
 DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05
 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
 EBUILD dnstracer-1.10.ebuild 678 BLAKE2B 82841c2e0abef131577d632693f65be2e6102b64e599d28d8cae1e648293c2ac2e96b16eb4f4e72b172dff8fe1e5d49643d525ae9f9f95e1cd4dc3c30516ebcf SHA512 5378dba0eba308532f288cd457b83b8dd292589bf4d66f8bcfa5b5bfe7a1416f375b6782a0f8eb4d3f7bef716b512b01adba8033e5772d5ec449c7dbdbbfdb12
-EBUILD dnstracer-1.9-r2.ebuild 529 BLAKE2B 98b954fd431a19ac9bdcc6c4a03b205a26a8e2a6976ee021887b6924be2d1aad4f24489b5ca5ba503f9afd1f47b8ce8d79a8862a1aa7f7ada2d8752158b91d44 SHA512 0de06d1dd0e15f6f71f733a24f24e6fcb13b950fd3e4bd584ccc4686503609f668f25f0fbf6337b537b542ead4de1c426fc160fd597739f7029cf543c1fd730c
+EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B c4008d5c48dbfe6bd0a7a6ecc23913fe4a21e6d0287ddd55c7d5f8fdd8b018e0d376457ee2d9349e2fa3d477d3d8b106fe3535b6b92a95904ec12d6678441f19 SHA512 b361a72cf4e5d04031799a0d7e7be1e2f138b71229800a93fdbf17ca205bf2f241f85f588ae439fc7a50bde2c3beaa02bf930b0f6aa96e0e1272a7d0c3e71301
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
index 2e93e346523c..4de46fa1b6a1 100644
--- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
 IUSE="ipv6"
 
 DOCS=( CHANGES README )
diff --git a/net-analyzer/dosdetector/Manifest b/net-analyzer/dosdetector/Manifest
deleted file mode 100644
index dd0a7342aa35..000000000000
--- a/net-analyzer/dosdetector/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX dosdetector-20060621-isdigit.patch 192 BLAKE2B 1a5ee6495fde139e7310b34c3c0e80214b93e8e8ab4baa10289b67955b1d8b02912de85f03867266b1d3fd104036b946d27c71b6b970af88226e9502b85a7a18 SHA512 20647b069c8503281fe5a982744c0a526f755e59963da21a0eacfa4963baaedf5f74e19aacf35eccb1d0286ed3a1f55af377fe52cb3eb4ec648b8d2e49fea2d3
-AUX dosdetector-20060621-sizeof.patch 301 BLAKE2B 4c30156b383337a60ccc3bda2153a21bee3c9a634aba7df7527763cbdfebd5a16d5a4926454f2af114620b65cb21e9eb8a51db7be8e4eae865422a4c4caf663a SHA512 4263a0a3d3b9c10e18eeaab96e19beb700286af10d438667ed00f2640e6dfe4db7ec4daac35c033a52ca08afad966337bd4c8ba84ae4ce9d56e3da71a8b130d3
-DIST dosdetector-20060621.tar.gz 164768 BLAKE2B 467b6f45fadecfc6260e90797b7bd5eba042860bdc42ef5aed7538ac70259bd2d34ccecadb46255c02488aef4e929d7eb1cc49884ef649210006aa8ef267965a SHA512 30b6980920920a05668165a1c3dcbd07a94f964367d5f48ca443e017806cfcce85a11ad57183d3cc29ac06e8a1ef122227187f6cacd237fe327db4a768b992f6
-EBUILD dosdetector-20060621-r1.ebuild 534 BLAKE2B 8cb811cfd6a1ef9cf1791ae42a8727ef400602567173ea0ba51cdaa97ac1152f17340ef3788025a32cd613cf5c28022bcf598e8dd641ba75d6f63c0e9952bbee SHA512 7b90561e8e9cc1575b39b2120d947fb5766aa8d8ac6942ebb63ccb31411de1614e79592e1e394b683aa48b6ce929fc57772a824432dac646a51124a8fb377ed6
-EBUILD dosdetector-20060621.ebuild 493 BLAKE2B 1cbe4ef37c8b262b23d2b712c5956eb4675f757122af7e95d1e39723cf6077cd2ee0664705a2f2ce310690f3a101973038f529e2d30ed2696bfebb49846dff9e SHA512 8b253d5e691d780a48a04eda6b6a1c79cdd41bcd654ab996ea4faa3618b9af21b4bd82d5f9c6da3bf605a45fb77e5b9a4a526ba88a8216cd684578c2c8dd895a
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
deleted file mode 100644
index 81aecb194510..000000000000
--- a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it"
-HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/"
-SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-isdigit.patch \
-		"${FILESDIR}"/${P}-sizeof.patch
-}
diff --git a/net-analyzer/dosdetector/dosdetector-20060621.ebuild b/net-analyzer/dosdetector/dosdetector-20060621.ebuild
deleted file mode 100644
index c7d8681ca3b5..000000000000
--- a/net-analyzer/dosdetector/dosdetector-20060621.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it"
-HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/"
-SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-isdigit.patch
-}
diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch
deleted file mode 100644
index 11cd3170ded9..000000000000
--- a/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/dos.h
-+++ b/include/dos.h
-@@ -26,6 +26,7 @@
- #include <net/ppp_defs.h>
- #include <sys/ioctl.h>
- #include <time.h>
-+#include <ctype.h> /* isdigit() */
- 
- /*
- #define DEBUG_TREE	1
diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
deleted file mode 100644
index aea9cfba19ee..000000000000
--- a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -306,8 +306,6 @@
-     hosts = calloc(2, sizeof(struct host));
-     rules = calloc(1, sizeof(struct rule));
-     rules_num = 0;
--    bzero(hosts, sizeof(hosts));
--    bzero(rules, sizeof(rules));
- 
-     /* Init rules table */
-     if (init_rules(opt.rules) != 0) {
diff --git a/net-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/dosdetector/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 045343b614e5..481e3ac81b27 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,6 +1,4 @@
-DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.1-r2.ebuild 3304 BLAKE2B bd423b357180362b03a602e661c348440f559af0007acaebd3b87fac825b66ed5a2f9d87f72c83a59f460d31ff88d0fab9dc58be1fdf15f2a77bb6753ad26ff8 SHA512 a0b3ac50485c7d74b0a2865ac90858fb9ddfc7b5a61902e22b21187e01e9a8f15e230983353d5998d9bb4f20cc4fd1f5dcc5986dab7d4acf8bac329e8a295ca8
-EBUILD fail2ban-0.11.2.ebuild 3357 BLAKE2B 9c7a838c885ba4a1d976d9433dcc1c084322e94a989a8f14eaa27e80a87ae84a2c9ce154f56e8629b9f5f4770e6ea2688d29550f5c0253ffb27ed2295acab295 SHA512 b22ad2a16221b97bd927769694ba9d90d0f751b2b0156811866dd52bed1c7b19d8e2d9c805cbd3ccd16dba526802ab90e3a9fcd6acb8d638a0ba81b205059f21
+EBUILD fail2ban-0.11.2.ebuild 3350 BLAKE2B dd5869547e647b3c9ebb24f1788521d1aad8e03ebd460e6aa8d93e268e3d5cd57398138da17b09fbd042f05a1e05b32982c9716fe094a738ed110238ca24e851 SHA512 8630e3ae9e440d8300d49fc11e51cc459875351486b18686b043a4d14f9baecf5e068022c61040213e64c0f9465a1dbbf053185833326dc9023a936c9b2748a3
 EBUILD fail2ban-99999999.ebuild 3235 BLAKE2B 68151b88460a56e1caa151bfe38a5e5f8e3338ef9c3d67e80463d4cada9036656b48c896c7fe88eb7f60ef6122f2921cf3472abe3676d07be32ec3ad65469cc7 SHA512 c51672b159da9332469c04b92b7e94deb7c87346aabc011ecf6a2fbbc600df6cebfb4e1eab5525a459903f30335ce20da466d79f56f20ea3d02b6562d4bac261
-MISC metadata.xml 478 BLAKE2B 29151d47650874f2adc5077f58e9beb2d943d9a7df465d73ae7d21277c47103af8496723965cc25c71f5c4778c78e44792a547fa674a4f2e07a812e450258999 SHA512 93b6aa4f37cf7374690eca92dd65a3ef8fee2155cfea5c8f64dff10c9f26828bf6a9e0b542cbab23a409b2cddbb1bf3911b324f8f61669c481f0b1a3d7e9dadc
+MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
deleted file mode 100644
index 55969ac3638c..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
-	)' 'python*' ) )
-"
-
-RESTRICT="test"
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	default
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-
-	newbashcomp files/bash-completion ${PN}-client
-	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index bd35827ae05e..ebb59e058f0b 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="selinux systemd"
 # Needs some work to enable them right now
 RESTRICT="test"
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 1512403ed499..cd908145eacc 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -5,10 +5,7 @@
     <email>sam@gentoo.org</email>
     <name>Sam James</name>
   </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">fail2ban/fail2ban</remote-id>
   </upstream>
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index 2be4bf55b57a..5d26a2cc1f89 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -1,6 +1,7 @@
+AUX gspoof-3.2-fno-common.patch 4897 BLAKE2B a6a47ea9dcdd312d7fcd241362e2c7056e5e781c8b693e54dfe4f6c2b4cf9fc45e369f23b3b31a48324496049a66371a4d16893701da53e4750c313339882617 SHA512 4f715689c37fb36942de254a408534cebc26bc90413e0606e0982c318d8beed1cfd6b93485a860adfb78cf0ff51c74b3cd14772cdd32e929df3c50b1741c892f
 AUX gspoof-3.2-icon.patch 2951 BLAKE2B 952de6a5c1345656da88f52efba8a18da2dc45b4b29f99816dff9c0a09aa003ab566f3ec831f39ead762c04a7b014dbdc1a4f73ee8f521502fffd6b8da195268 SHA512 ccfe1e2db4f08f0847316f6ac5b4cd884f450acaf609c479afe4ab9c1884126f54a8ef623779a16eed38676fde7f32aca9e58692e9ecff25656870589adfda15
 AUX gspoof-3.2-libdir.patch 668 BLAKE2B 1f31874c36368022b18814a6dcbc0c3b8696b9ba12f51c6f5e1bf201ae2e8eb42f21521e9fc9cc1e214d8ee480f198c84b393b483c66766ecffb9b6aee07022f SHA512 d4cd192132d1a7cb12676032cb1d787b44b1ec5c7fd8667c1f69455de3892011407b1663a15d47c7a8aba38b61fb76f6f141c1c01f24420c5dad2b39f347f641
 AUX gspoof-def-values.patch 903 BLAKE2B dff9e5e8bd60a51f2acddf4e553c326fd491aa40670954da6f84cbd4ad5a357327af8833f8eb2b5e0b67653761aeab55e37964bbc1c012b2eddfdf1c3157270a SHA512 92b4a1b682669acd13b4fbf77083b633b881f4933445910976492fd093e1c4db3ef0b9d45f487ef8c3df9f252ca239d5411026f527ed3e0ab2972bbfbeea8666
 DIST gspoof-3.2.tar.gz 69340 BLAKE2B c5769a242d6d388b7606594a01b6543822167505ea6210a05f6a514c47ea875efdea3e81b495b1a635fa15d9a065a35b631b20512b326304e366f692f8a73be5 SHA512 be90aeeb9ac93b5c4a190564ecfedd05ee077afed67696b773cb79949043975807dabed8f49597dcd3b08b9b0ee53c598caa9dced6f97bd9d6170f8e82b8f0f9
-EBUILD gspoof-3.2-r3.ebuild 773 BLAKE2B 20d95afedffdca2ce4f80e9ef8d1722f8fe51bea9894c3c71570ce2a81894c858345a207e0caec4ff64a5c83dc46ffcfd6af777170302a43eb21035e3a611b28 SHA512 07b3e26d609b6df724d0f5c71c463aa34c6bb053d3c2ebd8908e7f35a43b8005ab0ded5db3480dd8c17d87578f868cc44cda363012cbcf928bcf98365a67a87d
+EBUILD gspoof-3.2-r3.ebuild 811 BLAKE2B 05528ca26753b1ffd2adbdc0fecf650f67b9a26906145dc01c216d46a330a2ca6dca83ff608ee70a57d6538508561062edfa331f23012c86a6e685ae8c1eee7f SHA512 5838c5efa100bdbd7fef23449f030ea1a58e56a15a47f04b171a0c2c54f9053c5659351165fe75c56abf860737d711c22bba5341ef5b038bb9a4658dab7783ca
 MISC metadata.xml 248 BLAKE2B 86f5c3602168393b46b79f56b1bbcba7d32ab183eb1a640932bb91b4876e49e1ee407a9a5807f8bb559b5df9ee3c2fdc9fe6f69ec8b1744b7fcf2746a59e96a5 SHA512 d037f260b0d638df2bf9356b7d50974b341eefecd9e45a07b392d7180233299584f4911df4fd427122afd7e49e5f32417e0f2a3a92996450233e58eb51c34026
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch b/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch
new file mode 100644
index 000000000000..c91a54231150
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch
@@ -0,0 +1,221 @@
+--- a/ginclude.h
++++ b/ginclude.h
+@@ -22,8 +22,8 @@ struct FLAGS
+      urg:1,
+      ece:1,
+      cwr:1;
+-}
+-f;
++};
++extern struct FLAGS f;
+ 
+ struct CHECKS
+ {
+@@ -31,33 +31,33 @@ struct CHECKS
+      data:1,		/* include payload */
+      linkl:1,		/* work with datalink */
+      debug:1;		/* enable debug mode */
+-}
+-ck;
++};
++extern struct CHECKS ck;
+ 
+ struct MULTI
+ {
+    u_long number;
+    u_long delay;
+-}
+-m;
++};
++extern struct MULTI m;
+ 
+ struct ECN
+ {
+    u_int dscp:8;
+    u_int ecn_ct:2;
+    u_int ecn_ce:1;
+-}
+-ipv4_tos;
++};
++extern struct ECN ipv4_tos;
+ 
+-u_long shost;
+-u_long dhost;
+-u_long seq;
+-u_long ack;
+-u_short id;
+-u_short urgp;
+-u_short tos;
++extern u_long shost;
++extern u_long dhost;
++extern u_long seq;
++extern u_long ack;
++extern u_short id;
++extern u_short urgp;
++extern u_short tos;
+ 
+-char device[10];
+-char data[128];
++extern char device[10];
++extern char data[128];
+ 
+-u_char ebuf[LIBNET_ERRBUF_SIZE];
++extern u_char ebuf[LIBNET_ERRBUF_SIZE];
+--- a/interface.h
++++ b/interface.h
+@@ -20,47 +20,47 @@ GtkWidget* create_ECNWin (void);
+ /* Define common Widget */
+ 
+ /* MainWin */
+-GtkWidget *iface_entry;
+-GtkWidget *srcmac_entry;
+-GtkWidget *dstmac_entry;
+-GtkWidget *ethtype_combo;
+-GtkWidget *ethtype_combo_entry;
+-GtkWidget *DatalinkFrame;
++extern GtkWidget *iface_entry;
++extern GtkWidget *srcmac_entry;
++extern GtkWidget *dstmac_entry;
++extern GtkWidget *ethtype_combo;
++extern GtkWidget *ethtype_combo_entry;
++extern GtkWidget *DatalinkFrame;
+ 
+-GtkWidget *srcaddr_entry;
+-GtkWidget *dstaddr_entry;
+-GtkWidget *ttl_entry;
+-GtkWidget *id_entry;
+-GtkWidget *tos_entry;
++extern GtkWidget *srcaddr_entry;
++extern GtkWidget *dstaddr_entry;
++extern GtkWidget *ttl_entry;
++extern GtkWidget *id_entry;
++extern GtkWidget *tos_entry;
+ 
+-GtkWidget *srcport_entry;
+-GtkWidget *dstport_entry;
+-GtkWidget *flags_table;
+-GtkWidget *syn_checkbutton;
+-GtkWidget *fin_checkbutton;
+-GtkWidget *push_checkbutton;
+-GtkWidget *ack_checkbutton;
+-GtkWidget *rst_checkbutton;
+-GtkWidget *urg_checkbutton;
+-GtkWidget *ece_checkbutton;
+-GtkWidget *cwr_checkbutton;
+-GtkWidget *seq_entry;
+-GtkWidget *ack_entry;
+-GtkWidget *win_entry;
+-GtkWidget *urg_entry;
++extern GtkWidget *srcport_entry;
++extern GtkWidget *dstport_entry;
++extern GtkWidget *flags_table;
++extern GtkWidget *syn_checkbutton;
++extern GtkWidget *fin_checkbutton;
++extern GtkWidget *push_checkbutton;
++extern GtkWidget *ack_checkbutton;
++extern GtkWidget *rst_checkbutton;
++extern GtkWidget *urg_checkbutton;
++extern GtkWidget *ece_checkbutton;
++extern GtkWidget *cwr_checkbutton;
++extern GtkWidget *seq_entry;
++extern GtkWidget *ack_entry;
++extern GtkWidget *win_entry;
++extern GtkWidget *urg_entry;
+ 
+ /* Info TextView */
+-GtkWidget *TextView;
+-GtkTextBuffer *TextBuffer;
+-GtkWidget *VerticalScroll;
++extern GtkWidget *TextView;
++extern GtkTextBuffer *TextBuffer;
++extern GtkWidget *VerticalScroll;
+ 
+ /* DataWin */
+-GtkWidget *DataEntry;
++extern GtkWidget *DataEntry;
+ 
+ /* Multi */
+-GtkWidget *table2;
+-GtkWidget *NumberEntryMulti;
+-GtkWidget *DelayEntryMulty;
++extern GtkWidget *table2;
++extern GtkWidget *NumberEntryMulti;
++extern GtkWidget *DelayEntryMulty;
+ 
+ /* ECN */
+-GtkWidget *dscpEntry;
++extern GtkWidget *dscpEntry;
+--- a/gfuncts.c
++++ b/gfuncts.c
+@@ -19,9 +19,12 @@
+ 
+ #include "interface.h"
+ 
++struct FLAGS f;
++struct CHECKS ck;
++struct MULTI m;
++
+ /* private functions */
+ int CheckValues();
+-u_short datalen; /* data (tcp payload) lenght */
+ 
+ int Initialize()
+ {
+@@ -139,6 +142,7 @@ int SendPacket()
+    /* BEGIN of variables ' declaration */
+    libnet_t *l;
+    char *dataptr;
++   u_short datalen; /* data (tcp payload) lenght */
+ 
+    u_short sport, dport;
+    u_short flag=0x00;
+--- a/interface.c
++++ b/interface.c
+@@ -27,6 +27,47 @@
+ #include "ginclude.h" /* define payload and multi options */
+ #include "common.h"
+ 
++GtkWidget *iface_entry;
++GtkWidget *srcmac_entry;
++GtkWidget *dstmac_entry;
++GtkWidget *ethtype_combo;
++GtkWidget *ethtype_combo_entry;
++GtkWidget *DatalinkFrame;
++
++GtkWidget *srcaddr_entry;
++GtkWidget *dstaddr_entry;
++GtkWidget *ttl_entry;
++GtkWidget *id_entry;
++GtkWidget *tos_entry;
++
++GtkWidget *srcport_entry;
++GtkWidget *dstport_entry;
++GtkWidget *flags_table;
++GtkWidget *syn_checkbutton;
++GtkWidget *fin_checkbutton;
++GtkWidget *push_checkbutton;
++GtkWidget *ack_checkbutton;
++GtkWidget *rst_checkbutton;
++GtkWidget *urg_checkbutton;
++GtkWidget *ece_checkbutton;
++GtkWidget *cwr_checkbutton;
++GtkWidget *seq_entry;
++GtkWidget *ack_entry;
++GtkWidget *win_entry;
++GtkWidget *urg_entry;
++
++GtkWidget *TextView;
++GtkTextBuffer *TextBuffer;
++GtkWidget *VerticalScroll;
++
++GtkWidget *DataEntry;
++
++GtkWidget *table2;
++GtkWidget *NumberEntryMulti;
++GtkWidget *DelayEntryMulty;
++
++GtkWidget *dscpEntry;
++
+ #define GLADE_HOOKUP_OBJECT(component,widget,name) \
+   g_object_set_data_full (G_OBJECT (component), name, \
+     gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
index 81f4bbad8ce7..0dc610e0e3d7 100644
--- a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2-r3.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
@@ -12,8 +12,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-IUSE=""
-
 DEPEND="
 	x11-libs/gtk+:2
 	dev-libs/glib:2
@@ -22,9 +20,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-def-values.patch
-	"${FILESDIR}"/${P}-icon.patch
-	"${FILESDIR}"/${PN}-3.2-libdir.patch
+	"${FILESDIR}/${PN}-def-values.patch"
+	"${FILESDIR}/${PN}-3.2-icon.patch"
+	"${FILESDIR}/${PN}-3.2-libdir.patch"
+	"${FILESDIR}/${PN}-3.2-fno-common.patch"
 )
 
 src_prepare() {
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index e673774da80c..75d585380f60 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -15,6 +15,6 @@ AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0
 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 1595 BLAKE2B 012c23455fecc64b36fb412ac9fc3f96efb744ef7b218e2cd8ab7dc9046c2a8c2a1f68fdf466036bd3c04e6c7dc4246fef946cea815ec3bd914145634c17a64d SHA512 e77b0b7b3fc82dcff5a4f1e430f9f75f5f5d74a21177711497b4d8ff3a7a1e14959a6a21c7f5cf6aea21822794528f7ff54c1d6d79bbaddf1cd57d48b6bb3233
+EBUILD hping-3_pre20051105-r6.ebuild 1596 BLAKE2B 98a30f9e86a119a7f66793717074e18d9b1510e258e1d5be53054ca2b385b18ff8ba2d5806a28a2f203d469c33d97acc852d7c0d1b8b43ba564ebbdfe941f840 SHA512 1b9d3783ecdd143a46c254bcd5a021b588d75b7431b64503ac29b54cf1c4b876592bcb856cb8ed2788e8f9b10288b066c2ec10873dc715ca6fc5a40388504b30
 EBUILD hping-3_pre20141226.ebuild 1570 BLAKE2B d383f47c10f3d2efca53240ee7adc07b2a552112e4086598bacec34c7b3e4ebcd1b04bc5a65dfafda1f9fd8ea251aa296c663b2a9188de170f359766d5062af7 SHA512 c8c10c3d93ef8b94222a66a4e87ca282e3154d091cff24a85877e80fc2e190f6dce427310e0f0e00d4ebec204d1905039cd79b5951e94c7ae25d930bd642fdac
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
index 37f6833041af..796be56c9934 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86"
 IUSE="tcl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 8b31fc846bab..b100136dedf9 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,5 +1,5 @@
 AUX httping-2.2.1-flags.patch 161 BLAKE2B be0f5f8df2fd89f46f15b3ef6c0c06e9f04573a822a6ce6e559471e3db586d69de0e440e3b9c4f401f30ab741d9eb85077ead8d3f9d4c026e7398609602f7c2e SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6
 DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355
-EBUILD httping-2.5.ebuild 1427 BLAKE2B c0bfff58030fbe28b62c354620d7cf0f5969ee90ebe61bbd8256bf8d79f52d7238ff3f12d89ef01344c15a65de3bd8a15c2f842e2fae39439a01fd5e71befd20 SHA512 ce9773a573a634e04f0f174e9eaec483084d4e0106ed23261c8a33e2a9b836c0aa9f43f1b4f7bd9a6b13ae5bbc3e3f0d4fa0d15d13aa2c326381097cb6aad30f
+EBUILD httping-2.5.ebuild 1428 BLAKE2B 77b40c43c97804902ce94b28f83609e82422ab21e24ed34d9c3ac9311feff5aae2124c93b5de4c76dc30c468c5dee76f216ddd1174e496a71ed3901198c7c392 SHA512 62a92641c16ec8f2c53b6fc118072e6eea2501396b4637a3710085665249b0c01db1772800681fa1455d458d466282a41b91eb618930ac44f1fa979478ba7f64
 EBUILD httping-9999999.ebuild 1382 BLAKE2B 83dd9fea5843d43c1fe09cbbbd16e4056e6328bac8bcd5f78a9002b52ffbe0303cf529156532a2fa5548601ea44558abbe36c1c8c0b40b1fc6aa09318131b5c9 SHA512 43b214c43ac7a7d1aab26afb168ebc980930f721599d793638f8e8a53ff806220cc48b67003a64ada4f59ba9cfc0162458db1d22182a0d927e51fcf78f2d0f70
 MISC metadata.xml 344 BLAKE2B 7a460cc6d5df200cd57028b8e773452df890b91fee885c1337c7d9470acb38611f70bff7b0ff37f2854d304b1a8c1da5cbf219971dac72cb5ea536ba60d906f5 SHA512 3a2c114ecfba2e62b28c1a2ddb96bf57d73dda9c9dc50070c07beabbee711b37a560a71230b5a3ec8726b4d394674dcbb5943b33a62daed0c267e774b5ccbce7
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index 4f2b970f4c7f..b4f856e559ba 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo"
 
 RDEPEND="
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index cfafb20d47c3..c19aaff461f7 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,5 +1,5 @@
 AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b8d9e120e698f1831e65b6d65ff7175b7cfe91cd58f117df8ac64eb05b17820ca963c078855989a5820b1d5da2c SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
-EBUILD ifstat-1.1-r2.ebuild 674 BLAKE2B 8e7540501ad5ee32209ab267e1c70bf7d02aefd9ade064bfe662afaeec8a518cd8c2ad4218080d924cf798c7dde71590a8ff7439e39b60048f0cb4a731770379 SHA512 bb9d65936a13b3fe2c4983fa777723b4ed3826a218a2b1e08b40a8d86c60af23679667c177c89e84f136aaf32b9b2f4d4429a297c429c601681a87006c3ff2de
+EBUILD ifstat-1.1-r2.ebuild 675 BLAKE2B 68dd58ffd07dbdf52a6abd89fdc527f51b1c0bcf8896d8599e42ff56ee3b2f25465a120880140d7e98f8bc5e51be252511dc5ef71dbc6dc9fb2ecc0714252bd2 SHA512 4267310e3125f76fda4565fb419af4eb44e9e341cc2cc01d3d199032566267bbdcd6811c145ff7e9f8db6f8707223822d27b0ee1e24556f44fa81639c70157ac
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 42600860feb7..616e7250a9ca 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="snmp"
 
 DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index d9701255b8a9..788b00befeb4 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 1101 BLAKE2B 3920c705944d92899631b3ea460c77e6f2971d6dab0a0bcd5a937cd5c4c7539b5455165591d32e34342fe6e99f40ac371e74ff87f4206c775ef6385d8fd89f72 SHA512 97b4e382d2dedc6269997c057fe3788d9dab07fe5c5431469e21114eab38f1b15e7838d74d4354c0ae05be1e24491135c53d10ea553c8cc85cd35954ba238b11
+EBUILD iftop-1.0_pre4-r4.ebuild 1102 BLAKE2B d3ffad38b5cce025e79204a51037e480ef4fa0412a76b016f34618a7fa1d74f89d08db9dab68a03c22e1f8f71e3621a51dd2e1337b997505d0c1957b8574a218 SHA512 447899d4923508953844aa03cba6cf2d5c06675320dcf6a2aba5f11c43a8976b69049ab9f226413142845b43e56d6494defd44630e06a2103d03413eab485f70
 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 c74ef3a497fa..e46376dd33a4 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -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 ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 806cef501299..0466c71e1245 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,5 +2,5 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
 AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
-EBUILD mrtg-2.17.7.ebuild 1015 BLAKE2B 64e6a1cb49e4b446ecfedb2cbc48aff1be8ad1ee5806962794f65e0954c9c4e90a0f61ae064977e73fd1aba934384aa9c7e73a56531934d3326433adf073c531 SHA512 6f88bd77c9e08acfd1aa81b968a2f5b7eec1833657c2054a3b31928b9d39852a3241dd311c164805ad035efdc75631682799fab0a33991843ab0d17b39f2a795
+EBUILD mrtg-2.17.7.ebuild 1016 BLAKE2B 2097931fe97d50d9fc4acbe205dc5f2628a2c41a8b36d90ca592fab019844edc75c09723129f691b5a68e281c3cefa326460fdcc57d6d4372481a484e8cadf70 SHA512 4cfef68802b76230010c8624ee8e5bbd2490b6bfacb0b4b518639ec6293faf12b6a16a1f96a64fa1987c7ae743488e7a163d210b6e717171f10488d4847ed9c6
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
index b7136c69d4d7..0f9883018fc0 100644
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index fc53a216ff1c..d1110303b4e2 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 1389 BLAKE2B 165b9a35094f2a1ea4adf246b79335e97310b7633a0aad75997dbc22a2a9f7e9b94f09c9395b68fb49e9c34e2ed2da48a9c63a84d0e879216e3360b1870915a6 SHA512 e0a6ece96b0302de707a498421e12ff106b90ffc82f3a2366a6325d837e240bab832e33dfb008f8ed21abd66f68d747baf059190760199a77de8d8fb28f0e914
+EBUILD mtr-0.94.ebuild 1390 BLAKE2B c95c3d5ae610411f6fc1b1387330c9962fef76e330fbb79da725b9f730cc9e8b67b96a152b2468674d384c36e7379055c01cf16406dcb4b6878dce16c3fcf096 SHA512 19390bc6f71ad175d159dc6a117c5354b085f09cddcbf8f9d5c696ee7290c18fc936c77a0cc0b11ffee04ae8d3cd4714a92841f0e6ca50c01b219b3bce236574
 EBUILD mtr-9999.ebuild 1241 BLAKE2B 5c4b500e1ef1995947154e627d262b79ca135a6ee6c231e2f865b955952bb5f968f227d82f9a4217d963b4387a2afc379ef46c90fc88c43eff227676b34e78e7 SHA512 e954551e3a37dfca502d2c76e77134193ae7cdba68e74dd755a1f853ddbbe274488bf7bc758711805875f06e80e1790b638d2adfb247421c06c0aa706b9bb163
-MISC metadata.xml 556 BLAKE2B 23e3fd72b2360a5a1a5361df09a8116a70ed178a2e1367c21e7ce77b4f8956a521b8ffb69719eeca673e5766aa8733623baa579a8998adcf884e29a850bdeaca SHA512 a61448154f21ee3870c53bf3877cfbbad543fa11d9e0d1a4579cdcb18215e46129993df0dec9e01c97e76915ecb052c3f16e4c19cc85ac0f21c19cc4d45f71e1
+MISC metadata.xml 636 BLAKE2B 6ac1437dc7b42ef712ad3a851f6dc8df59f7a354e99db5bf564c91f90786a9eb3e90d2d131592047e5499eea5e5238150525e61ddad1a5ca72c594edc7c8f9f8 SHA512 85a0425e6ac71a544d6a8a0cbf270e77afd6dd41ed226650b122977b6288dee8d894c30d6c31425dc15d2b58d19d87050bf28320553a1993dc4f28184fe61aa9
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 2d3a67d433c3..88e5dd2b473f 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name='ipinfo'>Disable support for IP address lookups</flag>
 		<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">traviscross/mtr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
index a7ecb2677259..7f9e0050a0cb 100644
--- a/net-analyzer/mtr/mtr-0.94.ebuild
+++ b/net-analyzer/mtr/mtr-0.94.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos"
 IUSE="gtk +ipinfo +ipv6 jansson ncurses"
 
 RDEPEND="
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 8e2ca08d7c1e..1d1e29e95efe 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,3 +1,3 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
-EBUILD nagios-check_rbl-1.4.1.ebuild 1482 BLAKE2B d60deef215ee2461f1b2c70a5b939ee7c3ae179029db52b04ff1fe6dd22c2b6c3e2a856845fbb2ab2b65685c1501a838db12c0f680588e3585f11d6a32894a77 SHA512 5d9f00eeeee652913c3a513f4d295d6c7c8d44d3de5ceb768b9322bd1c69c0e62af35b481bebaea59ee26d749ed1143f8a2f51fa7faca91c22c8249d13dab209
+EBUILD nagios-check_rbl-1.4.1.ebuild 1483 BLAKE2B 225aa6cbc698bdc7e6346195e896277dcd2f71730d28fdc4274b30573c41bbb7ec644d8f5804765fd93b71cd2f8e1b38643314498a761249b655648ad1587c26 SHA512 da8f812cec89631714719ad52fa7b065915b3e02568001e2bca277ee9a4556d74f8c6c1a6888a2ec13bc3d55cad9cce98af850e8cfddec1bd508da92047e2380
 MISC metadata.xml 468 BLAKE2B 31fa2c6ba1b1c2860f89c7f1442fb0388e7285183f28e9656576e8c13bbb05298a9bd13dc78ca9bcc1ce47401eb1c83d56786c1f37481e351d1d0e9b32713986 SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
index dad8c4b7918b..8f6e17721ea9 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="amd64 hppa sparc x86"
+KEYWORDS="amd64 ~hppa sparc x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
index 9a9aa4f38183..bec87e1e6816 100644
--- a/net-analyzer/nagios-plugins-snmp/Manifest
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -1,3 +1,4 @@
+AUX nagios-plugins-snmp-0.6.0-fno-common.patch 2557 BLAKE2B 66e77015b81449bfa13c422af4eb5e110fa7650b08f09877b23f96ffd8715655a9851786225e545cb2260f11e3b0338d1d799148e5bdaa1ce3157630005dae4a SHA512 7809f8fa2cbac92ed0bf34d2de954d91e2a21a3e54e3593fb2e9e4bce0f6fe86853a81c7cc403fffe3a890f403a13e86ad87c9f90845178e051a8911b4a1c1dc
 DIST nagios-plugins-snmp-0.6.0.tgz 381664 BLAKE2B 1a6124b5aa194123b17a1ce98a4e023a8d71f70a6c5ae61b8b54b204050f7914f100e1e639630955e45905f86282cab6a7034e5927b3db5b609beb315a66c748 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529
-EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 864 BLAKE2B 65cf2b3b42dfb1e241071480e90207adbe4c57b6baeec997b853af93e1ce24a017dff5374f98b5f48396e623ff93ee81f4463109ca799b6f3deb39b423ab05a6 SHA512 f1f1a2eb8695d2dea00e6495fd3022fd4827533cb0958aaee49ffaf51325341ad7bf0deee6f27ae9a9c87ff545eaef73a9e17ab43a055271c45a4706b7ff49ea
+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
new file mode 100644
index 000000000000..5fd2ff1c2351
--- /dev/null
+++ b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
@@ -0,0 +1,83 @@
+--- 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 );
+--- 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"*/
+@@ -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);
+@@ -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>]"
diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
index 6eb4daae21ea..005fd81aef64 100644
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -19,7 +19,9 @@ DEPEND="
 	net-analyzer/net-snmp"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/nagios-plugins-snmp"
+S="${WORKDIR}"/nagios-plugins-snmp
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index b512dd4070f1..18a493e0f975 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -15,6 +15,6 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r2.ebuild 5666 BLAKE2B 8b7ab8cdd193ac45fa4b062c8b431e58e68726f6a3d25bf0ca93e8e9c57a34c0a27c8f6754821dfdb352d6ef3de0825ec6290bccf98faacc1f3b65af60afbffc SHA512 ca456df45a171fa900255773dac673997d50dc5061f84a3652fb4952d9fd8fb9b4fbb82c1834a4a6f7885d0faebead5033c7be99dabc7cfe1ccec63462caaea3
+EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 974411083d53abdc83237f4d33151bcb994c98e4c43fd5f38da1b777c305fba3fbf58c725156ed4a39b1bc7e6dd1b5d7a06057c3a3f3eba7767744daee590638 SHA512 713c10f2ecec85894dd96dcb6586e6828606f9a3dfb119ab030096f1585d1c206221efa10427a3bc6102bd8351a76b89675048ec5bebc69b0ef9bdff30c2b23c
 EBUILD net-snmp-99999999.ebuild 5667 BLAKE2B 96a45e763d4cd9e418288be6b86fb6884c3c05f99c8f01fac296b48af35cba79199eee4e5bb3984402c5847b9a8f91d7cdcfcb2164f6d6564dc06d93914ad751 SHA512 c08359fed122095229bea052ecad54a07228a862d532aae62315a5d7c563f7e02556d814cb5c97900656ee2736becc92e7b7fb3248f4e78bc3470b1586a9f91d
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index bca96ebda9fe..c83f4f58bfd9 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="
 	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
 	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index d060ae264de4..723772896685 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 1622 BLAKE2B 53be7631ddadb9fb50a84cb08154e0c30a64f72fecb65874e43ad23387a755767a1e9e817761433b786c5d7ef66aeebc13ee8710828a7c5557573b66d38ebefa SHA512 e1786e76851597d5d394b59a475c306a7239036c2504410062ce2b2b0e42e86e92281f805c5e27dbb91ebe1306f7ba2393c7aa7b7d3179da298792129182148f
+EBUILD netcat-110-r9.ebuild 1623 BLAKE2B 75cc0da4b3bdf527a322ddaee028386a5438f0af98eb40c6815bfefb2e634bceb6b35a99120b23c4b19fcb039f2669cf3aeb3ce9dc01869621d6bdc9a8956ae0 SHA512 518e9027a6dd8e42a36741011a0df538646478084e09a1a48f6f9363c3691ef7aa4df7b1b9290081e2d93a4550ef32a206e531e2d05e64ff4829dd754e375997
 EBUILD netcat-110.20180111.ebuild 1272 BLAKE2B b58aad81ff3d298a022954308c3b8e7405fe8542b5f658fb57331919406e2a682fb66455c19f319c41427d01619ec88c4bfa6278b595029e24f1e6fc7f560c25 SHA512 3e05c4a06f4a44ef0a2c8e36c26be838420d127226c36644b3b7cd6b25c122f5b19cdbd767e343313498ebc6ffa14e43ceef94c0132127b30dcc87037ac97d0c
 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 b2f2de36b879..3e36674e8555 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -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 ~x86-macos ~sparc64-solaris ~x64-solaris"
 IUSE="crypt ipv6 static"
 
 LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index c794d7e9c050..799325c05985 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 698 BLAKE2B 6723766eb7a9bd1382dbb9022d17a156260969b555ff88e399e991a0b2adc3e4c4f14608458589dc8817cee359fff4342b4c424ca368f11db9f63abb7263ebe1 SHA512 4986410752cf81aff909b5bed208943cd7de9b94933b3590237633f4df61b5d7ab374359ae8f1c0850d8f1b948d04ea0ab60b7451305c63d708adf204fdfc181
+EBUILD nethogs-0.8.6.ebuild 697 BLAKE2B 5f281603dd5005a0e39e4b58204cd959ab199d1c96cbc4840bb93703bc1fac5cbbe4189afdf7af869e6ed72b28a7f3b26e31a63a04fa7d11998ab2c70988fdb4 SHA512 c884aa2fb1dfa4a801acaed65ce39a93fe1f2f66ef28b6f9349152f596ce81a920ebe77be747a6caec69fcb9ade96364eb12f4aa9fc38ace5ea70d391260d0bc
 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 da998020a028..b24bab4c9213 100644
--- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.6.ebuild
@@ -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/netperf/Manifest b/net-analyzer/netperf/Manifest
index 664faaaa2e45..9ba9a9f69c6c 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r2.ebuild 1942 BLAKE2B ffb7d91533bab5dccbd85fb5570dd36ba32eabaaac83e7c8c17b5909c360497fc1b9a13313e992fad35a7e1b18d8f01adfb5becf34f875de3660cca51ce388f1 SHA512 f683a1642cacf6b355ac1fe071f3e993eeb4fdbf27e03e07698fa1ee2bfda3dd7b6da02c098eae79c0c2806aae960a44d37c012ae0721a1f8e5b41c16830d228
+EBUILD netperf-2.7.0-r2.ebuild 1943 BLAKE2B 09ab67995b1b46e7d1295aad62e05765c84ccde2bbd8cda9b24794942719b41f0c56a1167a2c2f3330186f53b23e4a33ac0bb34bc4874677d72d3534f5344026 SHA512 b1dacc7084488ca34af4771d9d6c3b07c43b003625c66108df54ef775410e2ec9fbbf452572c0920fa13e4b9b6aba3e0ed3dd24e78e12de8390a3aa3571caaf3
 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index e82ad712e781..ac656a889e76 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic user
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index bd0991d34106..5c81417a025d 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 968 BLAKE2B 4b8bb4045b93ef3a94f1eca91c5bcfa48e1745cd9c7c0535bd03bc3751143115cf1a3ad0e0c1af0d837c22fa68632cba395c06e4a487af3fbe209dbe1f9a77cb SHA512 0064cceb23d9a056e06dfe2acb326f11e87dc399f17773ff07397ba0ced25d9981a02189e6ca8ac2b4ee9c084e8fc4423af847c2447cf0a2bef54c29ae4d354c
+EBUILD netselect-0.4-r1.ebuild 969 BLAKE2B 0d858ad36a4dc512e6e2a9adf458d814a24ddc11987220de50521d2c4becd06f315341c7666604960eb3cfe23339490ea0f4e090c5ad50e392246eaefe6ac22c SHA512 2963cb6e195b9a2659b7b0fe65dcb2da98903a5efd30f48c25ad7ac29ce82df0a13ff8f80a5024e8d29e98a60f59655a6db44f0e91c02521a19d4a6fcbb47cfa
 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 bd049d48552a..8cdec08646af 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -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 ~x86-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index a24a23bda19f..4d8abde1e0d8 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,7 +1,4 @@
-AUX ngrep-1.45-build-fixes.patch 4778 BLAKE2B 058c0414edf1c37efd85f00a38d41d27ceb65e4f4c5e7636f6133964cd8fb75d66f02a45844cf56a8822d321d7937a5f3f8cdd99f85b79fec335c9d02dde75d2 SHA512 5e11682d6b360e96840135d8963bdf4c9bf5def0bd38ba716ce201c7bf9b5ce787338f2cff86d38318e0356d9118fde6985ed9a71728549842577ecdb3a5011e
-AUX ngrep-1.45-prefix.patch 575 BLAKE2B 1d5933c457507bdd10662005dac7a14a1b78d221f126a8cc33d0d952b81b10c936a86b83471be76219445d9332ea165a0fac3d3e6f37ae15096fef337ece404a SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc
-AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab723b23840ae5d1c460431b06777b0b691760854bf3fb64a72dfec85aa1b8110558f0037981f10a674cd53428ffb SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
-EBUILD ngrep-1.47.ebuild 976 BLAKE2B ae6431ab7b83c039dc2bc83adf85ad77b36e2191e89362a259dbd66649898851b086553fb05e2e85fa01991baaee54cbb678deab0f49aaf38addf4a91f83865d SHA512 ec26676f4873a6ef973b96c3668f92b99e29932785b9c8850b7847664512552f47ba253983047a18d558a2e1af8650a1ad5bfa94a31f180a4c05e9e53adc07cd
+EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
deleted file mode 100644
index 9cde0f81926d..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-This patch fixes a number of problems with have with build:
-
- * more clean cut off pcre library; we'll never use bundled pcre library, so
-   some autoconf added REGEX_LIBS to pass correct system libs and header change.
-
- * We use AC_CONFIG_SUBDIRS to pass make autoconf reconfigure gnuregex library
-   - this way ./configure will be called correctly and correct comipler will be
-   selected automatically.
-
- * With the previous change some modifications were required to make gnuregex
-   buildable: a) we should not overide CFLAGS in Makefile.in (as they together
-   with -DHAVE_CONFIG_H will be passed to gnuregex and it'll fail to build,
-   since no config.h exist) b) obvious way to remove warning "_GNU_SOURCE"
-   redefined
-
- * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug
-   #178684)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,7 +7,8 @@
- 
- CC=@CC@
- 
--CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
-+# Never redefine CFLAGS, as it pollutes env and gnuregex build failes
-+EXTRA_CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
- INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
- 
- LDFLAGS=@LDFLAGS@ @PCAP_LINK@
-@@ -34,25 +35,25 @@
- 
- REGEX_DIR=@REGEX_DIR@
- REGEX_OBJS=@REGEX_OBJS@
--
-+REGEX_LIBS=@REGEX_LIBS@
- 
- all: $(TARGET) 
- 
- $(TARGET): $(REGEX_OBJS) $(OBJS) 
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- debug: $(REGEX_OBJS) $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- static: $(REGEX_OBJS) $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- install: $(TARGET)
- 	$(INSTALL) -c -m 0755 $(TARGET)  $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET)
- 	$(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR_INSTALL)/$(MANPAGE)
- 
- .c.o:	
--	$(CC) $(CFLAGS) $(INCLUDES) -g -c $<
-+	$(CC) $(EXTRA_CFLAGS) $(INCLUDES) -g -c $<
- 
- clean:
- 	make -C $(REGEX_DIR) clean
-@@ -63,7 +64,7 @@
- 	rm -f config.status config.cache config.log config.h Makefile 
- 
- $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
--	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
-+	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
- 
- $(OBJS): Makefile ngrep.c ngrep.h
- 
-
---- a/configure.in
-+++ b/configure.in
-@@ -124,14 +124,16 @@
-   use_pcre="no"
- ])
- 
-+REGEX_DIR=""
-+REGEX_OBJS=""
-+REGEX_LIBS=""
- if test $use_pcre = yes; then
- 
-   echo 
--  echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
-+  echo 'Using System Perl-Compatible Regular Expression (PCRE) library ...' 
-   echo 
- 
--  REGEX_DIR='pcre-5.0'
--  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-+  REGEX_LIBS="`pcre-config --libs`"
-   USE_PCRE="1"
- 
- else
-@@ -144,12 +146,19 @@
-   REGEX_OBJS="$REGEX_DIR/regex.o"
-   USE_PCRE="0"
- 
-+  AC_CONFIG_SUBDIRS([regex-0.12])
-+
-+  echo
-+  echo 'GNU Regular Expression library is configured...'
-+  echo
-+
- fi
- 
--( cd $REGEX_DIR && ./configure )
- 
- AC_SUBST(REGEX_DIR)
- AC_SUBST(REGEX_OBJS)
-+AC_SUBST(REGEX_LIBS)
-+
- 
- 
- echo
-
---- a/ngrep.c
-+++ b/ngrep.c
-@@ -92,7 +92,7 @@
- #endif
- 
- #if USE_PCRE
--#include "pcre-5.0/pcre.h"
-+#include <pcre.h>
- #else
- #include "regex-0.12/regex.h"
- #endif
-
---- a/regex-0.12/Makefile.in
-+++ b/regex-0.12/Makefile.in
-@@ -18,23 +18,6 @@
- 
- version = 0.12
- 
--# You can define CPPFLAGS on the command line.  Aside from system-specific
--# flags, you can define:
--#   -DREGEX_MALLOC to use malloc/realloc/free instead of alloca.
--#   -DDEBUG to enable the compiled pattern disassembler and execution
--#           tracing; code runs substantially slower.
--#   -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
--#           the corresponding C procedures).  If not -DDEBUG, the macros
--#           are used.
--CPPFLAGS = 
--
--# Likewise, you can override CFLAGS to optimize, use -Wall, etc.
--CFLAGS = -g
--
--# Ditto for LDFLAGS and LOADLIBES.
--LDFLAGS =
--LOADLIBES =
--
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
-@@ -43,7 +26,7 @@
- 
- SHELL = /bin/sh
- 
--subdirs = doc test
-+subdirs = 
- 
- default all:: regex.o
- .PHONY: default all
-
---- a/regex-0.12/configure.in
-+++ b/regex-0.12/configure.in
-@@ -34,4 +34,4 @@
- 
- esac
- 
--AC_OUTPUT(Makefile doc/Makefile test/Makefile)
-+AC_OUTPUT(Makefile)
-
-=== modified file 'regex-0.12/regex.c'
---- a/regex-0.12/regex.c
-+++ b/regex-0.12/regex.c
-@@ -34,7 +34,9 @@
-   #pragma alloca
- #endif
- 
-+#ifndef _GNU_SOURCE
- #define _GNU_SOURCE
-+#endif
- 
- /* We need this for `regex.h', and perhaps for the Emacs include files.  */
- #include <sys/types.h>
-
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
deleted file mode 100644
index 8618f5daae31..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* refrain from doing an absolutely insane check (to see if pcap is
-  installed in more than one place)
-
---- a/configure.in
-+++ b/configure.in
-@@ -268,10 +268,7 @@
- 
- AC_MSG_CHECKING(for a complete set of pcap headers)
- 
--possible_dirs="`eval echo -n ${includedir}` \
--	       /usr/include /usr/include/pcap \
--               /usr/local/include /usr/local/include/pcap \
--               /usr/share/include /usr/share/include/pcap"
-+possible_dirs="`eval echo -n ${includedir}`"
- 
- AC_ARG_WITH(pcap-includes,
- [  --with-pcap-includes        specify the pcap include directory],
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
deleted file mode 100644
index 8789e5b8c76b..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Call setlocale to make isprint() decide what's printable depending
-on the current locale.  See bugs.debian.org/307496 .
-
---- a/ngrep.c
-+++ b/ngrep.c
-@@ -97,6 +97,8 @@
- #include "regex-0.12/regex.h"
- #endif
- 
-+#include <locale.h>
-+
- #include "ngrep.h"
- 
- 
-@@ -195,6 +197,8 @@
-     signal(SIGWINCH, update_windowsize);
- #endif
- 
-+    setlocale(LC_ALL, "");
-+
-     while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
-         switch (c) {
-             case 'W': {
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 641f886507d9..6ca8a342aa3a 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 3c74e917bd24..5c29a3e5458a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,7 +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 3280 BLAKE2B 1b3d8c48bbade2616fd4a53ab89fc968fbd8e4ffa31700ba66c6592270bb38dd665a309d8ab1f51f80d6e5e39d6abc3e5b70e206eec1d37144496ecb4df8a87a SHA512 c7e22900976d09f03403250b2edcc51a840129a2fa3c4aef9632369c43f1bf81e36ae87b52a96d9fac3db6aba0aee518bd0e7ba9f3ad6cbf520c84d3122883fa
+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-9999.ebuild 2600 BLAKE2B 4083277666f8b3806e35b4d9abc5a85a1df81cb37d5dc2abf5b1fed0d46fdbee5bc411523ef273ebd9363a0bcbec539ca9028ea6db1d1c6e07dd15710c76aed7 SHA512 61b17ca127dd806c5191a07c58fd35379db5fd2f5878f513791b9cca2ad703c7190e3db900e5360c8c7fa441dbd38df9cbfeafaf4be0f609aef0da4ddc540ecd
+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 baade24ff440..a70d5648057b 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -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 ~x86-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
new file mode 100644
index 000000000000..7b40515497d4
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools desktop flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+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"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+)
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		--without-ndiff \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--without-zenmap \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+}
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
new file mode 100644
index 000000000000..3b611d01445e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+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"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr \
+		--without-ndiff \
+		--without-zenmap
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 00bb4385aaa9..782f91bf13e1 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -11,8 +15,8 @@ EGIT_REPO_URI="https://github.com/nmap/nmap"
 
 LICENSE="NPSL"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -27,7 +31,7 @@ RDEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -44,6 +48,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -75,7 +83,7 @@ src_configure() {
 		$(use_with nping) \
 		$(use_with ssl openssl) \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index d6e4d0ca475b..fe7e12d281d4 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,6 +1,4 @@
-AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16
 AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029
-AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e
 AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee
 AUX ntopng-3.8.1-PKG_CONFIG.patch 2994 BLAKE2B 4ff178522c28f93d19550080e1338970413fa5a25dfcd4745fc3ab8a8ccb27166771285e68ee1b47353b610121630cd62c1c1c9b8672e5b59d13957185ca7ffc SHA512 77516304306ac66e6d691679209a9a93ef481c38a6eab4681430cf5864387664389e016ccab6106f576c90dfbd398b9f8711be61783c05017bf3c1dd1e99905c
 AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62
@@ -9,9 +7,7 @@ AUX ntopng-4.0-ndpi-includes.patch 388 BLAKE2B 59ad343a40c9a0034c4d3fdaf16b0e5f1
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
-DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
 DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9
-EBUILD ntopng-3.8-r1.ebuild 1729 BLAKE2B da6fc2d159813ca2505dae2bc82038fcc7831768adf03d2cbce74ef7ee9fc8268953819641015e0a98550b3ef19e7f42cb63da7c19e6e0f1edf6139f0326165c SHA512 3d71d06d03a0bb2c67be93701cb5a13058d50b029bc1a9f80d630fc687742dbfc7054be34a73c9c4f2f457c44692cec076b4d627a8f6d8b02d06352a4921d39e
 EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3
 EBUILD ntopng-4.0.ebuild 1916 BLAKE2B d288cc2f2b096a377a00a8814541e79a5328589f43963e118ccfd42c938fca1a7c684b769a81b2753ee2ab9c6431ee425d4d190444767a4b9059ceb6ebb64278 SHA512 37d3c01d11f761d2baec2047e52186a96ba7157cd11857eb7c1198bd6952994e6f1c37d12a20718d4319ac4b294a65dbb2bb96b3c7da0bc351d929769fc1e118
 MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
deleted file mode 100644
index 303826a918df..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
-+++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
-@@ -31,6 +31,7 @@
- 
- #include <new>
- #include <string>
-+#include <algorithm>
- 
- #include "tcp_connecter.hpp"
- #include "stream_engine.hpp"
-@@ -207,7 +208,7 @@
-         options.reconnect_ivl_max > options.reconnect_ivl)
-         //  Calculate the next interval
-         current_reconnect_ivl =
--            min (current_reconnect_ivl * 2, options.reconnect_ivl_max);
-+	  std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max);
-     return interval;
- }
- 
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
deleted file mode 100644
index 1308a5c2c03f..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/NetworkInterface.cpp
-+++ b/src/NetworkInterface.cpp
-@@ -1604,7 +1604,8 @@
- 	  ndpi_protocol icmp_proto = flow->get_detected_protocol();
- 
- 	  if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) {
--	    ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto);
-+	    ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr,
-+					   ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto);
- 	    flow->setDetectedProtocol(icmp_proto, false);
- 	  }
- 	}
diff --git a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
deleted file mode 100644
index 37e007de41ea..000000000000
--- a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools user toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/sqlite:3
-	dev-python/pyzmq
-	dev-lang/luajit:2
-	dev-libs/json-c:=
-	dev-libs/geoip
-	dev-libs/glib:2
-	dev-libs/hiredis
-	dev-libs/libsodium:=
-	dev-libs/libxml2
-	dev-libs/libmaxminddb
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	>=net-libs/nDPI-2.4:=
-	net-misc/curl
-	sys-libs/binutils-libs
-	dev-db/mysql-connector-c:="
-RDEPEND="${DEPEND}
-	dev-db/redis"
-PATCHES=(
-	"${FILESDIR}"/${P}-mysqltool.patch
-	"${FILESDIR}"/${P}-ndpi-includes.patch
-	"${FILESDIR}"/${P}-missing-min.patch
-	"${FILESDIR}"/${P}-ndpi-call.patch
-)
-
-src_prepare() {
-	default
-	sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
-	doins -r httpdocs
-	doins -r scripts
-
-	dodir ${SHARE_NTOPNG_DIR}/third-party
-	insinto ${SHARE_NTOPNG_DIR}/third-party
-	doins -r third-party/i18n.lua-master
-	doins -r third-party/lua-resty-template-master
-
-	exeinto /usr/bin
-	doexe ${PN}
-	doman ${PN}.8
-
-	newinitd "${FILESDIR}/ntopng.init.d" ntopng
-	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
-
-	dodir "/var/lib/ntopng"
-	fowners ntopng "/var/lib/ntopng"
-}
-
-pkg_setup() {
-	enewuser ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default credentials are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
index 4d5ef21c2327..338ba9e5cb0b 100644
--- a/net-analyzer/ossec-hids/Manifest
+++ b/net-analyzer/ossec-hids/Manifest
@@ -2,4 +2,4 @@ AUX gcc-fno-common-3.6.0.patch 11832 BLAKE2B ff5da1e79f7e736058c3405735e6bc7992b
 AUX makefile-3.6.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88
 DIST ossec-hids-3.6.0.tar.gz 1921753 BLAKE2B ca33a94d09265c94dbdb99e2b9637d1e062f39ab88837a5c8f089d64a6369c1bef1e010b18ac4713cd4965dcf189bb1c2866fd33813cd94ae34ac04182070580 SHA512 1f5e897de757df264dfb56def74b7d8f886b6b9d772b5b3d0197c9cd00a32fd7fd8a7b53566851fea3cd74d433b5594cbd074e50b7dbe36305fb3c243e8ddcf5
 EBUILD ossec-hids-3.6.0.ebuild 1850 BLAKE2B 275d43bbf74a67c452107844e83ad6adffa185d7be986420d824465a025e6dd53ef75dc9a6902dc9ed8be3ab2c61485e733b0cf8af9c492663ec89c64b9560d5 SHA512 40ef86cd5d9cff0b4a753d45a3d0e4b0c418bd97774dcca41e73c8929a1100a26abd88ead73268426020eeb2e07a7c6c93390335957bd98af78e632183ad2b5b
-MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767
+MISC metadata.xml 986 BLAKE2B 65ae79205c9d92a55f5f5d83eb57de97614b7e345bea5ba48817b7914f26dff7c0b47b140de75bd4395b17dfcdafa304dbb331f5ef55597e787ef0810ca30f1a SHA512 2e329b440315bab845fb3511c5c592d8099877bc49a1769f6d69666137e6ed25e7bda31b71c3b60fbbf678cd1d0685816ef633f7b5e29e81e7c1df347ac5213f
diff --git a/net-analyzer/ossec-hids/metadata.xml b/net-analyzer/ossec-hids/metadata.xml
index a6ba742f6ee0..cef6eccb2d71 100644
--- a/net-analyzer/ossec-hids/metadata.xml
+++ b/net-analyzer/ossec-hids/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		OSSEC is a full platform to monitor and control your systems. It mixes
 		together all the aspects of HIDS (host-based intrusion detection), log
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index daedf5985cad..095884b86f42 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -1,14 +1,9 @@
-AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b68788357e5b25274b6b2620880c1a81e7dda2dc07d77e12c1746fa966d1251d0a548ad0cc00e545bae50540b601c21c215f31e4ad43d67 SHA512 ef72812b5a2daceff20efb54c68311ef3486b8ffd56ec8bbc62ffba96e674a1f88562ed94eef531629684db13f6e2aa5c3a42d558c62869664131feb61939bea
 AUX prelude-correlator-5.2.0-fix_siteconfig.patch 333 BLAKE2B 8146762e1e277cab3ffe4517967a938083ddbda2a43f0e97c09e783094f025961a69e426adae2e0454d0a662215f3bc509d9f609995b06f13a408f4cb23964a4 SHA512 e423c37424ce80df6e448d04dd084eb40b90741a8acc35b91a1470f88d04531fedd8b8ccdbdbef3756ce5e7d285303608f8c794f2d60a00ab550b0a0f49134f8
 AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
-DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
-DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
 DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-4.0.0.ebuild 744 BLAKE2B 9c8bd8db36fda98e2f550ea932f50af9666eacc543099138a4acf7fedaa860fc28c3ff2d595e6791509ecad650f93ccbf4369c4e94e97e29bbd805af70e9fcea SHA512 2750e8ba8632395ef76e3b1a9dab51bf53581cf098cf7a63a0a58553f474509730e28a82b9701973735d1bc16238df41a93dae55e4fcf6ab1ab856d71ff0d237
-EBUILD prelude-correlator-4.1.1.ebuild 802 BLAKE2B 8528650cb4cafd831b77dbe5f95a0d2f2efa8a3bedd0579aeceee460a6b24f9fb5c35eca106c6f32a5e142eef7dd3fecaa93797b42a91725c9ae15cf61fe013e SHA512 58fb60ce4dd8d32347c35598a623f2f6a08dc89b377a466b0c46137f463a1b7da7b7ae8a0181f29033d01d7046d355f5dde67f6ee50694dfc07f614224f7bf06
 EBUILD prelude-correlator-5.1.0.ebuild 749 BLAKE2B bab459f78c726959988daa71cf2125b01a0e074cfedcfb96a5638def4efc88b95c773f7e22ea9e7755439ebdf7f3bbb3dcc367c1d6daa314149a8cfee72b8646 SHA512 c0242da96d1337bccf3154399405b68965570496dde459ad74f950825c3517a508838fa9aae268434559795d8c6c4370989ceb28a821f15146fd01ac472e0a3b
 EBUILD prelude-correlator-5.2.0.ebuild 880 BLAKE2B f6034add9c7602154ee93f2ba9bae711bd60d433984211edc4ab68feaed62435afbc6f5a8fcb5b0e084ea6722b4239c3ab5870e4f4fcf05fcea4e0f95b028463 SHA512 9acaaec2dbdbb2280dfd0205b7ec1da8a0ee8b8792dbc70d8f53d240a2478094041087f25639230fbe59fa7dd2c00f83e160bb217a3d849af3ce7254de2f2b99
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
deleted file mode 100644
index a671aa476585..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/preludecorrelator/config.py
-+++ b/preludecorrelator/config.py
-@@ -19,7 +19,11 @@
- 
- import os
- import glob
--import StringIO
-+import sys
-+if sys.version_info >= (3, 0):
-+    from io import StringIO
-+else:
-+    import StringIO
- try:
-     import configparser
- except:
-@@ -77,5 +81,8 @@
-                 f = open(fname, 'r')
-             except IOError:
-                 continue
--            self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
-+            if sys.version_info >= (3, 0):
-+                self.readfp(StringIO('[prelude]\n' + f.read()))
-+            else:
-+                self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
-             f.close()
---- a/preludecorrelator/context.py
-+++ b/preludecorrelator/context.py
-@@ -362,7 +362,7 @@
- 
-         try:
-             _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
--        except EOFError:
-+        except:
-             return
- 
-         logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
deleted file mode 100644
index 147c825eb4c2..000000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
deleted file mode 100644
index 384e4b199c8c..000000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.1-fix_python3.patch"
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index c9b1720c595b..00915eda130b 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -1,11 +1,5 @@
-DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165a3789ecffd15c75131acbbce6510e354e9e5ddb1575cc682b235e6833a16872889ce67c1557bbe19557e7f154b219c68b00 SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3
-DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
-DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7
 DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc
 DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
-EBUILD prelude-lml-rules-3.0.1.ebuild 485 BLAKE2B 4386ff4b8f8ff7034e601e8e2ad8efb381cd5398f2acc645bb35a99edfada906b6e2de89a9962c453021d7d3a2af62dec5b81795aff4a5c597ad3b66d95dde12 SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1
-EBUILD prelude-lml-rules-4.0.0.ebuild 456 BLAKE2B 9defe3181c15de9e839092b35afc63d8e5a2b62dd2341f15d20b8c50825cfb3a5eb1ea49d6997a6c658e9c88098b7ae67ba43afead0f0a6e5cfafc4bf388a305 SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d
-EBUILD prelude-lml-rules-4.1.0.ebuild 456 BLAKE2B 8973181a90812fe583f17cfbdf2c294f4f5437edc0376e1ce89d9ec037565c290082970f4c5cfc451b442ca6ec977f4ca5f1002ae1b3ad3b599fb6a6642c81c1 SHA512 094855a812d3f0e55cffd72d3e33a512d674d9e268d93af11c6466334877884868d56ed5db3e3b57b98449fd47f6dfa903f43e0ae728192513f762dbcee98109
 EBUILD prelude-lml-rules-5.1.0.ebuild 454 BLAKE2B 67c1020d0d4180704a80cd78e93ce0b313bae0df77b66e152a0cef1f8de9a6c93fe0505c278dbe583548da257a00d525fbc416f4ab8438cc6ea4e165c7b98bad SHA512 785dd110759a98e7b1679922ff6cc14fac51e3ddd7deda145efe5d591648d6db10aa86ce1e3a0722e9b3ba111fdfc2f9c9129a002bf3fec86e187e338e2f2580
 EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
 MISC metadata.xml 373 BLAKE2B 6fa00bbd4f812187c5808bda963bd017a49083630f19f9eb0966064914eeb3a21389430fa7aac54ce03faad80347a66be473227e933ab8e41c1598160ca7dd45 SHA512 1da0210300b25be42d84914b12750fbea2e7471ad5ce0cb7740e69c1e3c87b44ae76a3bfa57e60498dfd1e0a9ca9fd6eaf9a7a8a664e036bbfe45a2c00c94ad1
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
deleted file mode 100644
index 2088e31212d2..000000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-analyzer/prelude-lml"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir "/etc/prelude-lml/ruleset"
-	insinto "/etc/prelude-lml/ruleset"
-	doins "ruleset/"*.rules
-}
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild
deleted file mode 100644
index 1c9aed51d8a2..000000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="~net-analyzer/prelude-lml-${PV}"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/etc/prelude-lml/ruleset"
-	doins ruleset/*.rules
-}
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
deleted file mode 100644
index 59a9a724b22b..000000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="~net-analyzer/prelude-lml-${PV}"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/etc/prelude-lml/ruleset"
-	doins ruleset/*.rules
-}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index b24c2981e6e0..0646440a66fb 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -1,18 +1,10 @@
 AUX prelude-lml-3.0.0-conf.patch 716 BLAKE2B 0d25e6d9bd4a884be7b3143fbe4207e7fb8ef4ced40d0a145108cdbeb132a4c8453df17ab0de029e007f77b041c8c1c80422a64111ac17ae48484e17e2656acb SHA512 6394d55bcbc68971ec35161618bb6c7ccde0aa1e9ae2149b38f41117ddd2559ce5992803be7209d34ac20e2c5c30970bd34d39b1e510ed34655d345a3bf0c6e5
-AUX prelude-lml-3.0.0-configure.patch 1652 BLAKE2B ddd02115e815a62231607f2ca1e60f70b603fb58d06593e05389e43b7a47cb2f176d3ce95e4f3b1f585cd411616eeef030ca0c708b7a8ab14e50c749d035f2ec SHA512 553958c119eb56a0e1c513d6c197f30ca8c178fe956a93c549d3fd70ac627b65f1adf50bbac834bae241c6a610355c021b1853aa217d81e44457ee7f8c66f3ac
-AUX prelude-lml-3.0.0-run.patch 551 BLAKE2B 53f4fdbbd0377f0bff4f80c89f03c66e5fe8edd4f3eb526dd86fb26e375c46905851a03ce25a3e6c9aaf88166df913922e791823c482c4cce39ea114aa9049a5 SHA512 e772e55194461070f0379f0e5e02b48a8c6f6f5f79b154db85bfa945f9af17c3fe6394d81403ab032d306fa3da15d871c6bf1280cea85e27b1cd2e70565783b7
 AUX prelude-lml-3.1.0-run.patch 551 BLAKE2B 53ab37798c7d3efef60d3186ba8183a2b5fb9fc67ae7a0d1316359615838ae0e4e632a4f00a2dfd149dadb4b827c2b2ad7f32597ba8e0169de3ff96871e4f7e7 SHA512 20614c83925ec233d2fc5bf1c30df8b17031eb0448ef39095de6bce0c1ea489c82c542eb6b684afd26f05d6bc8f68ff5b6c0d04030de60036ef8bd2ed24a91d0
 AUX prelude-lml.initd 563 BLAKE2B 3a914e5cb52d2f137e6dbbd4a66e8de280ebad362b80e1dafb3c7df3d9cff1798421fec2d62b65c5324a4fa810616d69225b4b512ea2b9209a81e79f20c90c55 SHA512 b49cac24757000932e0d0ef8b98ab543d12b3efef0944f57f6c6bb23c04473d2a1cfbeccaaffb456e4d5306c12b412a1809aacae00edf535a7f3d944dcef10ec
 AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aae447870eb8ca8c7b8acd21e0664753511f7d659eb70d4f5ae80e20dcbed7addefd5d97967265fd3d SHA512 876f3c9c2c005cf146590e3c8718ae4fc04f80594ad2f279f6794e035a8ebed6b6499c6d8ac8268e8c953e615a79743eb24bf992a9857a743f75ca253aab95ad
 AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
-DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba33754970eff9b1a8c238f35cafec67601548985bd36244740062455a19fc816cbd7eb50bc6a3c4c97cf9da5b288dd3 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c
-DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8
-DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035
 DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
 DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
-EBUILD prelude-lml-3.0.0.ebuild 1114 BLAKE2B ede79f59ee9f077089f5f2f37a7bfd7ecc49dca5dc8051ec957d025ab1fc2f0be11c3ce18f5dbedd7f62d4106b689084b945f9c78ecf3c9fea378be86735fa1f SHA512 6bbb8fa330bc1441e144d4f100381b74fdfae3d5ef7b4f5478a451a212e7d165addcd4f2057393490e80c8ddee99caf6ad50839b5d0da9912413dafc205c5343
-EBUILD prelude-lml-4.0.0.ebuild 974 BLAKE2B 1d458ff6c476e56b22a0e510c9dbd831d6ee88e6647d9a040b6270507aa7a86779a85c825a029d3333122ac5909b3329817a98e284d7ca9cbeaaa2d53c5557d2 SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2
-EBUILD prelude-lml-4.1.0.ebuild 1045 BLAKE2B d5538ff12b7a81d4828d9f36c89987836f8697228779cae58fb86261b16796792b9ac711680bf82cd6cf6a2f7c71ce2ae9db9e9a2010fccddbdd5cff7ec79ba1 SHA512 b69be9c14f0587bc2bcfd85ea8c23f8f06f49704bcf373c2fee5921402ada7694fb57aa06357277ddace4b1528db05732cd85e4c8063a03b4900c76625412004
 EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B fec34ee3090b221fd4736640b74aa46c7b7c8b91c0ad994b3be21e5b03fa340dea49ab4429a7fd0486de97f92670136c2b6a3c73b61a628c55ee6aa78ab1d4f7 SHA512 e53ead9beb5a4dd2ed4d15288773dbe958c14ea4c3506c26bf988958a220c7ca81e680ad7655afa80a82c9dfb6a9728ab15bbf81faa9e143edd2b7cb2b3dae6a
 EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
-MISC metadata.xml 859 BLAKE2B 029350529cf91a38bba7ebf303271c5388e7407266a1808a410aa05d004d68b01fe48470384cfa45bf671d6ea095b14ee6f9b462b94cee4b30c1198485626e68 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724
+MISC metadata.xml 735 BLAKE2B 0bd39e9c3979edaf5a13331a34520bb9b25470b0731fd5a1f664e0841909a9c1a00358dbd624a596b53c8b052fa89719af4f4d3363c41914f6bf6aad89b67300 SHA512 6d2a5377d2a77e277c6d3fce58c36173f07681456c6688c4cdfb23933853da5ffa72eeac7a5a9c2b3183df00d13d75485cbb4d9f2253371ebd45fdc5087d0c57
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch
deleted file mode 100644
index 154a261eb5ad..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -107,10 +107,13 @@
- dnl **************************************************
- GNUTLS_MIN_VERSION=1.0.17
- 
--PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [],
--                  [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)])
--
--AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no)
-+AC_ARG_ENABLE(gnutls, AC_HELP_STRING(--enable-gnutls, Define whether GnuTLS provides gnutls_hash_get_len function), , enable_gnutls="yes")
-+if test x$enable_gnutls = xyes; then
-+	PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [],
-+	                  [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)])
-+	
-+	AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no)
-+fi
- 
- if test x$enable_gnutls = xyes; then
-         AC_DEFINE_UNQUOTED(HAVE_GNUTLS, , Tell whether GnuTLS is available for TCP-TLS support)
-@@ -125,8 +128,12 @@
- dnl * Check for libICU                               *
- dnl **************************************************
- 
--PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes],
--                  [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)])
-+AC_ARG_ENABLE(icu, AC_HELP_STRING(--enable-icu, Tell whether libicu is available for encoding convertion), , enable_icu="yes")
-+
-+if test x$enable_icu = xyes; then
-+	PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes],
-+        	          [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)])
-+fi
- if test x$enable_icu = xyes; then
-         AC_DEFINE_UNQUOTED(HAVE_LIBICU, , Tell whether libicu is available for encoding convertion)
- fi
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch
deleted file mode 100644
index 8b4e65216cca..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -187,9 +187,9 @@
- configdir=$SYSCONFDIR/prelude-lml
- prelude_lml_conf=$configdir/prelude-lml.conf
- regex_conf=$configdir/plugins.rules
--metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
-+metadata_dir=$LOCALSTATEDIR/prelude-lml
- plugindir=$LIBDIR/prelude-lml
--lml_run_dir=$LOCALSTATEDIR/run/prelude-lml
-+lml_run_dir=/run/prelude-lml
- 
- AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file)
- AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory)
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
index 9aa90946ee78..515391274149 100644
--- a/net-analyzer/prelude-lml/metadata.xml
+++ b/net-analyzer/prelude-lml/metadata.xml
@@ -16,8 +16,4 @@
 		them into Prelude-IDMEF alerts. Prelude-LML handles events generated
 		by a large set of applications
 	</longdescription>
-	<use>
-		<flag name="tls">Enables Prelude LML support Syslog through TLS
-		using <pkg>net-libs/gnutls</pkg>.</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
deleted file mode 100644
index d382e0286b29..000000000000
--- a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune systemd
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tls icu"
-
-RDEPEND="dev-libs/libprelude
-	dev-libs/libpcre
-	icu? ( dev-libs/icu )
-	tls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-configure.patch"
-	"${FILESDIR}/${P}-conf.patch"
-	"${FILESDIR}/${P}-run.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable icu) \
-		$(use_enable tls gnutls)
-}
-
-src_install() {
-	default_src_install
-
-	rm -rv "${D}/run" || die "rm failed"
-	keepdir /var/${PN}
-
-	prune_libtool_files --modules
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild
deleted file mode 100644
index 89563e4bb103..000000000000
--- a/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="icu ssl"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	dev-libs/libpcre
-	icu? ( dev-libs/icu )
-	ssl? ( net-libs/gnutls:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_with ssl libgnutls-prefix)
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED%/}/run" || die "rm failed"
-	keepdir /var/${PN}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
deleted file mode 100644
index 754a0268b461..000000000000
--- a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="icu ssl"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	dev-libs/libpcre
-	icu? ( dev-libs/icu:= )
-	ssl? ( net-libs/gnutls:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-	"${FILESDIR}/${PN}-3.0.0-conf.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with ssl libgnutls-prefix)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED%/}/run" || die "rm failed"
-	keepdir /var/${PN}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
index 7c49489f63e3..c606463071f1 100644
--- a/net-analyzer/prettyping/Manifest
+++ b/net-analyzer/prettyping/Manifest
@@ -1,3 +1,3 @@
 DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
 EBUILD prettyping-1.0.1.ebuild 478 BLAKE2B 862811bca0cdb0a40d55b8719379ab0b533f598615890c698a7d9e280d255caa0c95eb2c7283e11acb79d42435d5674fb389fb0ead8a53e00dc51b866fc7e0b7 SHA512 4be1f0f7b70bd5f6f68d15367f3e114aae0cfda3203df97b99353a4e94ff77bc203c826a23c136c94c211b5b6e3ed460b17c2540507f544b4925f36e68a7c68c
-MISC metadata.xml 632 BLAKE2B d1cfc1409dc7dea405d834a63e9b06b56219dd16a45d0ed6fb155a92963dee63c222f75793c26be3b8e12eae3bdbf01116a4def4b3977942329b1802193824dc SHA512 14e748d385fd8fc9adb3e45c366be801ca2d0a525fedfcc7de07883553fc8842d870d5d333b8a2f5705af2ede719ec66248392de595ad791ae68db652fc29107
+MISC metadata.xml 629 BLAKE2B 97885a7298da53e0f1424b7042090df868ebb865f9a4fcb6d9d041bfebdac0d5aea65bd271601dddfa33922e05c8bb021a89a58eb74092636b8b0f82bbf4d050 SHA512 037fbab4a14ae70bf7bf7acae8fb6b6db7d0a74cf9079db3ab591ad49d518850a491d1305bbf5a0b433961eec346faef5ce739b3df82ecdc98cac09d3b6f6861
diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml
index 5c168b379404..3799608c0a37 100644
--- a/net-analyzer/prettyping/metadata.xml
+++ b/net-analyzer/prettyping/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
+		<email>telans@posteo.de</email>
+		<name>Theo Anderson</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index d6a2b0a54cff..11d00fcd0418 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,4 +1,4 @@
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
-EBUILD scapy-2.4.4.ebuild 1060 BLAKE2B 7e069b3d74fda950c54f80df95847629af78386509467afcc3f387962eefa2eb1a41c386eb6d6d2e35b336d46f29e2840c26b5c8fe99802e8ba1dfd779e92629 SHA512 d80bec0aab72a90f7cdfac918e87e85d8ebc42c730d67e7a1700343b42624d2a19d51722e9eec78695dc4316ab6649c3f3974b98ac570c63f084a1a7a52b15aa
-EBUILD scapy-9999.ebuild 987 BLAKE2B 07bc33cd80fc39c47d49e181ccee40df7e93f895c73a97166c31922b941bff4cd4ef98baa5141aa4fdadef4260eb31570371eef5c99a2c4e39120779441439da SHA512 806261e8e3fc3407e6849c20106732d8f7e34bcfc979b8c88f4b76b9dd45a072c730ff37d48d5be23b1f18551aff3bfb266196339b7ce9e7330c04f603f6f729
+EBUILD scapy-2.4.4.ebuild 1093 BLAKE2B abb553977a693fea40a65748c57a81e6790e968e83e29bb9c50f765e775ca8119d240b5a679e0879a11747123a7b1af4261ee2c4629ea61bf056ba059891e8ff SHA512 6d992ab097ebf80e65a55f937b8e3af9d7c7164260c08a34f0d74fef41dff9c4278dd556d27b698ba5e73ebfea1eb61087a9cbf632a96671ad08ab14dfb03c11
+EBUILD scapy-9999.ebuild 1020 BLAKE2B 2ec910ff6e793bb70dd347e8a3aff545789aeb54ff21907cfbf2f2a2c3ff5a352134e3fcfa4c14fb0bdba3875ad17cb4bf0458be0cb080d8c04945e2f82b3e29 SHA512 e651e3c1961bb02a72b3c4f12519ae52fa4bb1195778da240205e03e50dc980d13ad8ebb475cf66f07a360c43c0250a96a8656319287ee2aaebf6cbe7417761a
 MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4.ebuild
index 18754dd9faa2..8e4a5ba64ef0 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index c8c5cfe91e84..3b658780d774 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 48901688e100..8794c64e58b3 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -14,7 +14,7 @@ DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127
 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 8396 BLAKE2B c9a4e6ba9f52e4b636fae963470a1f5e3eb819c5e07a6559de1a72604d2ba9aa3dc4960d4b432a651784abb12e673dfc8bb1fdcd7c2b1623cc42ecbb52985be9 SHA512 14ea6ae13822af4b9d8e9367605135cd0c318c52643ebe313f16362b49684cfad4e2c589146b6cec399c1ce03330be7b613940cd72ff50276f3b3651957afacb
+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 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
+MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index be9d2aed013e..b8c76a643bfc 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -35,7 +35,7 @@
 		</flag>
 		<flag name="gre">
 			Enable support for inspecting and processing Generic Routing 
-			Encapsulation (GRE) packet headders. Only needed if you are
+			Encapsulation (GRE) packet headers. Only needed if you are
 			monitoring GRE tunnels.
 		</flag>
 		<flag name="high-availability">
@@ -50,7 +50,7 @@
 		</flag>
 		<flag name="linux-smp-stats">
 			Enable accurate statistics reporting through /proc on systems with
-			multipule processors.
+			multiple processors.
 		</flag>
 		<flag name="non-ether-decoders">
 			Enable decoding of non-ethernet protocols such as TokenRing, FDDI,
@@ -79,7 +79,7 @@
 			(Only available on Linux systems)
 		</flag>
 		<flag name="side-channel">
-			Enables Snort's the side channel.
+			Enables Snort's side channel.
 		</flag>
 		<flag name="sourcefire">
 			Enables Sourcefire specific build options, which include
@@ -87,7 +87,7 @@
 		</flag>
 		<flag name="reload-error-restart">
 			Enables support for completely restarting snort if an error is 
-			detected durring a reload.
+			detected during a reload.
 		</flag>
 		<flag name="active-response">
 			Enables support for automatically sending TCP resets and ICMP 
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index f538da3c59d8..c3363729e9af 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
 high-availability inline-init-failopen large-pcap-64bit +libtirpc
 linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 40b3c15b80ab..100785b1dc12 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,8 @@
 AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
-DIST tcpdump-4.10.0rc1.tar.gz 1823212 BLAKE2B aa274e548163eacb09a98edbaa1127dbb06b6fe2f6eb23ffa968a577081d9d9323c339a885a198ee08d7dced04302cf50301ca575fbe95e082a6ed89e115de05 SHA512 b226ca569eeda7cee45fc7a1e42766f404d55ebca8133da544ecd75f975701532346f0cfdbefd4fc708fca12a8d094790c99a7276bd9b563885ef036a3912493
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.10.0_rc1-r1.ebuild 1847 BLAKE2B 9dab89ac03e15253288ec3b3f71da253766183d4ad3ce5d37ff768d95a79e84b882c995e02f63870dd92531bdfa27719c36ff7474bd79c9ad2e1fc848f8926d9 SHA512 5a482da138d7fd148a71aa98edd6e1d80722e317c773068692cd9702d93382e44f78f45f3e0e6027372a90b4dd788029dd923b72fb7d55f93b0ce5d735b09a3d
-EBUILD tcpdump-4.9.3-r4.ebuild 1758 BLAKE2B 12844ec4d7b49fcf249e21191cec0d98fa42a8ea83fb52de4d5202dacd989161a23dc931bec4776722b92b9f3ba21564fb71cd6aaaa96197ee3a3546c434ee5f SHA512 b6d7c8218540e3a6f374b6a827f40e136c665578e5a2a800241b7c0ba66c8cbc8a840cb51f8230455f48669ce7d78cc9d281eec5e9877d184160ac6ec2923aca
+DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
+EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 90dad95e765825652c9e7da84b69f863fc545d522aa14fb9c2994d3b5f1276c0b3d03d817daf57b54140a1d1058ea0c36203e7918851fe4af3f10e964c82ca2d SHA512 cc654bde41b19b3f52616c8c9fb3693307bc21aa4ed1568df7d7b68e28a453272344358a4c13f5258de96a045009875696d734fbde7b2ac73fcf2c89e84886f5
+EBUILD tcpdump-4.99.0.ebuild 1848 BLAKE2B 9c7def57d0ece28c0cd9f7f4967078fb9c6253b9f920308ca1ea0f3f655596426a48647d49d6c6f920063358e9f03b6e99875389cdd5b74341f7ba9af788d563 SHA512 c6399ed79c7eaca0e228582ecd3cf7c5906ee100d19c5e7e1d9bdd5d8edadaeb0cdf6c7f02ad62ad61eb12e24c7940fe16e6f1b449abefdd1485ec779f3f6b30
 EBUILD tcpdump-9999.ebuild 1719 BLAKE2B 538b1b4f0519fcd589a9d9c20935c84c9fee5136337ce13f519f0a22cce6ac0331a37310574cc60d1db3f0eaff030f75ca756c729bc81989b3cfc1230ae27bfa SHA512 9fcbc567c7be186a19181a0daf3014e4df3acf16b7a578bb7a782802afa449a21f7174d6a5eb75f7ee313453e46a12488b18957000757b8e23110d6f72ebf4a4
 MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 398ed0b9b2c5..6c0d493d0ed5 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 3133cb51eca1..5d08f58a44ec 100644
--- a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
@@ -16,9 +17,7 @@ IUSE="+drop-root libressl +smi +ssl +samba suid test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( samba )"
 
-BDEPEND="
-	drop-root? ( virtual/pkgconfig )
-"
+BDEPEND="drop-root? ( virtual/pkgconfig )"
 RDEPEND="
 	net-libs/libpcap
 	drop-root? (
@@ -43,6 +42,7 @@ DEPEND="
 		dev-lang/perl
 	)
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
 )
@@ -63,7 +63,7 @@ src_configure() {
 }
 
 src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
 		emake check
 	else
 		ewarn "If you want to run the test suite, make sure you either"
@@ -77,7 +77,7 @@ src_install() {
 	dodoc *.awk
 	dodoc CHANGES CREDITS README.md
 
-	if use suid; then
+	if use suid ; then
 		fowners root:pcap /usr/sbin/tcpdump
 		fperms 4110 /usr/sbin/tcpdump
 	fi
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 70007eb55149..d32a0aee6ff6 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,4 +1,4 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 879 BLAKE2B e6cc5df639c5d096207f3240e5755aaae8522a5e8a91b2fe84fb8f7d05128e5908f00e2ec15881ddc657469ebbe983609b5ff009bfcf20672008db57e80ed144 SHA512 f161a9244fcec7442983857641506e8a517e127ba9c0918fa23c424c95cb7acd15a0e9d1a18edc2ab39424ed0366b871e599565562181df17d1d729a4e66b7d2
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index 274ac82275e0..bfb827e2b245 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index a6e6a551e7d5..441f71c9bc21 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,3 @@
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
-EBUILD traceroute-2.1.0.ebuild 871 BLAKE2B fa4ecff44e2cf4ce9697fa17ac95679ed17b95bf7828101a10b52fe55330027a7894a355ec4e9162906ff5491ade483c945ec2b3b42650f7e85728fe1664ec66 SHA512 32c4d0230ae00a8d0e1958a31bbe520cabd9fe4b16c95e416d25e26b73e06dd6d129780d57085c1da0d764511d90d1b1b7f6a1019502d345ad27424fa4ed2d8a
+EBUILD traceroute-2.1.0.ebuild 872 BLAKE2B 349e4c4bd432cdb473ec06df345716c9b40dc0fd59e46d400b483a730da9b14858a95da7436c366e13432dddd6936b69ba88f32af8ec38721d46257516a0c70d SHA512 941bc1a5c5e7d8abe56da431fa480c00a8d34c855f9b0f3a0fd0c5d991519f4fa5aca7bc1b95bb9474b9ba1c798eb184a87756b4b2ad46df432613a475787274
 MISC metadata.xml 360 BLAKE2B ddaa20a837ed3daa2311c49dc988b9bd60e6a1dcb8a0a45d007ad78854d4e105a7303e816d5b13e12071ce264ab6b1f4df79f552d4920b9406117b0ca51e1384 SHA512 2114a7680804da45f09166e88f811d0b9088bbdedb0d3b587737bc3f4d723dfafe78e6ccf6c5f2b2c4c69838c9412dba3d9af682376b05bf1f4065f2a7c51bf5
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 03a922b734d2..f84fb8817101 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 0ba3841269a2..623708153107 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -10,12 +10,8 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6
-DIST vnstat-2.5.tar.gz 274765 BLAKE2B 65117717d5522ce17e40f05f62d0328f74f5cc3ab42353c93b7a2af0e74df1d36b3a64dd778cd4def2985120bfbc6e1cf8e83a7615ef236ea1af1dbd8d898965 SHA512 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
-EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
-EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
-EBUILD vnstat-2.5.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
-EBUILD vnstat-2.6.ebuild 1558 BLAKE2B 551564174e941fb9465a0b04fc1102a90a7602fd13ef0834c744da5ec558167eb1a7f3f742671b9739e2ad489cbca6ddc85372288af94e8736d42b5931cde866 SHA512 2cf654577d9f848b54cc4973662f03910310903f52047b81315108134dc9624b409ee2604300a8d3e03d11d3b1a959b888e1d624b58010d6276e4e785d453347
+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
-MISC metadata.xml 699 BLAKE2B 8c76aff9b720d3601cd2e10e7dde191eda8874c32747b73c408e81e44cdb06608bd7558088bf5e507ec4c387cb70e8972f3776ccd528c21f5dfdea0d5b39933b SHA512 7d3c8203145fcd9c1b83987a36c30477e66de7406e984c3b48d3deaa9e0ea1d052b5d07d5405bd168c0f08c9331f4a9d182c49eeb82ff43871f608e17ab28c1a
+MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index 8519b3380b92..815914aa1466 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/metadata.xml
@@ -15,4 +15,8 @@
 		The traffic information is analyzed from the /proc filesystem. That way vnStat
 		can be used even without root permissions.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">vergoh/vnstat</remote-id>
+		<changelog>https://humdi.net/vnstat/CHANGES</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index d48e9aa70bab..66f0ce74f2df 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/vnstat/vnstat-2.4.ebuild b/net-analyzer/vnstat/vnstat-2.4.ebuild
deleted file mode 100644
index 3c08307f0cf8..000000000000
--- a/net-analyzer/vnstat/vnstat-2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 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"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-conf.patch
-	"${FILESDIR}"/${PN}-2.2-drop-root.patch
-	"${FILESDIR}"/${PN}-2.2-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.8
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.5.ebuild b/net-analyzer/vnstat/vnstat-2.5.ebuild
deleted file mode 100644
index 12983f11d965..000000000000
--- a/net-analyzer/vnstat/vnstat-2.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 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"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-conf.patch
-	"${FILESDIR}"/${PN}-2.2-drop-root.patch
-	"${FILESDIR}"/${PN}-2.2-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.8
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
index 50688b8280f3..990a6e1d9dc2 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6914d8fbbf81..a41405b3e16e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -18,13 +18,17 @@ DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3
 DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
 DIST zabbix-5.0.5.tar.gz 19153153 BLAKE2B 6f78e690b5a8325739148802a8933d6b1e45a7c08c6f384643d4f85dc8a502be73ff2873cf3ec40cc96c2d892c8866c9f07847b055bef80fda9b00f7333727c5 SHA512 5397672fa170e12120526793b48d01764013467cc259eca61991bc52251c25888dd318ccffa6ed30ac3643104e715ceb70baaeec6eeaddb115ed294c22f5e619
 DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be
+DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403
 DIST zabbix-5.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
 DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-EBUILD zabbix-3.0.31-r2.ebuild 9272 BLAKE2B 952241486756f5705a6d90677bcd792f5fe6a71808510af248ac297e53d5918129cc7d54365368d874139a52b50a06d6d38bee4b79705da1b6ae074d5e375107 SHA512 7faa241ec721d93a91ad1a51bafbd4b3c37bc8a0d85d2ed4855f3e59d1cd19719888a9306bfab5cc2848a85e1f849949879c5511c24e795a81445c15c49ea162
-EBUILD zabbix-4.0.26-r1.ebuild 9246 BLAKE2B b86b928260077f788d8ea1a5c083873fd2335242e74c88f9eede8838e6d580cce27500ee4838689811b5e8fb17c3aaf834d607294411b00614ab964ec5e8a685 SHA512 1956f1119adf155f9eaa3a47869bbbd487e1aea6b5d711e44604f286cf497c183949ad521fb7d794b3d1a5b53c6f51ce1b102719c5ef507f7702eef48c80c812
-EBUILD zabbix-4.0.27-r1.ebuild 9248 BLAKE2B ec957d89d392344529536c0d0c80d4f22db4db467f82374d9add67d70c5d9643401775d0452d4fa84bf72c98f96b33fd2d462f8cf6951e6312644c301959d628 SHA512 b8afdd2e70ec8944aa601aaac86d1a38d172395eb21e19bc714dcecbd86b1b57af387769b5fe29baf2cdddee2db33867a803b07599d774c6909142cc148c442d
-EBUILD zabbix-5.0.5-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
-EBUILD zabbix-5.0.6-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
-EBUILD zabbix-5.2.1-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
-EBUILD zabbix-5.2.2-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
+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-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.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.3.ebuild 9079 BLAKE2B 52e11ccfe19a2f344be0e4d22894c311888f8c3dab251498a32cb1369ba9086b70e74e82adcec860e4d21534fc570627d94f8d53b9618df576603ff4cbe77404 SHA512 e95cb70fe23591ff07a56feb3664e9e99ea5fb5d8faf4a8645b65dac63ff0929edca5fb645a557d4f0bae32cc4842af7258ddd13c730fd990175db9a4072091d
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
index 40121fa75537..a0c92d82004e 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -122,9 +124,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
index c3e0e8de2db6..2c7ebb47a57b 100644
--- a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
index c097176110ef..7ce30397049f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
index 04c629c2aced..d236db78534c 100644
--- a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
index b95dbdcff0ce..8f6e95562365 100644
--- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
new file mode 100644
index 000000000000..8f6e95562365
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+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"
+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 ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
index 04c629c2aced..d236db78534c 100644
--- a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
index b95dbdcff0ce..8f6e95562365 100644
--- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
 HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
 		webapp_pkg_setup
 	fi
 
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
new file mode 100644
index 000000000000..8f6e95562365
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+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"
+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 ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /net-analyzer
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)