summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-05-31 20:50:13 +0000
committerJeroen Roovers <jer@gentoo.org>2010-05-31 20:50:13 +0000
commit73e7c6189399550c31d15475ce5c51c7b94f0d57 (patch)
treee2de690cd2ce08af08dc685dcfbe63805891a8e4
parentMarked ~ppc for bug #321497. (diff)
downloadhistorical-73e7c6189399550c31d15475ce5c51c7b94f0d57.tar.gz
historical-73e7c6189399550c31d15475ce5c51c7b94f0d57.tar.bz2
historical-73e7c6189399550c31d15475ce5c51c7b94f0d57.zip
When USE=ftconv, after we run eautoreconf, we need to define the switches differently (bug #322201).
Package-Manager: portage-2.2_rc67/cvs/Linux i686
-rw-r--r--net-analyzer/nfdump/ChangeLog6
-rw-r--r--net-analyzer/nfdump/Manifest4
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.1.ebuild15
3 files changed, 18 insertions, 7 deletions
diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 52e477a1c840..ee981bd0b0dd 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,10 @@
# 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.9 2010/05/06 09:10:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.10 2010/05/31 20:50:13 jer Exp $
+
+ 31 May 2010; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.1.ebuild:
+ When USE=ftconv, after we run eautoreconf, we need to define the switches
+ differently (bug #322201).
*nfdump-1.6.1 (06 May 2010)
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 0dd6691b0755..c44e91fe0211 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -6,6 +6,6 @@ DIST nfdump-1.6.1.tar.gz 495643 RMD160 af26aef45e937b633c349cd6a551c34bf8cf8827
EBUILD nfdump-1.5.1.ebuild 672 RMD160 b4057a31ad083659cdbbc25bea688030c2b017f2 SHA1 3c8b3b837677c44ca4c050e75cd696384e41a292 SHA256 c32f2d1f7184f5004a95ff6db43977c59668bf38852ed6db3ce9c355d543bc10
EBUILD nfdump-1.5.7.ebuild 670 RMD160 1046a51444247a3b2588eaa74825ee40d934ab8a SHA1 a511085d522a8af3e16ded80a6d6d3a1bb45a901 SHA256 1aca33ef4bcc2ca03306e038c85dd3f5a3207407b3fea0a94ca204c469a0ddf1
EBUILD nfdump-1.5.8.ebuild 642 RMD160 cb32ccd14ef6f9f5ee69015b18da4de4d13b60fe SHA1 ac0a36a0c7796aa45ae06cbbf5f1019633f367c6 SHA256 2f84d53576e019e171af123233e283f0888a166aa5c4974fbac28ab99332376f
-EBUILD nfdump-1.6.1.ebuild 1243 RMD160 67969b6c13c2b168f1e9f810a14823d6abe549b5 SHA1 7d53306349a50d2b612b4fa188a54ceea9975007 SHA256 80a67eca3069033aecf2c2a8a41e28e19415733b9a2369dabd721cc2a6bd9a5c
-MISC ChangeLog 1535 RMD160 17c4a0a4efb352e3f65b3e4ac41c0e488316010f SHA1 569e93bffc527bbaf91803de73e04829b0f4a934 SHA256 349efd1c90171cc1616b9ec6c83ae5d8beeb4287746176de130804acc3618931
+EBUILD nfdump-1.6.1.ebuild 1393 RMD160 69144c432ef0dbe905a6a80792892c12c0bfcdba SHA1 2ab3a868586a4977cf44798a08c8effd6565a368 SHA256 e0d3c1f2e7b3678f80eb9e453c6292d39c7f27f0ee4da76a1839eb08dd4cfb44
+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 59d1798a0fb6..a0c8f434228a 100644
--- 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.1 2010/05/06 09:10:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1.ebuild,v 1.2 2010/05/31 20:50:13 jer Exp $
EAPI=2
inherit autotools eutils
@@ -35,10 +35,17 @@ src_prepare() {
}
src_configure() {
- # $(use_enable readpcap) \
+ # 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
+
econf \
- $(use_enable ftconv) \
- $(use_with ftconv ftpath="/usr") \
+ ${myconf} \
$(use_enable nfprofile) \
$(use_enable sflow)
}