Respect user cflags (bug #432016); install in the same locations as other plugins instead of inventing /usr/nagios; use EAPI=4 and default functions whenever possible.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 64 insertions, 58 deletions

diff --git a/net-analyzer/nagios-plugins-snmp/ChangeLog b/net-analyzer/nagios-plugins-snmp/ChangeLog
index c962b3a168e1..2288de7b8fc4 100644
--- a/net-analyzer/nagios-plugins-snmp/ChangeLog
+++ b/net-analyzer/nagios-plugins-snmp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-plugins-snmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins-snmp/ChangeLog,v 1.16 2012/08/19 15:38:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins-snmp/ChangeLog,v 1.17 2012/08/20 03:20:17 flameeyes Exp $
+
+*nagios-plugins-snmp-0.6.0-r2 (20 Aug 2012)
+
+  20 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +nagios-plugins-snmp-0.6.0-r2.ebuild, -nagios-plugins-snmp-0.6.0.ebuild:
+  Respect user cflags (bug #432016); install in the same locations as other
+  plugins instead of inventing /usr/nagios; use EAPI=4 and default functions
+  whenever possible.
 
   19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Re-assign to sysadmin herd.
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
index d48f8e3865e6..26b3e96f53d6 100644
--- a/net-analyzer/nagios-plugins-snmp/Manifest
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 DIST nagios-plugins-snmp-0.6.0.tgz 381664 SHA256 c3616feeb817165bc356df8f2daef52e1077f5d97a35c8074cadc68e15c0fff5 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529 WHIRLPOOL 74fd6272690e307bfa996d6db08230dfc4314f14a2e146545913b4d0b42a42168560dded9be51c101a7571411663d74d78a9d1a35d9119b67c3765f28d33187f
 EBUILD nagios-plugins-snmp-0.6.0-r1.ebuild 1334 SHA256 ede969c080c4c97e8d5efe10d4f35850bffde0066c30b9b280f972c6e47df219 SHA512 59645c0f597e11cab9d30b1e2bea4b6e4e4cf19b2c051795c94b2336beb423aece045840e9b9241d0c5c555d7c129e3441e7cc0b2fa8c15e0e918aeca33add3f WHIRLPOOL bd446f3ff5c6fbfe694979f6d02c81e425f4311cc3cbe662bdec29c46e2e892f28507bd4572c7ff0cd24230af04c5567adb5d56eb209f36d63740ef0511a58f7
-EBUILD nagios-plugins-snmp-0.6.0.ebuild 1244 SHA256 2f22ed22837d5b577974fbeee362104ee7ccd6e1c9f775d89e604117e4118c33 SHA512 7c9ebe560ab029ea0456167a310b263e81f6e4c51bc1558c824a8ddbdaff25a35b79caa8d8960d07d69fbc50f0687a279ae012a0f9223c816dcabc2b4742290b WHIRLPOOL 3f2253345606410b119fc341e4462905f72a60a5a0dfd52341651cb5d2acc1745891dc3c068fa8fec476e2b396dd8028c469e101764001a92f1ad244a0243daf
-MISC ChangeLog 2534 SHA256 57acaafb57bb3cd1c81857f83fc5924323d1ea5f4d25062fc04816f7404badc8 SHA512 aa9c3bd7aad983fac7f462c6fb1443d04b0f80eec13cb23d2f49b5369c827deddfb9d5d9659cbd13817f02a18ad7d97865c39d1fe6df5a48fbe36b7220ce58a7 WHIRLPOOL 3a64e9c0372997140a96de722f6125e40d899c18a0095e7faeeaaa00aa755ba0d5d411999e0e0a9af3f8206638d3ae72bfd6043d0e9f1ff9d99eb7be8166109e
+EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 1038 SHA256 8c96987799a1557a01025940173eb31fdc6ab496f14b0079498282e6e245cae8 SHA512 eeadf1c23069ca16d8f470942bafaec3d62c63cfffff35d861d73ba81068ab4292a655cb9c496360e7de606f3c17142067871598aa727eeac6bdd2601b1c4487 WHIRLPOOL 8a3df0f667f16524aeae80ac487da4c16785d7549b1d0f2494716dd7288cfec0d62956229934104c447c2198af2f3d567797686901831d682b447d0c82b60041
+MISC ChangeLog 2885 SHA256 1bf5fcb67abd05cb63eccbbc5cb7b52ba73c3b0337fade7df5203edca98fe3c8 SHA512 8785a99ade4f65bee3fe12f18559418da8d39285881db395cf574e8d4ad6bc9db296d6315adc1216d7c838cceedce1476dfed96eedd75dcfbc65911b95f63ac3 WHIRLPOOL 18a6288bc9d3158aeb03ee057573564959406b89019f5ec67eda2517199015d30580f9d6decb47b7cdd1f6ee6852c4ce85855f974061cf2cea06736422bef72c
 MISC metadata.xml 164 SHA256 1603bbe450b91408df2e78a6e0c3e51da5cbc469797684346ae9c01729504111 SHA512 94000607677a29c3d9571765e83a31a4f0e73d6f821cd6d2e78c8a748511c4ad3bf662c5a1cf7d753b3a0951fd563bca4a92bfc696d275a30888b431b3d0383a WHIRLPOOL 5faa40ea9128f0f768fa43ab436ef7155316741949ae21ae6b7b14d89f75128ae901a12b8395c2d13eddfb29816624091cf459465c28a604cb74d42bd8f9c518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQMQhzAAoJEBzRPIrUMBNCpHIH/0cQUMrmztC53VR46dO/17UG
-zWy0HQ+kjVOQRjRQYspz1AgPeysL6jScS9uqDMsdmkfUlrB5a0U1yhyxVAgcgLNM
-+KdVkBLm6s3IbqRw9MMxU17pE+fVZ5VW/OYR1I4cLSALXvs5EwM8LxkwMiRr145k
-Rz2H13Hid08jfLnWp7Gw0cRYZhdFLhF7xbk4ZGlPP/IdPs7YxajlEjJiljYZLEZj
-ZPi6rRGfAbicRupxBypF7xKmFgjCJVOfp+ImxNrI5RJjQ9JqbDRmiNvlkoAjaOa1
-8mDl0ZPLQCsKsWJ2fMzSlM7AVm0RNnGTJ8KgKeK6fI7I8W3OGUP0T4ZE8k6M/0w=
-=D9g6
+iQEcBAEBCAAGBQJQMa0IAAoJEBzRPIrUMBNCuTgH/ixtVo8QgKE5E9DH0FEI79Kk
+UlCJ1RKYCXtEMFLOfBs0hDmmpZzG4rUWsSD+8ivLLl0ELdbqgrP297D8B4Qo5O+5
+yon205oqHQRYKnMC1S9jqWImQjrQVzAMZjZ+g1klzm7t/Qn/vDCVMP/0tnmHJzr8
+/wF4NIfgjO2+K/7zao9uhMaaAzLo3bV3Gcom8vEAPXsSqkAa62296vZxEamFBeDR
+1XvR09mym9Fwzan3bb/rFq9lgMyjZDpF+wj1uOKcUbs6JdHjQxVmyGwI7+PHWij4
+02d+xNnjORjam/K+eyCmFqE+Vpxz9dihzwmJ+hKCRmzqV1aZ2bPfjllqr4qBvRM=
+=Uo4R
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..17f26ba2f242
--- /dev/null
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild,v 1.1 2012/08/20 03:20:17 flameeyes Exp $
+
+EAPI=4
+
+inherit autotools user
+
+DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices"
+HOMEPAGE="http://nagios.manubulon.com"
+SRC_URI="http://nagios.manubulon.com/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/net-snmp"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/nagios-plugins-snmp
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	sed -i -e '/^CFLAGS=""/d' configure.in
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/nagios \
+		--libexec=/usr/$(get_libdir)/nagios/plugins
+}
+
+DOCS=( README NEWS AUTHORS )
+
+src_install() {
+	default
+
+	fowners root:nagios /usr/$(get_libdir)/nagios/plugins
+	fperms o-rwx /usr/$(get_libdir)/nagios/plugins
+}
diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0.ebuild
deleted file mode 100644
index 53cf603e8bfc..000000000000
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0.ebuild,v 1.5 2012/06/12 02:41:55 zmedico Exp $
-
-inherit autotools multilib user
-
-DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices"
-HOMEPAGE="http://nagios.manubulon.com"
-SRC_URI="http://nagios.manubulon.com/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/nagios-plugins-snmp
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins"
-	chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chmod of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	dodoc README NEWS AUTHORS
-}