summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-01-26 13:23:58 +0000
committerPeter Volkov <pva@gentoo.org>2008-01-26 13:23:58 +0000
commit9a4fe3d021f2c7baf328c2dc66a30da80428c34d (patch)
tree28090afc85d90f9ed832796a085ca7a9f76156d4
parentMoved autotools into src_unpack() (fixes bug #207474). (diff)
downloadgentoo-2-9a4fe3d021f2c7baf328c2dc66a30da80428c34d.tar.gz
gentoo-2-9a4fe3d021f2c7baf328c2dc66a30da80428c34d.tar.bz2
gentoo-2-9a4fe3d021f2c7baf328c2dc66a30da80428c34d.zip
Moved autotools stuff to src_unpack, bug #207463, thank Diego Pettenò <flameeyes AT gentoo.org> for report.
(Portage version: 2.1.4_rc14)
-rw-r--r--net-analyzer/flow-tools/ChangeLog8
-rw-r--r--net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild10
2 files changed, 11 insertions, 7 deletions
diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 4ba16570a8c7..6d87eb97d1df 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/flow-tools
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.34 2007/09/06 16:39:34 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.35 2008/01/26 13:23:58 pva Exp $
+
+ 26 Jan 2008; <pva@gentoo.org> flow-tools-0.68-r5.ebuild:
+ Moved autotools stuff to src_unpack, bug #207463, thank Diego Pettenò
+ <flameeyes AT gentoo.org> for report.
06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
-files/flow-tools-0.68-gcc-4.1-fix.patch, -flow-tools-0.68-r3.ebuild,
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild
index 4e38d37c1657..d3c172dce792 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild,v 1.4 2007/06/29 12:40:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r5.ebuild,v 1.5 2008/01/26 13:23:58 pva Exp $
WANT_AUTOMAKE="1.6"
WANT_AUTOCONF="latest"
@@ -43,7 +43,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-fix-configure.diff
epatch "${FILESDIR}"/${P}-fix-a-zillion-warnings-updated.diff
epatch "${FILESDIR}"/${P}-another-amd64-casting-fixes.patch
- use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch
+ use debug || epatch "${FILESDIR}"/${PN}-0.67-nodebug.patch
epatch "${FILESDIR}"/${PN}-0.67-memleak.patch
sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \
@@ -52,12 +52,12 @@ src_unpack() {
# bug 122842, we have /usr/bin/python and not /usr/local/bin/python
sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" \
"${S}"/bin/flow-{rptfmt,rpt2rrd,log2rrd}
-}
-src_compile() {
AM_OPTS="-f -i"
eautoreconf || die "autoreconf failed"
+}
+src_compile() {
use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql"
use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres"