From 81ae1d7f37c9afc6dee690e2fa9560aac405f902 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 13:58:39 +0100 Subject: [PATCH] dev-python/uranium: 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 --- dev-python/uranium/uranium-3.6.0-r1.ebuild | 18 ++++++++++++------ dev-python/uranium/uranium-4.2.0.ebuild | 18 ++++++++++++------ ...um-4.3.0.ebuild => uranium-4.3.0-r1.ebuild} | 18 +++++++++++------- 3 files changed, 35 insertions(+), 19 deletions(-) rename dev-python/uranium/{uranium-4.3.0.ebuild => uranium-4.3.0-r1.ebuild} (76%) diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild index fdbfe670aa9a..e2e7e3c9f1d2 100644 --- a/dev-python/uranium/uranium-3.6.0-r1.ebuild +++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild @@ -21,18 +21,24 @@ RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] - dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] - sci-libs/Shapely[${PYTHON_USEDEP}] + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] + sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] + ') dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5" DEPEND="${RDEPEND} sys-devel/gettext doc? ( app-doc/doxygen ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + test? ( + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_MULTI_USEDEP}] + ') + )" DOCS=( README.md ) diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild index 8b3f307a109c..3154436aac0b 100644 --- a/dev-python/uranium/uranium-4.2.0.ebuild +++ b/dev-python/uranium/uranium-4.2.0.ebuild @@ -24,14 +24,20 @@ RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} sys-devel/gettext doc? ( app-doc/doxygen ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + test? ( + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_MULTI_USEDEP}] + ') + )" RDEPEND="${PYTHON_DEPS} - ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] - dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] - sci-libs/Shapely[${PYTHON_USEDEP}] + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] + sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] + ') dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5" diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild similarity index 76% rename from dev-python/uranium/uranium-4.3.0.ebuild rename to dev-python/uranium/uranium-4.3.0-r1.ebuild index 4ca593a01581..b5516dcefb70 100644 --- a/dev-python/uranium/uranium-4.3.0.ebuild +++ b/dev-python/uranium/uranium-4.3.0-r1.ebuild @@ -25,16 +25,20 @@ BDEPEND="${PYTHON_DEPS} sys-devel/gettext doc? ( app-doc/doxygen ) test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/mypy[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_MULTI_USEDEP}] + dev-python/mypy[${PYTHON_MULTI_USEDEP}] + ') )" RDEPEND="${PYTHON_DEPS} - ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] - dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] - sci-libs/Shapely[${PYTHON_USEDEP}] + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] + sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] + ') dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5" -- 2.26.2