gentoo resync : 17.02.2021

31 files changed, 35 insertions, 337 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 895c4b943b6b..334ad40b6cc4 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 82618a5f69c1..de30a09fdf1c 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,4 +1,4 @@
 DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
-EBUILD gr-fosphor-0.0_p20200131.ebuild 1346 BLAKE2B b973d8fc813e7963c6579745d7e1e7422b7abc48d99f4684f248490c94663ae8036f45b7dc9fbd80e6c506230a85c3b781303435472d8a1a07076cb6b1c8b064 SHA512 e6405ee48dda7d7e9fc3770aa57704a57d0579798cb1af79fcbcdeba284484480d717732546cc13345c26ea0ddec15941ac53ac8957ffdadcbde51dd185597f7
-EBUILD gr-fosphor-9999.ebuild 1346 BLAKE2B b973d8fc813e7963c6579745d7e1e7422b7abc48d99f4684f248490c94663ae8036f45b7dc9fbd80e6c506230a85c3b781303435472d8a1a07076cb6b1c8b064 SHA512 e6405ee48dda7d7e9fc3770aa57704a57d0579798cb1af79fcbcdeba284484480d717732546cc13345c26ea0ddec15941ac53ac8957ffdadcbde51dd185597f7
+EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B b9df137d83fc10cfda6e1745f5a5c5029e419bb1372262e714889b84bd234ef61e2b4a427d2a2f720fe105ad6adb7e0d7c7ae9bb95665e89e84c21fc614c4e77 SHA512 3f3cd7057b5aaa2af2a2731e2210d886d0feb14ae99ae43fa3c8ed00f3814cd7ae306a3375177dc04e8c9dd29ee80525ef7fcc018a15b93dfb7af83afbb7d210
+EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B b9df137d83fc10cfda6e1745f5a5c5029e419bb1372262e714889b84bd234ef61e2b4a427d2a2f720fe105ad6adb7e0d7c7ae9bb95665e89e84c21fc614c4e77 SHA512 3f3cd7057b5aaa2af2a2731e2210d886d0feb14ae99ae43fa3c8ed00f3814cd7ae306a3375177dc04e8c9dd29ee80525ef7fcc018a15b93dfb7af83afbb7d210
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
index 41a7b4c68731..e3c5413176f4 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 41a7b4c68731..e3c5413176f4 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 919908528ee2..70c4d5f896ab 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,10 +1,6 @@
 AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77
-DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b
 DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
-DIST masscan-1.3.0.tar.gz 451097 BLAKE2B 1d64a80345aa18cc0fdd00b5fca6708bcabded62571887e7171f6ac9e9f77f6d9f5bcca9c0ee04f67fcdf3ead1d6b242dc5129c6c9a94e560ac5380904a5a02a SHA512 dbf489d1fb1c882873071073ef8e65723bf3b805c794a5d13dfdcea539558f049845b5bc02ada1e313729954fe7ba29be727a777937b8e4d41778c9175d13824
-DIST masscan-1.3.1.tar.gz 461128 BLAKE2B cb18c6665bdd106dd6b9d69c904d465988b0727cfb62b3845b8b68e9f0db8d2fe4dd91b6bc0eb0ddb91a143a6d0656e774fb4dd9d7b19623261f94ace3c0b3e0 SHA512 bc43b0c41313b400d55f5da2c777c94c3db31e087c87dc8dc883cd319a6eb45da1e8d7de107f52748e415d75c104c6e564f72bf8d7677c9be84e9297d02fa466
-EBUILD masscan-1.0.4.ebuild 833 BLAKE2B 6e8f6f5899d3a84b4534ae99db5ebfa1bef4508c7ec48aa42cde9b8f7556836ec717329d08848048d8f3b2426f3b780b28a0d32363fa324742fb86c38236bded SHA512 fee463d8b32f8e1ce75e045c60f8712c0ccd6a9536bcc721ff8b52bf778d72b02953b9ad997d0695129cfb43af4fb0d0f24e9bd8111466258c30a9fc899b8e6a
+DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27
 EBUILD masscan-1.0.5.ebuild 821 BLAKE2B b2db0fe2bcfd8eef6423bd961f451d798e4d5d7420d554b099118a81fbd00ef56cca94ca9f212acae65d58b1292064ce5bd4ffb86ff3371af48c091a368c932b SHA512 4b131f6e8838c2f0b2a541ac98b3b5e6e5eaa5638fae8b0b4e56d75707973add348bf81bc60365f1bf0d5fd05f7f5d1121442c9978f8eb9743245e217d252a4a
-EBUILD masscan-1.3.0.ebuild 822 BLAKE2B a31741d1aecbf883126c3a6b748c69f93aad65b24935e065fcb71a6752c63d50a1f5d0022bf7a60fa383d772dd354494e280146d1d2de6ebc8f928f8ae6b1847 SHA512 9e6bbed3d1cf2dfb57cb482d182e75f0936d942fb949a5e2eecb5f960b46480efead013433ac8d824969ea40271b1f06a49e0f4ec114998cb33b35322c72e8d6
-EBUILD masscan-1.3.1.ebuild 822 BLAKE2B a31741d1aecbf883126c3a6b748c69f93aad65b24935e065fcb71a6752c63d50a1f5d0022bf7a60fa383d772dd354494e280146d1d2de6ebc8f928f8ae6b1847 SHA512 9e6bbed3d1cf2dfb57cb482d182e75f0936d942fb949a5e2eecb5f960b46480efead013433ac8d824969ea40271b1f06a49e0f4ec114998cb33b35322c72e8d6
+EBUILD masscan-1.3.2.ebuild 822 BLAKE2B a31741d1aecbf883126c3a6b748c69f93aad65b24935e065fcb71a6752c63d50a1f5d0022bf7a60fa383d772dd354494e280146d1d2de6ebc8f928f8ae6b1847 SHA512 9e6bbed3d1cf2dfb57cb482d182e75f0936d942fb949a5e2eecb5f960b46480efead013433ac8d824969ea40271b1f06a49e0f4ec114998cb33b35322c72e8d6
 MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild
deleted file mode 100644
index fda9eec41325..000000000000
--- a/net-analyzer/masscan/masscan-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-		-e '/^GITVER :=/s!= .(.*!=!g' \
-		-e '/^SYS/s|gcc|$(CC)|g' \
-		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
-		Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/masscan
-
-	insinto /etc/masscan
-	doins data/exclude.conf
-	doins "${FILESDIR}"/masscan.conf
-
-	mv doc/bot.{hml,html} || die
-	dodoc doc/bot.html *.md
-
-	doman doc/masscan.8
-}
diff --git a/net-analyzer/masscan/masscan-1.3.1.ebuild b/net-analyzer/masscan/masscan-1.3.1.ebuild
deleted file mode 100644
index 6a290f96f458..000000000000
--- a/net-analyzer/masscan/masscan-1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-		-e '/^GITVER :=/s!= .(.*!=!g' \
-		-e '/^SYS/s|gcc|$(CC)|g' \
-		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
-		-e '/^CC =/d' \
-		Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/masscan
-
-	insinto /etc/masscan
-	doins data/exclude.conf
-	doins "${FILESDIR}"/masscan.conf
-
-	dodoc doc/bot.html *.md
-
-	doman doc/masscan.8
-}
diff --git a/net-analyzer/masscan/masscan-1.3.0.ebuild b/net-analyzer/masscan/masscan-1.3.2.ebuild
index 6a290f96f458..6a290f96f458 100644
--- a/net-analyzer/masscan/masscan-1.3.0.ebuild
+++ b/net-analyzer/masscan/masscan-1.3.2.ebuild
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
index 9f8ee2bcc6e3..badd693e2579 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 827 BLAKE2B f3beaced0e6e3ec513291c3594bc9594b1ba54653157509e72272fef8b5558f5240e59695928f8d05030383bf0d7ed34688672c08b02e1d9ff35eb5292f2a825 SHA512 10962e854eac0f349346efd01599b43fe699a7aaea7e03c6ce0a3b17ea6fe27c42ae942a4e1ae8d0ab118108c3c287beb580993d155bdad836dde5d7ab05aa1b
-EBUILD multimon-ng-9999.ebuild 827 BLAKE2B f3beaced0e6e3ec513291c3594bc9594b1ba54653157509e72272fef8b5558f5240e59695928f8d05030383bf0d7ed34688672c08b02e1d9ff35eb5292f2a825 SHA512 10962e854eac0f349346efd01599b43fe699a7aaea7e03c6ce0a3b17ea6fe27c42ae942a4e1ae8d0ab118108c3c287beb580993d155bdad836dde5d7ab05aa1b
+EBUILD multimon-ng-1.1.8.ebuild 814 BLAKE2B 7b9f0eb692b4686b7abccc6c8c47781dd0f85c52c1b7d834b884989215ebff48dac71278f539d1faf31de3133fd6e8229cdc17310af0a2ac6fb9b9eef02b5928 SHA512 620fc1aaf3cf4ff2bd0d52450d8937bbef45b1d8c0b17806a1e1f42378f6a07555a7eb0c10605691bb20a25434baec435bd8973273cf5c0e72052663903a028d
+EBUILD multimon-ng-9999.ebuild 814 BLAKE2B 7b9f0eb692b4686b7abccc6c8c47781dd0f85c52c1b7d834b884989215ebff48dac71278f539d1faf31de3133fd6e8229cdc17310af0a2ac6fb9b9eef02b5928 SHA512 620fc1aaf3cf4ff2bd0d52450d8937bbef45b1d8c0b17806a1e1f42378f6a07555a7eb0c10605691bb20a25434baec435bd8973273cf5c0e72052663903a028d
 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.8.ebuild
index da7b10babdb7..6e71ce63712d 100644
--- a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index da7b10babdb7..6e71ce63712d 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 2fb5f348397b..e06cf1fba593 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1,6 +1,3 @@
-AUX nbtscan-1.5.1-gentoo.patch 407 BLAKE2B bb761c5eab9b74d8988cae25ddb48662bab855c5ef4682acb29d4e4ca10f8fff4d3ef7d7495e1b684dc6c3d258197f32a04179c959184ea6ec8c7e8b6e994c1a SHA512 3bdfb90ac71eb599ec2eb3a8f83c3ba7d821da8cff9b5692aa03047f8212a88a9730c6ef3f20eb9aa250500aed5b49d287859be1d5b3fd4542a1cdb90c796d9b
-AUX nbtscan-1.5.1-includes-declarations.patch 954 BLAKE2B 7cbac59c29c3472fef5a87abee1bdd456f82dc5893777aaa0afce40d82aefdecefc53e60e822e9e9677a26315f645eee1069f8ac53cabda7eaa0a83361e4de02 SHA512 793499744b91621462802a6c53c1ba3e53de0537549b1f48047b81f7b34aeb1d1fa4b6dbe3c99048139061b05c2b5db19d9bbd9cb4a74c735a756dfb52843cc3
-AUX nbtscan-1.5.1-script-whitespace.patch 3784 BLAKE2B 3d8651982b85f1adc09726e90367ec40fd14db5480f5a96157ff379e54b955af0040d438fe78381284374c7574b803977d8f741616b90244740af33effe49c30 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6
 DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb
 EBUILD nbtscan-1.6.ebuild 679 BLAKE2B 4296c0705c408a0e82eec941db81158cbfac55ae6169dd6bddef8246d06e942b5b486453945bd1dc3b854b1e347a717d9e2b8ae677dacb0c2c51f4c6abd04352 SHA512 a2e0970efa4336ecf9e71950d12b181042d9c4e7658cd51fbe3c6911ac26816fb1b7c0be459b3aafecbce91e4bbef37c94f0e48cc3dfaa47fd68fa65fdddf052
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
deleted file mode 100644
index dbf2457bc29f..000000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,10 +11,10 @@
- BINDIR      = @bindir@
- 
- nbtscan: $(OBJECTS)
--	$(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
- 
- install:
--	$(INSTALL) $(TARGET) $(BINDIR)/$(TARGET)
-+	$(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
- 
- nbtscan.o: nbtscan.c statusq.h range.h list.h
- 	$(CC) $(CFLAGS) $(DEFS) -c nbtscan.c
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
deleted file mode 100644
index a585d4495fb5..000000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/list.h
-+++ b/list.h
-@@ -19,3 +19,5 @@
- int compare(struct list_item* item1, struct list_item* item2);
- 
- int insert(struct list* lst, unsigned long content);
-+
-+int in_list(struct list* lst, unsigned long content);
---- a/nbtscan.c
-+++ b/nbtscan.c
-@@ -5,6 +5,8 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <string.h>
-+#include <ctype.h>
-+#include <unistd.h>
- #if HAVE_STDINT_H
- #include <stdint.h>
- #endif
---- a/statusq.h
-+++ b/statusq.h
-@@ -103,4 +103,10 @@
- 	char* service_name;
- } nb_service_t ;
- 
-+char* getnbservicename(my_uint8_t service, int unique, char* name);
-+
-+struct nb_host_info* parse_response(char* buff, int buffsize);
-+
-+int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base);
-+
- #endif /* STATUSQ_H */
---- a/statusq.c
-+++ b/statusq.c
-@@ -29,6 +29,7 @@
- #include <sys/time.h>
- #include "statusq.h"
- #include <string.h>
-+#include <ctype.h>
- #include <stdio.h>
- #include <stddef.h>
- #include "errors.h"
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
deleted file mode 100644
index 4aca976dcd38..000000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/nbtscan.c
-+++ b/nbtscan.c
-@@ -86,7 +86,7 @@
- int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
-   int i;
-   unsigned char service; /* 16th byte of NetBIOS name */
--  char name[16];
-+  char comp_name[16];
- 
-   printf("\nPacket dump for Host %s:\n\n", inet_ntoa(addr));
-   if(hostinfo->is_broken) printf("Incomplete packet, %d bytes long.\n", hostinfo->is_broken);
-@@ -110,9 +110,9 @@
-     printf("Names received:\n");
-     for(i=0; i< hostinfo->header->number_of_names; i++) {
-       service = hostinfo->names[i].ascii_name[15];
--      strncpy(name, hostinfo->names[i].ascii_name, 15);
--      name[16]=0; 
--      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags);
-+      strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-+      comp_name[15]=0; 
-+      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags);
-     }
-   };
- 	
-@@ -147,9 +147,9 @@
- 
- 
- int v_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo, char* sf, int hr) {
--  int i, unique;
-+  int i, j, unique;
-   my_uint8_t service; /* 16th byte of NetBIOS name */
--  char name[16];
-+  char comp_name[16];
-   char* sname;
- 
-   if(!sf) {
-@@ -163,20 +163,27 @@
-   if(hostinfo->header && hostinfo->names) {
-     for(i=0; i< hostinfo->header->number_of_names; i++) {
-       service = hostinfo->names[i].ascii_name[15];
--      strncpy(name, hostinfo->names[i].ascii_name, 15);
--      name[16]=0;
-+      strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-+
-+      // Eliminate trailing spaces
-+      for(j=0; j < 15; j++) {
-+        if (comp_name[j] == ' ')
-+          break;
-+      }
-+      comp_name[j] = 0;
-+
-       unique = !(hostinfo->names[i].rr_flags & 0x0080);
-       if(sf) {
--	printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf);
--	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
-+	printf("%s%s%s%s", inet_ntoa(addr), sf, comp_name, sf);
-+	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
- 	else {
- 	  printf("%02x", service);
- 	  if(unique) printf("U\n");
- 	  else printf("G\n");
- 	}
-       } else {
--	printf("%-17s",  name);
--	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
-+	printf("%-17s", comp_name);
-+	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
- 	else {	
- 	  printf("<%02x>", service);
- 	  if(unique)  printf("             UNIQUE\n");
-@@ -199,7 +206,7 @@
- };
- 
- int print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, char* sf) {
--  int i;
-+  int i,j;
-   unsigned char service; /* 16th byte of NetBIOS name */
-   char comp_name[16], user_name[16];
-   int is_server=0;
-@@ -215,7 +222,13 @@
-       if(service == 0  && unique && first_name) {
- 				/* Unique name, workstation service - this is computer name */ 
- 	strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
--	comp_name[15] = 0;
-+
-+	// Eliminate trailing spaces
-+	for(j=0; j < 15; j++) {
-+		if (comp_name[j] == ' ')
-+			break;
-+	}
-+	comp_name[j] = 0;
- 	first_name = 0;
-       };
-       if(service == 0x20 && unique) {
-@@ -252,7 +265,7 @@
- /* If l is true adds #PRE to each line of output (for lmhosts) */
- 
- int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) {
--  int i;
-+  int i,j;
-   unsigned char service; /* 16th byte of NetBIOS name */
-   char comp_name[16];
-   int is_server=0;
-@@ -268,7 +281,13 @@
-       if(service == 0  && unique && first_name) {
- 				/* Unique name, workstation service - this is computer name */ 
- 	strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
--	comp_name[15]=0;
-+
-+	// Eliminate trailing spaces
-+	for(j=0; j < 15; j++) {
-+		if (comp_name[j] == ' ')
-+			break;
-+	}
-+	comp_name[j] = 0;
- 	first_name = 0;
-       };
-     };
-
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 82bfd4384516..1a0efb72f804 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -15,6 +15,6 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r2.ebuild 5665 BLAKE2B 46583cb723b418df527613742f25be998be31da3b5751b47f0ba3ff13e356ea200237b221792be2f62e54556a512b193c29491675c206f06e66c797d444a7c31 SHA512 fd6ec8668bb59dbe929ec7a5511595b105319016883a205ba3bbac2fa203409b4e68eccf12d74c968bdce232265433cb09affd004c977dcc546e0ffcfd8fa7ed
-EBUILD net-snmp-99999999.ebuild 5665 BLAKE2B 0653f7379afcd11083d445734d3ce3a9ec078c5e453b36b5e320680c14ee21585cee223eb4a6848614b3d1b35059bd684e3c8a2bc77309b58227e08b71c5f3b9 SHA512 488d36083a46bb4dabd577babec87f04ebfa87210248ccedcfe2a108ad49f7db14e544bbe3725aadd89b8f7116851f77a6a4852a08577b9c4fbf4c699c6d586d
+EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 002d2abbfe7c999dd14df3f36d2068cb846498fa582116c5ae7656a494dd69fb208f0d52590e47aaa3ab96edc3635cc3942f6be3d2881ff62b7b28e28cdb3cc0 SHA512 f39979dabbb37cac0d6c318c3205ed8b6fafba80ef392a2f21ab31cdd931e708287b6f38f2220f6c105ece8073e6f0d11e2c585d6ca27a0edc089bbadd26dd2e
+EBUILD net-snmp-99999999.ebuild 5667 BLAKE2B 2a1d78c1425552a505acc9b0252f07cb69e43d0c682c72b49e13cb356d09fa7da1bec0988fe68731990592fc6b9daeb55457221af4a1997a01f626175ec2392d SHA512 5611a026169cedb8a5659817b9fc2464ec2081374d2c177990ada057aff6aecb3d2051084b24a319b0be4b53ce16c6608a96723211ec9aee116afe85097d6cb2
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index 3972364ff6b0..e7d8ef4f773d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ DISTUTILS_OPTIONAL=yesplz
 DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
 PATCHSET=3
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 WANT_AUTOMAKE=none
 inherit autotools distutils-r1 perl-module systemd
 
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index d777fdc80b00..a24bf6edffd7 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.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
@@ -6,7 +6,7 @@ DISTUTILS_OPTIONAL=yesplz
 DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
 PATCHSET=3
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 WANT_AUTOMAKE=none
 inherit autotools distutils-r1 git-r3 perl-module systemd
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d5a60ecf1987..50336013fa87 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 3389 BLAKE2B ab07b075d60e5826b45cbcc182b9fbdb6c8a9822728eab3e9702ce1099d7cfa84312ec3cb009ed7be3235b152cf52522b45d2aa4f270e07d86eddf1c0037af30 SHA512 58ea8e9509ed34f4df2fa35b18c67db8fd74283a18ee43bcb200d2d1e4fb85086b8a9fb7f6a253304284c34aeb756335e343809e904d6c7bfe18cab7d081619b
-EBUILD nmap-7.91-r1.ebuild 2790 BLAKE2B 7a27264f2ba7c6955c8c8583d9653c431ae7320502fb4c7f66f4afebf86663f2497d895411a29cd8e942959e804465ba49db23452008fa5a4a904b7bb0b81ebd SHA512 38b413040e869eb094831ca3db993bf5db1a07703b9509dc56ab581c9b10132893fc7864ab4a5d7bd9967918fea238e2e5d0cc2a193c3555d8224e91a634ed94
+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.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 f6b39c905546..6a0187c3ab51 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 8b21bb0c8e6a..a46666146a85 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/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 53638b7a22a3..4865004ea387 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -1,5 +1,5 @@
 AUX openbsd-netcat-1.105-darwin.patch 1591 BLAKE2B 9df26c2efec9d234fa3bc8d1d20438b8bb5a1dce85e0d1c2636ffa7b79467af1b228f2a347bdc7795865784c3ce9d98b5e9801887bc1a4a7fbe9da0ce649463b SHA512 12a36f277b5a88491bcd8b3cb1c564bf9e3251c2a2b0f113ee425aa554bbb29b5cd2a87cdf0f67ad6b9cf3bc9a56d8a175d73ce4cb86fb4c531fd146b85b0ee9
-AUX openbsd-netcat-1.190-darwin.patch 3090 BLAKE2B d4e02d4f7acfccba697ae31ae61c7e843fbb3d2521f012e698a78e6cfe5f1c21020f64d69c83e6f4eb4ab43b8d4ffcf55118509f407b36d3d6e3a75fd75fc29c SHA512 7989c5161d7416878fb9335f18bab9d5ab4a972ef4f4ce971935a14eed4019170e79c393818ed89828fb5783ded617750e0a160ca78130cd85f654cc9e34940b
+AUX openbsd-netcat-1.190-darwin.patch 2806 BLAKE2B dcd54e828f78f038f00b8626c964e454bab3707f642450dc1118dd21e25cb79c993e6897b534f123a6d9eeda7f724e27c992f94c23ae8843eeb7457f687914aa SHA512 2d13d6541151adc045624c383ca8def21d067da28587fc7f55969205e18d9039b01e0c1b9c31cba3eaede4fe42fad95aa6c75445faa831379849b7b74910d663
 DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6
 DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703
 DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
@@ -9,5 +9,5 @@ DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e4
 EBUILD openbsd-netcat-1.105-r1.ebuild 1423 BLAKE2B 75f4fd8f925ab192dd5e4f8ea279bf9c18d443b6d7b48f824da78f88c3847410912e7ffbccff734c7b7b29cbfc22ed125524bd4be0a7347dddefa78058453ad2 SHA512 337b622157df344fa2430815f5087480b1c87c3c807a0ab0c079d1c43831bd1f6c74d8188b4bf2badb85f85d3789c8853f72aeeed7680c33c92d660c1d5eae03
 EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b
 EBUILD openbsd-netcat-1.190.ebuild 1535 BLAKE2B 2c11da018defad27a26f330eb2ba5da7154fea24a318390df095140d3a32516321f0326615608448cf844234c3b645ff61f2cc9665b8aaa265be68067dc0831a SHA512 bc5262850ed5bc33efeaf94a8f540eaefc58341e410b93ccf0d3b53d946985dce352c7a5484921203976060040ac79b6fd58002c0ac27f9987ea9995549d5192
-EBUILD openbsd-netcat-1.195.ebuild 1535 BLAKE2B 2c11da018defad27a26f330eb2ba5da7154fea24a318390df095140d3a32516321f0326615608448cf844234c3b645ff61f2cc9665b8aaa265be68067dc0831a SHA512 bc5262850ed5bc33efeaf94a8f540eaefc58341e410b93ccf0d3b53d946985dce352c7a5484921203976060040ac79b6fd58002c0ac27f9987ea9995549d5192
+EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 1854b0dd8cff8a0d73d14ab5154b51b51b890ca1d51ca6420bfdda8eb38b59987cebb0334ade87a8dbbc754ac6d949b14e892994881690a2c7e5b4d62c0b4751 SHA512 2c3d2ca937983331fddb5f699825ad1c7abb9e82e9f08e24ab4faf5f903b303b520b1592ad32cec52fcf874d34ece89192c6c6401faa1b36b7315003f38f37fe
 MISC metadata.xml 244 BLAKE2B 469b378b5a64e098c2f091fba31658d2193fbb4272f21d40e404757623bbe614474336eb8ef7d7820be4299cfdb6eb41d30fab05327993bafaaf52f9965dfafe SHA512 a8f913706b597ddb605f7e9ad505417dc7422a64037ba11e3a1826e60b882b9b5fac56ce9afd0a6c84380f2984e4079803d10ddc13e686025f65d7228063b59c
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
index e1a462e746b7..a8453c09067c 100644
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
@@ -4,7 +4,7 @@ diff --git a/netcat.c b/netcat.c
 index a0fb51b..bbb5dd1 100644
 --- a/netcat.c
 +++ b/netcat.c
-@@ -51,11 +51,13 @@
+@@ -51,11 +51,16 @@
  # include <bsd/readpassphrase.h>
  #endif
  
@@ -18,6 +18,9 @@ index a0fb51b..bbb5dd1 100644
 -# define IPTOS_LOWCOST 0x02
  # define IPTOS_MINCOST IPTOS_LOWCOST
  #endif /* IPTOS_LOWDELAY */
++#ifndef SOCK_CLOEXEC
++# define SOCK_CLOEXEC 0
++#endif
  
 @@ -108,8 +110,9 @@
  # include <tls.h>
@@ -87,17 +90,7 @@ index a0fb51b..bbb5dd1 100644
  					/* For now, all errnos are fatal */
  					err(1, "accept");
  				}
-@@ -1092,14 +1091,16 @@
- 	int s, save_errno;
- 
- 	if (uflag) {
--		if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0)
-+		if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0)
- 			return -1;
- 	} else {
--		if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) {
-+		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- 			errx(1,"create unix socket failed");
+@@ -1100,6 +1099,8 @@
  			return -1;
  		}
  	}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
index 7994e7f7ba34..9e669ea4b2af 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.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
@@ -30,7 +30,7 @@ src_prepare() {
 	done
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${P}-darwin.patch
+		eapply "${FILESDIR}"/${PN}-1.190-darwin.patch
 	fi
 	default
 }
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index abf8ba9bf6e9..67d7f77af1af 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -6,6 +6,6 @@ AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.7.2-r1.ebuild 4285 BLAKE2B fa7988df0a282ca8744f67c594eca3e6946d33009aa51b9230a59bce11c73e3b50434a09f831f7ed0445b4b48062934237492276a7a3f217045a321f20ae9384 SHA512 331b0993d3f352187b3e65fe841502fc4cb00f3353b6535d5fdf4c13aed808196c7f3ec6e5b86949c356f2911d4f26e9a2a75761586e585234f20531b4b70b28
-EBUILD rrdtool-1.7.2-r100.ebuild 5668 BLAKE2B c945fa05d9b1c9a6de4fbf9986200ea90928636991d381dc41a54e4e9d78085ff6f9376225fbdd5a3ccb6050ea5a30fa19b035c7d14a78281b12d8f15d4ba0c0 SHA512 1511bddb784821b36b9e84226e6f8a19bf471d22f24e5963942d0e95949edaabf4b4a6cad240d627ed659af91a81b138a22bd9320215476a25c6ad5b0d1f3c51
+EBUILD rrdtool-1.7.2-r100.ebuild 5670 BLAKE2B fd95afabbd2bb214eac8e8030deace0b142fefdc3b8c021e9e573cc3245637b163e037a482c07dd30f4c4e5a6cebe32e1858d8c06fbb0fa404b442836845290b SHA512 bb07a06155cf801c3dfce92587f736522805efeac21a1f9775f85840f169857537209ecbca97cea7dfb067145988cdd0546f913a4dd8cbf3cba01c5098ed52a5
 EBUILD rrdtool-1.7.2.ebuild 4290 BLAKE2B eb6142d4ab03c640e557639252d8db5818a30944cfc06b19fc7e7b0132cb25b5f22564684fa836750bc0a6695f8cdcd9aa97dcda3a15cd5edbe8b8ab1c34fe7b SHA512 52b56a2512525888b7eb6d40c3ad7f890d5e16a8e19840d099707965915281201f8e9a6db3d501eaa4e850de5963295ae49043a63803393ac98f23ecfd5aeb76
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 83d205320d67..8e87060d737d 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
 
