net-firewall/firewalld: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
similarity index 87%
rename from net-firewall/firewalld/firewalld-0.6.3.ebuild
rename to net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
index 1623b9983834216a3914f685e11c23186f5db6cb..3035cef8c28a38e265e3f7ad3a15c7c9b836d3d8 100644 (file)
--- 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
similarity index 87%
rename from net-firewall/firewalld/firewalld-0.7.1.ebuild
rename to net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
index 2e7f5223fef984698611597d1c66006e16c860b5..af7ce3dfdc23d57835ff82693dd5c60975b06d52 100644 (file)
--- 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