Version bump, remove broken version.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 26 insertions, 17 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 3f2fe555dedb..519a7ecc2959 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.27 2009/05/14 23:05:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.28 2009/06/05 15:03:51 pva Exp $
+
+*ipset-3.0 (05 Jun 2009)
+
+  05 Jun 2009; Peter Volkov <pva@gentoo.org> -ipset-2.5.0.ebuild,
+  +ipset-3.0.ebuild:
+  Version bump, remove broken version.
 
 *ipset-2.5.0-r1 (14 May 2009)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index c3604b23fdaf..c28be452a857 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -5,11 +5,12 @@ DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 S
 DIST ipset-2.4.9.tar.bz2 67180 RMD160 16317963a096f580381d3e15d5380918649246ca SHA1 17314e5a82e5887af93b214058ea9e70be6444c5 SHA256 0f616c673da457cc0db4f9a1fceb65cfd1f39ed2a21abf93cd2e2209634ba022
 DIST ipset-2.5.0.tar.bz2 67088 RMD160 5d18b6222daf2be64b017e1675036e43ffca1c58 SHA1 150670c0acb6337e478ccee580d6f17048b15fa0 SHA256 de84aa48d515f98cc33982e9092700e116adb8f987a924b1bfa91bc4acca73c7
 DIST ipset-20070401.tar.bz2 28279 RMD160 a51faccf276b5c90a83de1e3a0c5af9d2a93975e SHA1 b2ac74384513f4c235bb55e02dc6931f501dd9d5 SHA256 0a0c8b96c979148d652bc4b9b6ce601144abecc8c3aceba50f898c58edab1c90
+DIST ipset-3.0.tar.bz2 67280 RMD160 55cd34663f10c4c2c30e2d6acfafbff31ff4f4ea SHA1 436a9f9b427591991a897f57e6d1713d7d23bebd SHA256 b56e7550d64e17ff765e00f49847902a95ff0094f341928a7968ce52a853c0fb
 DIST patch-o-matic-ng-20070401.tar.bz2 142585 RMD160 34e5c2ad672b7384867d2953bc889c9526ebb754 SHA1 b8cad77065a97d3fd8f1740fd75736eac2c0117f SHA256 8176cfdc36bcf015a2a662589e96bdf23d85240c8ef1f14cad76eb08777700f0
 EBUILD ipset-2.2.9.20070401.ebuild 1341 RMD160 8783afb65cd59b4dc037c24054ef14b7301a72b3 SHA1 10cf72ab7cdbbe77dc2f05f885fe868087212762 SHA256 9d533099035d27a789323db57b043533d68faf7a4dd184285760dc95db521680
 EBUILD ipset-2.4.7.ebuild 2608 RMD160 27f336632d8943cc4601f0aa5aa8d39d803b5c15 SHA1 39dd2309feb32b079b038f00f8130465ca01ab52 SHA256 90931dbe590e302cfa30d106d408ed4fba80a0d98950a004850c82d7238ff145
 EBUILD ipset-2.4.9-r1.ebuild 2674 RMD160 703b81042b8578d2299fd212df53ad08d1f7fe4b SHA1 503bab12a3e8abcd43fc3ea2ffbc527350442357 SHA256 2e094968416a17cb7d1df50469b4ca2c9d314d286ff323a584cfb51bba28f41b
 EBUILD ipset-2.5.0-r1.ebuild 2586 RMD160 a55bbf0f92017a279128d49e378034a120a8b87d SHA1 c8263822aca08dc8d53a8c11344b6bd0f0309f57 SHA256 72b70b8ec1a43ed736e62fccfebffdb9815f5ad9d544014db0ee658b0df8c244
-EBUILD ipset-2.5.0.ebuild 2552 RMD160 8776f0f0ef305c303a25dc29461c2e2267b830d2 SHA1 68d898547b193aa4f8a5aefb1f07db7caf7d16cd SHA256 2eb40da4bebb5b0c7b336820501e41d489e87e400c82d50cd72e24fdff25a68e
-MISC ChangeLog 5359 RMD160 ba063b14870117d011c182891dcd3b2e2844f3c4 SHA1 9c4038af394896736345b887f252b5b5c75d1ade SHA256 5ef010672a3daaae439da2f0e3fc2ee104fbc3952e165b6e6ece5c2416cb29c1
+EBUILD ipset-3.0.ebuild 2576 RMD160 a8d56c287efd1ea32ff0c69a8566812dcab827dc SHA1 cb761ecaaabe4395ea266e43b2025fc438a7e9cb SHA256 7e3ece4c6fc9f1bce26835b289a6cefd8c61ccdfd8fc617e72ba7bfd021bdc25
+MISC ChangeLog 5508 RMD160 ee03719401454b1dc10e1843fc7905df2a05f08a SHA1 e5654cf723f340fd4c45c8158892790a1cffd0ca SHA256 d5132a4b958e33a1e788d81fe2f9a651c23ccc8d899ba0bb5ca6778ad16c5067
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/ipset-2.5.0.ebuild b/net-firewall/ipset/ipset-3.0.ebuild
index b9f778f72b40..248028cf5ad4 100644
--- a/net-firewall/ipset/ipset-2.5.0.ebuild
+++ b/net-firewall/ipset/ipset-3.0.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.5.0.ebuild,v 1.1 2009/04/04 09:11:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-3.0.ebuild,v 1.1 2009/06/05 15:03:51 pva Exp $
+
+EAPI="2"
 
 inherit eutils versionator toolchain-funcs linux-mod linux-info
 
 DESCRIPTION="IPset tool for iptables, successor to ippool."
 HOMEPAGE="http://ipset.netfilter.org/"
 SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
 RDEPEND=">=net-firewall/iptables-1.4.1"
 DEPEND="${RDEPEND}"
 
@@ -22,7 +26,7 @@ BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSI
 BUILD_TARGETS="all"
 MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel"
 MODULE_NAMES=""
-for i in ip_set{,_{{ip,port,macip}map,{ip,net,ipport}hash,iptree{,map}}} \
+for i in ip_set{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \
 	ipt_{SET,set}; do
 	MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
 done
@@ -30,18 +34,6 @@ done
 CONFIG_CHECK="NETFILTER"
 ERROR_CFG="ipset needs netfilter support in your kernel."
 
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's/KERNELDIR/(KERNELDIR)/g' \
-		-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
-		-e '/^all::/iV ?= 0' \
-		-e '/^all::/iKBUILD_OUTPUT ?=' \
-		-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \
-		"${S}"/kernel/Makefile
-
-}
-
 pkg_setup() {
 	get_version
 
@@ -66,6 +58,16 @@ pkg_setup() {
 	export myconf
 }
 
+src_prepare() {
+	sed -i \
+		-e 's/KERNELDIR/(KERNELDIR)/g' \
+		-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
+		-e '/^all::/iV ?= 0' \
+		-e '/^all::/iKBUILD_OUTPUT ?=' \
+		-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \
+		"${S}"/kernel/Makefile
+}
+
 src_compile() {
 	einfo "Building userspace"
 	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"