7 files changed, 80 insertions, 3 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 8c9fa148cba6..a415b2827616 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.7 2006/01/27 01:46:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.8 2006/05/25 06:00:32 robbat2 Exp $
+
+*ipset-2.2.9.20060508 (25 May 2006)
+
+  25 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  ipset-2.2.8.20051203.ebuild, +ipset-2.2.9.20060508.ebuild:
+  Bug #126878, upstream seems to have changed the directory name inside the
+  tarball. Also version bump that fixes a return code issue.
 
   27 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   ipset-2.2.8.20051203.ebuild:
diff --git a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119 b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
index 68db10cd589a..c9954fa559f2 100644
--- a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
+++ b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
@@ -1 +1,3 @@
 MD5 9f1b9c36d37eb8371c83b5610362d16d ipset-2.1.0-20050119.tar.bz2 23821
+RMD160 315f62e029237beb328dab54e28a0178f6b91ea0 ipset-2.1.0-20050119.tar.bz2 23821
+SHA256 23cfac9c5f08453f3b3567adc4ed4c3d4055da6f25be56c251eb7785e81aa8a6 ipset-2.1.0-20050119.tar.bz2 23821
diff --git a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1 b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
index 68db10cd589a..c9954fa559f2 100644
--- a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
+++ b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
@@ -1 +1,3 @@
 MD5 9f1b9c36d37eb8371c83b5610362d16d ipset-2.1.0-20050119.tar.bz2 23821
+RMD160 315f62e029237beb328dab54e28a0178f6b91ea0 ipset-2.1.0-20050119.tar.bz2 23821
+SHA256 23cfac9c5f08453f3b3567adc4ed4c3d4055da6f25be56c251eb7785e81aa8a6 ipset-2.1.0-20050119.tar.bz2 23821
diff --git a/net-firewall/ipset/files/digest-ipset-2.2.8.20051203 b/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
index 67287591f8dc..d42d99a18e5d 100644
--- a/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
+++ b/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
@@ -1 +1,3 @@
 MD5 a638af2788ce9e41e07dbe89311c0914 ipset-2.2.8-20051203.tar.bz2 27392
+RMD160 dfccbfd3d20e142b7777d4b35bd7472362a7aea8 ipset-2.2.8-20051203.tar.bz2 27392
+SHA256 5396ac8b164b9a00511f68833a5e4f572dce972f881e6da13a6175ff49c33e63 ipset-2.2.8-20051203.tar.bz2 27392
diff --git a/net-firewall/ipset/files/digest-ipset-2.2.9.20060508 b/net-firewall/ipset/files/digest-ipset-2.2.9.20060508
new file mode 100644
index 000000000000..47749f91289d
--- /dev/null
+++ b/net-firewall/ipset/files/digest-ipset-2.2.9.20060508
@@ -0,0 +1,3 @@
+MD5 b86efac9457e992d2633e9b4176f8ca9 ipset-2.2.9-20060508.tar.bz2 27530
+RMD160 c300304303c5f52eeff156a1900cccf1c1b2f7e0 ipset-2.2.9-20060508.tar.bz2 27530
+SHA256 09fe3e64e2715792dbd24f9e37b78cc0a66963ca226dc94f75f8b55dac5cb3d2 ipset-2.2.9-20060508.tar.bz2 27530
diff --git a/net-firewall/ipset/ipset-2.2.8.20051203.ebuild b/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
index 1e76218bfa16..0f8f9580ae4e 100644
--- a/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
+++ b/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.8.20051203.ebuild,v 1.2 2006/01/27 01:46:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.8.20051203.ebuild,v 1.3 2006/05/25 06:00:32 robbat2 Exp $
 
 inherit eutils flag-o-matic versionator linux-info
 
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND=">=net-firewall/iptables-1.3"
 DEPEND="${RDEPEND}
 		virtual/linux-sources"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${PV%.*}"
 CONFIG_CHECK="IP_NF_SET"
 
 pkg_setup() {
diff --git a/net-firewall/ipset/ipset-2.2.9.20060508.ebuild b/net-firewall/ipset/ipset-2.2.9.20060508.ebuild
new file mode 100644
index 000000000000..6a7bf9a68e2e
--- /dev/null
+++ b/net-firewall/ipset/ipset-2.2.9.20060508.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.9.20060508.ebuild,v 1.1 2006/05/25 06:00:32 robbat2 Exp $
+
+inherit eutils flag-o-matic versionator linux-info
+
+MY_PV="$(replace_version_separator 3 '-' )"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
+HOMEPAGE="http://people.netfilter.org/kadlec/ipset/"
+SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RDEPEND=">=net-firewall/iptables-1.3"
+DEPEND="${RDEPEND}
+		virtual/linux-sources"
+S="${WORKDIR}/${PN}-${PV%.*}"
+CONFIG_CHECK="IP_NF_SET"
+
+pkg_setup() {
+	ewarn "If your kernel sources do not contain the IPset functionality,"
+	ewarn "this package may fail to compile."
+	linux-info_pkg_setup
+}
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/lib"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	export myconf
+}
+
+src_compile() {
+	src_defs
+
+	# for some reason, it doesn't behave right if this is skipped
+	replace-flags -O0 -O2
+	if [ -z `get-flag O` ]; then
+		append-flags -O2
+	fi
+
+	# see iptables ebuild, as this code links against it
+	filter-flags "-fstack-protector"
+
+	# now build it
+	emake COPT_FLAGS="${CFLAGS}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		|| die "failed to build"
+}
+
+src_install() {
+	src_defs
+	emake DESTDIR="${D}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		install || die "failed to package"
+}