diff --git a/net-analyzer/softflowd/Manifest b/net-analyzer/softflowd/Manifest
index 10b34c339897..fb23c6dc2708 100644
--- a/net-analyzer/softflowd/Manifest
+++ b/net-analyzer/softflowd/Manifest
@@ -1,5 +1,3 @@
-AUX softflowd-0.9.9-_GNU_SOURCE.patch 506 BLAKE2B c3de95b807fb6f7c69c29c75d90d442e0d7f176e93b93944c5135a4e785aa3d88d663083637af8eda6198b59191a2a6afe28f50d7d30adfe8b8eb63afa58a9fd SHA512 b4e12a3e22bc055fce39427885e44803cde613a191ce44fc4b9e08d0d9eb480a899ee8eec1ef1a9561063850aa420ef1dffba63de07add6308ab79ec63e81119
-AUX softflowd-0.9.9-no-strip.patch 605 BLAKE2B cafd876892aea44ef8650501e66364b851f35f434e8959f1d85f762799af06ed45223ba191c43607d42a26066d11b1a0c257ac33c75929813b2d9670675c0d39 SHA512 4c42a64634dbe852d5c1563face382553c8091b8c36ce5fb40eab40492338019abb2b26b0e9c47fca602a324827fb130131ce16a32cd2450612ba6ffd3501d77
 AUX softflowd.confd 288 BLAKE2B 2adc2fd3c739982d08266b52e180b07e0e77ce1d1db8f66f935787b4eeee9ce5f419362f1854b5754a7b11cb78b52bba4ff8f39c082ddb5dd612e6ea9a25b795 SHA512 78edfe72bee5998ac6d91e97a119370e223f1fe868de43dfff70e127f202af8f17b3f96c6d0ed8f23ad022e314a1dd3cc0c3da19e85cd7af427671f7247710cb
 AUX softflowd.initd 1536 BLAKE2B b47f50af5ea4aa02a93050d37275c209db5c9d7ff3e09efe7c55f4af2a9b955915debc359f50f5e574086d4a82001e896559a4c61730b41af03d57b4b82eb35c SHA512 42ce99bbcc6ddfbb6a3e4c54100cce05ab1edf4c977c6c97e224b427f64fd8cf42f727dd6f4454919232987f177c6875f0ed86c89712b1a042be340a2d6e8ffc
 DIST softflowd-1.0.0.tar.gz 168379 BLAKE2B 97ce677adf8f8278516f25e82db1757ad5fe208fb8923b189698525d58d60c998ea847f29ae91eefed57d7bd1eb42f119a99e46346753539cb3a9584a90eb484 SHA512 01a4f89755c957a495b08c49b572b8b6aa41f5ac7672feb5e31b039fbfab84f3a206b1da95b11de2ec5882123f6ca2387c02efb874ce707c2263bf79b56012fd
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
deleted file mode 100644
index cb4844803e00..000000000000
--- a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-setresuid and setresgid need _GNU_SOURCE which clashes with _BSD_SOURCE
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,7 +87,7 @@
- AC_SEARCH_LIBS(socket, socket)
- AC_CHECK_LIB(pcap, pcap_open_live)
- 
--AC_CHECK_FUNCS(closefrom daemon setresuid setreuid setresgid setgid strlcpy strlcat)
-+AC_CHECK_FUNCS(closefrom daemon setreuid setgid strlcpy strlcat)
- 
- AC_CHECK_TYPES([u_int64_t, int64_t, uint64_t, u_int32_t, int32_t, uint32_t])
- AC_CHECK_TYPES([u_int16_t, int16_t, uint16_t, u_int8_t, int8_t, uint8_t])
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
deleted file mode 100644
index c48603a7f491..000000000000
--- a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,7 +52,7 @@
- 	    $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
- 	[ -d $(DESTDIR)$(mandir)/man8 ] || \
- 	    $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man8
--	$(INSTALL) -m 0755 -s softflowd $(DESTDIR)$(sbindir)/softflowd
--	$(INSTALL) -m 0755 -s softflowctl $(DESTDIR)$(sbindir)/softflowctl
-+	$(INSTALL) -m 0755 softflowd $(DESTDIR)$(sbindir)/softflowd
-+	$(INSTALL) -m 0755 softflowctl $(DESTDIR)$(sbindir)/softflowctl
- 	$(INSTALL) -m 0644 softflowd.8 $(DESTDIR)$(mandir)/man8/softflowd.8
- 	$(INSTALL) -m 0644 softflowctl.8 $(DESTDIR)$(mandir)/man8/softflowctl.8
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1fb5a3a695e5..28db2c120f41 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d
 DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
 EBUILD wireshark-3.4.2-r100.ebuild 7048 BLAKE2B cd9f0f0b03798fb023c2f5cf8f8fa0276f6d36a002097b57139bd52860f8d6c0718663268819898c12437723a855fca16d37668291ef3c5226a8c33ac845fc94 SHA512 39a85dd6b01e3de8978c1bde8de0693a6ce2e08f1ecb296994c6f8ab38d61c5919a7e1bc2c50386eaad3d6c6cbab26c7fd5b08aed315596aac749fe706a2bafa
