Version bump per bug #226155.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64

3 files changed, 80 insertions, 3 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index b8565beb1670..788d2ffb83bd 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipset
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.15 2007/11/14 05:50:21 pva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.16 2008/06/25 03:19:51 robbat2 Exp $
+
+*ipset-2.3.1.20080612 (25 Jun 2008)
+
+  25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +ipset-2.3.1.20080612.ebuild:
+  Version bump per bug #226155.
 
 *ipset-2.3.0.20070828-r2 (14 Nov 2007)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 3e7e7bac6af6..668e9f71e52b 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,8 +1,11 @@
 DIST ipset-2.3.0-20070828.tar.bz2 29442 RMD160 f87edd407fdda85d8fefb8ca31865a22a65753a4 SHA1 b831b0a0f6a7987b2eda8f7b1545da8b191673e8 SHA256 216f9bc128c2d0afab549baf1586ab9f2359e32fd1ccfe5ed0dc57e193d8f66a
+DIST ipset-2.3.1-20080612.tar.bz2 31821 RMD160 9de9f2e781e6b5256e868acabb24445b58c72c76 SHA1 b6a9ec4272d8e47ad2addde61ca1e91fd2dbe078 SHA256 86bbe1116e26ed0e33b0944f0f9314ab3321699e93ed29e10c2dc72b9d1721b8
 DIST ipset-20070401.tar.bz2 28279 RMD160 a51faccf276b5c90a83de1e3a0c5af9d2a93975e SHA1 b2ac74384513f4c235bb55e02dc6931f501dd9d5 SHA256 0a0c8b96c979148d652bc4b9b6ce601144abecc8c3aceba50f898c58edab1c90
 DIST patch-o-matic-ng-20070401.tar.bz2 142585 RMD160 34e5c2ad672b7384867d2953bc889c9526ebb754 SHA1 b8cad77065a97d3fd8f1740fd75736eac2c0117f SHA256 8176cfdc36bcf015a2a662589e96bdf23d85240c8ef1f14cad76eb08777700f0
 DIST patch-o-matic-ng-20071021.tar.bz2 136199 RMD160 3e211f5a2c930d582d0d7e4d47b1f6313b68e302 SHA1 303295dc853dd3947ae4e2c98c3b1ab69c276cf8 SHA256 558d3f1cb35e92faedc067bb34073f77db065c7a5c88ce1d4d6ea5588266e3ae
+DIST patch-o-matic-ng-20080617.tar.bz2 145630 RMD160 75b5afc798acef8efe877b3dff8705d70a3fbd46 SHA1 af24aea263873da9c89d075faf04e25d10b83780 SHA256 491b77ab61e9ee2f066ba178b4b7ff1b2ca9631757f1af182c0c70091155fe52
 EBUILD ipset-2.2.9.20070401.ebuild 1341 RMD160 8783afb65cd59b4dc037c24054ef14b7301a72b3 SHA1 10cf72ab7cdbbe77dc2f05f885fe868087212762 SHA256 9d533099035d27a789323db57b043533d68faf7a4dd184285760dc95db521680
 EBUILD ipset-2.3.0.20070828-r2.ebuild 2263 RMD160 d85e331bf7f67489dad5e20119db9722384b6b7f SHA1 e7177918a829a3797a63884e60de0b4616ff1383 SHA256 d8885d975f1e8a679136706ee0b0b6f068677fc136e00ac5a41da4be84084e19
-MISC ChangeLog 2978 RMD160 69bba70cae04394923505c4f3092cf0106481f64 SHA1 2f760c150524bac87666923b3ab0dea0d61ada3c SHA256 71515dae5623bb1b88edc69888b3d324b065b5de3b087edc688153cd9ef6c7a9
+EBUILD ipset-2.3.1.20080612.ebuild 2277 RMD160 40030a62ebb0b99a9bed13922b83787d379551ea SHA1 1df16cbf2f777bd7e064a3a5b2f6adaed5edf00a SHA256 36dd86162d140190c6cf9d2034d28c5d64a33ed1e7c85f154e89fd81f22fcd8a
+MISC ChangeLog 3137 RMD160 7d762a95bbc04c8d42cd070e6ac8537317cd756b SHA1 a0b846ef56f02bcfc318d5fb59218c014a265e8a SHA256 7c1045d50eb88cff71b9fc84edca91746e4e5f4773a49e04bf262733f95dafc8
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/ipset-2.3.1.20080612.ebuild b/net-firewall/ipset/ipset-2.3.1.20080612.ebuild
new file mode 100644
index 000000000000..84221d7f554d
--- /dev/null
+++ b/net-firewall/ipset/ipset-2.3.1.20080612.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.1.20080612.ebuild,v 1.1 2008/06/25 03:19:51 robbat2 Exp $
+
+inherit eutils versionator toolchain-funcs
+
+POM_PV="20080617"
+
+MY_PV="$(replace_version_separator 3 - "${PV/p/}")"
+DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
+HOMEPAGE="http://ipset.netfilter.org/"
+SRC_URI="http://ipset.netfilter.org/${PN}-${MY_PV}.tar.bz2
+		http://ipset.netfilter.org/patch-o-matic-ng-${POM_PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+RDEPEND=">=net-firewall/iptables-1.4"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/ipset-${MY_PV%-*}
+
+pkg_setup() {
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/$(get_libdir)"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	myconf="${myconf} KERNEL_DIR=${WORKDIR}/patch-o-matic-ng/patchlets/set/linux-2.6"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} || die "failed to build"
+}
+
+src_install() {
+	emake DESTDIR="${D}" ${myconf} install || die "failed to package"
+}
+
+pkg_postinst() {
+	elog "To use ${PN} you must have the ip_set kernel module compiled!"
+	elog "To patch you kernel run:"
+	elog
+	elog " # emerge --config ipset"
+	elog
+	elog "And follow on-screen instructions"
+}
+
+pkg_config() {
+	cd "${ROOT}${PORTAGE_TMPDIR}"
+	[ -d patch-o-matic-ng ] && {
+		einfo "${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory exist. Cleaning it..." ;
+		rm -rf patch-o-matic-ng;
+	}
+	mkdir patch-o-matic-ng && cd patch-o-matic-ng
+
+	IPTVERINS=`echo $(best_version net-firewall/iptables) | \
+	sed -n 's:^[^/]*/[[:alpha:]]*-\([0-9]\+\([.][0-9]\+\)*[a-z]\?\(_\(pre\|p\|beta\|alpha\|rc\)[0-9]*\)*\)\(-r[0-9]\+\)\?$:\1:p'`
+
+	einfo "Unpacking patch-o-matic-ng-${POM_PV} and iptables-${IPTVERINS} sources"
+	unpack {patch-o-matic-ng-${POM_PV},iptables-${IPTVERINS}}.tar.bz2
+
+	einfo "I'm going to patch sources in ${ROOT}usr/src/linux"
+	cd patch-o-matic-ng
+	KERNEL_DIR="${ROOT}"usr/src/linux IPTABLES_DIR=../iptables-${IPTVERINS} ./runme set
+
+	einfo "Cleaning ${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory"
+	rm -rf "${ROOT}${PORTAGE_TMPDIR}"/patch-o-matic-ng
+}