From bd62106cfc7133b117ca1986fc6dc0535aa58b7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 10:02:52 +0100 Subject: [PATCH] app-emulation/ganeti: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- ...15.2-r8.ebuild => ganeti-2.15.2-r9.ebuild} | 28 +++++++++++-------- app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 28 +++++++++++-------- .../ganeti/ganeti-2.17.0_beta1.ebuild | 28 +++++++++++-------- 3 files changed, 48 insertions(+), 36 deletions(-) rename app-emulation/ganeti/{ganeti-2.15.2-r8.ebuild => ganeti-2.15.2-r9.ebuild} (95%) diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild similarity index 95% rename from app-emulation/ganeti/ganeti-2.15.2-r8.ebuild rename to app-emulation/ganeti/ganeti-2.15.2-r9.ebuild index 6e00659d3fde..2f365cb6ab41 100644 --- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild +++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,16 +68,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" DEPEND=" dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/simplejson[${PYTHON_MULTI_USEDEP}] + dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] + dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] + dev-python/pycurl[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/bitarray[${PYTHON_MULTI_USEDEP}] + dev-python/docutils[${PYTHON_MULTI_USEDEP}] + dev-python/fdsend[${PYTHON_MULTI_USEDEP}] + ') || ( net-misc/iputils[arping] net-analyzer/arping @@ -157,7 +159,9 @@ RDEPEND="${DEPEND} DEPEND+=" sys-devel/m4 app-text/pandoc - dev-python/sphinx[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + ') media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild index bd24dd3fff74..94c05841d25e 100644 --- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild +++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" DEPEND=" dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/simplejson[${PYTHON_MULTI_USEDEP}] + dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] + dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] + dev-python/pycurl[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/bitarray[${PYTHON_MULTI_USEDEP}] + dev-python/docutils[${PYTHON_MULTI_USEDEP}] + dev-python/fdsend[${PYTHON_MULTI_USEDEP}] + ') || ( net-misc/iputils[arping] net-analyzer/arping @@ -140,7 +142,9 @@ RDEPEND="${DEPEND} DEPEND+=" sys-devel/m4 app-text/pandoc - dev-python/sphinx[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + ') media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild index d4baca0d24bf..061cb74ba0f5 100644 --- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild +++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" DEPEND=" dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/simplejson[${PYTHON_MULTI_USEDEP}] + dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] + dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] + dev-python/pycurl[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/bitarray[${PYTHON_MULTI_USEDEP}] + dev-python/docutils[${PYTHON_MULTI_USEDEP}] + dev-python/fdsend[${PYTHON_MULTI_USEDEP}] + ') || ( net-misc/iputils[arping] net-analyzer/arping @@ -140,7 +142,9 @@ RDEPEND="${DEPEND} DEPEND+=" sys-devel/m4 app-text/pandoc - <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + <=dev-python/sphinx-1.3.5[${PYTHON_MULTI_USEDEP}] + ') media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= -- 2.26.2