Version bump. Fix compiler warning. Fix DEPEND and RDEPEND entries. Remove pcap support as that never existed outside one header file and the configure script ("for future use"). Make librrd support optional.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

5 files changed, 39 insertions, 46 deletions

diff --git a/net-analyzer/rrdcollect/ChangeLog b/net-analyzer/rrdcollect/ChangeLog
index a0cb2c428f57..0255e5e926f1 100644
--- a/net-analyzer/rrdcollect/ChangeLog
+++ b/net-analyzer/rrdcollect/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/rrdcollect
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/ChangeLog,v 1.4 2011/04/02 12:52:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/ChangeLog,v 1.5 2011/06/09 17:36:12 jer Exp $
+
+*rrdcollect-0.2.9 (09 Jun 2011)
+
+  09 Jun 2011; Jeroen Roovers <jer@gentoo.org> -rrdcollect-0.2.3.ebuild,
+  -rrdcollect-0.2.4.ebuild, +rrdcollect-0.2.9.ebuild,
+  +files/rrdcollect-0.2.9-include.patch, metadata.xml:
+  Version bump. Fix compiler warning. Fix DEPEND and RDEPEND entries. Remove
+  pcap support as that never existed outside one header file and the configure
+  script ("for future use"). Make librrd support optional.
 
   02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> rrdcollect-0.2.3.ebuild,
   rrdcollect-0.2.4.ebuild:
diff --git a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
new file mode 100644
index 000000000000..69827b28358f
--- /dev/null
+++ b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
@@ -0,0 +1,10 @@
+--- a/src/checkpid.c
++++ b/src/checkpid.c
+@@ -20,6 +20,7 @@
+ 
+ #include "rrdcollect.h"
+ #include <fcntl.h>
++#include <sys/file.h> /* flock() */
+ 
+ /* lockfile in rrdcollect.pid */
+ /* five digits+"\n\0" */
diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml
index 31da1c9bff74..32c24f28c167 100644
--- a/net-analyzer/rrdcollect/metadata.xml
+++ b/net-analyzer/rrdcollect/metadata.xml
@@ -4,6 +4,6 @@
 <herd>netmon</herd>
 <use>
 <flag name="exec">Enable exec:/// support</flag>
-<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
+<flag name="librrd">Use the librrd library from <pkg>net-analyzer/rrdtool</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.3.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.3.ebuild
deleted file mode 100644
index 580f819af8a3..000000000000
--- a/net-analyzer/rrdcollect/rrdcollect-0.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/rrdcollect-0.2.3.ebuild,v 1.4 2011/04/02 12:52:52 ssuominen Exp $
-
-DESCRIPTION="Read system statistical data and feed it to RRDtool"
-HOMEPAGE="http://rrdcollect.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="pcre"
-
-DEPEND="net-libs/libpcap
-	net-analyzer/rrdtool
-	pcre? ( dev-libs/libpcre )"
-
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--with-libpcre \
-		--with-librrd \
-		$(use_with pcap libpcap) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-}
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.4.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
index 9f5e1a266339..090270f7b789 100644
--- a/net-analyzer/rrdcollect/rrdcollect-0.2.4.ebuild
+++ b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/rrdcollect-0.2.4.ebuild,v 1.2 2011/04/02 12:52:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild,v 1.1 2011/06/09 17:36:12 jer Exp $
+
+EAPI="3"
+
+inherit eutils
 
 DESCRIPTION="Read system statistical data and feed it to RRDtool"
 HOMEPAGE="http://rrdcollect.sourceforge.net/"
@@ -9,22 +13,24 @@ SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="pcre pcap exec"
+IUSE="exec librrd pcre"
 
-DEPEND="pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}
-	net-analyzer/rrdtool"
+DEPEND="
+	librrd? ( net-analyzer/rrdtool )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
 
-src_compile() {
-	econf --disable-dependency-tracking \
-		--with-librrd \
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+	econf \
 		$(use_with pcre libpcre) \
-		$(use_with pcap libpcap) \
+		$(use_with librrd) \
 		$(use_enable exec) \
 		|| die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {