gentoo resync : 09.07.2022

3 files changed, 26 insertions, 92 deletions

diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 1663cc94a087..fa351dc64351 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,5 +1,3 @@
 DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1
-DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
-EBUILD nagios-plugin-check_raid-4.0.10-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
-EBUILD nagios-plugin-check_raid-4.0.8-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
+EBUILD nagios-plugin-check_raid-4.0.10-r3.ebuild 2014 BLAKE2B 390162524585e1449c130e05b6cd3a56c6191aae571dafc90a9451501af8aeae9c872a0f466f331bf2e26a91c1db75010d17012c0e1fe629270847311abfb3f7 SHA512 33794a090a2834fe75374532286f18b0d2992a2b11be4664e1a1019ac91ce443002318a791f9645dd79e171b92623a08a86364894e1b5f8ea8d82104c36f3f6a
 MISC metadata.xml 1061 BLAKE2B 1aff6dfaf869ceb1ad828a45c58c4ed1645cdff139822e781753552e612dcd48f9533ee644808530e696a33fe02b7aeb3935be7f320d8400e9c9bf9621c0782d SHA512 3022372191de1bd349f9b7f22ed1d17dbde5dd56cbcef2cf9770c06ebae8a59b48cc9cfc9b050f90640a2c48088dd5dfa384d304f6dbd27ada1ac626b39a2a97
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
index d0caa68e4912..e5295fefced0 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
@@ -1,52 +1,53 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 #COMMIT=""
 MY_PV="${COMMIT:-${PV}}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
 
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
+DEPEND="
+	dev-perl/Monitoring-Plugin
+	dev-perl/Module-Pluggable"
 RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
+	sys-apps/smartmontools
+	sys-fs/lsscsi
+	3ware? ( sys-block/tw_cli )
+	aacraid? ( sys-block/arcconf )
+	dmraid? ( sys-fs/dmraid )
+	hpa? ( sys-block/hpacucli )
+	hpsa? ( sys-apps/cciss_vol_status )
+	megaraid-sas? ( sys-block/megacli )
+	mpt-sas2? ( sys-block/sas2ircu )
+	mpt? ( sys-block/mpt-status )"
 
 src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	#mv -f Makefile Makefile.upstream || die
-	sed -i '/CPANfile/d' Makefile.PL || die
 	default
+
+	# Upstream has a custom Makefile that is meant to build bundles
+	sed -i '/CPANfile/d' Makefile.PL || die
 }
 
 src_install() {
 	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${plugindir}"
-	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
 	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
+
+	local plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${plugindir}"
+	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}/${plugindir}" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
deleted file mode 100644
index d0caa68e4912..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-#COMMIT=""
-MY_PV="${COMMIT:-${PV}}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	#mv -f Makefile Makefile.upstream || die
-	sed -i '/CPANfile/d' Makefile.PL || die
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${plugindir}"
-	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
-	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}