6 files changed, 103 insertions, 5 deletions
diff --git a/net-analyzer/nagios-nsca/ChangeLog b/net-analyzer/nagios-nsca/ChangeLog
index c22316ab3320..3f4c48669a65 100644
--- a/net-analyzer/nagios-nsca/ChangeLog
+++ b/net-analyzer/nagios-nsca/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-nsca
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.15 2006/02/04 20:08:34 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.16 2006/04/27 03:02:57 ramereth Exp $
+
+*nagios-nsca-2.6 (27 Apr 2006)
+
+  27 Apr 2006; Lance Albertson <ramereth@gentoo.org> +files/nsca-2.6,
+  nagios-nsca-2.5.ebuild, +nagios-nsca-2.6.ebuild:
+  * Version bump
+  * Added reload to init script (2.6)
+  * Stable on x86 (2.5)
 
 *nagios-nsca-2.5 (04 Feb 2006)
 
diff --git a/net-analyzer/nagios-nsca/Manifest b/net-analyzer/nagios-nsca/Manifest
index eebc14ef8999..1777e0db7edd 100644
--- a/net-analyzer/nagios-nsca/Manifest
+++ b/net-analyzer/nagios-nsca/Manifest
@@ -1,10 +1,13 @@
-MD5 b427c00c8edada45e13b27bd97ef9ba7 ChangeLog 1799
+MD5 cff9660b3145db642b5df790bce744d5 ChangeLog 2032
 MD5 437542031246a33fb8628c0e4200d44b files/digest-nagios-nsca-2.4 59
 MD5 bb18a5c9e25e4b125e924a268482bf5f files/digest-nagios-nsca-2.5 59
+MD5 abbcbff174edb89a9bd5dff10a10d722 files/digest-nagios-nsca-2.6 60
 MD5 218223213e92b553a8b48303099e8074 files/nsca 449
 MD5 529c269b478256730d697c47a66c084e files/nsca-2.3 462
+MD5 60ed8374582c8dfbca1d45b58e8ee195 files/nsca-2.6 602
 MD5 8b86cb8a22eb4b17001fbabccdcb815b files/nsca.cfg 4960
 MD5 76939517175739a4759384705421d632 files/send_nsca.cfg 1628
 MD5 d01d27586cb77c61a399d77b3b33c408 metadata.xml 1129
 MD5 a438669b4f305a3c834920170611635e nagios-nsca-2.4.ebuild 1391
-MD5 b82b10e0fb183db3a266b6bf06e439d5 nagios-nsca-2.5.ebuild 1408
+MD5 5134dce40162ab42d999a03e18d1c357 nagios-nsca-2.5.ebuild 1407
+MD5 4dfb34f68d276b2750f5d12a0ab27642 nagios-nsca-2.6.ebuild 1410
diff --git a/net-analyzer/nagios-nsca/files/digest-nagios-nsca-2.6 b/net-analyzer/nagios-nsca/files/digest-nagios-nsca-2.6
new file mode 100644
index 000000000000..14c4e3ec7229
--- /dev/null
+++ b/net-analyzer/nagios-nsca/files/digest-nagios-nsca-2.6
@@ -0,0 +1 @@
+MD5 d526a3ac3c29648c729c5fb4fb332488 nsca-2.6.tar.gz 101341
diff --git a/net-analyzer/nagios-nsca/files/nsca-2.6 b/net-analyzer/nagios-nsca/files/nsca-2.6
new file mode 100755
index 000000000000..e1d3085cbd8b
--- /dev/null
+++ b/net-analyzer/nagios-nsca/files/nsca-2.6
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+
+opts="${opts} reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nsca"
+	start-stop-daemon --start --quiet --name nsca \
+	--startas /usr/nagios/bin/nsca \
+		-c nagios:nagios \
+		-- -c /etc/nagios/nsca.cfg \
+		--daemon
+	eend $? "Failed to Start nsca"
+}
+
+stop() {
+	ebegin "Stopping nsca"
+	start-stop-daemon --stop --quiet -n nsca
+	eend $? "Failed to Stop nsca"
+}
+
+reload() {
+        ebegin "Reloading nsca"
+        kill -HUP `pgrep nsca`
+        eend $? "Failed to reload nsca"
+}
+
+restart() {
+	ebegin "Restarting nsca"
+	svc_stop
+	svc_start
+	eend $? "Failed to Restart nsca"
+}
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild
index b8b6b54c6852..79b411bfc5d2 100644
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild
+++ b/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild,v 1.1 2006/02/04 20:08:34 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild,v 1.2 2006/04/27 03:02:57 ramereth Exp $
 
 DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
 HOMEPAGE="http://www.nagios.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=">=net-analyzer/nagios-plugins-1.3.1
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.6.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.6.ebuild
new file mode 100644
index 000000000000..4f6ef69785af
--- /dev/null
+++ b/net-analyzer/nagios-nsca/nagios-nsca-2.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.6.ebuild,v 1.1 2006/04/27 03:02:57 ramereth Exp $
+
+DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-analyzer/nagios-plugins-1.3.1
+	>=dev-libs/libmcrypt-2.5.1-r4"
+S="${WORKDIR}/nsca-${PV}"
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nsca-user=nagios \
+		--with-nsca-grp=nagios \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY
+	insinto /etc/nagios
+	doins ${S}/sample-config/nsca.cfg
+	doins ${S}/sample-config/send_nsca.cfg
+	exeinto /usr/nagios/bin
+	doexe src/nsca
+	fowners nagios:nagios /usr/nagios/bin/nsca
+	exeinto /usr/nagios/libexec
+	doexe src/send_nsca
+	fowners nagios:nagios /usr/nagios/libexec/send_nsca
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/nsca-${PV} nsca
+}
+pkg_postinst() {
+	einfo
+	einfo "If you are using the nsca daemon, remember to edit"
+	einfo "the config file /etc/nagios/nsca.cfg"
+	einfo
+}