gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /net-analyzer
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
165 files changed, 2943 insertions, 3837 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 77aa0592b1b9..691916998478 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index c54569ee2003..b6a3dd151743 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -8,7 +8,7 @@ AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
-EBUILD argus-3.0.8.2-r1.ebuild 2067 BLAKE2B ef1fe40bc38cc957a3c637313c34d2339f8ef2f1034928fa476ad8a1f92bdf075cf6b4c8d00b289a090a470221747c6841e1c6fa09566d8d584c892df864705f SHA512 7754f0257a9e35729defab6df1aa626a66c8560fdbad211dc60e79c574bcfcef814f39d8530d81ed3329a5385127b4664a39058df755286a1409d009e32ec9dc
-EBUILD argus-3.0.8.2-r2.ebuild 2165 BLAKE2B ccb45a1eedf0d5070bd75ceb28f6d4efb15505cffa2d653a6aabb9669e771e251c31dd3b8445fe667e172b3b86c278ce665da8a8c896379e1ae5b1afbdd7446f SHA512 1439de1ef098d5b0815367e997e7eb9ec93f5c4e3e8bd5262c5707e52e5bbf6ce459bcd5df927841cb629ca15192d05c54cf6ef87966d822c40ed021ef6e7d67
-EBUILD argus-3.0.8.3.ebuild 2088 BLAKE2B 39a3d169cd721baaa9edb4c9f9b9f841c80c2e0f0390c30c065291f879c18abc191f7015ef13a599e0f69b90ed4abf559ecf1de6e4ed256b7e6e4fda6873ffae SHA512 16266e0e61f26467cbab08782b8de8474297988bc0eff342f6a894b2faab3e9d8a3b1d4ea496fc68465f3dcaefa24ca18d3392df234aad4055f7f2e7f5fb2fb2
+EBUILD argus-3.0.8.2-r3.ebuild 2018 BLAKE2B 2e7f691e6b4d711ab805f8274b5cccc62afffb5ebc16640bc1121dd403d087a5385c5b1b95688371e8a2f21c661193f8263bb73b5d6c1f9da3484837ebdd18e1 SHA512 0c4f385b9d913aaa7870d3196625a166f38fa18b5eb4948f9e4ae5cfd2e6bbc162ba2e796a9b19df3f0fca20828000c6bbf6eac75c98781edbc8dc6b1b5d3e87
+EBUILD argus-3.0.8.2-r4.ebuild 2048 BLAKE2B 14495922f1c06df64278e94a75d1bedf97a2314ebdfc4592aaac74c45b2fc1bb9ab035d3b0aba9796fa47fcbe898bb9cfadd06fd4092fff8a9e21f1ca9c6e61d SHA512 b556f3de56e86c46786f3830ebe7aae0979f2d7f508c80d5ef22ba3ca28e5b81b8b5742e76e3f1b773250df8dfa00e8b87c488e4bd1d84598446dc49afa9fdd6
+EBUILD argus-3.0.8.3-r1.ebuild 2041 BLAKE2B 5286684a9d56de8fb3d79fade6f97243b844a112022edf7a2e7a98b763fe264e70a6a660e508b4cc679e6ee6f476eb6e317a46cc26856b9791ad30c5a9de186e SHA512 404cae82d5098a0fa30165adf153c37139eafb1eb59e99583bb3925fccb179bdab3f5459c5a3509c0a849cc927ee8967146c49cd4ab78f09ef2a76b362283e16
 MISC metadata.xml 378 BLAKE2B f5479fe68336ff3ee37d9e325b9b2c1a70eb399746512fec7e08e603c82c1183b8229e0b9ee1fae073f027ca7a7eabbf9e4607c9ab1b2fa6bb6fc8b6c9bdac6a SHA512 cbd4b2e58b229b6fa82e1b3628153113b611d7370e2f4fd3e662541f07d79c01aa5974cb797bcc67017034dc7f52373648b2cdb5a7f64a89391c7028303f591b
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
index 2e662864e3e6..a0f306223745 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils user
+
+inherit autotools epatch
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://www.qosient.com/argus/"
@@ -14,6 +15,8 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	sys-libs/zlib
@@ -22,7 +25,6 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
 DEPEND="
 	${RDEPEND}
 	>=sys-devel/bison-1.28
@@ -76,11 +78,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
index 807aab798e06..3ca4a4b18ff6 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://openargus.org/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	sys-libs/zlib
@@ -22,9 +25,8 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.28
 	>=sys-devel/flex-2.4.6
 "
@@ -37,11 +39,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_rc/.rc.}
 
-pkg_setup() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 src_prepare() {
 	find . -type f -execdir chmod +w {} \; #561360
 	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -82,11 +79,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.3.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index 8092871dded2..cc378b5cf4b8 100644
--- a/net-analyzer/argus/argus-3.0.8.3.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://openargus.org/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	net-libs/libtirpc
@@ -21,9 +24,8 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.28
 	>=sys-devel/flex-2.4.6
 "
@@ -36,11 +38,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_rc/.rc.}
 
-pkg_setup() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 src_prepare() {
 	find . -type f -execdir chmod +w {} \; #561360
 	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -67,7 +64,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
@@ -84,11 +84,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 57c8bae6b719..627ba27cfd7c 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -2,7 +2,7 @@ AUX darkstat-3.0.719-strncpy-off-by-one.patch 471 BLAKE2B 45e738a9a777173924df26
 AUX darkstat-confd 911 BLAKE2B 35cb512c3727176218a16508d3b61ddf003081997d8f52918c5b9b7e762c882f878bd3317c737931d29cbf3aba1a7c375ebf067a394da41d15b95b3d97768437 SHA512 cf5b222a45a406d4e6b03860a9053a9c25c88d793e86525ebe38dbf292a69f00dc073b12179818e7e7b669f4a706d70eebe9bfeda363c7c5003c035639f41bbc
 AUX darkstat-initd 1461 BLAKE2B 4f0aca1bb12661de4ea1c2d5ea7dd9733833aafbe012ea0019d536ee1d45fa0cffc5a7a210783e9bbd3c5c5b236dc6f505ee0807b8ad2bd6ef78e48fa676a386 SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226
 DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
-EBUILD darkstat-3.0.719-r1.ebuild 1802 BLAKE2B a62da0634ce64b39fce71aa5f2b649854be26e45f0d88875903bf7539003c5523984dc7788d1f4edda67ee55eb5a60c9b95f923e5ac39909986130e849c3f9cc SHA512 7a2cdefdc62188077cd62112301911c08095c8f081956501c810804d88a55080b4f67d0606a2cfb1e1c495ba8a5e0737d7d8bd67e98e4f34b885092aa5ee665d
-EBUILD darkstat-3.0.719.ebuild 1718 BLAKE2B 7c01b6c99a239bdf2c6c7ba84b9846a2873a8b7ff5cf3000b76018eeec3dadfb008f71c317a4d39982b9dc41de44d6011688423d106894b82ae4fa47a1e5dd3b SHA512 18371bdff718f03a28f17abf88c3dd713096650350246f46defd7459aa32100f01e74a1178816173c69dbbf0c37df53c4476198c1d44be9c73c6b2ee56ce86cb
-EBUILD darkstat-9999999.ebuild 1831 BLAKE2B ee48031b952a17d9f95f6332f5ca0526fc494ac7f76a5e2dce64235628aa943fbe21344078eb186e028702b74b81364ad8c53a77961f1a83ceb3733199e7eb31 SHA512 df4e23789762b2d5e4fcddb964b999b53caf374a584aa4b5edbf2a46dbec1b721aeceec28406e1c6f179c40bc0906911cf9e471594da77afb12f1c9866202b2a
+EBUILD darkstat-3.0.719-r2.ebuild 1693 BLAKE2B 8d739222a60aacd47dfafd7b913db182fe533afa20bc470ae29f2d09af8e965cc0aba4158be19f81cedf6ae59aeb138b9095151da040378355fc6464589a8eec SHA512 64bc9d1e189d7d16de8fda9083aa30ad6aaf3dce43ab3855a7ac0af9ce00ad6f67085e2ca62794db61bb9581e585d105fb094a7bbee03bfc8ec08792ae2b6686
+EBUILD darkstat-3.0.719-r3.ebuild 1780 BLAKE2B de855346a7375bd48572d2cd0f49923649b36572674af6fd0a70e7c3291b2f4b9458bd6b3ba2cc73518ede1c6ac6a89db2cef08a8b029113dd1548311cbe2943 SHA512 5de532416453b855f829fc28048b88d15b0aba65348b3d4f3972be2f7d651f7b87174f8f0dc9b41691fe46b683eb111dcae083d03dcd174140f630e3a4090ced
+EBUILD darkstat-9999999.ebuild 1809 BLAKE2B c4464879938ea296aa2f67b5d617587317bc199e947547dd5e2588603633536821f06608d2dca04ae2497b25d7905d7afb9d5f0affd08e025ea7c604c7c8d071 SHA512 061052f55525bb9f6247459e7f585224d05036fc6e444ac0635c57847fbeca9c9179e619169c1f401e1b01211e73922ee45c5e0f6f3f5e755ef920a84c2ae00e
 MISC metadata.xml 536 BLAKE2B 7ff89764c1281848b7345be779d1694d4a439fc0a211fc10feb37302a184ce78d984c941e374192bbefb1a22e1ce13ae63a1ab96c37fb4ff539aef0edeb7a58f SHA512 5950789030e76ea0a95fbf8cd53e702ee8d55af96ed12aef4d6e6ae658ba01e949f875283a2f5c0c12f15fe7beec18704bf14bea1d89c5321df505cd2ae3d5bb
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
index eb3e78e31c6c..041df6e159de 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -50,10 +52,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index dd21a625d201..d67ebb1e93f5 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -54,10 +56,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=$(
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 294f80c7140d..4ca39eb748e3 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 user
+
+inherit autotools git-r3
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -16,6 +17,7 @@ BDEPEND="
 	app-editors/vim-core
 "
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -57,10 +59,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=$(
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index 7f16a3805660..6ff69e8083af 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -11,4 +11,4 @@ AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
 DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
 EBUILD dhcp_probe-1.3.0-r4.ebuild 1128 BLAKE2B 3b5dcfd15dd977d8f95c5e2cdbc869ee37984c81a503950b3017b40545e86574b82928e785dd4b80599cc283c346abda5cc8031b619cbedf487dcfc47d516a3a SHA512 a43a0cfb7c3c3c784d12ab8b9aef02edc9230f773e8d0ccd07ff46f163d57fede4aae5d84c742ace7578a32053cd1784310cdca200924ad23fff4c0f8d0651e1
-MISC metadata.xml 385 BLAKE2B bdf1c7cd0202849dd9a929cae9cf67ee7dd286a099037287d1e6e73c7d2184f1240d8fc043488fed3ebb68d6a8735157cecab3cfc0ba49f3bee0de025fd350f6 SHA512 c8e1aced05e8c1eacaf98af4c72dff016994b62cbb574e4ce8040ee471003ad9611e849625c262cb49c8659c594941274402b1602f7637b5f9db60f74c999049
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
index 65f179266d16..2c2a7923cfc8 100644
--- a/net-analyzer/dhcp_probe/metadata.xml
+++ b/net-analyzer/dhcp_probe/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 001a078f3a54..925b42fa28d2 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -4,5 +4,5 @@ AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f
 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 1345 BLAKE2B af0fd32a79845b824a57ed6e059caae0c330efacfd89944733996e5ef448b76f7c9de32fc55c400ad1b2b0983df11ff56a7c839163360c26b25430213cc9fd6e SHA512 4c1085b74a40d3af3265a829f6c146f6b7f6cc3cc34fb425ce8c83396c2385d1c43074c86245a615df16b88434b5a243f9a7bcebb263c373c8d4857e20466f83
+EBUILD driftnet-1.3.0.ebuild 1350 BLAKE2B f4361cf5365dc28fe2137d030fc7660b4b942bb0a622e7718eb31ca0545c6d7419e17bb008b1c73ca45cc5872a28dfa3dc9259914583374dfb10aaad48185d71 SHA512 675fc93a31985730a5e9191fdf84baef6a0f935050b7f5d6c326227f227b8fbe86c4969ae1da58e71ff3a38c81b8cd0fbe02b930e47149b33d80c1841d95704c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 5472c3464801..b20c9b846b70 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 -sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc -sparc ~x86"
 SLOT="0"
 IUSE="debug gtk suid test"
 
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 6ab4d415bb1e..5598922002f6 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
-EBUILD fail2ban-0.11.1-r2.ebuild 3297 BLAKE2B 082b6e0872fbdfa02f9a1066f5a156a78aa773c9333e1dae0238764d07e23a69c1d904ae6226ca832d1272b23861220ffde584aeb1b52618317909274a883830 SHA512 c0b581770641dd89e39999a1d79d44b62f902a524c45216cb98775303ae880c7fdff5034b05861ad8048e0cf644e1a0d6fc129b40241e1a428337657d758ac0a
+EBUILD fail2ban-0.11.1-r2.ebuild 3304 BLAKE2B bd423b357180362b03a602e661c348440f559af0007acaebd3b87fac825b66ed5a2f9d87f72c83a59f460d31ff88d0fab9dc58be1fdf15f2a77bb6753ad26ff8 SHA512 a0b3ac50485c7d74b0a2865ac90858fb9ddfc7b5a61902e22b21187e01e9a8f15e230983353d5998d9bb4f20cc4fd1f5dcc5986dab7d4acf8bac329e8a295ca8
 EBUILD fail2ban-99999999.ebuild 3231 BLAKE2B 3700cf6551941dd695e81145d723f6be91bf21df0ac3fe95c3245a4a954c9855e3d082e47409f9a75dbbb87fc1c4ecf51a6477b3e419987a669ce821ee47e7fa SHA512 dc518092d1b9687ffe1c2d47e5e23f3ed58cd36b7ed28fc14db9179476c99b208450ba9f8fb0e9c516320408da526ae74f18ca1efb21a0b14cff4d06b9578a7c
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
index dae97e6adc44..55969ac3638c 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="selinux systemd"
 
 RDEPEND="
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index acd801e809f6..049ef44bd61e 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6
-EBUILD flent-1.3.2.ebuild 613 BLAKE2B 4d688c76e509abc1c2a96d260e4bcc87dfc54b1966d1300aa60957b0e2f96fc4836c1a96ba815d1f5442bd85ec09c7a8fd6395f797db5775f6aab96b84b00e62 SHA512 3146ade9a6be5468e198e91de8ffe0dba14272e747e6012cbaaaeb1fd7120a0946b02d569ed2a3d728823c037b21ce243adae7bf75cf1dceeb2cb8eae001f71d
+EBUILD flent-1.3.2.ebuild 617 BLAKE2B a7554baaeaef7c32d9a335395b573edf6c1999dc7ec8a13e8dc59d8d695774f51bc7d25d9014783c2264859903c8107580c077cf99960302e3074018c6eccc4c SHA512 db3cbcdcb69f6fa7491b74761353676ee93293e3d7d32a6496bde7003d40619b1a78f67f30b23ef5cdef4f8c7ad8572b2b1a61fded8e917390997edc5e4788bb
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.3.2.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild
index d3d134d7af8f..efc8e7382ee8 100644
--- a/net-analyzer/flent/flent-1.3.2.ebuild
+++ b/net-analyzer/flent/flent-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 DESCRIPTION="The FLExible Network Tester"
 HOMEPAGE="https://flent.org/"
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 31c270a2ecf5..db2a7db25ea7 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -8,6 +8,6 @@ AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511d
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740
-EBUILD flow-tools-0.68.5.1-r10.ebuild 1674 BLAKE2B 0388edf037c985e35961e04268db72741ca859bf0018759849e54e66451bea1876c65dd0bc419d3b05d53755aeb6b7d1a8b722845d53d124638a469b04503cac SHA512 954c240c465fdda3dad18f15b95fcde793979c5589f5db31f3c67fc12e0aca539e91c6052f13daffae806010d1b3d26be132048a9ab4d9ab9ea64e2b256fa63e
-EBUILD flow-tools-0.68.6.ebuild 1928 BLAKE2B 2e4ad0d586558a6fe1e1afbcebe8876d0711a562bc9d50f28f437f47f8c12cc1a90c6c2a310757f1dd7af4b2c626ddc26896839c66c7a19a978ddc64e4689267 SHA512 cc3d7801996709869f4ff7a630d650406f924639e8023d87e4abb76dd13152560105e0157f749cad8ba13ac96b78640928ef33f3c9677ff7940c27c2d2e62a23
+EBUILD flow-tools-0.68.5.1-r11.ebuild 1570 BLAKE2B 9777743a331cda77929b901175b8c9fce0f0619d28bbc6263bbbca6a22931de0bd7077176cbf27a0a5004f491d3dcb4878f7802a17a162016b8a7e9aa70621b1 SHA512 e95fb5cc31790bda2a7f3384ff76d2c140b359d9f321c09c8127ad77a995d07333bf18941ae54a29be1940fd411383c9cae8ad0a6c629b3d052ebb1429beaaaf
+EBUILD flow-tools-0.68.6-r1.ebuild 1821 BLAKE2B 4c62192f40635eb9afcdc3eca578deebde35e5a28c5ee25e1eba927ef9d34131a42cf662a81debcd783394a407d79c7a0f17f2b566d066d092c40aed83a22efd SHA512 5aecaa30e76eda57314d959e90d78a4a87983f95fb9a3ca6c8d951a95d9948c2d6a3a6ef814965e08e997c3a06fa4adb21f26f3014d124b737583192f986a65d
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
index 8656ded05688..d1f4fc95e62a 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit user
 
 DESCRIPTION="library and programs to process reports from NetFlow data"
 HOMEPAGE="https://code.google.com/p/flow-tools/"
@@ -13,7 +12,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
-RDEPEND="sys-apps/tcp-wrappers
+RDEPEND="
+	acct-group/flows
+	acct-user/flows
+	sys-apps/tcp-wrappers
 	sys-libs/zlib
 	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
@@ -21,8 +23,8 @@ RDEPEND="sys-apps/tcp-wrappers
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-devel/bison"
 
@@ -35,10 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
 )
 
-pkg_setup() {
-	pkg_douser
-}
-
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
@@ -68,12 +66,3 @@ src_install() {
 	fperms 0755 /var/lib/flows
 	fperms 0755 /var/lib/flows/bin
 }
-
-pkg_preinst() {
-	pkg_douser
-}
-
-pkg_douser() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index b95e64990111..d8ee002d2ccf 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="library and programs to process reports from NetFlow data"
 HOMEPAGE="https://github.com/5u623l20/flow-tools/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="
+	acct-group/flows
+	acct-user/flows
 	sys-apps/tcp-wrappers
 	sys-libs/zlib
 	mysql? ( dev-db/mysql-connector-c:0= )
@@ -39,15 +42,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.68.6-mysql.patch
 )
 
-pkg_douser() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
-
-pkg_setup() {
-	pkg_douser
-}
-
 src_prepare() {
 	default
 	sed -i -e 's|docbook-to-man|docbook2man|g' docs/Makefile.am || die
@@ -83,7 +77,3 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	pkg_douser
-}
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 14448334565e..c1ae028d21ad 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,7 +1,5 @@
 AUX fragroute-1.2.6-libdir.patch 4634 BLAKE2B 71fa0052f4e9b15b8ba143fac4f2a1af8bac19dafc9ecae71056b62cf6090ea0182da0b8e7986eb90318cfd3e4e57e8ae9c3a7146dbfda1ed91595ccf14d9783 SHA512 9013a8d685a66b0c7bd051ea4a95ae45140cefc11db05a1b476c07ecdeb26e99e90bd74f19698c2e7e52d4126e0415b5c3427d8028d260860f40aa1e3f95d727
 AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
-EBUILD fragroute-1.2.6-r1.ebuild 1037 BLAKE2B 81e3443bdd270b36cbf94e88412cd3220befc5faf843bf1619e3ba2f8fca3a5eadaf5cf40983e265bb214c12fb7af9bc2e59780f26bb5992f4dbdbf38514b687 SHA512 49b02420969d14fcba01898ac514f8fe2342a0cb9eae0e74eb3f685930d9bd7802200c3d9c4b9f62061ab1422018a8b93a45ef0819547fd092c5f134b26ce534
-EBUILD fragroute-1.2.6-r3.ebuild 1084 BLAKE2B b8474ef0ce515758463ad4b7bfaea6f1834c201ea17273fc9f86bc5698cbe729a32d64cb6902d44b293d7c3c210f6772d49ab7fbaee27dddf19423189c08c8aa SHA512 ed76c00c900f281715fa38ed7d254e290b7cade2f152ab007faa76f99be4d53cdf86f1242cdcc14efb06ed13211c1e64cc8d6a5b591ac8c263615f8c76d72ceb
-EBUILD fragroute-1.2.6-r4.ebuild 1079 BLAKE2B ec7b1b983de3ad65d0e7dec0c2ed2d2860360af485c973677f77e81a89eb3203a0d90489d05ab7581ddd9039598395733ebf9fbd953ff5b413cb769f26c664d1 SHA512 20ba8dd271f209770ac2fe8c55b2f7232419173dbec127f53e9910842fb430a1b88b2e01a353de79bb020b3ea25707c28b82413ee8723350650abd4aca59f976
+EBUILD fragroute-1.2.6-r4.ebuild 1077 BLAKE2B fbe77b23cd6c06e54e19a5630ad72b3a5631407a3583e7d00cdc18ff6f40eda745dc52192561d7855753b8b6a967174e29e30328af5e845472b16d99da656eeb SHA512 fe09d76c6f4c9ef6b701a7af484c703dd6a64e818f2258410772965b98fe0b92c8779567ee9e1d7a149d37ba1dc429c16ad14f38852a46772575c3f0a78283ca
 MISC metadata.xml 364 BLAKE2B 6f99923afef64e689bb2169801086f433f54879999551e8ac7e74f3c49ae10b2381041e626a024efe57b167a9394219b3ff3f313b049b2d40ba5404134b766c1 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
deleted file mode 100644
index 53aaa81ffc3d..000000000000
--- a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-ipv6"
-
-inherit autotools
-
-DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
-HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
-SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-libs/libevent
-	net-libs/libpcap
-	>=dev-libs/libdnet-1.12[ipv6]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/awk
-"
-DOCS=( INSTALL README TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# Remove broken and old files, autotools will regen needed files
-	rm *.m4 acconfig.h missing Makefile.in || die
-	# Add missing includes
-	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-libdnet="${EPREFIX}"/usr \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-libpcap="${EPREFIX}"/usr
-}
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
deleted file mode 100644
index 60b3c08bfca8..000000000000
--- a/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-ipv6"
-
-inherit autotools
-
-DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
-HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
-SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-libs/libdnet-1.12[ipv6]
-	dev-libs/libevent:=
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/awk
-"
-DOCS=( INSTALL README TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Remove broken and old files, autotools will regen needed files
-	rm *.m4 acconfig.h missing Makefile.in || die
-
-	# Add missing includes
-	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		DNETINC='' \
-		DNETLIB=-ldnet \
-		EVENTINC='' \
-		EVENTLIB=-levent \
-		PCAPINC='' \
-		PCAPLIB=-lpcap
-}
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
index 58e9d754203b..664c3d346e8c 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/libdnet-1.14-r1
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 45244eab08ae..8f0e961bfa2c 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1,6 @@
-DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
-EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
+DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
 EBUILD goaccess-1.3.ebuild 1512 BLAKE2B dfb4a092095509a7e6a335a7568a3a8b48904ebf95aaa6671c42194a42ea68a17448f3555aadacf455b5ed85456a11990c83b403ebf52706337dda1f70128212 SHA512 310a8f624a6d3404e14bc8fd1ecdb157c993b9f69390e7ade4e7b0bab3a47c4cbdc27590bf196c64f48fb8ebc2cbfa5230d812ffe4cca2def6d71761c415d281
-EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
+EBUILD goaccess-1.4.2.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
+EBUILD goaccess-9999.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
 MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild b/net-analyzer/goaccess/goaccess-1.2.ebuild
deleted file mode 100644
index fc4075601073..000000000000
--- a/net-analyzer/goaccess/goaccess-1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="https://goaccess.io"
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet[bzip2?,zlib?]
-		btree? (
-			bzip2? ( app-arch/bzip2 )
-			zlib? ( sys-libs/zlib )
-		)
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
-
-src_configure() {
-	econf \
-		$(use_enable bzip2 bzip) \
-		$(use_enable zlib) \
-		$(use_enable debug) \
-		$(use_enable geoip geoip $(usex geoipv2 mmdb legacy)) \
-		$(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
-		$(use_enable unicode utf8) \
-		$(use_with getline) \
-		$(use_with ssl openssl)
-}
-
-pkg_preinst() {
-	# Change path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed failed for goaccess.conf"
-}
diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
new file mode 100644
index 000000000000..e029cb0bf444
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="https://goaccess.io"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="debug geoip geoipv2 getline libressl ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	geoip? (
+		!geoipv2? ( dev-libs/geoip )
+		geoipv2? ( dev-libs/libmaxminddb:0= )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Change path to GeoIP bases in config
+	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		"$(use_enable debug)" \
+		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
+		"$(use_enable unicode utf8)" \
+		"$(use_with getline)" \
+		"$(use_with ssl openssl)"
+}
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index a5512dc51d48..e029cb0bf444 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
+inherit autotools
 
-inherit autotools git-r3
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
 HOMEPAGE="https://goaccess.io"
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
+IUSE="debug geoip geoipv2 getline libressl ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:0=[unicode?]
@@ -23,14 +27,6 @@ RDEPEND="sys-libs/ncurses:0=[unicode?]
 		!geoipv2? ( dev-libs/geoip )
 		geoipv2? ( dev-libs/libmaxminddb:0= )
 	)
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet[bzip2?,zlib?]
-		btree? (
-			bzip2? ( app-arch/bzip2 )
-			zlib? ( sys-libs/zlib )
-		)
-	)
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -48,11 +44,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		"$(use_enable bzip2 bzip)" \
-		"$(use_enable zlib)" \
 		"$(use_enable debug)" \
 		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-		"$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
 		"$(use_enable unicode utf8)" \
 		"$(use_with getline)" \
 		"$(use_with ssl openssl)"
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index e52f36f808e8..e6e6478588df 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,6 +1,4 @@
-DIST gr-fosphor-0.0_p20191202.tar.gz 254103 BLAKE2B 460b4ff2ff9f4a6faa70c541dd8ce936ba8419a89cca7715913b6f93f07a151c467a5737860a362198d609dfe0e4bfc4a476278bfc720d89c1876ff56addf226 SHA512 6bc26be4aa3116af33a214046c76e5a7623e049e27e86d866892de611ffd4bfa4bd841b66535fc40320fa7c7a46d19af2d391ee594f9a7ed997355cd2ade6fa1
 DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
-EBUILD gr-fosphor-0.0_p20191202.ebuild 1379 BLAKE2B e24557d185a06d139ba915dfadb23eb99d434f88f09bb006fcbb7cfc0d565905bc095cd83e630d4b80b97c1fc25b906b5eefa5b8ecba00f5b7b950bda869c53a SHA512 c764a9ed59af2a4b929add701485cf89a5ed0563f0caddf29dc71fb23cc8e0fe00c92a834ad4acbdbd95fd335648d4d0c3f71f4bcccc84d455cd5086decfb873
 EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
 EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
deleted file mode 100644
index 78c0f817bcf6..000000000000
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
-HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-else
-	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
-	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="glfw qt5 wxwidgets"
-
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	=net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
-	media-libs/freetype
-	dev-libs/boost:=
-	glfw? ( >=media-libs/glfw-3 )
-	virtual/opencl
-	virtual/opengl
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	# tries to run OpenCL test program, but failing doesn't hurt
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GLFW="$(usex glfw)"
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WX="$(usex wxwidgets)"
-		-DENABLE_PYTHON=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 40b68e00a617..313b8d92de7c 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -2,6 +2,6 @@ AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164
 AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8
 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
 DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241
-EBUILD graphite-web-1.1.5-r1.ebuild 2966 BLAKE2B ad0ebbd4068438719af7d8df197d938cadf89b8b92b9927e467e47adea7a8dbb5a6289e9ec2770a9796ba4825cc5ef6b39576fe6a2f5920d1dda9e63d28fd024 SHA512 010668dae9fd625d8b31a6db6d64fd0d3f860d6f208ecb951440ac7406b1376937d492a3719b6bb4d6e1605f1e691752cd32ab82c846fd27c4cf4a596b217fd7
-EBUILD graphite-web-1.1.7.ebuild 3038 BLAKE2B 8afc7e4e19c8815dc74fae76e59bc08a0d7432149f97d192188f7d5d415bf342cd1ccbfa74e4fee36dfc739c0e791352aca3f96538a4009bf822ae517f0875b7 SHA512 6b37ec3bbd1c2287051435cf55af36c90825d4c3b62ab1b5d256a481886464c3ffac881cf7fd7f04c388875473bf5d724e376aa552de1f2bdd9f77cb2b179cad
+EBUILD graphite-web-1.1.5-r1.ebuild 2922 BLAKE2B 066728f763f7c50995f5903503425e7da5bab78f1fe559e0929857e9fb6b45d2a3893f1fb7a18034f92e785f26e850c849236adc14f075a868841951d16ace0b SHA512 0a2efb28cfccf428626b54a4db53c765f1e9e8f9324f766d8702d96df29a3ad2f11868b6b783cd3c43a0fe5739df344a45a6a6474522b3279aa0654d03f9cacf
+EBUILD graphite-web-1.1.7.ebuild 3059 BLAKE2B d04098492791e0159db203953c4c0b70d9e7c505032cf698fe3c1c7f1568eaaf86f67c428b3cce82c37f24b4cc746b802204f58a704114bd3e21d47620792967 SHA512 a043cbf1f8a6d7d0b5ead0ab4deea7ce7d284f8baaa0b48b05c029dbe6dc8aeab9e104b92eaa1e179fe4002819db54edaf2fd22cbcdedc3366f8b66be425cd08
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 35eb0f1c76f7..4eb15c40b8c7 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )  # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 prefix
 
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 74a4e43dac93..96b7920163db 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )  # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
 	# 1.1.7 supports up to 3.9, so it's a matter of deps
+DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
 
 inherit distutils-r1 prefix
 
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index abc6a1cffaf6..2d6ab791e62f 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -3,6 +3,7 @@ AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0
 AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
 AUX gvmd-8.0.1-sbin.patch 2224 BLAKE2B 84e13415d01e3ce996af11f3ffde68a803c8db0a25b9a13986fde763739be95c95a547078a0a65a4cdeb2256c2daf9ed022381ba75e681198071364d2bf40320 SHA512 3cf3d8d12650f6905eef7c5b2b73fef9e228c13330d85916ed52bbad2911dc186c81e25650fd0381e0c878d2712df063cd42f18ceb9e6c9afac908bc9a2d7980
 AUX gvmd-8.0.1-tmplock.patch 746 BLAKE2B afba3139cd18734d9d9b89b05e7e5a3120c44b5099463cfa74f26142c2a779f75e473b0742e21d86171b5026af0d834bbedb2fb61edb3d1b83711898c0b6fcf9 SHA512 d5b12df500cef0c598aba6d0489ec18d6882ad0c111dce970ae4268af79df9b0aba66a5c9148b91af0e579aa82afb397bab1daced11b6f0ab2918472181800b2
+AUX gvmd-9.0.1-glibc_siglist.patch 3599 BLAKE2B 91844507e01a3a7faa017ae98ae066b856993bfeaef7404fa884add53ccb8954eb7c3eebb74a1de1a01a6ec61960347595ba9418e9a2b814598288d488a92a03 SHA512 c3fb56954c55181cbfc52828a0d87703e237b945e5c5239b3dd429910d8a65ceef41b2ee7a7df522c8e9da9e86cd07fc383fb62fdccd73ab9380ae139fea2a7f
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
 AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531
 AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d
@@ -11,5 +12,5 @@ AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c5665
 DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
 EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8
-EBUILD gvmd-9.0.1.ebuild 2728 BLAKE2B b22f1f879f7290657d4e49f0314e2fb81bd80e02e6383a0dcffc764a72e8883cc6d65b97846b9de2c28d46de4e97490334b52e1fd685706beea78a0addf795c1 SHA512 88b4d1d6266db00cd2b5ca7530d0746b54414963372c5537a3b19ed661ba5ae2cbba56ccc2ac90f80a5b35e09a8332ca184f41550e2942c72d3a26e663200e42
+EBUILD gvmd-9.0.1.ebuild 2837 BLAKE2B 2cdae3d6192e4cf4ba8f10a0e6d706d7f0c40173f5271209716e01f050c7e19f16eeefddf66520245db56c2288948a86f42b9d8d565ae6ddb72bc8626785a383 SHA512 9d2c0ff8c0ae32a300f98e5e51e429b253b71fec9f6d6c2a6134b856c86fa650622fead51009588e7b39a95d693058ea0af3be41cbbb5e94ff47ff2a316f9dc3
 MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
