From 5c442126573c8e621b805b5f2311939c93d25bdf Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Fri, 7 Aug 2020 13:43:23 +0300
Subject: net-firewall/ipset: migrate to sys-apps/kmod

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
 net-firewall/ipset/ipset-6.29-r1.ebuild |  98 ++++++++++++++++++++++++++++
 net-firewall/ipset/ipset-6.29.ebuild    |  98 ----------------------------
 net-firewall/ipset/ipset-6.38-r1.ebuild |  99 ++++++++++++++++++++++++++++
 net-firewall/ipset/ipset-6.38.ebuild    |  99 ----------------------------
 net-firewall/ipset/ipset-7.5-r1.ebuild  | 111 ++++++++++++++++++++++++++++++++
 net-firewall/ipset/ipset-7.5.ebuild     | 111 --------------------------------
 net-firewall/ipset/ipset-7.6-r1.ebuild  | 111 ++++++++++++++++++++++++++++++++
 net-firewall/ipset/ipset-7.6.ebuild     | 111 --------------------------------
 8 files changed, 419 insertions(+), 419 deletions(-)
 create mode 100644 net-firewall/ipset/ipset-6.29-r1.ebuild
 delete mode 100644 net-firewall/ipset/ipset-6.29.ebuild
 create mode 100644 net-firewall/ipset/ipset-6.38-r1.ebuild
 delete mode 100644 net-firewall/ipset/ipset-6.38.ebuild
 create mode 100644 net-firewall/ipset/ipset-7.5-r1.ebuild
 delete mode 100644 net-firewall/ipset/ipset-7.5.ebuild
 create mode 100644 net-firewall/ipset/ipset-7.6-r1.ebuild
 delete mode 100644 net-firewall/ipset/ipset-7.6.ebuild

(limited to 'net-firewall/ipset')

diff --git a/net-firewall/ipset/ipset-6.29-r1.ebuild b/net-firewall/ipset/ipset-6.29-r1.ebuild
new file mode 100644
index 000000000000..4a2d032bb942
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.29-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+MODULES_OPTIONAL_USE=modules
+inherit linux-info linux-mod ltprune
+
+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-r4 ${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.29.ebuild b/net-firewall/ipset/ipset-6.29.ebuild
deleted file mode 100644
index 4a2d032bb942..000000000000
--- a/net-firewall/ipset/ipset-6.29.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MODULES_OPTIONAL_USE=modules
-inherit linux-info linux-mod ltprune
-
-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-r4 ${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.38-r1.ebuild b/net-firewall/ipset/ipset-6.38-r1.ebuild
new file mode 100644
index 000000000000..37f222b9c797
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.38-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit linux-info linux-mod ltprune
+
+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 ~arm ~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."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		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-r4 ${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.38.ebuild b/net-firewall/ipset/ipset-6.38.ebuild
deleted file mode 100644
index 37f222b9c797..000000000000
--- a/net-firewall/ipset/ipset-6.38.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MODULES_OPTIONAL_USE=modules
-inherit linux-info linux-mod ltprune
-
-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 ~arm ~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."
-	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
-
-	build_modules=0
-	if use modules; then
-		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-r4 ${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-7.5-r1.ebuild b/net-firewall/ipset/ipset-7.5-r1.ebuild
new file mode 100644
index 000000000000..b0de78dae51c
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.5-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# 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."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		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() {
+	default
+
+	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
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
+	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-7.5.ebuild b/net-firewall/ipset/ipset-7.5.ebuild
deleted file mode 100644
index b0de78dae51c..000000000000
--- a/net-firewall/ipset/ipset-7.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# 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."
-	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
-
-	build_modules=0
-	if use modules; then
-		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() {
-	default
-
-	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
-
-	find "${ED}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
-	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-7.6-r1.ebuild b/net-firewall/ipset/ipset-7.6-r1.ebuild
new file mode 100644
index 000000000000..b0de78dae51c
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.6-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# 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."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		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() {
+	default
+
+	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
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
+	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-7.6.ebuild b/net-firewall/ipset/ipset-7.6.ebuild
deleted file mode 100644
index b0de78dae51c..000000000000
--- a/net-firewall/ipset/ipset-7.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# 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."
-	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
-
-	build_modules=0
-	if use modules; then
-		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() {
-	default
-
-	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
-
-	find "${ED}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
-	newconfd "${FILESDIR}"/ipset.confd ${PN}
-	systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
-	keepdir /var/lib/ipset
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-}
-- 
cgit v1.2.3-65-gdbad