gentoo auto-resync : 15:11:2024 - 03:02:36

28 files changed, 145 insertions, 423 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4bfc873026ea..a66faf720b43 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index c53c8d39a3c1..51a7e46e5bab 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -8,5 +8,5 @@ DIST arpwatch-3.5.tar.gz 117594 BLAKE2B 73b979ec279e5bf5baaeac05949e1bddf08cd9c3
 DIST arpwatch-3.6.tar.gz 117254 BLAKE2B 77cb129bb543a45e22e27c02193b2ceaf4c65fd56b4d77e710379a2fbcaa5f1be4d625ea0b99f63843358ae993c7bee95db764baf36e0802a7aceae5d81706c7 SHA512 5ba47b15f294396f79efa4b72743169b9eb36747d675144e8f456a23d3987dc0d719d9b97704e7eeec0795f03ee7ef7e8fe8a4ba1ee35d19ab8ec6b077d345e8
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
 EBUILD arpwatch-3.5.ebuild 2200 BLAKE2B 0024603349b41163b7783ec205f11a2e53cb27df996b8cb6466d6beceb4610818199c2da8514781af67c177c931a4d8ebed139ca073bc41cee010523cbd82002 SHA512 4c6f30d2c82926f335d50178cbd508ac3307e8c81c4dbde617ec71f42c89d0578e928d43f6729cce87549220756be81a3698e248c54c49340827cb19bf17fd93
-EBUILD arpwatch-3.6.ebuild 2204 BLAKE2B bfdbd8a340fc76e9033072efc1beb814a797af375e8463c20345887adca179bd546634d0739ba619320df98b1f186ce88309c7e3ce1a9fdf9e243bdda0e6d1a2 SHA512 be5fac9b97e7e9c78b24349a93c1f4686f36052b65a23a2bde78b5020d8bc9e6b507d9bae4209e39ebef48b2b0ed86a886fe165c4f2250d48998c59c41e65c30
+EBUILD arpwatch-3.6.ebuild 2200 BLAKE2B 0024603349b41163b7783ec205f11a2e53cb27df996b8cb6466d6beceb4610818199c2da8514781af67c177c931a4d8ebed139ca073bc41cee010523cbd82002 SHA512 4c6f30d2c82926f335d50178cbd508ac3307e8c81c4dbde617ec71f42c89d0578e928d43f6729cce87549220756be81a3698e248c54c49340827cb19bf17fd93
 MISC metadata.xml 742 BLAKE2B 6450c555cd2d073840a7b55b986dd06ef9bfcca83284747f960eec06bb2e4e20e3b60cf3f8321f7d737b1a9a45e256eca89a117466e0470ae30d90e49250d31d SHA512 f34b7397a71cad7092481bf0a4127aabc1bf28e9c781bf076610a3f11522053d7e3bd135ca3f983c8b0aa6802237015ea967a85e3dc207d67f04b063e1a482f1
diff --git a/net-analyzer/arpwatch/arpwatch-3.6.ebuild b/net-analyzer/arpwatch/arpwatch-3.6.ebuild
index 75c21ca8232c..8356cbac4ff1 100644
--- a/net-analyzer/arpwatch/arpwatch-3.6.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index cbf35c84bc6b..000dfce18dc9 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55
 DIST monitoring-plugins-2.4.0.tar.gz 2746382 BLAKE2B 3e062b9392b4e5885a549ca619eee25f29517e83682e0eb76c8780235b48ab26d79994827c1167e981a993ece3f3f339de61874c912e6fcb17b4cb1af22e97d9 SHA512 7e9aae7768ed9fccbaf377fc54a70374f6a41e8e8ef95cf7440e44fca1080eb23e6b3d737214c96d772eb9a32cdfdbf1b88e0eb35eda0690047d5fe1b485a6b2
-EBUILD monitoring-plugins-2.3.5.ebuild 3272 BLAKE2B c6d3c789dc96d478d044419f121bcac9dd09f0d697858509f3a2458d74f350be1567a6e118756bc590e9b77adf8dccb69df1daecc3e30233c627674278ddd922 SHA512 49073b7023da748a183a9cb3bad45f84c0840e361595619d8fd8517092478336446725d20756a604f9103f77f67808c1b7e99da5be2b65772d833f2ce299d4e8
-EBUILD monitoring-plugins-2.4.0.ebuild 3275 BLAKE2B bdc3d36692727e58cb6c600c0ac57f8553423812ede2bb6e322f022795f48c90464015d2a46dfeadfd51d5a619470d7e313a9f6be107a735e8a977f5f4cf90a5 SHA512 ba192af72c55ef9a5168e712387cc6ea80b825ea6ee4c7d2407a3ebb7e964b6ba23b977e4cd70c401278ad317e033bde828bd1e4d517a0dee4ae90601df88dd6
+EBUILD monitoring-plugins-2.4.0.ebuild 3272 BLAKE2B c6d3c789dc96d478d044419f121bcac9dd09f0d697858509f3a2458d74f350be1567a6e118756bc590e9b77adf8dccb69df1daecc3e30233c627674278ddd922 SHA512 49073b7023da748a183a9cb3bad45f84c0840e361595619d8fd8517092478336446725d20756a604f9103f77f67808c1b7e99da5be2b65772d833f2ce299d4e8
 MISC metadata.xml 1679 BLAKE2B e99ba6614df951268458260a1b8f02f40408dd2e41b65e77555fe1d1698bf4d5fbb8a35b5d640198c1feb74bdeb78c3efb9c2670c3d87bbadef16be66602d172 SHA512 1b24d36802f5efa30d4c289bbc231761d9a3a1149831ae913eea998d49782c9424e37d270ff2853a91a9d75d65e2991910aab986f7dc78e3a8132ca17be56d8a
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
deleted file mode 100644
index b7666ec27696..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	curl? (
-		dev-libs/uriparser
-		net-misc/curl
-	)
-	ldap? ( net-nds/openldap:= )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( virtual/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	acct-group/nagios
-	acct-user/nagios
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-# These all come from gnulib and the ./configure checks are working as
-# intended when the functions aren't present. Bugs 921190 and 936891.
-QA_CONFIG_IMPL_DECL_SKIP=(
-	MIN
-	fpurge
-	static_assert
-	statvfs64
-	alignof
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered (bug #468296). But also the path
-	# likes to move around on us (bug #883729).
-	myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with curl uriparser) \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.4.0.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.4.0.ebuild
index 254d7d52757a..b7666ec27696 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.4.0.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 346f2a6e6a5d..0dbcc79334c6 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,9 +1,7 @@
 AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 AUX nagios-core-4.5.1-musl.patch 2787 BLAKE2B 94e157cdb152ca609d29fd3b5e82d243693a5588337637e61723e3de78aca0238b189fc9a9ed38c46b8ff3b40ba053c84d9f4b1f56002aa81ac3a5a3527f7032 SHA512 904dc637909446d96c2f2f5552c57699c4cd3faf66e06bef9174cdd0dec1432e57fa38eb710f767dfd85fa57f4c5ded6fe14f01a28ec8ed856e2ae628cc1e1c0
-DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
 DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.14.ebuild 9256 BLAKE2B c1fd6c67b86f938b574097bd496707b4eb5a9574c13e25398dc2ad08583b5caea8522d36677ca42543995a8488ae27db1a0e848da428ab231f99c93cf4c0235c SHA512 2537cf54ef10a55f64538a2f49b9fa099da4a4dcb6ffed65c55381b0921c25e7562fa95f103364b84389da9fea272ec91c09ec8cb7424d56fc9f279d3e026d07
-EBUILD nagios-core-4.5.1.ebuild 9303 BLAKE2B 52a939185906c40cd32e86e1b682d6a9ddac8e3480ea50672f752434e65526561382d8773089a0aac301b28b9ba5807248d42ceec3b380b67091d41d963843f8 SHA512 fe2be154949e777ed4617512755e2e544cf3a9a77d1d9801b94164092bc33cb196ef9257f1345e30d30c2201282f2ae8c9b98be574bdaedf0ffe47013a85c25d
+EBUILD nagios-core-4.5.1.ebuild 9299 BLAKE2B 55ba352f224aa71b6d9cffbffd6275e38c55253b6570b12f82422897224a0c2229c38877ba17cdbbc492b58f08c06ae9b7e42ef0e4372ccdea4a8d3288417d09 SHA512 5ae0f6b5c97616dd0924a7ff4eef1889c9ece4ee79184bd27ae588aabf814d11ac786c06aaa442382889ed7693b806edfa4ffae95fe92cad21a6d889c5922499
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
deleted file mode 100644
index fe6f6dd27afe..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-	acct-user/nagios
-	virtual/mailx
-	dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-	apache2? ( acct-group/apache )
-	lighttpd? ( acct-group/lighttpd )
-	web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-	${DEPEND}
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-				( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		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" \
-		--localstatedir="${EPREFIX}/var/lib/nagios" \
-		--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-init-type="unknown"
-
-	# The paths in the web server configuration files need to match
-	# those passed to econf above.
-	cp "${FILESDIR}/99_nagios4-r1.conf" \
-		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
-		"${T}/" || die "failed to create copies of web server conf files"
-
-	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
-		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
-		-i "${T}/99_nagios4-r1.conf" \
-		-i "${T}/lighttpd_nagios4-r1.conf" \
-		|| die "failed to substitute paths into web server conf files"
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC="$(tc-getCC)" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	# The build system installs these directories, but portage assumes
-	# that the build system doesn't know what it's doing so we have to
-	# keepdir them, too. I guess you'll have to manually re-check the
-	# upstream build system forever to see if this is still necessary.
-	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		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
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		ewarn "The local state directory for nagios has changed in v4.4.5,"
-		ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
-		ewarn "wish to migrate your state to the new location, first stop"
-		ewarn "nagios and then run"
-		ewarn ""
-		ewarn "  diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
-		ewarn ""
-		ewarn "to identify any files that should be moved to the new"
-		ewarn "location. They can simply be moved with \"mv\" before"
-		ewarn "restarting nagios."
-	fi
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
index 8350b6e27910..d2f37b2264cc 100644
--- a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 7325c4457eb6..9b0fd2353070 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,3 +1,5 @@
+DIST nagios-plugins-2.4.12.tar.gz 2752829 BLAKE2B b72b9350e9c72c9cbe0cbca3effce16ec753887945455a1ac47975105e68f516923020cc88ee42da0c8cd815fe841a82ff5053c3ba5688888bec7be12c08fb8c SHA512 fbff697d0cea1cbeb83737f240a42c00e18bf443b8af303b5d7f7f735eb6faa5305d8740fb27472876dc1398735204e0d7a0e5863c2064ec2a37541253f91502
 DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43
+EBUILD nagios-plugins-2.4.12.ebuild 3281 BLAKE2B 6320c2af338658866447f4b23fe0cc786076619e6fb2746bfb680ed4d84026f687517e01696c3e741e9a8bd0ba3bd1fee3b77975774bf6aff56b1049e8ffa512 SHA512 787f749cd704763c756783219c56a041e67b4240cc89617f0f0a56ebc0fde48ae6d00856c3d58e9a465eb2dda9fd58b22171c2552a9305e85cc6ded41e52a6d2
 EBUILD nagios-plugins-2.4.6.ebuild 3277 BLAKE2B a11fda621ca3b455586550f55704ff0eb0880cf244d566c5cb7cf76e011a22358d3c1bad8994bbbf754a4b3d33239790f262800e353dbf2a6059ce43423c623a SHA512 7a57cb998ed1b1021a008c5f54a9233fab73058b86547d3e18c610aa528cab2899b90270a232d4d328e4ce2b3124dc00c49d6f636d47f1326854eaf937715a0b
 MISC metadata.xml 1569 BLAKE2B 4ebfd50870acac360fa2708dba05d3ea925e7d93444da82ca93067b4c8eeb177e8055cba4d12d690c8d9e1f5448447d6bf94a5991a09d0f4a2ee6126338bb707 SHA512 fffa8c7bc36e0cfd4ca35ab8c8f327749e0c6744a9567d9a6c88180c178a2a5bbf67df31b289d9319bc725d2fab4433a9d00443a87d0950777ed0c05031da193
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
new file mode 100644
index 000000000000..841c473ee4dc
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="https://nagios-plugins.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+AUTOMAGIC_DEPEND="
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( virtual/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Perl really needs to run during the build...
+BDEPEND="${AUTOMAGIC_DEPEND}
+	dev-lang/perl"
+
+DEPEND="
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+# Basically everything in net-analyzer/monitoring-plugins collides with
+# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
+RDEPEND="${BDEPEND}
+	${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+# These all come from gnulib and the ./configure checks are working as
+# intended when the functions aren't present. Bugs 907755 and 924341.
+QA_CONFIG_IMPL_DECL_SKIP=(
+	statvfs64
+	re_set_syntax
+	re_compile_pattern
+	re_search
+	re_match
+)
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered (bug #468296). But also the path
+	# likes to move around on us (bug #883765).
+	myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index b39f91a55db1..6b341b6f5c28 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,2 @@
-EBUILD nagios-4.4.14.ebuild 393 BLAKE2B afb79982cb600f6a10729336d63bc1e18a1926f1353f3676912ee08b3e9f69a1b60a816e998959cbda7de0de313b5ed860a54e4b8d681cb7759e36c84243acf6 SHA512 f114d70ee1a0facdde3f159903454ec81dd0331ec0edd3cbb4739b6614c6665b7e1add58b0439db4f85940118a9975f752f7a621c43c94f0508af4c2954a80b8
-EBUILD nagios-4.5.1.ebuild 389 BLAKE2B fe8daa78ebe04a346d47607399325fdac61ec8eee29e13430f3432e9b0578121d58cb93dea42180d3497b01c1bbda004b6369ebafac5419362b8092ec360d867 SHA512 ea35e3170cf137e895971048e810b5611fca47d2f2989b4cb291889f4ccca3713bb0b4a94d55765f51e5453a069c11cc058e89a10ffda7c6b21497f754c3f60e
+EBUILD nagios-4.5.1.ebuild 385 BLAKE2B 7bd4c6bf8923bc84e62a4d5394fe61279dad0f2f5c0daf693387cfd81b73d4ce29b6517cf71489d0727183ac58acddb7b7665bce38db15d7ce7a3aad5756510c SHA512 c7c25426e1e13ec3702d4e5378d540e8e72232b37e0ec09f7bca0a04430f6e7b0caa8ed3b6a12dc831b037e7ccabc64cbf64b062ab7d2c880d5dc70886c49340
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.14.ebuild b/net-analyzer/nagios/nagios-4.4.14.ebuild
deleted file mode 100644
index 6369ad6956d0..000000000000
--- a/net-analyzer/nagios/nagios-4.4.14.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.5.1.ebuild b/net-analyzer/nagios/nagios-4.5.1.ebuild
index 371d0ad43626..5a74cb50541d 100644
--- a/net-analyzer/nagios/nagios-4.5.1.ebuild
+++ b/net-analyzer/nagios/nagios-4.5.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
 	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index c124d64f95f0..b8f39abf0fc8 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -18,7 +18,7 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
 DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B 2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d SHA512 a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
 EBUILD net-snmp-5.9.3-r3.ebuild 6551 BLAKE2B 60e0ecc6bc9090c422aa69b74784b23fe05c97d94a17f6384f277900a2ee29734a1d5013b5d77a40ed1e6af2c5eafbbcaf91d136d45661fce9e5f4e6650f09e2 SHA512 0394e0a0781e7570f2a9ff196173fd2f78ef21d49c426dd620bb22b74c04c66c537969cc83882a06c1c96c415b5713d2abec4a8229920b4ffb8636eecf9f64de
-EBUILD net-snmp-5.9.4-r1.ebuild 6557 BLAKE2B 0d1f81a174325208970db8c708201364766505f23db5ef22e947e4f59d0eb8f9f9f354fbb21204fa6bf8fb1d88fe3b8908e8053ff9cb782b1bc7b4407737c706 SHA512 3dfbb03c6301fe548915999f4f9aa02c21498fb08dc1c05d0768fd9569dbfb3eda6ec2ee54a5e576a79e1642f784ac744669f0075bbc4e12f311e3d517c45bdc
+EBUILD net-snmp-5.9.4-r1.ebuild 6551 BLAKE2B b54f60db5555374decd0cd35bbddc6f1cc02955e4a6175472d78bc11905d495d792409506dbb8ad52c518c471003c04db9966793c4556bbd171905bab105ad8e SHA512 cd98ca6819e71d046f2f3f0d0fbe254601eec5fb70bdb7353a0f1bfccd186970d8469af77689efefd0cb4d840397eb9cb7614791b0db140cc43dcc998f1fcb8f
 EBUILD net-snmp-5.9.4.ebuild 6513 BLAKE2B 7e47752150ff6de4ae5cc9e2f638ef2fc1adc044ba2a149f7325433c3e45f26a22559cbf42ee2a7345f654aae8d171e444e4af1deb4328ac9b7b93f3fb2d8595 SHA512 497f82d38f7d46530943da06d165fd89ca7d772ad4dff30f18b6e4b6328edcc57beff63fd96a799985ddf85982d23b324d452337683a1624ec94d699af7749b8
 EBUILD net-snmp-9999.ebuild 6180 BLAKE2B 75b6afa5962936a894620450bd89ffb1e6aae53513a53abf6c34f1c9bc916c24197138738c0415119f874b5798216be49216c7091e3034e4217f69cdaf11a507 SHA512 d5b81080bc990c5f0743046132d5a4d9396a5cd23b61663d3b2de46025acf032dc85685420a379ed2d18201f8185f719724999d39c9cb03dc3bdf125628d2f90
 MISC metadata.xml 1552 BLAKE2B 4e2f3ca85f76e2bd5992e87385485055dc61f2ff52ba7a6ccc6cf2a3e34557a0d98840cfd34a88ee3c1513ebd2609e294f2db68d5963fa884eb0eb940d8599e3 SHA512 b666ad1730772cc9856bde562ad43db51b7ae1b2b9865d5804dd3313a0ca9200989d036be4ac33eaf1f5b1eda9864d9b9be4f5a58bcca8b1455d6e508e534bc2
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
index 3b2fddb9393e..e6ca2c72ee41 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
@@ -20,7 +20,7 @@ else
 	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 7b2ce8ca4423..13f89549a2e9 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -10,5 +10,5 @@ AUX netperf-log-dir.patch 461 BLAKE2B 94ad6f6b6d3a7a15fb422fde97a77071d9195ed7a7
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
 DIST netperf-2.7.0_p20210121.tar.gz 1914186 BLAKE2B 14d3a769a049443d8bf62b58c93c2b9563a16b69bb151d35926aa8831167b8a31bdd7d820c80a0c0511a78e519742005bdfa2079d403a514e2ec17f41a1b8e7c SHA512 8d9908fe2cd778eae719265b67938ab44e18de960c845f976e80d6b419c08b11ae47d8b4b906c6ccaf280f9f66bcdcb0be2ab379b0dca8d62d86671d57057e20
 EBUILD netperf-2.7.0-r5.ebuild 2029 BLAKE2B 76718fb90eda49083066167c1b81686e26683b255ca8118b6a180305e97a5e2d859dabb7eafd5534afc80d8ea8b65c37df0ce239d70b93adfeaff9686dc569db SHA512 0521d429c180a85570c50ff4a936035dc37211c20ae33a30a9a4f11840d3d94f4a16831c51a2e07bd608b2322d5865c1c1008eda53e23c7f0ebac7382536b0dd
-EBUILD netperf-2.7.0_p20210121.ebuild 1946 BLAKE2B a3c710a5c6583f5ff715b55d2e53e2343ce8c145f51838a94b5b86a633802f0e90b0c81558804bf73f275a276ca2609e1767af565aab4f4b510fb05275a073d3 SHA512 9b441b4a1c7c37642127005763ac51087b50b2e65a3b017a2710058f35d0158a4e538aca13229442bc3b9a522b411073d7479bf0fad02862d2171952e2352eca
+EBUILD netperf-2.7.0_p20210121.ebuild 1941 BLAKE2B d7cede6d94b1fd21a4befc18deb098c2023ea3978be0541f08a9c8795d3508e608df6d544ba7280c38f2c2b64ac2d009c48e0921df3b913b9d5a03c282877cac SHA512 2b84d8928e8b440e88c71df2da8208619316dfae45f82a582178923fc781167e13959028a7030b9b3e5dc9bc8311e293dbffc0a1fb6ceb6c55c0a9e399984091
 MISC metadata.xml 946 BLAKE2B ca011dc4a1e358fb1e8b643a6a56e6246e88b5c3ab94e731bee00d26e145b6544522445b4c80506cb39d96688e325e7ba677f92d31862a3b3d31d969e8d94937 SHA512 e0ce10c4a561e59e373b09b6a138e028ad944df850966e5dff00463ec4fcb9adf98942748753eaf4d00bb39fc3739b371374647de21b07f1f23af876163dbf97
diff --git a/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
index 554d1e930649..e604c1915694 100644
--- a/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="demo sctp"
 
 RDEPEND="
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 6127300f820c..ae285d3467d5 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -5,5 +5,5 @@ AUX nfdump.service 365 BLAKE2B aae0d69b77b01e822430585988c148c0a497123b9a90421b8
 DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003
 DIST nfdump-1.7.4.tar.gz 756319 BLAKE2B 441fb5d3fcb4b83bfc42861eac67bf96ac7c7d6a44afd47c4e16615b22261e1628a1bffc645071817eb9085857ca3a3b632fd265dc897cf9af8fce2999f86787 SHA512 be65aeee9b982b30633102b3ca0f84eab280ca4fda4544be458a2387d051e62517127a2625bbc4329a844550a613df67f5015cc5a90a8e4b6a8c65d045650ee2
 EBUILD nfdump-1.7.2.ebuild 1764 BLAKE2B 2926473aa8b71c4e1cc515174410fc8b67b5d82034e9c971a7c0d67172f3d03b933062fe91568c84fea23ef1c3a7519782ba69c460b09254ba090cd1f6bb55e1 SHA512 2d833098bfb8722079e54e29bb6448c7fe7657012d68e86099721d851f2bbd6570488499b93e73e45c558ead6a2e73ca5c892ba509e305bedc868ccfe5e7cbf9
-EBUILD nfdump-1.7.4.ebuild 2034 BLAKE2B cd5cbb4da3d87aa8b2e11e0636a469ae99411bf2ac0811ee83823b3b72a0aceb936a74dea34189b9c0529224b47bf2783112c97f08c6b6d0575521e3a95b801a SHA512 4a24a6fa5839d6738069df17c767e331f12a0ff684ac26ee47aaa51d968ab8f63311e202450a6f447f18cb2e5cd5bfde866f0b92ea66d5d2c0146ebe2ba07e51
+EBUILD nfdump-1.7.4.ebuild 2032 BLAKE2B 223cbb9478ee19dbe9762ddbd059783b809b6cf84a801883b47011551cccf5798935b0856bd6e007dc564dff7b09e11aee8eeae54c769841e2db0a1af3b65ac4 SHA512 b20bfa72cf9236987b70ae3964bece714471a921a72fb655ff51da7c91d3c074e66e7632625473825c8c19a5f6cc46de4598bfbe512d94e3217e9796a9305c39
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/nfdump-1.7.4.ebuild b/net-analyzer/nfdump/nfdump-1.7.4.ebuild
index 5bb38c317ad6..e0356c192572 100644
--- a/net-analyzer/nfdump/nfdump-1.7.4.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.7.4.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 zstd"
 
 REQUIRED_USE="?? ( jnat nsel )"
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index b19efa27daf7..677e3395864c 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -4,5 +4,5 @@ AUX scanssh-2.1.3-libdir.diff 5254 BLAKE2B d1f52730480f97c2518ccdf0c125d7d376a91
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
 DIST scanssh-2.1.3.1.tar.gz 147954 BLAKE2B a263eda2d49159e715bb8d2190fc78f8e41d5f3a56e0bf67b70ed716eb787c09cff0ea9e759b5aa62096f75de01d2d5b5980aa66a7c5b14635d835fd3b7c6f07 SHA512 970cbb03aa44fcef62aa03132335e6ecedb083cee98a360b3d781efc8c2d3c169f70c17837b1faaf9ceaa2691a7c619174a9bb185146af50188eaceda5d14adb
 EBUILD scanssh-2.1.2.ebuild 860 BLAKE2B 0d8ba021d32cf1656aa6823c96e716f3120ee3406de26bd78f827d13257c88a9acf54865c1b191a65c89c194bffd1e3dc34de664eb2f17bfe0bee9c9dbb31135 SHA512 acfa6e2a2f041773d15d8894ce95c2be194f100c9276f47081b5ad371299190620813f20c989ce065de6eb6950e1478ea5df35a607c81f86b8d43246869273d9
-EBUILD scanssh-2.1.3.1.ebuild 865 BLAKE2B 492a8889780f0189563830199fb0dad9a80e9af22272845c3a7cea0cf308c0673cef45e69f2f883f2b5b451e821c8e2b3a425a1325174e52a6c572a4e39aac37 SHA512 678116483f524b7996107ee5c59cae64a9d17a821c711277b7af6eee68c7a3dedd25e977f569da5ae215b607e568e2cae7328a69cd7329db2ebee427c01b8d34
+EBUILD scanssh-2.1.3.1.ebuild 861 BLAKE2B fe8480f39c1407b9e339c12e6e7742c725739d660f73008a64df028af121b23d90f09d2bfe55627acd99ef615c2bd4f905f4279b280011585a145d073dd2dddb SHA512 d5ba0d3ad68c8426ce00522ff4513b98a679656e900df57d6763c3ac25e9468fbe1b96305eb166fe6a2750fac3bfdb5eb470567535a839b86ce4b78d56681038
 MISC metadata.xml 512 BLAKE2B 58be7a766b9858f55a5d2926ed85a19545014f3a6f522132f03b11c2ae0b0f050e8cb85abc09725b4bcc6cb8f87ce50792756e31e8bf523d6da1ac4f1c012854 SHA512 d5c347f2a04abb0a6ba81edc8df0c844cab63d2eab85eaa01d8e847b4bde02ff4bb1e4531fa18678d66f032d4078ad17dce34b3b0aa27e9e0f964a77e829c6f5
diff --git a/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild
index f19ad9605894..86ead7b7c6e2 100644
--- a/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 3a00a5bb512a..d1bde3740865 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,5 +1,5 @@
 DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814
 DIST ssldump-1.8.tar.gz 188219 BLAKE2B e6cff9598e6818eb2192450c0958a7f9bf003d79ad74dd9e60b1af2e977b27a6b3667a5d7ed6fdb1fa836a51c4ab7a6dc2f0c5afb1dbd8b3b08af3cd145a872e SHA512 5435187fa851cddd167a5ee7e79f8051752780512873195b215e8695430282338f22719e6ddd32bd4eae3cc9a385abd44a4b369f93dc201908696aaed214b9bc
 EBUILD ssldump-1.5.ebuild 654 BLAKE2B 3af3a8f2fb39fdfb6d43dee01b578e25618c8583c756f8898cb5750213e624d45625ed83cc9e6fe6670a9ee91751b2a8c42703dea74925aa5b4a22ac6b80c885 SHA512 f8a004e5ec9656a287231d8a3570456119c2bccc9e517c94eb88714284598fdcaae623b4bd33b68fe4f5abe8f05e2cbe2c2afc9f057bad27a5bb128433d148e3
-EBUILD ssldump-1.8.ebuild 594 BLAKE2B 3477f873809922df3db49ea30c82d9a0e674d29bebb0cac3f0b111bfedfef48d51636fb4696c84d4090cf7f6284b3676273d934cb7480cc1c2acd0306d1a69a1 SHA512 f5de6234767e67dcdc4e29252bba24566efa5acc6b03f7ea4e1667ab7654e3422b8305a6519af4c7493e5e55012d3f1c021fbf7b7c30fca97a20cbbc8bce81f4
+EBUILD ssldump-1.8.ebuild 590 BLAKE2B 8dcb30982f47ae823d4e9c8168287cdc8a3cd17ce640e77f36fa91b9affdee27eaac0cba63d5a23ee25bf6f48deb955028e82bd3912f1b670795c47ba64ae212 SHA512 74083bb3b9496a61ac2f180b4a198fcb38a5bc7adbf5ad3b6457dee477b654d9400eed972ab4e26d63c47b5ddd5a55cf247472baca0eaa7217256b45e6166686
 MISC metadata.xml 360 BLAKE2B 6ac7a889c97606efc797c9d6d0dcfc72e7895c30df8002ec0b00dab180f15ba9f70f6b817885582743c6af623a8d703fa98317fb8b5f87feac502fa9fb331ffb SHA512 f5d603f9c61d05aba6727f1870357fc05036a27296418ba68f86c307854463554d7261a6dc0b0c601ffbdfced40da3b1e58f89717237ae6ac3aa604a59013a2d
diff --git a/net-analyzer/ssldump/ssldump-1.8.ebuild b/net-analyzer/ssldump/ssldump-1.8.ebuild
index 7cf1c12dd469..ee1826f45564 100644
--- a/net-analyzer/ssldump/ssldump-1.8.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.8.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:=
 	dev-libs/openssl:=
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 5261697ffe2a..bcbe4bb1cc63 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -3,5 +3,5 @@ DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed9
 DIST tcpslice-1.7.tar.xz 109272 BLAKE2B 5443afac3a4013ee2794084eb4f3b9e61aa6c3aab5e29b021b4e3e1248dc51a62e0a2ef3e742bc6e90392487fd6cae7888cb3ad031ef3daeaf6ae57dc92aef01 SHA512 9359daf309c962205c7503192a477a8a57f35c527d762c665f6181a0160a0f773cf5f186910ee548787fa0af2489d173872cd3dea05fa2073ea77a03a7d9c7a3
 DIST tcpslice-1.7.tar.xz.sig 442 BLAKE2B 96d77b64bb2a166d6017323a22f110f7015ef5866279ef1b3abb020704a93f98f72f4bb4d8214a57b1e6c782950c8894176c376f49cf0be5419d8874cdf280d3 SHA512 9ea7ec8a2709091d5726210517702fa808d0009a2761a6962a9225cc5598dfd7474f57c36207fdbef0d10ccf2abb4e1c0c6a825eec88445f8e86393cd89a388b
 EBUILD tcpslice-1.5.ebuild 617 BLAKE2B c5ad0d2d160140ebc4dead371e6fe49935b5937f1aeecf8c1fe59059f4e518da6a8f6ac9a602833ae506834d38846598d1d1778bb8c11fefe93c073e883b5a00 SHA512 75703afde1dd282e2abe59b492ad11ce0f8d0a39053fc30b1bf46ce909c0d836a04cb4424a041909ce7cfec855363c5688fc87d9ed1bdcf702f79d56fc41dc26
-EBUILD tcpslice-1.7.ebuild 631 BLAKE2B ea6d65c83a564382833c549686de2823bcb6878823bc50ff0ebbc1bdd17328411e88ec7ecd5057b7f69e418d4beb6a03046453edd604052631ac0c579a9dfa4f SHA512 d01d103009dc3c1eedd0e35ca3b161489f3ea67b2d0da1267e6cb269e1f83011375b058b67cf0111f0aee96606a48626b73c4f53199541ea725c05a04047a11a
+EBUILD tcpslice-1.7.ebuild 630 BLAKE2B 0e309bff5d91d82e5800da2d0a580aa886d913502037c77dfc16972c4a08de9ba2787c5516346e64b0ff5cc2a6f08b59be49593db9e1695521351cdb9b5f7f51 SHA512 a22840eacecf94afc7e9039389665d8ca2655950adbe93567342bde061ae2982d9b870400a3cec54e7b39c4dde486e3b405c0b09b0656a7d93a4d997014f90ba
 MISC metadata.xml 372 BLAKE2B c2e297cfa3dfa8458ff52fee54990962c94e9a06e8e180302f735e84b49a68d1b252bd1bbd3ed8f7882d4dbc70706dcd55d50f7fa87a32ebc44fa1ae952a54fe SHA512 aeba6817feb7095adca5beb16df6d14aea57d773b6a82a6d99dda19b28de89fa8e64d75b018e7d346b59c7014df34c0a45c3725361227ff709617da733be76bc
diff --git a/net-analyzer/tcpslice/tcpslice-1.7.ebuild b/net-analyzer/tcpslice/tcpslice-1.7.ebuild
index 2e725ff18f9b..fab9bf22e81d 100644
--- a/net-analyzer/tcpslice/tcpslice-1.7.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 78ec1a256b55..42e4342c842c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -29,6 +29,6 @@ EBUILD wireshark-4.2.6.ebuild 8816 BLAKE2B 0a0a1150be1ce3d3cfa05a7f92992d531bace
 EBUILD wireshark-4.2.7.ebuild 8820 BLAKE2B 094c80ccd41f08d069b3bbafb458254ee5671bcbe27aa24ff8fbb3b60520434ba12628102f6c8f0c95ef4cfdb940e3c2e111b37194add62f025dd34b3fdc5bdb SHA512 0bd38d485b507aa2e7871471c96dc5896fcbd3b2e3df91f340ce4bd6ba570d174d739392879e40788376dd26281cf4e68f4d27e865a48695b03b3da6c643efa9
 EBUILD wireshark-4.2.8.ebuild 8860 BLAKE2B 34fa8c1e14ff25c6b30f3795ec5a77482ea642c7cd101cd164daee1bd6f47a276604e2e14a5974406399e4cd7f1fb07f099c85e2e3cb8963d2ef59586079ed63 SHA512 9b93b5950df3dba29a6ec8ff5d7ce772b04cef94c6cb6e50f0eb1de4ed009cad67fbb0446045914e8e1310fb38df60b5aa908b7f02b7ce9b1bf9b726aafbc8ff
 EBUILD wireshark-4.4.0.ebuild 9076 BLAKE2B c29529e686b4a8e9a5ad9ce96930a80a938085dfca79e26cf43eff30ba2e2dd984d5009fcdb6bfdb5e9c7895f86643039ae134dbd17152ebda398e86e6da18d9 SHA512 1dbae6415dfc70b3ab5864dee6a4076cd9b4fe8336f4033656debf2c8d3066de1bc671991a5ec690af01f84d4062482a63808781a6694e613eab003fadef86c4
-EBUILD wireshark-4.4.1.ebuild 9042 BLAKE2B 09606b38b7fd3112e99801eaf157bfa26ad0f4592d80f624567d6f8790fc2f7d7adb85f4d9887719c552901542c7a77a54166e8142f52d79eae528403a8bd33f SHA512 ead2c846debb523efbf36a40b783361e519916f7515b024356532c09da0718aedfb39298e62868da5dce8c9ea2499c1bc98934cabc424538fc16faede3a418b7
+EBUILD wireshark-4.4.1.ebuild 9038 BLAKE2B 82eef8dff2544ed89ca7e6403e53de596ec33990ba62a957bbee35f4c969d2bec84b4676fd66755010ba51be699fec6ea5033d0c2d922a238de7ab5fecd6389f SHA512 ea22d45a6e1af52a5070db22b0f63ac96488634bd349cb65e186801d905ce8afc25e17006294032d92e4e94492b2a4db6fee11ee0e7021d4904d600663097ca7
 EBUILD wireshark-9999.ebuild 8997 BLAKE2B 9ce6be21698d6277140b048ffc9441705d7ec1737442bf2538e8720d0086b5061323d59757169223a8fb38d4cd075939fb8e7f8cac1f8231ce7092d1c816ff18 SHA512 25f45362e1c5221fa81bf13ac1d472deecbf5ec019fc992ca3e7ff6ba4534fefd65fb3af203fd3de304603c0f2a7701c354a744e3ff5a977b9430f81a690d74f
 MISC metadata.xml 5352 BLAKE2B 319ae9385ccf49cf52abdc3bb2292a6181f8bad974eecb1863b69dc248e8e1b17d95de5c7267e4e70ee28809bffc82a13f06de3e7d15541d32e2e2ab7ada638f SHA512 15580364ef3f86e9d4020c8b7e2e765a2be97742dc398d11697b87e15085e1a95e951d0200eea71484fb8d124d54b86da8542921c0b8f29d064a26681192d919
diff --git a/net-analyzer/wireshark/wireshark-4.4.1.ebuild b/net-analyzer/wireshark/wireshark-4.4.1.ebuild
index 1b0c68b24e86..7e4117e2772b 100644
--- a/net-analyzer/wireshark/wireshark-4.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.1.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
 	fi
 fi