gentoo resync : 11.08.2021

29 files changed, 338 insertions, 47 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 71f4a6e4bfed..601d150849ad 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index ae2b2b546d58..0b1b9d2adc0b 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,5 +1,5 @@
 DIST bwping-2.2.tar.gz 119688 BLAKE2B e30afc404f73aeff28e2775349eed9e6a113a7c0ef33798de9dc983f2ecb08ea1dc0838067aa83bd83e513fa9640bf38fd04a924c382bf770779892dcc39f8ab SHA512 4c0338359fce039357d763a0bdb8ea133a8c63f0e7eb2cbdc294454cad97b6e9010bf8898948aa2572418e4ae667d25dd54475a162f029c052b9611795ff4230
 DIST bwping-2.3.tar.gz 119043 BLAKE2B 2780f22a2cb541821aae3ddf0eaa5f2cb662ec8f190c44f7e28a092f4e07f9b19d1388b9ddaec0133cedef894c6ff64a9e53035fd73e44a8f0aae518c8b9dc7c SHA512 e8afed0d4ff0ae668f1700e3c93e4b6298e4861568d4786630826bf0f3519089602b9562c92b2c3bb97904faea0da6a084fb60cc69bc3a0a931bd0f55af3ee49
 EBUILD bwping-2.2.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
-EBUILD bwping-2.3.ebuild 464 BLAKE2B b8f2d8f1e1b62095c483789296c2d5687a22e1ec57ef3cd9aca9e15b15e1b280315c46063165212519e1812001d691947aec09b946275df73c86ff4b4fea9d44 SHA512 c20cb8e0c954e27abb3e4f20754722939accefd8603c79c02dfd544a2a2524bca626e45498d03a9c32a049224ad158e5318a6d53e261f395f85adcf168c317ed
+EBUILD bwping-2.3.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
 MISC metadata.xml 713 BLAKE2B e9792f974ce687d37a8faeddf987f0eda5086097fdf8db3d9ad5cf240bd65059232cee613fd1eec064916361fdced304f08134c3bfade7953f94ce2cfae90352 SHA512 199486090bd90174304b130e5c84e2092c535fcb360ab911ad44308f6a4ba1ad822d824cf370942a5ffceb30f86d4ee43eba25ee56d344acf572592b142bf156
diff --git a/net-analyzer/bwping/bwping-2.3.ebuild b/net-analyzer/bwping/bwping-2.3.ebuild
index 34866c961db0..635807686164 100644
--- a/net-analyzer/bwping/bwping-2.3.ebuild
+++ b/net-analyzer/bwping/bwping-2.3.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}-RELEASE_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index c9c32b609286..0efeaf9178f1 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -1,6 +1,6 @@
 AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
-DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076
+DIST cbm-0.3.1.tar.gz 17297 BLAKE2B 7b8bd12d8b4e9af5235512dfb689d7b55dd8b1b28b387eb987b22dccede7ca0bbcf33ddb884545532aaacababa243b5867fec8d205ceb2c2244715b614082e9e SHA512 ab971c1fb9f9da9749fa3ae36ed8914dbd8b6afb74d038e0e06856687e76b3a8bdd3522880db0c9c8e82e923907f7f3fc487e88828fa4b4d93b29b012fafce02
 DIST cbm-0.3.tar.gz 16473 BLAKE2B 165b01ec6d0fdd691763d990e1fe81b010942077f593e64fd3ccf5f070960612ddb2ccd1aef87530b0d0fe4c40e5d758c55d33b4b6e1c4b850769ef46b8a6b79 SHA512 dd4845465b34b978e6c696d6b0fa61969aead4bdd4474a264667af63cd99c5a1035f4961645237c3870dc366ea4b131c2e005d2abb2774814d127a61ecae8e29
