EAPI bump. Version bump. Fix missing includes/defines.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 140 insertions, 20 deletions

diff --git a/net-analyzer/ndoutils/ChangeLog b/net-analyzer/ndoutils/ChangeLog
index 85f040cdda68..626a881e2815 100644
--- a/net-analyzer/ndoutils/ChangeLog
+++ b/net-analyzer/ndoutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/ndoutils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.13 2012/06/12 02:48:43 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.14 2014/07/14 15:17:26 jer Exp $
+
+*ndoutils-2.0.0 (14 Jul 2014)
+*ndoutils-1.4_beta9-r1 (14 Jul 2014)
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> -ndoutils-1.4_beta9.ebuild,
+  +ndoutils-1.4_beta9-r1.ebuild, +ndoutils-2.0.0.ebuild,
+  +files/ndoutils-1.4_beta9-asprintf.patch,
+  +files/ndoutils-2.0.0-asprintf.patch, +files/ndoutils-2.0.0-sleep.patch:
+  EAPI bump. Version bump. Fix missing includes/defines.
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> ndoutils-1.4_beta9.ebuild:
   inherit user for enewgroup and enewuser
diff --git a/net-analyzer/ndoutils/files/ndoutils-1.4_beta9-asprintf.patch b/net-analyzer/ndoutils/files/ndoutils-1.4_beta9-asprintf.patch
new file mode 100644
index 000000000000..146132c21de3
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndoutils-1.4_beta9-asprintf.patch
@@ -0,0 +1,10 @@
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -9,6 +9,7 @@
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
new file mode 100644
index 000000000000..146132c21de3
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
@@ -0,0 +1,10 @@
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -9,6 +9,7 @@
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
new file mode 100644
index 000000000000..61694baee9e3
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
@@ -0,0 +1,10 @@
+--- a/src/queue.c
++++ b/src/queue.c
+@@ -8,6 +8,7 @@
+ #include "../include/queue.h"
+ #include <errno.h>
+ #include <time.h>
++#include <unistd.h> /* sleep() */
+ 
+ #define RETRY_LOG_INTERVAL	600		/* Seconds */
+ #define MAX_RETRIES	20				/* Max number of times to retry sending message */
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta9.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta9-r1.ebuild
index 7084f350404f..62f9653c538c 100644
--- a/net-analyzer/ndoutils/ndoutils-1.4_beta9.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta9-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta9.ebuild,v 1.2 2012/06/12 02:48:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta9-r1.ebuild,v 1.1 2014/07/14 15:17:26 jer Exp $
 
-inherit user
+EAPI=5
+inherit eutils user
 
 MY_P=${P/_beta/b}
 
@@ -13,13 +14,16 @@ 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"
+DEPEND="
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	virtual/mysql
+"
+RDEPEND="
+	${DEPEND}
+	>=net-analyzer/nagios-core-3.0
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -28,20 +32,29 @@ pkg_setup() {
 	enewuser nagios -1 /bin/bash /var/nagios/home nagios
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asprintf.patch
+}
+
+src_configure() {
 	econf \
 		--sysconfdir=/etc/nagios \
-		--enable-mysql \
-		--disable-pgsql || die "econf failed"
-
-	emake || die "emake failed"
+		--enable-mysql
 }
 
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	emake install-config DESTDIR="${D}" || die "emake install-config failed"
+DOCS=(
+	'docs/NDOUTILS DB Model.pdf'
+	'docs/NDOUtils Documentation.pdf'
+	Changelog
+	README
+	REQUIREMENTS
+	TODO
+	UPGRADING
+)
 
-	dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"
+src_install() {
+	default
+	emake DESTDIR="${D}" install-config
 
 	newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
 }
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
new file mode 100644
index 000000000000..a43aab9174bf
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild,v 1.1 2014/07/14 15:17:25 jer Exp $
+
+EAPI=5
+inherit eutils user
+
+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"
+
+DEPEND="
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	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_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-asprintf.patch \
+		"${FILESDIR}"/${P}-sleep.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/nagios \
+		--enable-mysql
+}
+
+DOCS=(
+	'docs/NDOUTILS DB Model.pdf'
+	'docs/NDOUtils Documentation.pdf'
+	Changelog
+	README
+	REQUIREMENTS
+	TODO
+	UPGRADING
+)
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-config
+
+	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-3x.o config_file=/etc/nagios/ndomod.cfg"
+}