version bump and cleanout

(Portage version: 2.2_rc8/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)

7 files changed, 11 insertions, 174 deletions

diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog
index e2a02f812226..c26e2d219663 100644
--- a/net-misc/l7-filter-userspace/ChangeLog
+++ b/net-misc/l7-filter-userspace/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/l7-filter-userspace
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.5 2008/08/02 14:13:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.6 2008/09/01 11:25:15 dragonheart Exp $
+
+*l7-filter-userspace-0.8 (01 Sep 2008)
+
+  01 Sep 2008; Daniel Black <dragonheart@gentoo.org>
+  -files/l7-filter-userspace-0.4-misc.patch,
+  -files/l7-filter-userspace-0.6-gcc4.3compat.patch, -files/Makefile.am,
+  -files/configure.ac, -l7-filter-userspace-0.4.ebuild,
+  -l7-filter-userspace-0.6.ebuild, +l7-filter-userspace-0.8.ebuild:
+  version bump and cleanout
 
 *l7-filter-userspace-0.7 (02 Aug 2008)
 
diff --git a/net-misc/l7-filter-userspace/files/Makefile.am b/net-misc/l7-filter-userspace/files/Makefile.am
deleted file mode 100644
index 05096fc061a4..000000000000
--- a/net-misc/l7-filter-userspace/files/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by Daniel Black <dragonheart@gentoo.org> for the l7-filter projects
-#
-EXTRA_DIST = sample-l7-filter.conf
-
-bin_PROGRAMS = l7-filter
-
-AM_CXXFLAGS = $(NFNETLINK_CFLAGS)
-
-l7_filter_SOURCES = l7-classify.cpp l7-queue.cpp l7-conntrack.cpp  l7-filter.cpp l7-parse-patterns.cpp  util.cpp
-l7_filter_LDADD = $(NFNETLINK_LIBS)
-#-lpthread
-
-dist_man_MANS = l7-filter.1
diff --git a/net-misc/l7-filter-userspace/files/configure.ac b/net-misc/l7-filter-userspace/files/configure.ac
deleted file mode 100644
index f6e163680549..000000000000
--- a/net-misc/l7-filter-userspace/files/configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-#
-# Created by Daniel Black <dragonheart@gentoo.org> for the l7-filter projects
-#
-
-AC_INIT(l7-filter-userspace, [0.4], [http://sourceforge.net/tracker/?group_id=80085])
-AC_PREREQ(2.60)
-
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS(config.h)
-
-#AC_PROG_CC
-AC_PROG_CXX
-
-PKG_CHECK_MODULES([NFNETLINK], [libnetfilter_conntrack libnetfilter_queue])
-AC_CHECK_LIB(pthread, main)
-AC_OUTPUT([Makefile])
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.4-misc.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.4-misc.patch
deleted file mode 100644
index 1420a4316c3f..000000000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.4-misc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: l7-filter.cpp
-===================================================================
---- l7-filter.cpp	(revision 49)
-+++ l7-filter.cpp	(working copy)
-@@ -34,6 +34,7 @@
- #include "l7-queue.h"
- #include "l7-classify.h"
- #include "util.h"
-+#include "config.h"
- 
- extern "C" {
- #include <linux/netfilter.h>
-@@ -234,7 +235,7 @@
-       case '?':
-       default:
-         cerr << 
--          "l7-filter v" << L7VERSION <<
-+          "l7-filter v" << VERSION <<
-           ", (C) 2006-2007 Ethan Sommer, Matthew Strait\n"
-           "l7-filter comes with ABSOLUTELY NO WARRANTY. This is free software\n"
-           "and you may redistribute it under the terms of the GPLv2.\n"
-Index: util.h
-===================================================================
---- util.h	(revision 49)
-+++ util.h	(working copy)
-@@ -3,8 +3,6 @@
- #ifndef L7_UTIL_H
- #define L7_UTIL_H
- 
--#define L7VERSION 0.4
--
- void l7printf(int triviality, const char * format, ...);
- string friendly_print(unsigned char * s, int size);
- void print_give_up(string key, unsigned char * buf, int len);
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch
deleted file mode 100644
index 0dec8573ac53..000000000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -NrU5 l7-filter-userspace-0.6.orig/l7-classify.cpp l7-filter-userspace-0.6/l7-classify.cpp
---- l7-filter-userspace-0.6.orig/l7-classify.cpp	2008-06-29 13:46:07.000000000 +0200
-+++ l7-filter-userspace-0.6/l7-classify.cpp	2008-06-29 13:48:04.000000000 +0200
-@@ -15,10 +15,11 @@
- 
- using namespace std;
- 
- #include <iostream>
- #include <fstream>
-+#include <cstring>
- 
- #include <vector>
- #include <string>
- #include <sstream>
- #include <stdio.h>
-diff -NrU5 l7-filter-userspace-0.6.orig/l7-conntrack.cpp l7-filter-userspace-0.6/l7-conntrack.cpp
---- l7-filter-userspace-0.6.orig/l7-conntrack.cpp	2008-06-29 13:46:07.000000000 +0200
-+++ l7-filter-userspace-0.6/l7-conntrack.cpp	2008-06-29 13:46:58.000000000 +0200
-@@ -19,10 +19,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
- #include <signal.h>
- #include <map>
-+#include <cstring>
- 
- extern "C" {
- #include <linux/netfilter.h>
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
- }
-diff -NrU5 l7-filter-userspace-0.6.orig/l7-filter.cpp l7-filter-userspace-0.6/l7-filter.cpp
---- l7-filter-userspace-0.6.orig/l7-filter.cpp	2008-06-29 13:46:07.000000000 +0200
-+++ l7-filter-userspace-0.6/l7-filter.cpp	2008-06-29 13:50:37.000000000 +0200
-@@ -20,10 +20,11 @@
- using namespace std;
- #include <pthread.h>
- 
- #include <fstream>
- #include <iostream>
-+#include <climits>
- 
- #include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff -NrU5 l7-filter-userspace-0.6.orig/l7-queue.cpp l7-filter-userspace-0.6/l7-queue.cpp
---- l7-filter-userspace-0.6.orig/l7-queue.cpp	2008-06-29 13:46:07.000000000 +0200
-+++ l7-filter-userspace-0.6/l7-queue.cpp	2008-06-29 13:46:58.000000000 +0200
-@@ -33,10 +33,12 @@
- #include <errno.h>
- #include <signal.h>
- #include <map>
- #include <netinet/in.h>
- 
-+#include <cstring>
-+
- #include "l7-conntrack.h"
- #include "l7-queue.h"
- #include "util.h"
- 
- // Probably shouldn't really be global, but it's SO much easier
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.4.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.4.ebuild
deleted file mode 100644
index 186234cf72fd..000000000000
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.4.ebuild,v 1.1 2007/04/15 10:30:43 dragonheart Exp $
-
-inherit autotools
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
-HOMEPAGE="http://l7-filter.sourceforge.net"
-SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT="0"
-S="${WORKDIR}"/${MY_P}
-DEPEND="
-		net-libs/libnetfilter_conntrack
-		net-libs/libnetfilter_queue"
-RDEPEND="net-misc/l7-protocols
-		${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/configure.ac .
-	cp "${FILESDIR}"/Makefile.am .
-	epatch "${FILESDIR}"/${P}-misc.patch
-	mv Changelog ChangeLog
-	mv LICENSE COPYING
-	touch AUTHORS INSTALL NEWS
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO BUGS
-}
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.6.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild
index 9f965d38cfad..0c9dff4270f0 100644
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.6.ebuild
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.6.ebuild,v 1.2 2008/06/13 12:50:36 dragonheart Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild,v 1.1 2008/09/01 11:25:15 dragonheart Exp $
 
 DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
 HOMEPAGE="http://l7-filter.sourceforge.net"
@@ -17,10 +15,6 @@ DEPEND="
 		net-libs/libnetfilter_queue"
 RDEPEND="net-misc/l7-protocols
 		${DEPEND}"
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc4.3compat.patch
-}
 
 src_install() {
 	emake DESTDIR="${D}" install || die