-EBUILD cbm-0.2.ebuild 644 BLAKE2B 4d8d12be2e0f22df0671682acb74db9b0664b16fa69397c080c85e390d2288577d2b210d73f1f533dd1dd0bd0935600e7a086e071451985765931c65c4fc0143 SHA512 b7230fa1e1ceb8abbef8f2de5a77173c7b73cd2fad7205abdc6da649dc18c45230a76506b4167fc421d555e7b4c7fa7952069cb68bd5cfe85a70d8de1f5e6215
+EBUILD cbm-0.3.1.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9
 EBUILD cbm-0.3.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9
 MISC metadata.xml 387 BLAKE2B 0cb8910fe08af4b1b9a874dc196724cd4e7d7f65d3112ec24bacc6d338d2931afbda0755cafc89e2ce844893e1649675e34f37c0baa6d141faf45a7ca77f866b SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6
diff --git a/net-analyzer/cbm/cbm-0.2.ebuild b/net-analyzer/cbm/cbm-0.3.1.ebuild
index 970db519d022..22ae3162bb6a 100644
--- a/net-analyzer/cbm/cbm-0.2.ebuild
+++ b/net-analyzer/cbm/cbm-0.3.1.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="Color Bandwidth Meter"
@@ -15,15 +16,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	sys-libs/ncurses
-"
-DEPEND="
-	${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.4
 	app-text/xmlto
 	virtual/pkgconfig
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2-tinfo.patch
 )
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index e935966a8e18..7d30c0d497b7 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,5 +1,5 @@
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
 DIST etherape-0.9.20.tar.gz 1480790 BLAKE2B 22682d1b7b72206519d0ad32855f558a718bed83674753fcc923419845ac8b97ce970c1121f49eac9b910e10675b5397e5d3a16701af5bc9b78187baee455ccf SHA512 1dbfbb0efff7871a4b78ca90f81ac2155b57ace217b72e443cdc8b3d3807f7ab881c876bec12d93673500026a9dbf1111417a419891df62230e664af9b54b636
 EBUILD etherape-0.9.19.ebuild 563 BLAKE2B 408aa0eddba3ddeabf7bc90662f211e7ec73552ecec7d8e09e4577e7e46a28dd25d1a8f833a01525c046cbaf0b580296f4dcf5682dda22dbe32f2d1aa268c6e8 SHA512 a60c429b91d341c11627e635856177cc5b7da7f29bdd287116edcf8e573d8be4da8d3b3a162ae12589bbbb67a444596de3f637e49990d087230e67b0b8d4cfa7
-EBUILD etherape-0.9.20.ebuild 577 BLAKE2B c8565cb20ac438ebd3eb23922cfd166a8f527ad3570671867aa1fa60278d7d21456720c3f017d5139ce62ce08700e11c13be4df57669bd9acca8419ce8fc8838 SHA512 e3b70188c5c89fdf18e5f1eaa8c9e3b290a7cf8f89f2433b59406570c7e610625cab308a89233909602ed713ae92d7a9022eb4cc4b0a593730c11cbbd3d925bd
+EBUILD etherape-0.9.20.ebuild 572 BLAKE2B 31d0ded0af53d6131ce3b5718e86c319679c76bad7d6920821204be46a48012597495d6c083db769e61a8b8b6d622e8988cefed35d63b8e7909bc5b958727392 SHA512 93ced8fb5135d2c015fef05ba6e0d343e652108ac5df66fd95db378eb9739691d2346c3b2b0f7ce47fe5eee5a02f3ad34dce199c13c283c485f230b3333d7b5c
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.20.ebuild b/net-analyzer/etherape/etherape-0.9.20.ebuild
index 1df3baebd4a8..e1b4495473b6 100644
--- a/net-analyzer/etherape/etherape-0.9.20.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.20.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index bbefb09c8f51..568bfe3b9f47 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,7 @@
+AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9d9d15a1b0205a1d86f132e3faa5ea3e5cf91d55082b2d264e558dca4b7fbe62f643601b3315ac31cae387c433c2d90b670965abfa744f87 SHA512 dddff4858431170f5a24daab2d3cedcdcd7a1194b8ecbbcd794dfe00dcaee4af410afef102d3a25f86f541267d7be63e3e1d239c879e95d20cef9f0dacdcdc4c
 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
