Stable on x86, fixed mysql deps bug #98153

(Portage version: 2.0.51.22-r3)

6 files changed, 137 insertions, 8 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 613ed96b6967..10881ee42abf 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.41 2005/10/24 03:48:26 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.42 2005/11/20 02:37:54 ramereth Exp $
+
+*nagios-plugins-1.4.2-r1 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  nagios-plugins-1.4.1.ebuild, nagios-plugins-1.4.2.ebuild,
+  +nagios-plugins-1.4.2-r1.ebuild:
+  * Stable on x86
+  * Fixed RDEPEND for mysql, bug #98153
+    - Added dev-perl/DBI and dev-perl/DBD-mysql
 
 *nagios-plugins-1.4.2 (24 Oct 2005)
 
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 2471a7862359..2da81dc68b16 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,9 +1,10 @@
-MD5 99a3fb1d14d3e25fc8114f20dab92de7 ChangeLog 7023
+MD5 eb6b563511c93042554d44810ef58e67 ChangeLog 7318
 MD5 8f37db1a5330acf9b68c8642375acd17 nagios-plugins-1.3.1-r1.ebuild 2947
 MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
 MD5 65f2a5c5e0084a5be8c0301705c0a67c nagios-plugins-1.4.ebuild 3278
-MD5 6091d3a22d5f8ebb7b7592e516ad58ff nagios-plugins-1.4.1.ebuild 3470
-MD5 8868a2e9d14d485f7c1fb8e86a84cf54 nagios-plugins-1.4.2.ebuild 3468
+MD5 434344d6e331eb775e55c2acc171c8bf nagios-plugins-1.4.1.ebuild 3469
+MD5 de318824a91726116ec40be35dcac501 nagios-plugins-1.4.2.ebuild 3467
+MD5 bcb62ab7165f8f4487d0ed440938c0c7 nagios-plugins-1.4.2-r1.ebuild 3517
 MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
 MD5 acb0b2b914b27b67b9a33807b1e6838e files/install-opts-fix.diff 3168
 MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
@@ -12,3 +13,4 @@ MD5 639ea6f5791cdf3ad540489c66d1f356 files/digest-nagios-plugins-1.4 70
 MD5 da07ad1aeef96a19b0a44da14dac23ca files/digest-nagios-plugins-1.4.1 72
 MD5 64ead1ebbfd3bdb60ac19dc617dd96bf files/digest-nagios-plugins-1.4.2 72
 MD5 73ee36e67ff5948e0db8c99963a9e89f files/nagios-plugins-1.4-noradius.patch 666
+MD5 64ead1ebbfd3bdb60ac19dc617dd96bf files/digest-nagios-plugins-1.4.2-r1 72
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
new file mode 100644
index 000000000000..3b387f8d2ec1
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
@@ -0,0 +1 @@
+MD5 1f2bee15ade3d98ec79964a43479e328 nagios-plugins-1.4.2.tar.gz 971447
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
index bc79f22d88f6..fa4bd5bf5e00 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1.ebuild,v 1.6 2005/10/24 03:48:26 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild,v 1.7 2005/11/20 02:37:54 ramereth Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
 nagios-ssh nagios-game ups ipv6 radius"
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..5962bdf9e53f
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 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.2-r1.ebuild,v 1.1 2005/11/20 02:37:54 ramereth Exp $
+
+inherit eutils
+
+DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
+nagios-ssh nagios-game ups ipv6 radius"
+
+DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.52-r1 )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	radius? ( >=net-dialup/radiusclient-0.3.2 )"
+
+# test broken anyway	test? ( >=dev-perl/Cache-Cache-1.03 )"
+
+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
+			)
+	mysql? ( dev-perl/DBI
+			 dev-perl/DBD-mysql )
+	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
+	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
+	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
+	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
+	ups? ( >=www-apps/nut-1.4 )
+	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	if ! use radius; then
+		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch
+	fi
+	if ! use radius; then
+		export WANT_AUTOCONF=2.58
+		export WANT_AUTMAKE=1.8
+		cd ${S}
+		aclocal -I m4 || die "Failed to run aclocal"
+		autoconf || die "Failed to run autoconf"
+		automake || die "Failed to run automake"
+	fi
+}
+
+src_compile() {
+
+	econf \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with ssl openssl) \
+		$(use_with ipv6) \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--with-nagios-user=nagios \
+		--sysconfdir=/etc/nagios \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "econf failed"
+
+	# fix problem with additional -
+	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg
+	chmod +x ${S}/contrib/*.pl
+
+	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${S}/contrib/*.pl || die "sed failed"
+	sed -i -e '30s/use lib utils.pm;/use utils;/' \
+		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
+
+	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
+		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use mysql || use postgres; then
+		dodir /usr/nagios/libexec
+		exeinto /usr/nagios/libexec
+		doexe ${S}/contrib/check_nagios_db.pl
+	fi
+
+	dodir /usr/nagios/libexec/
+	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
+
+	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
+
+	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
+}
+
+pkg_postinst() {
+	einfo "This ebuild has a number of USE flags which determines what nagios isable to monitor."
+	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
+	einfo "flags need to be set for nagios to function correctly."
+	echo
+	einfo "contrib plugins are installed into /usr/nagios/libexec/contrib"
+}
+
+src_test() {
+	einfo "test broken"
+}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
index e68d1bc8523c..4a2b1cc94d2e 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2.ebuild,v 1.1 2005/10/24 03:48:26 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild,v 1.2 2005/11/20 02:37:54 ramereth Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
 nagios-ssh nagios-game ups ipv6 radius"