gentoo auto-resync : 19:04:2023 - 17:58:12

7 files changed, 4 insertions, 90 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 58a449c10aad..aba8a8d33216 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
index a12267a04338..5bd83058fb04 100644
--- a/net-analyzer/nagios-check_multiple/Manifest
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
-EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1358 BLAKE2B 305338ed1e2bf6e06cd33a5010e233202a90ca3cd3360d4c74c20b7d3319266b750d7d2c5471d521b20e813d821338405a226dbb6b2b3fc13d66c7ef45c81f66 SHA512 da62c6d9704a554ceefb56a0160954f9e4cb2383559f8da4a0ca90a3122a6e7047ea3cadfa21ca9d778fc439df8626c9869227fb86ca1c50ed3bfefe5c0c4b08
-EBUILD nagios-check_multiple-0.0.1-r2.ebuild 1368 BLAKE2B e68b4a2a7ee95207efff60906f47e08a76d9eec2e22af524a53342f296e47361c10f99fb4438a6de00145816eaefc38fd8fc478fc684afa630bf4abbd6f42c68 SHA512 bcf13502d9e467963145fdd1d2b8df60ffd3b15ce5905eae87cf01d38f6f0ac91a38ca855f2742525cde7732963b868cb79120d55366cfee42187ec0cd90e3c1
+EBUILD nagios-check_multiple-0.0.1-r2.ebuild 1367 BLAKE2B df32a3635acd626b17142fe07b968893895e1a591250b7dd053593d105f014dafe04d9e0171fbefc71b132402f1095258783593a564d3a5678851acb10144065 SHA512 2d61c3506e13fcbf5a81e47d3bd79af49a6ed3c3a76bda35d5d50a2e1b0444c24d234e35987f9f1fefb60f30f7435bf3f7aa58c52268320fba688a0c8a1b2d92
 MISC metadata.xml 347 BLAKE2B c25107d223ed89498730678d4338d8c6bdef7693a86418fd80ebcbe48b0ca7a250af6740abaa20be36b9be23490c16e52d0bc2ae20901b93c05b97222526ad83 SHA512 4f246f7fc5e6af8898c19b653013ac167107f3663aa93dbee5186f7a1740140bd01d26208347c03cdd0526639be28245d8413cb4560a1a2ea90c565729c7ee35
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
deleted file mode 100644
index 009545a959b7..000000000000
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_multiple"
-DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
-HOMEPAGE="https://github.com/clarkbox/check_multiple"
-SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
-		|| die "test suite failed"
-}
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
index 8821327435cf..d5e64ac02fa8 100644
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index ea6dd5a30dc2..68bc55c62d26 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1201 BLAKE2B 4870e01efff48b49dfbf4d6cd33f9805e27c25a84c6c6a70594430a5ef30531d4b6ce4b3c1644d7d76473ec7b355c80dd5535c5d0b560029ed1309beecf569dc SHA512 f45e1bc2d409c24696ee3330aded8989f824e1b27c52cbaee687b55d11c454bbc80158fe7d4af2f51cc499257ae88cfacd7a9e6ed64794f03305226ddcc0ab8d
-EBUILD nagios-icinga-openvpn-0.0.1-r3.ebuild 1217 BLAKE2B f6023bf507b282f11e7d0e5ecc66717660b8887fef450876b18aec5dfb24851628110360337406afa8d51c42f0290216b8fea0521429997a84d9201e86651055 SHA512 3c7c823ea52f00012dd251b06797fb1df824b2468ab0229c4a855a85db550a5134ce27ea5cbcb419236661993ed22ed1bf1a0c77bccbddf39948433197fb765a
+EBUILD nagios-icinga-openvpn-0.0.1-r3.ebuild 1216 BLAKE2B b44deb18f610d3989d39e7499b721a453c0f856f9dd909daeaf4044cb843c980679dabfcc14639d3af587aaad4da62ab1bad57475b2be622fce9af83cbe1f717 SHA512 c31316d675b843a7c48c87ce4986415f71f4a5303ee43f2fee861bf9bab7769d56fca36f64fd29a4948dc3c2aa955ab161dbdb2ed472fe5f3b94cfbbb75737c2
 MISC metadata.xml 352 BLAKE2B dd1dd8a4b5a742cd5e7ec46a22748f01d56ce26fa0d3d1a855bf0699db64cd5fa181306ac9528991572906ac89c6125bf6d10e97332bc148996cac14f5cf83d5 SHA512 3930012be14153b9cba53af2fc2edce373e1a279a5364c3cebcc472dfdbd7f544205145e842630da210b75d6c8cd34d9bb6b91403ed1a51e4b5c99061c31e1ca
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
deleted file mode 100644
index d16004eadc12..000000000000
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 python3_10 )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_openvpn"
-DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
-SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
index 29bd4732ec09..0dc7a05fc33c 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 src_install() {