version bump, removed old versions

(Portage version: 2.2_rc23/cvs/Linux i686)

7 files changed, 12 insertions, 196 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 86ccdeda8dbd..28d8be6e5ac0 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.26 2009/02/08 14:51:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.27 2009/03/03 12:52:49 wschlich Exp $
+
+*conntrack-tools-0.9.11 (03 Mar 2009)
+
+  03 Mar 2009; Wolfram Schlich <wschlich@gentoo.org>
+  -files/conntrack-tools-0.9.7-int_max.patch,
+  -files/conntrack-tools-0.9.7-path_max.patch,
+  -conntrack-tools-0.9.7-r2.ebuild, -conntrack-tools-0.9.8.ebuild,
+  -conntrack-tools-0.9.8-r1.ebuild, -conntrack-tools-0.9.10.ebuild,
+  +conntrack-tools-0.9.11.ebuild:
+  version bump, removed old versions
 
   08 Feb 2009; Markus Meier <maekke@gentoo.org>
   conntrack-tools-0.9.9.ebuild:
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.10.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
index 4104894331e0..2ebfecf2f50d 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.10.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.10.ebuild,v 1.1 2009/01/26 17:22:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild,v 1.1 2009/03/03 12:52:49 wschlich Exp $
 
 inherit linux-info eutils
 
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild
deleted file mode 100644
index ad676da097b2..000000000000
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild,v 1.3 2008/11/27 18:55:16 ssuominen Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="Connection tracking userspace tools"
-HOMEPAGE="http://conntrack-tools.netfilter.org"
-SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/libnfnetlink-0.0.33
-	>=net-libs/libnetfilter_conntrack-0.0.94"
-DEPEND="${RDEPEND}
-	!net-firewall/conntrack
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-path_max.patch"
-	epatch "${FILESDIR}/${P}-int_max.patch"
-	sed -i -e '/-Werror \\/d' {.,src,extensions}/Makefile.in
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="NF_CT_NETLINK"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/conntrackd.initd" conntrackd
-	newconfd "${FILESDIR}/conntrackd.confd" conntrackd
-
-	insinto /etc/conntrackd
-	doins doc/stats/conntrackd.conf
-
-	dodoc AUTHORS ChangeLog
-
-	insinto /usr/share/doc/${PF}
-	doins -r doc
-}
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild
deleted file mode 100644
index 7536b413d8fd..000000000000
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild,v 1.1 2008/11/20 12:06:32 wschlich Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="Connection tracking userspace tools"
-HOMEPAGE="http://conntrack-tools.netfilter.org"
-SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-libs/libnfnetlink-0.0.33
-	>=net-libs/libnetfilter_conntrack-0.0.97
-	!net-firewall/conntrack"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="NF_CT_NETLINK"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd
-	newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd
-
-	insinto /etc/conntrackd
-	doins doc/stats/conntrackd.conf
-
-	dodoc AUTHORS ChangeLog
-
-	insinto /usr/share/doc/${PF}
-	pushd doc &>/dev/null && doins -r . && popd &>/dev/null
-}
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.8.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.8.ebuild
deleted file mode 100644
index 754a9217f90e..000000000000
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.8.ebuild,v 1.3 2008/11/27 18:55:16 ssuominen Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="Connection tracking userspace tools"
-HOMEPAGE="http://conntrack-tools.netfilter.org"
-SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/libnfnetlink-0.0.33
-	>=net-libs/libnetfilter_conntrack-0.0.97"
-DEPEND="${RDEPEND}
-	!net-firewall/conntrack
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="NF_CT_NETLINK"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/conntrackd.initd" conntrackd
-	newconfd "${FILESDIR}/conntrackd.confd" conntrackd
-
-	insinto /etc/conntrackd
-	doins doc/stats/conntrackd.conf
-
-	dodoc AUTHORS ChangeLog
-
-	insinto /usr/share/doc/${PF}
-	doins -r doc
-}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch
deleted file mode 100644
index 683d17af9436..000000000000
--- a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru conntrack-tools-0.9.7~/src/ignore_pool.c conntrack-tools-0.9.7/src/ignore_pool.c
---- conntrack-tools-0.9.7~/src/ignore_pool.c	2008-06-14 18:23:09.000000000 +0200
-+++ conntrack-tools-0.9.7/src/ignore_pool.c	2008-06-14 21:17:13.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- 
- /* XXX: These should be configurable, better use a rb-tree */
- #define IGNORE_POOL_SIZE 128
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-path_max.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-path_max.patch
deleted file mode 100644
index df831b2c8800..000000000000
--- a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-path_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru conntrack-tools-0.9.7~/src/main.c conntrack-tools-0.9.7/src/main.c
---- conntrack-tools-0.9.7~/src/main.c	2008-06-14 18:23:09.000000000 +0200
-+++ conntrack-tools-0.9.7/src/main.c	2008-06-14 18:24:04.000000000 +0200
-@@ -19,6 +19,7 @@
- #include "conntrackd.h"
- #include "log.h"
- 
-+#include <linux/limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>