gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /net-analyzer
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
119 files changed, 2134 insertions, 2272 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f827958a1d96..6aca37d5db6e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 113b1d0f7d95..ec66c51686db 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -3,5 +3,5 @@ DIST bwping-2.0.tar.gz 106255 BLAKE2B f3ff631a1d9d5aed9645558c639840055bb041612e
 DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
 EBUILD bwping-1.17.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 EBUILD bwping-2.0.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
-EBUILD bwping-2.1.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
+EBUILD bwping-2.1.ebuild 387 BLAKE2B 4b5a572ff68d6a4571f48462e997df90e38c165cd3e1eb7744d5d2bb02b7f17ed29ebdb1ce7626acfccc01804d6204244088fd877be7833824b57ad9d64017e1 SHA512 58e5e25d21c8268b786c7b2ff5b1c0ec3034d30fc892931910b3122ceeb81de2867c7b245e9c36d03744b86dd7bfc3d0ddf3cf5a065d3857cdac9029f2cb3a0d
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild
index b22cf8d14539..d036906fb29e 100644
--- a/net-analyzer/bwping/bwping-2.1.ebuild
+++ b/net-analyzer/bwping/bwping-2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest
index f476cca140ab..018ac252d719 100644
--- a/net-analyzer/calamaris/Manifest
+++ b/net-analyzer/calamaris/Manifest
@@ -1,7 +1,3 @@
-DIST calamaris-2.59.tar.gz 56168 BLAKE2B 1ab118066c836c2d2e9584594e31db77ed8aa50dd3f74da5f60ea41075abd5873f5d413ebf6e352f5cdf4ecefc86307669c46f88c9048194f31936470040ed82 SHA512 8c8ed820a1af6e21cfe9f03397c159b2261c8253b3395a8d6dbd21064151439406496132917d0ef087eed805c7945cf28f2d12dc1e52340991c18e6a27484ade
-DIST calamaris-2.99.4.0.tar.gz 105860 BLAKE2B f87b51bab7aac10f9ef0fb50a788a0ad86a3b98171b9d4f1e1f7cc50878ff9f9ad70ed6485e4fa301c713b5551390ee4f2697c37291a540ee3b3feb6960891d4 SHA512 4127a3963fd0ea5baa1d5ce9a784f45658bb685f18e576c134fee1b4e8fdad535676974498119018e771924a8a622ed83b8aa095d3909b7bb3d009dd6024dbef
 DIST calamaris-2.99.4.5.tar.gz 116893 BLAKE2B 9864f135b364dd7d7becd7c30cc28da1f41c4db0fb940f45153d5fd8da04c8df8675a728e19b47f6eb8f602945655817717189349fe047944d0abdacfd0476c9 SHA512 d9bc890afd6a349ea448b4f40281b8d4dd5babf2915cdfe6d4a46c066826e54c3a9e988e575fb13a4cf5ae9500d33faa5d24f295504f7b6fbfbec219610b309d
-EBUILD calamaris-2.59.ebuild 462 BLAKE2B 00850fe6c0f4cccd044c0d788eff970bb2188225a298286c6f35c3ef6b0c6a6c8d443ee3693c3c6903e133482ed48f6b6743950daabf770322750bb7400d24a2 SHA512 6a7026a71f6383bc83fe0d50425cca5506a5aef16adecadd2af88aecb5bf7453ee52fa9e476c3fe42011673439717d6b3435533ada0549561931500cdab6c697
-EBUILD calamaris-2.99.4.0.ebuild 690 BLAKE2B e08c2f9778bc9a1af7ae2d3be1ce0d9085ecdd351be5b79c29aaaef3c2e02c3f8caf499bc3623938d4e8a5eba698281b9ce15d1d4c3323f6fcb8cf850d38bf13 SHA512 b3bca403f0fe47529918a7d0dd20a806638cc6883aca368d6d6c67cde2db1f0bb3b4adadbe87f3b48e9d06c81fd1e4ae5d56dba45e8093cab3bc1e784dc055ed
 EBUILD calamaris-2.99.4.5.ebuild 694 BLAKE2B 0ae607b5e7e2682619932da2d9128110356040e24905781a1e64c76dd4f09565d8c43927fd68bb454958fb0275e451c33d971d3f1755c8155056fe7f188dad1a SHA512 45e9ea33f3c5d2e1b7ba85fd1f2a6f0c2b30ef4a53f03ac7f9a43867df6ef9554f0dbf6f815d230c49c02fb0ee6867d3eea6bf1e4858ee9768164afa455c8754
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild
deleted file mode 100644
index 852e4b508c92..000000000000
--- a/net-analyzer/calamaris/calamaris-2.59.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
-HOMEPAGE="http://cord.de/calamaris-home-page"
-SRC_URI="http://cord.de/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	dobin calamaris
-	doman calamaris.1
-	dodoc CHANGES EXAMPLES README
-}
diff --git a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
deleted file mode 100644
index aed1057e0f8f..000000000000
--- a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
-HOMEPAGE="http://cord.de/calamaris-home-page"
-SRC_URI="http://cord.de/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/GDGraph
-"
-
-src_prepare() {
-	sed -i \
-		-e "s:\(use lib\).*$:\1 '/usr/share/';:" \
-		calamaris || die
-}
-
-src_install() {
-	dobin calamaris calamaris-cache-convert
-
-	insinto /usr/share/${PN}
-	doins *.pm
-
-	doman calamaris.1
-
-	dodoc BUGS CHANGES EXAMPLES EXAMPLES.v3 README TODO calamaris.conf
-}
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index 4df05b27e1d8..09e4e6f63a85 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -1,7 +1,3 @@
-AUX cbm-0.1-gcc-4.3.patch 159 BLAKE2B ac9ae0a7a222e64e5c0284e9f3803ab97cef9a824f89997dbc8880dd082d092e7c0a2a0fa7c6dafcefa451d3025e756361d3439ef637dc7580689ffa0458f5ec SHA512 9ba1cb68e4b48f3c5035254e88cebab7702b97739537d892f42a256635cfc692026c26b0325084b2fbbb15a865390c30167119c7bac9362076f18e416afef2be
-AUX cbm-0.1-gcc-4.7.patch 195 BLAKE2B 2c909deab45b4ecce26e243f0d65e838b67ee7fd7bd0ff4aabb689560a701550720c7f4cbbd047c9ca11984305f11cf3b8aecbbe7653c03437c3cfb59078564e SHA512 e1d66c6122163509ea247692362230323039f642f6f8cbc06f0023044223875fc9567a20c7dbdf5651313dc76a0033aa14118c5abe8aa8196ab90991c90d348d
-AUX cbm-0.1-headers-status-line.patch 1724 BLAKE2B 12a8fd6edfbe34eaacabf4e4093173b429a0307099dc56260d6a87a4c914719afcaf24dac2761ed30d3f3dff003edd0e15159b4df138a1d1c0b00d1ee3b705f2 SHA512 06a4614ece7d265b5604e4021671012d0ec8cece3f77025f9866c6c4193f85a5b7cbea740952dfd7d16cae6798708428fe5be4c06f5684baf9493c30effb867e
-AUX cbm-0.1-tinfo.patch 463 BLAKE2B e985b2f962247dbe2f230580149abccc7a1d8b7ed069791bf30780ca61aa881f4f58c98aed2aa851dd0f78ac5da2587ba316cccc60277d09ae700864812fbbb8 SHA512 51509006d183634a4322ace7de01fde57bbd0d18a991dfab43e7189227f88edc7201d47e3a38826a15ba67047357f39d7a1298788268bf2db6b27aa2a048d903
 AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
 DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076
 EBUILD cbm-0.2.ebuild 644 BLAKE2B 4d8d12be2e0f22df0671682acb74db9b0664b16fa69397c080c85e390d2288577d2b210d73f1f533dd1dd0bd0935600e7a086e071451985765931c65c4fc0143 SHA512 b7230fa1e1ceb8abbef8f2de5a77173c7b73cd2fad7205abdc6da649dc18c45230a76506b4167fc421d555e7b4c7fa7952069cb68bd5cfe85a70d8de1f5e6215
diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch
deleted file mode 100644
index ae9b58f6e99b..000000000000
--- a/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/statistics.hpp
-+++ b/src/statistics.hpp
-@@ -3,6 +3,7 @@
- 
- #include <list>
- #include <string>
-+#include <sys/time.h>
- 
- namespace statistics {
-     
diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch
deleted file mode 100644
index 94b50a6877f7..000000000000
--- a/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/cbm.cpp
-+++ b/src/cbm.cpp
-@@ -18,6 +18,7 @@
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <net/if.h>
-+#include <unistd.h>
- 
- // Externs
- extern int optind, opterr, optopt;
diff --git a/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch b/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch
deleted file mode 100644
index 4b09bbb69793..000000000000
--- a/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bdc4f02a6d7fb1416f36aef89af4592c691576d8 Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto@cante.net>
-Date: Mon, 19 Sep 2011 14:27:04 +0300
-Subject: [PATCH] [fix] Headers and status line don't display by Paul Martin
- <pm@debian.org>
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jari Aalto <jari.aalto@cante.net>
----
- src/cbm.cpp            |    9 ++++++++-
- src/widgets/Window.cpp |    2 +-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-index 74282e2..0197443 100644
---- a/src/cbm.cpp
-+++ b/src/cbm.cpp
-@@ -156,13 +156,20 @@ int main(int argc, char **argv) {
- 	    interfaceTable.setColumns(4);
- 	    interfaceTable.setActiveStyle(A_BOLD);
- 	    interfaceTable.setActiveRow(1);
-+	    // Position the interface table
-+	    interfaceTable.setPosition(2, 2);
-+	    interfaceTable.setSize(screen.getWidth() - 4, 
-+					       8); // TODO
- 
- 	    // Create the detail table
- 	    VerticalTable detailTable(screen);
- 	    detailTable.setColumns(2);
- 	    detailTable.setRows(2);
- 	    detailTable.setActiveRow(-1);
--	    
-+	    // Position the detail table
-+	    detailTable.setPosition(2, 12); // TODO
-+	    detailTable.setSize(screen.getWidth() - 4, 10); // TODO
-+
- 	    // Populate the detail table
- 	    detailTable.setText (0, 0, "Interface");
- 	    detailTable.setStyle(0, 0, COLOR_PAIR(COLOR_HEADING) | A_BOLD);
-index 322cb9b..572eef7 100644
---- a/src/widgets/Window.cpp
-+++ b/src/widgets/Window.cpp
-@@ -14,7 +14,7 @@ Window::~Window() {
- }
- 	
- void Window::setPosition(unsigned x, unsigned y) {
--    mvwin((WINDOW*) win_, y, x);
-+    mvderwin((WINDOW*) win_, y, x);
- }
- 
- void Window::setSize(unsigned width, unsigned height) {
--- 
-1.7.5.4
-
diff --git a/net-analyzer/cbm/files/cbm-0.1-tinfo.patch b/net-analyzer/cbm/files/cbm-0.1-tinfo.patch
deleted file mode 100644
index 955d762214c4..000000000000
--- a/net-analyzer/cbm/files/cbm-0.1-tinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,4 +3,4 @@
- cbm_SOURCES = cbm.cpp \
- 	      ErrnoError.hpp \
- 	      statistics.cpp statistics.hpp
--cbm_LDADD = -lncurses widgets/libwidgets.la
-+cbm_LDADD = $(ncurses_LIBS) widgets/libwidgets.la
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,6 +18,8 @@
- 
- # Checks for libraries.
- 
-+PKG_CHECK_MODULES(ncurses,ncurses)
-+
- # Checks for header files.
- 
- # Checks for typedefs, structures, and compiler characteristics.
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest
index 123994d159b8..7818064e4b83 100644
--- a/net-analyzer/check_mk_agent/Manifest
+++ b/net-analyzer/check_mk_agent/Manifest
@@ -2,4 +2,4 @@ DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40
 DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b
 EBUILD check_mk_agent-1.2.8_p27.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
 EBUILD check_mk_agent-1.4.0_p31.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
-MISC metadata.xml 1184 BLAKE2B 4dad1714d5a7283ccab3072f4b1790a58f02124272e0f1949cbd0b82d0e07a83cfbaaed1cc8471a88241ae0560e79839a97bcf18e1e3735fc1280ad0df29e687 SHA512 7802ae43e00f96a3371d4e0e888342630a3773cb75ccc7f203e884cdc64ad283a27abc34cc940a2b4b8ab3911ef6a744d18527d04338253a7c5069b67c1d9ee1
+MISC metadata.xml 1097 BLAKE2B e84f46161fbb1e01bebf32135b8f794d5f82d68657be9064c088f61a8b3699d838282553a0443db3a27190796e2cd1eefe3f39fdaa28c0a951284e6cba48ef3e SHA512 844aabdeb511686e82ee2ea51791c1536a35e64061900dae5cad45cb076f3d713ea88ef9aab365dac0d30c60bff247da94327c8b5dda22054bdf9c0ea4dd05f9
diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml
index 1a171aa481ac..20b2c3eaafa2 100644
--- a/net-analyzer/check_mk_agent/metadata.xml
+++ b/net-analyzer/check_mk_agent/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-		<name>Ian Stakenvicius (_AxS_)</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The agent, to gather and report system and other monitoring data to Check_MK enabled
 		Nagios/Icigna centralized monitoring servers.
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 66944ffb1d23..e5b3955260da 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,4 +1,3 @@
-AUX cnet-3.3.1-gentoo.patch 4936 BLAKE2B 18796d6fd211d1539c6e1417aa49d46d68f24df9a9e4116ea83d8bc5d10389d15bcbabdd6cf336db9832d1b695c725ff0f55df1d1316d5783bfa80add1e45f0f SHA512 a0d8e35e998befa7c145ce79e92f8725b6343269a84f8b34a4787cedcf4df8e9f7723c4e44223f556df99892ac0fbd313dcdae1f8e88e2b000cd1eb393fd2753
 AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1
 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
diff --git a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
deleted file mode 100644
index 9754fb4ebf84..000000000000
--- a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@
- # Comment/uncomment the following 4 constants to suit your system:
- #
- # PREFIX defines the directory below which cnet will be installed.
--PREFIX		= /usr/local
-+PREFIX		= /usr
- #PREFIX		= $(HOME)
- #
- # BINDIR defines the directory where the cnet binary will be installed.
-@@ -16,26 +16,24 @@
- LIBDIR		= $(PREFIX)/lib64/cnet
- #
- # WWWDIR defines the directory to hold cnet's web-based documentation
--WWWDIR		= /home/httpd/html/cnet
-+#WWWDIR		= /home/httpd/html/cnet
- #WWWDIR		= $(HOME)/WWW/cnet
- #
- # ---------------------------------------------------------------------
- #
- it:
--	make -C src
--	make -C support
-+	$(MAKE) -C src
-+	$(MAKE) -C support
- 	@ls -l bin/$(NAME) lib/*.a
- 
- install:
--	make
--	@mkdir -p  $(BINDIR) $(LIBDIR)
--	@chmod 755 $(BINDIR) $(LIBDIR)
--	@cp bin/$(NAME) $(BINDIR)/$(NAME)
--	@chmod 755 $(BINDIR)/$(NAME)
--	@rm -rf $(LIBDIR)/*
--	@cp lib/* $(LIBDIR)
--	@chmod 644 $(LIBDIR)/*
--	@ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
-+	@mkdir -p  $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+	@chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+	@cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
-+	@chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
-+	@rm -rf $(DESTDIR)$(LIBDIR)/*
-+	@cp lib/* $(DESTDIR)$(LIBDIR)
-+	@chmod 644 $(DESTDIR)$(LIBDIR)/*
- 
- AND	= html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
- www:
---- a/src/Makefile.linux
-+++ b/src/Makefile.linux
-@@ -5,7 +5,7 @@
- #	binutils 2.5.2, and
- #	libelf (0.6.4 onwards)
- #
--WARNINGS =	-Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \
-+WARNINGS =	-Wall -Wshadow -Wpointer-arith -Wcast-qual \
- 		-Wcast-align -Wwrite-strings -Wconversion \
- 		-Wstrict-prototypes -Wredundant-decls -Winline \
- 		-Wcomments -Wtrigraphs -Wimport -Wundef
-@@ -20,8 +20,8 @@
- XINCLUDES	= -I/usr/include/tcl8.5
- XLIBS		= -ltcl8.5 -ltk8.5 -lX11
- #
--C99		= gcc -std=c99 -Wall -Werror -pedantic
--CFLAGS		= -O3 -fPIC $(INCLUDES) $(XINCLUDES)
-+C99		= $(CC) -std=c99 -Wall -pedantic
-+CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
- #
- LD		= gcc -rdynamic
- LIBDIRS		= $(XLIBDIRS)
---- a/support/Makefile
-+++ b/support/Makefile
-@@ -7,21 +7,21 @@
- 
- it:
- 	@if uname -s -r | grep -q "Linux" ; then \
--		make -f Makefile.linux ; fi
-+		$(MAKE) -f Makefile.linux ; fi
- 	@if uname -s -r | grep -q "Darwin" ; then \
--		make -f Makefile.macosx ; fi
-+		$(MAKE) -f Makefile.macosx ; fi
- 	@if uname -s -r | grep -q "SunOS 4" ; then \
--		make -f Makefile.sunos ; fi
-+		$(MAKE) -f Makefile.sunos ; fi
- 	@if uname -s -r | grep -q "SunOS 5" ; then \
--		make -f Makefile.solaris ; fi
-+		$(MAKE) -f Makefile.solaris ; fi
- 	@if uname -s -r | grep -q "OSF1" ; then \
--		make -f Makefile.osf1 ; fi
-+		$(MAKE) -f Makefile.osf1 ; fi
- 	@if uname -s -r | grep -q "IRIX" ; then \
--		make -f Makefile.irix5 ; fi
-+		$(MAKE) -f Makefile.irix5 ; fi
- 	@if uname -s -r | grep -q "FreeBSD" ; then \
--		make -f Makefile.freebsd ; fi
-+		$(MAKE) -f Makefile.freebsd ; fi
- 	@if uname -s -r | grep -q "NetBSD" ; then \
--		make -f Makefile.netbsd ; fi
-+		$(MAKE) -f Makefile.netbsd ; fi
- 	@cp -p cnetsupport.h ../lib
- 
- # ---------------------------------------------------------------------
---- a/support/Makefile.common
-+++ b/support/Makefile.common
-@@ -1,13 +1,13 @@
- #
--CC		= gcc
--CFLAGS		= -std=c99 -pedantic -Wall -Werror -O3 -fPIC
-+#CC		= gcc
-+CFLAGS		+= -std=c99 -pedantic -Wall -fPIC
- 
- DOTH		= cnetsupport.h
- OBJ		= hashtable.o haversine.o lexical.o md5.o queue.o vector.o
- 
- $(NAME):	$(OBJ)
--		ar rc $(NAME) $(OBJ)
--		ranlib $(NAME)
-+		$(AR) rc $(NAME) $(OBJ)
-+		$(RANLIB) $(NAME)
- 		@cp -p $(NAME) ../lib
- 
- %.o : %.c $(DOTH)
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -8,21 +8,21 @@
- 
- it:
- 	@if uname -s -r | grep -q "Linux" ; then \
--		make -f Makefile.linux $(NAME) ; fi
-+		$(MAKE) -f Makefile.linux $(NAME) ; fi
- 	@if uname -s -r | grep -q "Darwin" ; then \
--		make -f Makefile.macosx $(NAME) ; fi
-+		$(MAKE) -f Makefile.macosx $(NAME) ; fi
- 	@if uname -s -r | grep -q "SunOS 4" ; then \
--		make -f Makefile.sunos $(NAME) ; fi
-+		$(MAKE) -f Makefile.sunos $(NAME) ; fi
- 	@if uname -s -r | grep -q "SunOS 5" ; then \
--		make -f Makefile.solaris $(NAME) ; fi
-+		$(MAKE) -f Makefile.solaris $(NAME) ; fi
- 	@if uname -s -r | grep -q "OSF1" ; then \
--		make -f Makefile.osf1 $(NAME) ; fi
-+		$(MAKE) -f Makefile.osf1 $(NAME) ; fi
- 	@if uname -s -r | grep -q "IRIX" ; then \
--		make -f Makefile.irix5 $(NAME) ; fi
-+		$(MAKE) -f Makefile.irix5 $(NAME) ; fi
- 	@if uname -s -r | grep -q "FreeBSD" ; then \
--		make -f Makefile.freebsd $(NAME) ; fi
-+		$(MAKE) -f Makefile.freebsd $(NAME) ; fi
- 	@if uname -s -r | grep -q "NetBSD" ; then \
--		make -f Makefile.netbsd $(NAME) ; fi
-+		$(MAKE) -f Makefile.netbsd $(NAME) ; fi
- 	@cp -p $(NAME) ../bin
- 	@cp -p cnet.h  ../lib
- 
-@@ -33,7 +33,7 @@
- 	@rm -rf HTML GPATH GRTAGS GSYMS GTAGS
- 
- hide:
--	make clean
-+	$(MAKE) clean
- 	echo '#if	HIDE_GLOBAL_NAMES'		 > hidenames.h
- 	sort < HIDENAMES | \
- 	awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 925b42fa28d2..f6c38d807bd4 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,8 +1,6 @@
 AUX driftnet-0.1.6-giflib-5.patch 1060 BLAKE2B 6bd972e9c7e66eda935058daf75b5667f93f1a808499023e70087d7dd3a904762cd7139f23338321a0f7292974cd8dd206a97b33e665944fd32c9b14aae3908a SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c
 AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04
 AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b
-DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
 DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
-EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1818 BLAKE2B cfaa0f1513e946a3ab25d88735f42f3d7c4c0fafd9b8eacb31c7ba4bef35c46f0196a3e4dd2f084e83717abe854fa977a7694170d6b486c7fe6063746571c684 SHA512 344eab963fbaccc2cfbd020fcdf962f6e590c86d77654df5b0eb805d31649126a5bb432de1000ea080488e0d13d2b1905855383372439a3a72c63fc316aace60
-EBUILD driftnet-1.3.0.ebuild 1350 BLAKE2B f4361cf5365dc28fe2137d030fc7660b4b942bb0a622e7718eb31ca0545c6d7419e17bb008b1c73ca45cc5872a28dfa3dc9259914583374dfb10aaad48185d71 SHA512 675fc93a31985730a5e9191fdf84baef6a0f935050b7f5d6c326227f227b8fbe86c4969ae1da58e71ff3a38c81b8cd0fbe02b930e47149b33d80c1841d95704c
+EBUILD driftnet-1.3.0.ebuild 1347 BLAKE2B 78790e24d9d41ad91cedb98a2e0b5ad6e00e051afa6eeb38599c062d8345bf4222cbcba70240bcfad2b7d3b6c157304e570436d5a2314a97328683e6ea058c01 SHA512 a60128b7b1e3f380c2f566490def7f84b72a7c5013252b109c6fd925d0d05fe923f65525ac9b93b1d35e29794dc93d1924ceb45f415769d497cfcfd57069d7eb
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
deleted file mode 100644
index 6e4749e79a26..000000000000
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fcaps flag-o-matic toolchain-funcs
-
-DESCRIPTION="Listen to network traffic and pick out images from TCP streams observed"
-HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 ppc -sparc x86"
-SLOT="0"
-IUSE="gtk mp3 suid"
-
-CDEPEND="
-	net-libs/libpcap
-	gtk? (
-		x11-libs/gtk+:2
-		virtual/jpeg:0
-		media-libs/giflib:=
-		media-libs/libpng:=
-	)
-"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	mp3? ( media-sound/mpg123 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.6-giflib-5.patch
-
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-
-	# With newer libpng, --cflags causes build failures.
-	sed -i \
-		-e 's:pkg-config --cflags libpng:$(PKG_CONFIG) --libs libpng:' \
-		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
-		Makefile || die
-}
-
-src_compile() {
-	tc-export CC PKG_CONFIG
-
-	if use gtk; then
-		emake
-		mv driftnet driftnet-gtk || die
-		emake clean
-	fi
-
-	# build a non-gtk version for all users
-	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
-	append-flags -DNO_DISPLAY_WINDOW
-	emake
-}
-
-src_install() {
-	dosbin driftnet
-	doman driftnet.1
-
-	use gtk && dosbin driftnet-gtk
-
-	dodoc CHANGES CREDITS README TODO
-
-	if use suid ; then
-		elog "marking the no-display driftnet as setuid root."
-		fowners root:wheel "/usr/sbin/driftnet"
-		fperms 710 "/usr/sbin/driftnet"
-		fperms u+s "/usr/sbin/driftnet"
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
-		"${EROOT}"/usr/sbin/driftnet
-	use gtk && fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
-		"${EROOT}"/usr/sbin/driftnet-gtk
-}
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index b20c9b846b70..e286126f8a0c 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
 SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc -sparc ~x86"
+KEYWORDS="amd64 ~arm64 ppc -sparc x86"
 SLOT="0"
 IUSE="debug gtk suid test"
 
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 8b7147d2a565..00bc4689af52 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,3 +1,3 @@
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
-EBUILD etherape-0.9.19.ebuild 556 BLAKE2B fef4e05c52350c1d3d8f328b9cef8227e020fa72626a0ec8a3148b9da78bc11d2fabe26d1069bfc2ac88b09e02ed3dc118ce4aba108c02ca8de152c6ed8bc7c7 SHA512 e2cabf07804447bc91438f97cc5669461310b970b472607e3fe2c0779fe77d9f278391741f9b3fce2689701ab548aae4c592c078da3534517079efcc1a516f6b
+EBUILD etherape-0.9.19.ebuild 563 BLAKE2B 408aa0eddba3ddeabf7bc90662f211e7ec73552ecec7d8e09e4577e7e46a28dd25d1a8f833a01525c046cbaf0b580296f4dcf5682dda22dbe32f2d1aa268c6e8 SHA512 a60c429b91d341c11627e635856177cc5b7da7f29bdd287116edcf8e573d8be4da8d3b3a162ae12589bbbb67a444596de3f637e49990d087230e67b0b8d4cfa7
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild
index 115dc5bb3c88..721766aba287 100644
--- a/net-analyzer/etherape/etherape-0.9.19.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index 15e5958685ab..152d7dedf6c5 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,4 +1,3 @@
-AUX ethloop-10-gcc45.patch 712 BLAKE2B b7a58c136663860120467fef7e752b957383d8e5e84325bfda20873581673937e669044a67a61b02080570397e5599e207162e430c910e319d4f32db30a9b412 SHA512 c10c7b723698dc6426478b7e9d861a7a88c887a6df3033c8080f51149882925952ff6cf0d0c7ca1d35dcda2c43cb278d8c4475a37d8be3a5a653c974b48bb7b2
 AUX ethloop-10-misc.patch 1760 BLAKE2B f3e22dc20e87bae4d9deab283581f12330ab4535394c1fb1fb787dc7d550a63da64ab936c3b89f06aa3dc218357eaa7ce8a41de9006b62a31c7026f2c75cf51f SHA512 0bb1bacf5103e9b3715c0242844e90007ea68715dbf51abc12c14c845277f6520023c59f4e014cb955552d7dc7854ebe46524e6f5dc2faf47cb145a844fe5ba1
 DIST ethloop10.tgz 3912 BLAKE2B 4cd0ad93693afb2302627b9fcbefa94eefec3d29c55e583c5126aed9cfb20aa7a2d68834fa138debaf767972e7e898245d7297567b322953e1df03b3817a5609 SHA512 82ac0114d0d539f5c057101e1e1f0e2eac32e0bd482bd62e6305f7c4863d0776dcff7bc85167dbcfb136d0b430c9008241c2c0250713beb2703cb052b9b71e63
 EBUILD ethloop-10-r4.ebuild 565 BLAKE2B ed6cfa4ee8fc45e88898ed4805c5eeeb841a22dc6d738a4c6d3b6bdb8d3c86575fbe21975a6a3e77d37aeecc9bab377a2613f7c323c8f214bd18a36ee8355096 SHA512 0ac1d22150a61d075392e20a4fa91b744cad5989f0220e26f08909a6312332238f516bfcf960aa6f53038f5e0a641b9fa8eec165ed6927ecbcbf1d3affd5c90a
diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
deleted file mode 100644
index bf905cd44b2c..000000000000
--- a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix recv call (bug #336755), add some more includes.
-
---- a/ethloop.c
-+++ b/ethloop.c
-@@ -1,5 +1,7 @@
- /* vim: cin sw=4 ts=4
- */
-+#include <arpa/inet.h> /* htons() */
-+#include <sys/types.h> /* recv() */
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <sys/poll.h>
-@@ -13,6 +15,7 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <signal.h>
-+#include <string.h>
- 
- int sock;
- 
-@@ -133,9 +136,9 @@
- int recv_raw(int tmo)
- {
- 	struct pollfd pf = {sock,POLLIN,0};
--	int r; unsigned short proto;
-+	ssize_t r; unsigned short proto;
- 	if(poll(&pf,1,tmo) <= 0) return 0;
--	r = recv(sock,&buf,1550,0);
-+	r = recv(sock,&buf,sizeof(buf),0);
- 	if (r <= 0) {
- 		printf("error recv (%d)\n",r);
- 		return 0;
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 4845a0d451a3..9523bd5e0184 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,4 +1,3 @@
-AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf
 AUX ettercap-0.8.3.1-libressl.patch 1147 BLAKE2B bb3cf4e73f9a03cb13a82e6569d05f52ffe2bf438fc834f5793057c9aab85a5edff7a2c5830a5aecddce8646e9a5d370be4654610516bdbbdcfaff63a2b8ea04 SHA512 57c8c6c04f4b49598fedc702d119963e7633ebec4008d4c3467749e7f5053572f9d8fe1254f7ed6554975791300ba2e96e481a86a656f6ec0d80d5a011254b92
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
 EBUILD ettercap-0.8.3.1.ebuild 1850 BLAKE2B 2bd65f9b1dee27731671f7b1f7e669a9be0968f45e8682833f2076cbd8319bc21f67f281932f3ab72c7a2a13845f36bc392df00576e56fbdd948e2dac47c2b24 SHA512 ab334f8a0e70726703d3d82562ccd160e6488e908c2fe415386484150116e600ff5079bee7fbf854bcbe5501531e399415e85f753d59f1972a3b7884660351d9
diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch
deleted file mode 100644
index eddca836905f..000000000000
--- a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/include/ec_threads.h
-+++ b/include/ec_threads.h
-@@ -12,7 +12,7 @@
- };
- 
- /* a value to be used to return errors in fuctcions using pthread_t values */
--pthread_t EC_PTHREAD_NULL;
-+extern pthread_t EC_PTHREAD_NULL;
- #define EC_PTHREAD_SELF EC_PTHREAD_NULL
- #define PTHREAD_ID(id)  (*(unsigned long*)&(id)) 
- 
---- a/src/ec_threads.c
-+++ b/src/ec_threads.c
-@@ -46,6 +46,8 @@
- #define INIT_LOCK     do{ DEBUG_MSG("thread_init_lock"); pthread_mutex_lock(&init_mtx); } while(0)
- #define INIT_UNLOCK   do{ DEBUG_MSG("thread_init_unlock"); pthread_mutex_unlock(&init_mtx); } while(0)
- 
-+pthread_t EC_PTHREAD_NULL;
-+
- /* protos... */
- 
- pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void *), void *args, int detached);
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 5598922002f6..b0bba48e9b06 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,6 @@
 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-99999999.ebuild 3231 BLAKE2B 3700cf6551941dd695e81145d723f6be91bf21df0ac3fe95c3245a4a954c9855e3d082e47409f9a75dbbb87fc1c4ecf51a6477b3e419987a669ce821ee47e7fa SHA512 dc518092d1b9687ffe1c2d47e5e23f3ed58cd36b7ed28fc14db9179476c99b208450ba9f8fb0e9c516320408da526ae74f18ca1efb21a0b14cff4d06b9578a7c
+EBUILD fail2ban-0.11.2.ebuild 3357 BLAKE2B 9c7a838c885ba4a1d976d9433dcc1c084322e94a989a8f14eaa27e80a87ae84a2c9ce154f56e8629b9f5f4770e6ea2688d29550f5c0253ffb27ed2295acab295 SHA512 b22ad2a16221b97bd927769694ba9d90d0f751b2b0156811866dd52bed1c7b19d8e2d9c805cbd3ccd16dba526802ab90e3a9fcd6acb8d638a0ba81b205059f21
+EBUILD fail2ban-99999999.ebuild 3235 BLAKE2B 68151b88460a56e1caa151bfe38a5e5f8e3338ef9c3d67e80463d4cada9036656b48c896c7fe88eb7f60ef6122f2921cf3472abe3676d07be32ec3ad65469cc7 SHA512 c51672b159da9332469c04b92b7e94deb7c87346aabc011ecf6a2fbbc600df6cebfb4e1eab5525a459903f30335ce20da466d79f56f20ea3d02b6562d4bac261
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
new file mode 100644
index 000000000000..bd35827ae05e
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+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"
+# Needs some work to enable them right now
+RESTRICT="test"
+
+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*' ) )
+"
+
+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-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 358d12b3149a..ab7e2cb0ad8f 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 8df90af737d4..f03457f21d2e 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,22 +1,6 @@
-AUX fping-2.4_beta2_p161-err.h.patch 191 BLAKE2B 265658587236ab7fa67c07f45fa72256bfd25ad4211bdc0c0b95aa312f5729190b2ef2161354e78896a629d85c4f7cce660b5616164c1cf576dd575b8c61b7ea SHA512 f716398d2615e3f5707b3c4bad3ad84088f2acb06b90efcc25af87c54bbc4228326213c2b58b1703a4490a909a3ad59249361a55d9e36a59afc019a25d48d08d
-AUX fping-2.4_beta2_p161-min-time.patch 1653 BLAKE2B e25af1458375d03c981e5f2f0301f32a2b9c4751927eba0577aec0731e4efddfd9ae64e557c4fca5fb8276fba33462b5de08ff8a36f3b1c6cab32b341339727d SHA512 46f34c26de425c96193b5d9e2182cfae38899bd5e63538d508b7d6c713f5518dd56bfb84bfda1e1b81b48aaaf3f4a09cfd0c5e2e2c83e01dbd04a5f7213d2793
-AUX fping-4.1-ipv6.patch 328 BLAKE2B e65293ba588b2a653d8f0d1779f3094aa24f0937d4d35f7634a208370bf2fb83e8b3ef5c98f5d812cde92fc54ce8f37b9992bb9c30da3fb3abd64e0c1138378a SHA512 dd1a598a4ec6f93435f26066c739ea8ba798691ab5365901584e8cd3f6c8ea6fcf566ca0d8ba30bf3c2b8790d24849045751506e00dbc8ced4f260e811af04b7
-AUX fping-4.2-fno-common.patch 283 BLAKE2B 7758e7da9fb4da39bb9d77a36312bfec434b961765d510b071b49dd222a7136515bda0232440b719b8ad4146754dfbeb5648d3ef919a674ad9d81aecd9af977a SHA512 9328e40190691fd54d7059289a84e06dcddedc7cafd1a2af16c682038925d267b0945f4959b37a9acd7dd1ec909322c769e971c743b3bb8454a8fe9edcb1ff7a
 AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78
-DIST fping-3.13.tar.gz 155976 BLAKE2B 6f5b825fd215a4329c35022e326df2e9dc7454b03e9a960074aef451277d2d99af23ccf451379d44a76776fec135983c7948c8bd54bde98c7f79180e59ced616 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d
-DIST fping-4.0.tar.gz 170060 BLAKE2B 1142ed700a28f28ff8710b65300754139734f89123db01fa4a3772f0a804cfa58477b30ab749426be384f7e007437a82138d319ab6a702702314e24c915db44d SHA512 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e
-DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f50a8af1b20c34f51b3dca9b4238fd934b46ad11cb71c539c3a1f82531b44f585c774a0c28a4786105e3c0c SHA512 cd31ea336985f8d727b0db3c70213b827f0282b0c382694e10c72a89c425f2f7383d07f8f2febdc23aa246ebbf65ac9751b2404be405088963a682945edc80ba
-DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a
 DIST fping-4.4.tar.gz 182921 BLAKE2B ddf84d5576170f0279e1d801fbb4afe491c698e5fba3ef4ac6fe25b2dc9b72605c23b6d33559d04170a885ed9ab423cbc1b853110dba93d5d250b6008b0c2a3e SHA512 8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0
 DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
-DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0
-DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9
-EBUILD fping-2.4_beta2_p161-r2.ebuild 1189 BLAKE2B afe89e154f87e6aca77b4de90cbcc2d201713ba946d5b667f7c4fcb26314f5bf42d2079d88ae20d647b3cfd1d147b64eb600ea9d7cf08cf0c1b9048914a8b68e SHA512 0b94a677b031fc3698a3d6a9f9cff27f6274085f06c6936e920beb948c84fbffee8b2d7a0e88f7dc1c2f16ff1e0d3bf75e4c501505502966fc617ce7e06528ad
-EBUILD fping-3.13.ebuild 550 BLAKE2B 8a2e24aa3da841fd15202edeeaa963da2237aecfee1d89ccbce819982ad53f6efcd82dbc7f43cb05cec493af6a2810ff8431bb3e1e99e6dd5b42abf6efc6afa0 SHA512 720857d4d7b5658fcb0c2a125c235fdbd9827dda8a89edab1f23fcbd939ee26160d12bc398925715988a0df4900f37e145c56d626bd591035a0d85d2cc7dde9d
-EBUILD fping-4.0.ebuild 524 BLAKE2B 37afe8c889ff6a04e9a452686a22bc06378b20f09bb7eca6e4c9087dddcf3eda4c2db965f2125ad9c584cb13624f54a02fc8225fcc9810b0ec6200dcfe0d35ac SHA512 e561eb0d9a1090dfdaae4d9fbc5d3207ff27969a26d659e9c3d5a35b6488755d00be8064f578e97ef54a7d40d2521e6d761c8a0e1e0ff2dd7443591deb3579b2
-EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc915f1cf9a42093f9e40eaa8405a46cc8dbee6111d92fbe440921efe26546cb8eca7552a90e1cbc1fe98a4 SHA512 466941d669576fe07cd4e34b75e8b7e648a8e9997776fad2a2fcb419da54f3810844ac1125d0ddbcdb827d0b1794d7c31363c37d6505b19fdbfe2bc3add3e58f
-EBUILD fping-4.2-r1.ebuild 729 BLAKE2B 0e09d1adf6f798e073347356e687d1bf7d31b950d8dc0cd8630665bb6558bbd259d296156597de1a4f2cb7f933144007610ac7a10fc270fa56205cbb6028c325 SHA512 576c28d07fac7010c5febdeea586e5a0e4fbbfb217a7560eecc07f44308e071b15a95277e969d88469bd4e8a438b85fe918357bb12f6628d204f86503c60aa91
-EBUILD fping-4.2.ebuild 578 BLAKE2B 570b1faf781599b7ad1b5cffbd226bef804fbf808ccaab33712f7cc4874e1434fee0c4ae8c19e6930df4144d5fbd9ced8ae3dc4555f7f2a601dd40299eeff161 SHA512 bcd33d815cc898b6a806560047b584af353f00515bbc5f3a9c2203083b2faf7eefeaeaf58b800803d1c8f939fe94b50377654f4d448da36a3ff257a7138e1eef
 EBUILD fping-4.4.ebuild 724 BLAKE2B a51d93dd39d228d94a28c2a28bb5559ee7560927ac5fcb6b7bdcdcd8f2c8d85aee2d52c69ff114967761cefb0803cc1ee30f00afd8897b6fad527f06a4311ce5 SHA512 025d2cf95e10f8ed4a9e6f04848d546c9840af60be844a964e2da03405ea542f6f09c3c97e3136037a53f4964491e07c56f14030e7894c30bccf1126c8330313
 EBUILD fping-5.0.ebuild 719 BLAKE2B 98ced5b720717b803a90cd638c197df5507d59038d6a948eb8d3f2c6d8d5f44998d60ae5c7004779fa0af70cf1a954f03bc38b132fcf83a4c8814b473c04e73e SHA512 a66671876fdbba80c0f12e82a6378b7615b61682a3bd7f9205195ead0738ddca9d13205fb41330e50fa06607087edd0ca2607e4ec1378391ae6a3053c75e5fd8
 MISC metadata.xml 355 BLAKE2B 6e4fd15cdfa76be00db905cfbff100e3ba30fbc04f0e5fe42cecdd7f66e3c2478ef626b11d5f0be2f43e5526dc6022b1334a5c51253396f3b582cf56b28b4a8f SHA512 036f801bf73918249011ac68a06d0b1e29e5f8685209cd70a0df02b9f43271d57222f4250f973b2b65b7b0c0811598ff0179e0ea09ec70683abf99a14dbe48d6
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
deleted file mode 100644
index 38946ac38524..000000000000
--- a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/fping.c
-+++ b/fping.c
-@@ -106,6 +106,7 @@
- 
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <err.h> /* err() warnx() */
- 
- /* RS6000 has sys/select.h */
- #ifdef HAVE_SYS_SELECT_H
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
deleted file mode 100644
index a101fd4ae0e1..000000000000
--- a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/fping.c
-+++ b/fping.c
-@@ -25,6 +25,7 @@
-  * Original author:  Roland Schemers  <schemers@stanford.edu>
-  * IPv6 Support:     Jeroen Massar    <jeroen@unfix.org / jeroen@ipng.nl>
-  * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
-+ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net)
-  *
-  *
-  * RCS header information no longer used.  It has been moved to the
-@@ -743,7 +744,7 @@
- 	
- 	if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) )
- 	{
--		fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n",
-+		fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n",
- 			prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA );
- 		usage();
- 	
-@@ -1112,7 +1113,7 @@
- 		ht = timeval_diff( &current_time, &cursor->last_send_time );
- 
- 		if( report_interval && ( loop_flag || count_flag ) &&
--			( timeval_diff ( &current_time, &last_report_time )	> report_interval ) )
-+			( timeval_diff ( &current_time, &last_report_time )	>= report_interval ) )
- 		{
- 			print_per_system_splits();
- 			gettimeofday( &current_time, &tz );
-@@ -1487,8 +1488,8 @@
- 		}/* IF */
- 		
- 		fprintf( stderr, "\n" );
--		h->num_sent_i = h->num_recv_i = h->max_reply_i =
--			h->min_reply_i = h->total_time_i = 0;
-+		h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0;
-+		h->min_reply_i = 10000000;
- 	
- 	}/* FOR */
- 
-@@ -2377,6 +2378,7 @@
- 	p->timeout = timeout;
- 	p->running = 1;
- 	p->min_reply = 10000000;
-+	p->min_reply_i = 10000000;
- 
- 	if( strlen( p->host ) > max_hostname_len )
- 		max_hostname_len = strlen( p->host );
diff --git a/net-analyzer/fping/files/fping-4.1-ipv6.patch b/net-analyzer/fping/files/fping-4.1-ipv6.patch
deleted file mode 100644
index 7889b568a194..000000000000
--- a/net-analyzer/fping/files/fping-4.1-ipv6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/fping.c
-+++ b/src/fping.c
-@@ -687,7 +687,11 @@ int main(int argc, char** argv)
- 
-     /* validate various option settings */
- 
--    if (socket4 < 0 && socket6 < 0) {
-+    if (socket4 < 0
-+#ifdef IPV6
-+        && socket6 < 0
-+#endif
-+    ) {
-         crash_and_burn("can't create socket (must run as root?)");
-     }
- 
diff --git a/net-analyzer/fping/files/fping-4.2-fno-common.patch b/net-analyzer/fping/files/fping-4.2-fno-common.patch
deleted file mode 100644
index d18af66b0637..000000000000
--- a/net-analyzer/fping/files/fping-4.2-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fping.h
-+++ b/src/fping.h
-@@ -11,7 +11,7 @@
- void crash_and_burn( char *message );
- void errno_crash_and_burn( char *message );
- int in_cksum( unsigned short *p, int n );
--int random_data_flag;
-+extern int random_data_flag;
- 
- /* socket.c */
- int  open_ping_socket_ipv4();
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
deleted file mode 100644
index 23e248eb31f2..000000000000
--- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-SRC_URI="
-	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz
-	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz
-	"
-HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.html"
-
-SLOT="0"
-LICENSE="fping"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6"
-
-S="${WORKDIR}/fping-2.4b2_to-ipv6"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/fping_2.4b2-to-ipv6-16.1.diff \
-		"${FILESDIR}"/${P}-err.h.patch \
-		"${FILESDIR}"/${P}-min-time.patch
-	eautoreconf
-
-	if use ipv6; then
-		cp -a "${S}" "${S}-6"
-	fi
-}
-
-src_configure() {
-	econf
-	if use ipv6; then
-		cd "${S}-6"
-		append-flags -DIPV6
-		econf
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd "${S}-6"
-		emake
-	fi
-}
-
-src_install() {
-	dosbin "${S}"/${PN}
-	if use ipv6; then
-		newsbin "${S}"-6/fping fping6
-		fperms 4555 /usr/sbin/fping6 #241930
-	fi
-	fperms 4555 /usr/sbin/fping  #241930
-	doman fping.8
-	dodoc ChangeLog README
-}
diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
deleted file mode 100644
index a4c4388c06a1..000000000000
--- a/net-analyzer/fping/fping-3.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="http://fping.org/"
-SRC_URI="http://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 suid"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid ; then
-		fperms u+s /usr/sbin/fping
-		use ipv6 && fperms u+s /usr/sbin/fping6
-	fi
-}
diff --git a/net-analyzer/fping/fping-4.0.ebuild b/net-analyzer/fping/fping-4.0.ebuild
deleted file mode 100644
index 82fc433b4cc2..000000000000
--- a/net-analyzer/fping/fping-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="http://fping.org/"
-SRC_URI="http://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 suid"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid ; then
-		fperms u+s /usr/sbin/fping
-	fi
-}
diff --git a/net-analyzer/fping/fping-4.1.ebuild b/net-analyzer/fping/fping-4.1.ebuild
deleted file mode 100644
index 0c25ab5c1df4..000000000000
--- a/net-analyzer/fping/fping-4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="http://fping.org/"
-SRC_URI="http://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 suid"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1-ipv6.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid ; then
-		fperms u+s /usr/sbin/fping
-	fi
-}
diff --git a/net-analyzer/fping/fping-4.2-r1.ebuild b/net-analyzer/fping/fping-4.2-r1.ebuild
deleted file mode 100644
index 0e1b61dd97e7..000000000000
--- a/net-analyzer/fping/fping-4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="https://fping.org/"
-SRC_URI="https://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 suid"
-
-FILECAPS=( cap_net_raw+ep usr/sbin/fping )
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-fno-common.patch
-	"${FILESDIR}"/${PN}-4.2-fping6-6.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid; then
-		fperms u+s /usr/sbin/fping
-	fi
-
-	if use ipv6; then
-		dosym fping /usr/sbin/fping6
-	fi
-}
diff --git a/net-analyzer/fping/fping-4.2.ebuild b/net-analyzer/fping/fping-4.2.ebuild
deleted file mode 100644
index fff3fa9ccd77..000000000000
--- a/net-analyzer/fping/fping-4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="https://fping.org/"
-SRC_URI="https://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 suid"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-fno-common.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid ; then
-		fperms u+s /usr/sbin/fping
-	fi
-}
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index e84cef49aad0..67acd209a735 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,5 +1,4 @@
 AUX hunt-1.5-exit.patch 208 BLAKE2B 0cb8afdb88649dc60e2d854a17cfc0ca5177257f101b25411c22707776369f9e758b3795d3c8d2a1f2bf68607371c3f7e99b6a0d5d850082800260febfb24267 SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8
