Version bump.

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

3 files changed, 100 insertions, 2 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 82ba9ed399c3..7b6e827e9763 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2009/03/20 13:47:10 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.26 2009/04/04 09:11:22 pva Exp $
+
+*ipset-2.5.0 (04 Apr 2009)
+
+  04 Apr 2009; Peter Volkov <pva@gentoo.org> +ipset-2.5.0.ebuild:
+  Version bump.
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> ipset-2.4.7.ebuild:
   Marked ppc stable for bug #257483.
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index f63756243cc0..78919fa346ec 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -3,10 +3,12 @@ AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6
 AUX ipset-2.4.9-gethostbyname-align.patch 438 RMD160 e68e00cecc037a0171b5434288b69ffd0d63b294 SHA1 bd3259f0f5ec3c300c1217e3bce8cc4bd807d01b SHA256 42e214ab4a9ed440f7f04f60078f23e0bd4843f22d0e4f25d3e65259425492d9
 DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928
 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 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
-MISC ChangeLog 5080 RMD160 77032b37cb962722213a24dabff1d16900ae7cd8 SHA1 bd32f942a2bc1131fb3128b39aef22f839d01b1c SHA256 b3e1dabc39a8565c834ddbda1e04b925403dec0719c42d59d3bbf3645a743f86
+EBUILD ipset-2.5.0.ebuild 2552 RMD160 8776f0f0ef305c303a25dc29461c2e2267b830d2 SHA1 68d898547b193aa4f8a5aefb1f07db7caf7d16cd SHA256 2eb40da4bebb5b0c7b336820501e41d489e87e400c82d50cd72e24fdff25a68e
+MISC ChangeLog 5188 RMD160 ab0ebd5af7f4ee09a2c8aab9983548b52f41274c SHA1 257c19e39ef64dd40cd25d7235844697f4e63dd4 SHA256 531f481d911c69a4788ef5d6ec53378043998d5a57f7db93c2195fbf0ff85b6d
 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-2.5.0.ebuild
new file mode 100644
index 000000000000..b9f778f72b40
--- /dev/null
+++ b/net-firewall/ipset/ipset-2.5.0.ebuild
@@ -0,0 +1,91 @@
+# 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 $
+
+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}"
+
+# configurable from outside
+[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256
+[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024
+BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}"
+# module fun
+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}}} \
+	ipt_{SET,set}; do
+	MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
+done
+# sanity
+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
+
+	modules=0
+	msg=''
+	if linux_chkconfig_builtin "MODULES" ; then
+		modules=1
+		msg="Modular kernel detected, will build kernel modules"
+	else
+		msg="Nonmodular kernel detected, will not build kernel modules"
+	fi
+	einfo "${msg}"
+
+	[[ $modules -eq 1 ]] && \
+		linux-mod_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} NO_EXTRA_WARN_FLAGS=yes"
+	export myconf
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"
+
+	if [[ $modules -eq 1 ]]; then
+		einfo "Building kernel modules"
+		cd "${S}/kernel"
+		export KERNELDIR="${KERNEL_DIR}"
+		linux-mod_src_compile || die "failed to build modules"
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
+
+	if [[ $modules -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		cd "${S}/kernel"
+		export KERNELDIR="${KERNEL_DIR}"
+		linux-mod_src_install
+	fi
+}