+EBUILD fail2ban-0.11.2-r1.ebuild 3689 BLAKE2B 5dc2fa9338ed3b48fa81521ce89ed70eafe0da29fa224c3bd7f364cd6472e19164b4b271553d607c38d83d5058ac5b346d95d917b9caa7028f0dd1d052e1adeb SHA512 ed072821e005a52809b6bfd0f0885bb3e90d157f7e5f638ba64efde3132f781e2925316bc45cfcf82dbbeb05422e74bc38d631004e0f83cc64a712b692035610
 EBUILD fail2ban-0.11.2.ebuild 3625 BLAKE2B f4b38ddd45e4cc6f9c5e39a56aae7e131c98d3867fece38c5e6936161b47b6885e6d5a294be2531a8b8a4c4d67f38b7bcb03156b8193f3bcb3279c3f0a40732c SHA512 ce4be968377b06d0e95735d487a7c1c9de1b19a659b12fe03d50a792fdf69fdc81633201417cd6a932220d9228c4e17e3d8e70e884eba7c5d2cc9d1b6624c216
-EBUILD fail2ban-9999.ebuild 3577 BLAKE2B d355a7e2dd272987146d9bf37de7ff205052837ad04324964e7bef2a18759c0db07ca3cbe494f989acf36663138a3ed5755930ef6c3de99ee50677c4afab2733 SHA512 9553bf8079c7b886c038a87aec8bca6862290568463fd5aaf585741853ac4b8582e0b033a5ff40d9174cce5d47b8617dc23d971eb17e398638021f30c93237bf
+EBUILD fail2ban-9999.ebuild 3647 BLAKE2B d8f991763425786647a84c1323ab5c660be6bf5accbe2a3d97b771b55f83880d59b40205fa4dd70699a15f04c5ab6ef634fc00962b8ed8018da668b6fbf71f08 SHA512 95d57eb6462f8907a9c9bc0632213935f62a8741350c0b8878765399bf413496ece5b1e0b1cf7a3d58e5b7fba0730ff3261e5201f346c11f779eb7973bcc8174
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
new file mode 100644
index 000000000000..a858cbe09d29
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1 systemd tmpfiles
+
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? (
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/python-systemd[${PYTHON_USEDEP}]
+				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+			)' 'python*' )
+	)
+"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
+	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
+)
+
+python_prepare_all() {
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	./fail2ban-2to3 || die
+	distutils-r1_python_compile
+}
+
+python_test() {
+	bin/fail2ban-testcases \
+		--no-network \
+		--no-gamin \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
+
+	# Not ${FILESDIR}
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
+	systemd_dounit "${T}"/${PN}.service
+	dotmpfiles files/${PN}-tmpfiles.conf
+
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
+	if [[ ${previous_less_than_0_7} = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2Ban!"
+		elog
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite] ; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+
+	if has_version sys-apps/systemd[-python] ; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 2ad8f462e23d..9d117cebef47 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd tmpfiles
@@ -38,6 +38,10 @@ RDEPEND="
 
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
+)
+
 python_prepare_all() {
 	# Replace /var/run with /run, but not in the top source directory
 	find . -mindepth 2 -type f -exec \
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch
new file mode 100644
index 000000000000..3017883f0d5a
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch
@@ -0,0 +1,29 @@
+From bda9b88e883207b99781352c68610980e23fa62f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 11 Aug 2021 01:58:05 +0100
+Subject: [PATCH] Adjust Apache log paths for Gentoo
+
+Closes: https://bugs.gentoo.org/805485
+---
+ config/paths-common.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/paths-common.conf b/config/paths-common.conf
+index 7383caf..4f4a6e1 100644
+--- a/config/paths-common.conf
++++ b/config/paths-common.conf
+@@ -36,9 +36,9 @@ sshd_backend = %(default_backend)s
+ dropbear_log = %(syslog_authpriv)s
+ dropbear_backend = %(default_backend)s
+ 
+-apache_error_log = /var/log/apache2/*error.log
++apache_error_log = /var/log/apache2/*error_log
+ 
+-apache_access_log = /var/log/apache2/*access.log
++apache_access_log = /var/log/apache2/*access_log
+ 
+ # from /etc/audit/auditd.conf
+ auditd_log = /var/log/audit/audit.log
+-- 
+2.32.0
+
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 702e9b4eb5e7..f331eb91cc62 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -3,5 +3,5 @@ DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c572
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1648 BLAKE2B fa3fc6c694fc056d1f55d96855784ff492a40d312639820519a786b24549e9031e43016ea791d99fdc82c06fd7c4e0d2ffa59d85e9159948d4f1fd830ae53645 SHA512 2d35b812bafa2865c55370c4825e78e53a5c9f2bb7add8f64194713312856872ac2a37de4b5aa69a23fc45fa96c413ee77e450c2e93c750c8f01c0ca93be956c
-EBUILD netcat-110.20180111-r1.ebuild 1320 BLAKE2B bcbffe3eb6c486b9500b8ab08c1ad097ece37ddb05966814d3e55a0cf9af501f146307bc489e9fcd9a2cc427be66d6125c12a730ecee65d83056d29334cd9f28 SHA512 9407ca2c7173f8faa09716ebf1f42e61349a125643af6f7318080cf8899626c85db707df0c9fef64fdce5166fa32ecedbad95ce4f68bfb829869600d72930225
+EBUILD netcat-110.20180111-r1.ebuild 1314 BLAKE2B e0859faed87546fc50f0e34d39067765c6643eefc8ca30f5fd94386280dbdef7e950d0b1db66cbdbb673291503bd0a564d98943ce5b937cf754f37b288326127 SHA512 4bd4020ad473a78229abf5952864645d89c776e00c1bfa7c098537f8e9228764358f90b288ca22a13a8495cd1d700e6a8ecf3bb4f5c7e51f29c7bb2a3cfb8cd1
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index 3e8c204b0133..3a8c40a30ab9 100644
--- a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/nc110"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
 src_prepare() {
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 0d46c108bd10..0894db4461d2 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -6,5 +6,5 @@ AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfb
 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
 EBUILD nfdump-1.6.22-r1.ebuild 1720 BLAKE2B e0d274c34ddf13ea1c7de9e6010641f11a564ca3cd35c87cc4a2557f7beae27e183de37734d51f1e785053acd7ba729eeda55fc83c0ffa949cee17cd7740890d SHA512 426138c255976b081d91fc0640974e4fff47b0438acb617bc7bc469f84a1b1f54d3fa6b1b562e0efe8fbe556d839cb3633c9801eeac8eed2a5c4c768c1534829
-EBUILD nfdump-1.6.23.ebuild 1674 BLAKE2B f09df24b3d422fcb371057531f858d5411dc73ed325b79e2fb4ee1285ff4f77ec0a98dfcb442a493821953db73e2568e7c9b8ac77efa26218e28f86142a666a8 SHA512 e7981d17b39ee22dbd68ab6bc263487e932d5a24d57e5ec5e22de28af6d29e3d3823a3e957aa699b7873c8ad5212731cf8fb0c49291160adeef60bfcca1ac78a
+EBUILD nfdump-1.6.23.ebuild 1672 BLAKE2B 4d0b88c5592b18da7579e01047b4986984627d3668b09271d5a792cedad3bb9334317026d3cbaf70449262d425c8984a1cd5be2de2b15aa2e8c57b80cb93d539 SHA512 754513ceb76ba46f7a7cf48ef6cba87f060af153c671d56d08bbcb17f4988061c3524d28deed0d32fd30a1023dc4d994e61bed5d45468b434e0d9cf349fff856
 MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
index 6790afe4e55d..9c9c2bd847b6 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
 
 REQUIRED_USE="?? ( jnat nsel )"
diff --git a/net-analyzer/nipper/Manifest b/net-analyzer/nipper/Manifest
index f0fc08642ecc..7c34b0fb6f79 100644
--- a/net-analyzer/nipper/Manifest
+++ b/net-analyzer/nipper/Manifest
@@ -1,3 +1,3 @@
 DIST nipper-cli-0.12.0.tgz 34157 BLAKE2B b4945ef0d2a4ed7579b6f9ee7d80be1b8e57621797ed023a03fa05f94eca0ec781a5438d12b20dc61f16eb5e7776219788a4c1b76c3b6222df8a6fe755f573e4 SHA512 f65f1e954d9a054136f0a3ac5ea1c25b46a74fe640860fd45093206402c7bb9e566b33cc03ed144a0fd7951f94d94390100344c24ff5343473374676e807f742
-EBUILD nipper-0.12.0.ebuild 440 BLAKE2B 340e0c9a516f9e0687735cbf14b63d7ae7c84de25e4427ad9ba6ea68fa97f4c5a6c6c03d69fd016121052143c9858529a4e380e2ccfa63ebfa99e901525ccf4e SHA512 5d2790a1e9c0af3c0b6d0916e3b386c0fe32c6b1eeb444b10f0074ceaeef1cb799cb081affef4c416fe9d7421ae8272702e1b97111a8b82eff9316b9c608e56c
-MISC metadata.xml 318 BLAKE2B f5c07504aa2c9809ffa2798644d13a73383500e16a25f5e2e47502e71b27019badbdffb08d91c705e69708d56154070b82c9d1eb5a07f23c540eefb185e01480 SHA512 8b02dbd54b036d2aa1f1bebefd77ae6a0caf5747a99a00085ad9aede3dafbb62d1c81f276ba8f758999c9f9c84d3f0f15aa3ba82b9c2246f3db7505ffa33e81d
+EBUILD nipper-0.12.0.ebuild 428 BLAKE2B e0d368c9042c238de9b78e8a607f42155ef1c58af8b265393d1a291a9b1841f60ba6c943ab259b183391cfea4307331da539c9d68c8dbdc396f9c7079fcf7372 SHA512 8ac3cfac37bbc4309152b72265ca188fce3be38a00d9ba2caad0fb4fb7cf578a5214cab20b7903a623dda75684d7e5cef6e3e39412e0d65e45daf088a83f7d1e
+MISC metadata.xml 243 BLAKE2B 7b0056630c1c87a1d5a93a71057b2ee48a295693e3767741c6c841df2f9a723fbf4c8c2a0765895e2028a41816271b4a93a9616e3ac3f3b76a184202cf3f7e6a SHA512 34cfd346b7f7c38ca4663d17494fc2a0d001206a401e55a037ad8ff45fe9e63b3b1e244fea9fd584810d75f3f8034e68875a81f384ae8e698e2b4c2f45636afd
diff --git a/net-analyzer/nipper/metadata.xml b/net-analyzer/nipper/metadata.xml
index fb98633af89b..71daedd3b38b 100644
--- a/net-analyzer/nipper/metadata.xml
+++ b/net-analyzer/nipper/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">nipper</remote-id>
 	</upstream>
diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild
index 534146bbe3d1..cb8d8c2c8668 100644
--- a/net-analyzer/nipper/nipper-0.12.0.ebuild
+++ b/net-analyzer/nipper/nipper-0.12.0.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit cmake
 
 MY_P="${PN}-cli-${PV}"
-inherit cmake-utils
 
 DESCRIPTION="Router configuration security analysis tool"
 HOMEPAGE="http://nipper.titania.co.uk/"
 SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=net-libs/libnipper-0.12"
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index b16099c16091..54e845ab73c6 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -15,7 +15,10 @@ 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
 DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
 EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
-EBUILD nmap-9999.ebuild 3199 BLAKE2B f77fa1c163955c79703536ed201aae478bb1e165814764b5d994d04c66f8f5c18ea37d29227bb71362e10d6b5e5239ca97c081f4de60d1adfecce6b2982d18b0 SHA512 4d4fa28592a7e250d45bce010e94f6576fbdf3a995110b6e4ed19e28ed8c534635e9a2d1697577bfe4f5ddab04a3457592c71cfa219fcfddc70cc9951dac69e0
+EBUILD nmap-7.92.ebuild 3177 BLAKE2B 53c4495a7b5d7565782538088298fd594f374dbf685d9eee9b6cfd61e1e8e9399c26521f7cacc880901e76503b9b0e0f3d0770673547bda1ffbb9aaed07c6eb9 SHA512 a2dc96642b187e5a8616e642848b3963e70578e824f0dac0a5a023c62e32297bd627b52eb0d9d6a5626651187d971fbbc57223b9b4847c5916dcd4b5172ac08a
+EBUILD nmap-9999.ebuild 3222 BLAKE2B fde1fd8e24e9f912f02b16bd92aaa5f4981114cdbf300a657eb6e3ce60e463cfff45f82bd9755481c884db0534823f1f43a758e9243a31cd8193b3b569fc9558 SHA512 e65d00ee53d629596e0255471a200ea5ed1ea70be1840e6ece49b2d475342226e814aaa5f51fad32b35dbbaf003b5a789f5d42436fdaa8e73b087a907a771362
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
new file mode 100644
index 000000000000..d0ab6cc2b59c
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+	# Just in case for now as future seems undecided.
+	LICENSE="NPSL"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
+	inherit verify-sig
+
+	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+	LICENSE="|| ( NPSL GPL-2 )"
+fi
+
+SLOT="0"
+IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nse? ( sys-libs/zlib )
+	ssl? ( dev-libs/openssl:0= )
+	system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre="${ESYSROOT}"/usr \
+		--without-ndiff \
+		--without-zenmap
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0b17737335e2..58f0f67de1fa 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -17,14 +17,15 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
 	LICENSE="|| ( NPSL GPL-2 )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SLOT="0"
@@ -101,7 +102,7 @@ src_configure() {
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
-		--with-pcre=/usr \
+		--with-pcre="${ESYSROOT}"/usr \
 		--without-ndiff \
 		--without-zenmap
 }
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index acd6b8723cc1..e8f1f8563dcb 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -7,6 +7,6 @@ DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 37424499cff6a5e1dc811f96e1677f4efdb996be069f4474726387dd33bff2305c1cac3127a3330621bbd1cf111f181c4b0a7f47f4a7773d78ff4448f57f4c6e SHA512 b0f937130dacca550c89314f599c32bc6b36747bc90e884a58b4cfbda2a1f28fb2fd1fc66e5507b3412b26ce7c9039fa562cf53d123f92fb5cabe48fa7f24573
-EBUILD openbsd-netcat-1.195-r1.ebuild 1731 BLAKE2B 80f578352862419ba0adf7dda2dd6d4b1538460be152a354b0e8ee987fc9319a5668e5dcc53e747d9e583d0ab280627ad5d51328e4fc3411c27fc84aa44a62e6 SHA512 d535c9ed6fc4d7ff319ac723fa8f4ab5d4a69ffd2319b4285bb5c2b0e39a6aca60497c2838372b27715d5df538a36254025e91849e477a0c8c25c6b4f215188e
+EBUILD openbsd-netcat-1.195-r1.ebuild 1736 BLAKE2B 13f8074a8a4f6bb1d8a39f4cca3216df7200d675b3cc9cf4ffb52444245e78cba4c5248b777fbf01fa1b87e5a7a0c72bf93082b3d455aee6d9750a17d7b6433c SHA512 484fddf115f7c38a306bfcec77d19d921a2c9fafb6f0d1630cb44ed99ed3eb71dc31acbc90eba2499f4524085bd8db6f4b8db0f0a92688b956043b84f22a8e9a
 EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 97c48f8f148eed200429efa52e13ef924d92be828bcbd0045e5ecde9664e0c71951254b0bef38bd9f738be2f59e49893218635c92e752ac45d9ab13f54a5fcff SHA512 a5696d2915e8dc5d11d9756917717420ac08fbb319aedee66171299290c13f4ac3e55775d9072cc24b31e15df01d7f9374b98cc2a9c22b6ffc7cd5d83b6a57d2
 MISC metadata.xml 244 BLAKE2B 469b378b5a64e098c2f091fba31658d2193fbb4272f21d40e404757623bbe614474336eb8ef7d7820be4299cfdb6eb41d30fab05327993bafaaf52f9965dfafe SHA512 a8f913706b597ddb605f7e9ad505417dc7422a64037ba11e3a1826e60b882b9b5fac56ce9afd0a6c84380f2984e4079803d10ddc13e686025f65d7228063b59c
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index b7288f531c86..5d630245ac74 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="elibc_Darwin"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 0798fa53ea47..3f7f5f5366ff 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -4,4 +4,4 @@ DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cb
 EBUILD scapy-2.4.4-r1.ebuild 1132 BLAKE2B 9e443884839312921260be7323baae52abf5a85799f6cab9d499cc02ac982b75746f097e48050bbd6ede928d35b5f4c37fb2eebf8baed4b2b6fd4c81af7c7e1d SHA512 9f8d9da8c924689ae39adfa19f5dd30b53e3808aea70e11df8b4a8927eac3d3a4c7401dc194b2df875e67825b25851ce304be4213ac31b1fa48e878a2190ab32
 EBUILD scapy-2.4.5.ebuild 1093 BLAKE2B 83f35e9715010f620988ef58fccb095257eb31f56000383608f4220bb9b68ef576215a421064ab9d16ca5e9425037506ddc43c0321e4abf88c787056d9ac6892 SHA512 bd1b2543a30814b94fcec1975d3b2aa92ac1ed51e19c1b0f2c840fd91b684c5ea4b8d8e474f8da8a3ad4bed89f71eef5b77f88fd2d22eeb98bdf775fdaf415e6
 EBUILD scapy-9999.ebuild 1010 BLAKE2B 5bd01cb4ddfda58610a8e32b4452379dcadc7b562f404cd23832ddfed5af4ce063ecaed1025b469db662db701d2ca7c3d5645fab9f2a0a9650f35282761738d1 SHA512 4be78df01f5f07c98f63d33570225b206630d070e8cb6cbbef501bbd7e70fcadd10d2197089d97afdcef7a2b422bd784b1358184bce3cc6cb6684a13bb95a08a
-MISC metadata.xml 596 BLAKE2B 30e74b96e16999c8af278d90c056d5a4bf62885e4bb3fcdbf6a26e0be5e4be87dad1f3c1ffec13a15a2f39241feceaccef5e17b4533dd827ad57525a8a35764a SHA512 b10887767c17e90cc402db5d2c483be6aab74bcb015164e3a31dc9986ac89900734de22a69a72ae582abe551b718c58bf0f7f4eb499a9c4607b6862c4b56030f
+MISC metadata.xml 493 BLAKE2B a3af12f03a366441e6d63a5b13c3ece9328ff5d81848cd0863401c5910348ae5680d5a891c497b1f3000e4e65c9073224511bb23c66d7aa84cdf03f87b36c79a SHA512 493b14cb8f430bc0eaaa6ebe991a8727defa530dc46614f61c12b65cda098ca5911ff21dcfe60964737cf6224e32afaac0c62ece5aa50e705f5c36fa7ca8a0b5
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 1c78a31b5528..2dd233deee17 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index b70698e7eb80..33e7ddd58344 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1,3 @@
 DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c
-EBUILD speedtest-cli-2.1.3.ebuild 682 BLAKE2B ff6e6916375f0e349bf2061a9fed91d198dd314c6457db5f3f4291d4165fb68f1cb5345017c0fb2e03ec599f1300153dfc2df39c73e29dbc10edeb3b1fb0ebdb SHA512 fd99a5dfa95b51b952a3b6ffcf52a336c53feb90883db3c32d03b8f1d223ddca341c2458202eb3c3092665fae60e6cdd7fdd36e2c62f74e65f1ac1dbaf0ab5f7
+EBUILD speedtest-cli-2.1.3.ebuild 649 BLAKE2B e8bd11a170f454d5d25919d681fdb96efa090f3abe49534892d950aa4be5cb8ff6cb9d40b898e801ed1a6d505b985f45163425caedfdc7efdab96df417de8637 SHA512 c591006f317b6962ab98f35e7bf9cc3f0a671e9a0038f6d427c80792b8c62e1990643532333a1024316ea90f9eeff598b2b2fad22612d3471f410bb61b48770c
 MISC metadata.xml 334 BLAKE2B f478e9bd7fb6fabecf2fa2aedcd21ee834fed3d0f8be4c1b6e5244f66a4c347f8df04d0ee8375394e632d6652bd360d51830e2b8d9c2757b1323f8f46b2a5567 SHA512 b51e761e451165b6a1dd898e59892e0bb1b8c53b36af40af0f036e8accfa1335a893b9dd6a1002a148a7b695181a714e2baa79b64968d37b93babdd8b2207509
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
index adbeae7674b3..4d4c4eb395bc 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 35a5b288044f..9ceb1a442d7f 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -3,5 +3,5 @@ DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5
 DIST ssldump-1.4.tar.gz 129184 BLAKE2B db27f94deaa8b1f0e656d22e645db349bba872d8404a1d8a82098c3a2dd4c6d4b12bb3d430094825219a66bd203736cc27766967d3ce0923bd5fdd64a452d6cd SHA512 fb17c5610dcfce3e8020a5148d37be5b2fbc3083d78727281922ae32b5905c4aa882cd368c3581238f3492c6b5bab943dcff6a966d64160a3836d6a95bdc7682
 EBUILD ssldump-1.1.ebuild 937 BLAKE2B cb9e7f84168680586b01f3d7392e92782476684a50f507be370ba5da0cc93fba4410dbb85d172cc2985560c8f4516c893b88a9aae0596ffd78590b481e78a7b7 SHA512 7e2d32d38e73c1768778d54f9357b5da7000ee7e794e74ea05304fef283ccf945643a336ed380cf3098d968649e6ee2f2599bb173a18cb0a7dc7f1af82813314
 EBUILD ssldump-1.3-r2.ebuild 661 BLAKE2B c029ae3caf669efae13cebc005ac4de8cedaaedf6ed584cbd2b057a21c6b01e8ce7913f73007bd4223cd8b4dc9a5b84dffa04734fe2b0e7872ee30bc40fbee77 SHA512 cd906cc11d80bbf8ce11bedc09533f11f50f5fb6a7792861b89361635e04bff241c6353b14a3b13e03165b320004c0b4b6c15ceeaedd22514ba84292c7f4bafe
-EBUILD ssldump-1.4.ebuild 665 BLAKE2B fe067d17d90c5bd86755ba810649138c3e0baf58126eef1ff633ab0ca3d0bc8b1592bbd6d9eea9e7a17774958805b1ad82177af947ce4c78a9fa03c642be8c58 SHA512 60a5a7fa9694a0af18c799ca1feb73b92750fc52e05da8993bc12f79490424bf3c9539117651e293984a003040b1639e3f849bc7f0d42e64b4ff79ee2b6e4860
+EBUILD ssldump-1.4.ebuild 661 BLAKE2B c029ae3caf669efae13cebc005ac4de8cedaaedf6ed584cbd2b057a21c6b01e8ce7913f73007bd4223cd8b4dc9a5b84dffa04734fe2b0e7872ee30bc40fbee77 SHA512 cd906cc11d80bbf8ce11bedc09533f11f50f5fb6a7792861b89361635e04bff241c6353b14a3b13e03165b320004c0b4b6c15ceeaedd22514ba84292c7f4bafe
 MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/ssldump-1.4.ebuild b/net-analyzer/ssldump/ssldump-1.4.ebuild
index 1f01a2d17e4a..45809ea32b92 100644
--- a/net-analyzer/ssldump/ssldump-1.4.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/json-c:=