Updated fix by jer as I like terse code more :)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index a0e2eac19b1b71a8d601065a3e6c156f1d8ef3db..7fd8374a09ee20a21ce8e8d674914a3f2b1b7cc1 100644 (file)
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,6 +2,6 @@ AUX nfdump-1.5.8-parallel.patch 315 RMD160 3c68680036eb2d2ba8888581b9555f728f70b
 DIST nfdump-1.5.8.tar.gz 331279 RMD160 3b91874088cec70eae697fa45f9e8c2832da43b9 SHA1 73a18f3eabb7f928d8ed9c2a305914c953f9457e SHA256 3fbfb874377316cf322cf13cfab667207fe78e0910bbc82ba012e3a77c00de36
 DIST nfdump-1.6.1.tar.gz 495643 RMD160 af26aef45e937b633c349cd6a551c34bf8cf8827 SHA1 d00cd84eb0f6ff23928c3c2c09665e5633f5114d SHA256 d0585d3963288b708f2be6081f673d9935acc8bb5f25255286786eedf31edafd
 EBUILD nfdump-1.5.8.ebuild 642 RMD160 cb32ccd14ef6f9f5ee69015b18da4de4d13b60fe SHA1 ac0a36a0c7796aa45ae06cbbf5f1019633f367c6 SHA256 2f84d53576e019e171af123233e283f0888a166aa5c4974fbac28ab99332376f
-EBUILD nfdump-1.6.1.ebuild 1393 RMD160 69144c432ef0dbe905a6a80792892c12c0bfcdba SHA1 2ab3a868586a4977cf44798a08c8effd6565a368 SHA256 e0d3c1f2e7b3678f80eb9e453c6292d39c7f27f0ee4da76a1839eb08dd4cfb44
+EBUILD nfdump-1.6.1.ebuild 1290 RMD160 97aeff27d28084afa775a3858c7bf50aa8488919 SHA1 94a7b3160becf729544efea3ec3eb60d8c6f423b SHA256 35ba5de3f85a19720f329e7381e4a27b02787e1f91075741099fdb911a2dabe2
 MISC ChangeLog 1710 RMD160 c77e4bbfa399b738813b67ddeb44231281b56438 SHA1 6471a2cb146f93dad37dd1544e1a6ac7696036af SHA256 f4e1332ed414b7be9233ac5eba2de8f95d3eebdc65cc8cb1c9c9405f510bf743
 MISC metadata.xml 573 RMD160 1d97875a7d89719bba6e2eea50b31546a42b6ce2 SHA1 f740e3397f535672cb2b3e4bc738b886fc61c81e SHA256 cad6f663d4018fab0c0b552134d905a6cab35b8540cb575f5923adf9fb448353

diff --git a/net-analyzer/nfdump/nfdump-1.6.1.ebuild b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
index a0c8f434228a4b7e7718cc2279d708212e19520c..2d5a35578bb4631337c59a20d5c5a17594e6db84 100644 (file)
--- a/net-analyzer/nfdump/nfdump-1.6.1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2010/05/31 20:50:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1.ebuild,v 1.3 2010/06/01 08:14:39 pva Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -35,19 +35,12 @@ src_prepare() {
 }
 
 src_configure() {
-       # When USE=ftconv, after we run eautoreconf, we need to define the switches
-       # differently (bug #322201)
-       local myconf
-       if use ftconv; then
-               myconf="--with-ftpath=/usr --enable-ftconv"
-       else
-               myconf="--without-ftconv"
-       fi
-
+       # --without-ftconf is not handled well #322201
        econf \
-               ${myconf} \
+               $(use ftconv && echo "--with-ftconf --with-ftpath=/usr") \
                $(use_enable nfprofile) \
                $(use_enable sflow)
+       #       $(use_enable readpcap) \
 }
 
 src_install() {