summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-19 18:57:13 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-19 18:57:13 +0000
commitb6bd80e72cb0cbb7fcfaef5d283034ac42bf3b95 (patch)
tree00f365c9ae30d61e6835bec68728748c079a6586 /net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
parentalpha/ia64/s390/sh/sparc stable wrt #425194 (diff)
downloadhistorical-b6bd80e72cb0cbb7fcfaef5d283034ac42bf3b95.tar.gz
historical-b6bd80e72cb0cbb7fcfaef5d283034ac42bf3b95.tar.bz2
historical-b6bd80e72cb0cbb7fcfaef5d283034ac42bf3b95.zip
Drop dependency over net-analyzer/net-snmp: all the SNMP plugins use dev-perl/Net::SNMP instead. Since the dependency does not require any rebuild, make this behave like nagios-game and don't remove the plugins.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild')
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild11
1 files changed, 2 insertions, 9 deletions
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
index e97fbf27f930..081eae94bbe6 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
@@ -1,6 +1,6 @@
# 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/nagios-plugins-1.4.16-r1.ebuild,v 1.1 2012/08/18 02:52:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild,v 1.2 2012/08/19 18:57:13 flameeyes Exp $
EAPI=4
@@ -33,9 +33,7 @@ RESTRICT="test"
RDEPEND="${DEPEND}
>=dev-lang/perl-5.6.1-r7
samba? ( >=net-fs/samba-2.2.5-r1 )
- snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
- >=net-analyzer/net-snmp-5.0.6
- )
+ snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 )
mysql? ( dev-perl/DBI
dev-perl/DBD-mysql )
nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
@@ -98,11 +96,6 @@ src_install() {
doexe "${S}"/contrib/check_nagios_db.pl
fi
- if ! use snmp; then
- rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
- || die "Failed to remove SNMP check plugins"
- fi
-
mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
if ! use jabber; then