From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 61FD9138350 for ; Sun, 9 Feb 2020 16:18:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4599AE087B; Sun, 9 Feb 2020 16:18:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0E1CE087B for ; Sun, 9 Feb 2020 16:18:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C378B34E754 for ; Sun, 9 Feb 2020 16:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B76B14C for ; Sun, 9 Feb 2020 16:18:19 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581265080.81ae1d7f37c9afc6dee690e2fa9560aac405f902.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/uranium/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/uranium/uranium-3.6.0-r1.ebuild dev-python/uranium/uranium-4.2.0.ebuild dev-python/uranium/uranium-4.3.0-r1.ebuild dev-python/uranium/uranium-4.3.0.ebuild X-VCS-Directories: dev-python/uranium/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 81ae1d7f37c9afc6dee690e2fa9560aac405f902 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:18:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd18b5c2-619b-4cc1-8ad6-9ab0c9830c91 X-Archives-Hash: 16524dc529e2e8db8dbe545ea756a801 commit: 81ae1d7f37c9afc6dee690e2fa9560aac405f902 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 12:58:39 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:18:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ae1d7f dev-python/uranium: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> dev-python/uranium/uranium-3.6.0-r1.ebuild | 18 ++++++++++++------ dev-python/uranium/uranium-4.2.0.ebuild | 18 ++++++++++++------ .../{uranium-4.3.0.ebuild => uranium-4.3.0-r1.ebuild} | 18 +++++++++++------- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild index fdbfe670aa9..e2e7e3c9f1d 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 8b3f307a109..3154436aac0 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 4ca593a0158..b5516dcefb7 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"