commit: 0d7bfedb0301cadcf0e96cec0eb182ab1f471553 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Mon Jan 2 07:57:00 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 4 05:48:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7bfedb
sci-libs/opencascade: simplify vtk logic (v7.6.3) Backport patch from v7.7.0 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28932 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/opencascade/opencascade-7.6.3-r1.ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild index 2090e9b45195..82352ba3e3a2 100644 --- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild @@ -132,17 +132,14 @@ src_configure() { fi if use vtk; then + local vtk_ver=$(best_version "sci-libs/vtk") + vtk_ver=${vtk_ver#sci-libs/vtk-} + vtk_ver=$(ver_cut 1-2 ${vtk_ver}) mycmakeargs+=( -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) ) - if has_version ">=sci-libs/vtk-9.2.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) - elif has_version ">=sci-libs/vtk-9.1.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) - elif has_version ">=sci-libs/vtk-9.0.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) - fi fi cmake_src_configure
