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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 155 insertions, 30 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/Manifest b/net-analyzer/ndoutils/Manifest
index b9965d1d2517..300aa314230d 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX ndo2db.init-nagios3 607 RMD160 653f69cd72a3fa25042533ab7c66fedb93648234 SHA1 7d3976574cf34281645798712dd25a29df18b349 SHA256 e4729dece963cb72277868fb19299dc03d3b8a8d9708cfb7f23d80e65a2b135d
-DIST ndoutils-1.4b9.tar.gz 2135521 RMD160 9ff3a5d6c6b511eaf5a069dd0e3433e392d3187c SHA1 28877b5d721824c74682a9f971c90c9461df8925 SHA256 9d85187ec41586e91dc89630a9332d53aa78efa8f2bd9be8019bd7a2558b9306
-EBUILD ndoutils-1.4_beta9.ebuild 1397 RMD160 e4c48492c48de53c87c13e63cfc2f46e03f38681 SHA1 a61ef0b3c842024ea71e2a4d8443dab62cf5291d SHA256 6332920676d1dd3cafd751991385ee085b9a5f9b9dc635a227279856106dfdaa
-MISC ChangeLog 2250 RMD160 1cf0f13eeadb91f05dbbe6c82220226b25f9eb0c SHA1 1c1fb2ac673529d84609bfa1723512a7803d5ba9 SHA256 219cc2ea97a4b2e05f8e7fe62193d902d6915ebf929be347c9d651771038b9de
-MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b
+AUX ndo2db.init-nagios3 607 SHA256 e4729dece963cb72277868fb19299dc03d3b8a8d9708cfb7f23d80e65a2b135d SHA512 e50aef67900c068564e970fd7534450fbad3120ac7d98c10a5d04f1699757ab7d317072ecaa42c01551b6dfb169241dd4b0388b17de61e49b2915aa268199c71 WHIRLPOOL 4e618f42775ec09d1fc9e9c6fbf2ba418ae9bee96c7653e966b69a15e4025b9b0172e34fc845dd12688c42ec4af4c51692ab3d1c4de3641a07cfc9df4636f5ca
+AUX ndoutils-1.4_beta9-asprintf.patch 172 SHA256 c7db1469e5be1aeeffb03541dcc851094a8c212d6ad2caae3a37776bdb62ee6b SHA512 f70586d71727cb3017bb1b5c10dacf33f4a4c3ece405d544d182258d96a3540a8b95220d181a65c22a0023cf1c4294c8d2061fd1ab7328c371b0254464119a9c WHIRLPOOL 0100d63a892308766ab7922a5bf92ea4e7c4238b383c0ab50eb52f176207df6e4e934b60929f9ca00367c833eebc74d1b1c84162223e78c4f35debabcb39aab5
+AUX ndoutils-2.0.0-asprintf.patch 172 SHA256 c7db1469e5be1aeeffb03541dcc851094a8c212d6ad2caae3a37776bdb62ee6b SHA512 f70586d71727cb3017bb1b5c10dacf33f4a4c3ece405d544d182258d96a3540a8b95220d181a65c22a0023cf1c4294c8d2061fd1ab7328c371b0254464119a9c WHIRLPOOL 0100d63a892308766ab7922a5bf92ea4e7c4238b383c0ab50eb52f176207df6e4e934b60929f9ca00367c833eebc74d1b1c84162223e78c4f35debabcb39aab5
+AUX ndoutils-2.0.0-sleep.patch 284 SHA256 b89fdf0f7ff20068e04ccec1411e24c76f7ae85350fd11ee7485bd426e4d9702 SHA512 12ecbe803edc7e4b2c80da34849a7a8e6c64453f98afa51865042282b6420f9a511f08c2f7921ff06455d81a68a35115db942ec1ee6c946969c902dff65346f7 WHIRLPOOL c2f09b6ec089fe25eb78a90dd33a2f467dc3d5c33a7a3848d50c547f2c4c47479b0262d55535d4b5cffebe564ebe4aa5291089f2719a576628dd2940c61f1486
+DIST ndoutils-1.4b9.tar.gz 2135521 SHA256 9d85187ec41586e91dc89630a9332d53aa78efa8f2bd9be8019bd7a2558b9306 SHA512 addaa9c0883c48239444d98c934c3dd5dc923ba0e63a8f63d8b1b6334a4d9364be147d778fed15f1fda857561e69a3645e2c0ff58896a5b568ba95f1180c42b5 WHIRLPOOL 094dfa911c8f3a49720e9b3b0865273a0eeef0b02699eb7b9f41e306ad7defaa0f71e8855dc786c77a814cdaa4945f78aecdd6ffd505d5a4d3696d7c70cbc720
+DIST ndoutils-2.0.0.tar.gz 2207263 SHA256 b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1 SHA512 c899c9f9d0a14995ae7e3fc9f8566891acef9186cc53f05e4f509e9dd01a19a17d32c746a4a1c125342ebffad65946c7a3ea11da68ce0ff240bd37e85334545c WHIRLPOOL d3e41eb5e2a3ea9a5ca0d24fc8319beaa914d2bcb16c187ab6c5f5a3f133c27756ecdc2b6302a75c015294a1b2c3cc48d3c87a540ae1b9b07a21eb427b45d181
+EBUILD ndoutils-1.4_beta9-r1.ebuild 1318 SHA256 0906921b17b80dc1af86553fe3a501865d18fc3e58af374e5e7cc774c4746b52 SHA512 3a365dd73de64a0709bce4164de19ad71b95f6e134940ead79cab60fd8d9c3efbef91160740128e168ae60898a96584ea3a48fe535e013e2791402337b4723dc WHIRLPOOL 7292937aed846fe23e96089598cc31219861a935659477e50d9216bc407ce6f52a710e75988cb26cba8b72bfece945dac2393a1f114d3542f39f32139ebb92f7
+EBUILD ndoutils-2.0.0.ebuild 1350 SHA256 4b0021b4eb47193e56710274177141ff5cd4e6f4d139e775fe714828b1184295 SHA512 ee87065d6dfb8132497742141822d5fa43045779fd4ab827c619904e11ac614a9f1d5ba4da37eb0279cc4469793316c71fe0504d8ba34e5a01b0492928b8d186 WHIRLPOOL 3380936f3e1573550ed6917eee4b147dfcfe64ea2286b3e73a83d869100b11b95a4e9b2f081341516745b126c1695458ef60d484db7ebb3ff14f33172a09d662
+MISC ChangeLog 2623 SHA256 cbfd554da50b776b5aec07ee3dd20a45a541a1bb588ae27e7e8ce29f8545b28a SHA512 7c426ae6ed833b3a59474de1eed5aff7e4882fa453d908fe888bc980a19a1fa842cf80167911002261d4451aabc1644c7c4522786684f4aa982482767d6536af WHIRLPOOL 8ec76fc0d648209cc120ef8a8aca2f5bfcb869037f2953680cb83f63e850a5ac9d803e267e2e38365f6ac98cad1e08f0cd58b04d77e5f0b2e3790dbd57bfe63a
+MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk/WrhAACgkQ/ejvha5XGaMN7gCgg7zWktnvxdzJHYAjE6KZ0oHM
-LVYAnjlxJPB+FuUWJWD0uafq1/3iql/p
-=Fwfe
+iEYEAREIAAYFAlPD9IcACgkQVWmRsqeSphNkIgCeKERP7TPD8esUHvAeHqP2aPmS
+UY8An0vv+1EESHYXa4PWvwOM14x7iH8P
+=KC0j
 -----END PGP SIGNATURE-----
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"
+}