Cleanup

(Portage version: 2.1.3.7)

6 files changed, 6 insertions, 210 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 4b79926a3547..4ba16570a8c7 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.33 2007/06/29 12:40:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.34 2007/09/06 16:39:34 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/flow-tools-0.68-gcc-4.1-fix.patch, -flow-tools-0.68-r3.ebuild,
+  -flow-tools-0.68-r4.ebuild:
+  Cleanup
 
   29 Jun 2007; Christoph Mende <angelos@gentoo.org>
   flow-tools-0.68-r5.ebuild:
diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3
deleted file mode 100644
index 3db6eb93276d..000000000000
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151
-RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 flow-tools-0.68.tar.gz 987151
-SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df flow-tools-0.68.tar.gz 987151
diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4
deleted file mode 100644
index 3db6eb93276d..000000000000
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151
-RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 flow-tools-0.68.tar.gz 987151
-SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df flow-tools-0.68.tar.gz 987151
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-gcc-4.1-fix.patch b/net-analyzer/flow-tools/files/flow-tools-0.68-gcc-4.1-fix.patch
deleted file mode 100644
index 5ab9170c8406..000000000000
--- a/net-analyzer/flow-tools/files/flow-tools-0.68-gcc-4.1-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flow-tools-0.68.orig/lib/ftchash.c	2006-07-08 17:32:43.000000000 -0300
-+++ flow-tools-0.68/lib/ftchash.c	2006-07-08 18:12:34.000000000 -0300
-@@ -326,7 +326,7 @@
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      ftch->traverse_rec = (char*)ftch->traverse_rec + ftch->d_size;
-       return ret;
- 
-     } else {
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild
deleted file mode 100644
index 1f197fc8d766..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-r3.ebuild,v 1.7 2006/11/23 19:47:32 vivo Exp $
-
-WANT_AUTOMAKE="1.6"
-WANT_AUTOCONF="latest"
-inherit eutils flag-o-matic autotools
-
-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 ~ia64 ppc x86"
-IUSE="mysql postgres debug ssl"
-
-RDEPEND="sys-apps/tcp-wrappers
-	sys-libs/zlib
-	sys-devel/flex
-	!postgres? ( mysql? ( virtual/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-updated.diff
-	use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch
-	epatch "${FILESDIR}"/${PN}-0.67-memleak.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() {
-	AM_OPTS="-f -i"
-	eautoreconf || 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 ChangeLog README 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
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild
deleted file mode 100644
index 5e5d0f589d44..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/04/09 16:17:07 pva Exp $
-
-WANT_AUTOMAKE="1.6"
-WANT_AUTOCONF="latest"
-inherit eutils flag-o-matic autotools
-
-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 ~ia64 ~ppc ~x86"
-IUSE="mysql postgres debug ssl"
-
-RDEPEND="sys-apps/tcp-wrappers
-	sys-libs/zlib
-	sys-devel/flex
-	!postgres? ( mysql? ( virtual/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-updated.diff
-	use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch
-	epatch "${FILESDIR}"/${PN}-0.67-memleak.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() {
-	AM_OPTS="-f -i"
-	eautoreconf || 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 ChangeLog README 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
-}