new file mode 100644
index 000000000000..186bd882bdd8
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
@@ -0,0 +1,96 @@
+From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Tue, 1 Sep 2020 10:03:34 +0200
+Subject: [PATCH] Replace deprecated sys_siglist with strsignal
+
+Required to work with glibc >= 2.32.
+
+https://sourceware.org/pipermail/libc-announce/2020/000029.html
+
+  The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
+  are no longer available to newly linked binaries, and their declarations
+  have been removed from <string.h>. They are exported solely as
+  compatibility symbols to support old binaries. All programs should use
+  strsignal instead.
+
+--- ./src/manage.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage.c	2020-10-27 13:32:20.423421085 +0100
+@@ -3283,7 +3283,7 @@
+               {
+                 g_debug ("%s: Received %s signal.",
+                          __FUNCTION__,
+-                         sys_siglist[get_termination_signal()]);
++                         strsignal(get_termination_signal()));
+               }
+             if (global_current_report)
+               {
+@@ -3305,7 +3305,7 @@
+         {
+           g_debug ("%s: Received %s signal.",
+                    __FUNCTION__,
+-                   sys_siglist[get_termination_signal()]);
++                   strsignal(get_termination_signal()));
+           if (global_current_report)
+             {
+               set_report_scan_run_status (global_current_report,
+--- ./src/gvmd.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/gvmd.c	2020-10-27 13:34:47.606424207 +0100
+@@ -922,7 +922,7 @@
+   if (sigaction (signal, &action, NULL) == -1)
+     {
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(termination_signal));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -953,7 +953,7 @@
+   if (sigaction (signal, &action, NULL) == -1)
+     {
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(termination_signal));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -1258,7 +1258,7 @@
+       if (termination_signal)
+         {
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
+           cleanup ();
+           /* Raise signal again, to exit with the correct return value. */
+           setup_signal_handler (termination_signal, SIG_DFL, 0);
+@@ -1347,7 +1347,7 @@
+       if (termination_signal)
+         {
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
+           cleanup ();
+           /* Raise signal again, to exit with the correct return value. */
+           setup_signal_handler (termination_signal, SIG_DFL, 0);
+--- ./src/manage_sql.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage_sql.c	2020-10-27 13:36:19.071426148 +0100
+@@ -18711,7 +18711,7 @@
+ void
+ manage_cleanup_process_error (int signal)
+ {
+-  g_debug ("Received %s signal", sys_siglist[signal]);
++  g_debug ("Received %s signal", strsignal(signal));
+   if (sql_is_open ())
+     {
+       if (current_scanner_task)
+--- ./src/gmpd.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/gmpd.c	2020-10-27 13:46:29.687439101 +0100
+@@ -496,8 +496,7 @@
+         {
+           g_debug ("%s: Received %s signal.",
+                    __FUNCTION__,
+-                   sys_siglist[get_termination_signal()]);
+-
++                   strsignal(get_termination_signal()));
+           goto client_free;
+         }
+ 
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
index 837980d8e687..b48b9a9102a3 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@@ -45,6 +45,11 @@ BDEPEND="
 	)
 	test? ( dev-libs/cgreen )"
 
+PATCHES=(
+	# Replace deprecated glibc sys_siglist with strsignal 
+	"${FILESDIR}/${P}-glibc_siglist.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 7a958cddcb57..9e8776a92305 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,8 +1,13 @@
+AUX icinga2-2.12.1-boost-1.74.0.patch 19210 BLAKE2B e6e09b631dc70b740212ad20d4e1bb38c7c8cf75c535f8935531bb02d0d3a9c3917bc272046315782aca2aa9e9f541c6686ef14810acfd854af9c64d647a554d SHA512 6f5b457dd4ef8d08fd4063a1a9babdc81d8f6789547448180795a30b46c4868ff1c520cc6e9b9140c866e0b62c9caae30ef4af53a963e29a0d2b4280acac1360
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
-DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd SHA512 22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
+DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797 SHA512 2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
-EBUILD icinga2-2.11.5.ebuild 4582 BLAKE2B e4f9f977636053c64d8a1bb86bf8f62cb5f42f9a3fea84bb90eb03470533a6b29a24851023b6353558fd8ae3ef7622759887b559b7080aae400505eaeb7e8838 SHA512 94ef9210e2b300cf6aecf8b3caedc9fde4e17b53b90ad554737a94c0207d86a31c139e1280ae55ca17332cbe70326afccb1e7670d2eea279fcc5d42dbbfa9678
+DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
+DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187 SHA512 db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
+EBUILD icinga2-2.11.6.ebuild 4584 BLAKE2B 26ebea2c0c182362d24720bf50b95bc5ec364629c0229d2399c666081570909d66f3cfb4dd357a0b5c61447a5a369bbb833fc51c1fc1a99a6902ed33c4ca6402 SHA512 801050caf9c1ac07a2177f61965aac1829b8ba8bb8961c7a6f300ac1fadee3cee290cf58d499c8e6f52dada72a659baaf8905cf636cd3dd369764a2a4781af09
 EBUILD icinga2-2.12.0.ebuild 4582 BLAKE2B e4f9f977636053c64d8a1bb86bf8f62cb5f42f9a3fea84bb90eb03470533a6b29a24851023b6353558fd8ae3ef7622759887b559b7080aae400505eaeb7e8838 SHA512 94ef9210e2b300cf6aecf8b3caedc9fde4e17b53b90ad554737a94c0207d86a31c139e1280ae55ca17332cbe70326afccb1e7670d2eea279fcc5d42dbbfa9678
-EBUILD icinga2-9999.ebuild 4584 BLAKE2B 26ebea2c0c182362d24720bf50b95bc5ec364629c0229d2399c666081570909d66f3cfb4dd357a0b5c61447a5a369bbb833fc51c1fc1a99a6902ed33c4ca6402 SHA512 801050caf9c1ac07a2177f61965aac1829b8ba8bb8961c7a6f300ac1fadee3cee290cf58d499c8e6f52dada72a659baaf8905cf636cd3dd369764a2a4781af09
-MISC metadata.xml 767 BLAKE2B 5a1f42327c794c6a9c7bc2c12a9d58fc0eb01e414f18a3ef80ac25263166a615ac1e3865544d3cc17bd950e5688b1f092b5061cbb5d4a51bca8c94bc83ddf9e5 SHA512 e92f81fbe17e5a54e509f26fa6b1fd0461c5229eecd3d0c5e078ab35fa6f2b5898e60e0d132b096bd2292d54ec9c4694564e96282fb4157985dfddec80c58675
+EBUILD icinga2-2.12.1.ebuild 4060 BLAKE2B f775606357a69066c8cbf1cd2e686f623e4e88824e703f6b4dfe4280ca3ea0620436ef156625974ff5e9cc177b206101a968892b68fc4783828a4192b39ea67e SHA512 5f37665f4efce4dc3f7bc26620b8573606ea45a77858a66c0feb881644dba96c9ee1215912c9b0787e58e5e63ab988d0b96ab7de854890dc0467cd02b300c4fb
+EBUILD icinga2-2.12.2.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
+EBUILD icinga2-9999.ebuild 3930 BLAKE2B 20bacd633c55857af4e85b4ddf36ad86cae209adf380a183c35157bd69c553d70731ba699a6c706c0f77cfd03563af8fdad9748856cd1b91a9b387c5f175a035 SHA512 1249cb4f89bbee800a7cc8e8a35da90b6978878c14860e2d93651de641268328b2b1ffafb2363fb96c3b45de3b180b278a59cadcf0a4b2210655f3d8770a3285
+MISC metadata.xml 870 BLAKE2B f18bef5b15712d2fddf22edaaf628b4b9bacbb92fd03750b0d956aa7e13baaf389c131b929236158f1df8c718c754bd55ef6031cca282db0b22d2a4d94a353a3 SHA512 30744556867891c0a4e3ab86dbebdd6b1191bfe25f8b9f997fc8c88b3b8d69365a33184c7ae2cfa7fee5c19e8c348c768fcdaede7a0e4ab5c28927bc09151ae0
diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
new file mode 100644
index 000000000000..e6ad4807993a
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
@@ -0,0 +1,436 @@
+From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Thu, 20 Aug 2020 18:25:48 +0200
+Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
+ =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was deprecated in
+https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc
+---
+ lib/base/utility.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
+index 1add7616c6..d8e6f20b0c 100644
+--- a/lib/base/utility.cpp
++++ b/lib/base/utility.cpp
+@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const String& target)
+ {
+ 	namespace fs = boost::filesystem;
+ 
++#if BOOST_VERSION >= 107400
++	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
++#else /* BOOST_VERSION */
+ 	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
++#endif /* BOOST_VERSION */
+ }
+ 
+ /*
+From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
+Date: Wed, 26 Aug 2020 13:56:26 +0200
+Subject: [PATCH] Introduce HttpUtility::Set()
+
+refs #8185
+---
+ lib/cli/consolecommand.cpp           |  9 ++++---
+ lib/perfdata/elasticsearchwriter.cpp | 13 ++++-----
+ lib/perfdata/influxdbwriter.cpp      |  7 ++---
+ lib/remote/configfileshandler.cpp    |  4 +--
+ lib/remote/eventshandler.cpp         |  2 +-
+ lib/remote/httpserverconnection.cpp  | 40 ++++++++++++++--------------
+ lib/remote/httputility.cpp           |  4 +--
+ lib/remote/httputility.hpp           | 28 +++++++++++++++++++
+ lib/remote/infohandler.cpp           |  6 ++---
+ plugins/check_nscp_api.cpp           |  9 ++++---
+ 10 files changed, 77 insertions(+), 45 deletions(-)
+
+diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
+index 41b6590e4c..42c5c63133 100644
+--- a/lib/cli/consolecommand.cpp
++++ b/lib/cli/consolecommand.cpp
+@@ -3,6 +3,7 @@
+ #include "cli/consolecommand.hpp"
+ #include "config/configcompiler.hpp"
+ #include "remote/consolehandler.hpp"
++#include "remote/httputility.hpp"
+ #include "remote/url.hpp"
+ #include "base/configwriter.hpp"
+ #include "base/serializer.hpp"
+@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest()
+ 
+ 	http::request<http::string_body> request(http::verb::post, std::string(l_Url->Format(false)), 10);
+ 
+-	request.set(http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
+-	request.set(http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
++	HttpUtility::Set(request, http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
++	HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
+ 
+-	request.set(http::field::accept, "application/json");
+-	request.set(http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
++	HttpUtility::Set(request, http::field::accept, "application/json");
++	HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
+ 
+ 	try {
+ 		http::write(*l_TlsStream, request);
+diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
+index 6870198e45..3764bf536b 100644
+--- a/lib/perfdata/elasticsearchwriter.cpp
++++ b/lib/perfdata/elasticsearchwriter.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include "perfdata/elasticsearchwriter.hpp"
+ #include "perfdata/elasticsearchwriter-ti.cpp"
++#include "remote/httputility.hpp"
+ #include "remote/url.hpp"
+ #include "icinga/compatutility.hpp"
+ #include "icinga/service.hpp"
+@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const String& body)
+ 
+ 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
+ 
+-	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
+-	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
++	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
++	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
+ 
+ 	/* Specify required headers by Elasticsearch. */
+-	request.set(http::field::accept, "application/json");
++	HttpUtility::Set(request, http::field::accept, "application/json");
+ 
+ 	/* Use application/x-ndjson for bulk streams. While ES
+ 	 * is able to handle application/json, the newline separator
+ 	 * causes problems with Logstash (#6609).
+ 	 */
+-	request.set(http::field::content_type, "application/x-ndjson");
++	HttpUtility::Set(request, http::field::content_type, "application/x-ndjson");
+ 
+ 	/* Send authentication if configured. */
+ 	String username = GetUsername();
+ 	String password = GetPassword();
+ 
+ 	if (!username.IsEmpty() && !password.IsEmpty())
+-		request.set(http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
++		HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
+ 
+ 	request.body() = body;
+-	request.set(http::field::content_length, request.body().size());
++	HttpUtility::Set(request, http::field::content_length, request.body().size());
+ 
+ 	/* Don't log the request body to debug log, this is already done above. */
+ 	Log(LogDebug, "ElasticsearchWriter")
+diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
+index 4692b8b5df..0ddd582447 100644
+--- a/lib/perfdata/influxdbwriter.cpp
++++ b/lib/perfdata/influxdbwriter.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include "perfdata/influxdbwriter.hpp"
+ #include "perfdata/influxdbwriter-ti.cpp"
++#include "remote/httputility.hpp"
+ #include "remote/url.hpp"
+ #include "icinga/service.hpp"
+ #include "icinga/macroprocessor.hpp"
+@@ -501,11 +502,11 @@ void InfluxdbWriter::Flush()
+ 
+ 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
+ 
+-	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
+-	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
++	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
++	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
+ 
+ 	request.body() = body;
+-	request.set(http::field::content_length, request.body().size());
++	HttpUtility::Set(request, http::field::content_length, request.body().size());
+ 
+ 	try {
+ 		if (stream.first) {
+diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
+index d714f4d864..5c2bfdb405 100644
+--- a/lib/remote/configfileshandler.cpp
++++ b/lib/remote/configfileshandler.cpp
+@@ -82,9 +82,9 @@ bool ConfigFilesHandler::HandleRequest(
+ 
+ 		String content((std::istreambuf_iterator<char>(fp)), std::istreambuf_iterator<char>());
+ 		response.result(http::status::ok);
+-		response.set(http::field::content_type, "application/octet-stream");
++		HttpUtility::Set(response, http::field::content_type, "application/octet-stream");
+ 		response.body() = content;
+-		response.set(http::field::content_length, response.body().size());
++		HttpUtility::Set(response, http::field::content_length, response.body().size());
+ 	} catch (const std::exception& ex) {
+ 		HttpUtility::SendJsonError(response, params, 500, "Could not read file.",
+ 			DiagnosticInformation(ex));
+diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
+index e92b14a2d4..e41b4711c6 100644
+--- a/lib/remote/eventshandler.cpp
++++ b/lib/remote/eventshandler.cpp
+@@ -100,7 +100,7 @@ bool EventsHandler::HandleRequest(
+ 	server.StartStreaming();
+ 
+ 	response.result(http::status::ok);
+-	response.set(http::field::content_type, "application/json");
++	HttpUtility::Set(response, http::field::content_type, "application/json");
+ 
+ 	IoBoundWorkSlot dontLockTheIoThread (yc);
+ 
+diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
+index d4eac7d074..688392c821 100644
+--- a/lib/remote/httpserverconnection.cpp
++++ b/lib/remote/httpserverconnection.cpp
+@@ -184,12 +184,12 @@ bool EnsureValidHeaders(
+ 				{ "status", String("Bad Request: ") + errorMsg }
+ 			}));
+ 		} else {
+-			response.set(http::field::content_type, "text/html");
++			HttpUtility::Set(response, http::field::content_type, "text/html");
+ 			response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>";
+-			response.set(http::field::content_length, response.body().size());
++			HttpUtility::Set(response, http::field::content_length, response.body().size());
+ 		}
+ 
+-		response.set(http::field::connection, "close");
++		HttpUtility::Set(response, http::field::connection, "close");
+ 
+ 		boost::system::error_code ec;
+ 
+@@ -247,20 +247,20 @@ bool HandleAccessControl(
+ 				auto& origin (request[http::field::origin]);
+ 
+ 				if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) {
+-					response.set(http::field::access_control_allow_origin, origin);
++					HttpUtility::Set(response, http::field::access_control_allow_origin, origin);
+ 				}
+ 
+ 				allowOriginHeader.Done();
+ 
+-				response.set(http::field::access_control_allow_credentials, "true");
++				HttpUtility::Set(response, http::field::access_control_allow_credentials, "true");
+ 
+ 				if (request.method() == http::verb::options && !request[http::field::access_control_request_method].empty()) {
+ 					response.result(http::status::ok);
+-					response.set(http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
+-					response.set(http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
++					HttpUtility::Set(response, http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
++					HttpUtility::Set(response, http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
+ 					response.body() = "Preflight OK";
+-					response.set(http::field::content_length, response.body().size());
+-					response.set(http::field::connection, "close");
++					HttpUtility::Set(response, http::field::content_length, response.body().size());
++					HttpUtility::Set(response, http::field::connection, "close");
+ 
+ 					boost::system::error_code ec;
+ 
+@@ -288,10 +288,10 @@ bool EnsureAcceptHeader(
+ 
+ 	if (request.method() != http::verb::get && request[http::field::accept] != "application/json") {
+ 		response.result(http::status::bad_request);
+-		response.set(http::field::content_type, "text/html");
++		HttpUtility::Set(response, http::field::content_type, "text/html");
+ 		response.body() = "<h1>Accept header is missing or not set to 'application/json'.</h1>";
+-		response.set(http::field::content_length, response.body().size());
+-		response.set(http::field::connection, "close");
++		HttpUtility::Set(response, http::field::content_length, response.body().size());
++		HttpUtility::Set(response, http::field::connection, "close");
+ 
+ 		boost::system::error_code ec;
+ 
+@@ -320,8 +320,8 @@ bool EnsureAuthenticatedUser(
+ 			<< "Unauthorized request: " << request.method_string() << ' ' << request.target();
+ 
+ 		response.result(http::status::unauthorized);
+-		response.set(http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
+-		response.set(http::field::connection, "close");
++		HttpUtility::Set(response, http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
++		HttpUtility::Set(response, http::field::connection, "close");
+ 
+ 		if (request[http::field::accept] == "application/json") {
+ 			HttpUtility::SendJsonBody(response, nullptr, new Dictionary({
+@@ -329,9 +329,9 @@ bool EnsureAuthenticatedUser(
+ 				{ "status", "Unauthorized. Please check your user credentials." }
+ 			}));
+ 		} else {
+-			response.set(http::field::content_type, "text/html");
++			HttpUtility::Set(response, http::field::content_type, "text/html");
+ 			response.body() = "<h1>Unauthorized. Please check your user credentials.</h1>";
+-			response.set(http::field::content_length, response.body().size());
++			HttpUtility::Set(response, http::field::content_length, response.body().size());
+ 		}
+ 
+ 		boost::system::error_code ec;
+@@ -421,12 +421,12 @@ bool EnsureValidBody(
+ 				{ "status", String("Bad Request: ") + ec.message() }
+ 			}));
+ 		} else {
+-			response.set(http::field::content_type, "text/html");
++			HttpUtility::Set(response, http::field::content_type, "text/html");
+ 			response.body() = String("<h1>Bad Request</h1><p><pre>") + ec.message() + "</pre></p>";
+-			response.set(http::field::content_length, response.body().size());
++			HttpUtility::Set(response, http::field::content_length, response.body().size());
+ 		}
+ 
+-		response.set(http::field::connection, "close");
++		HttpUtility::Set(response, http::field::connection, "close");
+ 
+ 		http::async_write(stream, response, yc[ec]);
+ 		stream.async_flush(yc[ec]);
+@@ -511,7 +511,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
+ 			parser.header_limit(1024 * 1024);
+ 			parser.body_limit(-1);
+ 
+-			response.set(http::field::server, l_ServerHeader);
++			HttpUtility::Set(response, http::field::server, l_ServerHeader);
+ 
+ 			if (!EnsureValidHeaders(*m_Stream, buf, parser, response, m_ShuttingDown, yc)) {
+ 				break;
+diff --git a/lib/remote/httputility.cpp b/lib/remote/httputility.cpp
+index 91902ba501..e46e990ecf 100644
+--- a/lib/remote/httputility.cpp
++++ b/lib/remote/httputility.cpp
+@@ -56,9 +56,9 @@ void HttpUtility::SendJsonBody(boost::beast::http::response<boost::beast::http::
+ {
+ 	namespace http = boost::beast::http;
+ 
+-	response.set(http::field::content_type, "application/json");
++	HttpUtility::Set(response, http::field::content_type, "application/json");
+ 	response.body() = JsonEncode(val, params && GetLastParameter(params, "pretty"));
+-	response.set(http::field::content_length, response.body().size());
++	HttpUtility::Set(response, http::field::content_length, response.body().size());
+ }
+ 
+ void HttpUtility::SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response,
+diff --git a/lib/remote/httputility.hpp b/lib/remote/httputility.hpp
+index 6465b4af92..be600d4090 100644
+--- a/lib/remote/httputility.hpp
++++ b/lib/remote/httputility.hpp
+@@ -5,8 +5,12 @@
+ 
+ #include "remote/url.hpp"
+ #include "base/dictionary.hpp"
++#include "base/string.hpp"
+ #include <boost/beast/http.hpp>
++#include <boost/lexical_cast.hpp>
+ #include <string>
++#include <type_traits>
++#include <utility>
+ 
+ namespace icinga
+ {
+@@ -26,6 +30,30 @@ class HttpUtility
+ 	static void SendJsonBody(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const Value& val);
+ 	static void SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const int code,
+ 		const String& verbose = String(), const String& diagnosticInformation = String());
++
++	template<class Message, class Key, class Value, typename std::enable_if<std::is_arithmetic<Value>::value, int>::type = 0>
++	static void Set(Message& message, Key&& key, Value value)
++	{
++		Set(message, std::forward<Key>(key), boost::lexical_cast<std::string>(value));
++	}
++
++	template<class Message, class Key>
++	static void Set(Message& message, Key&& key, const String& value)
++	{
++		Set(message, std::forward<Key>(key), value.GetData());
++	}
++
++	template<class Message, class Key>
++	static void Set(Message& message, Key&& key, String&& value)
++	{
++		Set(message, std::forward<Key>(key), value.GetData());
++	}
++
++	template<class Message, class Key, class Value, typename std::enable_if<!std::is_arithmetic<Value>::value, int>::type = 0>
++	static void Set(Message& message, Key&& key, Value&& value)
++	{
++		message.set(std::forward<Key>(key), std::forward<Value>(value));
++	}
+ };
+ 
+ }
+diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp
+index 18c18c0e04..daec628047 100644
+--- a/lib/remote/infohandler.cpp
++++ b/lib/remote/infohandler.cpp
+@@ -29,7 +29,7 @@ bool InfoHandler::HandleRequest(
+ 
+ 	if (url->GetPath().empty()) {
+ 		response.result(http::status::found);
+-		response.set(http::field::location, "/v1");
++		HttpUtility::Set(response, http::field::location, "/v1");
+ 		return true;
+ 	}
+ 
+@@ -74,7 +74,7 @@ bool InfoHandler::HandleRequest(
+ 
+ 		HttpUtility::SendJsonBody(response, params, result);
+ 	} else {
+-		response.set(http::field::content_type, "text/html");
++		HttpUtility::Set(response, http::field::content_type, "text/html");
+ 
+ 		String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2 (Version: " + Application::GetAppVersion() + ")!</h1>";
+ 		body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
+@@ -92,7 +92,7 @@ bool InfoHandler::HandleRequest(
+ 
+ 		body += R"(<p>More information about API requests is available in the <a href="https://icinga.com/docs/icinga2/latest/" target="_blank">documentation</a>.</p></html>)";
+ 		response.body() = body;
+-		response.set(http::field::content_length, response.body().size());
++		HttpUtility::Set(response, http::field::content_length, response.body().size());
+ 	}
+ 
+ 	return true;
+diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
+index 3f6843ec29..ad15e62527 100644
+--- a/plugins/check_nscp_api.cpp
++++ b/plugins/check_nscp_api.cpp
+@@ -16,6 +16,7 @@
+ #include "base/tcpsocket.hpp" /* include global icinga::Connect */
+ #include "base/tlsstream.hpp"
+ #include "base/base64.hpp"
++#include "remote/httputility.hpp"
+ #include "remote/url.hpp"
+ #include <remote/url-characters.hpp>
+ #include <boost/program_options.hpp>
+@@ -365,11 +366,11 @@ static Dictionary::Ptr FetchData(const String& host, const String& port, const S
+ 
+ 	http::request<http::string_body> request (http::verb::get, std::string(url->Format(true)), 10);
+ 
+-	request.set(http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
+-	request.set(http::field::host, host + ":" + port);
++	HttpUtility::Set(request, http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
++	HttpUtility::Set(request, http::field::host, host + ":" + port);
+ 
+-	request.set(http::field::accept, "application/json");
+-	request.set("password", password);
++	HttpUtility::Set(request, http::field::accept, "application/json");
++	HttpUtility::Set(request, "password", password);
+ 
+ 	if (l_Debug) {
+ 		std::cout << "Sending request to " << url->Format(false, false) << "'.\n";
+From 7e62a68eadada58e762d3f4261750796adffd440 Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
+Date: Wed, 26 Aug 2020 13:48:39 +0200
+Subject: [PATCH] Define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
+
+refs #8185
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 046f23cf22..46e765415e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,6 +172,9 @@ add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
+ 
+ add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+ 
++# Required for Boost v1.74+
++add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
++
+ link_directories(${Boost_LIBRARY_DIRS})
+ include_directories(${Boost_INCLUDE_DIRS})
+ 
diff --git a/net-analyzer/icinga2/icinga2-2.11.5.ebuild b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
index 72756f463b8e..bb0f2605e735 100644
--- a/net-analyzer/icinga2/icinga2-2.11.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; then
 	inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
new file mode 100644
index 000000000000..ad2f31c9b0f3
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+	"${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-2.12.2.ebuild b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
new file mode 100644
index 000000000000..8ec76ee82fac
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+	"${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index bb0f2605e735..c19de03c6e71 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit cmake systemd
+
 if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
+HOMEPAGE="https://icinga.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
 
-CDEPEND="
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=dev-libs/boost-1.66.0:=[context]
@@ -28,39 +29,27 @@ CDEPEND="
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl"
-
-DEPEND="
-	${CDEPEND}
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
 	sys-devel/bison
 	>=sys-devel/flex-2.5.35"
-
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	plugins? ( || (
 		net-analyzer/monitoring-plugins
 		net-analyzer/nagios-plugins
 	) )
 	mail? ( virtual/mailx )
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd
 	acct-group/nagios"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
 src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
 	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
@@ -69,9 +58,10 @@ src_configure() {
 		-DICINGA2_GROUP=icingacmd
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
 		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
 	)
 	# default to off if minimal, allow the flags to be set otherwise
 	if use minimal; then
@@ -81,47 +71,26 @@ src_configure() {
 		)
 	else
 		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
+	cmake_src_install
 
 	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use mariadb ; then  # same as mysql
+	if use mysql || use mariadb; then
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
 		docinto schema/upgrade
 		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
 	fi
-	if use postgres ; then
+	if use postgres; then
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
 		docinto schema/upgrade
@@ -163,8 +132,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
 	fi
 }
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 2916a6886755..720f4e2e47b7 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
+		<flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag>
 		<flag name="mail">Allows for mailing of alerts</flag>
 		<flag name="mariadb">Enable support for the mariadb database backend</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index 3d45dfd91829..cfafb20d47c3 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -2,4 +2,4 @@ AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
 EBUILD ifstat-1.1-r2.ebuild 674 BLAKE2B 8e7540501ad5ee32209ab267e1c70bf7d02aefd9ade064bfe662afaeec8a518cd8c2ad4218080d924cf798c7dde71590a8ff7439e39b60048f0cb4a731770379 SHA512 bb9d65936a13b3fe2c4983fa777723b4ed3826a218a2b1e08b40a8d86c60af23679667c177c89e84f136aaf32b9b2f4d4429a297c429c601681a87006c3ff2de
-MISC metadata.xml 355 BLAKE2B 4c41f1d6538bdabcee69ca12d05ce31d9c99b862789a4f91adbe0bd63549a584f7e3f5a31fa84fbe16c440f3eca0b46ef880533c672c4fdda6746d040027205f SHA512 b267308f9c60f6d5da88b7771a71efc9cb5b3efe8f52e54b71a3a18b56503c607915ed8169a5e36cd00994ef39589b9821ac035214294c17c3f0d5455817fffd
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index ac8cfae30fff..2c2a7923cfc8 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index ffd4b4ba5a52..0598c1778a1e 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -9,6 +9,6 @@ AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
 EBUILD iftop-1.0_pre4-r2.ebuild 931 BLAKE2B e39c863df202fa76f0923696ac9abc9d2e3ff69251726e82649329212ae6faeea587e192684a0ccfffaea43c84ed671254822feea7bf2e6bb9355f9bd4255728 SHA512 986734bdbdb493b2e8c630827df7558caa34b2ab45483f989d7ced5318f0c5ba057b1a0fc9a2e5a767d3240a0b293c0e4d6b7cea3173d8161ea84d08319a0176
 EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6
-EBUILD iftop-1.0_pre4-r4.ebuild 1106 BLAKE2B 3ee1172d92c73c97245755b626d11ca1b6763714e2add23dfebec41b764d7e666c99a44e1d6ddb144f9468968c1ed12b77206c375b86d75e266c6e8160aa2e8e SHA512 ccec613b80b771d0de500c6aaf07e079f59933a4dad5fd30d888468e8bf3b66bc9f933c0277d4a5e5611a8d9ac361f2f48a89f6f3435370d8564b2dbbca5b186
+EBUILD iftop-1.0_pre4-r4.ebuild 1101 BLAKE2B 3920c705944d92899631b3ea460c77e6f2971d6dab0a0bcd5a937cd5c4c7539b5455165591d32e34342fe6e99f40ac371e74ff87f4206c775ef6385d8fd89f72 SHA512 97b4e382d2dedc6269997c057fe3788d9dab07fe5c5431469e21114eab38f1b15e7838d74d4354c0ae05be1e24491135c53d10ea553c8cc85cd35954ba238b11
 EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index 3f9d11ed9b42..c74ef3a497fa 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index c33a37503c28..edbe808a6e4f 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,5 +1,5 @@
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
 DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
-EBUILD linkchecker-10.0.0_pre20200729.ebuild 1504 BLAKE2B be8e53d4febdbae0322e5f9ba40abe2f1b8838230566fa218e40cf924d26c41eecb8b3a2795d9f5228c9f2599ca85dafe953c5aab07264d26278b1cc2e76737c SHA512 ae03dcb3af8a5fcf50240f75d4fc26cad763c0c9e58dc98f7eb5c64d5e13656a38959cd052884ad1bcce306cdad5e0590315f5e85e33e0dc307b5f5070b0a3b1
+EBUILD linkchecker-10.0.0_pre20200729.ebuild 1502 BLAKE2B 8c268cb3cdde5b1ef62078978350376de8e051f5dc7c9e6131932b30b9572bbcb4c2160f477d6e6666b9079dd67cc1772cfe6f924fc926d3f52a02dbe7460ab9 SHA512 134d6e1fcadf01f4532d156f6cf39832542d5be6908f64c2e86c5570def8c06a33b8621ca3d05e407cd9aebe7df759cc9e5d81147af32f5304731c8cbdc42901
 EBUILD linkchecker-9999.ebuild 1327 BLAKE2B b6160741da9a3532ef70d05706d53806a79e1cea88a0a1e8a815b1865d7c72ad7c4efdce86dc27b7fc593c4d6e31e2c89f79c0b8e4e6bd7001c6f68d9a94b106 SHA512 93a08f43960426f83cf14a19974707ffd69c067fb952200d44582180451e34a46e1b0dae838c0cb375d5432a1e493b35f2fa015841d798b781461b0d8ff3bf7e
 MISC metadata.xml 544 BLAKE2B 4ab01a5626c5397e7b550b717902525a6e3b5b8e3a7b1c916a48abc7181a1c1486a53ecb9e68e06ece5bcf5bcdf67167b0ab60186291033e84d2ed9237bfa35c SHA512 c0f91900f87cc48adc5628264a1948400da60d444c4c5ca251d4edc23a9042616fd90d60e4493e5e458c47991aeace55725bd181c82d6188be398cda2347a64c
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
index 763f34dc20d5..69dd01691653 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
@@ -18,7 +18,7 @@ else
 	GIT_COMMIT="a977e4d7129450ba9fda8389724c80c1bde66883"
 	SRC_URI="https://github.com/linkchecker/linkchecker/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
deleted file mode 100644
index e6c008e9dd53..000000000000
--- a/net-analyzer/mk-livestatus/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf
-AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404
-AUX mk-livestatus-1.2.8_p26-fno-common.patch 671 BLAKE2B a0f49e00c040cc8fab5bc343042195d62087172c549d331375d51832a3234e56cff09a0f0c3c9a53ddeb7e824db26084ac16ce7051d1c4bc885e4d8610ebae06 SHA512 067b1c5af81ff668dda6a713306bedb9b3c6795a1bc146988ff9f351a62cb39cea889bfe77474a918ab69c8f97fee506372ff3115deabea400ced605e60f0520
-AUX mk-livestatus-1.2.8_p26-rm.patch 254 BLAKE2B 789318a34cbedb65595e930c3e9c3f3a641d581cc1f9045c54445f501c8173475bb4fef49bc16352749036ceff380e81c83e18aff386150ed85014ef8d490bf2 SHA512 df8b7337206922a7aa5f980e19a5f1d4b0a8a92d5b0603339a7437d5eb4a78a3a3148d9c27f84869d91e73b42b7aa18e2c3868650efe179cc856cb90491f392c
-AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7
-DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
-DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
-DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
-DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6
-EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
-EBUILD mk-livestatus-1.2.8_p16.ebuild 3420 BLAKE2B 0931d1ec0fdb6dc496ad76a14ecc829d7b389e9a0ef9cfe55ed7f3d9e8447ef570bbaedce501eb7c9739853212dfd012e8a55be87540b31d6fb73a09f8e7dbea SHA512 5a453d138453916c5ac46ad5b7c916bbf5dc8c0ae196ec66da4e8da25179a4816d4588e84fa89e978296b74d013f08c5df0224dc749547480a6be665d7869e45
-EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3456 BLAKE2B 5aa345a5411a3fb01cc9a120f27bb19dd84c92f9c2ae26f4c11461baafdc86db14306b401bd44c2bf2dc5598afff21174ca84ed664c065020c485092ddad93bc SHA512 1af491259f2c8c6ad0cf1d2ad2414cab89a3df7dbb820ed2f80f61c1417fde1a099e4efd7cafd9b9c949fb9b20831e2f6d2bc9fe347bee2eb10b6131a709e2a5
-EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328
-MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
deleted file mode 100644
index 5b5009bfaa01..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 21 Aug 2013 23:00:21 +0200
-Subject: [PATCH 1/2] MEDIUM: Drop default strip
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=482026
-
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index deab289..126b503 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -55,7 +55,7 @@ livestatus_so_CFLAGS   = -fPIC
- 
- livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
- 	-rm -f plugin.so
--	$(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
-+	$(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
- 
- all-local: livestatus.o
- 
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
deleted file mode 100644
index 264d9bb899b6..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 21 Aug 2013 23:00:21 +0200
-Subject: [PATCH 2/2] MINOR: test: Remove the usage of
- Perl::Critic::Policy::Modules::ProhibitAutomaticExportation
-
-This does not exist since
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=482026
----
- api/perl/t/perlcriticrc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc
-index f7e4721..f686dca 100644
---- a/api/perl/t/perlcriticrc
-+++ b/api/perl/t/perlcriticrc
-@@ -133,8 +133,6 @@ severity   = 3
- [Perl::Critic::Policy::Miscellanea::ProhibitTies]
- severity   = 4
- 
--[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
--
- [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
- severity   = 4
- 
-@@ -283,4 +281,4 @@ severity   = 5
- severity   = 5
- 
- [Perl::Critic::Policy::Variables::RequireNegativeIndices]
--severity   = 4
-\ No newline at end of file
-+severity   = 4
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
deleted file mode 100644
index e0dc8469c15a..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/logger.h
-+++ b/src/logger.h
-@@ -27,6 +27,7 @@
- 
- #include "config.h"  // IWYU pragma: keep
- #include <syslog.h>
-+#include <pthread.h>
- 
- #ifdef CMC
- #define LG_DEBUG LOG_INFO
-@@ -49,6 +50,8 @@
- extern "C" {
- #endif
- 
-+extern pthread_t g_mainthread_id;
-+
- void logger(int priority, const char *loginfo, ...)
-     __attribute__((format(printf, 2, 3)));
- void open_logfile();
---- a/src/module.c
-+++ b/src/module.c
-@@ -95,7 +95,6 @@
- char g_logfile_path[4096];
- int g_debug_level = 0;
- int g_should_terminate = false;
--pthread_t g_mainthread_id;
- pthread_t *g_clientthread_id;
- unsigned long g_max_cached_messages = 500000;
- unsigned long g_max_lines_per_logfile =
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
deleted file mode 100644
index abdb2e01691b..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -62,7 +62,6 @@
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
--	rm -f $(DESTDIR)$(pkglibdir)/livestatus.so
- 
- clean-local:
- 	rm -f *~
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
deleted file mode 100644
index 5c267ae2f4cd..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -201,7 +201,6 @@
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
--	rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a
- 
- clean-local:
- 	rm -rf *~ compile_commands.json cppcheck-result.xml html
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
deleted file mode 100644
index 4a90a3fdc4d8..000000000000
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bertrand@jacquin.bzh</email>
-		<name>Bertrand Jacquin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
-		<flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag>
-		<flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
deleted file mode 100644
index b36094f1ee3e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
deleted file mode 100644
index f0e770a07ddb..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o
-EOF
-	# same for icigna
-	cat <<EOF >"${T}"/icigna.cfg
-define module{
-        module_name             mk-livestatus
-        module_type             neb
-        path                    /usr/$(get_libdir)/mk-livestatus/livestatus.o
-        args                    /var/lib/icigna/rw/live
-        }
-EOF
-	insinto /usr/share/mk-livestatus
-	doins "${T}"/{nagios,icigna}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icigna and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
deleted file mode 100644
index 071250a73b6b..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-	"${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch
-	"${FILESDIR}"/${PN}-1.2.8_p26-rm.patch
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
-EOF
-	# same for icigna
-	cat <<EOF >"${T}"/icigna.cfg
-define module{
-        module_name             ${PN}
-        module_type             neb
-        path                    /usr/$(get_libdir)/${PN}/livestatus.o
-        args                    /var/lib/icigna/rw/live
-        }
-EOF
-	insinto /usr/share/${PN}
-	doins "${T}"/{nagios,icigna}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icigna and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
deleted file mode 100644
index a0d42e5b3a7e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="https://checkmk.com/"
-SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="boost examples nagios4 perl python re2 test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	!sys-apps/ucspi-unix:0
-	net-analyzer/rrdtool:=
-	boost? ( dev-libs/boost )
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )
-	re2? ( dev-libs/re2:= )
-"
-DEPEND="
-	${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
-	"${FILESDIR}"/${PN}-1.5.0_p22-rm.patch
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	# failing test
-	rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	econf \
-		$(use_with boost boost-asio) \
-		$(use_with nagios4) \
-		$(use_with re2)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		SRC_TEST="parallel"
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
-EOF
-	# same for icinga
-	cat <<EOF >"${T}"/icinga.cfg
-define module{
-        module_name             ${PN}
-        module_type             neb
-        path                    /usr/$(get_libdir)/${PN}/livestatus.o
-        args                    /var/lib/icinga/rw/live
-        }
-EOF
-	insinto /usr/share/${PN}
-	doins "${T}"/{nagios,icinga}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icinga and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 29ba411ebc24..216fa0b8a909 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -7,6 +7,6 @@ DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
 EBUILD mtr-0.87.ebuild 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0
 EBUILD mtr-0.93-r2.ebuild 1331 BLAKE2B aa44ba0f4126312bbfed53cf22fab692f84775f966c61b5b3b3cfb76d476cc6ef7db231194d957a7e5f7c5c140f4217b08737a31f250c4e984b1e981267d0283 SHA512 bc24e0412acc8f0a5c1dfbe556ec9ee0fe9044b2ce8e39366f555068a1471b80517f0d443a21e36bdc542d255f594d336c9817f5cfa75f21a0da8c38247f5612
-EBUILD mtr-0.94.ebuild 1400 BLAKE2B 94552b00fc43e56e85008543c297f64ef2b41364f27ed80951207de9437ec36fb8a7482747f4b41987585468bca308d7e951850ae5fbcedeaea97473371a3804 SHA512 0172ac41ce736541ce8bd6591f3900525f4c5934dc3db117304af72ea069a1120ef68a2e15afa03a0ed7b77c1722cadaff72eb4de6e9c80fbe529315f33710cf
-EBUILD mtr-9999.ebuild 1244 BLAKE2B e46c8c9f5b2159ca0eaeb13067bf15e27da71de31acc37610d9e95dfd04e3c7171d124f5daaafa407317027ab81fb6bb1e4bec79251a3414493a950fc895c24a SHA512 7c27c9fec1561e657210dd74f1b9398fe7e56a0a8f3c4a31fb67cd7c60b46870a7bf6642116e7454e5ea3b006fa1074c1d23ee258b3b3f9697884494ffcdbe76
-MISC metadata.xml 444 BLAKE2B a5e09136f19f4b7958c9aa882d3501bcd6f592e501540cc4949e00388a095df82f4978dd75cf611d7e4c533841398237f36e839085c64bec997a9ccc947b0273 SHA512 1178be0331a735aec9b0c45323cfc8c83eaa7dde375c3de9fe858e9d0a95d4b894e3cef7a09fe3e0c33527145ec7e3833c1c42804643b4cdf94d21f4d69080bc
+EBUILD mtr-0.94.ebuild 1389 BLAKE2B 165b9a35094f2a1ea4adf246b79335e97310b7633a0aad75997dbc22a2a9f7e9b94f09c9395b68fb49e9c34e2ed2da48a9c63a84d0e879216e3360b1870915a6 SHA512 e0a6ece96b0302de707a498421e12ff106b90ffc82f3a2366a6325d837e240bab832e33dfb008f8ed21abd66f68d747baf059190760199a77de8d8fb28f0e914
+EBUILD mtr-9999.ebuild 1241 BLAKE2B 5c4b500e1ef1995947154e627d262b79ca135a6ee6c231e2f865b955952bb5f968f227d82f9a4217d963b4387a2afc379ef46c90fc88c43eff227676b34e78e7 SHA512 e954551e3a37dfca502d2c76e77134193ae7cdba68e74dd755a1f853ddbbe274488bf7bc758711805875f06e80e1790b638d2adfb247421c06c0aa706b9bb163
+MISC metadata.xml 556 BLAKE2B 23e3fd72b2360a5a1a5361df09a8116a70ed178a2e1367c21e7ce77b4f8956a521b8ffb69719eeca673e5766aa8733623baa579a8998adcf884e29a850bdeaca SHA512 a61448154f21ee3870c53bf3877cfbbad543fa11d9e0d1a4579cdcb18215e46129993df0dec9e01c97e76915ecb052c3f16e4c19cc85ac0f21c19cc4d45f71e1
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 632c6e60e5ba..2d3a67d433c3 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name='ipinfo'>Disable support for IP address lookups</flag>
-<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
-</use>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name='ipinfo'>Disable support for IP address lookups</flag>
+		<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
index f7343a7d970d..a7ecb2677259 100644
--- a/net-analyzer/mtr/mtr-0.94.ebuild
+++ b/net-analyzer/mtr/mtr-0.94.ebuild
@@ -10,8 +10,8 @@ SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+gtk +ipinfo +ipv6 +jansson +ncurses"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="gtk +ipinfo +ipv6 jansson ncurses"
 
 RDEPEND="
 	gtk? (
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 3f821be8ee37..7067fbb688f5 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/traviscross/mtr"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+gtk +ipinfo +ipv6 +jansson +ncurses"
+IUSE="gtk +ipinfo +ipv6 jansson ncurses"
 
 RDEPEND="
 	gtk? (
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 37040fcb0d1d..2fe3d494a8ce 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -11,22 +11,13 @@ AUX munin-node_conf.d_1.4.6-r2 188 BLAKE2B 419e475fb422a74d1c094145c25b7ad371e10
 AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce94ee1dd9e2ca9dc15ba322b531fe4564a76e5cd6526b5b1be5bf06e31ca6c108e8e9f05c89d718c7531ef18a5f SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
-DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d
 DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
-DIST munin-2.0.61-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.61.tar.gz 2254571 BLAKE2B e73fb6fc4f71c8d56a7e8a05852f699c94a7cf321b8034ad31ccbd06a37a602e6d312c0079fcb31afc5489a265a35a68c037743e01471ca950223d5cb6757b64 SHA512 ea6ae5a7f812985e0179dc2fe2f21136ecf6152ec2adf48d53e4fa19cfc14e74befe56c77a18f27ba966c12034a4fea442d5d1498a7cfe57ed052d332c199019
-DIST munin-2.0.63-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.63.tar.gz 2254548 BLAKE2B 5e0aa63222706a1e23bcb2af98437ee8cc3f09cdf833a6546ea40cf7307728518d5d696bd500105f85139753bc17a26dddfb202a661d35a7046ffc55b5b9ef02 SHA512 c28d2bedda8abb8787e1ba40ec80961d1304c903e9e608e30ed7903210169f258f9c062fc97d89932ddd7aabefa4360495d19535520741911c489c9c3c2e76fe
 DIST munin-2.0.64-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.64.tar.gz 2256519 BLAKE2B 6a48327672ab7cf20be7a47d489467d0b888e00c01ca0ce8b0bc47a03b63087cf61de4aaf8ae0f18d8e5ef95c49f85092d719ae7de6fe51bcb5e60d138caa519 SHA512 d5f8fb04a601b053844b04850416f09b9f682b83298e35b973ee495cc60477720dc0483f73809db5ca24ba6b9fa1520f026a3f187db01b0c946cce756e4e401f
-EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823
-EBUILD munin-2.0.56.ebuild 12254 BLAKE2B 925fe7a93c3130d665afa4aa9c874bbf34b22e29fea84fbb6a5f518facd256cb79bf1e2b20ffa5f086d1a8715328a3f34482e1e08f7ded2fa924a976b20cd93f SHA512 5fdc2357b5a48815f7de08d46def379bc5d263b68f1f88ecd5756d095299a53fc8996dce41350fd4281bba434c85c090bfbd965edc1ca46ce5f051d47eeb7c46
+DIST munin-2.0.65-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.65.tar.gz 2255611 BLAKE2B b506dd12e527bd42f7f8cd9766f260b68bdd08114261b6e1e35316d12d501ac86d1aa7f4c461ab4f3f73490bafde870420e69fbed68f2b663e5e1e011b7bb4ca SHA512 8a0dc93de878e1d502467f4e8589a0af2b809ec7282033534de2fd17b842bbf864d900136516a668a8e3f80e99215062620a503c5f664c799892f77950b4859a
 EBUILD munin-2.0.59.ebuild 12267 BLAKE2B d4fb2b1f62a4c1a3d1d69fa61e841c17ad6716fa824df49352ad2e5c5ddc39a035c828830302cd6414750c72e2b52198a76efd936d2300dd76529dc2994054ce SHA512 c306d35fe98c0dd9668068fcad1830cf1c5fd45839187b0a91cde40f075a7a042a737e4cc53cdbb27da5049f52021a63cb925040f5b2e54f91155811f7413252
-EBUILD munin-2.0.61.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
-EBUILD munin-2.0.63.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
 EBUILD munin-2.0.64.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
+EBUILD munin-2.0.65.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.52.ebuild b/net-analyzer/munin/munin-2.0.52.ebuild
deleted file mode 100644
index 56f3cf00bae6..000000000000
--- a/net-analyzer/munin/munin-2.0.52.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit user java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.56.ebuild b/net-analyzer/munin/munin-2.0.56.ebuild
deleted file mode 100644
index 500c7e3caf59..000000000000
--- a/net-analyzer/munin/munin-2.0.56.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.63.ebuild b/net-analyzer/munin/munin-2.0.63.ebuild
deleted file mode 100644
index acaf9f6d9f0c..000000000000
--- a/net-analyzer/munin/munin-2.0.63.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.61.ebuild b/net-analyzer/munin/munin-2.0.65.ebuild
index acaf9f6d9f0c..acaf9f6d9f0c 100644
--- a/net-analyzer/munin/munin-2.0.61.ebuild
+++ b/net-analyzer/munin/munin-2.0.65.ebuild
diff --git a/net-analyzer/nagios-check_glsa2/Manifest b/net-analyzer/nagios-check_glsa2/Manifest
index c745b4023b0f..3900ac9a4287 100644
--- a/net-analyzer/nagios-check_glsa2/Manifest
+++ b/net-analyzer/nagios-check_glsa2/Manifest
@@ -1,3 +1,4 @@
+AUX nagios-check_glsa2-20120930-CACHEDIR.patch 357 BLAKE2B b808848ea5c1b58f374d1f16d725226c6cb14bae757910f20a8b0eef7be5ba2d8b04f3fe2079b3910f99c795589d5c57108338327bc1f97aa06bf9a1bb8dd0e9 SHA512 a2046105e63661f83c2c800f60959c2092128e9e09cbf5b7ba7e1e758e990f167cb8e888d009030b8f88ed43058f1a5e99ce96d704af93590e325b6c1b632f4b
 DIST check_glsa2-20120930.tar.xz 1980 BLAKE2B 6a5e3541b23fe43daba37ccac085ca1079dc1fedbfa87a439a433d6445bd039090a336765bde0c1b2fc5fad464d0f4e175e4a7e90ca65d6bd56d082a3f1cac88 SHA512 ecf7f6f119c8a73bf672eddc64374ed07c03720ec97b51f7e0bd779b3ba2c4ceab87c1c3cbbe38b1f0224234a9fb2af7bd156f9073a8a0aa8da1458988a2bc65
-EBUILD nagios-check_glsa2-20120930-r1.ebuild 869 BLAKE2B 167ccffd0e6b93a78e78cb6872ca76c270c65731840de22aab0ee89b2bbacbe02f3404e535d135ae5646b6420b7ebe7d841afb4ccf16cd364830ef8b5d31c033 SHA512 5c3d23e1f5e5881c05e64efef7f3295568d65fa0bbf7d22cfe0aa1d2b58df1f7595d83f64fc9ea3e867a1a961789131325d73190e2f22339af09971173e7ca4d
+EBUILD nagios-check_glsa2-20120930-r1.ebuild 725 BLAKE2B 0c55e0382efad38dd44cd5c09c779650217c1985e4402461c1527d28ac2f9cf84045df4bd08bd24e9385e35bf580a2e90f8305831d017c5ef00d04aa83d5a3e5 SHA512 ba9d2358c07f83479d4a0dd8943d568882effa2525423e7002648e2a01dd4766453a58b2f967237731e3c1e42cb0b9dde57e1cc796bd3f031c01c5a197149895
 MISC metadata.xml 351 BLAKE2B 79a36729dc00b5651ab2d461efdf7254b19b3b65d5279381567abe68e18215a0fa998a65ae858f1d8ece9896fe54edb7430dd5952aab106140bb853d378044cd SHA512 651d2427fbe198beafadf6a75e664718c1367c118e3b9a1e637fe33abde8751e31b221873f3f9955f0af516ea8948085998eeda2ce64b1247291a4b5a8edffeb
diff --git a/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch b/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch
new file mode 100644
index 000000000000..3e02afe6e004
--- /dev/null
+++ b/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch
@@ -0,0 +1,11 @@
+--- a/check_glsa2_cached.sh
++++ b/check_glsa2_cached.sh
+@@ -8,7 +8,7 @@
+ # Caches the result of check_glsa2.sh
+ # First line is the return code, rest of the file is the message
+ NAME=$(basename $0 .sh)
+-CACHEDIR=/var/lib/gentoo/
++CACHEDIR=/var/cache/check_glsa2
+ CACHEFILE=${CACHEDIR}/check_glsa2.cache
+ SCRIPT=/usr/lib/nagios/plugins/check_glsa2.sh
+ ret=0
diff --git a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
index 5b6ab2dd057a..aba3bf1143f7 100644
--- a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
+++ b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
@@ -1,38 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit multilib user
-
-DESCRIPTION="Nagios check script for GLSAs (Gentoo Linux Security Advisories)"
-HOMEPAGE="https://github.com/craig/check_glsa2"
+EAPI=7
 
 MY_PN="${PN/nagios-/}"
 MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
 
+DESCRIPTION="Nagios check script for GLSAs (Gentoo Linux Security Advisories)"
+HOMEPAGE="https://github.com/craig/check_glsa2"
 SRC_URI="https://dev.gentoo.org/~flameeyes/${MY_PN}/${MY_P}.tar.xz"
+
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-
 KEYWORDS="amd64"
 
-RDEPEND="app-portage/gentoolkit"
-DEPEND=""
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
+DEPEND="
+	acct-group/nagios
+	acct-user/nagios"
+RDEPEND="
+	${DEPEND}
+	app-portage/gentoolkit"
 
-src_prepare() {
-	sed -i -e '/CACHEDIR=/s:=.*:=/var/cache/check_glsa2:' ${MY_PN}_cached.sh || die
-}
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-20120930-CACHEDIR.patch )
 
 src_install() {
-	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
-	exeinto ${nagiosplugindir}
+	exeinto /usr/$(get_libdir)/nagios/plugins
 	doexe *.sh
 
 	dodoc README
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
index b3fa98e2ce37..9a9aa4f38183 100644
--- a/net-analyzer/nagios-plugins-snmp/Manifest
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-plugins-snmp-0.6.0.tgz 381664 BLAKE2B 1a6124b5aa194123b17a1ce98a4e023a8d71f70a6c5ae61b8b54b204050f7914f100e1e639630955e45905f86282cab6a7034e5927b3db5b609beb315a66c748 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529
-EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 889 BLAKE2B 3f11de32bcb02a72207e603e8401fc56126342b16ee67af31b7bcdedc2b3d6a8886b663dbe143f06a94903f49e8bb573987b6861698c2e87dcf38f2ccb369d0e SHA512 44c6501861586be89f75df69dd5b43b3938ad32d8560afd243931c4ccba5999f6814f5e8c528482428e88697b6c1610ec810e7db326946c2b476bef903af06ca
+EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 864 BLAKE2B 65cf2b3b42dfb1e241071480e90207adbe4c57b6baeec997b853af93e1ce24a017dff5374f98b5f48396e623ff93ee81f4463109ca799b6f3deb39b423ab05a6 SHA512 f1f1a2eb8695d2dea00e6495fd3022fd4827533cb0958aaee49ffaf51325341ad7bf0deee6f27ae9a9c87ff545eaef73a9e17ab43a055271c45a4706b7ff49ea
 MISC metadata.xml 271 BLAKE2B 7231d9dcb020ef6bb73db6e7038abab171c5ac137e457e50bd730b126a20a8af0a21b1cb987b00b8965af807dde7b0431dfacb6066d15d08b5bfbfbaecf3e5a0 SHA512 f323a192c090757e24caa9352b8be964050a00a86d174507c858c2a3a61767c243dba99ac37571779128d73e9bf6817f056d6d590be2b2ec8a8e3f3a92a4f304
diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
index c89ed52c8249..6eb4daae21ea 100644
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools user
+inherit autotools
 
 DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices"
 HOMEPAGE="http://nagios.manubulon.com"
@@ -12,31 +12,28 @@ SRC_URI="http://nagios.manubulon.com/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-IUSE=""
 
-DEPEND="net-analyzer/net-snmp"
+DEPEND="
+	acct-group/nagios
+	acct-user/nagios
+	net-analyzer/net-snmp"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/nagios-plugins-snmp
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
+S="${WORKDIR}/nagios-plugins-snmp"
 
 src_prepare() {
-	sed -i -e '/^CFLAGS=""/d' configure.in
+	default
+	sed -i -e '/^CFLAGS=""/d' configure.in || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--sysconfdir=/etc/nagios \
-		--libexec=/usr/$(get_libdir)/nagios/plugins
+		--sysconfdir="${EPREFIX}"/etc/nagios \
+		--libexec="${EPREFIX}"/usr/$(get_libdir)/nagios/plugins
 }
 
-DOCS=( README NEWS AUTHORS )
-
 src_install() {
 	default
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 9a4ac8af9a15..7c95710748f7 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.11.1-es8.x86_64.rpm 38880588 BLAKE2B 36a611cb545caaf242a9fd7a5c6d305856281d78ed6a0c52bf2624f78163e47eb1e11467dd413e103446ed5b76aa101e45bef82fb9e2526ed06465b7615b9b45 SHA512 838aa45373b2c03616e89b2a0caf5f6a65fe552a067906e05a6e2ff60dafcb08c6f2d9bc5cd17fe88fc46de465d963d218cf28698c93ad14da43a5ea75f789bf
-EBUILD nessus-bin-8.11.1-r1.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f
+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
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.12.1.ebuild
index 1e569f0e0f10..1e569f0e0f10 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.12.1.ebuild
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 601d5f9f30d0..d060ae264de4 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -4,4 +4,4 @@ DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8d
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1622 BLAKE2B 53be7631ddadb9fb50a84cb08154e0c30a64f72fecb65874e43ad23387a755767a1e9e817761433b786c5d7ef66aeebc13ee8710828a7c5557573b66d38ebefa SHA512 e1786e76851597d5d394b59a475c306a7239036c2504410062ce2b2b0e42e86e92281f805c5e27dbb91ebe1306f7ba2393c7aa7b7d3179da298792129182148f
 EBUILD netcat-110.20180111.ebuild 1272 BLAKE2B b58aad81ff3d298a022954308c3b8e7405fe8542b5f658fb57331919406e2a682fb66455c19f319c41427d01619ec88c4bfa6278b595029e24f1e6fc7f560c25 SHA512 3e05c4a06f4a44ef0a2c8e36c26be838420d127226c36644b3b7cd6b25c122f5b19cdbd767e343313498ebc6ffa14e43ceef94c0132127b30dcc87037ac97d0c
-MISC metadata.xml 420 BLAKE2B 0f6ca06be45cca89f3744ea43aa8d6b0ef4b9480f2e130417a24bd659ff87bdc2966eaa8e3954f90f5f88d95340cca9d97fb20302fb1fd6beea55a5d2220ec4f SHA512 9cc7b08660742189bc64bcac5a9a17651dc4c54e497c785a697a95ec0239982d971aba91656cef1b5178497b13b4f8d0e5fab6f9f8c989e9c0466870b6098425
+MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index fedce3835928..a1937487a94a 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 06ae026236fc..424e90c40bd3 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,8 +1,10 @@
 DIST netdata-1.23.2.tar.gz 3839012 BLAKE2B f0c225307b61a0a3b5d581e6d5e4a90d5f26ad0aae49e32dfd3dc36405e48d2e8f7a088c31a2a19059418f88e362eb9840b6c020f5459a0d0388f10b7c729eb0 SHA512 4a4dc647e0326da4f785444e15e2f74af09428374bfe2db57c44dd2765ce77b2babbd8b52e33e04f49b95937a6ca8691ffa18b51d1717ea927025b70fa7e369f
 DIST netdata-1.24.0.tar.gz 3876403 BLAKE2B 36a2413039f89d4a9f4c60a6ebe319b5e818b9a0f57e722cd7e29293452faebf264cf961530a03c9a8ffa27fe9f12caf5c54d1e58741641a1be76e936a0e3222 SHA512 18276605f74520b3d55b8a67bfbee7cb2483d472becbcab7e2b1af19f08b05ffd2a83e6e8eec98733abde8ba1f552eec919e8ae59266cbec7c2c94beb4a2aeb4
 DIST netdata-1.25.0.tar.gz 3891805 BLAKE2B 42e6f1d2a20bce352fa5bbac162ff906a150069d3dd7e4c83f7315a6962f4e33f6a5a65e500b4763ad6f0778d71e93226604c6b0bee2f8fdcdfc9f36f07f7033 SHA512 d92249a2fab28ae26132708bc79af591f8050fef2e82b331d3756c84e21072bfd6f6b1158d8ca912a500ed7fd65e4e3005828b28180befa88d2984dde8bd816b
+DIST netdata-1.26.0.tar.gz 3932155 BLAKE2B 6b119080c6d6a96bbe6add9e38c035950f5380ebdbe882459aedcd95514e87572c5da384893d917b4dc7810c34a7f80e56b59b29a4ecf5f0b65c3124b4a4aa79 SHA512 0a4c538387a28da9999e3a69cbc5c80ba8d5542185ef91cd8440a9701875b7c1c5b62bbc3a471881cd6d494beea5618971e90228d65c8497d88e83ccf5164fef
 EBUILD netdata-1.23.2.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
 EBUILD netdata-1.24.0.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
 EBUILD netdata-1.25.0.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
-EBUILD netdata-9999.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
-MISC metadata.xml 1161 BLAKE2B 4e30814c2a12186f05242520e555d513d6ebbe82ce0c16e975b0a2182091c2119b31fd84a696323f51126f27769f7fd71370e7fd313bc704145f89777875028e SHA512 76b385a11f3017ffbb62bdc45fc685b574c5c8fcc7d342fcce3e7076f347961cc88ba67242d6bf2b7a3aa8ec82865625763dac7024110948c1d4f2684c0b247e
+EBUILD netdata-1.26.0.ebuild 3494 BLAKE2B 633a1fb1e97d253730f92079216a9c2b8ac32eea3dcecfe3955213ae643649522cc135b45d7b25c52fd8d8ccb1c333432d695ca6c90e776f56e36e00668bca71 SHA512 5f4aff70a22b6db98c6656bf4d8a6d7ca1c0a5d43425030a8599eba995b62a6e9ffa0a381e7c03d46988dea38cc308719aca405db7f92856ae3638b93422086f
+EBUILD netdata-9999.ebuild 3494 BLAKE2B 633a1fb1e97d253730f92079216a9c2b8ac32eea3dcecfe3955213ae643649522cc135b45d7b25c52fd8d8ccb1c333432d695ca6c90e776f56e36e00668bca71 SHA512 5f4aff70a22b6db98c6656bf4d8a6d7ca1c0a5d43425030a8599eba995b62a6e9ffa0a381e7c03d46988dea38cc308719aca405db7f92856ae3638b93422086f
+MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 8c3dae0f9448..7eb822608727 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
     <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
     <flag name="kinesis">Enable support for Amazon Kenesis as a backend</flag>
+    <flag name="lto">Build with Link Time Optimization (LTO)</flag>
     <flag name="mongodb">Enable support for the mongodb backend</flag>
     <flag name="nfacct">Enable the nfacct plugin</flag>
     <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
diff --git a/net-analyzer/netdata/netdata-1.26.0.ebuild b/net-analyzer/netdata/netdata-1.26.0.ebuild
new file mode 100644
index 000000000000..f935e5a09fa2
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.26.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+		mysql? (
+			|| (
+				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
+				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
+			)
+		)
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-cloud \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 48231022d056..f935e5a09fa2 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -106,6 +106,7 @@ src_configure() {
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
 		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
 		$(use_enable mongodb backend-mongodb) \
 		$(use_enable prometheus backend-prometheus-remote-write) \
 		$(use_enable xen plugin-xenstat) \
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ce911a930e58..3c74e917bd24 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -8,10 +8,11 @@ AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4
+AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
-AUX nmap-9999-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
-DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.80-r1.ebuild 3384 BLAKE2B d0e17e01112a98cf486230dd0d2c62c6a58195a6381aaf533e813d233a5d7f61d3ad467fa99f5d8d655c5c4e214ed01d43d21cafe4de95dc533e8f80a59b758b SHA512 615b65941058fa30416d010cd789093b4bd96969d609a02d02e9e2f1ee1d5ecf694d867c0c53e901e8c3a4cd911d0fe0c7bfcfa87adc1486f3d5149157c85c03
-EBUILD nmap-9999.ebuild 3010 BLAKE2B 6c2e906a4d1a0389ff427e66c43480c61a021067b8762235520f98f6fa82ff6e24e5a83858543ddac2647a52a4a6cd9f9d537190d594431dc854c0cb06f9c87b SHA512 c3cc533c4e9e07296732a7c11bcf0418b6b9d79f8f301c789828b2efe14fa918146fcf46ad81c089a78571ee45fa6f58367b8504df61a4dcded6d80afe19a11a
-MISC metadata.xml 797 BLAKE2B 083b63af1e130f047a474d71e62b42ca4250b85d58c129695fe80a845cf57f5f223273850d249c57617b29a144ef1c4e94ccb47b9caac47b1c71b546259051b7 SHA512 ac11d3d3c8bccb2aa875dc5e5df2dc07517abda3fdace75a939be90cf83d772d5a535e4e3188a2873ce8f06785b9013faeee2841140d4a7ac3e2e52121faa097
+DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
+EBUILD nmap-7.80-r1.ebuild 3280 BLAKE2B 1b3d8c48bbade2616fd4a53ab89fc968fbd8e4ffa31700ba66c6592270bb38dd665a309d8ab1f51f80d6e5e39d6abc3e5b70e206eec1d37144496ecb4df8a87a SHA512 c7e22900976d09f03403250b2edcc51a840129a2fa3c4aef9632369c43f1bf81e36ae87b52a96d9fac3db6aba0aee518bd0e7ba9f3ad6cbf520c84d3122883fa
+EBUILD nmap-7.91.ebuild 2682 BLAKE2B 823a879c2be6f0af191bad0def13abb115803983e7c53c03e7fd301378424c93ceab6e389ce9978c4382b1e8def9ec1dc3a1cba5b056d51937cfb2ee07a91162 SHA512 b5cee4212391eae167b987ec441fb00464827e042f4783e4fb82b6455bb2d842a6b13bc168f4446a0add7e5f144c9c804c9a2b6c79dd951f8f6e10251ca134c9
+EBUILD nmap-9999.ebuild 2600 BLAKE2B 4083277666f8b3806e35b4d9abc5a85a1df81cb37d5dc2abf5b1fed0d46fdbee5bc411523ef273ebd9363a0bcbec539ca9028ea6db1d1c6e07dd15710c76aed7 SHA512 61b17ca127dd806c5191a07c58fd35379db5fd2f5878f513791b9cca2ad703c7190e3db900e5360c8c7fa441dbd38df9cbfeafaf4be0f609aef0da4ddc540ecd
+MISC metadata.xml 1012 BLAKE2B b759966f2b8f8beab43c892441824430605fdd2fda075af8a0fbeebdec6bc781496ca4da93767265a18727d35d287f53ab00da17ac30ca7fec83e01d5cd251c0 SHA512 238dbddb537409cd4f3ff2f0146f3b917206209cd87435cb495eb8f12807b5df91e210f28d2a60326fd3a2bcf02068fd3b1dddca2b2a8874db91956bd7d9781d
diff --git a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch
index b4c06be942ed..b4c06be942ed 100644
--- a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch
+++ b/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 717311a09670..668d67a59b22 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index c31710c9585a..baade24ff440 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -2,20 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools desktop flag-o-matic toolchain-funcs
 
-MY_P=${P/_beta/BETA}
-inherit autotools desktop flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A utility for network discovery and security auditing"
+DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
@@ -51,7 +46,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 )
-S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
new file mode 100644
index 000000000000..ecd6339ffe97
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+
+LICENSE="NPSL"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
+REQUIRED_USE="system-lua? ( nse )"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr \
+		--without-ndiff \
+		--without-zenmap
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 96c09bd09780..00bb4385aaa9 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,17 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools flag-o-matic git-r3 toolchain-funcs
 
-MY_P=${P/_beta/BETA}
-inherit autotools desktop flag-o-matic git-r3 toolchain-funcs user
-
-DESCRIPTION="A utility for network discovery and security auditing"
+DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 
 EGIT_REPO_URI="https://github.com/nmap/nmap"
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 
-LICENSE="GPL-2"
+LICENSE="NPSL"
 SLOT="0"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
@@ -43,10 +40,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-9999-netutil-else.patch
-	"${FILESDIR}"/${PN}-9999-no-FORTIFY_SOURCE.patch
 )
-S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
@@ -58,11 +54,6 @@ src_prepare() {
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
 
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 
@@ -81,18 +72,16 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
-		--without-ndiff \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
-		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
+		--with-pcre=/usr \
+		--without-ndiff \
+		--without-zenmap
 }
 
 src_compile() {
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index 0e6023b5f842..dda09685e821 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,5 +1,5 @@
 AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2
 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224
 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010
-EBUILD nsca-2.7.2-r103.ebuild 2127 BLAKE2B b282376efe16c25c8c3af3012d5fb95ed97026444e1a329fc71ada0510be732caacccc35db0ac8d350cdb096b8e56272deface4119c50dd9dc5d61f6e429871d SHA512 be64c75074fb50cb65f02a4a1e0dfce1ec43f8f648ab4a54e9e221fad2a7fb5cfcfbe1514822f4ebac8df7b24cbeeb768dd4e4e5c8b380fccfea33fe8557765e
+EBUILD nsca-2.7.2-r103.ebuild 2008 BLAKE2B ff80c71588eed60158e78636aef991cbcaa143a4b3645a7eb69abc13e4b96502b7e7d070371c62fe0c1c76fe20a5b7c5251dffc024966890b7d935b31b558949 SHA512 11cfa59fd4e36ff0174354848fff571b2147390fdb5993e85f0671b521dc67a623e3817909cf57805abf466298f9b55960009d62720d3c90500aac06c8f51d29
 MISC metadata.xml 1732 BLAKE2B 9a1c8c74f4a0b8fb4d79340d3f1860ecb0b885b5709f54ea63eb7a8b288b99ce31875d54829c87b5865b62fa75126f2713f64febc2e812981113c7172fe3aa70 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index 9fe0ae002f79..c7120d06b665 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit multilib user eutils
+EAPI=7
 
 DESCRIPTION="Nagios Service Check Acceptor"
 HOMEPAGE="https://www.nagios.org/"
@@ -15,28 +13,29 @@ KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="tcpd +crypt minimal"
 
 DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
-	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
-
+	!minimal? (
+		tcpd? ( sys-apps/tcp-wrappers )
+		acct-group/icinga
+		acct-group/nagios
+		acct-user/icinga
+		acct-user/nagios
+	)"
 RDEPEND="${DEPEND}
-	!minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) )
+	!minimal? (
+		|| (
+			net-analyzer/icinga
+			net-analyzer/nagios
+		)
+	)
 	sys-apps/openrc"
 
-pkg_setup() {
-	if ! use minimal; then
-		enewgroup nagios
-		enewgroup icinga
-		enewuser nagios -1 /bin/bash /var/nagios/home nagios
-		enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-	fi
-}
-
 src_configure() {
 	use tcpd || export ac_cv_lib_wrap_main=no
 	use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false
 
 	econf \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
+		--localstatedir="${EPREFIX}"/var/nagios \
+		--sysconfdir="${EPREFIX}"/etc/nagios \
 		--with-nsca-user=nagios \
 		--with-nsca-grp=nagios
 }
@@ -49,7 +48,7 @@ src_compile() {
 		-e '/nsca_\(user\|group\)/s:nagios:icinga:' \
 		-e '/nsca_chroot/s:=.*:=/var/lib/icinga/rw:' \
 		-e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \
-		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg
+		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg || die
 }
 
 src_install() {
@@ -58,7 +57,7 @@ src_install() {
 	dobin src/send_nsca
 
 	insinto /etc/nagios
-	doins "${S}"/sample-config/send_nsca.cfg
+	doins sample-config/send_nsca.cfg
 
 	if ! use minimal; then
 		exeinto /usr/libexec
@@ -68,7 +67,7 @@ src_install() {
 		newconfd "${FILESDIR}"/nsca.conf nsca
 
 		insinto /etc/nagios
-		doins "${S}"/sample-config/nsca.cfg
+		doins sample-config/nsca.cfg
 
 		insinto /etc/icinga
 		newins "${T}"/nsca.icinga.cfg nsca.cfg
@@ -79,7 +78,7 @@ pkg_postinst() {
 	if ! use minimal; then
 		elog "If you are using the nsca daemon, remember to edit"
 		elog "the config file /etc/nagios/nsca.cfg"
-		elog ""
+		elog
 		elog "If you intend to use nsca with Icinga, change the"
 		elog "configuration file path in /etc/conf.d/nsca so that"
 		elog "it will default to the correct paths and users."
diff --git a/net-analyzer/odhcploc/Manifest b/net-analyzer/odhcploc/Manifest
index 3bb6d889b4b7..ab9966bca8a9 100644
--- a/net-analyzer/odhcploc/Manifest
+++ b/net-analyzer/odhcploc/Manifest
@@ -1,3 +1,3 @@
 DIST odhcploc-20111021.tar.gz 13831 BLAKE2B c0eb71bc47bdf70fee5f701d6d3a6641110682c82f49f3ea38402526cd4f83e588cbd75272adfafae15e9e3d2c366a9b4004a0a6cfe478cd469c6507627f0e28 SHA512 3270b2bf25e079544805ceaba152e4d47a3cae3d78db0429b21c884686de8e0a872628a92390eebe5128ebcf9dcc3d14020420bb95ae8b367784ae4282d21556
 EBUILD odhcploc-20111021-r1.ebuild 415 BLAKE2B 238f155662897f7ec7bb2973206f318165d2fd045c62021a129efe9baa054b823a40347e94e4c4348650c4b003f2f8f87dba71aa47b24876a0cb6f2e41650a4b SHA512 23ae64ed8c902be6c7faee80cebe7d64978894d8479ed2a621ffe791eea528adee87e8e704f1da1c6c43f0fd85d3de7a15a59998dd24421f2fea0cedd464b03f
-MISC metadata.xml 463 BLAKE2B cd29070e0c1a969bf077da5afd4a3342091e1ecb88837cd975ede45e42da574ed955cf3f9d97452eb45d24213f7d794a4e0c45f0f47f53c9f0f185fbd5922c23 SHA512 17259ba58976713396fb8bbf67e994f0106c219798de1e08b8cee64c89d8bfaef01af32f108f3f7e4335b9d1b3a7af194ae9396eb042d1e7d7abd1df1e338b91
+MISC metadata.xml 358 BLAKE2B 5ef1172b20889884202de03cd9a110fc511b82b18a2a7a9dde7d144d6e315e6459065d9e2cd596a18779f69fc56685949bfda837be48c0216ac2413a45c5750b SHA512 b7351b0e06091e12534e12380d924b4bb836ef39f1e5ed0700b5b36b27a3f6bf734885183c27042fc6c951e18a70b99f7f43ea74370ab69465c4f5bc70eb714c
diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
index dec13966250c..9c86a3d2d05c 100644
--- a/net-analyzer/odhcploc/metadata.xml
+++ b/net-analyzer/odhcploc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 122dc7131978..53638b7a22a3 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -9,5 +9,5 @@ DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e4
 EBUILD openbsd-netcat-1.105-r1.ebuild 1423 BLAKE2B 75f4fd8f925ab192dd5e4f8ea279bf9c18d443b6d7b48f824da78f88c3847410912e7ffbccff734c7b7b29cbfc22ed125524bd4be0a7347dddefa78058453ad2 SHA512 337b622157df344fa2430815f5087480b1c87c3c807a0ab0c079d1c43831bd1f6c74d8188b4bf2badb85f85d3789c8853f72aeeed7680c33c92d660c1d5eae03
 EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b
 EBUILD openbsd-netcat-1.190.ebuild 1535 BLAKE2B 2c11da018defad27a26f330eb2ba5da7154fea24a318390df095140d3a32516321f0326615608448cf844234c3b645ff61f2cc9665b8aaa265be68067dc0831a SHA512 bc5262850ed5bc33efeaf94a8f540eaefc58341e410b93ccf0d3b53d946985dce352c7a5484921203976060040ac79b6fd58002c0ac27f9987ea9995549d5192
-EBUILD openbsd-netcat-1.195.ebuild 1538 BLAKE2B cdd56207e2bf4219989c15ed6dcf9d0ee7827f9950acf81e635ae93e5765b82dd175998d107269f8c9aad0f86ac2f400779ecf90df986456a46551f010bab8c9 SHA512 5a7ddccb776ade6cbeb08bc74d8a7a0297a1902b595d7596d938063dab3c1bed65d74eddfd2438443e1913dd4c2a910cefacfe9ece443fda6989f8d9fe914635
+EBUILD openbsd-netcat-1.195.ebuild 1535 BLAKE2B 2c11da018defad27a26f330eb2ba5da7154fea24a318390df095140d3a32516321f0326615608448cf844234c3b645ff61f2cc9665b8aaa265be68067dc0831a SHA512 bc5262850ed5bc33efeaf94a8f540eaefc58341e410b93ccf0d3b53d946985dce352c7a5484921203976060040ac79b6fd58002c0ac27f9987ea9995549d5192
 MISC metadata.xml 244 BLAKE2B 469b378b5a64e098c2f091fba31658d2193fbb4272f21d40e404757623bbe614474336eb8ef7d7820be4299cfdb6eb41d30fab05327993bafaaf52f9965dfafe SHA512 a8f913706b597ddb605f7e9ad505417dc7422a64037ba11e3a1826e60b882b9b5fac56ce9afd0a6c84380f2984e4079803d10ddc13e686025f65d7228063b59c
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
index 363c5e7a8193..7994e7f7ba34 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="elibc_Darwin"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 
 DEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 1f81a34af812..daedf5985cad 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -1,11 +1,14 @@
 AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b68788357e5b25274b6b2620880c1a81e7dda2dc07d77e12c1746fa966d1251d0a548ad0cc00e545bae50540b601c21c215f31e4ad43d67 SHA512 ef72812b5a2daceff20efb54c68311ef3486b8ffd56ec8bbc62ffba96e674a1f88562ed94eef531629684db13f6e2aa5c3a42d558c62869664131feb61939bea
+AUX prelude-correlator-5.2.0-fix_siteconfig.patch 333 BLAKE2B 8146762e1e277cab3ffe4517967a938083ddbda2a43f0e97c09e783094f025961a69e426adae2e0454d0a662215f3bc509d9f609995b06f13a408f4cb23964a4 SHA512 e423c37424ce80df6e448d04dd084eb40b90741a8acc35b91a1470f88d04531fedd8b8ccdbdbef3756ce5e7d285303608f8c794f2d60a00ab550b0a0f49134f8
 AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
 DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
 DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd
+DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
 EBUILD prelude-correlator-4.0.0.ebuild 744 BLAKE2B 9c8bd8db36fda98e2f550ea932f50af9666eacc543099138a4acf7fedaa860fc28c3ff2d595e6791509ecad650f93ccbf4369c4e94e97e29bbd805af70e9fcea SHA512 2750e8ba8632395ef76e3b1a9dab51bf53581cf098cf7a63a0a58553f474509730e28a82b9701973735d1bc16238df41a93dae55e4fcf6ab1ab856d71ff0d237
 EBUILD prelude-correlator-4.1.1.ebuild 802 BLAKE2B 8528650cb4cafd831b77dbe5f95a0d2f2efa8a3bedd0579aeceee460a6b24f9fb5c35eca106c6f32a5e142eef7dd3fecaa93797b42a91725c9ae15cf61fe013e SHA512 58fb60ce4dd8d32347c35598a623f2f6a08dc89b377a466b0c46137f463a1b7da7b7ae8a0181f29033d01d7046d355f5dde67f6ee50694dfc07f614224f7bf06
 EBUILD prelude-correlator-5.1.0.ebuild 749 BLAKE2B bab459f78c726959988daa71cf2125b01a0e074cfedcfb96a5638def4efc88b95c773f7e22ea9e7755439ebdf7f3bbb3dcc367c1d6daa314149a8cfee72b8646 SHA512 c0242da96d1337bccf3154399405b68965570496dde459ad74f950825c3517a508838fa9aae268434559795d8c6c4370989ceb28a821f15146fd01ac472e0a3b
+EBUILD prelude-correlator-5.2.0.ebuild 880 BLAKE2B f6034add9c7602154ee93f2ba9bae711bd60d433984211edc4ab68feaed62435afbc6f5a8fcb5b0e084ea6722b4239c3ab5870e4f4fcf05fcea4e0f95b028463 SHA512 9acaaec2dbdbb2280dfd0205b7ec1da8a0ee8b8792dbc70d8f53d240a2478094041087f25639230fbe59fa7dd2c00f83e160bb217a3d849af3ce7254de2f2b99
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
new file mode 100644
index 000000000000..cdb55dfbac95
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
@@ -0,0 +1,10 @@
+--- a/setup.py	2020-09-29 00:30:57.407653336 +0200
++++ b/setup.py	2020-09-29 00:41:37.813997273 +0200
+@@ -67,6 +67,7 @@
+ 
+ class my_install(install):
+     def run(self):
++        self.skip_build = 0
+         for dirname, flist in self.distribution.data_files:
+             prefix = self.prefix
+             if self.prefix == "/usr":
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
new file mode 100644
index 000000000000..8d5c2ca8a594
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
+	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch"
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /var/${PN}
+	keepdir /var/spool/prelude/prelude-correlator
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 65b7ceb64a2e..c9b1720c595b 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -2,8 +2,10 @@ DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165
 DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
 DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7
 DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc
+DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
 EBUILD prelude-lml-rules-3.0.1.ebuild 485 BLAKE2B 4386ff4b8f8ff7034e601e8e2ad8efb381cd5398f2acc645bb35a99edfada906b6e2de89a9962c453021d7d3a2af62dec5b81795aff4a5c597ad3b66d95dde12 SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1
 EBUILD prelude-lml-rules-4.0.0.ebuild 456 BLAKE2B 9defe3181c15de9e839092b35afc63d8e5a2b62dd2341f15d20b8c50825cfb3a5eb1ea49d6997a6c658e9c88098b7ae67ba43afead0f0a6e5cfafc4bf388a305 SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d
 EBUILD prelude-lml-rules-4.1.0.ebuild 456 BLAKE2B 8973181a90812fe583f17cfbdf2c294f4f5437edc0376e1ce89d9ec037565c290082970f4c5cfc451b442ca6ec977f4ca5f1002ae1b3ad3b599fb6a6642c81c1 SHA512 094855a812d3f0e55cffd72d3e33a512d674d9e268d93af11c6466334877884868d56ed5db3e3b57b98449fd47f6dfa903f43e0ae728192513f762dbcee98109
 EBUILD prelude-lml-rules-5.1.0.ebuild 454 BLAKE2B 67c1020d0d4180704a80cd78e93ce0b313bae0df77b66e152a0cef1f8de9a6c93fe0505c278dbe583548da257a00d525fbc416f4ab8438cc6ea4e165c7b98bad SHA512 785dd110759a98e7b1679922ff6cc14fac51e3ddd7deda145efe5d591648d6db10aa86ce1e3a0722e9b3ba111fdfc2f9c9129a002bf3fec86e187e338e2f2580
+EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
 MISC metadata.xml 373 BLAKE2B 6fa00bbd4f812187c5808bda963bd017a49083630f19f9eb0966064914eeb3a21389430fa7aac54ce03faad80347a66be473227e933ab8e41c1598160ca7dd45 SHA512 1da0210300b25be42d84914b12750fbea2e7471ad5ce0cb7740e69c1e3c87b44ae76a3bfa57e60498dfd1e0a9ca9fd6eaf9a7a8a664e036bbfe45a2c00c94ad1
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
new file mode 100644
index 000000000000..e93bb67f9786
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="~net-analyzer/prelude-lml-${PV}"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto "/etc/prelude-lml/ruleset"
+	doins ruleset/*.rules
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 6bf5ff2e871e..b24c2981e6e0 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -9,8 +9,10 @@ DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba
 DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8
 DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035
 DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
+DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
 EBUILD prelude-lml-3.0.0.ebuild 1114 BLAKE2B ede79f59ee9f077089f5f2f37a7bfd7ecc49dca5dc8051ec957d025ab1fc2f0be11c3ce18f5dbedd7f62d4106b689084b945f9c78ecf3c9fea378be86735fa1f SHA512 6bbb8fa330bc1441e144d4f100381b74fdfae3d5ef7b4f5478a451a212e7d165addcd4f2057393490e80c8ddee99caf6ad50839b5d0da9912413dafc205c5343
 EBUILD prelude-lml-4.0.0.ebuild 974 BLAKE2B 1d458ff6c476e56b22a0e510c9dbd831d6ee88e6647d9a040b6270507aa7a86779a85c825a029d3333122ac5909b3329817a98e284d7ca9cbeaaa2d53c5557d2 SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2
 EBUILD prelude-lml-4.1.0.ebuild 1045 BLAKE2B d5538ff12b7a81d4828d9f36c89987836f8697228779cae58fb86261b16796792b9ac711680bf82cd6cf6a2f7c71ce2ae9db9e9a2010fccddbdd5cff7ec79ba1 SHA512 b69be9c14f0587bc2bcfd85ea8c23f8f06f49704bcf373c2fee5921402ada7694fb57aa06357277ddace4b1528db05732cd85e4c8063a03b4900c76625412004
 EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B fec34ee3090b221fd4736640b74aa46c7b7c8b91c0ad994b3be21e5b03fa340dea49ab4429a7fd0486de97f92670136c2b6a3c73b61a628c55ee6aa78ab1d4f7 SHA512 e53ead9beb5a4dd2ed4d15288773dbe958c14ea4c3506c26bf988958a220c7ca81e680ad7655afa80a82c9dfb6a9728ab15bbf81faa9e143edd2b7cb2b3dae6a
+EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
 MISC metadata.xml 859 BLAKE2B 029350529cf91a38bba7ebf303271c5388e7407266a1808a410aa05d004d68b01fe48470384cfa45bf671d6ea095b14ee6f9b462b94cee4b30c1198485626e68 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
new file mode 100644
index 000000000000..554623ae6606
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="icu ssl"
+
+RDEPEND="dev-libs/libpcre
+	>=dev-libs/libprelude-5.2.0
+	<dev-libs/libprelude-6
+	icu? ( dev-libs/icu:= )
+	ssl? ( net-libs/gnutls:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+	"${FILESDIR}/${PN}-3.0.0-conf.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with ssl libgnutls-prefix)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED}/run" || die "rm failed"
+	keepdir /var/${PN}
+	keepdir /var/spool/prelude/prelude-lml
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index c24c69fd7a7e..2d769e5a5a4b 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -9,5 +9,5 @@ DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323d
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r5.ebuild 1814 BLAKE2B f16f379c88b9807221810e5fd3c89c5eb56d26670fcb19e441185c9583f69f4e9ecab41f4ee5d9cf720ab35632c77e1abbf3e4cd21a8ba2740be0dd2e7fd3d6e SHA512 437ab1a97e4323d582e26f82a555ca31aea878a3100d9d1ae955b03483cb98d546a7d29cb5a5009b5a0d086b7fb3bd2064dc0c2eb53d734216ac0afb65c7f03c
+EBUILD sancp-1.6.1-r6.ebuild 1776 BLAKE2B 62828e42931e65cea178f0b7d6d5acd6c0db2d0a747056a59d8f039c944a9338868d395f3e94f3a6953b695b2028b48476540398837155776607654775abd86a SHA512 38702d270d041de28d82c8f2d8c1c8c6eb417abaefc722ef14469a0c1549bec772c80e0b36ae8cd6ac856ae3ad77159ee70a5d47adab26b958fa427ed18714e1
 MISC metadata.xml 473 BLAKE2B 2d145ab771bc6ec7572cfc0523c7d9630638909cdd4a8eba60a5ba47bd0d74d14985cca1cb435c26d1f2cf9893d22e8001066d17cbf763014def308c787cad99 SHA512 3328fdd1dc68198464db9730005254454691ac8f4fbdd76dc09eb21c12f21fcd011ce7fb6cb1ce06262eb79fcc3c43abddd2314bdc64e2022fc8e5bb58360a85
diff --git a/net-analyzer/sancp/sancp-1.6.1-r5.ebuild b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
index 543e814ff1d0..be00f2204c5c 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r5.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs user
+
+inherit toolchain-funcs
 
 DESCRIPTION="collect network traffic statistics and store them in pcap format"
 HOMEPAGE="https://sourceforge.net/projects/sancp/"
@@ -19,13 +20,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
 
-RDEPEND="net-libs/libpcap"
+RDEPEND="
+	acct-group/sancp
+	acct-user/sancp
+	net-libs/libpcap"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	enewgroup sancp
-	enewuser sancp -1 -1 /dev/null sancp
-}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 44b9f0c637ca..9af9059a8201 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 1046 BLAKE2B 2b068e080b9b5728d8427aeef978fff3e9c97e3e053993446a435e9af94d7f7f51c5637bf7f0e5952ee192d6746db80c24aaa167a12ad75974f5b155369267a4 SHA512 0adb1abd53ee2bac6e92153fa4ed4a9fbef7c280d6f9261733c5d692bf05b813ebd96e6c20cfab8efba34c7b074a3ad2d0ad1f45750a7949edbb8ebb029a4285
+EBUILD scapy-2.4.4.ebuild 1058 BLAKE2B 261a2d8e4f1de4942b6125ab2388139fee9e0db20788c0e53cf671deb831838f91df1d91550e07268fe1d96759de2a9be04b70ee1585f6dd81a23f344c194af4 SHA512 f99effd1be3bdf062d80acc8f7d0af2c516f5f35bc9bc9d42917ea1c8032d6dbc2053d035b4805441472396886d89377ebac61ea7f6b64fe503ad527cdfead39
 EBUILD scapy-9999.ebuild 983 BLAKE2B 3f1e5d14b6e57ba98659e724a0bab5bd427559b45f492b8f142a2d77b5d07c237754a6f3e12e5f917751972145cceb7cc8eaf0de20171f80d6b46ee75ee19a95 SHA512 63138785e892c083ee8886ff24260089d110ffc25e98d46d8c8331507d09320d44ceebb222336f11a9d8623359c2d98a11f4b594ee223978d8a816caee306079
-MISC metadata.xml 460 BLAKE2B c2e6394f3ddbbd6fafd1ad50ad4efbdec39016adbdc84b18a2d50ec86d71d28f66c7bd4282b7ff5be8bbc8564c8e2682cdad0678bd84c6244854bbc76a2cd116 SHA512 62b81aff71c77ebd87a6d7f6b84685b3a9350568a549bbc406db05adc33dfe10fa1e4558445ad0fdf8d6a451a9982100b743359a1c2b253005bb17f694d42e34
+MISC metadata.xml 560 BLAKE2B 0031ba40f45dfbd2102459d22ee29248d02147a66124ab694cff2f8127b9eab8a57beaa3b09225851b83acbef4b54d98254bf333b5fe67e3935a8a5ae09b4cee SHA512 cf4e12f89211e5d4cab9a017ad1fa8e99115bb3b071cab99bfd7a593ca089d4902ab6a8e72b083293ac620c6bca5ef88f40db8c790765a2c0a0c7f3907c5a083
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index a7791d1ecc1b..85d0af3d580d 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -5,6 +5,10 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4.ebuild
index 503c24d45f18..31ea052c82e5 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.4.ebuild
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 DOC_CONTENTS="
 Scapy has optional support for the following packages:
 
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
deleted file mode 100644
index ac6ad6f58711..000000000000
--- a/net-analyzer/sguil-server/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX sguild.confd 718 BLAKE2B b2ac186865f8fbe20c920b8f493fe6b7fd5736244e8d5574c8362e9c663baecd270821d024f124cb952d49a2ea80513d0bf961db9bf1fa5a93262b2236051037 SHA512 48bf64ed2335367c6b11dafb7f157fc507398e2466e186602e3319891848b3b47a5f9a70a39d8d94ecba170a7604252f689d116442572c3bc71441b01e3c0e34
-AUX sguild.initd 1198 BLAKE2B bd1225afa2e9544a818d234270fa1179db899b400492cea5efce91d59b7f211ba44cf4014eb7b5b785fa5da318cf7c52ca87d961ac4cd0c90e354219de270d8f SHA512 73bc162660ec36e568071026b6578a6e46215720cafdf957356307a341fcb159f201ba075d3f97563c81384da119f88a002f0f9e990071aef18026ad77e2e101
-DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-server-1.0.0.ebuild 2696 BLAKE2B 73d8065d9cbf487839c61c85169de7a41fc267a334a191bad48aed2bcbe643e5f01b7f39853699c3f4a52639f4b854de58d035d30140e598942c4648ba8e8e3a SHA512 3faf9efbd2832e93e988e367bbe7161d4028232406eeabe43e45c7cb306abf3c3dfd1efc6068bb104bc23570a29893d2e9362169a1f850470773a14cf0dc5cc0
-MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-server/files/sguild.confd b/net-analyzer/sguil-server/files/sguild.confd
deleted file mode 100644
index 216f6e60ad87..000000000000
--- a/net-analyzer/sguil-server/files/sguild.confd
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/sguild
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#PATH to the sguild config (sguild.conf) file.
-CONF=/etc/sguil/sguild.conf
-
-#PATH to the sguild config (autocat.conf) file.
-AUTOCAT=/etc/sguil/autocat.conf
-
-#PATH to the sguild global queries (sguild.queries) file.
-QUERIES=/etc/sguil/sguild.queries
-
-#PATH to the sguild users (sguild.users) file.
-USERS=/etc/sguil/sguild.users
-
-#PATH to the sguild access file
-ACCESS=/etc/sguil/sguild.access
-
-#Directory that contains sguild.pem and sguild.key
-#Uncomment to enable openssl connectivity
-#OPENSSLPATH="/etc/sguil/"
-
-#For any other options you wish to add
-#EXTRA_SGUILD_OPTS=
diff --git a/net-analyzer/sguil-server/files/sguild.initd b/net-analyzer/sguil-server/files/sguild.initd
deleted file mode 100644
index e4fec500feb9..000000000000
--- a/net-analyzer/sguil-server/files/sguild.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -z "${CONF}" ] && CONF="/etc/sguil/sguild.conf"
-[ -z "${AUTOCAT}" ] && AUTOCAT="/etc/sguil/autocat.conf"
-[ -z "${QUERIES}" ] && QUERIES="/etc/sguil/sguild.queries"
-[ -z "${USERS}" ] && USERS="/etc/sguil/sguild.users"
-[ -z "${ACCESS}" ] && AUTOCAT="/etc/sguil/sguild.access"
-
-SGUILD_OPTS="-D -c ${CONF} -u ${USERS} -A ${ACCESS}"
-
-[ -n "${OPENSSLPATH}" ] && SGUILD_OPTS="${SGUILD_OPTS} -o -C ${OPENSSLPATH}"
-
-depend() {
-	need net
-	use mysql
-}
-
-checkconfig() {
-	[ -f "${CONF}" ] || return 1	
-	[ -f "${AUTOCAT}" ] || return 1	
-	[ -f "${QUERIES}" ] || return 1
-	[ -f "${USERS}" ] || return 1
-	[ -f "${ACCESS}" ] || return 1
-	if [ -n "${OPENSSLPATH}" ]; then
-		[ -f "${OPENSSLPATH}/sguild.key" ] || return 1
-		[ -f "${OPENSSLPATH}/sguild.pem" ] || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting sguild"
-	start-stop-daemon --start --quiet -c sguil --exec /usr/bin/sguild \
-		-- ${SGUILD_OPTS} ${EXTRA_SGUILD_OPTS} -D -P /run/sguild.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sguild"
-	start-stop-daemon --stop --quiet --pidfile /run/sguild.pid
-	eend $?
-}
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
deleted file mode 100644
index ca324d618d91..000000000000
--- a/net-analyzer/sguil-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bammv/sguil</remote-id>
-    <remote-id type="sourceforge">sguil</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
deleted file mode 100644
index 08a35d0af331..000000000000
--- a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Daemon for Sguil Network Security Monitoring"
-HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tcllib
-	dev-tcltk/mysqltcl
-	ssl? ( >=dev-tcltk/tls-1.4.1 )
-"
-RDEPEND="
-	${DEPEND}
-	net-analyzer/p0f
-	net-analyzer/tcpflow
-	net-misc/openssh
-"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/'$(get_libdir)'/sguild:g' \
-		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
-		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
-		server/sguild.conf || die
-}
-
-src_install() {
-	dodoc server/sql_scripts/*
-	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
-	doc/TODO doc/sguildb.dia
-
-	insopts -m640
-	insinto /etc/sguil
-	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
-
-	insinto /usr/$(get_libdir)/sguild
-	doins server/lib/*
-	dobin server/sguild
-	newinitd "${FILESDIR}/sguild.initd" sguild
-	newconfd "${FILESDIR}/sguild.confd" sguild
-
-	if use ssl; then
-		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-	fi
-
-	diropts -g sguil -o sguil
-	keepdir \
-		/var/lib/sguil \
-		/var/lib/sguil/archive \
-		/var/lib/sguil/rules
-
-}
-
-pkg_postinst() {
-	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
-		install_cert /etc/sguil/sguild
-	fi
-
-	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
-	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
-
-	if [ -d "${ROOT}"/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
-	fi
-
-	elog
-	elog "Please customize the sguild configuration files in /etc/sguild before"
-	elog "trying to run the daemon. Additionally you will need to setup the"
-	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
-	elog "Please note that it is STRONGLY recommended to mount a separate"
-	elog "filesystem at /var/lib/sguil for both space and performance reasons"
-	elog "as a large amount of data will be kept in the directory structure"
-	elog "underneath that top directory."
-	elog
-	elog "You should create the sguild db as per the install instructions in"
-	elog "/usr/share/doc/${PF}/ and use the appropriate"
-	elog "database setup script located in the same directory."
-
-	elog
-}
diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest
index c567608573ef..85f77aacab58 100644
--- a/net-analyzer/snallygaster/Manifest
+++ b/net-analyzer/snallygaster/Manifest
@@ -1,5 +1,7 @@
 DIST snallygaster-0.0.6.tar.gz 22260 BLAKE2B 5f5f45678ee83922d477eb7356bf830a4ececbff6fc02bc21d2b714abf350c1b2643fb8134f330d8f54a4c58809b9de2671f46b728e631ac0a5f4996f87fd8e1 SHA512 abca663005e43948ef7c6516a3e85d1b1010811365f39a280b9c091490a8b4687fdaa1b0acbd29f5a84285fe16cd74398098eb9600b5ec41ec880d355cd0ddbd
 DIST snallygaster-0.0.8.tar.gz 23341 BLAKE2B 0b4e92b50c9f766440a19bab6e39f7be323c5574c8f350ed3fbd07499ca04b358ec0e66deeddd30b5e798d093a73fbce65434be4058285eb773918314f373dac SHA512 a4937d5e486109deb54d4a3494fcdb2b06a0938cb9ca686550616d31d2f5bde01b4162f610db15c34c86e41673f6f05f749fb921d5f858cbc4a2fc7f65a6dda6
+DIST snallygaster-0.0.9.tar.gz 24055 BLAKE2B 049a88250877ed87103d23a30443ed638320e61c788716d432d877407c837f439bd16dc78a6eb00f7fea844280975f155898d9b084f7e285a0ed81a6becf9d68 SHA512 e7de6d97576f1651e0a6882c4d2766efe82b8656f53a6c30a5e36eeadbaa4fdc2b79dc370a1106a0bbd916d45d1c92169dcfb5d7c75e89946b371bc80098366c
 EBUILD snallygaster-0.0.6.ebuild 540 BLAKE2B 3d0254f87df1fe231e06854887f5507e65988eace51aa92d5eb0a016b8ec275edf8bcf5e45b63efa75d85d1b8cad5a387f890d98548c1d416901863ee475fd3d SHA512 b37b7b963fd1458f0baf292ed7b286b4e1a226fd9b1d57ef6da5a1dbcb46e10a3efa08e47bd4d23ac6092576048cb4d6bf1363b2f31f67cd4bcbc9996338e75c
 EBUILD snallygaster-0.0.8.ebuild 540 BLAKE2B 3d0254f87df1fe231e06854887f5507e65988eace51aa92d5eb0a016b8ec275edf8bcf5e45b63efa75d85d1b8cad5a387f890d98548c1d416901863ee475fd3d SHA512 b37b7b963fd1458f0baf292ed7b286b4e1a226fd9b1d57ef6da5a1dbcb46e10a3efa08e47bd4d23ac6092576048cb4d6bf1363b2f31f67cd4bcbc9996338e75c
+EBUILD snallygaster-0.0.9.ebuild 540 BLAKE2B 3d0254f87df1fe231e06854887f5507e65988eace51aa92d5eb0a016b8ec275edf8bcf5e45b63efa75d85d1b8cad5a387f890d98548c1d416901863ee475fd3d SHA512 b37b7b963fd1458f0baf292ed7b286b4e1a226fd9b1d57ef6da5a1dbcb46e10a3efa08e47bd4d23ac6092576048cb4d6bf1363b2f31f67cd4bcbc9996338e75c
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
new file mode 100644
index 000000000000..721aa4381322
--- /dev/null
+++ b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
+HOMEPAGE="https://github.com/hannob/snallygaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/dnspython
+	dev-python/urllib3
+	dev-python/beautifulsoup"
+RDEPEND="${DEPEND}"
+DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 1c4400be6205..b07e2ecce2db 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,9 +1,19 @@
 DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
-DIST sslscan-2.0.0.tar.gz 109677 BLAKE2B 728ca5f59e7d46cf6bf4ac03fce8eb8b7183f9984da58985c3964a3d82c2b5ba6e1f90361cb7c504db3555ff0d6edb739a97aa2b6b4c90970ababd1bf2faa9cd SHA512 faebf7014738a991be4d1d78fe0e9523f24a00c4154c19862fb46c3cc1674d5f8c3ab03e58975401e3265c9e2ada0cab9898d17c0f089dd3a20ba44b4fbf78ab
 DIST sslscan-2.0.1.tar.gz 109709 BLAKE2B d0aabebe208529122d9d4d63d39b13c3cc9128dce552cc773b32e02ade87fcb91d5ad7e13a5dfd4883f73153d3ec19b91b16166a756c38df92c96a2f9e8606bb SHA512 d8e9b66b110d7a76ffa7cc3b52f6f5614998ab08e91d12aa92d604ff3320dff6bec0e9a9017ab9c2dea204d9f51b5c729215836fd8f0dce0c5817e28b2eef63f
+DIST sslscan-2.0.2.tar.gz 109798 BLAKE2B 4ed599578a3ee1bd0296c237f8f751aa9f95b96ab7592d0d8f7d117879e7058a92f28d5361658e144eb461fd1bb11739e79e2ae030ac9fb0430924ecca53dfd6 SHA512 ffe12315942c9b9a5f28766768c2202ef09d82977a42c5d114ba2bb7354e694df6262377288ca788e185e0b9423a78c9ebe2fcc02923bd8522c0b9b98df43453
+DIST sslscan-2.0.3.tar.gz 109870 BLAKE2B e42b31eea50adb3f24627a0359d9896a1ed3e24f6f4316ff55ed1ea5e52a9d8d7db8c231e18e0e323b688e3b2cb15342b052529392bfa9b6be17e7c3401bf193 SHA512 3cc1e7b93f76c03afff054b74938fbc22a190f6231fc9623b70084d5488313e253d170532c58ec5d320cac2a0b451b2bf43199367f4f38ccecbfa904bb8424ec
+DIST sslscan-2.0.4.tar.gz 109501 BLAKE2B 45eccf9c2b7b235b30259dd77a7bdfcb77ee43517ec5619aef96a06aba9f145e105fc29410f4abf6d4c645c1aebd02156344d9ca88c629068ba00d6ee93d12e2 SHA512 1313020edc75abad12f1ea735d4c871d4bc605b7cb3be039904cb24dfbeae94580c812067b3ff304e9c4f612e22697dee02c6cfdc81066a7af46c95523399837
+DIST sslscan-2.0.5.tar.gz 109503 BLAKE2B bd1fd0c3a0eb9e00cd36dc30c3bc2cc052c0e842ef61e49830af57a7f6ebc4a683440c973193bd7ccd3a20b67c42a47c92480789bf3de0886d51827876626f64 SHA512 2d6db38d6df6bd3bd691381ad6f649283889bfcab06121d509db40ec080adff421962980cb7943eae83c23bcef91e57c5d2be1ad32560e8bdab2b200a080fb37
+DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
 DIST sslscan-OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
+DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
 EBUILD sslscan-1.11.13-r1.ebuild 1029 BLAKE2B 3e0c3fa00d0a29907180b2307efe0e628305951d614613dead3fe4580d000f13151bbfa88070240048e5e2cb02e0699355312cca6947d19c1fcba3c0b3178ff7 SHA512 92032809178fcd9bbf769059afd3f31fbda24f9b8e6ace40acbca7c09a7de314ac94408ad2b8c00daf181fa89ddf376cc00ab7bf3662c38dae68d1a88a4fc63c
-EBUILD sslscan-2.0.0.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
 EBUILD sslscan-2.0.1.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
+EBUILD sslscan-2.0.2-r1.ebuild 1257 BLAKE2B c17e33c3509ec360f5a62ebefb0eb6e773a5f6ee2827722aa9457258dc84d695a266a21bae23ab5a0bcb78713b41487692c74c273e3ac2e4e9230579791516be SHA512 94b770ab86e5c88b348a221a3c3e9bfaf0aebea0ad841377827ea51360cdd6b2f5a98b04f10e21c0f06151461f00823229b24c451edeb6c0d2446ad1d13af140
+EBUILD sslscan-2.0.2.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
+EBUILD sslscan-2.0.3.ebuild 1257 BLAKE2B c17e33c3509ec360f5a62ebefb0eb6e773a5f6ee2827722aa9457258dc84d695a266a21bae23ab5a0bcb78713b41487692c74c273e3ac2e4e9230579791516be SHA512 94b770ab86e5c88b348a221a3c3e9bfaf0aebea0ad841377827ea51360cdd6b2f5a98b04f10e21c0f06151461f00823229b24c451edeb6c0d2446ad1d13af140
+EBUILD sslscan-2.0.4.ebuild 1257 BLAKE2B c17e33c3509ec360f5a62ebefb0eb6e773a5f6ee2827722aa9457258dc84d695a266a21bae23ab5a0bcb78713b41487692c74c273e3ac2e4e9230579791516be SHA512 94b770ab86e5c88b348a221a3c3e9bfaf0aebea0ad841377827ea51360cdd6b2f5a98b04f10e21c0f06151461f00823229b24c451edeb6c0d2446ad1d13af140
+EBUILD sslscan-2.0.5.ebuild 1018 BLAKE2B 0d8d4da54e5c353ddb40dc94c215ce8585441c12afb156012f3f4279079168420de7bbd3f7bb07ce7bab377e811f13aba52dee8d9e25433fee9ede2ae36192e7 SHA512 e6ab4241f1c3f89f877f1c09a8e35a7af5281141708244ab1d5edd9a9d99b0833a31d8db1511ff654ab4e51caa0b17d72e25f1a03800662689c6426e4dfe7398
+EBUILD sslscan-2.0.6.ebuild 1018 BLAKE2B 0d8d4da54e5c353ddb40dc94c215ce8585441c12afb156012f3f4279079168420de7bbd3f7bb07ce7bab377e811f13aba52dee8d9e25433fee9ede2ae36192e7 SHA512 e6ab4241f1c3f89f877f1c09a8e35a7af5281141708244ab1d5edd9a9d99b0833a31d8db1511ff654ab4e51caa0b17d72e25f1a03800662689c6426e4dfe7398
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..b90f6d3563b4
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+#MY_FORK="rbsec"
+#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+#	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.0.ebuild b/net-analyzer/sslscan/sslscan-2.0.2.ebuild
index 874d6c6593bd..874d6c6593bd 100644
--- a/net-analyzer/sslscan/sslscan-2.0.0.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.2.ebuild
diff --git a/net-analyzer/sslscan/sslscan-2.0.3.ebuild b/net-analyzer/sslscan/sslscan-2.0.3.ebuild
new file mode 100644
index 000000000000..b90f6d3563b4
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+#MY_FORK="rbsec"
+#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+#	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.4.ebuild b/net-analyzer/sslscan/sslscan-2.0.4.ebuild
new file mode 100644
index 000000000000..b90f6d3563b4
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+#MY_FORK="rbsec"
+#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+#	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.5.ebuild b/net-analyzer/sslscan/sslscan-2.0.5.ebuild
new file mode 100644
index 000000000000..8deaf7cd4f79
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
new file mode 100644
index 000000000000..8deaf7cd4f79
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index ed8dd86cf388..17da0e7e5613 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,8 +2,12 @@ AUX suricata-5.0.1-conf 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb6
 AUX suricata-5.0.1-init 5480 BLAKE2B 48c9484c824f7216d1c4d64394a60b5a5b2c1f5781e8faa775d56765680dd27cb886daf61da7e93f78469f2947f38bd044804acc79f2fb3c40477aff0f470f13 SHA512 6756cebe424b057884904e716af05e74bf2cfc47461a6081b4ff45144d1fefb568ffc3aaffb8162efa3272fea535d0f93632b4778d9c80d64fca26740471ed49
 AUX suricata-5.0.1_configure-no-lz4-automagic.patch 601 BLAKE2B 01874b39d89a8872a35a102018e2e11208549f60790e88f988a689ba09c59fb915bbffccb6db454a8d8d4fee0ccf69b51cd5d2cde11cb6f2a1c401cb74c5c49d SHA512 d26fc7e0193ea3ddd5436964a26bbbfed847890d513c4e7181a0faceb0a688df8ca35ad68045ecd006a25da93d345a942c593f8711f81dff5f63d13e599f78b0
 AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83bd35927cf90b66a10e51e5058869e09c05810c037da025a9d26486e33077a06bfe8ba08698618e091bdc40a255d8322062c7 SHA512 0f6337d5bff60cd57f3a3a3edcb82abde9acc6848b158cac1b8f945fc7a228340c420d53a2c5f558d5b5e2b7645f6b104e8105b260245209ba782966d6f04a7c
+AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e9756c0385338f4a1b8f6c36b22052cc7f8a41cd07e31b882e2e89402c5eb43e599390cf6922f9dcfc869416d57aa3426516f8f9 SHA512 8edff1be84dbe29a140889040a7d9310ee8dc5ab82cf9ff64298ecfab07a75853caa7ac907cf191a62a1c2de9833311fd090eb2f82c9d3745b5f3fc01adf6efd
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-5.0.3.tar.gz 23744731 BLAKE2B 51dfd6fb8a1208e4999999f178f679f2b3cf6a2632a659fb5b58baa747da64fb37a1c9345b51b2bb3f5c33f9a3fc9208ab52cb6e8dc6ddb38b7c19124f7345ca SHA512 4e0ad2ae33537cb074d549b3cc162c5ed115605cb142a96cbf66d1341799eaad96b307fd6ad4679e344e51d00065b3573bfb26bd60468f12addb144b112e4f72
-EBUILD suricata-5.0.3.ebuild 6182 BLAKE2B 0467639af68bfb855f72dc0097856688f6a3f2a28b0a9a2d37e419b3220cb6350bfc30ac0defbf46990ad72ad4d47cab818d40ec28674638cd45fb680fbabfb9 SHA512 19d4a32238228d5d4779870dcb75e55caebdf841bc74b39b6cd0bccd5494496def82cdf2c63cc2472db4612e4dc468148f2206e47beaad2c9d33231625274183
+DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6
+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
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch
new file mode 100644
index 000000000000..03e0f1cda944
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch
@@ -0,0 +1,27 @@
+--- a/suricata.yaml.in
++++ b/suricata.yaml.in
+@@ -209,8 +209,9 @@
+             # https://suricata.readthedocs.io/en/latest/output/eve/eve-json-output.html#dns-v1-format
+ 
+             # As of Suricata 5.0, version 2 of the eve dns output
+-            # format is the default.
+-            #version: 2
++            # format is the default - but the daemon produces a warning to that effect
++            # at start-up if this isn't explicitly set.
++            version: 2
+ 
+             # Enable/disable this logger. Default: enabled.
+             #enabled: yes
+@@ -988,9 +989,9 @@
+ ##
+ 
+ # Run Suricata with a specific user-id and group-id:
+-#run-as:
+-#  user: suri
+-#  group: suri
++run-as:
++  user: suricata
++  group: suricata
+ 
+ # Some logging modules will use that name in event as identifier. The default
+ # value is the hostname
diff --git a/net-analyzer/suricata/suricata-5.0.3.ebuild b/net-analyzer/suricata/suricata-5.0.4.ebuild
index d159cf584dac..e618aa1e0bcc 100644
--- a/net-analyzer/suricata/suricata-5.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.4.ebuild
@@ -35,11 +35,11 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.33
+	>=net-libs/libhtp-0.5.35
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
-	bpf?        ( >=dev-libs/libbpf-0.0.6 )
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb )
 	logrotate?  ( app-admin/logrotate )
diff --git a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild b/net-analyzer/suricata/suricata-6.0.0-r100.ebuild
new file mode 100644
index 000000000000..872fafeef3af
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.0-r100.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic linux-info lua-single 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 lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bpf? ( af-packet )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+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.35
+	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?        ( ${LUA_DEPS} )
+	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 lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+	if use lua; then
+		if use lua_single_target_luajit; then
+			myeconfargs+=( --enable-luajit )
+		else
+			myeconfargs+=( --enable-lua )
+		fi
+	fi
+
+	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/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild
new file mode 100644
index 000000000000..5f5d14e3eec3
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.0.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.35
+	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:* )
+	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/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index e67fccb6e06a..40b3c15b80ab 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,8 @@
+AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.10.0rc1.tar.gz 1823212 BLAKE2B aa274e548163eacb09a98edbaa1127dbb06b6fe2f6eb23ffa968a577081d9d9323c339a885a198ee08d7dced04302cf50301ca575fbe95e082a6ed89e115de05 SHA512 b226ca569eeda7cee45fc7a1e42766f404d55ebca8133da544ecd75f975701532346f0cfdbefd4fc708fca12a8d094790c99a7276bd9b563885ef036a3912493
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.10.0_rc1.ebuild 2007 BLAKE2B 76de68cff518dc99ead39c4c0051b5a6d13b9c7c215b36262f50cd3b371ced18ae198785abe8fa8fba01da728c2aaccb3c2e69c89dda231d445a1e98cc993947 SHA512 9dbd38f528da1f6b068aee1888b633726dd94f638480da8bf4aa67bda7355b21f7ab15d569b97d1f20ef577303be471bc670adb892834b6444c2c831c5885aed
-EBUILD tcpdump-4.9.3-r1.ebuild 1879 BLAKE2B 65e3958ba8cad7dc7b7d2b77d6010e8f839c89fdb0d2fae5c15b338dab2d1b6f2758b86bfa94e72589a7578b3f3a7f299ba298a15414ee4847f014f9047915c9 SHA512 caada4ddb50725f408d1559b8d53c1ac8c996a5eee4ca41d645731f378c35ff7b1d74e75e7c728bb546c5c678d984015f702e5ba350048540f77cfc3fab56e1f
-EBUILD tcpdump-4.9.3.ebuild 1938 BLAKE2B 3fbeee3f62778f3347d509c2daa7a70ece06f40e3a8d37b85f3a67f53a6c3ed1eaa09bc52b48239db0c51739ad2f94239f9ebe11ed9c1e4bc2dbde8b8eff94b9 SHA512 f627bd6a18482bbc70724491eb69acfbba095d5193bfee673da5f275ce8b40383450776aa1e22444595116df42bc5b6d23a2ffd16a5b94cbc3144253f64e104a
-EBUILD tcpdump-9999.ebuild 1874 BLAKE2B 1ed3229b920e1dbaf9475165c8a46b9f03df687b638997f48df58ff041a45fe307f4818d539fbeab13a5eb0c04131b359b7109e4f80527da6469c5eff55aa305 SHA512 32234b09024c788595fa6f9b32e698ef40133253dae1042fb7e730590d6673ffc2e898295b42ebaa679d97cc95b45413979c161b4caf92ba92e411bc43e4c56c
-MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
+EBUILD tcpdump-4.10.0_rc1-r1.ebuild 1847 BLAKE2B 9dab89ac03e15253288ec3b3f71da253766183d4ad3ce5d37ff768d95a79e84b882c995e02f63870dd92531bdfa27719c36ff7474bd79c9ad2e1fc848f8926d9 SHA512 5a482da138d7fd148a71aa98edd6e1d80722e317c773068692cd9702d93382e44f78f45f3e0e6027372a90b4dd788029dd923b72fb7d55f93b0ce5d735b09a3d
+EBUILD tcpdump-4.9.3-r4.ebuild 1758 BLAKE2B 12844ec4d7b49fcf249e21191cec0d98fa42a8ea83fb52de4d5202dacd989161a23dc931bec4776722b92b9f3ba21564fb71cd6aaaa96197ee3a3546c434ee5f SHA512 b6d7c8218540e3a6f374b6a827f40e136c665578e5a2a800241b7c0ba66c8cbc8a840cb51f8230455f48669ce7d78cc9d281eec5e9877d184160ac6ec2923aca
+EBUILD tcpdump-9999.ebuild 1719 BLAKE2B 538b1b4f0519fcd589a9d9c20935c84c9fee5136337ce13f519f0a22cce6ac0331a37310574cc60d1db3f0eaff030f75ca756c729bc81989b3cfc1230ae27bfa SHA512 9fcbc567c7be186a19181a0daf3014e4df3acf16b7a578bb7a782802afa449a21f7174d6a5eb75f7ee313453e46a12488b18957000757b8e23110d6f72ebf4a4
+MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
new file mode 100644
index 000000000000..2852845eb748
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
@@ -0,0 +1,63 @@
+From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001
+From: Guy Harris <guy@alum.mit.edu>
+Date: Sat, 18 Apr 2020 14:04:59 -0700
+Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer.
+
+The buffer should be big enough to hold the captured data, but it
+doesn't need to be big enough to hold the entire on-the-network packet,
+if we haven't captured all of it.
+
+(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334)
+---
+ print-ppp.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/print-ppp.c b/print-ppp.c
+index 891761728..33fb03412 100644
+--- a/print-ppp.c
++++ b/print-ppp.c
+@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo,
+ 	return 0;
+ }
+ 
++/*
++ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.
++ * The length argument is the on-the-wire length, not the captured
++ * length; we can only un-escape the captured part.
++ */
+ static void
+ ppp_hdlc(netdissect_options *ndo,
+          const u_char *p, int length)
+ {
++	u_int caplen = ndo->ndo_snapend - p;
+ 	u_char *b, *t, c;
+ 	const u_char *s;
+-	int i, proto;
++	u_int i;
++	int proto;
+ 	const void *se;
+ 
++	if (caplen == 0)
++		return;
++
+         if (length <= 0)
+                 return;
+ 
+-	b = (u_char *)malloc(length);
++	b = (u_char *)malloc(caplen);
+ 	if (b == NULL)
+ 		return;
+ 
+@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo,
+ 	 * Do this so that we dont overwrite the original packet
+ 	 * contents.
+ 	 */
+-	for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
++	for (s = p, t = b, i = caplen; i != 0; i--) {
+ 		c = *s++;
+ 		if (c == 0x7d) {
+-			if (i <= 1 || !ND_TTEST(*s))
++			if (i <= 1)
+ 				break;
+ 			i--;
+ 			c = *s++ ^ 0x20;
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 926985b6a8cb..1f6e1c98b574 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<use>
 		<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
-		<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
+		<flag name="drop-root">Drop privileges to pcap:pcap when run as root</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id>
diff --git a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1-r1.ebuild
index c2cf8713eaca..3133cb51eca1 100644
--- a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1-r1.ebuild
@@ -2,35 +2,39 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+inherit autotools
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-LICENSE="BSD"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
+SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz"
+S="${WORKDIR}/${PN}-${P/_}"
 
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( samba )"
 
+BDEPEND="
+	drop-root? ( virtual/pkgconfig )
+"
 RDEPEND="
 	net-libs/libpcap
-	drop-root? ( sys-libs/libcap-ng )
+	drop-root? (
+		acct-group/pcap
+		acct-user/pcap
+		sys-libs/libcap-ng
+	)
 	smi? ( net-libs/libsmi )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-"
-BDEPEND="
-	drop-root? ( virtual/pkgconfig )
+	suid? (
+		acct-group/pcap
+		acct-user/pcap
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -42,18 +46,9 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
 )
-S=${WORKDIR}/${PN}-${P/_}
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -64,7 +59,7 @@ src_configure() {
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
+		$(usex drop-root "--with-user=pcap" "")
 }
 
 src_test() {
@@ -83,18 +78,11 @@ src_install() {
 	dodoc CHANGES CREDITS README.md
 
 	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
+		fowners root:pcap /usr/sbin/tcpdump
 		fperms 4110 /usr/sbin/tcpdump
 	fi
 }
 
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
 pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
 }
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index e23d799be4ba..398ed0b9b2c5 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -2,31 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
+SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	net-libs/libpcap
-	drop-root? ( sys-libs/libcap-ng )
+	drop-root? (
+		acct-group/pcap
+		acct-user/pcap
+		sys-libs/libcap-ng
+	)
 	smi? ( net-libs/libsmi )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	suid? (
+		acct-group/pcap
+		acct-user/pcap
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -35,17 +39,12 @@ DEPEND="
 		dev-lang/perl
 	)
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
+	"${FILESDIR}"/${PN}-4.9.3-CVE-2020-8037.patch
 )
 
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -58,7 +57,7 @@ src_configure() {
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
+		$(usex drop-root "--with-user=pcap" "")
 }
 
 src_test() {
@@ -77,18 +76,11 @@ src_install() {
 	dodoc CHANGES CREDITS README.md
 
 	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
+		fowners root:pcap /usr/sbin/tcpdump
 		fperms 4110 /usr/sbin/tcpdump
 	fi
 }
 
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
 pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
 }
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
deleted file mode 100644
index 3731233ad947..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
-	test? (
-		>=net-libs/libpcap-1.9.1
-		dev-lang/perl
-		app-arch/sharutils
-	)
-"
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 8352b63b1ccf..6f074f38fb23 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 user
+inherit autotools git-r3
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="
@@ -20,12 +20,20 @@ REQUIRED_USE="test? ( samba )"
 
 RDEPEND="
 	net-libs/libpcap
-	drop-root? ( sys-libs/libcap-ng )
+	drop-root? (
+		acct-group/pcap
+		acct-user/pcap
+		sys-libs/libcap-ng
+	)
 	smi? ( net-libs/libsmi )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	suid? (
+		acct-group/pcap
+		acct-user/pcap
+	)
 "
 BDEPEND="
 	drop-root? ( virtual/pkgconfig )
@@ -41,13 +49,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
 )
 
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -61,7 +62,7 @@ src_configure() {
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
+		$(usex drop-root "--with-user=pcap" "")
 }
 
 src_test() {
@@ -80,18 +81,11 @@ src_install() {
 	dodoc CHANGES CREDITS README.md
 
 	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
+		fowners root:pcap /usr/sbin/tcpdump
 		fperms 4110 /usr/sbin/tcpdump
 	fi
 }
 
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
 pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+	use suid && elog "To let normal users run tcpdump add them to the pcap group."
 }
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
deleted file mode 100644
index 7e74600accdf..000000000000
--- a/net-analyzer/tcpflow/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tcpflow-1.5.0_alpha-libcapng.patch 235 BLAKE2B dff01050c14223ecece11396e1e5b60b7a485dd5a46a1c44774442ab441ca10153bcb9bbe9dc9cf60b99b412c74e96ba32fd8b1af06d5babdfd8a60cd9442263 SHA512 0d2bd1ed7056033c94fa32deeac70e31ea35309e38e54c66f5092547559cf4c037bf2f4302deee3474839681eeba24cc4ac1068597c0ee28d48d2a10c2eea063
-AUX tcpflow-1.5.2-gentoo.patch 1344 BLAKE2B 2b795f920d9605f53f81b03dd125dc52c6cf0ad8471c630b0f9d17a65bfbe01d5736f4528f0592f154e54e2e06d2c01d0939501f4474568cc41054e9ae1068a3 SHA512 b7bab2ebb03e7d0ce400880eb27963a02e7f2d47f2df624dba71ec67e0aeace04eae0d8ac21e029e9353c69c1d003fc4b4edcc5fcbe9972244422925433fead6
-DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
-DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
-DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9
-EBUILD tcpflow-1.5.2-r1.ebuild 1568 BLAKE2B 30369bf01dd72a0b231152be69678a2fe5d55101bdee0cb7db6449f622354386dc8a194a205f113281563293b05c930e14fd401e650dceab0e04b1f4c0c28be7 SHA512 d240db703d05ba81626161868315dc11cd599aec886236c54bafbbd67cc45127df65239a13b50d7c7551d7aefff4935c95eeeea33a92ed9add566618691f534d
-MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
deleted file mode 100644
index b56144324c09..000000000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/tcpflow.cpp
-+++ b/src/tcpflow.cpp
-@@ -30,6 +30,10 @@
- #include <grp.h>
- #endif
- 
-+#ifdef HAVE_CAP_NG_H
-+#include <cap-ng.h>
-+#endif
-+
- /* bring in inet_ntop if it is not present */
- #define ETH_ALEN 6
- #ifndef HAVE_INET_NTOP
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
deleted file mode 100644
index de0864004a0c..000000000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,6 @@
- AC_PROG_INSTALL
- 
- m4_include([m4/slg_searchdirs.m4])
--m4_include([m4/slg_gcc_all_warnings.m4])
- 
- 
- # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so.  Don't
-@@ -402,7 +402,12 @@
-	AC_CHECK_HEADERS(cap-ng.h)
- fi
- 
--
-+################################################################
-+# http-parser
-+ 
-+AC_CHECK_LIB(http_parser,http_parser_init,,
-+  AC_MSG_ERROR([http-parser library not installed]))
-+AC_CHECK_HEADERS(http_parser.h)
- 
- ################################################################
- # Specify our other headers
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,20 +90,12 @@
- 	scan_netviz.cpp \
- 	pcap_writer.h \
- 	iptree.h \
--	http-parser/http_parser.c \
--	http-parser/http_parser.h \
- 	mime_map.cpp \
- 	mime_map.h 
- 
- EXTRA_DIST =\
- 	inet_ntop.c \
- 	inet_ntop.h \
--	http-parser/AUTHORS \
--	http-parser/CONTRIBUTIONS \
--	http-parser/LICENSE-MIT \
--	http-parser/Makefile \
--	http-parser/README.md \
--	http-parser/http_parser.gyp \
- 	wifipcap/README.txt \
- 	wifipcap/TimeVal.cpp \
- 	wifipcap/TimeVal.h \
---- a/src/scan_http.cpp
-+++ b/src/scan_http.cpp
-@@ -11,7 +11,11 @@
- #include "tcpip.h"
- #include "tcpdemux.h"
- 
-+#ifdef HAVE_HTTP_PARSER_H
-+#include "http_parser.h"
-+#else
- #include "http-parser/http_parser.h"
-+#endif
- 
- #include "mime_map.h"
- 
diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml
deleted file mode 100644
index d0b78340e0f1..000000000000
--- a/net-analyzer/tcpflow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">simsong/tcpflow</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
deleted file mode 100644
index 1b29c9fe64b0..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow"
-SRC_URI="
-	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
-	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
-	https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
-	https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
-	https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-db/sqlite
-	dev-libs/boost:=
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/libcap-ng
-	sys-libs/zlib:=
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-S=${WORKDIR}/${PN}-${P/_/}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
-	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
-	mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -fpermissive
-	econf $(usex cairo --enable-cairo=true --enable-cairo=false)
-}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index db6ecc60d23e..ddb68b1bab3a 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,5 @@
 DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2
+DIST testssl-3.0.4.tar.gz 9223535 BLAKE2B 658947ca7afc2b080edeed724f8185a3292736df1c71bd0bffd5a6f7ecfef7c56a1589c29eff84f278b2b788e63a881139a62ac714684209ed0cb8425f9a749e SHA512 663dc71dcaa37fe969121980274489fc2cf91450122001e98b8e78e510b1e3741b801fd767f6fca2d0735a184ea919b1672b2ba154ef074b146b6d5d47adc277
 EBUILD testssl-3.0.2.ebuild 1509 BLAKE2B 3fe3638078171668db5e9820cd1b29062117c8f081e0d68f9830dc1e1970a17b546eeb491170420a359901abf7ea7d9b2255a9c483b2a564ebf315b2dec319bd SHA512 5e404a151afe689e1701cbf79ccd0c6e925f4848bb513ff9f5aab6f35dd99c287ba31321841693ad51b06e54122f0bb6d876f45cda4c8aa2480982f59983be14
+EBUILD testssl-3.0.4.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-3.0.4.ebuild b/net-analyzer/testssl/testssl-3.0.4.ebuild
new file mode 100644
index 000000000000..8a2472e4e275
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index b2af48b7036f..0ba3841269a2 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -16,6 +16,6 @@ DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b
 EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
 EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
 EBUILD vnstat-2.5.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
-EBUILD vnstat-2.6.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
+EBUILD vnstat-2.6.ebuild 1558 BLAKE2B 551564174e941fb9465a0b04fc1102a90a7602fd13ef0834c744da5ec558167eb1a7f3f742671b9739e2ad489cbca6ddc85372288af94e8736d42b5931cde866 SHA512 2cf654577d9f848b54cc4973662f03910310903f52047b81315108134dc9624b409ee2604300a8d3e03d11d3b1a959b888e1d624b58010d6276e4e785d453347
 EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
-MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
+MISC metadata.xml 699 BLAKE2B 8c76aff9b720d3601cd2e10e7dde191eda8874c32747b73c408e81e44cdb06608bd7558088bf5e507ec4c387cb70e8972f3776ccd528c21f5dfdea0d5b39933b SHA512 7d3c8203145fcd9c1b83987a36c30477e66de7406e984c3b48d3deaa9e0ea1d052b5d07d5405bd168c0f08c9331f4a9d182c49eeb82ff43871f608e17ab28c1a
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index dace7f2e8f57..8519b3380b92 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-<longdescription>
-  vnStat is a network traffic monitor for Linux that keeps a log of daily
-  network traffic for the selected interface(s). vnStat isn't a packet sniffer.
-  The traffic information is analyzed from the /proc filesystem. That way vnStat
-  can be used even without root permissions.
-</longdescription>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		vnStat is a network traffic monitor for Linux that keeps a log of daily
+		network traffic for the selected interface(s). vnStat isn't a packet sniffer.
+		The traffic information is analyzed from the /proc filesystem. That way vnStat
+		can be used even without root permissions.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
index 12983f11d965..50688b8280f3 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index fcfe7b6f3c0e..d8fdc2358800 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,4 +1,4 @@
 DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96
-EBUILD wapiti-3.0.3.ebuild 915 BLAKE2B 50dd4b4345d588be5a1c6f0472069722632eafb140977befa693b1d2a575ab1189c0a107529921d850102ae3c42fc2c8621f79643403b475293e338fb069fd04 SHA512 0c5d834ad8167d1e9163e5b76e25f67e46789d59b6879f9d77a46841628b435c80692d217c3a5e2359ef96da218ccc43bf6790233c23d14b1b9f0a3af649e63f
-EBUILD wapiti-9999.ebuild 975 BLAKE2B edef62f884693d1209a77d1cafe370d83976c57a914072cf9743dc4fbcca91d15b27a60c633088d848099e8f9b7ea4b33ad689b1b70b6abe3a06f3309bf35ed8 SHA512 aa9cd40e26339742caf593e4ef8fb48233f56646684bfd27f015231c2d5add6ef1311e61b1bfbb6b8953baca37375c3cf3c81f534244c26fca9474c6db021f7a
+EBUILD wapiti-3.0.3.ebuild 948 BLAKE2B 6fdc380d3c0bbc195037dc23380ba66ad165b5e2e9a0286bf018ab9a77f16e5981a8b98131fc1aafdd49082956300c61069cd3e9d095a369fe7cc6cf4832cee8 SHA512 9b04ec3d5d07de4326a4fdd36265af7fe9694166daa60c1207302a91d6311aa5cfbbb9df5cfafd7cbf15b418efa418c750dba13c265b41781660f7138638a18b
+EBUILD wapiti-9999.ebuild 1008 BLAKE2B 4b5f6a7f4a6730fc66e74948a6fb6b178c1269b30538a78fdbc852a9df39d60f1022c84b77d531cb18f060e44cfc33be26f7ac53649f19c221ac179ee5b90465 SHA512 923f14554a3efe767d3712d983b34b78c433cb62c9e9cc4157bde03a93d4de94478f521e01f9884ac11cc4908ec415a9e74b3b0126a561ad90c362f9e59529c9
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
index b74bc61781ce..4537e62437ab 100644
--- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml'
 
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index ef1480dd21ea..95af12c83a0c 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml'
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a76b2933fe8c..dbde11b7181a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,14 +1,6 @@
-AUX wireshark-2.4-androiddump.patch 1167 BLAKE2B dcbb99f89e25f83e28bf4d7e1379967ba98bac6b712d897e68329a85f2f19ec6ecbc0a87c59db39c619eba1e27227577b9efe2399add981a93ed589f5baade38 SHA512 b5553ff8f80309791741f7d7e82364ab754a905b062f3b477ee542ee59ce7bbe0a272c517188b0480769e170c73d2a37260222b7d517796f9b16a9b6dc0d17ef
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
-AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
-AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e
-AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442 SHA512 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
-DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad SHA512 c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
-DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece SHA512 1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
-EBUILD wireshark-3.2.6.ebuild 7045 BLAKE2B 2a0720dae27a7107ee5d4befc453381bbe823f5ca5a79ead2064922ed124901f03060b631b56d28f08b8ff62dffd6b83fb829aed035d4a856d733e93c6c98647 SHA512 f06a5f4253320cfd44cfdd55fa03cba0222fab6310ae7fdfafb475c95e9c879e1c889370f5a67a757c73a3f71e68b67f4f1493044adfc6d810256b1ee5a9c2cc
-EBUILD wireshark-3.2.7.ebuild 7049 BLAKE2B 27333a50c3ddc495611adc472e28b161378a41f544a571c256f99bbefda4e36ecd3a71ca75d848674b94ef820786e3c136b5ac279e5e42fa5e0fe7c65f6fcafc SHA512 19cc1d7536fd75a1ee67e4d035c22afe0e73e85ccc4b8658eba07b2a5166a08dfa933ef9dd4d287837264bdcb22ecfa4030a39322ed646ed983118836eed9296
-EBUILD wireshark-3.3.0.ebuild 6958 BLAKE2B 7cc52200981228568376a3ffdab962a7d610ead91dfa67237fcf313f5fe8a564acf8d578f82c9815dded47795ca1b43f082938896b04a3f6e41d95bfcd20bac3 SHA512 50af2109a63fb3672afa55906a9d7aa7dfe0c5a7cee6fc4b06b4e9d429af664949e258bd3478aeb46ad1f2decece5b9dfbd3487183d39a3d21c106ecbe4bc8ea
-EBUILD wireshark-99999999.ebuild 6883 BLAKE2B 93a85e82b44a92298cde281cdcaa4e1ebfc26a832b922850fdce3438409cbf8a2e2b68ba3b3bf74c2975dce89a8948cc24571df551889f4b54fc81484a5fb127 SHA512 013ceac4f3c654df13a0b3bc2b03a99488b68bc0901ece57c6a2684c753577abcec1b82bc657cc9f4da13020e07b53fbe4748cf9fc9a9edb5566c929c3229e94
-MISC metadata.xml 5040 BLAKE2B f90a667752c84ec9f7098916a62d280caa2abde9c02eb751e9564ace0e4832f58a277d0a379fc549145488442463e7885d89c235ed707f09e167afe98fb0a380 SHA512 67a13228dcbecbeff78cabdf8de7f6b6dd0836321f5d17e09f65866d8258688dea033cdbccd8447c8f857637da55228c5c74ac9311543b74f574510aa0d6935c
+DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
+EBUILD wireshark-3.4.0.ebuild 6897 BLAKE2B 40060ac8da3fe5d0bb0a324f44c41816018b45f659caa329e1e391b69f055cedb9b02d8cb1f1201c9b5738d3e09688b8fae2a9c51f83432896007880964e8e9d SHA512 b0cb8dfa42527a9a6f69d36b23514d7f374d08c090fdee37f57fbf55ab39518df309160561da64a661a6f2e9ca6f3953f46d42a79b491f3c59c94ce8a25e109e
+EBUILD wireshark-99999999.ebuild 6787 BLAKE2B 37a68da765e48fa4fd7105bb4c57ca7e88549a4044d92e45aa0c9fefff95f0e2efbc018edb9797cbd52074cd4b92d1eaea9963dfe2262eda2b2d712b99d4fde7 SHA512 49cb20297b5321cfb427783fec1d202c5ea236e772a3ebc5154e0919702f29867478d861d4f835005925979e45e7bfe250700a15bdc4489109df076265464624
+MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
deleted file mode 100644
index 2272ef891c27..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/extcap/androiddump.c
-+++ b/extcap/androiddump.c
-@@ -438,13 +438,13 @@
-     pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO);
-     extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
-     if (!extcap_dumper.dumper.pcap) {
--        g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
-+        g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap));
-         pcap_close(pcap);
-         exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
-     }
-     extcap_dumper.encap = encap;
-     if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--        g_warning("Write to %s failed: %s", g_strerror(errno));
-+        g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
-     }
- #else
-     wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
-@@ -480,7 +480,7 @@
- 
-     pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer);
-     if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--        g_warning("Write to %s failed: %s", g_strerror(errno));
-+        g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
-     }
- #else
-     int                 err = 0;
diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
deleted file mode 100644
index 40082c435010..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2314,6 +2314,7 @@
- 
- if(BUILD_tfshark)
- 	set(tfshark_LIBS
-+		m
- 		ui
- 		wiretap
- 		epan
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
deleted file mode 100644
index 3d3a2a9c9323..000000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/extcap/CMakeLists.txt
-+++ b/extcap/CMakeLists.txt
-@@ -91,6 +91,8 @@ if(BUILD_androiddump)
- 		if(HAVE_LIBPCAP)
- 			set(androiddump_LIBS
- 				ui
-+				wiretap
-+				wsutil
- 				${GLIB2_LIBRARIES}
- 				${WIN_WS2_32_LIBRARY}
- 				$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
-@@ -102,6 +104,7 @@ if(BUILD_androiddump)
- 		set(androiddump_LIBS
- 			ui
- 			wiretap
-+			wsutil
- 			${GLIB2_LIBRARIES}
- 			${ZLIB_LIBRARIES}
- 			${CMAKE_DL_LIBS}
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
deleted file mode 100644
index 8cff4bdd0752..000000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1058,7 +1058,6 @@
- 		Qt5LinguistTools
- 		Qt5Multimedia
- 		Qt5PrintSupport
--		Qt5Svg
- 		Qt5Widgets
- 	)
- 	if(APPLE)
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 940a96ed59a5..715f6af2e195 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,65 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription>
-Wireshark is the world's foremost network protocol analyzer, and is the de
-facto (and often de jure) standard across many industries and educational
-institutions. Wireshark has a rich feature set which includes 1) deep
-inspection of hundreds of protocols, with more being added all the time, 2)
-live capture and offline analysis, 3) standard three-pane packet browser, 4)
-captured network data can be browsed via a GUI, or via the TTY-mode TShark
-utility, 5) the most powerful display filters in the industry, 6) rich VoIP
-analysis, 7) read/write many different capture file formats: tcpdump (libpcap),
-Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network
-General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®,
-Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer,
-Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime,
-WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files
-compressed with gzip can be decompressed on the fly, 9) live data can be read
-from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame
-Relay, FDDI, and others, 10) decryption support for many protocols, including
-IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules
-can be applied to the packet list for quick, intuitive analysis, 12) output can
-be exported to XML, PostScript®, CSV, or plain text.
-</longdescription>
-<use>
-<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
-<flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag>
-<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag>
-<flag name="capinfos">Install capinfos, to print information about capture files</flag>
-<flag name="captype">Install captype, to print the file types of capture files</flag>
-<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
-<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
-<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
-<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
-<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
-<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
-<flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag>
-<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
-<flag name="lto">Enable link time optimization</flag>
-<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
-<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
-<flag name="minizip">Build with zip file compression support</flag>
-<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-<flag name="plugin-ifdemo">Install plugin interface demo</flag>
-<flag name="plugins">Install plugins</flag>
-<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
-<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
-<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
-<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
-<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag>
-<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
-<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
-<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
-<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
-<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
-<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
-<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
-</use>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		Wireshark is the world's foremost network protocol analyzer, and is the de
+		facto (and often de jure) standard across many industries and educational
+		institutions. Wireshark has a rich feature set which includes 1) deep
+		inspection of hundreds of protocols, with more being added all the time, 2)
+		live capture and offline analysis, 3) standard three-pane packet browser, 4)
+		captured network data can be browsed via a GUI, or via the TTY-mode TShark
+		utility, 5) the most powerful display filters in the industry, 6) rich VoIP
+		analysis, 7) read/write many different capture file formats: tcpdump (libpcap),
+		Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network
+		General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®,
+		Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer,
+		Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime,
+		WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files
+		compressed with gzip can be decompressed on the fly, 9) live data can be read
+		from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame
+		Relay, FDDI, and others, 10) decryption support for many protocols, including
+		IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules
+		can be applied to the packet list for quick, intuitive analysis, 12) output can
+		be exported to XML, PostScript®, CSV, or plain text.
+	</longdescription>
+	<use>
+		<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+		<flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag>
+		<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag>
+		<flag name="capinfos">Install capinfos, to print information about capture files</flag>
+		<flag name="captype">Install captype, to print the file types of capture files</flag>
+		<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
+		<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
+		<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
+		<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
+		<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+		<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
+		<flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
+		<flag name="lto">Enable link time optimization</flag>
+		<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
+		<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
+		<flag name="minizip">Build with zip file compression support</flag>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+		<flag name="plugin-ifdemo">Install plugin interface demo</flag>
+		<flag name="plugins">Install plugins</flag>
+		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+		<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
+		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+		<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag>
+		<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
+		<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+		<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
+		<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+		<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
+		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
+		<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
deleted file mode 100644
index 275d063e26e3..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5
-	dev-libs/libgcrypt:0
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${D}"/usr/share/appdata ]]; then
-		rm -r "${D}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
deleted file mode 100644
index 5b16741cb38c..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5
-	dev-libs/libgcrypt:0
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${D}"/usr/share/appdata ]]; then
-		rm -r "${D}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index d2607c117e43..21e823418e48 100644
--- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -11,17 +13,18 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
+	acct-group/pcap
 	>=dev-libs/glib-2.32:2
 	>=net-dns/c-ares-1.5
 	dev-libs/libgcrypt:0
@@ -38,6 +41,7 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -94,10 +98,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
 )
 
-pkg_setup() {
-	enewgroup wireshark
-}
-
 src_configure() {
 	local mycmakeargs
 
@@ -148,7 +148,6 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
@@ -163,6 +162,7 @@ src_configure() {
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
 		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
@@ -239,17 +239,16 @@ pkg_postinst() {
 	xdg_mimeinfo_database_update
 
 	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
 	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi
 
 	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "add yourself to the pcap group. This security measure ensures"
 	ewarn "that only trusted users are allowed to sniff your traffic."
 }
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 580fa7c54d0b..bb74c3376075 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake
+inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
+EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
@@ -19,9 +19,11 @@ IUSE="
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
+RESTRICT="!test? ( test )"
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
+	acct-group/pcap
 	>=dev-libs/glib-2.32:2
 	>=net-dns/c-ares-1.5
 	dev-libs/libgcrypt:0
@@ -93,10 +95,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
 )
 
-pkg_setup() {
-	enewgroup wireshark
-}
-
 src_configure() {
 	local mycmakeargs
 
@@ -147,7 +145,6 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
@@ -238,17 +235,16 @@ pkg_postinst() {
 	xdg_mimeinfo_database_update
 
 	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
 	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi
 
 	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "add yourself to the pcap group. This security measure ensures"
 	ewarn "that only trusted users are allowed to sniff your traffic."
 }
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 67ccd04dc463..6286e812ee48 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,13 +14,15 @@ AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b70639
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.23.tar.gz 17398767 BLAKE2B e1a2dba3c5d0eff6e5b277beb3b0fcfc931883f4ccd9ab458dde4115f997c37ae813804d890f586c560191523b8ed5b2fde72c71910436ab33ea953373316641 SHA512 7d78bf21cc9df6a924543b4ce0ba1ea5e5de4b169fd2333cafbac7eb8a757d2db32dcbbc8783ed0c95dfdddb7dadd6109352f2544d3c92f6f410d2116bf72ca2
-DIST zabbix-4.0.24.tar.gz 17404177 BLAKE2B 3c2e9d6f69ad32c5fbee4d4f57661dffa9afafd98056f199658e05ff6c241149c5f23bb3a71a8524e3d83b33a6635b78713e8ec7a77457ae62550f9580715969 SHA512 ec4d4bbfc3ce1ea10a4e6cf96c10e4495ce2ea154dc297544ae107d4cb7451e3fc76e25d7822f40a809a87a268c54abb8a9d49869942f2009c0a7f92ff6abaf3
-DIST zabbix-5.0.2.tar.gz 18823956 BLAKE2B 170b64a15ac8dfbf16264e4973b16130f8066a7b08e579265ae17132d9b78f43bcc8840606c0413a4db199e237ba92989556cbd12f76e595f2999cfe9ff041a0 SHA512 81cf26d67e4e4df388dd6505db6f7451cf2f05aa6ac7b5d043c32eec89053cf133075bbb289cfb5b15f48a3eb94f6462427047777035ab09cc1dfeefba926dd6
-DIST zabbix-5.0.3.tar.gz 18893485 BLAKE2B fd0225b86337a80f92a32647027e2265394ba766b304e305813b9edcfd2cc979dc4b6b4072dcd043e3b043b5f64a3fb28d36dd0dde18d216d877534ca2725d85 SHA512 d08a031b334f531320f6b695af3ed7e3514c802ea28e0cec75040c518409e16ab4c591b389091aa12c07129f9b758d050c958967e3e86e725f4595f3b3a90d97
+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-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.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.23.ebuild 9231 BLAKE2B d51de21f9a13f9b4812eef4c3e052f4d807efeb2dfa0ad36cdcbb964e4295fd5cf6642a5f8d578fd9c84f3e43c15ea7a1e7121071cf0bdb2429327c3f627372b SHA512 f35b6ede0825eac946723baf4e5fd75a86d336c2e6df154225c549c8c3097b9c0098c10cee55ebbb39c6cee32d70891d7f131d9fb4525c36fa6e3dfce911fc12
-EBUILD zabbix-4.0.24.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
-EBUILD zabbix-5.0.2.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
-EBUILD zabbix-5.0.3.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
+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
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.23.ebuild b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
index 065c01ba723d..065c01ba723d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.23.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
diff --git a/net-analyzer/zabbix/zabbix-4.0.24.ebuild b/net-analyzer/zabbix/zabbix-4.0.26.ebuild
index 844a2e68741e..844a2e68741e 100644
--- a/net-analyzer/zabbix/zabbix-4.0.24.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.26.ebuild
diff --git a/net-analyzer/zabbix/zabbix-5.0.2.ebuild b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
index c105a7d5d7ea..c105a7d5d7ea 100644
--- a/net-analyzer/zabbix/zabbix-5.0.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
diff --git a/net-analyzer/zabbix/zabbix-5.0.3.ebuild b/net-analyzer/zabbix/zabbix-5.0.5.ebuild
index e393d4a24eba..e393d4a24eba 100644
--- a/net-analyzer/zabbix/zabbix-5.0.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.5.ebuild
diff --git a/net-analyzer/zabbix/zabbix-5.2.1.ebuild b/net-analyzer/zabbix/zabbix-5.2.1.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.2.1.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"
+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/zmap/Manifest b/net-analyzer/zmap/Manifest
index 48dd16b3ca95..be09dd4d71ae 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r1.ebuild 973 BLAKE2B add50cd653eb43697d66db3c3957fa41a2c5decd97da8db98c9e7d6c70ef73fb3f983bb14d52450a085e8282f05b45a4b59db6c39e551975e1e404ab07b231db SHA512 43f95ca9088ebfc686a4c4951a51991af43321ba9085a96111d954bdcb3867a3ca49c57bb8ff8e516d2788e93e197fb5f19a448d116790ba73d8cd5948270f99
-EBUILD zmap-9999.ebuild 732 BLAKE2B d5d0719da6d299fe4dc99f95ea8259fc14210bfd0026c2965fb1081072005623cdb6c6b91c80c753923bf51b2f877fc1fa5345128d85e6fee7a72538fc356953 SHA512 e0c4b11ed47483c28e2f9fca033be8e0c25d3c172b7d4229d2b0b14a0e5250b8a68de7d6d2b7470eacaf4b3bb399d13c45c417bedb583ac4fc2b5d80e83d21dd
-MISC metadata.xml 1298 BLAKE2B 3dfab71d1b2bada9a1e04c6097f4cf245299142b429fab93809d2e45446e22a04a339cb5a188861d7b3b29a540638debca59fccabea96faa22fd9dd19afbf69d SHA512 44560e99499065e9e95eba68340ebe67b3e6dcacb11c7b392568be24af12134634a453ccd9f54c77116f473c9a64e587d862ec317c48871eed644585ee7f8193
+EBUILD zmap-2.1.1-r2.ebuild 943 BLAKE2B 32d8e39e880cf29f411d527b5830963939b95a2e6a019e1290b7bfdfbe83da6d0431e3cb8bf06d289234cbaf6910138c547228a44465eb3ee3b4de1265e05e15 SHA512 e050474a7764ba68f916cd3492fcfc75176bae9cf398d707f4000da43efe2468d5a72634c3ecc210d3c407ed9dd3408236a1728da520771817b149a70ae12ad9
+EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
+MISC metadata.xml 1229 BLAKE2B a7adf10c6b6ee12c6bdca30375582ccba8541bd70321fc055682d12343149d7ac4162cdcde4abab160b760eb04a644045fac14c878fc2219db497055234ec3d2 SHA512 b457bdfbba7318412aac2d759bf616f2417c0946bd534cc0b5066ffc226e586f277ffa6c317e13504766c35d881ad77797321b377e4350a7a4f5dd22624cfc1b
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index fc168991253e..2204ae3c97cf 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -21,7 +21,6 @@ availability, and help us better understand large systems distributed
 across the Internet.
   </longdescription>
   <use>
-    <flag name="json">Add support to store results JSON based</flag>
     <flag name="mongo">
       Add support for storing in a mongo DB via <pkg>dev-db/mongodb</pkg>
     </flag>
diff --git a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
index dac6ede5634e..be82641d5c7a 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils fcaps
+inherit cmake fcaps
 
 DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
 HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="json mongo redis"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="mongo redis"
 
-RDEPEND="
-	dev-libs/gmp:0
+RDEPEND="dev-libs/gmp:0
 	net-libs/libpcap
 	dev-libs/json-c:=
 	mongo? ( dev-db/mongodb )
@@ -29,7 +28,7 @@ src_prepare() {
 	sed \
 		-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
 		-i src/CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -39,7 +38,7 @@ src_configure() {
 		-DWITH_MONGO="$(usex mongo)"
 		-DWITH_REDIS="$(usex redis)"
 		)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 04e4602032d2..4d5b862277d5 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils fcaps git-r3
+inherit cmake fcaps git-r3
 
 DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
 HOMEPAGE="https://zmap.io/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/zmap/zmap.git"
 
-SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS=""
+SLOT="0"
 IUSE="redis"
 
 RDEPEND="
@@ -32,7 +30,7 @@ src_configure() {
 		-DWITH_WERROR=OFF
 		-DWITH_REDIS="$(usex redis)"
 		)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /net-analyzer
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)