commit: 497ca726b40aecc0d3187bc69044b40b2f22ede8
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 17:08:44 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 15 17:11:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497ca726
sci-libs/vtk: correct dep on gdal
gdal-3.5.0 now uses python-single-r1, we have
to correct the dependency here to avoid a very
confusing blocker
Correct the dep on jpeg while we are at it, following
the deprecation of the virtual
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/vtk/{vtk-9.1.0.ebuild => vtk-9.1.0-r1.ebuild} | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0-r1.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.1.0.ebuild
rename to sci-libs/vtk/vtk-9.1.0-r1.ebuild
index 9a6ebbdaac51..a6ac2ea19bcb 100644
--- a/sci-libs/vtk/vtk-9.1.0.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r1.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
<sci-libs/hdf5-1.12:=[mpi=]
sci-libs/netcdf:=[mpi=]
sys-libs/zlib
- virtual/jpeg
+ media-libs/libjpeg-turbo
all-modules? ( sci-geosciences/liblas[gdal] )
boost? ( dev-libs/boost:=[mpi?] )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
@@ -114,13 +114,13 @@ RDEPEND="
x11-libs/libXext
)
web? ( ${WEBAPP_DEPEND} )
- $(python_gen_cond_dep '
- python? (
+ python? (
+ $(python_gen_cond_dep '
boost? (
dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
- gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
- )
- ')
+ ')
+ gdal? ( sci-libs/gdal:=[python?,${PYTHON_SINGLE_USEDEP}] )
+ )
"
DEPEND="
