From: Matthias Maier <tamiko@gentoo.org>
Date: Tue, 17 Mar 2020 21:11:34 +0000 (-0500)
Subject: net-firewall/firewalld: fix refactoring screwup
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b880c642d5eb94346b4d92c246a9ea727697e382;p=gentoo.git

net-firewall/firewalld: fix refactoring screwup

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
---

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index 2c9f20c7fd33..6d61ab3a74f5 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -18,11 +18,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[iptables?] )
+	nftables? ( net-firewall/nftables )
 	iptables? (
 		net-firewall/iptables[ipv6]
 		net-firewall/ebtables
 		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables] )
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '
diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild
index 2c9f20c7fd33..6d61ab3a74f5 100644
--- a/net-firewall/firewalld/firewalld-0.7.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild
@@ -18,11 +18,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[iptables?] )
+	nftables? ( net-firewall/nftables )
 	iptables? (
 		net-firewall/iptables[ipv6]
 		net-firewall/ebtables
 		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables] )
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '