From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA31B15800F for ; Wed, 4 Jan 2023 05:50:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7179E0636; Wed, 4 Jan 2023 05:50:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 925F4E03DF for ; Wed, 4 Jan 2023 05:50:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CBD0340E91 for ; Wed, 4 Jan 2023 05:50:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCF1F7FC for ; Wed, 4 Jan 2023 05:50:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672811291.0d7bfedb0301cadcf0e96cec0eb182ab1f471553.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-7.6.3-r1.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0d7bfedb0301cadcf0e96cec0eb182ab1f471553 X-VCS-Branch: master Date: Wed, 4 Jan 2023 05:50:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b85d1bdb-468b-4a39-81e3-3b03d6c6806f X-Archives-Hash: 15909787610a64a49ea2002840ad31c0 commit: 0d7bfedb0301cadcf0e96cec0eb182ab1f471553 Author: Bernd Waibel posteo net> AuthorDate: Mon Jan 2 07:57:00 2023 +0000 Commit: Sam James gentoo 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 posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28932 Signed-off-by: Sam James 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