From 191bd5df8e7ded4729966cd6c3572f775cf46d90 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Fri, 7 Aug 2020 13:41:37 +0300
Subject: net-firewall/firehol: 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/firehol/firehol-3.1.6-r1.ebuild | 67 ++++++++++++++++++++++++++++
 net-firewall/firehol/firehol-3.1.6.ebuild    | 67 ----------------------------
 2 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 net-firewall/firehol/firehol-3.1.6-r1.ebuild
 delete mode 100644 net-firewall/firehol/firehol-3.1.6.ebuild

diff --git a/net-firewall/firehol/firehol-3.1.6-r1.ebuild b/net-firewall/firehol/firehol-3.1.6-r1.ebuild
new file mode 100644
index 000000000000..9307f76bb41c
--- /dev/null
+++ b/net-firewall/firehol/firehol-3.1.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
+SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc ipv6 ipset"
+KEYWORDS="amd64 arm ~ppc ~x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal,ipv6?]
+	net-misc/iputils[ipv6?]
+	net-misc/iprange
+	net-analyzer/traceroute
+	virtual/modutils
+	app-arch/gzip
+	ipset? (
+		net-firewall/ipset
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~IP_NF_FILTER \
+		~IP_NF_IPTABLES \
+		~IP_NF_MANGLE \
+		~IP_NF_TARGET_MASQUERADE
+		~IP_NF_TARGET_REDIRECT \
+		~IP_NF_TARGET_REJECT \
+		~NETFILTER_XT_CONNMARK \
+		~NETFILTER_XT_MATCH_HELPER \
+		~NETFILTER_XT_MATCH_LIMIT \
+		~NETFILTER_XT_MATCH_OWNER \
+		~NETFILTER_XT_MATCH_STATE \
+		~NF_CONNTRACK \
+		~NF_CONNTRACK_IPV4 \
+		~NF_CONNTRACK_MARK \
+		~NF_NAT \
+		~NF_NAT_FTP \
+		~NF_NAT_IRC \
+	"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-vnetbuild \
+		$(use_enable ipset update-ipsets) \
+		$(use_enable doc) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
+}
diff --git a/net-firewall/firehol/firehol-3.1.6.ebuild b/net-firewall/firehol/firehol-3.1.6.ebuild
deleted file mode 100644
index c17a7cde2bf0..000000000000
--- a/net-firewall/firehol/firehol-3.1.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="amd64 arm ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6?]
-	net-misc/iputils[ipv6?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	virtual/modutils
-	app-arch/gzip
-	ipset? (
-		net-firewall/ipset
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_CONNMARK \
-		~NETFILTER_XT_MATCH_HELPER \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		$(use_enable ipset update-ipsets) \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
-- 
cgit v1.2.3-65-gdbad