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.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 55 insertions, 49 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/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
-}