| 1 |
commit: 81ae1d7f37c9afc6dee690e2fa9560aac405f902 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 12:58:39 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:18:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ae1d7f |
| 7 |
|
| 8 |
dev-python/uranium: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/uranium/uranium-3.6.0-r1.ebuild | 18 ++++++++++++------ |
| 13 |
dev-python/uranium/uranium-4.2.0.ebuild | 18 ++++++++++++------ |
| 14 |
.../{uranium-4.3.0.ebuild => uranium-4.3.0-r1.ebuild} | 18 +++++++++++------- |
| 15 |
3 files changed, 35 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild |
| 18 |
index fdbfe670aa9..e2e7e3c9f1d 100644 |
| 19 |
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild |
| 20 |
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild |
| 21 |
@@ -21,18 +21,24 @@ RESTRICT="!test? ( test )" |
| 22 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 23 |
|
| 24 |
RDEPEND="${PYTHON_DEPS} |
| 25 |
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] |
| 26 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] |
| 27 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 28 |
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] |
| 29 |
- sci-libs/Shapely[${PYTHON_USEDEP}] |
| 30 |
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] |
| 31 |
+ $(python_gen_cond_dep ' |
| 32 |
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] |
| 33 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 34 |
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] |
| 35 |
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] |
| 36 |
+ ') |
| 37 |
dev-qt/qtquickcontrols:5 |
| 38 |
dev-qt/qtquickcontrols2:5" |
| 39 |
|
| 40 |
DEPEND="${RDEPEND} |
| 41 |
sys-devel/gettext |
| 42 |
doc? ( app-doc/doxygen ) |
| 43 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 44 |
+ test? ( |
| 45 |
+ $(python_gen_cond_dep ' |
| 46 |
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ ') |
| 48 |
+ )" |
| 49 |
|
| 50 |
DOCS=( README.md ) |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild |
| 54 |
index 8b3f307a109..3154436aac0 100644 |
| 55 |
--- a/dev-python/uranium/uranium-4.2.0.ebuild |
| 56 |
+++ b/dev-python/uranium/uranium-4.2.0.ebuild |
| 57 |
@@ -24,14 +24,20 @@ RESTRICT="!test? ( test )" |
| 58 |
BDEPEND="${PYTHON_DEPS} |
| 59 |
sys-devel/gettext |
| 60 |
doc? ( app-doc/doxygen ) |
| 61 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 62 |
+ test? ( |
| 63 |
+ $(python_gen_cond_dep ' |
| 64 |
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}] |
| 65 |
+ ') |
| 66 |
+ )" |
| 67 |
|
| 68 |
RDEPEND="${PYTHON_DEPS} |
| 69 |
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] |
| 70 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] |
| 71 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 72 |
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] |
| 73 |
- sci-libs/Shapely[${PYTHON_USEDEP}] |
| 74 |
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] |
| 75 |
+ $(python_gen_cond_dep ' |
| 76 |
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] |
| 77 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 78 |
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] |
| 79 |
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] |
| 80 |
+ ') |
| 81 |
dev-qt/qtquickcontrols:5 |
| 82 |
dev-qt/qtquickcontrols2:5" |
| 83 |
|
| 84 |
|
| 85 |
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild |
| 86 |
similarity index 76% |
| 87 |
rename from dev-python/uranium/uranium-4.3.0.ebuild |
| 88 |
rename to dev-python/uranium/uranium-4.3.0-r1.ebuild |
| 89 |
index 4ca593a0158..b5516dcefb7 100644 |
| 90 |
--- a/dev-python/uranium/uranium-4.3.0.ebuild |
| 91 |
+++ b/dev-python/uranium/uranium-4.3.0-r1.ebuild |
| 92 |
@@ -25,16 +25,20 @@ BDEPEND="${PYTHON_DEPS} |
| 93 |
sys-devel/gettext |
| 94 |
doc? ( app-doc/doxygen ) |
| 95 |
test? ( |
| 96 |
- dev-python/pytest[${PYTHON_USEDEP}] |
| 97 |
- dev-python/mypy[${PYTHON_USEDEP}] |
| 98 |
+ $(python_gen_cond_dep ' |
| 99 |
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}] |
| 100 |
+ dev-python/mypy[${PYTHON_MULTI_USEDEP}] |
| 101 |
+ ') |
| 102 |
)" |
| 103 |
|
| 104 |
RDEPEND="${PYTHON_DEPS} |
| 105 |
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}] |
| 106 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] |
| 107 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 108 |
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] |
| 109 |
- sci-libs/Shapely[${PYTHON_USEDEP}] |
| 110 |
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] |
| 111 |
+ $(python_gen_cond_dep ' |
| 112 |
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] |
| 113 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 114 |
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] |
| 115 |
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] |
| 116 |
+ ') |
| 117 |
dev-qt/qtquickcontrols:5 |
| 118 |
dev-qt/qtquickcontrols2:5" |
Archives