85416

Package-Manager: portage-2.0.51.19

4 files changed, 25 insertions, 18 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 0e136f777800..9aeb3caf17e7 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2005/03/19 13:47:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.11 2005/03/25 21:12:29 blubb Exp $
+
+  25 Mar 2005; <blubb@gentoo.org> +files/flow-tools-0.67-debug.patch,
+  flow-tools-0.67.ebuild:
+  added Jeremy Hanmer's patch to make it working with USE=debug and added ~amd64
+  keyword, see bug #85416
 
   19 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> flow-tools-0.66.ebuild,
   flow-tools-0.67.ebuild:
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 3a05953559b8..4186526a7102 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 90c973c0e02d0a0f33fbceacdad1f863 flow-tools-0.67.ebuild 2066
+MD5 4363852c7b75f387cabf2e3826799e1c ChangeLog 2200
 MD5 8f9c6d7e1e7e86ef04599a7774c85b16 flow-tools-0.66.ebuild 1001
-MD5 e9753f5796cb3817e7b709f024f9c0a5 ChangeLog 1998
+MD5 50b2beaf69c3163fee00bda59f3e906a flow-tools-0.67.ebuild 2108
 MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
 MD5 4274d0fb58b88876a5767ab9d1c6204c files/digest-flow-tools-0.66 67
 MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
-MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403
-MD5 3164389b3ab0f7170727e6ea6b419256 files/flow-tools-0.67-fix-configure.diff 3510
 MD5 16e9d55df0b78a82c236db3bcad399a5 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18805
-MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPC1mEZCkKN40op4RAvF/AKClZTQ8GUFp1i+SQWeDx+xcML+azgCgv4q0
-W3Ei4slmCWQK7eEfzGuIEb0=
-=4Eyo
------END PGP SIGNATURE-----
+MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
+MD5 c6c737d5afc1661a098632c246dec51e files/flow-tools-0.67-debug.patch 313
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-debug.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-debug.patch
new file mode 100644
index 000000000000..035ecf193f88
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-debug.patch
@@ -0,0 +1,10 @@
+--- flow-tools-0.67.orig/src/flow-export.c      2005-03-25 12:50:39.000000000 -0800
++++ flow-tools-0.67/src/flow-export.c   2005-03-25 12:51:02.000000000 -0800
+@@ -691,6 +691,7 @@
+   char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp, *tmp;
+   int db_port;
+   int len;
++  int debug;
+
+   MYSQL mysql;
+
diff --git a/net-analyzer/flow-tools/flow-tools-0.67.ebuild b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
index dd66b7584546..35b950036c47 100644
--- a/net-analyzer/flow-tools/flow-tools-0.67.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.67.ebuild,v 1.5 2005/03/19 13:47:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.67.ebuild,v 1.6 2005/03/25 21:12:29 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="mysql postgres debug"
 
 RDEPEND="virtual/libc
@@ -43,6 +43,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fix-a-zillion-warnings.diff
 	use debug || epatch ${FILESDIR}/${P}-nodebug.patch
 	epatch ${FILESDIR}/${P}-memleak.patch
+	epatch ${FILESDIR}/${P}-debug.patch
 
 	sed -i "s|\(^.*CFLAGS=\).*$|\1-Wall|" \
 		configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed"