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.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

6 files changed, 48 insertions, 56 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/Manifest b/net-analyzer/rrdcollect/Manifest
index 285fb3bc4cdc..49f2f1000699 100644
--- a/net-analyzer/rrdcollect/Manifest
+++ b/net-analyzer/rrdcollect/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST rrdcollect-0.2.3.tar.gz 158328 RMD160 1c0643844fa83c552cd18df1af384a65178eba5a SHA1 0c0374eae95ae5f0a5d1056d2d455c065d059aa5 SHA256 f0bde287a723b0feadde551a712c2b47ea757d40a89dda5bca5323f037f33a8d
-DIST rrdcollect-0.2.4.tar.gz 165654 RMD160 94e86031084a82f0dd26401fee28bda01aa0b93d SHA1 99c7dfdd2471475bfb437a225abb701a055666d3 SHA256 960297fa6c6570653e50aaec8835650f06e74a2044ce5b5d920d9e64f7fe88f1
-EBUILD rrdcollect-0.2.3.ebuild 781 RMD160 cd6ef80fc3731c48f2170ecc17a2d0616c01d3b7 SHA1 dafabcff8d201049d2ba946c53b18a9baf62628b SHA256 8cbc182308bbbdce80fea28278c9d6df5d4898393a0b8ab72d4dead36aa47ed3
-EBUILD rrdcollect-0.2.4.ebuild 835 RMD160 8c494762fc9b80ce20b2b9d934404fbf6eb187ff SHA1 890775fca182e9e06dbc5adf0d8d88f8d1f6505f SHA256 4e700d569ce5a296f420feac6806fefa638336fec26dbcb503253950b6988b41
-MISC ChangeLog 886 RMD160 a0a8d85fb3b413a4dbbbdb16f400e9dc6375b5c9 SHA1 b8425c20ff08bb2951a1a7dcbb0e0a68adad4e6a SHA256 7d635a33c4a362a11d948383084cf53c44be68753556a872a5cf0f969e66a2a3
-MISC metadata.xml 299 RMD160 394bce22bb258b5f7284529e6fb759bcfbb5c66e SHA1 ae3f5c80485dbf6db32da87841474912064b28fa SHA256 bbba2b251e8a6218a3242408358046547d7b55e847a8853a45d9383bc3110d3d
+AUX rrdcollect-0.2.9-include.patch 206 RMD160 6b69df90c416aad35dc0c4c502f2e21eec70d3f1 SHA1 1b22167ef35d6afb2a1f418671b8d7059cf1531f SHA256 95896cd56078294361a4fb3aff829cfb35db03b375fd839b70ead1b37f7fd8b7
+DIST rrdcollect-0.2.9.tar.gz 137397 RMD160 cb20c07421509aed721e6cec684801f9cb482245 SHA1 726ca783635bef9e2f2459974657d701a211fdbd SHA256 df738369c4f7c642e85ee1e0314c29cca19534c4d53074295b25c3b309ea1a50
+EBUILD rrdcollect-0.2.9.ebuild 822 RMD160 63f2967aef5c6a114788e121ae5a2cd4ca00c671 SHA1 853e60d04134081aa1ff5015a73bb9707115b30f SHA256 4f6ad51f4169f9a2bd6fc3389649cd4d672563afb77be2bc8b5c715f131b702d
+MISC ChangeLog 1311 RMD160 3bc850cdc43ad09f913b7d871d9ca4b1ab00b077 SHA1 4e8458f218bbab7d749686fc86b59086aa976ffe SHA256 3100e2832fae6173fe946e993037ae416a3d45e86ff44c1ddf1819209e6c8cca
+MISC metadata.xml 308 RMD160 9f1c53ac433ea83d8d78e31386386116d0492c60 SHA1 c36f4050a55e41b8c88323a24d8bace433ef6ca8 SHA256 f91a7b50d3712a0fd2aa82756877c4235f6e9bcd47a0e6804042427e6aa56917
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2XHGgACgkQXkR9YqOcLPHFCgEAhMAzDp2puanx7cuR6SJk1bsd
-WoK3yf/VjEGw2+LW71sA/27vAN96lmEIwr3YQ1hYRb9C89F+uPj6uvF3b1/BS1vu
-=J2Db
+iEYEARECAAYFAk3xBJYACgkQVWmRsqeSphNRhwCeKw8glJz0NwYZ+jG5G3jWveZF
+xOQAn2gBgZtDYvmG9jySnKyWpxJsWPWq
+=vszM
 -----END PGP SIGNATURE-----
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() {