gentoo auto-resync : 24:10:2023 - 02:40:28

4 files changed, 4 insertions, 115 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2eb7f760e9fa..f5a7a3a1551a 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index f87024bb6a1f..12f92a468a89 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,10 +1,8 @@
 AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e
 AUX monitoring-plugins-fix-check-http-segfault.patch 870 BLAKE2B 23e0d356fbb2ac071b488c49d846827292ad9fc6a2f7d5b1c1390d84db777e787d2f4d09f40ff297bab7da72c6b6b287ebfb01ca313923cca6d2bd44cad77f50 SHA512 c13325116a125f0af6299ec2d8f2ba109cc14fe5d315d944b3a3a7e8a5af731d40d84d57c9e1e29c9c9bb07212e67e943bcefb4706cd0b9c6bc0e9ec6760c2d2
 AUX monitoring-plugins-gnutls.patch 782 BLAKE2B 52f3ad417fbbf9b6fd021a42dfa2b547fcdf5f6709701732029c4bcca00793d83be9bc56f95100ded0cfe6ddaa026972b7ebd1451a7ce9a756d1cf27f595a1a7 SHA512 bc52716ad032215ce8dcd2b59b18b84eddede536280fdfd263ea7c0bb7be93f57a8efd5fcaedf6b803b435325fba8f3197ba2b17f0dd037c3beecbcaeb5cce75
-DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
-DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765
 DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
-EBUILD monitoring-plugins-2.3.1-r5.ebuild 3127 BLAKE2B 592ec38a0f1f74ff7f14a4b8bdd30d3abe869b2cebb9955f0c2fcf53be87ee3ad58b5fa28a11817fc6497f0ae741b04a1ade2602a2654c08b4ed3ccec155546f SHA512 a353cc6c58c42b7b57e9abc5cab93fc8313f1d3d1762696f4edbeb1739cd8f288c3e24d76df94fedaaa4bf85da4b15c6b6614bfbc2a6580a9d4c50aba8fd55f6
-EBUILD monitoring-plugins-2.3.2-r2.ebuild 3055 BLAKE2B ee0a89c757db3be55e3a9d9974b52fd4b375386d91db1d38c08085be972491cf83a07e77c934e6414d709f58d77266a547385c9c16762add2c9d150af9f1b6e9 SHA512 bdcca02cb711eed024afad1573ff15e4e2d7273ec0a623cfb916a3fa3603fe7e4b6b41832c068a7a2521085947ae6ca2db874db6c9bd6351289d8c86b643db02
+DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55
 EBUILD monitoring-plugins-2.3.3-r2.ebuild 3169 BLAKE2B 7e6ddc621b94b560b18cdd33c4acabf234b534aa07ad6d239f38b95daa4c4f0f3582630cbda51fd2887492357eb8233dbcc34136e7b9a8fd1640f894c99876c8 SHA512 e17f1cf4619cc3cda54d7024dabc6cd6cb01028504489908110806fc449548297846441a0444b74d12693db182d125dd4e6016522ec9d858a005d0e194623373
+EBUILD monitoring-plugins-2.3.5.ebuild 3056 BLAKE2B 2880afb830ba993c236aea364f1dd64e0206a8e2e262e445c219c4197fd484c9aa68cd1c7018e145b869dc572d32a82a2e246b62e5ccc6d68d8ccb6e39d55a71 SHA512 ecae7f5a28c4c5c92f92f2577c9750ad2691d33bb254ed3db4312b96fa08585175a9c0e71c12f4344c9ab1abed4154997a85250b24eb274368489d91109289fc
 MISC metadata.xml 1541 BLAKE2B 979f2ab54aa6fd684023c25a2725f45ce1c3edfcc98f7b79e0bee72937f0c385c71c8f8a2caaa60231bdf26c4649ded397eeafb046a46fdcda5247ca030724be SHA512 a8d68c666fa3e9e181ab3d7f469395b19e26b47145fdf96f1135c3eb5001404f66a8c046a236d25238e4e31adb6269c1da7020b5b92262d3a7cb4f6f8a0f49d9
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
deleted file mode 100644
index b0bacbb75463..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249
-)
-
-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.3.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
index 3cea165dde1d..0dae17b07692 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 inherit flag-o-matic
 
@@ -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