Add sed line for bug 122842, we have /usr/bin/python and not /usr/local/bin/python. Thanks to Hasan Khalil <gongloo at gentoo dot org>.

(Portage version: 2.0.54 on steroids)

4 files changed, 119 insertions, 24 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index bde5564a47c9..12e947ade966 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/flow-tools
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.16 2005/09/16 11:12:07 ka0ttic Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.17 2006/02/17 23:34:11 vanquirius Exp $
+
+*flow-tools-0.68-r2 (17 Feb 2006)
+
+  17 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +flow-tools-0.68-r2.ebuild:
+  Add sed line for bug 122842, we have /usr/bin/python and not
+  /usr/local/bin/python. Thanks to Hasan Khalil <gongloo at gentoo dot org>.
 
   16 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
   files/flow-tools-0.67-fix-a-zillion-warnings.diff,
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index eaf7ab701611..f92f5a1411ca 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b4137cf5d98a0dc381479c22e6f56bb8 flow-tools-0.67.ebuild 2102
-MD5 8f9c6d7e1e7e86ef04599a7774c85b16 flow-tools-0.66.ebuild 1001
-MD5 a5eba5008729fa7c037c6b4d59277eb6 flow-tools-0.68-r1.ebuild 2466
-MD5 fecd6516b359b067be27796d980a2152 flow-tools-0.68.ebuild 2166
 MD5 7228ba768fbbffe8357362e19a395b2c ChangeLog 3200
-MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
 MD5 4274d0fb58b88876a5767ab9d1c6204c files/digest-flow-tools-0.66 67
 MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
 MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68 67
-MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403
-MD5 98dc78d5d311ce19b972580774781796 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
+MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68-r1 67
+MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68-r2 67
 MD5 c6c737d5afc1661a098632c246dec51e files/flow-tools-0.67-debug.patch 313
+MD5 a4c028b5f1d22a56d9020a2ef90ca253 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222
 MD5 3164389b3ab0f7170727e6ea6b419256 files/flow-tools-0.67-fix-configure.diff 3510
+MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403
+MD5 eddbfc9694d3f0b00a46f84a0e58a651 files/flow-tools-0.67-memleak.patch 465
+MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
+MD5 98dc78d5d311ce19b972580774781796 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
+MD5 09baff60cf1fc75fdf326c0d70f0b250 files/flow-tools-0.68-fix-configure.diff 4311
 MD5 a3079e6e4ce9d077caa0939f51e806f2 files/flowcapture.confd 1590
 MD5 e093ab64e5496e26be23026c3436ddde files/flowcapture.initd 430
-MD5 09baff60cf1fc75fdf326c0d70f0b250 files/flow-tools-0.68-fix-configure.diff 4311
-MD5 a4c028b5f1d22a56d9020a2ef90ca253 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222
 MD5 94581c1ca18b1891395fe1f3daeb04ca files/linkme 283
-MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
-MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68-r1 67
-MD5 eddbfc9694d3f0b00a46f84a0e58a651 files/flow-tools-0.67-memleak.patch 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDKqi6EZCkKN40op4RAitWAJ0Xn0USdKErtFMlR2p0CbdkZIEXnwCbBxJK
-UxDAZY1BuMdZaJW5po6BUWQ=
-=zB5A
------END PGP SIGNATURE-----
+MD5 8f9c6d7e1e7e86ef04599a7774c85b16 flow-tools-0.66.ebuild 1001
+MD5 b4137cf5d98a0dc381479c22e6f56bb8 flow-tools-0.67.ebuild 2102
+MD5 a5eba5008729fa7c037c6b4d59277eb6 flow-tools-0.68-r1.ebuild 2466
+MD5 783e852a3fcbe3f473c5b3009c66d20e flow-tools-0.68-r2.ebuild 2650
+MD5 fecd6516b359b067be27796d980a2152 flow-tools-0.68.ebuild 2166
+MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2
new file mode 100644
index 000000000000..cd3d9265e6ee
--- /dev/null
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2
@@ -0,0 +1 @@
+MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild
new file mode 100644
index 000000000000..582242464a89
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/02/17 23:34:11 vanquirius Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data"
+HOMEPAGE="http://www.splintered.net/sw/flow-tools/"
+SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql postgres debug ssl"
+
+RDEPEND="sys-apps/tcp-wrappers
+	sys-libs/zlib
+	sys-devel/flex
+	!postgres? ( mysql? ( dev-db/mysql ) )
+	!mysql? ( postgres? ( dev-db/postgresql ) )
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+pkg_setup() {
+	if use mysql && use postgres ; then
+		echo
+		eerror "The mysql and postgres USE flags are mutually exclusive."
+		eerror "Please choose either USE=mysql or USE=postgres, but not both."
+		die
+	fi
+
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-configure.diff
+	epatch "${FILESDIR}"/${P}-fix-a-zillion-warnings.diff
+	use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch
+	epatch "${FILESDIR}"/${PN}-0.67-memleak.patch
+	epatch "${FILESDIR}"/${PN}-0.67-debug.patch
+
+	sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \
+		configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed"
+
+	# 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() {
+	einfo "Running autoreconf"
+	autoreconf -f -i || die "autoreconf failed"
+
+	use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql"
+	use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres"
+
+	econf \
+		--localstatedir=/etc/flow-tools \
+		--enable-lfs \
+		$(use_with ssl openssl) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		|| die "econf failed"
+
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc COPYING ChangeLog README INSTALL SECURITY TODO
+
+	keepdir /var/lib/flows
+	keepdir /var/lib/flows/bin
+	exeinto /var/lib/flows/bin
+	doexe "${FILESDIR}"/linkme
+	keepdir /var/run/flows
+
+	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+}
+
+pkg_postinst() {
+	chown flows:flows /var/run/flows
+	chown flows:flows /var/lib/flows
+	chown flows:flows /var/lib/flows/bin
+	chmod 0755 /var/run/flows
+	chmod 0755 /var/lib/flows
+	chmod 0755 /var/lib/flows/bin
+}