-EBUILD wireshark-3.4.3.ebuild 7065 BLAKE2B 837913290c11a3cf4849429084f019742f764ea2499b617c23cb73f6ed958e823fc17f0b5ef166685db930f9ab71935baac22226e2820f5ae9556b8036d9e46b SHA512 e911418c354be419b67577b4f9a99a7a2df4ce4b55cf979af7a639ef53e5eeadd91c9b15ae4f2e3db26681236773d0d21a322e04d0a96272edc2038d529dd7be
+EBUILD wireshark-3.4.3.ebuild 7064 BLAKE2B 9ccd4ad0a7616800d9e807e3b29251f7fdb744ba38f52b7e32e8b1f96ac26196bdd7b428d329256aaa234f2fb783110c55d34e27c9eae2e208712ab4faca53c3 SHA512 87a396fe18db80ce249fd3e8aa36846c7843363aa2f51a7ebc266a02ca9ef9ff07e10b922bcfce300f792d4866e98db5040024f24ef516aa498f377e1721cba8
 EBUILD wireshark-99999999.ebuild 7000 BLAKE2B aa5d6f86cb7725b6006cd0444635e92f39aa9f9bdc52546ff7dd627aef8bbb2bdac810219ebb5e371fcec2c5acc03ae578f389838845f31445799464f3797b70 SHA512 07c3d58bfceb06f1896226329202d44696466fdb4c732306cfb923cb40a9241efe80c985a93ff82b302003cf9d03bd504bb71ec706452c1b5805ba2ccb603521
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 443fd2b7994b..311f89608fec 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb