gentoo resync : 28.04.2021

3 files changed, 18 insertions, 18 deletions

diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 8c225a01e149..dfe6080173d9 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,5 +1,5 @@
 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.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
-EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
+EBUILD nagios-plugin-check_raid-4.0.10-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726
+EBUILD nagios-plugin-check_raid-4.0.8-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726
 MISC metadata.xml 1134 BLAKE2B aca2fafdfea4d29d99185b09c4e701d6aacd8871d65ef50ea9b9eb4cc9c1c76c9bd70703307bfe1926816bb77319dcc28cf899333fe75a892e32e24467dded20 SHA512 d0bacddb2750f5da8a274d7d44669cfa83152419499fbf89f7abf1505d1f54249531967ec5cb2f95233fea3bf13dd61e276e9dfc4457ce290e86c6f9f6e07681
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild
index 26049ac2dfbc..eaf055e9fadc 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+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_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"
 
@@ -31,22 +31,22 @@ RDEPEND="${DEPEND}
 		megaraid-scsi? ( sys-block/megarc )
 		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
-	sed -i '/CPANfile/d' Makefile.PL
+	#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 "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodir "${plugindir}"
+	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
 	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
 }
 
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild
index 26049ac2dfbc..eaf055e9fadc 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+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_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"
 
@@ -31,22 +31,22 @@ RDEPEND="${DEPEND}
 		megaraid-scsi? ( sys-block/megarc )
 		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
-	sed -i '/CPANfile/d' Makefile.PL
+	#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 "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodir "${plugindir}"
+	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
 	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
 }