gentoo resync : 03.03.2021

63 files changed, 736 insertions, 938 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 334ad40b6cc4..3f17d0a8aa3b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index 9d6db63995b3..a4107c97b33c 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,6 +1,6 @@
 DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
 EBUILD arp-scan-1.9.6.ebuild 466 BLAKE2B df0472c3ab4b460912fdf6c2cdee09db76a33c10c550d701f3a598abd5508508a26b2204bf099a1a820fa7c32068576b00525d4c65957279a51d54ac7b22fd90 SHA512 69c822f1d85edca29c4c4943978ad85f55940f8545c69027b24bc8d19ed65199bbcd0849aedb66b20aa7136d71f5faab1f96380dcd8219849a9559d77f70a1e5
-EBUILD arp-scan-1.9.7.ebuild 473 BLAKE2B f2043577c08b654761063da4b68ea6a16f5dfe396a3122b291f256bbed38b5027213962df60d0969027b705486fbfc67e50ddb4633c4d8c8dbc3b28e104bdbec SHA512 997625149bad504c75b1972a389930a6546e90b78449bdda6710dbe39b669829ca41918e9c2d33d78c7f79112f6f1c793dc1f1e0b8f5d1d2f7805b6b7299f9fe
+EBUILD arp-scan-1.9.7.ebuild 472 BLAKE2B 9e1d1d684de88508e55728e88bbe1983baca6b270553657766df91e6a33ee3d833fb3f3c371d9f706105f207e4412eb7ab9a9c87a1db78cf8d480198ea861625 SHA512 71dff6ec3626642fc15632a2f1e76f50eeb4d0e3ef2503ceb541dcfe4455001040fd601ba3d87240894aac982037a9e27a1e8a4c2de6045e521504ef92faa194
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
index 106b62cd7022..2278aa10e0d5 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 522a52f84536..2e384a8be63c 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -4,6 +4,6 @@ DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ff
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 EBUILD arping-2.17.ebuild 708 BLAKE2B 3f42edd2ff6cbcba37db121428174f06a7a88c0d7217918509b962b2f5da6f9db020102989bbdd4fb28c9a5077dd77e58bc5d4995712b7c71d37add6064ef122 SHA512 dbc00430158b3633e3b35fd2d72e17f27a1ec42c8e306a8d40e149cca5b909db5792d3f21fad1b7463803c4831b405a27a871c6db45f4df76157ea5408d1bcc3
 EBUILD arping-2.20.ebuild 796 BLAKE2B d4637d26d201b66e4dd1a2c60efb22e5b60f239d6c538df33959d04d9ef69b3b6bc3c877ea731bc92544485b99abab067e20504af60820256740c41f9a00ba64 SHA512 dcbc382a2b8e77aeea9e945b3d1f3ec31c19c6b045d1c537f2e725ab9a89bbf73d9fd1194aecefc354956cafbd852b37b27968a427b381af5680e22f3d29e967
-EBUILD arping-2.21.ebuild 878 BLAKE2B 18cfbd810ea9353310446675dbcd7f9c6cff764d1b376d5d911a5635383e72dc2c8ba00f2629974009d383b4517646c9f7fd22f29c36d3b265e565bbe86a3616 SHA512 a578fab585477a3f2b06ff521599060cd31a7b120be711682593481370d417e8bc02da07f618a29be23a1c390fde662afabfd3209cce809656364abd3326fd82
+EBUILD arping-2.21.ebuild 877 BLAKE2B dca720710a5be07f195297793cb9c5efe3bfebcd11cc826a7faf27a7f81b6b270f4b199b25b63cd94715d357e9dd8ff46ef3544eaddb1a3e6974d9f1607ef963 SHA512 da894a394ce2b00404804f740f1bfcbab3136575a83dbedc3fc05e91fd0a9566282878d718f7894b13fa8aa389684f3b75bd77ba6e09b82f7fe62274c556cd9c
 EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index b74780e5673e..1572d488bb94 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index fa5ce881534a..948256b649ff 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -4,6 +4,6 @@ DIST cacti-spine-1.2.14.tar.gz 107577 BLAKE2B 5865d93ffefeeafac1d2245000467deac7
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
 EBUILD cacti-spine-1.2.13.ebuild 894 BLAKE2B d87521d5b3d0604e61f08853356c86578647cfec8b59ef347eed64920a9d0aba57bbda986b24afd4ec8a0442a81827b143f9d3dbd2387cbd2fcf31e0fbacce8e SHA512 a7d0cd71b0a3cfa669c240df7bdffa91069e2d84b5185c20aef4b41da7640f4d82e38633fb4c26035eb8343878008e95c3f3231e060b02d8de4313a0d0a5e329
 EBUILD cacti-spine-1.2.14.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
-EBUILD cacti-spine-1.2.16.ebuild 880 BLAKE2B 7f5fe69bfcc1a64e3c3d75625c4d0b0f770b77a892eb76a5854f3f6a3bc15a50e326f3b0e81e61ea819fb57f47cf5016a18222e86fbd12d72027d7670634ada7 SHA512 bfa8fc7aa9ca6f25996276fe410a3509574e5d69ce674c5b19372d097470b093d3518dc79fa6015298320486c1cf6242e813685460a4a5efef4a73a76325a0d9
+EBUILD cacti-spine-1.2.16.ebuild 879 BLAKE2B c40f69d0353777ceb2e43a1196e9b7263e88187ce80fd0828f1b91119383f1ee9352cc5a8ea99e140572c206dbe2961a61669bdd44f2887d628289f749b5d1d7 SHA512 78c3c7510157708223e1b24b8d2209883fa457ac49d626930c9daeeaf28dc45957b0e95dded4fd55b64a9b7f27b66b0daa898466b490fd85351e15267243a87b
 EBUILD cacti-spine-99999.ebuild 830 BLAKE2B df76efd7eaf22a36b96c6b834089f5e6916b4ac95d34b07e3db6a93d84bac90124c94d67586078283f6a3e6fc817501e34083b426982f0694fa7a7179cb269a6 SHA512 903233605ded071a0eebb0e17b25bd0cd61b20b54c0d85a2fc230058e64e908e4b8eac3ac7f566f7d1f4d0c68cb2be0c6f38de7bdf344c9e6e3df81b2af10ee4
 MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
index 4b56a685b01c..8bce1cc74d0e 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="libressl"
 
 BDEPEND="sys-apps/help2man"
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
deleted file mode 100644
index f16af274e8ce..000000000000
--- a/net-analyzer/jffnms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jffnms-0.9.4.tgz 610758 BLAKE2B 2bbe122bae3d358e710895ebd1c38f28644260744d97f5ab88301dc5549c099c9af0931156d47ce0e616c0f6f84b04f2e7ae04f4d0efc8cc3ff72b01dc51e22c SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7
-EBUILD jffnms-0.9.4-r1.ebuild 1350 BLAKE2B 6116589cf87bdfd067741f1a6640d72c7a39667b7c1d7d0ee179123f8b682b8bf3baa3560b034a8d467c26fdd1f3ca5ccd5c7ba9c025a7644298f774c4cb97fa SHA512 50b8849c8ab6d1ccd54047b00931c46fda9a29b08dd10da6af076b623837316620759c100342e79ed81b97c9769cad51453ae27ac504dffaad907b65dfb3a970
-MISC metadata.xml 356 BLAKE2B 999eb20df883348a87beb333f9c07db6e79f20b0166d6ede78059a82d4978be56af98a3504129cd998d95e3902c4931513e3317c373ba61ddf78e7a2734597e0 SHA512 d9902d5255db25672152c02e26494f9c42137714feb9318a8eaf517c6a62255d036a3c2b1b308a3c32882b7648f33a38a7af344c2e3ec4b2f402fe26870435f1
diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
deleted file mode 100644
index c0957c2f5e85..000000000000
--- a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user
-
-DESCRIPTION="Network Management and Monitoring System"
-HOMEPAGE="http://www.jffnms.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres snmp"
-
-RDEPEND="
-	dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx]
-	dev-php/PEAR-PEAR
-	media-gfx/graphviz
-	media-libs/gd
-	net-analyzer/fping
-	net-analyzer/net-snmp
-	net-analyzer/nmap
-	net-analyzer/rrdtool[graph]
-	sys-apps/diffutils
-"
-
-pkg_setup() {
-	enewgroup jffnms
-	enewuser jffnms -1 /bin/bash -1 jffnms,apache
-}
-
-src_install() {
-	local INSTALL_DIR="/opt/${PN}"
-	local IMAGE_DIR="${D}${INSTALL_DIR}"
-
-	insinto "${INSTALL_DIR}"
-	doins -r *
-
-	rm -f "${IMAGE_DIR}/LICENSE"
-
-	# Clean up Windows related stuff
-	rm -f "${IMAGE_DIR}"/*.win32.txt
-	rm -rf "${IMAGE_DIR}"/docs/windows
-	rm -rf "${IMAGE_DIR}"/engine/windows
-
-	fowners -R jffnms:apache "${INSTALL_DIR}"
-	fperms -R ug+rw "${INSTALL_DIR}"
-}
-
-pkg_postinst() {
-	elog "${PN} has been partialy installed on your system. However you"
-	elog "still need proceed with final installation and configuration."
-	elog "You can visit https://wiki.gentoo.org/wiki/Jffnms in order"
-	elog "to get detailed information on how to get jffnms up and running."
-}
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
deleted file mode 100644
index a7910963dea7..000000000000
--- a/net-analyzer/jffnms/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="sourceforge">jffnms</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
index 6fcac31b5daf..8765f711ed28 100644
--- a/net-analyzer/mbrowse/Manifest
+++ b/net-analyzer/mbrowse/Manifest
@@ -1,5 +1,5 @@
 AUX mbrowse-0.4.3-flags.patch 344 BLAKE2B 84e36e46bf28cbda61458c9b43df300c691b9e175035175bc751799ac6feca151ab3aa5deae15b1809c1a96da6442093aafac6ee5dccb928cbf7e04ec98949c9 SHA512 46b27bc97436a714f6c36a3690c1c935c76d74ba32bbaa4904a6522654ec61981df58ed48c6255357404a3af904c322fea01658abb1bddec61cf6071dbdc74d5
 AUX mbrowse-0.4.3-fno-common.patch 611 BLAKE2B 6c01824e75927a0d49c831cb6e2e668a25c2da539ec6ed7b9e1dd14acfc9e82ec2297e8bdb5b4baaa2ded7276022f55dbbca471fdec15ed920ccf5c8bd5d153a SHA512 2d6ef84299eeea297926f4366863ae53b1ccca89b4fca8b7d3fefe6a7113000360e5a44be65356d4028f0501ad2fcc4699974b0d65f6d56979d31aa93ee24f2c
 DIST mbrowse-0.4.3.tar.gz 146028 BLAKE2B 32b33dc4ec10a7b7ece07c47280b703c871e83a41f3cd8d60f7a177925da9c269020d927b193e8550fe15356c55bb4faa47c195354bb7784553601fc39ef00b7 SHA512 adccf8de707611034db0cbb6a37117f6a4741eb92656eab0e9e5c6a8268b17cc66080ed9663fe59a3fea9b110d83bcff9094b5fec133ca7ceb2650fd532a6cb4
-EBUILD mbrowse-0.4.3-r1.ebuild 700 BLAKE2B 52b224020d704eef88765b076655ccd48e2c044f8234683ec1032298d04ab42fe2ba559d851c5a76e71a39ab4912d75bddd1de40592d26ad2713154b4c2363ca SHA512 b305d49ddfe45471f806a8c17b5cc55eba8a58396467c67caef998ea90ebef2c25595185d6a46da2e836af2da0b6119001a05edc9dfadcd9f842ef7cd77c7dc9
+EBUILD mbrowse-0.4.3-r1.ebuild 698 BLAKE2B 3590a319423b8095add590b865473b9fa5f735baf6998c44756b0c45757547c52c4ffcecc17db5dc10be4783d5ecd21b2529ba45e9a6e88e2b524d959525da4a SHA512 3e36770cea0c536a00a27f6f48203608ae277834730d84567d146d67489ad4fd89abc546fe98edda4da85b111bda333d9ed940a15d8033e168e4cee29d788f55
 MISC metadata.xml 357 BLAKE2B 725053ef04034d1a1c6272ed485156e4e2a933ef149a5df00d6a6b8b03bd48d6a1b49564c25d7d91ab78673d49e23f8587b7af091ffe20848b21a0bc157b2ac5 SHA512 5199c9147351e6dc733c1b8f2edaf598d9ae32d0a72de149a2b1550a4aaa1081d80ee5ae175fd9dc4de7e65d177055ee9dad006a81a268f8af6f8497e202261f
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
index e19a12d41812..4c72d7daca60 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="MBrowse is a graphical MIB browser"
@@ -21,6 +22,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.3-flags.patch
 	"${FILESDIR}"/${PN}-0.4.3-fno-common.patch
@@ -32,6 +34,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--with-snmp-lib="${EPREFIX}/usr/$(get_libdir)"
+	econf --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
index badd693e2579..4aa82e6ca020 100644
--- a/net-analyzer/multimon-ng/Manifest
+++ b/net-analyzer/multimon-ng/Manifest
@@ -1,4 +1,4 @@
-DIST multimon-ng-1.1.8.tar.gz 2430488 BLAKE2B 82bc0be58e2f7d596363fc916c11584cbd1335e7984194af22955587877ad1cba2a0cca819467061bb18b97ca70f5c2adfd73ccbf159fbc27348d59429959ada SHA512 9cf93362555e5dc465a9ec60dff27b9875879afd954e810069022b3c003eca4c3ab2a833f1c00fef877175bc72e2d378bbb53380ada54542ae29d257a7d2bd1b
-EBUILD multimon-ng-1.1.8.ebuild 814 BLAKE2B 7b9f0eb692b4686b7abccc6c8c47781dd0f85c52c1b7d834b884989215ebff48dac71278f539d1faf31de3133fd6e8229cdc17310af0a2ac6fb9b9eef02b5928 SHA512 620fc1aaf3cf4ff2bd0d52450d8937bbef45b1d8c0b17806a1e1f42378f6a07555a7eb0c10605691bb20a25434baec435bd8973273cf5c0e72052663903a028d
-EBUILD multimon-ng-9999.ebuild 814 BLAKE2B 7b9f0eb692b4686b7abccc6c8c47781dd0f85c52c1b7d834b884989215ebff48dac71278f539d1faf31de3133fd6e8229cdc17310af0a2ac6fb9b9eef02b5928 SHA512 620fc1aaf3cf4ff2bd0d52450d8937bbef45b1d8c0b17806a1e1f42378f6a07555a7eb0c10605691bb20a25434baec435bd8973273cf5c0e72052663903a028d
+DIST multimon-ng-1.1.9.tar.gz 2433964 BLAKE2B c2d72ba3b19ba162cb6fa9b8c1a66d950f3ed0acb36117ce070fbb9ede1837225b7349f473477020eea0ba727b6ea088688dbfaa50257702f337f1270ff5a233 SHA512 a30d8933b6cd0150a24a70544c03fa418bb5bdb00ab5531692f7153b59593455a915078a7417fb08c815b140f4c25786a9c412503dc50bead54f9dda304c053e
+EBUILD multimon-ng-1.1.9.ebuild 828 BLAKE2B 08c882f603e300ca39d17b6f3a684f4aebabb6aeedb60d2d28af480cac1bcfa12a3fc33af58677ada74a67c4e187aea9190b8f5bbbb5c253de9450692892ff15 SHA512 5a48dd1ac995e8db0a96c17717580d5cc06d3b481b17a30d7149c300b8c4477ce17dbf66d00ee3273c7fecc3c5a7b45804a436a093703f11ece38c049e770b12
+EBUILD multimon-ng-9999.ebuild 828 BLAKE2B 08c882f603e300ca39d17b6f3a684f4aebabb6aeedb60d2d28af480cac1bcfa12a3fc33af58677ada74a67c4e187aea9190b8f5bbbb5c253de9450692892ff15 SHA512 5a48dd1ac995e8db0a96c17717580d5cc06d3b481b17a30d7149c300b8c4477ce17dbf66d00ee3273c7fecc3c5a7b45804a436a093703f11ece38c049e770b12
 MISC metadata.xml 432 BLAKE2B 18d6a22e90f20d23e46aa7f0c0875dc156ba6d0b141b2ac98674b44d05166bc9f48a74f2d885723b5e7838fd2f710488aace8e7c9927a3bd14103101729ec111 SHA512 f61a6ec965782d81ba149cd16df61d7334a8775a2624ba38408e7ca9660df9d69e40817eecfd17db5b819a68e178648ed440e69278223665e51c98a7c2535230
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild
index 6e71ce63712d..f2011e9ff0d2 100644
--- a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
 HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
@@ -23,9 +23,10 @@ IUSE="pulseaudio X"
 DEPEND="pulseaudio? ( media-sound/pulseaudio )
 		X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox"
 
 src_prepare() {
 	use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
 	use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index 6e71ce63712d..f2011e9ff0d2 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
 HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
@@ -23,9 +23,10 @@ IUSE="pulseaudio X"
 DEPEND="pulseaudio? ( media-sound/pulseaudio )
 		X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox"
 
 src_prepare() {
 	use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
 	use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 41f46a69f9d6..2ffa3a20230c 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -13,14 +13,11 @@ AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa2
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
 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.64-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.64.tar.gz 2256519 BLAKE2B 6a48327672ab7cf20be7a47d489467d0b888e00c01ca0ce8b0bc47a03b63087cf61de4aaf8ae0f18d8e5ef95c49f85092d719ae7de6fe51bcb5e60d138caa519 SHA512 d5f8fb04a601b053844b04850416f09b9f682b83298e35b973ee495cc60477720dc0483f73809db5ca24ba6b9fa1520f026a3f187db01b0c946cce756e4e401f
-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
 DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
+DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
 EBUILD munin-2.0.59.ebuild 12267 BLAKE2B d4fb2b1f62a4c1a3d1d69fa61e841c17ad6716fa824df49352ad2e5c5ddc39a035c828830302cd6414750c72e2b52198a76efd936d2300dd76529dc2994054ce SHA512 c306d35fe98c0dd9668068fcad1830cf1c5fd45839187b0a91cde40f075a7a042a737e4cc53cdbb27da5049f52021a63cb925040f5b2e54f91155811f7413252
-EBUILD munin-2.0.64.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
-EBUILD munin-2.0.65.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
-EBUILD munin-2.0.66.ebuild 12270 BLAKE2B a74e5cf89c8d8b313470d50ae2f291752d9bce83cb0be6342b0284387cc1d4b6eb35434d381f7a699df0468f4dadfc7626604b5fbebd60ed2d8da6baa225574b SHA512 a415f74e29caa56bf07a85d0c7886963bfcced603a05664d86e9af5a24b123e3242d048ad9f3f88b4d760a2da7cdfaa0f0ccffc844b337f6ee2a96a8c5c02437
+EBUILD munin-2.0.66.ebuild 12267 BLAKE2B 05ee840753229d97e2b1d5914191950bece83b6575cffa2a7ee50de4dfc3a16f892d8f660288315faccc570166e58fd391795a90fa3aa24531a5fd13752636e1 SHA512 b5ad10e6752dce09b925e05d42db944b5a8f25820b9fbfbfd0272b053539f2b70655ffaf745395f920f5d601ab65d1c0efeb27a3dc353f60b3d8c617f5949b2b
+EBUILD munin-2.0.67.ebuild 12270 BLAKE2B a74e5cf89c8d8b313470d50ae2f291752d9bce83cb0be6342b0284387cc1d4b6eb35434d381f7a699df0468f4dadfc7626604b5fbebd60ed2d8da6baa225574b SHA512 a415f74e29caa56bf07a85d0c7886963bfcced603a05664d86e9af5a24b123e3242d048ad9f3f88b4d760a2da7cdfaa0f0ccffc844b337f6ee2a96a8c5c02437
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.65.ebuild b/net-analyzer/munin/munin-2.0.65.ebuild
deleted file mode 100644
index acaf9f6d9f0c..000000000000
--- a/net-analyzer/munin/munin-2.0.65.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.66.ebuild b/net-analyzer/munin/munin-2.0.66.ebuild
index d589b34da0d2..7a5621b5deb7 100644
--- a/net-analyzer/munin/munin-2.0.66.ebuild
+++ b/net-analyzer/munin/munin-2.0.66.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+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 )"
diff --git a/net-analyzer/munin/munin-2.0.64.ebuild b/net-analyzer/munin/munin-2.0.67.ebuild
index acaf9f6d9f0c..d589b34da0d2 100644
--- a/net-analyzer/munin/munin-2.0.64.ebuild
+++ b/net-analyzer/munin/munin-2.0.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 29fd97c60ad8..326d06dc1e0d 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,6 +2,6 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.6-r1.ebuild 8829 BLAKE2B 61377c315f2f70ed7a88237fd428e61c2486a06664606af6474d51bf3328cf721ebd18cc8874276cdf5324976c2c8f54ad5ecd31747e5c7724c31e58339abf5e SHA512 93f9e7379628d3a4791852e83d703d1728bf1afe0c13e14547e4f93738cf0573a83df99bd96187d876fcea1265c8ede836b1deaa3e0d91d7ecb013bba98d094a
+EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B b808540623055f3830a38ed79ffbe30fc8a24851624bd6bbd902df293683e6fac78291b6f59529eaab533ff041fe8d89ddd60c3be08d36210aebd823b2173098 SHA512 4733058532beef20606e4f8bf833ce6c4e0932ca69fdef01f25e45f1533004e720b5282045b32582543d52c020d043f59989a954afbea0697a1868951c766936
 EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index b345507323e7..90f596a5cc86 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs
 
 MY_P="${PN/-core}-${PV}"
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
@@ -108,6 +108,9 @@ src_configure() {
 		fi
 	fi
 
+	# We pass "unknown" as the init type because we don't want it to
+	# guess. Later on, we'll manually install both OpenRC and systemd
+	# services.
 	econf ${myconf} \
 		--prefix="${EPREFIX}/usr" \
 		--bindir="${EPREFIX}/usr/sbin" \
@@ -115,7 +118,8 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/nagios" \
 		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
 		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
+		--with-init-type="unknown"
 
 	# The paths in the web server configuration files need to match
 	# those passed to econf above.
@@ -198,7 +202,13 @@ src_install() {
 		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
 	fi
 
+	# The ./configure script for nagios detects the init system on the
+	# build host, which is wrong for all sorts of reasons. We've gone
+	# to great lengths above to avoid running "install-init" -- even
+	# indirectly -- and so now we must install whatever service files
+	# we need by hand.
 	newinitd startup/openrc-init nagios
+	systemd_newunit startup/default-service nagios.service
 
 	if use web ; then
 		if use apache2 ; then
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 1a0efb72f804..e119c460756d 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -6,6 +6,7 @@ AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636
 AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
+AUX net-snmp-5.9-r3-f2fs.patch 1594 BLAKE2B 41dbc49ec2b67831e1fa0965052e3eae88140512a2584e4bfac0ae52a1c575c59c48022c1c97838e7d05a3b849c6bb85810bf208e629a57cc78a982a3b6d6a67 SHA512 067fb5d58512852deffe53ce5fe2bdb905a13e4e2add3fd7f889b8e5806e2e29eb38ac04abed5fd099355b76dd3f9b6413f973ff04be5599189decf4f8d71cf1
 AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
@@ -16,5 +17,6 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
 EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 002d2abbfe7c999dd14df3f36d2068cb846498fa582116c5ae7656a494dd69fb208f0d52590e47aaa3ab96edc3635cc3942f6be3d2881ff62b7b28e28cdb3cc0 SHA512 f39979dabbb37cac0d6c318c3205ed8b6fafba80ef392a2f21ab31cdd931e708287b6f38f2220f6c105ece8073e6f0d11e2c585d6ca27a0edc089bbadd26dd2e
-EBUILD net-snmp-99999999.ebuild 5667 BLAKE2B 2a1d78c1425552a505acc9b0252f07cb69e43d0c682c72b49e13cb356d09fa7da1bec0988fe68731990592fc6b9daeb55457221af4a1997a01f626175ec2392d SHA512 5611a026169cedb8a5659817b9fc2464ec2081374d2c177990ada057aff6aecb3d2051084b24a319b0be4b53ce16c6608a96723211ec9aee116afe85097d6cb2
+EBUILD net-snmp-5.9-r3.ebuild 5702 BLAKE2B 5f85c9eb2eb0e2fec3bff02f7aa822ab9c2b5bdd12a4305ce582b3de383b7944b5b48ba2b3b1f8434870e4401eda360cd20da281e12ff6e9f7e83a0952decf39 SHA512 c28204e6bb8831cd2ac5bbe5718799251fb18d5d573a55aded2ab4c6682e7551b622e53fdbc93c1fdb9f30b2c276fc055b01167bfc2ebc0e3af1d2dbd31a9566
+EBUILD net-snmp-99999999.ebuild 5642 BLAKE2B c42d9d6d4fb53bccf863a4d6a7fe0882c3ae28365ac55e2de52e211d4aa7dcb0460e385fa5faff980dbee1bc0048f225828ec3409825c30ea1d69b37befb2d06 SHA512 816497802a2b8f07edc0307b0a31dfddac946c23bbd1861357306e2aa13aefab181d2f2250970299bcfb446b03db72b1d745d0d318103af294d230c3a1de2601
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
new file mode 100644
index 000000000000..c06c94ff7ace
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/729224
+https://github.com/net-snmp/net-snmp/commit/5a18e300bd085c6ba5967d7b00cc3f57fe83f665
+
+From 5a18e300bd085c6ba5967d7b00cc3f57fe83f665 Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Thu, 8 Oct 2020 20:12:44 -0700
+Subject: [PATCH] HOST-RESOURCES-MIB: Add support for f2fs
+
+See also https://github.com/net-snmp/net-snmp/issues/111 .
+---
+ agent/mibgroup/hardware/fsys/fsys_mntent.c | 1 +
+ agent/mibgroup/hardware/fsys/mnttypes.h    | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntent.c b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+index abdc63ed6..75e2782f7 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntent.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+@@ -146,6 +146,7 @@ _fsys_type( char *typename )
+               !strcmp(typename, MNTTYPE_CVFS) ||
+               !strcmp(typename, MNTTYPE_SIMFS) ||
+               !strcmp(typename, MNTTYPE_BTRFS) ||
++              !strcmp(typename, MNTTYPE_F2FS) ||
+               !strcmp(typename, MNTTYPE_ZFS) ||
+               !strcmp(typename, MNTTYPE_NVMFS) ||
+               !strcmp(typename, MNTTYPE_ACFS) ||
+diff --git a/agent/mibgroup/hardware/fsys/mnttypes.h b/agent/mibgroup/hardware/fsys/mnttypes.h
+index cda42420d..3540cf31b 100644
+--- a/agent/mibgroup/hardware/fsys/mnttypes.h
++++ b/agent/mibgroup/hardware/fsys/mnttypes.h
+@@ -154,6 +154,9 @@
+ #ifndef MNTTYPE_BTRFS
+ #define MNTTYPE_BTRFS     "btrfs"
+ #endif
++#ifndef MNTTYPE_F2FS
++#define MNTTYPE_F2FS      "f2fs"
++#endif
+ #ifndef MNTTYPE_ZFS
+ #define MNTTYPE_ZFS       "zfs"
+ #endif
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
new file mode 100644
index 000000000000..2ded43695310
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-5.9-r3-f2fs.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--disable-static \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index a24bf6edffd7..4a58da93c990 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -2,34 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_SINGLE_IMPL=yesplz
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PATCHSET=3
 PYTHON_COMPAT=( python3_{7,8,9} )
 WANT_AUTOMAKE=none
+
 inherit autotools distutils-r1 git-r3 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
+SRC_URI="https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz"
 
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-KEYWORDS=""
 IUSE="
 	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
 	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
 "
+
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	rpm? ( bzip2 zlib )
 "
 
+RESTRICT="test"
+
 COMMON_DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
@@ -41,7 +42,7 @@ COMMON_DEPEND="
 	perl? ( dev-lang/perl:= )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
 	)
@@ -56,10 +57,8 @@ COMMON_DEPEND="
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 "
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="
 	${COMMON_DEPEND}
 	perl? (
@@ -68,7 +67,7 @@ RDEPEND="
 	)
 	selinux? ( sec-policy/selinux-snmp )
 "
-RESTRICT=test
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
@@ -138,7 +137,7 @@ src_configure() {
 		--with-logfile="/var/log/net-snmpd.log" \
 		--with-mib-modules="${mibs}" \
 		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
+		--with-sys-contact="root@unknown" \
 		--with-sys-location="Unknown"
 }
 
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index c50d9dc1ecd1..31fbd2c45be4 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,10 @@
 DIST netdata-1.29.0.tar.gz 6233326 BLAKE2B b177fba4d6560b289e5a9fbedffe7f3eae53074fea30483a54a682370ab5427bb1002392ea44efd1c7675dd8347116675d91ac47dbd3fb3d0c66d0391d63971c SHA512 adcc450492f769a1d6277b551d318479dac2150b2c92b9ab648bb3f30cfe3cd0717f2febbe5299093f1d0638a90523aad9f6a073fc34bd91990d2c90416d0fdc
 DIST netdata-1.29.1.tar.gz 6233282 BLAKE2B 53fd82c0b904b6d29eac1534e46d856c9b13460fec7b739cb5e93596961753d978dff0a5e08c88f10d974838809d4266b715e442b54e507ae744122d0345297f SHA512 252efece4501d9cd3c71536b96f9487c618f9a2a3445d0bf0d49f0bfd399b80115b0f57f22fddc5567763a9f41e95f24c8ed64b6e1c29f0d7d121d844d8d1176
+DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc5449189d12215c2af4a5c543fb0be9314842430da75547db0bc5f1027fec313703cbc98d21435807d2105d6761372 SHA512 3046fa99725c9ec9b5cac695d2ab66dbad999fc7b1242722592521b0e270fbb32756a7de4aac9ac8fa4ef5dbf455034f7fdbe84f8e281c12471de61e79a0eacd
+DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
 EBUILD netdata-1.29.0.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.29.1.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
+EBUILD netdata-1.29.2.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
+EBUILD netdata-1.29.3.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-9999.ebuild 3418 BLAKE2B 6c063a2a8110311dbc32e4787dc75bcea98240d0f607ffc032a132107a907693452e5317da8efff30684ca5f56ff2e6cc63899b1635e69e267670818986951df SHA512 1501c5272ea5ecb7fb4deabd9e50e505f1aa4a4fb21a86090f3ee4b78138e0ea2b492c350139d93875c853c6ae5351ac868fd7d4d2c92461fe09a13eaa4c3805
 MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e
diff --git a/net-analyzer/netdata/netdata-1.29.2.ebuild b/net-analyzer/netdata/netdata-1.29.2.ebuild
new file mode 100644
index 000000000000..8d690b9c0539
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.29.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{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-libs/libwebsockets
+	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}]') )
+		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-1.29.3.ebuild b/net-analyzer/netdata/netdata-1.29.3.ebuild
new file mode 100644
index 000000000000..8d690b9c0539
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.29.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{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-libs/libwebsockets
+	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}]') )
+		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/nmap/Manifest b/net-analyzer/nmap/Manifest
index 50336013fa87..d0e4e04c5efd 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -13,8 +13,8 @@ AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
 EBUILD nmap-7.80-r1.ebuild 3270 BLAKE2B d3e505d33d6c14069bacdaaf7a5197ab03fac726f4728dc807ccd864da4fea89958e4cc199cb6e63d5c1de7c7f159e65ae3a620715d6b7d64a1469963e3bedaf SHA512 ee325f3747bdac7f8233adbc7e884090ceda7069d9b5f9ddd7ff2db7edacc80c8eaa3dc99727a3a2785e0504d6d4e4ef90f028c7baee35adfa0b93b886225dc7
-EBUILD nmap-7.80-r2.ebuild 3387 BLAKE2B 698d3db68dd144c69724486c84695816c73570a4b7dbde0accce89924bb85801e7df944ed2f565a96a332d3443456b0ac59bbd013e937dd3d6ab2dc8b893ecbe SHA512 f91ac350f6d4063c728b0ac56da893fd2a3d4d13bcb0388e237dfcaa83918896516dde1449f40177e9dc5a86ef7f2cad98d5e932cb20ff5228c25876736001b8
-EBUILD nmap-7.91-r1.ebuild 2788 BLAKE2B f78ab92f56849364ba3353a2aa87d323a546553758ed8205e7792279eba68d067e108eaab4fa4cb283221e29336a2aed071ddd1c3336bf50d70a164f9925190a SHA512 70339821113f150b2501e39f544615bf6fbcb2de366b563dcd5937bab7d213cfcae24d071ec09f21540da6d41f5d3e80d472a4802521d1752ce92162224cc378
+EBUILD nmap-7.80-r2.ebuild 3386 BLAKE2B fd3b88003aaab420a29745a407f07ec1a295eb47def0843a16acd3e6202068a4b3d32cb6129ee4c969c4c5c0791213e8b220e8f21332efab6425c68ae2a35e2e SHA512 df22d7061dec12102a3e3b42aac686144dc43d1a5208e5712af03e247b50d91a71c24caffe951d6ab8ff8d309443dd3f2a143d3007ecab3155a352df494a011b
+EBUILD nmap-7.91-r1.ebuild 2787 BLAKE2B 09a5c9e50b10688a700c4721a92dd501a1314e8a2b5d7655ce9eee614a9de8b260e420a46fd7e2a4674417f3caae7b87e3bcd58ab0aa0475b0f4b08f8a8c061b SHA512 a49f565239fe7d4e749ae3bdab9df84d29099ca8311626266eaa572fbebd5e579d5151cb06c836ef92ac81d4fdc2cd48d35210d5c8c61d9d71f7cd20f180b8eb
 EBUILD nmap-7.91.ebuild 2671 BLAKE2B 3247aac2abd7f3166a84afebf6cb316287ab4392f77b177ee476a3eead52eea41a1ac7365423720e9bcd78cb109d08721dcb5b2157fd12b357cd4ff9e95384a2 SHA512 4ecdb4a0e024b38ae382c9d6c677ab9c9295dbeea43f4f32431f8360969685b446d11ba752dca06cfb5da1bda78db0595a7af795a9b20d26cab68ab3d445f8a6
 EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6a0187c3ab51..5f48909bca01 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index a46666146a85..610bd50821a6 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 34f33697b3dd..aa897a322cfc 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,5 +1,4 @@
-AUX ostinato-0.9_p20180522-buildfix.patch 542 BLAKE2B 7916e581c50b3090415cfdd2607e9614e9fffd057e2b2c8d32458fa2582e30ad37c4c334fb7a610d059e5a4951a376ebcc5795511203333333c102abfd7be1ab SHA512 b7647a4d485e5a814cc75cc86bf1552c78d1498363eb1fafcb0ec17dc9c2191d93744dd6d58c47b704ed3e8f756bab5480b31b67ce5e1ace250e64c4523130b7
 AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b
-DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
-EBUILD ostinato-0.9_p20180522.ebuild 843 BLAKE2B 63051fb75faef8a8c2693c543dbf3e3982e0e8eeb0d92136f4a0e9b8dfa112cd52f86629e6cd2b39b362a8a12300455e37a2a0f8a3685a591e67292de223b0ab SHA512 49b6402c5595e811f3123ecb295cd6201f2bf8fe2d8d955bc3cc4b744d6926aac1735ef0df7ee72b20bd3868212f619e3d79f0364271e5968de84a1a0a016689
-MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
+DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449
+EBUILD ostinato-1.1.ebuild 739 BLAKE2B aa23b50a213fced2e5b4a52a1c61f436308c809450375fe5178046a0aa315346131d897cd75b541d7a10a23d4deed2afd3fbf4f7f7b74daefb9cbb83327426ce SHA512 3ffd38bd7138f362055aa3310d568fdd62f5274d6e999c17c92930a8fbded320bb3e87ffadb09c37afbf61c4c69cdb038e42fd945eade40284d4c471047d465f
+MISC metadata.xml 329 BLAKE2B 3618e866706468ccbdbb03e22088df81922a7997a04a0a7f7a011aa6df7f3653462569b1384ce9e12ccebe742df9c3f417dab26dc6983c48f1b146c731d623f2 SHA512 9382245a5216d3373ce5fc0fd926f5d1aa4669bb80636db967882eda3088f6a6fa0c1a6df75a42de456d7646a10061acfbae251cfae8efc5f53dec597463d732
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
deleted file mode 100644
index ff09d689ae5c..000000000000
--- a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/common/mld.cpp	2018-05-22 18:18:21.000000000 +0200
-+++ b/common/mld.cpp	2018-06-26 13:59:58.562569302 +0200
-@@ -24,6 +24,14 @@
- #include <QHostAddress>
- #include <QStringList>
- 
-+template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) {
-+  if (sizeof(unsigned long) == 8) {
-+    return qbswap<quint64>(quint64(source));
-+  } else {
-+    return qbswap<quint32>(quint32(source));
-+  }
-+}
-+
- MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent)
-     : GmpProtocol(stream, parent)
- {
diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml
index fb90fd94be6f..e63760e84925 100644
--- a/net-analyzer/ostinato/metadata.xml
+++ b/net-analyzer/ostinato/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">ostinato</remote-id>
+		<remote-id type="github">pstavirs/ostinato</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-1.1.ebuild
index e2e38eaf0514..9dba7331941b 100644
--- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
+++ b/net-analyzer/ostinato/ostinato-1.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703
 inherit qmake-utils
 
 DESCRIPTION="Packet generator and analyzer"
 HOMEPAGE="https://ostinato.org/"
-SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 #https://github.com/pstavirs/ostinato/issues/173
@@ -27,11 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 PATCHES=(
-	"${FILESDIR}/${P}-buildfix.patch"
-	"${FILESDIR}/${P}-no-modeltest.patch"
+	"${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch"
 )
 
 src_configure() {
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index bec63d69b08e..4d08aa71b1e8 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,13 +1,7 @@
-AUX pmacct-1.7.3-nDPI-3.0.patch 1157 BLAKE2B e7beb25fa1b239193d4c4deb7521b1b03051335901e61ee68b198e8ef73cefe193884111f605cbd38f444cb5380c28529a815b4b055fceac8e467da59ff9f2db SHA512 323012c63ed16ce3fe7a3684b84cc6fdcf9412fa9ce2cead2600459ee500ae60a0e5603805ef9c66b7d6e3f4b7d1b779b51b45494ce91e4798035956621eb8fe
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
-AUX pmacct-1.7.4-nDPI-3.2.patch 1712 BLAKE2B 103650626f7e4cb8f7f76738c3b151f38c517d27ec0c5b4c1b2ab14f6a22fb20150b01c0bd171e99c70749d8cd62aa6f04cce229d3056e0382bedd6bd9e28b24 SHA512 3ed43f04bc7aa709390748c503f390f98a6b057825fc6d608730803ffd70e6a081c455085067507567b7f43f49c8e6ebc00d4762bc2aeee66a9784ebfdb80c80
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
-DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
-DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
 DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
-EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f
-EBUILD pmacct-1.7.4_p1.ebuild 2335 BLAKE2B 5b7c57caed2f2e96817f247a719e90f05bb3f30b715c053b07ddce3738f8e54ad35eb17edd94c385cc1dcb804dcce16c72282d70f572237f8e55cb06e70d827f SHA512 04c0c6fed8c5d81affd3eb3b65c3959934880cc38c5d5cbc67e269d399cea7a41da889d8e984630f2399138680a8bd4e885e716647097cfb06a8030f4364d2ac
-EBUILD pmacct-1.7.5.ebuild 2102 BLAKE2B 2c075143458f53bf9186e7ecf6b65e806f099a573e5d1a14ccd5a72224c8665ad0f1d25b4f343b0dcd56a0d32dab65bc0445b22c242740b8584d6608a0be5d6e SHA512 afc89ef6d76d06ce7da4634e39b2e62b3f1a574dc291803a13e5ed882168f5c680ab7cb69b5c6682dc2ca28f11d988f18e7cb1b0bf1468140698c5c503bce4a8
-EBUILD pmacct-999999.ebuild 2159 BLAKE2B 8896ff11b80d2ceb5256ca205557fd6471f007356218b8ea8f358617d61a61c61c1f5a8d42c23bff7c03e8ca2909420aaf1ab14abddc4cb07f1eb4b6cbffec04 SHA512 f6604dea81dead988131d69ce4118b1d305beb9fade5bd49da06e6c46e27b45a264e5c5bc41f98e7cb56fcb3bd5f0aac2e178ec8c89b2ccbce136e7c6cfa804d
-MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
+EBUILD pmacct-1.7.5.ebuild 2112 BLAKE2B 9cd161a5985445c2b4f80ea83f8d253f8768d05fc14ff43743d118fa36c3e63dabbdf210bdef15c6ad14d3f2affec424af861aaf8d20c0de160cdaed76330661 SHA512 7be7c18a3d7dd9949fbb82d3725e81302b5846176d5ad3b6e006e4d1cd3cc1b69eff51de7ddecee91285859d56f300e444bb8953a97ce0133efe2d88273ef751
+EBUILD pmacct-999999.ebuild 2073 BLAKE2B b9e1405cfb4694ef08bc16b477169345155ecc83fe18eebfc51c34eb4cb365d021aa306ab3ac75a6f998e38515988cc6da4b8b9c4128c45c640d86a0fd0b85ce SHA512 aad2e1e6cffc1fc28997fdf2dc7bed7ba4c40eb109417325244179e7e55a236e4ee33e6c8991697b0868a754ef3892cc0e3c715591dddcdcc241ea2bc10f9b32
+MISC metadata.xml 1293 BLAKE2B 102bb4be653f429b9b20ebe66e121ee1fa1f95e2133b81ee9b6741e9a3aaf7e2c2ce4862845c35ef2a1a9f83ad5112a914a0db4153e67ad61435ed6ce3a74125 SHA512 e68e3c42adfe2dc8287f5e06caa1e14fabcba7601605512024524e00c82a09100bd5af75a863fa7027508f792d0e446e66f27c19d1abd2ae0e14e8cecf201732
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
deleted file mode 100644
index 9e6c618fe443..000000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -955,6 +955,7 @@
-       CFLAGS="$_save_CFLAGS"
-     ])
-     PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)])
-+    PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)])
-     ;;
-   no)
-     AC_MSG_RESULT(no)
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -374,10 +374,14 @@
-   if (flow->detection_completed || flow->tcp_finished) {
-     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
- #ifdef WITH_NDPI26
-+#ifdef WITH_NDPI30
-+	  flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
-+#else
-       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
-+#endif /* WITH_NDPI30 */
- #else
-       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+#endif /* WITH_NDPI26 */
- 
-     if (workflow->prefs.protocol_guess) {
-       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
deleted file mode 100644
index bcbdbc834cad..000000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -900,7 +900,7 @@
-   [ case "$enableval" in
-   yes)
-     AC_MSG_RESULT(yes)
--    PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [
-+    PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [
-       SUPPORTS="${SUPPORTS} ndpi"
-       USING_NDPI="yes"
- 
---- a/src/ndpi/ndpi_util.c
-+++ b/src/ndpi/ndpi_util.c
-@@ -29,7 +29,8 @@
-     
-   NDPI_PROTOCOL_BITMASK all;
-     
--  struct ndpi_detection_module_struct *module = ndpi_init_detection_module();
-+  ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs;
-+  struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs);
-   struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow));
- 
-   log_notification_init(&log_notifications.ndpi_cache_full);
-@@ -77,6 +78,8 @@
-   NDPI_BITMASK_SET_ALL(all);
-   ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
- 
-+  ndpi_finalize_initalization(workflow->ndpi_struct);
-+
-   return workflow;
- }
- 
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -373,11 +373,7 @@
- 
-   if (flow->detection_completed || flow->tcp_finished) {
-     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
--#ifdef WITH_NDPI26
--      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
--#else
--      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
- 
-     if (workflow->prefs.protocol_guess) {
-       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a306c0fa5034..ee7d2e55c726 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -1,25 +1,23 @@
 <?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="64bit">Use 64bit counters instead of 32bit ones</flag>
-<flag name="bgp-bins">Link BGP daemon binaries</flag>
-<flag name="bmp-bins">Link BMP daemon binaries</flag>
-<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
-<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
-<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
-<flag name="l2">Enable Layer-2 features and support</flag>
-<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag>
-<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
-<flag name="nflog">Enable support for NFLOG through uacctd</flag>
-<flag name="plabel">Enable IP prefix labels</flag>
-<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
-<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag>
-<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
-<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="bgp-bins">Link BGP daemon binaries</flag>
+		<flag name="bmp-bins">Link BMP daemon binaries</flag>
+		<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+		<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+		<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+		<flag name="l2">Enable Layer-2 features and support</flag>
+		<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
+		<flag name="nflog">Enable support for NFLOG through uacctd</flag>
+		<flag name="plabel">Enable IP prefix labels</flag>
+		<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
+		<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag>
+		<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
+		<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
deleted file mode 100644
index 99560fad9a73..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
-	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-2.4:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
deleted file mode 100644
index 29e47d7219dd..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
-	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-3.2:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-#	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
-	"${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
index b40dc62cab70..b6cef6d81f80 100644
--- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
@@ -35,8 +36,8 @@ RDEPEND="
 	sqlite? ( =dev-db/sqlite-3* )
 	zmq? ( >=net-libs/zeromq-4.2.0:= )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 63073745a3d7..88a7b0b03c6c 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
@@ -12,8 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
-	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel
+	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 "
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
@@ -27,10 +28,6 @@ RDEPEND="
 	geoipv2? ( dev-libs/libmaxminddb )
 	jansson? ( dev-libs/jansson )
 	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
 	mysql? ( dev-db/mysql-connector-c:0= )
 	ndpi? ( >=net-libs/nDPI-3.2:= )
 	nflog? ( net-libs/libnetfilter_log )
@@ -39,8 +36,8 @@ RDEPEND="
 	sqlite? ( =dev-db/sqlite-3* )
 	zmq? ( >=net-libs/zeromq-4.2.0:= )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
@@ -67,18 +64,18 @@ src_configure() {
 		$(use_enable jansson) \
 		$(use_enable kafka) \
 		$(use_enable l2) \
-		$(use_enable plabel) \
-		$(use_enable mongodb) \
 		$(use_enable mysql) \
 		$(use_enable ndpi) \
 		$(use_enable nflog) \
+		$(use_enable plabel) \
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable st-bins) \
 		$(use_enable traffic-bins) \
 		$(use_enable zmq) \
-		--disable-debug
+		--disable-debug \
+		--disable-mongodb
 }
 
 src_install() {
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 56861cb5d153..52b1d60ee33e 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -7,5 +7,5 @@ AUX slurm-0.4.3-version.patch 170 BLAKE2B 21d810de2df77546c584d66c85d180054b3f56
 DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3
 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
 EBUILD slurm-0.3.3-r2.ebuild 771 BLAKE2B bc0919c9de9e4c97929cf51cbcd0e4a241262ab92bd4017ecaba0cf2884d57793a25b28bcc9761f6c8505559789f0d87774265c4dc1fbd7a8a31d76970a5e9c7 SHA512 2e528680ff2ddd6b31c4b8c2ad49a4b3a21e7da0d8f504100f6588cbe480fcfdd5f2e3a58a60c26360313c526cf9dddb4c77746e1e5938766e7ea1277b36accc
-EBUILD slurm-0.4.3.ebuild 705 BLAKE2B 0a6c92d592cf2fde8576e0a6e1aafe723d04c2149ae1e726f87e393fd70e5a9fc91e461cfd3f0fb0c334518808fb2b91b0d907fab0890d070d2c92554e5ce9c7 SHA512 623327dc319bbe53901dbcddf645459e031c22caa5dd9b699c460f43107431a9d3a2aa9896a460b40e50f7d58e13730f7995dab4edef5cab93954f81c3168888
+EBUILD slurm-0.4.3.ebuild 703 BLAKE2B d8816f08f1be187c170a1f805d3cbe2e5a341cac4b19857f2a37d0a21ce3cc2e9de660f5bc1ce0b2f11dbdd0e462e101d8d4c31a6e003bfc859dc14d5c9f8004 SHA512 c66c994f8d152177499684255e3be582c096f61bda0cf5203bb4952e9bd64a3fe77c11d35f1c17160b72a3cfb1eddfb0f3b1dfeb620b2ae1752497e54797d0d7
 MISC metadata.xml 360 BLAKE2B a7b740796c57e64abb029e278f22e04a9af73827f35a2b1576b4f955d74c23cd1c16c9215b831f46030f55bfa0727bd50ccfa31ca7ad999bc574dd6cc4b575bf SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
index da86bb68d8bf..5dd5798c2f8b 100644
--- a/net-analyzer/slurm/slurm-0.4.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/snmpclitools/Manifest b/net-analyzer/snmpclitools/Manifest
index aafb7e211897..fab4f78e02b8 100644
--- a/net-analyzer/snmpclitools/Manifest
+++ b/net-analyzer/snmpclitools/Manifest
@@ -1,3 +1,3 @@
 DIST snmpclitools-0.6.4.tar.gz 50853 BLAKE2B 23b28395c1b4d376e4b39f8ebb6d9acf8329da8c9bd6403d0670236ed89a783c0145ceb3ed31a653055bc6fbde785f911e6eeb30f32a587b80878b26ea2a8ba1 SHA512 42c0905f65bc855f7f0089ee7e944543e29ca0ca5a8d7185f5fa877f9c97cae1f1952477e85c614db9785deabad1770f1a046c4e6e98a7832097581f8e14748c
-EBUILD snmpclitools-0.6.4.ebuild 587 BLAKE2B e0aad949e171187d2544366b92317a601cdeb430bfaaae400da8a393f9710a3051767155f52b25fced4590ff426548977bb823e05c13b696841bc752e76d73c8 SHA512 cc156b76ffc4e3a8089565092e78bd996e6ce4da2f66e20d6894f533dd8665399ba566b4947bc845b3d6673a20c01e1889cafdbd26ab283227a4a1ebd9855e75
-MISC metadata.xml 289 BLAKE2B e0397501ebb162c536e6bd8e1a9c24243d5aec4bfdbb100939bdc57360d461f8c7adb503764fd2cf5b096c24d92d3c0d623bf8a4e60668adb78f9a6b1514952a SHA512 7e8013e9ecdd0ec4f0a584421aa9c1f6f976883ca89e6cf211923c99fc580099638cb8c8333948a6b9e1f6809fe72f6835d9b7410b1ebe282b0ad44e6e19e6cc
+EBUILD snmpclitools-0.6.4.ebuild 540 BLAKE2B 38e12d3181590e57f4dfc836154f025516345f9f69c9540c0452193d3a2d7f2c467582dfdc6709283df89bc570bf0bfeb2e341a79efa92db5bfd8192a052298a SHA512 e275a7b30b48c4cb73e2befc8fed1f7d568b45ddf46c8c370796c5d2367d5df2096f269d8c6af778eb056541652d9b9eacc70652082d31d72b310dd168a725a4
+MISC metadata.xml 405 BLAKE2B d3555af67b9a584f1dfa860783874d5d2c8e54e4d774712243c1736bc402207388cb59d971abf0e10a86e3c0f76c6ef237cc43e7aaf93f457011451ae76e7b6c SHA512 73908b7539e32b6f83c0f2b155150979fb0da9a45b01ea90e5aaf459a3f141a53c182b9e5b27ddc93c478bcde66869f0ab0db01b3444cea9b919dda97a153c88
diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml
index 57e2cb1d8be5..e34f7d9e6afa 100644
--- a/net-analyzer/snmpclitools/metadata.xml
+++ b/net-analyzer/snmpclitools/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>python@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
index a9d12d02c23e..69405fd70deb 100644
--- a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
+++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps"
@@ -16,8 +17,4 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	!dev-python/pysnmp-apps
 	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
-	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 45c3ab511b03..89b5e4266a56 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1,3 @@
 DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd
-EBUILD speedtest-cli-2.1.2.ebuild 649 BLAKE2B 8b4c48724a2e17b9c79e7c8f37e82e131b7bacecf60c8e5e7e3da68dcdb22ccc1190d92ea9d21bb04e180e52aba39957704c465ff93c54e2b26f4960129cbdad SHA512 99fecbce5ad3f768d5e59159907759dff43696ef2c4863a06470693b7ac68495b26af5d1fca4be86d9946cbf1942fbcde7debdd0d8e9f4c6b9eb38f4958c1fe5
+EBUILD speedtest-cli-2.1.2-r1.ebuild 682 BLAKE2B ff6e6916375f0e349bf2061a9fed91d198dd314c6457db5f3f4291d4165fb68f1cb5345017c0fb2e03ec599f1300153dfc2df39c73e29dbc10edeb3b1fb0ebdb SHA512 fd99a5dfa95b51b952a3b6ffcf52a336c53feb90883db3c32d03b8f1d223ddca341c2458202eb3c3092665fae60e6cdd7fdd36e2c62f74e65f1ac1dbaf0ab5f7
 MISC metadata.xml 334 BLAKE2B f478e9bd7fb6fabecf2fa2aedcd21ee834fed3d0f8be4c1b6e5244f66a4c347f8df04d0ee8375394e632d6652bd360d51830e2b8d9c2757b1323f8f46b2a5567 SHA512 b51e761e451165b6a1dd898e59892e0bb1b8c53b36af40af0f036e8accfa1335a893b9dd6a1002a148a7b695181a714e2baa79b64968d37b93babdd8b2207509
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild
index 318d38a39235..adbeae7674b3 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 40919ea52c91..99536355fb81 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -2,9 +2,12 @@ DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186e
 DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
 DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
 DIST sslscan-2.0.7.tar.gz 109639 BLAKE2B d4a8257943f0c07dfc4f59e3b71091466dfd9d0cea71dfd44f17487fd0254e0f6113acbd1ddf30659cebb60bca7609070ed5733af737dce11c7cd762d3dbdd30 SHA512 de5e27e75f9af4dadc6ae10388602f64a56a457fcd737b37a1a9da1f433969d19004c994b8f04c569aa40b8ade6176fa2752fbc0b52046174791cad119e07bd0
+DIST sslscan-2.0.8.tar.gz 109713 BLAKE2B 3c28eda337145556a968be66bb7924f95cd7ad8eb9bab04531cad7d3a274f5e337804d3223903369df63c97884b6373f0b207e3691857a6b65591e7d067f51dc SHA512 5260e8da881b7757d69b1f8a9640a9c1593c6537a9f66e9250c9183697e7768488d24bab1eef713a1907a773689587bd1b2856caebe6d8df3cf509273a2cf7fd
 DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
 DIST sslscan-OpenSSL_1_1_1i.tar.gz 9989266 BLAKE2B c0d48845457ba89a9ed4a6f4425a8556cc9c623bba5ecaa07911d19285ca32124c09294862c874afa61aadebb33f290028b14134d51f1823d1bbb63854d7c179 SHA512 7e2ae6f1ce75d39f330d79abc1d2c67418fa8609580a7550f39104e18e9278e859ec788f993186808d45363c43b3e731c3ec5d874d072f2c3e33adb0701db70a
+DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
 EBUILD sslscan-1.11.13-r1.ebuild 1029 BLAKE2B 3e0c3fa00d0a29907180b2307efe0e628305951d614613dead3fe4580d000f13151bbfa88070240048e5e2cb02e0699355312cca6947d19c1fcba3c0b3178ff7 SHA512 92032809178fcd9bbf769059afd3f31fbda24f9b8e6ace40acbca7c09a7de314ac94408ad2b8c00daf181fa89ddf376cc00ab7bf3662c38dae68d1a88a4fc63c
 EBUILD sslscan-2.0.6.ebuild 1016 BLAKE2B 55289328d999c1af28b5cb9ed42ce6f6e2ff672cb6b974623b5f02c81227ab3de39cb8730d7a1568de970170e15eb5ec0c16a757f45585c41f1c8d76332c47e2 SHA512 b55cb759acf7f8aa0d5a78c54620d3375d4b89bdd6c1c23d162d5dfb68a879dc60f2237d16c1cbcdcd248f63a3f2edd27e93e7db9dde9982152aaa19650d5a6c
 EBUILD sslscan-2.0.7.ebuild 1018 BLAKE2B 0e98d5d7daba239c28dd922f24c954c5727387d5007ff38dafc6913facbe33cf3bdcffc10ef516e2cd02c8ac85447b62eb06150eaabdd9b59f8320640b9e2310 SHA512 040c88add3f54cd57919eb1d58cf3ecda35c6e64e16bfdc8a2f73eafdf55735b844001ab7f64bddbf11cd692814ed10892fe5740da0f11afa450e45c21a7fe6d
+EBUILD sslscan-2.0.8.ebuild 1018 BLAKE2B 78ef0d602717064b9405bf69b73e42dea04fe5015525a8d772af14ebc9e715137f5b43335381eb6f5be27f401530160996f7f31ef79e5afc8235a0193e42792b SHA512 fb0024161aa41a3a0c70499037d18a90e294f0154b2f093b462cfd8932b09fa40a37ef6bcb60c1d7e176c3b4c8622af05daae9885c65c8115c15650a349de0dc
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-2.0.8.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
new file mode 100644
index 000000000000..5093e3ee48ab
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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_1j"
+
+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/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 4a9400b7047d..9edc977aaece 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,6 +3,6 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
 EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 90dad95e765825652c9e7da84b69f863fc545d522aa14fb9c2994d3b5f1276c0b3d03d817daf57b54140a1d1058ea0c36203e7918851fe4af3f10e964c82ca2d SHA512 cc654bde41b19b3f52616c8c9fb3693307bc21aa4ed1568df7d7b68e28a453272344358a4c13f5258de96a045009875696d734fbde7b2ac73fcf2c89e84886f5
-EBUILD tcpdump-4.99.0.ebuild 1847 BLAKE2B 406aa3b0e2ff3e97301fe680389c603595a67ad71dccc483bb76e438d0663524bdc7819f3111ed68d09f0e0e054cc30f6262507a204262a0b3747b6546becde4 SHA512 57e535b437b7f4380e0e93d7c8b63797fd8041e6a695fb4a345bbb6546ef5bd1ad25aadf7183d10572583274f850030fafb873f0244b6e057f09f73629ae05b7
+EBUILD tcpdump-4.99.0.ebuild 1846 BLAKE2B e6506aaa002791fde7c00c9b7a1788858b1f9d93bc2988550712b79f28e2ecb4bb400f4d252d2fc8659a0808d1565ea904831222a771d92046d512bcddb97e72 SHA512 970e01743686f7bc827488bead7632a772b15dadf71912711fafd294bd7571256e0f8206ba2ffbc47e5e0e19087ac2df9abd3596eaf44d05c32f1962460584ad
 EBUILD tcpdump-9999.ebuild 1719 BLAKE2B 538b1b4f0519fcd589a9d9c20935c84c9fee5136337ce13f519f0a22cce6ac0331a37310574cc60d1db3f0eaff030f75ca756c729bc81989b3cfc1230ae27bfa SHA512 9fcbc567c7be186a19181a0daf3014e4df3acf16b7a578bb7a782802afa449a21f7174d6a5eb75f7ee313453e46a12488b18957000757b8e23110d6f72ebf4a4
 MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index e645322ec4bf..3b3f98211ec8 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
diff --git a/net-analyzer/upnpscan/Manifest b/net-analyzer/upnpscan/Manifest
index d6f219c00c03..aff6ddcca372 100644
--- a/net-analyzer/upnpscan/Manifest
+++ b/net-analyzer/upnpscan/Manifest
@@ -1,4 +1,4 @@
 AUX upnpscan-0.4-r2-cflags.patch 967 BLAKE2B dc6f9088078989c08d9910f2b95e900fb598aa7ba6373862a0c9817266bea560f70730d6e5bde123f47e628630ea6217821129f39cf6ea68fbcb1ab96a6db77b SHA512 69115c3f63af1ef29151e541aa99e7af8325a1c63c5453f4fa3cfa2cdb74959f0b6f7c1098bd87003aa290421bfe97dcd49a7c1f565a9c554b3158c54962afbc
 DIST upnpscan-v0.4-src.tgz 309011 BLAKE2B e7cb466d67d32aae72b6ee69d9d08124bedea23b0b5d8ba8bb0d0463364b358930c87b0d7bd4dec40e998a28887bb7df315b3590168c51167e4d70a928a7eb2d SHA512 d7791afdc6d3f318a1a29486485ab5f71a1a32159a2212164c763748a047c8243e3017afc887e9394ae78ffc2412091ed590a714c4a482b44792ae8a835e095e
-EBUILD upnpscan-0.4-r3.ebuild 513 BLAKE2B 55a4018588db043f3ce6c7468da26cb4007704d26a4b967854421611fd76988ef705626245ebc0a0fc7a7824f30420a69f54a554346d5dd0ce42df78804e4661 SHA512 0441a0668f8b413a892a0072c082eb1576bf903c20cd25576e3d1e639de6ce418b18dadaf3eeeafe86fd320008cd5fbd8d4817bf58c59ce98ac0eef5ab493530
+EBUILD upnpscan-0.4-r3.ebuild 496 BLAKE2B dde560b52e295ac7f09b6684b4212cbf658ab4cd2b9a60aeb5ad39a9ed87ff402f94eb3f911f03b4b7941d9a0e42b5d0ff52a61f2e64e889991b6526a7f60696 SHA512 dff6ec77e6a62d639eb8b31208236b85d5168df8d5b3c550aaa64ccf25debf668548dd3c5547009d8e32b712347fa76a3609712aa26bd6b0b83ecb22a5d75ecf
 MISC metadata.xml 508 BLAKE2B cc5626eb5eda89bbcf5059d103102b2cd594b4b92399ba15ab427d00e3b5deda780b9e7f2b086c69f2df7d5f0a64cafc10de9913229bb51a3d7a00de8e46bcd1 SHA512 e96d83ebf9190d887b037a1eca1aa797a39df2180ffb95cdeeeeab9e793fafea0c23a5832fdc507d1e2be4275da1e3a5cf9f1baf96f543238cd1d3945b797d00
diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
index 91839f3352c1..b92dcbfb3960 100644
--- a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
+++ b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools
 
-inherit autotools-utils
-
-DESCRIPTION="Scans the network for UPNP capable devices"
+DESCRIPTION="Scans the network for UPnP capable devices"
 HOMEPAGE="http://www.cqure.net/wp/upnpscan/"
 SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-S=${WORKDIR}/${PN}
-
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-PATCHES=( "${FILESDIR}"/${P}-r2-cflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-r2-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index da150b7f36c3..163bd8eb2d22 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,17 +14,17 @@ 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.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
 DIST zabbix-4.0.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425
-DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403
+DIST zabbix-4.0.29.tar.gz 17411987 BLAKE2B 187b6de17403c656c2faa93c8e0952be06ca4fc60e8fe62c48dd9f96371bd26b53f333b93de5805d7333b849f93ff7db6cf1f0cf256cea438afeea5d314e0e83 SHA512 778fe43c2394c572b0f1a6d426897bf24391ebda25cce5bfa0dad63827f5d3457776ecd8186c0b783d400a0d87778d9243fdfedd875136383282e56f542eafca
 DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9
-DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+DIST zabbix-5.0.9.tar.gz 19513312 BLAKE2B e60fcf300c3fcd9595e9fa8465403e906672fdc908d9a15646e2ac9e88684999184acb3a0b8226dff1966554769930b0ae6d692ee4569441714912c2eb93540f SHA512 7306afce482b8b8222d46c25d91cdd8df2d5bbbeb755bd54b4bf747dc78031cc24167a954e4de5933f33f59772838ff0b4c66d0bf19c28dc1a27276da9bb0b38
 DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4
+DIST zabbix-5.2.5.tar.gz 20039761 BLAKE2B 27510c462947a7dedb16d029799aa1c7b38d68199aae47b4b3e5a757120bd74ddf87c7dade0bf339ff2165111345d79119718ade2fe39fd088971be6dcef2bda SHA512 5014a5a510e9ea4a39aa30bdbe3ee82dc1d0a139f32151bb7739df7442ea707b91446ce1cefb61007b603ccedfb0353c628b043db3e90cfe8fc3d67588f2dfd5
 EBUILD zabbix-3.0.31-r2.ebuild 9301 BLAKE2B c015b9dc26dfa67ebfcd7aceb64112b6c6bbfefdca280e0b8c1ea20de26dc553ec618bd0e8fa2d6049dbe4823ee78ff5c944920b018f25e81900980b0236956b SHA512 a2ab0daec92eef21a4310be08e985222e344e8c77e816629fe779827520c502b0321651a06c4def7ded2968103aae3b3b8782aded68932f4a39240d402a58238
-EBUILD zabbix-4.0.27-r1.ebuild 9275 BLAKE2B 5b65d2fef8b8be1a903a202185df86f78de46d3147e884749a899d7330a20488d7b5cd09021cda9224ec9664b55f65f85e18e436cacc586d332eb7f76c0bec56 SHA512 fbe2f7c21e7455644d77e79b4a3cfb5289f16cc0bff44a297b8fef362f347d8aff177453c4df86eb3c56e7931a7d5cdfe010e7ce4507b9a83d49b92f999e5456
-EBUILD zabbix-4.0.28.ebuild 9277 BLAKE2B ade8c37f772a5c18001b547b070422de3c77d783626e27f1324377e0e66786389c24a02bfe0e2654703bb5e337e29b7d5d5b652a595681f52cc23cec8930d5b3 SHA512 b24f23d30f4f8e01df08a5bfe79d5db773bcd4df6001dfdc7a177bfdbc31a04da5e739b98883069a9ecda96f93c6e2b4c16244517db694ec542a85137ae50697
-EBUILD zabbix-5.0.7.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
-EBUILD zabbix-5.0.8.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
-EBUILD zabbix-5.2.3.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
-EBUILD zabbix-5.2.4.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
+EBUILD zabbix-4.0.28.ebuild 9275 BLAKE2B 5b65d2fef8b8be1a903a202185df86f78de46d3147e884749a899d7330a20488d7b5cd09021cda9224ec9664b55f65f85e18e436cacc586d332eb7f76c0bec56 SHA512 fbe2f7c21e7455644d77e79b4a3cfb5289f16cc0bff44a297b8fef362f347d8aff177453c4df86eb3c56e7931a7d5cdfe010e7ce4507b9a83d49b92f999e5456
+EBUILD zabbix-4.0.29.ebuild 9277 BLAKE2B ade8c37f772a5c18001b547b070422de3c77d783626e27f1324377e0e66786389c24a02bfe0e2654703bb5e337e29b7d5d5b652a595681f52cc23cec8930d5b3 SHA512 b24f23d30f4f8e01df08a5bfe79d5db773bcd4df6001dfdc7a177bfdbc31a04da5e739b98883069a9ecda96f93c6e2b4c16244517db694ec542a85137ae50697
+EBUILD zabbix-5.0.8.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
+EBUILD zabbix-5.0.9.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
+EBUILD zabbix-5.2.4.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
+EBUILD zabbix-5.2.5.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
 MISC metadata.xml 1404 BLAKE2B b745b4316c35535bcbd9f4b586214497272c6e611ee8f7e65ccb0b0d6d47646f5cc74e0d9afe374ef9ebea7a9b6ee527204ac3081e2c3749b046316816b92015 SHA512 9c61628b450cf06d3643b91eca8bb6ebdd7d85623003856722992ec4e9b9a6aa8a76e769544e6285b898314af4281eb532fde77576b4c04cdc795d1a0102aebc
diff --git a/net-analyzer/zabbix/zabbix-4.0.28.ebuild b/net-analyzer/zabbix/zabbix-4.0.28.ebuild
index 6eb470b33c50..b20bafc87ab0 100644
--- a/net-analyzer/zabbix/zabbix-4.0.28.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.29.ebuild
index b20bafc87ab0..6eb470b33c50 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.8.ebuild b/net-analyzer/zabbix/zabbix-5.0.8.ebuild
index 37470326b6db..90a6d16b59ee 100644
--- a/net-analyzer/zabbix/zabbix-5.0.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.0.9.ebuild
index 90a6d16b59ee..37470326b6db 100644
--- a/net-analyzer/zabbix/zabbix-5.2.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.2.4.ebuild b/net-analyzer/zabbix/zabbix-5.2.4.ebuild
index 37470326b6db..90a6d16b59ee 100644
--- a/net-analyzer/zabbix/zabbix-5.2.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.2.5.ebuild
index 90a6d16b59ee..37470326b6db 100644
--- a/net-analyzer/zabbix/zabbix-5.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )