summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-02-07 18:02:51 +0100
committerMichał Górny <mgorny@gentoo.org>2020-02-09 17:34:04 +0100
commitf3429f0c5bb235b664e0218dc2c29c9808cbe794 (patch)
treefc8d30b18927c22279ef8fe5990f0564d6db103a /net-firewall
parentnet-analyzer/suricata: Switch to PYTHON_MULTI_USEDEP API (diff)
downloadgentoo-f3429f0c5bb235b664e0218dc2c29c9808cbe794.tar.gz
gentoo-f3429f0c5bb235b664e0218dc2c29c9808cbe794.tar.bz2
gentoo-f3429f0c5bb235b664e0218dc2c29c9808cbe794.zip
net-firewall/firewalld: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/firewalld/firewalld-0.6.3-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.6.3.ebuild)18
-rw-r--r--net-firewall/firewalld/firewalld-0.7.1-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.7.1.ebuild)18
2 files changed, 20 insertions, 16 deletions
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
index 1623b9983834..3035cef8c28a 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
@@ -18,19 +18,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
!!net-firewall/gshield
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
net-firewall/iptables[ipv6]
net-firewall/ipset
net-firewall/nftables
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- x11-libs/gtk+:3
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35
diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
index 2e7f5223fef9..af7ce3dfdc23 100644
--- a/net-firewall/firewalld/firewalld-0.7.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
@@ -18,19 +18,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
!!net-firewall/gshield
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
net-firewall/iptables[ipv6]
|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
net-firewall/ipset
net-firewall/nftables
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- x11-libs/gtk+:3
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35