[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Robin H. Johnson]

commit:     40960cbcbab5397a82b1c0eb0cb89af0dee10f6e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 20:38:05 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 20:38:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40960cbc

net-firewall/ipset: cleanup

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-firewall/ipset/Manifest             |   8 ---
 net-firewall/ipset/files/ipset.initd-r2 |  59 -----------------
 net-firewall/ipset/files/ipset.initd-r3 |  95 ---------------------------
 net-firewall/ipset/ipset-6.15.ebuild    | 111 -------------------------------
 net-firewall/ipset/ipset-6.16.1.ebuild  | 110 -------------------------------
 net-firewall/ipset/ipset-6.16.ebuild    | 110 -------------------------------
 net-firewall/ipset/ipset-6.17.ebuild    | 110 -------------------------------
 net-firewall/ipset/ipset-6.19.ebuild    | 110 -------------------------------
 net-firewall/ipset/ipset-6.20.1.ebuild  | 113 --------------------------------
 net-firewall/ipset/ipset-6.21.1.ebuild  | 113 --------------------------------
 net-firewall/ipset/ipset-6.24.ebuild    |  98 ---------------------------
 11 files changed, 1037 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 90a13b0ac8c..f909863eb09 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,11 +1,3 @@
-DIST ipset-6.15.tar.bz2 432771 SHA256 6f60a472bc2ef7b1c864be6472de65365c90e264dfadf28da48c2361393d8fd1 SHA512 f72329bb8610717ccdddbfaf7b7774e717a34d71fdb7f9c7eac97e3d1b314915500c88137b6e229411df99c86d2228bef447f26c116bc2cf992cfb60ab1422d3 WHIRLPOOL 868ee3cd722c2d86c273aca8f3ca7695e8ef5d00d30111ef0f2bf972a119211008d8cadec1760b43b4f0efb24690f20a2cf5f0fdbbb0700cf66e5660d363ab2a
-DIST ipset-6.16.1.tar.bz2 433347 BLAKE2B 6998df5f7e02906fd7ac5e40091599e8d734c139ce1d68316ef0d97b3715619d2f5fe238f9a83471882d3d48b479ab105eebd7d13f8200be38ca015815eaa5c7 SHA512 e54d32932875a9d06acba598280de9e83529f36326cbaaeb05d38b985bc40d276dc46e37eae3d1d4c1afcdd69b3074678512349ebd964b6189ca1c6871efe304
-DIST ipset-6.16.tar.bz2 433118 BLAKE2B 20d3080b88126d19c930b2351212acc01cb8e295a4746fc86c67b0c0bfa91c248927516a19f5935dc344b1780bc3b191514bea6574b4d78d66381dc7d0c0fd41 SHA512 34ef44af76f3609035ae1bdacb7586f2288ee66701ed8a1a5a0632fb23b5f651fe02b070e0f0f1b0ebae6cab02b3f827cc7e67f740cf77f51ba494c25dcc47dd
-DIST ipset-6.17.tar.bz2 448076 BLAKE2B b1ff8d51cc4c9fc0c2053f8dea4f00c05f7d9dacb39fc5550e73b01ffe15c8e37507affc790cdffeb3ec26630a00332a529a3a1bb8b9824b3201609027657877 SHA512 668f173b7ddd8a18af2730205e2e2c38610aa9fd191af52f91080e903bcd8e1f38e8e3a7fd57077decb00fd0556df89c3315c91eaffaa6977f2caf2a3300b175
-DIST ipset-6.19.tar.bz2 465927 BLAKE2B 5df57e88384447e272e8d6a8e2b2a81f910efb703a6f54743c7eb1949fbddcd95922b0dc8659be92e890b8269d61f022161a3e87f7f3050d7ffeffdd4163d0bf SHA512 9e9fdccd8ae34ad56c5fc6da03060b39b3acc9a53154acf7e82df3f2c1545b2bdcc7b5b9b4f6ddd6ee3e8582e81b1fa51fae37cb4f46948c053d5153bdca6f39
-DIST ipset-6.20.1.tar.bz2 500898 BLAKE2B bde1cbce6d5cd0862bfa33752375643d7d5c47ce5c8e7435768d41be09763690ec18892fc88275e45c46dbe1510b4fcacb9ec7b79255883d549cdb110e941fe0 SHA512 3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565
-DIST ipset-6.21.1.tar.bz2 510013 BLAKE2B 38d3f6841f6c3ffc95d786aeee3e97a68bf0828a7f8651ec10afcfcf3cf3b460cd977b0380c35ab11117d73813301f7ab93391c64d521dc5f3ab203b5d0300b7 SHA512 c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb
-DIST ipset-6.24.tar.bz2 518811 BLAKE2B 19c7ccd8890386dcb342eefc88559edab2f8d0235b8f76c1a916298d32d4b0ac2f4232755cc1c362823a1397dc29054bf0dcf6375804392b541bee2ba6c2b849 SHA512 107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4 SHA512 ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.30.tar.bz2 544054 BLAKE2B eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b SHA512 6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 DIST ipset-6.32.tar.bz2 544635 BLAKE2B 684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1 SHA512 7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7

diff --git a/net-firewall/ipset/files/ipset.initd-r2 b/net-firewall/ipset/files/ipset.initd-r2
deleted file mode 100644
index 86c580cfe08..00000000000
--- a/net-firewall/ipset/files/ipset.initd-r2
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="save"
-
-IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
-
-depend() {
-    before iptables ip6tables
-}
-
-checkconfig() {
-    if [ ! -f "${IPSET_SAVE}" ] ; then
-        eerror "Not starting ${SVCNAME}. First create some rules then run:"
-        eerror "/etc/init.d/${SVCNAME} save"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return 1
-    ebegin "Loading ipset session"
-    ipset restore < "${IPSET_SAVE}"
-    eend $?
-}
-
-stop() {
-    # check if there are any references to current sets
-
-    if ! ipset list | gawk '
-        ($1 == "References:") { refcnt += $2 }
-        ($1 == "Type:" && $2 == "list:set") { set = 1 }
-        (scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
-        (set && $1 == "Members:") {scan = 1}
-        END { if ((refcnt - setcnt) > 0) exit 1 }
-    '; then
-        eerror "ipset is in use, can't stop"
-        return 1
-    fi
-
-    if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-        save || return 1
-    fi
-
-    ebegin "Removing kernel IP sets"
-    ipset flush
-    ipset destroy
-    eend $?
-}
-
-save() {
-    ebegin "Saving ipset session"
-    touch "${IPSET_SAVE}"
-    chmod 0600 "${IPSET_SAVE}"
-    ipset save > "${IPSET_SAVE}"
-    eend $?
-}

diff --git a/net-firewall/ipset/files/ipset.initd-r3 b/net-firewall/ipset/files/ipset.initd-r3
deleted file mode 100644
index 85556edd1c3..00000000000
--- a/net-firewall/ipset/files/ipset.initd-r3
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="save"
-extra_started_commands="reload"
-
-IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
-
-depend() {
-    before iptables ip6tables
-}
-
-checkconfig() {
-    if [ ! -f "${IPSET_SAVE}" ] ; then
-        eerror "Not starting ${SVCNAME}. First create some rules then run:"
-        eerror "/etc/init.d/${SVCNAME} save"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return 1
-    ebegin "Loading ipset session"
-    ipset restore < "${IPSET_SAVE}"
-    eend $?
-}
-
-stop() {
-    # check if there are any references to current sets
-
-    if ! ipset list | gawk '
-        ($1 == "References:") { refcnt += $2 }
-        ($1 == "Type:" && $2 == "list:set") { set = 1 }
-        (scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
-        (set && $1 == "Members:") {scan = 1}
-        END { if ((refcnt - setcnt) > 0) exit 1 }
-    '; then
-        eerror "ipset is in use, can't stop"
-        return 1
-    fi
-
-    if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-        save || return 1
-    fi
-
-    ebegin "Removing kernel IP sets"
-    ipset flush
-    ipset destroy
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading ipsets"
-
-    # Loading sets from a save file is only additive (there is no
-    # automatic flushing or replacing). And, we can not remove sets
-    # that are currently used in existing iptables rules.
-    #
-    # Instead, we create new temp sets for any set that is already
-    # in use, and then atomically swap them into place.
-    #
-    # XXX: This does not clean out previously used ipsets that are
-    # not in the new saved policy--it can't, because they may still
-    # be referenced in the current iptables rules.
-
-    # Build a list of all currently used sets (if any).
-    running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
-	running_ipset_list="${running_ipset_list% }"
-    # Build a regular expression that matches those set names.
-    running_ipset_list_regex="${running_ipset_list// /|}"
-
-    # Load up sets from the save file, but rename any set that already
-    # exists to a temporary name that we will swap later.
-    if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) (${running_ipset_list_regex}) /\1 \2_atomic_temp /" | ipset restore ; then
-        eend $? "Failed to load new ipsets"
-    fi
-
-    # Now for every set name that currently exists, atomically swap it
-    # with the temporary new one we created, and then destroy the old set.
-    for ipset_name in ${running_ipset_list} ; do
-        ipset swap ${ipset_name} ${ipset_name}_atomic_temp || eend $? "Failed to swap in new ipset $ipset_name"
-        ipset destroy ${ipset_name}_atomic_temp || eend $? "Failed to delete obsolete ipset ${ipset_name}_atomic_temp"
-    done
-    eend 0
-}
-
-save() {
-    ebegin "Saving ipset session"
-    touch "${IPSET_SAVE}"
-    chmod 0600 "${IPSET_SAVE}"
-    ipset save > "${IPSET_SAVE}"
-    eend $?
-}

diff --git a/net-firewall/ipset/ipset-6.15.ebuild b/net-firewall/ipset/ipset-6.15.ebuild
deleted file mode 100644
index fda7f2ff30d..00000000000
--- a/net-firewall/ipset/ipset-6.15.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit autotools linux-info linux-mod
-
-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="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}" \
-		--disable-silent-rules
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.16.1.ebuild b/net-firewall/ipset/ipset-6.16.1.ebuild
deleted file mode 100644
index 735cbce7981..00000000000
--- a/net-firewall/ipset/ipset-6.16.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools linux-info linux-mod
-
-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="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.16.ebuild b/net-firewall/ipset/ipset-6.16.ebuild
deleted file mode 100644
index 735cbce7981..00000000000
--- a/net-firewall/ipset/ipset-6.16.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools linux-info linux-mod
-
-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="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.17.ebuild b/net-firewall/ipset/ipset-6.17.ebuild
deleted file mode 100644
index e841595369f..00000000000
--- a/net-firewall/ipset/ipset-6.17.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools linux-info linux-mod
-
-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="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.19.ebuild b/net-firewall/ipset/ipset-6.19.ebuild
deleted file mode 100644
index 735cbce7981..00000000000
--- a/net-firewall/ipset/ipset-6.19.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools linux-info linux-mod
-
-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="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.20.1.ebuild b/net-firewall/ipset/ipset-6.20.1.ebuild
deleted file mode 100644
index 6bd830949e0..00000000000
--- a/net-firewall/ipset/ipset-6.20.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod
-
-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"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-	# It does still build without NET_NS, but it may be needed in future.
-	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
-	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.21.1.ebuild b/net-firewall/ipset/ipset-6.21.1.ebuild
deleted file mode 100644
index 70888cbc868..00000000000
--- a/net-firewall/ipset/ipset-6.21.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod
-
-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"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You should recompile and run new kernel to avoid runtime errors."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-	# It does still build without NET_NS, but it may be needed in future.
-	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
-	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}

diff --git a/net-firewall/ipset/ipset-6.24.ebuild b/net-firewall/ipset/ipset-6.24.ebuild
deleted file mode 100644
index 0795c0f13b4..00000000000
--- a/net-firewall/ipset/ipset-6.24.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MODULES_OPTIONAL_USE=modules
-inherit linux-info linux-mod
-
-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 ~arm64 ~ppc ~x86"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-	get_version
-	CONFIG_CHECK="NETFILTER"
-	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-	# It does still build without NET_NS, but it may be needed in future.
-	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
-	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_present "IP_NF_SET" || \
-				linux_chkconfig_present "IP_SET"; then #274577
-				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
-				eerror "Please either build ipset with modules USE flag disabled"
-				eerror "or rebuild kernel without IP_SET support and make sure"
-				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
-				die "USE=modules and in-kernel ipset support detected."
-			else
-				einfo "Modular kernel detected. Gonna build kernel modules..."
-				build_modules=1
-			fi
-		else
-			eerror "Nonmodular kernel detected, but USE=modules. Either build"
-			eerror "modular kernel (without IP_SET) or disable USE=modules"
-			die "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_with modules kmod) \
-		--disable-static \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ksource="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/ipset.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}