commit: 5c2fe7c8a0c22b766f7da750daa2caf6881393fa
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 18:17:05 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 18:17:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2fe7c8
sci-libs/vtk: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/vtk/vtk-8.2.0-r4.ebuild | 24 ++++++++++++------------
sci-libs/vtk/vtk-9.0.1.ebuild | 8 ++++----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sci-libs/vtk/vtk-8.2.0-r4.ebuild b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
index 2051e4d46bd..2cfd6476f0a 100644
--- a/sci-libs/vtk/vtk-8.2.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
@@ -80,7 +80,7 @@ RDEPEND="
mpi? (
virtual/mpi[cxx,romio]
$(python_gen_cond_dep '
- python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
')
)
mysql? ( dev-db/mysql-connector-c )
@@ -90,7 +90,7 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/sip:5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip:5[${PYTHON_USEDEP}]
')
)
qt5? (
@@ -101,7 +101,7 @@ RDEPEND="
dev-qt/qtsql:5
dev-qt/qtx11extras:5
$(python_gen_cond_dep '
- python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
')
)
R? ( dev-lang/R )
@@ -112,14 +112,14 @@ RDEPEND="
web? (
${WEBAPP_DEPEND}
$(python_gen_cond_dep '
- dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
- dev-python/constantly[${PYTHON_MULTI_USEDEP}]
- dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
- dev-python/incremental[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- dev-python/twisted[${PYTHON_MULTI_USEDEP}]
- dev-python/txaio[${PYTHON_MULTI_USEDEP}]
- dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+ dev-python/autobahn[${PYTHON_USEDEP}]
+ dev-python/constantly[${PYTHON_USEDEP}]
+ dev-python/hyperlink[${PYTHON_USEDEP}]
+ dev-python/incremental[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/txaio[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
')
)
"
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
index fde829fd737..6e0717f814c 100644
--- a/sci-libs/vtk/vtk-9.0.1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -7,7 +7,7 @@ EAPI=7
# - add USE flag for remote modules? Those modules can be downloaded
# properly before building.
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
@@ -107,9 +107,9 @@ RDEPEND="
web? ( ${WEBAPP_DEPEND} )
$(python_gen_cond_dep '
python? (
- boost? (
dev-libs/boost:=[mpi?,python?,${PYTHON_MULTI_USEDEP}] )
- gdal? ( sci-libs/gdal:=[python?,${PYTHON_MULTI_USEDEP}]
)
- mpi? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ boost? (
dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
+ gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
+ mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
)
')
"
