12 files changed, 8 insertions, 623 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3c90daa3b581..b1172828773b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 205852a65d31..247c2d255503 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,6 @@
 AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
-DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4 SHA512 fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
 DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.10.ebuild 9243 BLAKE2B b3af2ee5c6f670a7fc7700c266d655d9cca4e56af2176a2177569b4ae70c088784cfbb4de438c168ebf33f310ded2d7d5043eb6e62191ae9d8862fcf96cf611b SHA512 a97ccba86cfeef8d844cbeca4ded6165a9d1f55d84fe090fa778f60256ae8576a56b5d7abd9aaad73b7eb4ac36b65d06dec750ffed8d835240c2f0cfae97d6f3
-EBUILD nagios-core-4.4.14.ebuild 9247 BLAKE2B 0b7f8376c20f46868ad77cc7530c0056f3352416433b21ef4c5d3a661121eb31e96adefd28a978644157e7e428f7acafcef70415e00d2e4d85a26159dc081645 SHA512 96e94b04a772de2220213f058e64ddf799f0bdfa197e33c50ab40e6dd3f75a5031bf180ea2911f19fcc3f717eae0146e190bd6683f17426854227d8f84a47c97
+EBUILD nagios-core-4.4.14.ebuild 9243 BLAKE2B 2fd8690fb48a0a0456f3a1e0e01ba69a70d773cfd1783960fe9bc87a50e47b8a1b52b33d26b53613b55d8917f87a5d68f9820386822ddbb6703fb25054d20252 SHA512 7d723863dc194388097789f928316c8c303298889e79700949087bd478afa8ea5b1d278ac3b6be9a118a8c6481fb32fe1a93c7ce5913e003cb3b4fa74c1ef32e
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
deleted file mode 100644
index dd7e014a712a..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 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="mirror://sourceforge/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.4.14.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index 1f5a40a99885..14dbc007802e 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/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 4a08112f2b31..7325c4457eb6 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,8 +1,3 @@
-AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
-DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
-DIST nagios-plugins-2.4.2.tar.gz 2740092 BLAKE2B 73101f0d439a10bbc0e5d576fe1cf60f115eead00e4611e2f820ebde86390daf1904a45603389a6ad0a9fdb0f14fb49b429ad571159f605df5490f9798fc18d1 SHA512 43448483301c8f5fb9be9b496514a9e15199c320b2a320bb93c4fc6f6fcd35f2a469f980916b37b2b7e565edcb14eea1692f290b0a7bca9364e298eb42af63ce
 DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43
-EBUILD nagios-plugins-2.4.0-r3.ebuild 3104 BLAKE2B 2b920abe2259ca3e64a29a63079755b23e6619291e99f32d84aae2d28b05ab6c9459a40858bd7ede633a02391edf3695c9050c91f8efc5e4aacb993dbbed9318 SHA512 fc71484e2825a43f394e6d4fab2561a1ec29e8e0bc4d3b6a6b6bb1735cb14811e1de151e1f5b57dea4aa9474168632a55d1f0859cbec66080bffe7c23096f551
-EBUILD nagios-plugins-2.4.2-r3.ebuild 3039 BLAKE2B dabc166f9755ed296c24cde0b138ce6e5016f2a308d29d698d4fc151abe8d22e69dc513f4b8e25d4ea8854bdc729fbfbbbb09c033fca1ed6f7746eb379999fe9 SHA512 527008c686e9d74ebdfd037abcead491baf41427d47179467ada562cf892bf0f71c5df034bf4e1408732a56e1400c306c0c25cbc80a9dba97b88cb2723c718c4
-EBUILD nagios-plugins-2.4.6.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/files/define-own-mysql-port-constant.patch b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
deleted file mode 100644
index 67bc65cad880..000000000000
--- a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 43ff2e8607c0b7095c2a4dcab6e466bc67e2e2ff Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 26 Oct 2017 15:01:17 -0400
-Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
- port.
-
-The MYSQL_PORT constant used to be defined in mysql.h, and was used as
-the default port in the two plugins check_mysql and check_mysql_query.
-Now that mysql.h no longer defines that constant, our plugins fail to
-build against newer versions of MySQL and MariaDB.
-
-Since MYSQL_PORT used the "default port" on the local system, it
-actually was not the best choice as the default for the check plugins:
-when monitoring remote MySQL servers, the usual default of 3306 is
-more likely to be correct than whatever the local server happens to be
-listening on.
-
-As a result, we fix the issue by defining our own constant, called
-CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
-check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
-to use the new CHECK_PORT_DEFAULT.
-
-This change is backwards-incompatible: any users who compiled in a
-MYSQL_PORT other than 3306 and who were running their checks on the
-same server as the database will now need to specify that port
-explicitly.
-
-Closes: https://github.com/nagios-plugins/nagios-plugins/issues/288
----
- plugins/check_mysql.c       | 7 +++++--
- plugins/check_mysql_query.c | 7 +++++--
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
-index 83f89c85..c0b61292 100644
---- a/plugins/check_mysql.c
-+++ b/plugins/check_mysql.c
-@@ -36,6 +36,9 @@ const char *email = "devel@nagios-plugins.org";
- 
- #define SLAVERESULTSIZE 70
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -58,7 +61,7 @@ char *ciphers = NULL;
- bool ssl = false;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- int check_slave = 0, warn_sec = 0, crit_sec = 0;
- int ignore_auth = 0;
- int verbose = 0;
-@@ -505,7 +508,7 @@ void
- print_help (void)
- {
- 	char *myport;
--	xasprintf (&myport, "%d", MYSQL_PORT);
-+	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
- 	print_revision (progname, NP_VERSION);
- 
-diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
-index 436e0685..e9c3acfb 100644
---- a/plugins/check_mysql_query.c
-+++ b/plugins/check_mysql_query.c
-@@ -33,6 +33,9 @@ const char *progname = "check_mysql_query";
- const char *copyright = "1999-2014";
- const char *email = "devel@nagios-plugins.org";
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -48,7 +51,7 @@ char *db_pass = NULL;
- char *db = NULL;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- 
- int process_arguments (int, char **);
- int validate_arguments (void);
-@@ -300,7 +303,7 @@ void
- print_help (void)
- {
- 	char *myport;
--	xasprintf (&myport, "%d", MYSQL_PORT);
-+	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
- 	print_revision (progname, NP_VERSION);
- 
--- 
-2.13.6
-
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r3.ebuild
deleted file mode 100644
index 192207bf2da9..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 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
-)
-
-PATCHES=(
-	"${FILESDIR}/define-own-mysql-port-constant.patch"
-)
-
-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-plugins/nagios-plugins-2.4.2-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r3.ebuild
deleted file mode 100644
index 93ed15e27790..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 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
-)
-
-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-plugins/nagios-plugins-2.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
index 841c473ee4dc..e7c725947880 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index d7e811c0fd5b..3f3b3c077e03 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,2 @@
-EBUILD nagios-4.4.10.ebuild 393 BLAKE2B 0859182a3e1c1974b254a6775c51e84bc93d9cc21eedde2be3157dcf38edba12d896de6b927a61e690c72ed1ce0cd9f7e5d148d8ad486ac3caf2123c4a62dbc6 SHA512 75b82a94729a05cff3cd79a56043a71b7c7a0a1824ede66b6601db6c8f862d94a641df652d734ccc54aba734559d6a75f84c2384a37a5222ae9a1d762ca219ff
-EBUILD nagios-4.4.14.ebuild 397 BLAKE2B 34478d5d1a47532d8d7bc8b9f1d76f7559dbf685357ff1d9c790b9ffe27a53e926ebe15d6e5a1bbf0e75b45acb73cdde97a4ca647d3a2c5b9de972dc87ca5002 SHA512 e46b8a078d75784e962a6aff1e4ab64f460051edbe6e6121c2c72f32eceea57da9f206d67fcc4cf540ef9568705b769e6a727057e8f062ea55a3ec6a129aff8f
+EBUILD nagios-4.4.14.ebuild 393 BLAKE2B afb79982cb600f6a10729336d63bc1e18a1926f1353f3676912ee08b3e9f69a1b60a816e998959cbda7de0de313b5ed860a54e4b8d681cb7759e36c84243acf6 SHA512 f114d70ee1a0facdde3f159903454ec81dd0331ec0edd3cbb4739b6614c6665b7e1add58b0439db4f85940118a9975f752f7a621c43c94f0508af4c2954a80b8
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.10.ebuild b/net-analyzer/nagios/nagios-4.4.10.ebuild
deleted file mode 100644
index 329a15c9deb1..000000000000
--- a/net-analyzer/nagios/nagios-4.4.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2023 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.4.14.ebuild b/net-analyzer/nagios/nagios-4.4.14.ebuild
index 917c4e712c90..6369ad6956d0 100644
--- a/net-analyzer/nagios/nagios-4.4.14.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}