rev-bump for Nagios 3, added ~ppc, fix quoting

Package-Manager: portage-2.1.5.4

5 files changed, 107 insertions, 12 deletions

diff --git a/net-analyzer/ndoutils/ChangeLog b/net-analyzer/ndoutils/ChangeLog
index 0e5676e46483..092bdc361835 100644
--- a/net-analyzer/ndoutils/ChangeLog
+++ b/net-analyzer/ndoutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ndoutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.4 2008/03/08 21:21:36 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.5 2008/06/08 18:37:50 dertobi123 Exp $
+
+*ndoutils-1.4_beta7-r1 (08 Jun 2008)
+
+  08 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/ndo2db.init-nagios3, +ndoutils-1.4_beta7-r1.ebuild:
+  rev-bump for Nagios 3, added ~ppc, fix quoting
 
 *ndoutils-1.4_beta7 (08 Mar 2008)
 
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index d99ff02699ef..7b070a679d97 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,5 +1,7 @@
 AUX ndo2db.init 547 RMD160 f463c156a0577585809d8a01470b042d535f4a98 SHA1 d04b6030285d415cb8b032a27816401bd2bc542b SHA256 46d482286bc19e3cb31a4a3caca1c98fa23282e442729e49d0739f8a254b563c
+AUX ndo2db.init-nagios3 555 RMD160 2bb47593e9b60ac8e22c277dc0143af1d77859fb SHA1 83cfd78d08f82945c1549ede0b0799913b754bbe SHA256 e77f69251438ccc632e49c7e8600080b847d769ad3188a8e47b500495d775398
 DIST ndoutils-1.4b7.tar.gz 1553879 RMD160 a5cb66c59cf20705f54d1c8dda5ed244daf9b2fc SHA1 9b02fda9a612f07d6aa353c9a4a01be121094224 SHA256 76053576fa55f0231917733fc8e7a95d93e013cdb693fadbd8e8a7aa9ac8162c
-EBUILD ndoutils-1.4_beta7.ebuild 1932 RMD160 54e863d047ba26f3df84c18f4cd0a3ae69ff1850 SHA1 b055e5d898e883058a298fd8ce2ee0e5f8ad7521 SHA256 77e604d5e5b6f2408419d3c0cb0630aabc0945bea267bbcc044fc55de1d1b04b
-MISC ChangeLog 925 RMD160 b5846f9cfea222a238be90beb8b9f461e1493eac SHA1 2587933e06d5c7335d01a8f004b1cc8deb6f1244 SHA256 1208955129f378e2167dd20127d84c68329f0805107238f9bc34a209230af6e0
+EBUILD ndoutils-1.4_beta7-r1.ebuild 1814 RMD160 407ac0ad901e51b8ed73eea0c3a25c90e6991276 SHA1 9e7c43a3bec74dd0bf54dfd64018ec0ab60a4331 SHA256 385086c7aa9148b60ab1e91e304e6196b877e0270ae338cfceca9696019caa67
+EBUILD ndoutils-1.4_beta7.ebuild 1954 RMD160 61adadb1d0ad25602eddec16c8cbed76f8e02c4a SHA1 b7fce8473524b4338f35d02905a77d6a99342f8f SHA256 19b1337944eefc7a754edbf1e01996c3d8c2bf7f642e5a957c12f8fd80e02cfb
+MISC ChangeLog 1130 RMD160 741c064af9463cd47745cc9ee52f70d262fbdad1 SHA1 e3e8016e3f2b4db90e5707af78ee2713373ce22f SHA256 fbc17e6528e44dd23bcaca4f63ffbf037bc12d3e25c4116347e240cdf4b1803e
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
diff --git a/net-analyzer/ndoutils/files/ndo2db.init-nagios3 b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
new file mode 100755
index 000000000000..ea98d3f4e754
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3,v 1.1 2008/06/08 18:37:51 dertobi123 Exp $
+
+depends() {
+	before nagios
+	need mysql
+}
+
+start() {
+	ebegin "Starting ndo2db"
+	start-stop-daemon --start --quiet --exec /usr/nagios/bin/ndo2db-2x \
+	-- -c /etc/nagios/ndo2db.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ndo2db"
+	start-stop-daemon --stop --quiet --exec /usr/nagios/bin/ndo2db-2x
+	eend $?
+}
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
new file mode 100644
index 000000000000..f914b270fffe
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild,v 1.1 2008/06/08 18:37:50 dertobi123 Exp $
+
+inherit eutils
+
+MY_P=${P/_beta/b}
+
+DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
+HOMEPAGE="http://www.nagios.org"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+DEPEND="dev-perl/DBI
+		dev-perl/DBD-mysql
+		virtual/mysql"
+RDEPEND="${DEPEND}
+	>=net-analyzer/nagios-core-3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/nagios \
+		--enable-mysql \
+		--disable-pgsql || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	cp "${S}"/src/{file2sock,log2ndo,ndo2db-3x,ndomod-3x.o,sockdebug} "${D}"/usr/bin
+
+	dodir /usr/share/nagios/
+	cp -R "${S}"/db "${D}"/usr/share/nagios
+
+	chown -R root:nagios "${D}"/usr/bin || die "Failed chown of "${D}"/usr/nagios"
+	chmod 750 "${D}"/usr/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || "Failed chmod"
+
+	dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"
+
+	sed -i s:socket_name=/usr/local/nagios/var/ndo.sock:socket_name=/var/nagios/ndo.sock:g "${S}"/config/ndo2db.cfg
+
+	insinto /etc/nagios
+	doins "${S}"/config/ndo2db.cfg
+	doins "${S}"/config/ndomod.cfg
+
+	newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
+}
+
+pkg_postinst() {
+	elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
+	elog "in /etc/nagios/nagios.cfg:"
+	elog "\tbroker_module=/usr/bin/ndomod-2x.o config_file=/etc/nagios/ndomod.cfg"
+}
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
index c9544fd7769a..4f9d2ac9c72b 100644
--- a/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild,v 1.1 2008/03/08 21:21:36 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild,v 1.2 2008/06/08 18:37:50 dertobi123 Exp $
 
 inherit eutils
 
@@ -38,13 +38,13 @@ src_compile() {
 
 src_install() {
 	dodir /usr/nagios/bin
-	cp ${S}/src/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} ${D}/usr/nagios/bin
+	cp "${S}"/src/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} "${D}"/usr/nagios/bin
 
 	dodir /usr/nagios/share/
-	cp -R ${S}/db ${D}/usr/nagios/share
+	cp -R "${S}"/db "${D}"/usr/nagios/share
 
-	chown -R root:nagios ${D}/usr/nagios || die "Failed chown of ${D}/usr/nagios"
-	chmod 750 ${D}/usr/nagios/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || "Failed chmod"
+	chown -R root:nagios "${D}"/usr/nagios || die "Failed chown of "${D}"/usr/nagios"
+	chmod 750 "${D}"/usr/nagios/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || "Failed chmod"
 
 	dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"
 
@@ -52,16 +52,16 @@ cat << EOF > "${T}"/55-ndoutils-revdep
 SEARCH_DIRS="/usr/nagios/bin"
 EOF
 
-	sed -i s:socket_name=/usr/local/nagios/var/ndo.sock:socket_name=/var/nagios/ndo.sock:g ${S}/config/ndo2db.cfg
+	sed -i s:socket_name=/usr/local/nagios/var/ndo.sock:socket_name=/var/nagios/ndo.sock:g "${S}"/config/ndo2db.cfg
 
 	insinto /etc/revdep-rebuild
 	doins "${T}"/55-ndoutils-revdep
 
 	insinto /etc/nagios
-	doins ${S}/config/ndo2db.cfg
-	doins ${S}/config/ndomod.cfg
+	doins "${S}"/config/ndo2db.cfg
+	doins "${S}"/config/ndomod.cfg
 
-	newinitd ${FILESDIR}/ndo2db.init ndo2db
+	newinitd "${FILESDIR}"/ndo2db.init ndo2db
 }
 
 pkg_postinst() {