| 1 |
commit: d1cf307738d58b4509a32ea95900c032f8726ed6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 19:09:05 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cf3077 |
| 7 |
|
| 8 |
sci-libs/vtk: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{vtk-8.1.0-r3.ebuild => vtk-8.1.0-r4.ebuild} | 58 ++++++++++++---------- |
| 13 |
1 file changed, 31 insertions(+), 27 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-libs/vtk/vtk-8.1.0-r3.ebuild b/sci-libs/vtk/vtk-8.1.0-r4.ebuild |
| 16 |
similarity index 90% |
| 17 |
rename from sci-libs/vtk/vtk-8.1.0-r3.ebuild |
| 18 |
rename to sci-libs/vtk/vtk-8.1.0-r4.ebuild |
| 19 |
index c2a250417f9..0618010649d 100644 |
| 20 |
--- a/sci-libs/vtk/vtk-8.1.0-r3.ebuild |
| 21 |
+++ b/sci-libs/vtk/vtk-8.1.0-r4.ebuild |
| 22 |
@@ -69,28 +69,10 @@ RDEPEND=" |
| 23 |
ffmpeg? ( virtual/ffmpeg ) |
| 24 |
gdal? ( sci-libs/gdal ) |
| 25 |
java? ( >=virtual/jdk-1.7:* ) |
| 26 |
- mpi? ( |
| 27 |
- virtual/mpi[cxx,romio] |
| 28 |
- python? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
| 29 |
- ) |
| 30 |
mysql? ( virtual/mysql ) |
| 31 |
odbc? ( dev-db/unixODBC ) |
| 32 |
offscreen? ( media-libs/mesa[osmesa] ) |
| 33 |
postgres? ( dev-db/postgresql:= ) |
| 34 |
- python? ( |
| 35 |
- ${PYTHON_DEPS} |
| 36 |
- dev-python/sip[${PYTHON_USEDEP}] |
| 37 |
- ) |
| 38 |
- qt5? ( |
| 39 |
- dev-qt/designer:5 |
| 40 |
- dev-qt/qtcore:5 |
| 41 |
- dev-qt/qtgui:5 |
| 42 |
- dev-qt/qtopengl:5 |
| 43 |
- dev-qt/qtsql:5 |
| 44 |
- dev-qt/qtwebkit:5 |
| 45 |
- dev-qt/qtx11extras:5 |
| 46 |
- python? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) |
| 47 |
- ) |
| 48 |
R? ( dev-lang/R ) |
| 49 |
tbb? ( dev-cpp/tbb ) |
| 50 |
tcl? ( dev-lang/tcl:0= ) |
| 51 |
@@ -98,16 +80,38 @@ RDEPEND=" |
| 52 |
video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) |
| 53 |
web? ( |
| 54 |
${WEBAPP_DEPEND} |
| 55 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
| 56 |
- dev-python/constantly[${PYTHON_USEDEP}] |
| 57 |
- dev-python/hyperlink[${PYTHON_USEDEP}] |
| 58 |
- dev-python/incremental[${PYTHON_USEDEP}] |
| 59 |
- dev-python/six[${PYTHON_USEDEP}] |
| 60 |
- dev-python/twisted[${PYTHON_USEDEP}] |
| 61 |
- dev-python/txaio[${PYTHON_USEDEP}] |
| 62 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
| 63 |
+ $(python_gen_cond_dep ' |
| 64 |
+ dev-python/autobahn[${PYTHON_MULTI_USEDEP}] |
| 65 |
+ dev-python/constantly[${PYTHON_MULTI_USEDEP}] |
| 66 |
+ dev-python/hyperlink[${PYTHON_MULTI_USEDEP}] |
| 67 |
+ dev-python/incremental[${PYTHON_MULTI_USEDEP}] |
| 68 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 69 |
+ dev-python/twisted[${PYTHON_MULTI_USEDEP}] |
| 70 |
+ dev-python/txaio[${PYTHON_MULTI_USEDEP}] |
| 71 |
+ dev-python/zope-interface[${PYTHON_MULTI_USEDEP}] |
| 72 |
+ ') |
| 73 |
) |
| 74 |
- xdmf2? ( sci-libs/xdmf2 )" |
| 75 |
+ xdmf2? ( sci-libs/xdmf2 ) |
| 76 |
+ $(python_gen_cond_dep " |
| 77 |
+ mpi? ( |
| 78 |
+ virtual/mpi[cxx,romio] |
| 79 |
+ python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] ) |
| 80 |
+ ) |
| 81 |
+ python? ( |
| 82 |
+ ${PYTHON_DEPS} |
| 83 |
+ dev-python/sip[\${PYTHON_MULTI_USEDEP}] |
| 84 |
+ ) |
| 85 |
+ qt5? ( |
| 86 |
+ dev-qt/designer:5 |
| 87 |
+ dev-qt/qtcore:5 |
| 88 |
+ dev-qt/qtgui:5 |
| 89 |
+ dev-qt/qtopengl:5 |
| 90 |
+ dev-qt/qtsql:5 |
| 91 |
+ dev-qt/qtwebkit:5 |
| 92 |
+ dev-qt/qtx11extras:5 |
| 93 |
+ python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] ) |
| 94 |
+ ) |
| 95 |
+ ")" |
| 96 |
DEPEND="${RDEPEND} |
| 97 |
doc? ( app-doc/doxygen )" |
Archives