Add more USE flags for configure options. Respect CFLAGS.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index eb5a8da048004daab60d8226b7c94028b4d9910f..be106b39869959dfa0364b0ca27ae3f0432ec909 100644 (file)
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.13 2010/06/26 17:03:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.14 2010/07/12 22:34:45 jer Exp $
+
+*nfdump-1.6.1-r1 (12 Jul 2010)
+
+  12 Jul 2010; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.1-r1.ebuild,
+  metadata.xml:
+  Add more USE flags for configure options. Respect CFLAGS.
 
   26 Jun 2010; Christoph Mende <angelos@gentoo.org> nfdump-1.6.1.ebuild:
   Stable on amd64 wrt bug #323567

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 9ee9a8026a4b88d206f273b0c114b36e834129f7..354bcdf2bb0a3f9f00e5d092fb07da2629811c25 100644 (file)
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,4 +1,5 @@
 DIST nfdump-1.6.1.tar.gz 495643 RMD160 af26aef45e937b633c349cd6a551c34bf8cf8827 SHA1 d00cd84eb0f6ff23928c3c2c09665e5633f5114d SHA256 d0585d3963288b708f2be6081f673d9935acc8bb5f25255286786eedf31edafd
+EBUILD nfdump-1.6.1-r1.ebuild 1436 RMD160 496d46d3dbbb5e44d725e9b878291d2308aacf9c SHA1 26052f4782f3911eb1743d568f6051ddc888951a SHA256 3089ab9dce222f25004aa0c643568e88985f60141a9654e9a5f90637ae7bdc05
 EBUILD nfdump-1.6.1.ebuild 1314 RMD160 f93ea40044b54dd2ab36dca96e15f560e3acced6 SHA1 8a89192aab7afd2f76eeac2fc36ce3eeb6ecd4d3 SHA256 aef3cd56f876c4b3a6ed58ab49bc20c8e59937a0ffd5810ac802ce331bd78f30
-MISC ChangeLog 2075 RMD160 2d4ada41fd5c69447b6c251efcb364be3fc86644 SHA1 4a771d54fd7d6aa3e9e9271aafcf351b1782a96e SHA256 35544cd7f5f35a8f2a3fbf19947d4788f71567cb0f829a04f5d40e204feccb22
-MISC metadata.xml 573 RMD160 1d97875a7d89719bba6e2eea50b31546a42b6ce2 SHA1 f740e3397f535672cb2b3e4bc738b886fc61c81e SHA256 cad6f663d4018fab0c0b552134d905a6cab35b8540cb575f5923adf9fb448353
+MISC ChangeLog 2252 RMD160 ff7f23f8cda758b208a0bf1290f7effa425f7e69 SHA1 c5967e47ba9e5615aaa564e77f5c18d7514fc8c0 SHA256 c2b7010d95e569473a6ce9cf21faf3125b280a5d4e1a2ed52cc5c471cfaa2b9e
+MISC metadata.xml 672 RMD160 2cc5cad8ddda5833a01978d7f88aa035aef3b105 SHA1 3964c522dfd999385f44c1c6a0ef3a13ef393290 SHA256 5bc59bc7a5a8f8f0da16de87446c72ee2e1b7ff0dd704640269292e70d9fbf45

diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index 194d2b1f16ceece543f723f5bc1b1bea7acd86c4..527afc53bd98ac0a3a0af7f5e23159c0555edbd8 100644 (file)
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -7,6 +7,7 @@
   <flag name='nfprofile'>Build nfprofile used by NfSen</flag>
   <!--<flag name='readpcap'>Build nfcapd collector to read from pcap file instead ofnetwork data</flag>-->
   <flag name='sflow'>Build sflow collector sfcpad</flag>
+  <flag name='compat15'>Enable read support for nfdump data files created with nfdump 1.5.x</flag>
 </use>
 <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
 </pkgmetadata>

diff --git a/net-analyzer/nfdump/nfdump-1.6.1-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.1-r1.ebuild
new file mode 100644 (file)
index 0000000..4ed729d
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1-r1.ebuild,v 1.1 2010/07/12 22:34:45 jer Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Fails to build readpcap:
+# https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752
+IUSE="compat15 debug ftconv nfprofile sflow"
+
+CDEPEND="
+       ftconv? ( sys-libs/zlib
+               net-analyzer/flow-tools )
+       nfprofile? ( net-analyzer/rrdtool )"
+#      readpcap? ( net-libs/libpcap )"
+DEPEND="${CDEPEND}
+       sys-devel/flex"
+RDEPEND=${CDEPEND}"
+       dev-lang/perl"
+
+src_prepare() {
+       if use ftconv; then
+               sed '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+               sed 's:lib\(/ftlib.h\):include\1:' -i configure.in || die
+       fi
+       sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
+       eautoreconf
+}
+
+src_configure() {
+       # --without-ftconf is not handled well #322201
+       econf \
+               $(use ftconv && echo "--with-ftconf --with-ftpath=/usr") \
+               $(use nfprofile && echo "--enable-nfprofile") \
+               $(use_enable sflow) \
+               $(use_enable debug devel) \
+               $(use_enable compat15)
+       #       $(use_enable readpcap) \
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS README || die
+}