-AUX hunt-1.5-flags.patch 507 BLAKE2B 2eccfe6119d07770fa6ddeecf7de405ec8fd2f3d28318a0cbc264c6ad6069fff7152109bd7aad5b06e90d0de3b1b4c625d4bfb6b7f35774c86ae8ba8077c8681 SHA512 2d354317438a387220089635aeda449a922746ce0b38b14b57bc0daf30f5216691a7c5098d569143e2b70bd7e8d7156b2a42423bca13c5e77c635f64d1804546
 AUX hunt-1.5-gentoo.patch 377 BLAKE2B 728df0a5a8eb29c039fab217825acd3162e9ec58ec1f73e854d3e10b981b6835f387592d0be81c622676fdeb6966b28243e4adb57d4e4e9863b9e3c759e4f542 SHA512 f2f499ee496112fd89e632565d393ce4af6e358481a47de4418490e87c90128870cf201274a39fe92b7e01044e3d182fb0c30d370161917bf2bdbb8961491799
 AUX hunt-1.5-log2.patch 387 BLAKE2B ba98751feb2a4c7544ac6c238016071fb01dbdbd81ab8a6a08df64b3adf8ac1896a8e883a4295c5681ee806c6528191ceb2ccef293705ab188ed5ea59efc872b SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff
 AUX hunt-1.5-tpserv-log.patch 3426 BLAKE2B 23ef690623d82440e5749c42eb78c48e3226ffbe9b8aa1b59e1f63bf0595aa9f52c091c0897ecc8fa28d974d0356c472227416ed51d0909b3d3af9c22d94c1d4 SHA512 7690f0e1089b1767a1d4349fac66fc9897c542482677c54f77732b4377f561387301982c7aed60a15973ec2f08d2901d936fb86d6ad516594639441eeb81f289
diff --git a/net-analyzer/hunt/files/hunt-1.5-flags.patch b/net-analyzer/hunt/files/hunt-1.5-flags.patch
deleted file mode 100644
index 2ffcd823847e..000000000000
--- a/net-analyzer/hunt/files/hunt-1.5-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,7 @@
--CFLAGS=-Wall -O2 -g -D_REENTRANT
-+CFLAGS += -I. -Wall -D_REENTRANT
- #CFLAGS+=-DSYNC_FAST
- #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR
- 
--LDFLAGS=
- #LDFLAGS=-static
- 
- OBJ=hunt.o main.o c/list.o c/hash.o c/array.o util.o net.o \
-@@ -11,7 +10,7 @@
- 	addpolicy.o options.o resolv.o timer.o pktrelay.o
- 	
- hunt: $(OBJ)
--	$(CC) ${LDFLAGS} -o $@ $^ -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
- 
- hunt_static: $(OBJ)
- 	$(CC) ${LDFLAGS} -static -o $@ $^ -lpthread
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 8a12ae8654eb..427305139843 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -2,8 +2,8 @@ AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bf
 DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
 DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10eacded15941545d8d7cee19c954aae2619c39a11b1eeaa79f5a381b5dcf2e6a6e0b8fdd7e78e75f41ab10b71e6a0a SHA512 6dc3b5deb7c6fb3776ce696492975db43c13fa2d1d956712e7738ef34ac1bfc5f5d63a5211ba8e9fabf391e8bc5560c08c5d5e219b0cfe067e3499b2c02e6f3d
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
-EBUILD iptraf-ng-1.1.4-r1.ebuild 1325 BLAKE2B d27a62d5195b922cb586cf4fa65b6e5af4f4deb81ac4b854c0eebead7b6cda8a2e9a21fc94e184f6a2e02aec33a28964aebaca1620fa4f17b5a56d9d0a276a1b SHA512 62c3d031eeb0629adec93ef8347f8ae252633092a0ed372806304979e450ac7ed3513873d598795a98c564b6d847e698f3c0e7808adc3f253791f21b49e6ccf7
+EBUILD iptraf-ng-1.1.4-r1.ebuild 1326 BLAKE2B d5d601fda955334b542f7d16413c02bc53a74ca917b7e0dd225393cd37754e7090983ac97e71813ff3f9530d34ec4ab129f96c0041f34339470e7efa56ee2a54 SHA512 8e0bc6972a46fb21b3fa04e17236d68a07c7d4fb83bf0a850d520b2f00e7e95dc115993c2c5f207aad4749e4b58040376a2c8f003113b0b3cc171b1bbc77555f
 EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5
-EBUILD iptraf-ng-1.2.1.ebuild 1217 BLAKE2B 86b513e6512d3e50e84c137f7411aadd460263ae0f146921fced0bebba4d12f15148d802ebd692c6b6ffc4c7d6d25f8a5a2de403d8b44328b0065f7a1da8f43d SHA512 3d8b85657fa9f99eca7e2c9d7e5722d1744634aa51d1aa610471e7d8ffb4dfb016892afadc9b2334acbaa9c5d9c993f54722e19c30b743af229848352ac3b127
+EBUILD iptraf-ng-1.2.1.ebuild 1223 BLAKE2B 65337b95d7cea650e2c5bf9ed258bf46af427e3fc6f8585df657d6a98aa702bf4c6379e19b2f525b9fcf65689033f5f06ffb706d8136cc3aa356763718082528 SHA512 0bc4eb5554c28bcedcc6feb6ae0a54389a626f70a72394a8215f9ec2f384ff0c34ce456a087a0284cf53a7377e0f84d1cd1b4886ea376741a20be4694e2b889c
 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
index 414a906e2eb0..3a2bcb201de4 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc"
 
 RESTRICT="test"
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
index 643acfc262e0..cf6548199533 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index f33235d352d6..52566ee7abb2 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -3,5 +3,5 @@ DIST macchanger-1.7.0.tar.gz 396848 BLAKE2B 7a6e5cbf302568884363ab4023033b53b1ad
 DIST macchanger_1.7.0-5.4.debian.tar.xz 25084 BLAKE2B 65d39333e07a4c89da7e622aaccc0f2cab45af8d84721c3d39c457dfaf3063df872812d07860cbe78634159b0a2944e75aa54c11f46eadc37b9d4a23fc81b629 SHA512 b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc
 EBUILD macchanger-1.7.0-r1.ebuild 827 BLAKE2B 37ea254281948010006d9c4d8a2bc367890ce5f3f01018c8948d6bc11619ea0c1b0bf9dedba72f166c44c4b7130084552c53c4db89666322f008c36341318be5 SHA512 e4ea29afaae5fef4772bc7f35b050047ab4c0b8338dcd99c3e1ae9548a2f484b75796161e07de1d774b723080fd349c06e44d4a64f1293bbc850d2b594c7fdc8
 EBUILD macchanger-1.7.0.ebuild 786 BLAKE2B 5c254408e09b2c9ac7d3be4f7c96f50619dc534b25de339b8bac9281c250bd5d9f5dfa73120e2d9b01c27a54cfe8735314cb5fe7594d3d650f82b6d71ead6497 SHA512 f41d16d66bb5bfa112b988fbda7d70a0ef21f8d638811bfb2eacfdbd392170c1fc3767e702804c2e2d62f54efc2d4509e0cd8404eca7532d6872b443bf8b76fc
-EBUILD macchanger-1.7.0_p5_p4.ebuild 1317 BLAKE2B 672afd58dc3d16cbb3266d2c7349219ee64e81d07483c5b81c37fcf45e4c33ebf550585849fc13e918ebe30b514987d03af123c279ce09cecfbb4685f88c1b23 SHA512 8d09e195e8df485550961ddff8f7adb19fd1789c51112c4c38870642e3bdb0b3c16265f186d6a09f19fa4f6b3205c6ece1d9773c3baf7d5dfbc65a757eeb019f
+EBUILD macchanger-1.7.0_p5_p4.ebuild 1316 BLAKE2B 8fe7a2a3efcd35b4acfcde041b5a148a0a56038a48edf3dc2205de8fadaeca17f588713c75e2470bb61ee99a5e665917e912a5297e0e5e7d67c563c14ee46841 SHA512 9b071279080331609b19e244d39651d96791c2bf06ac4f27adad4eb62481877c2a17bd44e3885341821cca500625ac7dde00036ba9f3322e9f67bb21189e7ebe
 MISC metadata.xml 473 BLAKE2B 4bc062f103c20f1f68bcd0242fee42a5e5c1b8ce862f336fda153bddc6294ff7e382edd5fb4aaf7091b1701cfb88b5db82da3f1b0cce7d8bcc4ef0141ef0536f SHA512 f328b70876919441f61939ad0198c98acfcae561b3eb27beeb6d09d565191f64075a63e7f99af6d69493c6100256fb2cec0a3b60b62c7d28fd41c885cedad4a4
diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
index 84a233813719..93a8476bcb30 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 	mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz
 "
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc sparc x86"
 SLOT="0"
 
 PATCHES=(
diff --git a/net-analyzer/nagios-plugins-flameeyes/Manifest b/net-analyzer/nagios-plugins-flameeyes/Manifest
deleted file mode 100644
index 0954a95d8fd5..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD nagios-plugins-flameeyes-9999.ebuild 1107 BLAKE2B a20d900da62f208cd2e03e01decadfb50e26cfd10502bf6c7d72b1967809641c9b994e3a5e1ef483a8d448922aace25fdf952ff4fa2296a6ae32ee086a2c0aeb SHA512 bb60220d159725156c080fdf255856f6f40ca4064ac563f218a31cbd051108a1f3ab7d04e7b2016d80e5678602e58107047c1f595f77d620f636f470ed453336
-MISC metadata.xml 626 BLAKE2B 5656a8de553bc783b4bd81891421e89b60a5d1693ddab0a0f7cc0ff527fd5c908c872e4797688db87e89cf8e8be12c1f8e0e6e12edfca93f17fe62f8ee688e6b SHA512 f89139edf88000f6767eeb1424ead0fc9a87e9ededbdb4277e73db92a766804182540aa82a0de37b7b708d0f5094fc816be9be2485a8f1af9190cc690cd57176
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
deleted file mode 100644
index 7bf85b98253c..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sysadmin@gentoo.org</email>
-    <name>Gentoo Sysadmin Project</name>
-  </maintainer>
-  <use>
-    <flag name="smart">
-      Install <pkg>sys-apps/smartmontools</pkg> required for
-      S.M.A.R.T. disk monitoring. Disabling the flag removes the
-      plugin file. This plugin also requires the sudo flag to be
-      enable.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Flameeyes/nagios-plugins-flameeyes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
deleted file mode 100644
index 351eac1d17cc..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 multilib
-
-EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git"
-SRC_URI=""
-KEYWORDS=""
-
-DESCRIPTION="Flameeyes's custom Nagios/Icinga plugins"
-HOMEPAGE="https://github.com/Flameeyes/nagios-plugins-flameeyes"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="smart samba"
-
-RDEPEND="
-	dev-perl/Monitoring-Plugin
-	sys-apps/portage
-	dev-perl/Time-Duration
-	dev-perl/TimeDate
-	smart? (
-		sys-apps/smartmontools
-		app-admin/sudo
-	)
-	samba? ( dev-perl/Filesys-SmbClient )"
-DEPEND=""
-
-src_compile() {
-	cat - > "${T}"/50${PN} <<EOF
-Cmnd_Alias NAGIOS_PLUGINS_FLAMEEYES_CMDS = /usr/sbin/smartctl
-User_Alias NAGIOS_PLUGINS_FLAMEEYES_USERS = nagios, icinga
-
-NAGIOS_PLUGINS_FLAMEEYES_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_FLAMEEYES_CMDS
-EOF
-}
-
-src_install() {
-	insinto /etc/sudoers.d
-	doins "${T}"/50${PN}
-
-	dodir /usr/$(get_libdir)/nagios/plugins/flameeyes
-	cp -Rp $(find . -type d -mindepth 1 -maxdepth 1 -not -name .git) \
-		"${D}/usr/$(get_libdir)/nagios/plugins/flameeyes" || die
-
-	dodoc README.md
-}
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index 756f467dc032..3ec2c4129d83 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,5 +1,5 @@
-DIST nagios-plugins-linux-madrisan-26.tar.xz 379480 BLAKE2B e30fa00c029506ffd76e9c16f409f62f00ab481894d6b35dd34470dab5f2a18b2fc18bd06ae5e6a7179ed23f36c785c9a403258b9066e5a08f6a139ab0192088 SHA512 61c523ddf7a98ae01caf543a7e38903478346ce380884a7cd2a2e592db806e73fb996675aa701e2bbf57b31ed062886daba4af70cc2875e1c296537de01c588d
 DIST nagios-plugins-linux-madrisan-27.tar.xz 385324 BLAKE2B ef207e365d044fefa8c0dbef7aae8a50ec9b6c70d60d069574ed423646d1e936e0bd6bbb316070d94f354236f815e508da4ec1b298e89958c8393a041f98a908 SHA512 5d93912f2237449e29e963cca260fbe7a735f47e7c2752402e2f371289e2875e4fea35f191705d7a2f01ac49381e039b720f43c8c794e85ee0bbbb01d212a10a
-EBUILD nagios-plugins-linux-madrisan-26-r1.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
+DIST nagios-plugins-linux-madrisan-28.tar.xz 390428 BLAKE2B bc41fb7d3b639fe2d133c2ff6643562ce94e5523b13aa18045d7265ae8d9d80873b0611aaee0f0fa8b959e0da3e2c350868574a8986c0d9436b6bd4e4154d908 SHA512 c72065ade12ec60c86479276370215bc0dc419ae9681d7260c550f8985300c39c1c8e39537c51c56e0c1ae61283befc5d111ffd47394de7dc7f7daa5993254fc
 EBUILD nagios-plugins-linux-madrisan-27.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
+EBUILD nagios-plugins-linux-madrisan-28.ebuild 1108 BLAKE2B f72e33a87c21f0f18630990cdceb46991b0d2e9de3a0d6395b87fc901fd29bccdff04b5eb2e27b174c860ef45cb97ef33ce74062c4e8cb784e05ca6d87f2b2e4 SHA512 ddababf0001ba44e92ba35a68ae3514425291733fd195fbd3e6ae7101ed246e6e4f5c127844957678e61179772b150396a18ebf7809da4c6a2e358804d4393ff
 MISC metadata.xml 612 BLAKE2B 0766fb1263f00a86cb3a04f1214193d59cf52b49738299389cfafd6fbb179c359387cf0267f7cef083cf6b416db39733c30426f8240ffa4d3944d90c7da1fb43 SHA512 990649aed9420b40d725e3a4a78bfe7e9504e216292835c55bdd634310840f85609fe13d35ebe351a9f66ea1b7de12d823bdec42fc91cd1ea797cc7098370e7f
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild
index f76ea708a821..a0e44b8d7feb 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild
@@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Additional and alternative Nagios plugins for Linux"
 HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
 SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -23,8 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 	# Avoid collision with net-analyzer/monitoring-plugins
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index d0ae39ce1ae2..12f35d9f9081 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
-EBUILD nagios-plugins-2.3.1-r1.ebuild 3044 BLAKE2B 2e0e3dd1918969f8df738cb7d09909367680607c6f001c124e9a025a1c2e4183eb6818d38d4f9cd826544ce4b1cbdca388d703635ebd450500c8e01a2edc540b SHA512 70f2a2b41b1289aed40949d9f74778d50c482039c3095d34b5f988a487352cdb1742b5fe6ea0bb2cb7d6be4706b911d43210262a2b39d84ff4cde849ddcdcbc6
+EBUILD nagios-plugins-2.3.1-r1.ebuild 3045 BLAKE2B 1c58e0ad3b9d0fe3edc6fc756284aaec94488f67fedc88149ec1154ff6b488f737ccff6dd59a3c653d16e0e41c75e45f305d4236f27bd7d1da85f01608a4c774 SHA512 c700e8d891c208fc3129ebae102896a9c3db025cf4661bdf4541679f4cc646276531fd569614a42d13c02c16e42470d3f3d75d08e281b730dab3ad4b726a9f23
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
index 323a3523cf7e..8f1178da010c 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nagios-plugins.org/download/${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="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 581abfe44e69..9f1df6f58502 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-8.1.0-es8.x86_64.rpm 15139440 BLAKE2B 9005191c02478da6d4c4d2997689100e38b4521b51b63521bfa28abb0d14abbba4cca20084c9ea4c42877504a33400447ea1701e0945201b3094a54604b17ffe SHA512 a95ce61146907f80dda89300148e84cdab26a1318fd8db01ec5edba57cbc07390068a243aafa9b866df2313a5291bd0403297496487b9b16b9647d202797d77c
-EBUILD nessus-agent-bin-8.1.0.ebuild 2322 BLAKE2B 78a7eb0cec02ec3dfc242ba6ddcaa8d08d633f29b8236655cea10c6ac486965bf72e18f2df9a7ad0a7e9f5be840ff7e3b31bd9d6e2b312f3c489980d92be5910 SHA512 eba4b0ca29c6fde98f6803f7bdeb26b17795422eb430226356ce7de55deaf0b20dffdd52a4014f6ec43400d5c02959ade919b68c9f44091c9aec7ddd68280c11
+DIST NessusAgent-8.2.1-es8.x86_64.rpm 14895872 BLAKE2B fce714456a6cbf7b4f6bc8171e5461591761e5b16683b253c723738b3afe9624caa8d0dbf153c665f1cd696da48c44e1d0ddd7a9f3355faeb52b8bf285f749b0 SHA512 357cb33527411eb698879f4af329906e4ce677a4b4d70099f4d4933d0eed3a5330541def3a20d1a72aee6be1c4b5c9cb81dfe125d12e562fe0ad27a81605bd8c
+EBUILD nessus-agent-bin-8.2.1.ebuild 2358 BLAKE2B 2375f9957e2109648af925374701ae2303d428cd59aa913e16eb6ddb81bd0793866d39606da4bb054e5c42f0701caccb20121401a73b76284bf2f22e6a8023dc SHA512 a10eab141c37e7895be64a627bd8a44b7027c0129dfad90dbd0b3bde68b99b075b29609764498ccf58a9376a5f4cea7dceb7f0bfbc4623c2e8620c12040b892f
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.1.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.1.ebuild
index bcc8308edd06..9436416d89df 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.1.0.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.1.ebuild
@@ -19,8 +19,9 @@ RESTRICT="mirror fetch strip"
 
 QA_PREBUILT="opt/nessus_agent/bin/nasl
 	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libjemalloc.so.*
 	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/iconv/*.so
 	opt/nessus_agent/sbin/nessus-check-signature
 	opt/nessus_agent/sbin/nessus-service
 	opt/nessus_agent/sbin/nessuscli
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 7c95710748f7..69d05f532bc0 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-8.12.1-es8.x86_64.rpm 40523256 BLAKE2B c4b401e65142bb4c624194d8712b8de3f38f5287d27da7a0e595b32a1802d4218ff9b00632643bf63d8584d7a22fc63dde054cc4bbc6ce8bcb5132ba694da8fd SHA512 95eaebc0ce8e1369390e448cfad4048e11f6bbada8b8102b1921074b92818564531ed427aeac0e14519b85e1597fc256a67d5d14b13c6be9de459d99d44eeb23
-EBUILD nessus-bin-8.12.1.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f
+DIST Nessus-8.13.0-es8.x86_64.rpm 41087764 BLAKE2B 38ccb0fe298dbcb9e7fe7481a137a3f5ed0b2d22c575ac6669b72f9e2588d834b287e3aab9632f6f5e7823100eeaaac9fda0fd966b5f850ca3dc73eaa1c8102d SHA512 3fddaba821efa27059c22c1df5d7fad36813e6f1aad48402d4ea2eafba036a1cb8f74c29aebbc39065db7efc66c3669b1514d6f2fc4d0cf69ca5f7a75a5d2a50
+EBUILD nessus-bin-8.13.0.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.12.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.13.0.ebuild
index 1e569f0e0f10..1e569f0e0f10 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.12.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.13.0.ebuild
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 6a96c83b6e1a..b512dd4070f1 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -2,7 +2,6 @@ AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997d
 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415
 AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
-AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
 AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636c0fa01730141bcb6ec71c540053e0d5a50e7e3fd410b730e78b0bb3f8b1a856dcb7dc24eaece972fe00afa5f43ff3711f SHA512 40a61a4bebfd289f3474da483177c0031096aced23bbf69e1bf7b5d7b383710b1df05b074baf1ccb87035b4cdde3b8b70773455e457ad53f347781d7c5368a8a
 AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
@@ -16,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 5667 BLAKE2B 56d363f8e669ed84b134d6808188a66d121490d2bd21ead5ad2621314c5df9ec6722bc361f18603de05691149584b99a2279a5c7a6709f4f513741e34d90a047 SHA512 c568a2142e2c40e8b7662f1a248800c416b83f5d4db02250d0b2a84ed42c174b474f38746c1b82f8ba03dda8cdb6cc721b4712cd90702d63aa070c4fdb075ff4
+EBUILD net-snmp-5.9-r2.ebuild 5666 BLAKE2B 8b7ab8cdd193ac45fa4b062c8b431e58e68726f6a3d25bf0ca93e8e9c57a34c0a27c8f6754821dfdb352d6ef3de0825ec6290bccf98faacc1f3b65af60afbffc SHA512 ca456df45a171fa900255773dac673997d50dc5061f84a3652fb4952d9fd8fb9b4fbb82c1834a4a6f7885d0faebead5033c7be99dabc7cfe1ccec63462caaea3
 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/files/net-snmp-5.8-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch
deleted file mode 100644
index 746575a9b7fb..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -611,6 +611,7 @@
- AC_CHECK_HEADERS([curses.h])
- AC_CHECK_HEADERS([ncurses/curses.h])
- NETSNMP_SEARCH_LIBS([endwin], [curses ncurses],,,,[LIBCURSES])
-+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
- AC_SUBST([LIBCURSES])
- 
- #   libm for ceil
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 389a8f5e207f..bca96ebda9fe 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/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index f3ab28e45adb..27ec745279ee 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,6 +1,3 @@
-AUX netdiscover-0.3_beta6-fno-common.patch 837 BLAKE2B 9b980d3de4565b4c139b7a325873c6602eef4825d7874ef79e94759a71fa07209c607548f89d46a44cad1be52c5bdd49fdb567c10d154cd1701c2a69dd873ccb SHA512 b4ce0c7c3b152a95f08bcc1190b971b632b325af8ef10d0b21ea5ed5b17b890366d7ea79eeefa3422e3906f447fa046051122795738a66574c738d5c629f8ddf
-AUX netdiscover-0.3_beta6-gentoo.patch 668 BLAKE2B fa0f3080a27e41029e604b0018ecdcb5569ddec556cf0ff8da216128b6c598a0f48ffa1a113d92b8c5b3e91d92a75d30552a493e1ae2805fbc62101f7f9315df SHA512 f05aea3f8ef120f3f1a33f1dfff401fc5045cb6e71735dcdc135bb33b5bb338eb90fb442d474a0e8a993df5d67f70fcd676f12c582ca1509d5550724d4f53b99
-AUX netdiscover-0.3_beta6-misc.patch 432 BLAKE2B 740fd53b60002d4c5577a23ad492d268f4c75aa4057b999fd3ebccecd187aba15982c1e94ff9044d1a5fefc46ff51ea31deb57e6df58de72eec24f179c2bf867 SHA512 bf67008aa25558d2a8d1a2a5731fdafb555b5336db2be3ffc6f15e89312341eff9bd351115a2cbd21078d823f4b79a81f0583b0380d44eb617a2770838c07de7
 DIST netdiscover-0.7.tar.gz 356514 BLAKE2B de880e124d1ee52c5466cf843ad3fc7077c9a673867f117f255791da9fcc8444599bf703515ef04eaa0f3fbc8ed50951bbd6cb147b1eb18020e06d35a90ccee4 SHA512 e526c1560c4054c6a2761d392997629b301c50db2c408719e84a820f9ad206825b9a4620e6721dcdebbb5c7479cd239e85de2d0657f97015b103805e8f9c05b4
 EBUILD netdiscover-0.7.ebuild 666 BLAKE2B 4b8b7e603e5e211cab03b8cb7b3f64a6121b26e511377054ce4bd8053c9d6cd8fc320e62c2ed76aa5cce97c6941f609dd304b561c0e8e2c51cb274a366bdc081 SHA512 5d867270a314032b76b01c6ca1e3e03eb941e3e7c1309484aafed0fbeea4270993567382fc35561c05b90375980218c5c89a4298a8d1d4f519eb711910e8ecab
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch
deleted file mode 100644
index 8355321085d1..000000000000
--- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./src/ifaces.c
-+++ ./src/ifaces.c
-@@ -72,6 +72,7 @@
- unsigned char smac[ETH_ALEN];
- struct p_header *temp_header;
- 
-+char *ourmac, errbuf[PCAP_ERRBUF_SIZE];
- 
- /* Start Sniffing on given iface */
- void *start_sniffer(void *args)
---- ./src/ifaces.h
-+++ ./src/ifaces.h
-@@ -46,7 +46,7 @@
- 	
- 	
- 	// Shitty globals
--	char *ourmac, errbuf[PCAP_ERRBUF_SIZE];
-+	extern char *ourmac, errbuf[PCAP_ERRBUF_SIZE];
- 	
- 	// Sniffer Functions
- 	void *start_sniffer(void *);
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -48,6 +48,7 @@
- struct arp_rep_c *arprep_count;
- struct winsize win_sz;
- pthread_mutex_t *listm;
-+char *current_network;
- 
- int scroll;
- int smode, oldmode;
---- ./src/screen.h
-+++ ./src/screen.h
-@@ -24,7 +24,7 @@
- 
- 
- /* Ohh no, more globals */
--char *current_network;
-+extern char *current_network;
- 
-  
- /* Structs for counters */
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
deleted file mode 100644
index d70fc36de5a5..000000000000
--- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -5,7 +5,7 @@
- 
- AC_INIT(configure.in)
- AM_INIT_AUTOMAKE(netdiscover, 0.3-beta6)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- 
- dnl get system information
-@@ -35,7 +35,6 @@
- 
- AC_ISC_POSIX
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
- AM_PROG_LIBTOOL
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,8 +5,8 @@
- 
- SUBDIRS = src doc
- 
--netdiscoverdocdir = ${prefix}/doc/netdiscover
--netdiscoverdoc_DATA = \
-+noinstdir = ${prefix}/doc/netdiscover
-+noinst_DATA = \
- 	README\
- 	COPYING\
- 	AUTHORS\
-@@ -15,7 +15,7 @@
- 	NEWS\
- 	TODO
- 
--EXTRA_DIST = $(netdiscoverdoc_DATA)
-+EXTRA_DIST = $(noinst_DATA)
- 
- 
- 
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
deleted file mode 100644
index 2b92bfde8629..000000000000
--- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -33,7 +33,7 @@
- 
- char *search_vendor(unsigned char mac[6])
- {
--	char tmac[6];
-+	char tmac[7];
- 	int i = 0;
- 	
- 	sprintf(tmac, "%02x%02x%02x", mac[0], mac[1], mac[2]);
-@@ -42,7 +42,7 @@
-     for (i=0; i<6; i++)
-         tmac[i] = toupper(tmac[i]);
- 	
--	for (i=0; i<8436; i++)
-+	for (i=0; i<NUM_OUI_RECORDS; i++)
- 	{
- 		if (strcmp(oui_table[i].prefix, tmac) == 0)
- 			return oui_table[i].vendor;
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index e3019aebbaca..480412a2eeaf 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -5,5 +5,5 @@ AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.45-r3.ebuild 1050 BLAKE2B 405266d7b8805ff562241b5ac72e0a0319754884b64934e71c650e63577da53e18704a32648bc72c1aae35a4036606c4922169d10a3e2b8d481632c141a25ce9 SHA512 6bdd2ebb0b45d9c7744243a0f16c193b3d4501b10716ffdf614774a9ba63168be8d14c2b2795322b41469e820a3aeb511e57343ebbbef01abc45292192af93d0
-EBUILD ngrep-1.47.ebuild 979 BLAKE2B 78529aa9d657cb4ae93b4c6c3efe6006cf972603cd20195ac676c85c4524e42c1ef4e6a4ccbe09ae05239acf7fe7cae695bb04a0348546af0620ca7ee5068158 SHA512 b4a45c91ed963233026443fe6505a092b971451fecfc7578b2ed01ffe98d25ec15f1807aed0bbf23d2b76e84e513a3d9b5a37ca033d066bc93bdc40dea9d9076
+EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 3fe551bd7997..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/pinger/Manifest b/net-analyzer/pinger/Manifest
index 16e8e9e6b0be..d5089d2332e9 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,5 +1,3 @@
-AUX gtk-2.0.m4 7539 BLAKE2B b129c696c03264551aed12e6c9d0bb46dc83141b6a033280bd4abe0468044ed0384f0cc66a48980ecbce826e3d105cd454f61540a33b8a9990e013df5945f900 SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e
-AUX pinger-0.32e-tinfo.patch 907 BLAKE2B 8b6f43e44ec59353c1c59a4af6de4aab254182e4b55fa1f518f7c4bc053ec9659f44f676df4b4469f380779a1ce2485b05955cb399ac1b7834d63090fcc590e6 SHA512 690b3b669d225c55641fce56d91d287a2152c0546b15f728761ec869afc311a49f831b38642f63f999958e20ba6ce2855efc2a5c3aec6ab2a752349cc375904f
 AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c570677ce60cff01a4ce517f1557256cdc3c440049c68aebd642c4d92d76b29cd56ef18da1d9161e06dac20504ce4207 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730
 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1
 EBUILD pinger-0.33.ebuild 1078 BLAKE2B 06914b03d4a01a297ab2076a2339acc5c2fae072f48594a1d19803ef3861c8e9250576e7843724806b1c0bd8ab1bc5d7d36c301fbedb3e92e1a3db4bb6f1216c SHA512 f51daabcbb7e8781955b9232b51d3bd5589be2ce0c724b30f75f9ddd9012168879a51813c93b52a1b185e63c2389027c1483a76078582d9691a1e1e7b6aa9bf9
diff --git a/net-analyzer/pinger/files/gtk-2.0.m4 b/net-analyzer/pinger/files/gtk-2.0.m4
deleted file mode 100644
index 88596a969e19..000000000000
--- a/net-analyzer/pinger/files/gtk-2.0.m4
+++ /dev/null
@@ -1,196 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
diff --git a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
deleted file mode 100644
index f9175b22540f..000000000000
--- a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -65,8 +65,18 @@
- 					 AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2),
-            HAVE_GTK_2=0)
- fi
-+AC_ARG_ENABLE(ncurses, [  --enable-ncurses        enable ncurses support],
-+              [if test "$enableval" = no; then no_ncurses=yes; fi])
-+if test x$no_ncurses != xyes; then
-+PKG_CHECK_MODULES(ncurses, ncurses,[
-+	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)
-+	HAVE_CURSES=1
-+	LIBS="$LIBS $ncurses_LIBS"
-+	CFLAGS="$CFLAGS $ncurses_CFLAGS"],
- AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
- 	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library))
-+	)
-+fi
- AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl")
- AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", AC_MSG_ERROR(Pthread required and not found. Please check if you have libpthread in your system and specify using CFLAGS and LDFLAGS when configure))
- 
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 497ad129840c..465b973fb415 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,5 @@
 DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
 EBUILD pypacker-4.8.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
-EBUILD pypacker-4.9.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
+EBUILD pypacker-4.9.ebuild 720 BLAKE2B b056cfdf36ef915c93ec12bde0f8e662542719d1068ebb00e5d7bf745cf7828e0a5f012addf044461a3fdeda9f74026886dbf2dd88e9030524343d1e4ca5d2d9 SHA512 8431c487669b61756a09955575dd58e702e1fa2ea6bf641a802dc6cb2d2bb4a54821b790426a2cdb445b7d1c8bc9e39fa49eb7b2994444d576e448bc6499e7ad
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild
index f10389269bce..6de7cf5ad3c1 100644
--- a/net-analyzer/pypacker/pypacker-4.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.9.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest
index c5465e2470cf..f19648615356 100644
--- a/net-analyzer/rrdcollect/Manifest
+++ b/net-analyzer/rrdcollect/Manifest
@@ -1,4 +1,3 @@
-AUX rrdcollect-0.2.9-include.patch 206 BLAKE2B 81b31a4bf3a03f55d9ae4bcf6d80eff86608142b537789788b96d5219d14632d0307230d1b39d5fd8355059b67e152e7f378950fc66c8b15723bf2910067fb07 SHA512 e3092bfe72977cd67cbb4654a44a504d532fbcf3914c3d339e99d9d61d704d7d6954e233d6d5f04cd02ef4fb827cde0835dddca519e3cd26cbc9b7aa74eb72ac
 DIST rrdcollect-0.2.10.tar.bz2 114312 BLAKE2B 8e75a44e6ea2dcf57eec7418912383fe1ed846eda5ac2e402b7ed3b0f47f3f169d84b563821380fcb1ee87b70fcdf881dd48763fbb4ab3c8ef301ca9ef5f2a74 SHA512 c926ccfdbf98a4de114b80012151bf6859644742a97e14ce06f3c44c3b48bb242d47fda54deef8069d57aa8d207389e788e6021ce337559c0185e7cdb680b26e
 EBUILD rrdcollect-0.2.10.ebuild 707 BLAKE2B 1474b932b1360595674194a6ef4e53ec4e5f6aa71ad03d023849653f436ef64fcb0f96def3ff1e94f52180d3724d4a7047e03fd7dc6a13b9647a5fd7b0076c70 SHA512 c5a2df5dcab7a58c9ace1e4741bdecf3c36ba54301622d5cf4ebdc54a64bc7a09fe1b7203c4032bca15e71637a3bd11cbb650a773e828579c19b69c13ebda229
 MISC metadata.xml 515 BLAKE2B 4dd541000df2c92fd88fe509cd2f84dc88b2c939af53eda8cf0e9a18e56be6df06a6f8e07b0eba4b7f9d7b285b585d2266ec79bf6243612cb1ee468b59b6b986 SHA512 68fc73d6b069e077b672c34aaa99f0c1a07c861573a123458fd5953efd71134a7b93bb81d93a41b6d1e5b51228e304eed40d6cb36c795f0f20549e700914d051
diff --git a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
deleted file mode 100644
index 69827b28358f..000000000000
--- a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/checkpid.c
-+++ b/src/checkpid.c
-@@ -20,6 +20,7 @@
- 
- #include "rrdcollect.h"
- #include <fcntl.h>
-+#include <sys/file.h> /* flock() */
- 
- /* lockfile in rrdcollect.pid */
- /* five digits+"\n\0" */
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 39a41063f5ee..9bc0c96e4c8d 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,6 +5,7 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r1.ebuild 4297 BLAKE2B 4dfe4672064347d3eea7f200e9eba19785c10f57c494368cc84dbf61a06a7b1c4248e2c9e839812a72462be2c652baa63da4565afeb67918bd486e7ae6ede58f SHA512 70d1a71a9e47c3dbe68e4a8540b10928a45396d32ac4d862f91633bc4d9951f76022987d82b7f65f7578b5d08b5938e785455841484b5844bc50d81776cd1db5
-EBUILD rrdtool-1.7.2.ebuild 4301 BLAKE2B c3f38ec4f106e09339c0c855f7a695f41d22b63e09f92418c0e0f26c8f91d2f29f69ea4ece8fb6bf21c06e3a7f008099329b7a203199db2f08eaa0f2227ab6ac SHA512 e77f816f7b34b8677064f9caa5ccf66041e2ce3d6f665f177ba5389f1c2ef3de1c835054ba5a6630b536cdf9a212a8d6c73286750cf2af78b2a4f8ad2f697658
+EBUILD rrdtool-1.7.2-r1.ebuild 4298 BLAKE2B c3544426f7988eee417285de01eb5dc3f7eef7b93cece34a6fd0367e9674dc1e6f5d9e96503d704123fa94c94a2ee65cd79cbf13912d3a5020eb0f3c0129f9dc SHA512 8a46316c9a69180eaab0b78fd01b14a6f3cdffedd0bdce169c859ec618080221862f04543396dee0c7fb2a470ef2a3d8c10baf07de7121de4e201215b39ac594
+EBUILD rrdtool-1.7.2-r100.ebuild 5688 BLAKE2B a67ba4d12f5557b6a4ea937f4f64d121908ac018aa83a537099961d168b38eddd4ce8a62548e1a1a5bb99895164246bd0528a8e693ffd6cbcdf283e85ca4a57f SHA512 7088e634e9df85169cca3449a765ab722e983ab13fa0f7dec62ebcdc53ef21b908a1183a4d33dcb80b028e3dbfed09cf6e5afc153d63375aba4d0abc98ff4ea9
+EBUILD rrdtool-1.7.2.ebuild 4302 BLAKE2B 5f6968576aa9d88ffdb5f1d2e1e8381d1d28949b3790962bfa3770db8c50589575f2a1c2c8395c88b9599e57f589b5f4828a4a8db7a1fcb8e40758c6e85dfc29 SHA512 85b576cd6654f8ab87477d341553bc787fa768ace9db884f14934767f82dabfbd34a54c31bb3cf7ea9a6f9ce07cdd5fc4e6d14918a426e08c94705fabaf35e20
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
index 0504266762ec..fa7ddc30fd67 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
 		>=x11-libs/pango-1.28
 	)
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	rados? ( sys-cluster/ceph )
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
new file mode 100644
index 000000000000..9618fcae7a45
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	lua? (
+		${LUA_REQUIRED_USE}
+		test? ( graph )
+	)"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+	test? ( sys-devel/bc )
+"
+RDEPEND="
+	${CDEPEND}
+"
+BDEPEND="test? (
+	lua? ( ${LUA_DEPS} )
+)"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+)
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	if ! [ -f doc/rrdrados.pod ]; then
+		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
+	else
+		die "File already exists: doc/rrdrados.pod. Remove this code!"
+	fi
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			-e 's|graph1||g' \
+			tests/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	export rd_cv_gcc_flag__Werror=no
+	export rd_cv_ms_async=ok
+
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	# We will handle Lua bindings ourselves, upstream is not multi-impl-ready
+	# and their Lua-detection logic depends on having the right version of the Lua
+	# interpreter available at build time.
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-lua \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
+
+	# We do need the cmod-dir path here, otherwise libtool complains.
+	# Use the real one (i.e. not within ${ED}) just in case.
+	emake \
+		LUA_CFLAGS=$(lua_get_CFLAGS) \
+		LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
+
+	popd
+}
+
+src_compile() {
+	default
+
+	if use lua; then
+		# Only copy sources now so that we do not trigger librrd compilation
+		# multiple times.
+		lua_copy_sources
+
+		lua_foreach_impl lua_src_compile
+	fi
+
+	use python && distutils-r1_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
+
+	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
+
+	popd
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+	if use lua; then
+		lua_foreach_impl lua_src_test
+	fi
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
+
+	# This time we must prefix the cmod-dir path with ${ED} so that make
+	# does not try to violate the sandbox.
+	emake \
+		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
+		install
+
+	popd
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_install
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"/usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 9d9de2a3f492..1ee76659bd70 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
 		>=x11-libs/pango-1.28
 	)
-	lua? ( dev-lang/lua:*[deprecated] )
+	lua? ( dev-lang/lua:0=[deprecated] )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	rados? ( sys-cluster/ceph )
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index 23d98d94e9b0..a509c5b73df6 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,8 +1,5 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
 AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d21bcdb535cf2411b41fc4c623ab04e2411dbdd239e62cc4f6545b9d67d29bab879f6ac268c241d1cd884b2592 SHA512 be01518f156b724439837150f9f02148d6f92c0bac2557419f2f9def9244d29006a6c84ceecf193b6f57830c697d9b650102625cf78787fc59709a2ef2b7847f
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
-DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c
-EBUILD scanssh-2.1-r2.ebuild 831 BLAKE2B 141448c971983f22bbace5a1888e20eef9ee99597ae44092f271689950be50e3c7f527d782e2740eac24d7c36992684f95aec8c559d93cb262b60de197bc3419 SHA512 50d6179496f1896edb14278af86ae7c9452932579073802017394442c4b8d656fd4bb41952b2bb9ceb6b4f0bd755522f94bab50b04f918468bcf48be9d7839ca
 EBUILD scanssh-2.1.2.ebuild 853 BLAKE2B f0d75a289370b7d1dca290e1865181eb758bae4a2f740f7cfd8e327ef054262306f74033e0c9bf7551cd57901e83c17bb10155d24068dd0a31dde53c05cb8cab SHA512 c0d3d279f685f27aa46e8194fe00af6b93354157deefb1ec926e38203409a7312b58b9305c96cb3bf5457adbe118f5343f969004fcdb2bedb99b006c18cdcf8d
-EBUILD scanssh-2.1.ebuild 641 BLAKE2B 8023919e0452fdaa5420cf90b59466b04070b9c4b1ff733657d5a0b22ab6c870113a9234b1442d88a02b34d91d8504a41eb101e38fd77e8c58c41bb8d61bd59e SHA512 56e016f7ff11ea334c276f011b73870079e1b40bc2baeab621a141722b1f52c9da7f1d16beedc0952b6722907fe5445d3b40b7252141abd99de10e68e3329baa
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1-r2.ebuild b/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
deleted file mode 100644
index 954e6059dec1..000000000000
--- a/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
-HOMEPAGE="https://monkey.org/~provos/scanssh/"
-SRC_URI="https://monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	dev-libs/libdnet
-	dev-libs/libevent:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-fix-warnings.diff
-	"${FILESDIR}"/${PN}-2.0-libdir.diff
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		DNETINC='' \
-		DNETLIB=-ldnet \
-		EVENTINC='' \
-		EVENTLIB=-levent \
-		PCAPINC='' \
-		PCAPLIB=-lpcap
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin scanssh
-	doman scanssh.1
-}
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
deleted file mode 100644
index d154e29437a3..000000000000
--- a/net-analyzer/scanssh/scanssh-2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
-HOMEPAGE="https://monkey.org/~provos/scanssh/"
-SRC_URI="https://monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
-
-DEPEND="
-	dev-libs/libdnet
-	dev-libs/libevent
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0-fix-warnings.diff
-	touch configure
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin scanssh
-	doman scanssh.1
-}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 9af9059a8201..565dcf845fac 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,6 @@
 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
 EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
-EBUILD scapy-2.4.4.ebuild 1058 BLAKE2B 261a2d8e4f1de4942b6125ab2388139fee9e0db20788c0e53cf671deb831838f91df1d91550e07268fe1d96759de2a9be04b70ee1585f6dd81a23f344c194af4 SHA512 f99effd1be3bdf062d80acc8f7d0af2c516f5f35bc9bc9d42917ea1c8032d6dbc2053d035b4805441472396886d89377ebac61ea7f6b64fe503ad527cdfead39
-EBUILD scapy-9999.ebuild 983 BLAKE2B 3f1e5d14b6e57ba98659e724a0bab5bd427559b45f492b8f142a2d77b5d07c237754a6f3e12e5f917751972145cceb7cc8eaf0de20171f80d6b46ee75ee19a95 SHA512 63138785e892c083ee8886ff24260089d110ffc25e98d46d8c8331507d09320d44ceebb222336f11a9d8623359c2d98a11f4b594ee223978d8a816caee306079
-MISC metadata.xml 560 BLAKE2B 0031ba40f45dfbd2102459d22ee29248d02147a66124ab694cff2f8127b9eab8a57beaa3b09225851b83acbef4b54d98254bf333b5fe67e3935a8a5ae09b4cee SHA512 cf4e12f89211e5d4cab9a017ad1fa8e99115bb3b071cab99bfd7a593ca089d4902ab6a8e72b083293ac620c6bca5ef88f40db8c790765a2c0a0c7f3907c5a083
+EBUILD scapy-2.4.4.ebuild 1060 BLAKE2B 7e069b3d74fda950c54f80df95847629af78386509467afcc3f387962eefa2eb1a41c386eb6d6d2e35b336d46f29e2840c26b5c8fe99802e8ba1dfd779e92629 SHA512 d80bec0aab72a90f7cdfac918e87e85d8ebc42c730d67e7a1700343b42624d2a19d51722e9eec78695dc4316ab6649c3f3974b98ac570c63f084a1a7a52b15aa
+EBUILD scapy-9999.ebuild 987 BLAKE2B 07bc33cd80fc39c47d49e181ccee40df7e93f895c73a97166c31922b941bff4cd4ef98baa5141aa4fdadef4260eb31570371eef5c99a2c4e39120779441439da SHA512 806261e8e3fc3407e6849c20106732d8f7e34bcfc979b8c88f4b76b9dd45a072c730ff37d48d5be23b1f18551aff3bfb266196339b7ce9e7330c04f603f6f729
+MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 85d0af3d580d..b3243d196ed5 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -13,6 +13,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">secdev/scapy</remote-id>
 	</upstream>
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4.ebuild
index 31ea052c82e5..18754dd9faa2 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 DOC_CONTENTS="
 Scapy has optional support for the following packages:
 
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index a7ccbd8a5d2d..c8c5cfe91e84 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index d254322496d0..3ce91f99d5e9 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,13 +1,7 @@
 AUX 79_smokeping.conf 351 BLAKE2B 97e09d4cf9d4b1fe4b334165a0f46bb11dea32cf6a2678a04c48e5290940a197c2efee0fa540726493e623a0f0235fdffde8ee28b2c89af22a804a8dfca29149 SHA512 d53abdf29e8f6bad67a654b17088c3f8dee7908ff82b0b911599e2ac6a11be84b8fa2c30b1f0b6142803ff9a5058f586946eafa112dfd26ca4f8f8664d19cfc6
-AUX smokeping-2.6.9-pod.patch 482 BLAKE2B 8490774fffcdac52d5375bd7155a1246f03a748eb6d7e365dcb6b82d5d4e5cdbdd0025793daf68a4605137c03447463c5bea86bdebcf1ac48e51309abe0f5ee1 SHA512 3744f97a8f817c7b9d5da4fe130377658d74ac1be78a00dbc39b501716fc2d6b9fb2188f9ff3c57da5c36b6761e9099d0ef85a7600174de8fda01a8898274b71
 AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731d8851cc5f9a81118c9ce9ff76888b0bddcbf6b4341a47a76a74f64aecdc3d1610510714f119ee7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef
-AUX smokeping.init.3 1737 BLAKE2B 0c1ad0e4c5dd843097eadbdd2e2309f9f89c5f336ae20938680f2629c16e6ee265a56a4aaa26b40243d9d85331775315ac4eb5235eb51c7ff6d981ab2dd3a683 SHA512 87386971b42bf842c6cf59f641576cfcfd7439fe9f10139730b0c73acea610945d634d3effc3a5db793a71e2e625b49184a02813cbf34473dd94ac4a3931ed67
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
-DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.6.9-r1.ebuild 4174 BLAKE2B d9c87bde47edc6665a35152ca6167658ef248e9e8b4a893b53954b553a3acd7af953c193f5f441dab21509e11de4adf91f730c511527c8d57da0c5c10c929533 SHA512 21ecba069f21dadef3baefec04b1ff0d24e732ec4baf99421f6228d498f8b0315bd8b03d4e04c58f51789f4af87c5d05409519bb65cda54e389d0319064c57e2
-EBUILD smokeping-2.7.2.ebuild 4129 BLAKE2B c193fb3280a5a7bde86e64cb3fc593d2f83ee2a57207a30f5ac77b633e486e4797c5eb26e82272e02cc9d76007dbcd774a964b03d6f2601f6a5698c9f7b3d894 SHA512 8044d7d0588d29645f241ffbd3a92210e02ecb0f22259e8b573778a73c69b7e51371b412aead3772622f0b18e37da42c99baa9a0eb71e1ebf3e307486fd04fb3
-EBUILD smokeping-2.7.3.ebuild 4125 BLAKE2B 2a38e163224837d43267c3cd57b558c88065e5391b7993203c017181bfd85e3772929b82cab8c2846710d7f2f08e9ba913f5ad3d317cb4d2007c1ddb68e22b93 SHA512 dc46019e3a83e168f9642efda2c4808485a5e646fb63a1f0ff43e5065a4d5ecfbb608079b60aa856dfc58bee31a8336ebf2137689fdf9ed1eaa937317fed6c01
-MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
+EBUILD smokeping-2.7.3.ebuild 4124 BLAKE2B ea0860b53f68bb0ba8fa5c529d8d93482cfd9b040207702f3098af826dab835b48394d70cb690d5fac35f5f01132fa5ab8b47bb00839211fedc8392f95d31ba0 SHA512 8fc47418549e80010d72215e56aeba82e73621d5347e49581862245a9347562c9339f1f3e93848fdca31c1916d8976912ea3e2d8654d384bd4c609992781c69a
+MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch b/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch
deleted file mode 100644
index 81a1e053b4f8..000000000000
--- a/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Smokeping.pm
-+++ b/lib/Smokeping.pm
-@@ -2631,7 +2631,7 @@
- The base directory where SmokePing keeps the files related to the DYNAMIC function.
- This directory must be writeable by the WWW server. It is also used for temporary
- storage of slave polling results by the master in 
--L<the master/slave mode|smokeping_master_slave>.
-+L<the masterE<sol>slave mode|smokeping_master_slave>.
- 
- If this variable is not specified, the value of C<datadir> will be used instead.
- DOC
diff --git a/net-analyzer/smokeping/files/smokeping.init.3 b/net-analyzer/smokeping/files/smokeping.init.3
deleted file mode 100644
index 2e5e35795b91..000000000000
--- a/net-analyzer/smokeping/files/smokeping.init.3
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="${opts} dump reload restore"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "/etc/smokeping/config" ] ; then
-		eerror "You need /etc/smokeping/config to run smokeping!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ ! -d /run/smokeping/ ]; then
-		mkdir /run/smokeping/
-	fi
-	chown smokeping:smokeping /run/smokeping/
-
-	ebegin "Starting smokeping"
-	LC_ALL=C \
-	start-stop-daemon --start --name smokeping \
-		--pidfile /run/smokeping/smokeping.pid \
-		--exec /usr/bin/smokeping \
-		--user smokeping:smokeping
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping smokeping"
-	start-stop-daemon --stop \
-		--pidfile /run/smokeping/smokeping.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading smokeping"
-	/usr/bin/smokeping --reload 1>/dev/null 2>&1
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before dumping files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
-		f_xml=`dirname $f`/`basename $f .rrd`.xml
-		rrdtool dump "$f" > "${f_xml}"
-		chown root:0 "${f_xml}"
-	done
-	eend $?
-}
-
-restore() {
-	ebegin "Restoring smokeping rrd files from XML dump files"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before restoring files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
-		f_rrd=`dirname $f`/`basename $f .xml`.rrd
-		mv -f "${f_rrd}" "${f_rrd}.bak"
-		chown root:0 "${f_rrd}.bak"
-		rrdtool restore "$f" "${f_rrd}"
-		chown smokeping:smokeping "${f_rrd}"
-	done
-	eend $?
-}
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index e445720edf9f..7b436470d4c4 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -8,7 +8,5 @@
 <use>
 <flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
 <flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
-<flag name="telnet">Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
-<flag name="ssh">Install ssh functionality</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
deleted file mode 100644
index 7a4eb1a16840..000000000000
--- a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="amd64 x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
-
-DEPEND="
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/Authen-Radius )
-	ssh? ( dev-perl/Net-OpenSSH )
-	telnet? ( dev-perl/Net-Telnet )
-	dev-perl/CGI-Fast
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/Net-DNS
-	dev-perl/libwww-perl
-	virtual/perl-libnet
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-
-	epatch "${FILESDIR}"/${P}-pod.patch
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	dodir /var/cache/smokeping
-	keepdir /var/cache/smokeping
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}
diff --git a/net-analyzer/smokeping/smokeping-2.7.2.ebuild b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
deleted file mode 100644
index 973327b4df83..000000000000
--- a/net-analyzer/smokeping/smokeping-2.7.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	dev-perl/CGI-Fast
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index d28ba3dbe294..57f3773d61bb 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="apache2 curl dig echoping ipv6 radius"
 
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index 532884180d60..8e8a8a1575c4 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,7 +1,3 @@
-AUX sniffit-0.3.7-gentoo.patch 1164 BLAKE2B 0d35dab5ae42180ae0eab4133f2a5c752d39fbf20577b06d697ea2bcfa745c3fa51b2318e5043783eea0c54c398478f8939d050fcb9a6c28aa4e3ac483f09135 SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865
-AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4a298a6984338a44cd8f1295a6a490aeb89e4d06d61c863665f67ca8894951fe4a3d1d52d226895581d84038e49 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e
-AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6
-AUX sniffit-0.4.0-fno-common.patch 6287 BLAKE2B 6480ee02366d834b9a6097a36023dd2ea707fc85ba2f6e5dae75cdd6e05c1107ed26ff869d57557d2ac3d3f850e21d99c1eec6d8028ecc7dc8257adae16265e0 SHA512 3b293d71c3b9b9c05d6d2077f6cc759f469af91c0dffe243dbfe75ba93677f18f24e62b78d2a2ca3b5ac99aac318da6802ec4e5c3012569c428662f40fe7f355
 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
 DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc
 EBUILD sniffit-0.5.ebuild 583 BLAKE2B 2203a79bd787f3669c808478a1b3cad5593fb7b2b68b9b856f674f41fa5cc8cb6c3f05fe064a59b3099bb3b2f241fbdac618738d25e7b980d33053f41a37966e SHA512 63dc04674e45be650d1376afee4306005e8815cd3e32009575aab5f50c689e4832bb250fa884beb4c1aefc1c9bbdfd475eb82559e3fd513b2f89d06527d4b660
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
deleted file mode 100644
index c226b6f00d45..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -10,13 +10,13 @@
- LIBS       = @LIBS@
- DEFS	   = @DEFS@
- OS_OPT     = @OS_OPT@
--OBJ_FLAG   = -w -O2 -c
--OBJ_OPT    = -I./libpcap -L./libpcap
--EXE_FLAG   = -w -O2 -o sniffit
--EXE_OPT    = -I./libpcap -L./libpcap -lpcap
-+OBJ_FLAG   = $(CFLAGS) -c
-+OBJ_OPT    = -I/usr/include/pcap -L/usr/lib
-+EXE_FLAG   = $(CFLAGS) $(LDFLAGS) -o sniffit
-+EXE_OPT    = -I/usr/include/pcap -lpcap
- EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
-              sn_logfile.o sn_resolv.o
--DEP_FILES  = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \
-+DEP_FILES  = sn_config.h sn_data.h sn_defines.h sn_plugins.h \
-              sn_analyse.c sn_conn_desc.c \
-              sn_packets.o \
-              sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \
-@@ -26,9 +26,7 @@
- 	@echo "Succesfull compilation..."
- 
- sniffit: $(SNIFFIT) $(DEP_FILES)
--	cd libpcap; make; cd ..
- 	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
--	strip sniffit
- 
- sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h
- 	$(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS)
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
deleted file mode 100644
index ff84cd7d2259..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/sn_cfgfile.h
-+++ b/sn_cfgfile.h
-@@ -10,3 +10,4 @@
- void make_nr_dot (char *);
- void interprete_line (char *);
- void read_cfg_file (char *);    
-+char *strlower (char *);
---- a/sn_structs.h
-+++ b/sn_structs.h
-@@ -67,7 +67,7 @@
- struct snif_mask                                         /* struct for mask */
-   {
-   _32_bit source_ip, destination_ip;
--  _32_bit short source_port, destination_port;
-+  _32_bit source_port, destination_port;
-   };
- 
- /* (packet generation) */
---- a/sn_analyse.c
-+++ b/sn_analyse.c
-@@ -1,6 +1,9 @@
- /* Analyse traffic for logging mode                                      */
- /*   - by: Brecht Claerhout                                              */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- const unsigned char *data;
- memcpy(&tcphead,header,sizeof(struct TCP_header));
- 	  	
---- a/sn_cfgfile.c
-+++ b/sn_cfgfile.c
-@@ -3,6 +3,11 @@
- /*   - improvements: Shudoh Kazuyuki                                      */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include "sn_interface.h"
-+#include <string.h>
-+#include <ctype.h>
-+#include <time.h>
- #include <netdb.h>	                           /* for getservbyname() */
- 
- #include "sn_config.h"
---- a/sn_conn_desc.c
-+++ b/sn_conn_desc.c
-@@ -1,6 +1,8 @@
- /* Connection description detection file                                 */
- /*   - by: Brecht Claerhout                                              */
- 
-+#include <ctype.h>
-+#include <string.h>
- 
- /* Simple PORT BASED detection */
- 
---- a/sn_generation.c
-+++ b/sn_generation.c
-@@ -6,12 +6,16 @@
- #ifdef INCLUDE_INTERFACE
- #ifdef GENERATION
- #include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <netinet/in.h>     
- #include "sn_curses.h"
- #include "sn_defines.h"
- #include "sn_structs.h"
- #include "sn_generation.h"  
-+#include "sn_interface.h" /* input_field() */
-+#include "sn_packets.h" /* in_cksum() */
- 
- extern volatile int screen_busy;
- 
---- a/sniffit.0.3.7.c
-+++ b/sniffit.0.3.7.c
-@@ -4,6 +4,9 @@
- #include "sn_config.h"		/* Config header file */
- 
- #include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
- #include <signal.h>
- #include <stdio.h>
- #include <fcntl.h>
---- a/sn_interface.c
-+++ b/sn_interface.c
-@@ -6,6 +6,9 @@
- #ifdef INCLUDE_INTERFACE
- #include <signal.h>
- #include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>       
- #include "sn_curses.h" 
---- a/sn_logfile.c
-+++ b/sn_logfile.c
-@@ -4,6 +4,9 @@
- #include "sn_config.h"
- 
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
-+#include <string.h> /* strcpy() */
-+#include <time.h> /* time() ctime() */
- #include <sys/stat.h>
- #include <sys/time.h>
- #include "sn_defines.h"
---- a/sn_packets.c
-+++ b/sn_packets.c
-@@ -5,6 +5,7 @@
- #include "sn_defines.h"
- #include "sn_structs.h"
- #include <netinet/in.h>
-+#include <string.h> /* memcpy() strcpy() */
- 
- extern int PROTO_HEAD;
- extern char NO_CHKSUM;
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
deleted file mode 100644
index b82835049687..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -5,30 +5,15 @@
- 
- AC_INIT(sniffit.h)
- 
--dnl Config of libpcap
--AC_CONFIG_SUBDIRS(libpcap)
--
- dnl Check the C compiler
- AC_PROG_CC
- 
- dnl Check NCURSES availability
--NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h
--ncurses_warn=0
--AC_CHECK_LIB(ncurses,main,,ncurses_warn=1)
--
--AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH)
--if test "$NCURSES_LOCATION" != no; then
--	echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h
--	AC_DEFINE(HAVE_NCURSES_H,1)
--else
--	ncurses_warn=1
--fi
--
--dnl Print warning for interactive mode
--if test $ncurses_warn -ne 0; then
--        AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!)
--	AC_MSG_WARN(Install ncurses!)       
--fi
-+PKG_CHECK_MODULES(ncurses,ncurses,main,
-+	LIBS="$LIBS $ncurses_LIBS"
-+	echo "#include <ncurses.h>" > sn_curses.h
-+	AC_DEFINE(HAVE_NCURSES_H),
-+	AC_MSG_ERROR([ncurses not found]))
- 
- dnl Check Shared Memory support
- AC_CHECK_FUNCS(shmget)
diff --git a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch
deleted file mode 100644
index 6a576acf1d2b..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch
+++ /dev/null
@@ -1,181 +0,0 @@
---- a/src/sn_data.h
-+++ b/src/sn_data.h
-@@ -101,7 +101,7 @@
- char IP[256];
- unsigned long SNIFLEN;                            /* bytes we need to snif */
- short DEST_PORT, SRC_PORT;                             /* destination port */
--char non_printable, *logging_device;
-+char non_printable;
- 
- /**** Global data (packets) *************************************************/
- int PROTO_HEAD;    /* Base Protocol head length (ethernet, PPP ,....) */
-@@ -147,43 +147,6 @@
- /**** Global data (plugins) *************************************************/
- char Plugin_Active[10];
- 
--/**** Global data (interactive) *********************************************/
--#ifdef INCLUDE_INTERFACE
--
--/**** shared memory pointers ************************************************/
--char *SHARED, *connection_data, *timing, *running_connections,
--						  *logged_connections;
--int *LISTlength, *DATAlength, memory_id;
--unsigned int  *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets;
--unsigned int  *IP_nr_of_packets;
--unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets;
--int *DESC_LEN;
--
--/**** data structures *******************************************************/
--struct snif_mask *mask;
--struct shared_logged_conn *log_conn;
--FILE *log_dev_stream;
--struct stat log_dev_stat;
--
--volatile int LOGGING=0, screen_busy=0;
--char PACKET_INFO;
--int POINTpos=0, LISTpos=0;
--unsigned char COLOR_AVAIL=0;
--
--/**** screen  **************************************************************/
--int MASK_WINDOW_ROWS, MASK_WINDOW_COLS;
--int MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS;
--int INFO_WINDOW_ROWS, INFO_WINDOW_COLS;
--int DATA_WINDOW_ROWS, DATA_WINDOW_COLS;
--int INFO_WINDOW_X, INFO_WINDOW_Y;
--int MASK_WINDOW_X, MASK_WINDOW_Y;
--int DATA_WINDOW_X, DATA_WINDOW_Y;
--
--WINDOW *menu_window;
--struct box_window data_box, main_box, mask_box, packets_box;
--int Pid=0;
--#endif
--
- /* DEBUG section */
- #ifdef DEBUG
- FILE *debug_dev;
---- a/src/sn_global.h
-+++ b/src/sn_global.h
-@@ -4,7 +4,6 @@
- /* currently some option data */
- 
- char SNIFMODE, DUMPMODE, PROTOCOLS, ASC, WILDCARD, CFG_FILE, NO_CHKSUM;
--char INTERACTIVE_EXTEND;
- int LOGPARAM;
-                                                       /* All option shit */
- 
---- a/src/sn_interface.c
-+++ b/src/sn_interface.c
-@@ -18,37 +18,37 @@
- #include "sn_generation.h"
- #include "sn_resolv.h"
- 
--/*** extern stuff ********/
--extern char *SHARED, *connection_data, *timing, *running_connections,
-+/*** global stuff ********/
-+char *SHARED, *connection_data, *timing, *running_connections,
-                                                   *logged_connections;
--extern int *LISTlength, *DATAlength, memory_id;
--extern unsigned int  *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int  *IP_nr_of_packets;
--extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets;
--extern int *DESC_LEN;   /* For the connection desciption */
--
--extern char INTERACTIVE_EXTEND;
--
--extern struct snif_mask *mask;
--extern struct shared_logged_conn *log_conn;
--extern FILE *log_dev_stream;
--extern struct stat log_dev_stat;
--
--extern volatile int LOGGING, screen_busy;
--extern char PACKET_INFO;
--extern int POINTpos, LISTpos;
--extern unsigned char COLOR_AVAIL;
--
--extern WINDOW *menu_window;
--extern struct box_window data_box, main_box, mask_box, packets_box;
--extern int Pid;
--extern char *logging_device;
-+int *LISTlength, *DATAlength, memory_id;
-+unsigned int  *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int  *IP_nr_of_packets;
-+unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets;
-+int *DESC_LEN;   /* For the connection desciption */
-+
-+char INTERACTIVE_EXTEND;
-+
-+struct snif_mask *mask;
-+struct shared_logged_conn *log_conn;
-+FILE *log_dev_stream;
-+struct stat log_dev_stat;
-+
-+volatile int LOGGING, screen_busy;
-+char PACKET_INFO;
-+int POINTpos, LISTpos;
-+unsigned char COLOR_AVAIL;
-+
-+WINDOW *menu_window;
-+struct box_window data_box, main_box, mask_box, packets_box;
-+int Pid;
-+char *logging_device;
- 
- 
- /*** Screen Parameters ***/
--extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS;
--extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS;
--extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y;
--extern int DATA_WINDOW_X, DATA_WINDOW_Y;
-+int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS;
-+int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS;
-+int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y;
-+int DATA_WINDOW_X, DATA_WINDOW_Y;
- 
- 
- /*** Sreen operations ***/
---- a/src/sn_interface.h
-+++ b/src/sn_interface.h
-@@ -1,9 +1,46 @@
- /* Sniffit Data File                                                       */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "pcap.h"
- 
- typedef void (*sig_hand)(int );  /* sighandler_t gave errors, weird */
- 
-+/*** global stuff ********/
-+extern unsigned int  *IP_nr_of_packets;
-+extern char *SHARED, *connection_data, *timing, *running_connections,
-+                                                  *logged_connections;
-+extern int *LISTlength, *DATAlength, memory_id;
-+extern unsigned int  *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets;
-+extern unsigned int  *IP_nr_of_packets;
-+extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets;
-+extern int *DESC_LEN;   /* For the connection desciption */
-+
-+extern char INTERACTIVE_EXTEND;
-+
-+extern struct snif_mask *mask;
-+extern struct shared_logged_conn *log_conn;
-+extern FILE *log_dev_stream;
-+extern struct stat log_dev_stat;
-+
-+extern volatile int LOGGING, screen_busy;
-+extern char PACKET_INFO;
-+extern int POINTpos, LISTpos;
-+extern unsigned char COLOR_AVAIL;
-+
-+extern WINDOW *menu_window;
-+extern struct box_window data_box, main_box, mask_box, packets_box;
-+extern int Pid;
-+extern char *logging_device;
-+
-+
-+/*** Screen Parameters ***/
-+extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS;
-+extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS;
-+extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y;
-+extern int DATA_WINDOW_X, DATA_WINDOW_Y;
-+
- int add_itemlist(char *, char *, char *);
- void child_exit (void);
- void clear_shared_mem(char);
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 59007e95deb5..48901688e100 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -14,6 +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.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
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
new file mode 100644
index 000000000000..f538da3c59d8
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+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
+reload-error-restart selinux shared-rep side-channel sourcefire static
++threads"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( ${LUA_DEPS} )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+	open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+	"${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch
+)
+
+pkg_setup() {
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+	use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 17da0e7e5613..05b3b21a4b94 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -6,8 +6,12 @@ AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e975
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6
+DIST suricata-5.0.5.tar.gz 29094537 BLAKE2B c2a5897836117abe9ca39b3a03de36c4d5667d3e64dc1befd77a7b777e4191439a497e3042e6d00b80ae31c8c4f18347cb2e6833e8db5f64b31c8ab1cf557ac5 SHA512 5f26731e0a0134fdecc8e76a68a69584bacb614ba4fd56b74f27abe62ab7d80135908eeaae38c9a03101f069d83597b3c7c69000bdd2a2e6bfe87f7a98de4e16
 DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3
-EBUILD suricata-5.0.4.ebuild 6182 BLAKE2B 39f9cc7a0a7510e36bb1365a40eb3ddfce15cd42a427a314ac775ca50d51ebf5aeabc36eca89be9dae30de7f8f78112fea959f88d5360bb990828a395153906f SHA512 62256f5377e72a91d6d7e6faef585fdbec8adaf191f9e7008ee41422039d1b59ef77b7fb50975ab7606ef12f445d7257321ad3d1b5310fa32145d1107bcbe26e
-EBUILD suricata-6.0.0-r100.ebuild 6588 BLAKE2B bbecfaec715b56be86c957bc00389bd1644425e9e1d045f7d287d5c5ee3584b66bcad2be6a719ade59faa2154de266671391ad3a804d529010c101d231875b39 SHA512 0fcb23cb9774e45d7affd9942d341b86ba5848f65be21604d99a7ad165849591647fcb74312b1fbfe47f4a08323eefb95d0b9b9594531c2292383a0f93ca8bcb
-EBUILD suricata-6.0.0.ebuild 6486 BLAKE2B 8cf5048478d9f3d59dde49205720ea344eabb1c1dfafa63a047fcb657dce1195de126c4032557268db93bbe971e9c7e559f51127bc2e1f7722e38bb8f8e20269 SHA512 1050838e4093e5601f66caee1ee850b21ab7cbaaeab8f919ffccf80f95bd577a014bba68d7f99da39fa0e1c8fca993e188923583ed869c7585ba54eabae585ac
+DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4
+EBUILD suricata-5.0.4.ebuild 6183 BLAKE2B 00a0b81904e7225328307256cd22ace60677b947f31f99f0c2db2916695e35dc69399098ba395ebaad1ae838d1ffcefa3d9342dae9a1d06fd6eddf5c697fff79 SHA512 817214715a8925e3e217c1f847694d37bea28e4bef2198e4d5f111618d21d5cbcce630206869ffec6c0a4a778074aa6b676a14ec669249786a6767499497c2a1
+EBUILD suricata-5.0.5.ebuild 6183 BLAKE2B f97f394dbbfb9ddbe9c276742641ccab96dfa0da6324576b11189e6bf13ebbb1233f018f9c248f97c1d7fe766b2236c98e8facbe332bef8f1ef9611ea28d8970 SHA512 479dbbdf85088291c5af571aabe4bc86e0a5699402ce6e4e6076341c70c51adee49f01be0853d743ee999b3e28d45c6c96a2b73bb59fbd279687e00f5fcca2be
+EBUILD suricata-6.0.0.ebuild 6487 BLAKE2B 21e0ab1b2980ec2e77b8fef5086ed942b49b1107fa63351d1a059e52b090d8cded46b667ba82fb6e16191ca3fca8a14a76a4de90e30bb837202df157ee7589c9 SHA512 8aa777b9c64f7d1aa3b8b0affab01799085924ba2be4d899186ae3ddf032d76e2badb56b462bb2e5648be15d3667aa3eb8d92b53ed546835ab088298ed327dc2
+EBUILD suricata-6.0.1-r100.ebuild 6588 BLAKE2B 0c1aa2338a90b101a8470584af787e0a0575cc866eb8e9bfc04ee00d3a3746855444573454c3fba041dabd8e700b668087072d5bfb5f4946ec46642c37281a81 SHA512 8e2bb4d502ad9b6cc6beab62e250e83fa31b46a8061d7347d68f91e6f689b67d20e2538544691e33560e37918e83f248c8874c5e1130b870b641c3449e491f88
+EBUILD suricata-6.0.1.ebuild 6487 BLAKE2B 0f6477549e22b64277048640a9956727e6506bc2a1de2dbf98236393ff054d54b96b105ce52ee3e745adf6639fd65524645241e12fef8afc473c85d90f3a32d6 SHA512 dadce97a0b0c9d1099c71bd365ad0e4f66aad00a6d30e19096476f69b5daf5c92bf80508255eac0478099a077e505139ae2696ccbe13047039574c396beb74e2
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/suricata-5.0.4.ebuild b/net-analyzer/suricata/suricata-5.0.4.ebuild
index e618aa1e0bcc..077c14ece6d3 100644
--- a/net-analyzer/suricata/suricata-5.0.4.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.4.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${PYTHON_DEPS}
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb )
 	logrotate?  ( app-admin/logrotate )
-	lua?        ( dev-lang/lua:* )
+	lua?        ( dev-lang/lua:0= )
 	luajit?     ( dev-lang/luajit:* )
 	lz4?        ( app-arch/lz4 )
 	nflog?      ( net-libs/libnetfilter_log )
diff --git a/net-analyzer/suricata/suricata-5.0.5.ebuild b/net-analyzer/suricata/suricata-5.0.5.ebuild
new file mode 100644
index 000000000000..db9ee04aadb6
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.5.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.36
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:0= )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog ""
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog ""
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog ""
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog ""
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog ""
+	elog "To download and install an initial set of rules, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog ""
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild
index 5f5d14e3eec3..6a00d0c18c98 100644
--- a/net-analyzer/suricata/suricata-6.0.0.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.0.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${PYTHON_DEPS}
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb )
 	logrotate?  ( app-admin/logrotate )
-	lua?        ( dev-lang/lua:* )
+	lua?        ( dev-lang/lua:0= )
 	luajit?     ( dev-lang/luajit:* )
 	lz4?        ( app-arch/lz4 )
 	nflog?      ( net-libs/libnetfilter_log )
