1 |
commit: 1c052fae8943550cb8ea43e90e3020ff4768fff4 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 19:11:53 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:35:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c052fae |
7 |
|
8 |
sci-visualization/paraview: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
...aview-5.6.1.ebuild => paraview-5.6.1-r1.ebuild} | 34 +++++++++++++--------- |
13 |
1 file changed, 20 insertions(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild |
16 |
similarity index 91% |
17 |
rename from sci-visualization/paraview/paraview-5.6.1.ebuild |
18 |
rename to sci-visualization/paraview/paraview-5.6.1-r1.ebuild |
19 |
index 71b503e37a9..6233e8195c6 100644 |
20 |
--- a/sci-visualization/paraview/paraview-5.6.1.ebuild |
21 |
+++ b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild |
22 |
@@ -62,19 +62,21 @@ RDEPEND=" |
23 |
!offscreen? ( virtual/opengl ) |
24 |
python? ( |
25 |
${PYTHON_DEPS} |
26 |
- dev-python/constantly[${PYTHON_USEDEP}] |
27 |
- dev-python/incremental[${PYTHON_USEDEP}] |
28 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
29 |
- dev-python/numpy[${PYTHON_USEDEP}] |
30 |
- dev-python/pygments[${PYTHON_USEDEP}] |
31 |
- dev-python/sip[${PYTHON_USEDEP}] |
32 |
- dev-python/six[${PYTHON_USEDEP}] |
33 |
- || ( dev-python/twisted[${PYTHON_USEDEP}] |
34 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
35 |
- ) |
36 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
37 |
- mpi? ( dev-python/mpi4py ) |
38 |
- qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] ) |
39 |
+ $(python_gen_cond_dep ' |
40 |
+ dev-python/constantly[${PYTHON_MULTI_USEDEP}] |
41 |
+ dev-python/incremental[${PYTHON_MULTI_USEDEP}] |
42 |
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] |
43 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
44 |
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
45 |
+ dev-python/sip[${PYTHON_MULTI_USEDEP}] |
46 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
47 |
+ || ( dev-python/twisted[${PYTHON_MULTI_USEDEP}] |
48 |
+ dev-python/twisted-core[${PYTHON_MULTI_USEDEP}] |
49 |
+ ) |
50 |
+ dev-python/zope-interface[${PYTHON_MULTI_USEDEP}] |
51 |
+ mpi? ( dev-python/mpi4py ) |
52 |
+ qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_MULTI_USEDEP}] ) |
53 |
+ ') |
54 |
) |
55 |
qt5? ( |
56 |
dev-qt/designer:5 |
57 |
@@ -91,7 +93,11 @@ RDEPEND=" |
58 |
tk? ( dev-lang/tk:0= )" |
59 |
DEPEND="${RDEPEND} |
60 |
${PYTHON_DEPS} |
61 |
- boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] ) |
62 |
+ boost? ( |
63 |
+ $(python_gen_cond_dep ' |
64 |
+ dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}] |
65 |
+ ') |
66 |
+ ) |
67 |
doc? ( app-doc/doxygen )" |
68 |
|
69 |
S="${WORKDIR}/${MY_P}" |