diff --git a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild b/net-analyzer/suricata/suricata-6.0.1-r100.ebuild
index 872fafeef3af..3d6679536b45 100644
--- a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.1-r100.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.35
+	>=net-libs/libhtp-0.5.36
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/suricata/suricata-6.0.1.ebuild b/net-analyzer/suricata/suricata-6.0.1.ebuild
new file mode 100644
index 000000000000..6602a4b80adc
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.36
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:0= )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-6.0.0_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
+		ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
+		ewarn "If you need unified2 support, please continue to use suricata-5."
+	else
+		elog "To download and install an initial set of rules, run:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+	elog
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest
index 3d74556bdd95..ecd2e7ddf8e4 100644
--- a/net-analyzer/synscan/Manifest
+++ b/net-analyzer/synscan/Manifest
@@ -1,4 +1,3 @@
-AUX synscan-5.01-build.patch 2450 BLAKE2B f71bdb916f50de5c40d4c0b374c87b3bb698d5f46ccd4fcb4b6c1218a17fe2eae1e02a9f3d7c90f7839e299e7335b8496e759a4bc8b436483ca4f1d802e30955 SHA512 231420fbc0b306442a8589bc406a9d8f6a206103878b5dde4dc1dd4d2d18ce165863c76df21b24c130895be4dbbc5798deae59044aa1e1d288fb3ffbc7acaaaa
 AUX synscan-5.02-destdir.patch 436 BLAKE2B 8ce7e5a365f2769431864d116a42780b12d68df8247e3a9644f6b9a19bd4c3f1c92e8e6938baf2f532d9de109fb1911d69c9bea0a407e6d986705fdc9f0fcdd0 SHA512 4441e97a177d918b221569046115fdae729f96319abe90c42e94a5bcc04a56f20057923057314c7d61e1d06ab2325d70409765c129db8093d27e8541498e8567
 DIST synscan-5.02.tar.gz 60651 BLAKE2B 0ad083d6751234b60ec0428cb3752ba1207a5be5e305a0d26950343c7a7f0572aa9ad5cb16831d862ac43c35a051514bd8fefce4abadbf4c120e4e9add7fa433 SHA512 40ec616e169d0d4150e2213fbdcb985e55dcceefef521b0bf85d8964f5b82892b8abeffcbe9c5e38314c22b86553dae56fb082d546e83efa65755a4d345ea7b0
 EBUILD synscan-5.02.ebuild 775 BLAKE2B 4d549d8f8090082e5daacdc0b78dd914685829c22cfff94942ba273c7983e80054a3f9fc9e9fad3364864337b4adb12e641bf4b702af18950ac722ae35234da4 SHA512 97ab032246b39a8a7e0eab8f20f797b2306e971f7d8c7f43802fb70eee70c55d34afade0368e00219bd6d01170310e644fdc6b827dbc8f08bda5430a352cf90a
diff --git a/net-analyzer/synscan/files/synscan-5.01-build.patch b/net-analyzer/synscan/files/synscan-5.01-build.patch
deleted file mode 100644
index 79cf6943e185..000000000000
--- a/net-analyzer/synscan/files/synscan-5.01-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur synscan-5.01.orig/configure.in synscan-5.01/configure.in
---- synscan-5.01.orig/configure.in	2009-03-31 23:22:46.000000000 +0300
-+++ synscan-5.01/configure.in	2010-06-14 00:31:06.000000000 +0300
-@@ -49,7 +49,7 @@
-         owd=`pwd`
- 	if cd $withval; then withval=`pwd`; cd $owd; fi
-         CFLAGS="$CFLAGS -I$withval -I$withval/bpf"
--        LDFLAGS="$LDFLAGS -L$withval -lpcap"
-+        LIBS="$LIBS -L$withval -lpcap"
-      else
-         AC_ERROR(pcap.h or libpcap.a not found in $withval)
-      fi
-@@ -57,12 +57,12 @@
-   esac ],
- [ if test -f ${prefix}/include/pcap.h; then
-      CFLAGS="$CFLAGS -I${prefix}/include"
--     LDFLAGS="$LDFLAGS -L${prefix}/lib -lpcap"
-+     LIBS="$LIBS -L${prefix}/lib -lpcap"
-   elif test -f /usr/include/pcap/pcap.h; then
-      CFLAGS="$CFLAGS -I/usr/include/pcap"
--     LDFLAGS="$LDFLAGS -lpcap"
-+     LIBS="$LIBS -lpcap"
-   elif test -f /usr/include/pcap.h; then
--     LDFLAGS="$LDFLAGS -lpcap"
-+     LIBS="$LIBS -lpcap"
-   else
-      AC_MSG_RESULT(no)
-      AC_ERROR(libpcap not found)
-@@ -73,12 +73,15 @@
- ##
- ## Check of getoptlong
- ##
--AC_CHECK_FUNCS([getopt_long],,
--  AC_CHECK_LIB([gnugetopt], getopt_long,
--               [ LDFLAGS="$LDFLAGS -lgnugetopt";
--                 AC_DEFINE([HAVE_GETOPT_LONG])]
--               )
--)
-+ac_cv_have_getopt_long="no"
-+AC_CHECK_FUNCS([getopt_long],
-+ [ac_cv_have_getopt_long="yes"],
-+ [AC_CHECK_LIB([gnugetopt], [getopt_long],
-+   [ac_cv_have_getopt_long="yes"
-+    LIBS="${LIBS} -lgnugetopt"])])
-+if test "$ac_cv_have_getopt_long" != "no"; then
-+  AC_DEFINE([HAVE_GETOPT_LONG])
-+fi
- 
- ##
- ## Output files
-diff -ur synscan-5.01.orig/Makefile.in synscan-5.01/Makefile.in
---- synscan-5.01.orig/Makefile.in	2009-03-31 23:22:28.000000000 +0300
-+++ synscan-5.01/Makefile.in	2010-06-14 00:32:19.000000000 +0300
-@@ -5,7 +5,7 @@
- 
- CC = @CC@
- CFLAGS=@CFLAGS@ @DEFS@ -Wall
--LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
- 
- OBJS_MINIMAL = \
- 	common.o net.o obuf.o
-@@ -56,13 +56,13 @@
- solaris-sparc-gcc:
- 	$(MAKE) $(PROJ) \
- 		CFLAGS="$(CFLAGS) -DBSD_COMP -DSOLARIS" \
--		LDFLAGS="$(LDFLAGS) -lsocket -lresolv -lnsl"
-+		LIBS="$(LIBS) -lsocket -lresolv -lnsl"
- 
- synscan: synscan.c synscan.h ${OBJS}
--	${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o synscan
-+	${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o synscan
- 
- sslog: sslog.c ${OBJS}
--	${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o sslog
-+	${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o sslog
- 
- install:
- 	mkdir -p -m 755 ${bindir}
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 3bcff4ed90a2..e64a8947fcc8 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,4 +1,3 @@
-AUX tracebox-0.2-deps.patch 1119 BLAKE2B dc1a567aec9ec7cf6d66f3b722f1786d5730c5d351ae4fa2c9d03387fd6cb2c5b04229803ea7ed7fdc075692ca04deb4ec6068d65dfd01d73169ac63a0db887b SHA512 ecfffb4fca07597361170681762ea001a403979a96b8681fa144f7dc86c6d3b508d756863f8b2584f4951c1207a23c6babf7457f5f48dce1c400fe87ab5985b3
 AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
 EBUILD tracebox-0.4.4.ebuild 1172 BLAKE2B 2808a98a047d80e7166aa165c389e1b93d953ea94c4d35a29a34993f0731a1b794faee9fb51f6b9cf2957faea1237dfefb2610dec57c9d9edf5690a4d200351f SHA512 c463e77f6f2b0db874cfb9aeb6323aa41284765494b248667d81752b184d2f51712da3551f56f1482bc18742957579288553d258f64eb199938346275ffd9a2a
diff --git a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch b/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
deleted file mode 100644
index f6c748a410cd..000000000000
--- a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,15 +32,11 @@
- 	])
- ])
- 
--# Make sure libcrafter build a static library by adding the --disable-shared
--# argument to the configure script.
--ac_configure_args_pre="$ac_configure_args"
--ac_configure_args_post="$ac_configure_args --disable-shared"
--ac_configure_args="$ac_configure_args_post"
-+# check for libcrafter
-+PKG_CHECK_MODULES(crafter, crafter, LIBS="$LIBS $crafter_LIBS",AC_MSG_ERROR([libcrafter is required]))
- 
--AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
--AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter)
-+# check for libpcap
-+AC_CHECK_LIB(pcap,pcap_open_offline,LIBS="$LIBS -lpcap",AC_MSG_ERROR([libpcap is required]))
- 
- # Enable click submodule
- AS_IF([test "x$enable_tests" = "xyes"], [
-@@ -50,7 +46,6 @@
- 
- 	AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
- 	AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--	AC_CONFIG_SUBDIRS(tests/tools/click)
- 
- 	AC_PATH_PROG([FAKEROOT], [fakeroot])
- 	AS_IF([test -z "$FAKEROOT"], [
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index 568e928501ac..1d5607912ad1 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -4,5 +4,4 @@ AUX trafshow-5.2.3-pcap_init.patch 841 BLAKE2B f338a21de4f75acda08b1fc1f795edca3
 AUX trafshow-5.2.3-tinfo.patch 1864 BLAKE2B c2f908bd07cc31ad5c555e7e4055fb1f3378986cf032e26fbfe33e6213f528120cd9813fa73b0723f1a4f772149e793926cc3daef93a215ae910cd2dae1816d8 SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056
 DIST trafshow-5.2.3.tgz 142615 BLAKE2B c13ee7c39d598dc78e58b65b49a439ecc9e5630a24f78d2bc5a8ec39fc6aa15c084a291f8e932027108176e7aeeebbf5fb7e2380a64718273e67073869b7d5e9 SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540
 EBUILD trafshow-5.2.3-r1.ebuild 910 BLAKE2B a95d8ba14ae564aa5e815a92b149aca2a80ec52d337ef08d445faaf670b9736de00d094e503116c90703dd17c4be62e09220b0ff3b5381024a5629bf0f61af1d SHA512 a7c762f521e209c3064a3d095f9231554d5900a0989b897079c743383ddd763f89c5d5c7c8d85dda815aed9f08f5ec9fad1e298792c52e811a24a27dd9b1a7ca
-EBUILD trafshow-5.2.3.ebuild 846 BLAKE2B 25e04654fe1e4df05bc428e5ef57c8df0a2c87f6b268740cc506f534149c0a09f347b74a31a812f0ad56c2618aee28c64ce7abea460d68a2b93acf9651bb2c43 SHA512 548e0a060fd84841d71720c80f09ef2b13eea314d07522b534f2de7eb30669bd21b6d47a0c9331fad1e398e922d6e1e0719435367c27b0fd68a1ff50fe3a7943
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
deleted file mode 100644
index 9cde85d61f47..000000000000
--- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Full screen visualization of the network traffic"
-HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
-SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
-IUSE="slang"
-
-DEPEND="
-	net-libs/libpcap
-	!slang? ( sys-libs/ncurses )
-	slang? ( >=sys-libs/slang-1.4 )
-"
-
-src_prepare() {
-	cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-src_configure() {
-	if ! use slang; then
-		# No command-line option so pre-cache instead
-		export ac_cv_have_curses=ncurses
-		export LIBS=-lncurses
-	fi
-
-	econf
-}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6286e812ee48..2520c9f5e6bc 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -16,13 +16,19 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
 DIST zabbix-4.0.25.tar.gz 17414403 BLAKE2B 5b84c5d61c90b4fbc94ea64994a7b4216fe1e728e3bf71afb5cfa674f3f24bd8d9ab91dbd9d869d5bef8fc83ef168a952ba45db8abeabf51402d92dd4487d8dc SHA512 741373adeab5ad4adccc8909e7adf7c8d2172b49e6c5e23cda057be3b82ea237fabcaa787557ea391861a6c2ad42efb695d36836ce8dfd1532e8a3cf394a7cfb
 DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3e608beddb5b12ccbc8998ee6f0c3913b5f5cfe2b63dbf154a43e8393fc64b8286f805b8d3d08edbd25f21b66ce1 SHA512 7dc54176bd40cd73e2e82844caa317747df611e61b5d2d13a3516d143af9ede29ba5407bfca8aec21c9afcb77f53494ee469a2fc62cef3b91cedfce71803cac3
+DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
 DIST zabbix-5.0.4.tar.gz 19039167 BLAKE2B 82fb27076febe5ba43ff6c829ae22c5b4928d74f14e429c602442c90dfd5d1ce112b66d1782bd313b3300c66c774da4403a2150be7ed6ae56ae4b03a608dd018 SHA512 8ac6b56a221fe73982c30dc7dd2f2b036fa10a2fc38ef54e24dc0dd5d56a096f9c0779965afcaa5d26ee893a9f5fc8189ebc67d4244b325acb851cd8b5b6af73
 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.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
-EBUILD zabbix-3.0.31-r1.ebuild 9257 BLAKE2B 0fdd5d2a46f61939912b2ad0ebc088f4b77ee1792ee5876845f6aee190396c1418ca40f7da3ab3973f457f66bb0b94a8ac4f98e5fee18a24c35ac86491f294c4 SHA512 fe6705253dec2a4b82698cfc17963d55bee700b974ce6be5c848f0029a875a84599b3919e78915a9662cf47360154cfef60f2604dacd8414f2ca3a7dff46cb47
-EBUILD zabbix-4.0.25.ebuild 9231 BLAKE2B d51de21f9a13f9b4812eef4c3e052f4d807efeb2dfa0ad36cdcbb964e4295fd5cf6642a5f8d578fd9c84f3e43c15ea7a1e7121071cf0bdb2429327c3f627372b SHA512 f35b6ede0825eac946723baf4e5fd75a86d336c2e6df154225c549c8c3097b9c0098c10cee55ebbb39c6cee32d70891d7f131d9fb4525c36fa6e3dfce911fc12
-EBUILD zabbix-4.0.26.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
-EBUILD zabbix-5.0.4.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
-EBUILD zabbix-5.0.5.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
-EBUILD zabbix-5.2.1.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
+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.25-r1.ebuild 9246 BLAKE2B b86b928260077f788d8ea1a5c083873fd2335242e74c88f9eede8838e6d580cce27500ee4838689811b5e8fb17c3aaf834d607294411b00614ab964ec5e8a685 SHA512 1956f1119adf155f9eaa3a47869bbbd487e1aea6b5d711e44604f286cf497c183949ad521fb7d794b3d1a5b53c6f51ce1b102719c5ef507f7702eef48c80c812
+EBUILD zabbix-4.0.26-r1.ebuild 9247 BLAKE2B cfd0080e536041cb26b8a148e7e5e1af5cfde637eb4fdbdebff1345d198b4e1ee5b6e3b1907c26eefec008f14ef22f8983431bdba3346d8a8255c879aac46d53 SHA512 0d57d119cb94fb448c735f9a8cecccfc3cd20ef5cd1631fc646b21eddfb5c3d20104c3a4b6b47d57d0693b51c032effd982f863f6ee89dfa5745de833aaac079
+EBUILD zabbix-4.0.27-r1.ebuild 9248 BLAKE2B ec957d89d392344529536c0d0c80d4f22db4db467f82374d9add67d70c5d9643401775d0452d4fa84bf72c98f96b33fd2d462f8cf6951e6312644c301959d628 SHA512 b8afdd2e70ec8944aa601aaac86d1a38d172395eb21e19bc714dcecbd86b1b57af387769b5fe29baf2cdddee2db33867a803b07599d774c6909142cc148c442d
+EBUILD zabbix-5.0.4-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
+EBUILD zabbix-5.0.5-r1.ebuild 9116 BLAKE2B 836123e564143d2dd7b126e07c482a66b34240f1e9ae667991dd6791a99058e1aa5aedc781c35f2675fb4bfbfe8e6da923a7ffe3f4187644acfe404e2d457799 SHA512 83abc4baaa8ecc3dc25124ad2051b5120cf2a9be42d0597997477d29b2cdd01da269498e34114678ae9300bb5ba5c8b8a7ffd1d9f274cfc224f09daa212c5012
+EBUILD zabbix-5.0.6-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
+EBUILD zabbix-5.2.1-r1.ebuild 9116 BLAKE2B 836123e564143d2dd7b126e07c482a66b34240f1e9ae667991dd6791a99058e1aa5aedc781c35f2675fb4bfbfe8e6da923a7ffe3f4187644acfe404e2d457799 SHA512 83abc4baaa8ecc3dc25124ad2051b5120cf2a9be42d0597997477d29b2cdd01da269498e34114678ae9300bb5ba5c8b8a7ffd1d9f274cfc224f09daa212c5012
+EBUILD zabbix-5.2.2-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
index e33f3eee4220..40121fa75537 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
@@ -13,7 +13,7 @@ MY_P=${P/_/}
 MY_PV=${PV/_/}
 SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
diff --git a/net-analyzer/zabbix/zabbix-4.0.25.ebuild b/net-analyzer/zabbix/zabbix-4.0.25-r1.ebuild
index 065c01ba723d..c3e0e8de2db6 100644
--- a/net-analyzer/zabbix/zabbix-4.0.25.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.25-r1.ebuild
@@ -13,7 +13,7 @@ MY_P=${P/_/}
 MY_PV=${PV/_/}
 SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
diff --git a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
new file mode 100644
index 000000000000..d7ad8e740a55
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
@@ -0,0 +1,350 @@
+# 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 user 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/4.0/${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 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	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] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	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
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	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) \
+		$(use_with xmpp jabber)
+}
+
+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 frontends/php/* "${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 (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			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-4.0.26.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
index 844a2e68741e..c097176110ef 100644
--- a/net-analyzer/zabbix/zabbix-4.0.26.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
@@ -13,7 +13,7 @@ MY_P=${P/_/}
 MY_PV=${PV/_/}
 SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
diff --git a/net-analyzer/zabbix/zabbix-5.0.4.ebuild b/net-analyzer/zabbix/zabbix-5.0.4-r1.ebuild
index c105a7d5d7ea..04c629c2aced 100644
--- a/net-analyzer/zabbix/zabbix-5.0.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.4-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+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"
diff --git a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..7fdc79246f1d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
@@ -0,0 +1,347 @@
+# 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 user 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}
+	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
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	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.ebuild b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
index e393d4a24eba..b95dbdcff0ce 100644
--- a/net-analyzer/zabbix/zabbix-5.2.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+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"
diff --git a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..7fdc79246f1d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
@@ -0,0 +1,347 @@
+# 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 user 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}
+	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
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	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.0.5.ebuild b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
index e393d4a24eba..b95dbdcff0ce 100644
--- a/net-analyzer/zabbix/zabbix-5.0.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+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"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /net-analyzer
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)