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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AC611382C5 for ; Thu, 6 May 2021 21:45:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 410E3E07A7; Thu, 6 May 2021 21:45:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BF0EE07A7 for ; Thu, 6 May 2021 21:45:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC721340D01 for ; Thu, 6 May 2021 21:45:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF32759C for ; Thu, 6 May 2021 21:45:20 +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: <1620337362.d8e72a84aebb1ac6094257935e5c5a589da1870c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/freecad-0.19.2.ebuild X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d8e72a84aebb1ac6094257935e5c5a589da1870c X-VCS-Branch: master Date: Thu, 6 May 2021 21:45:20 +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: 6eff07fa-9ee8-41c0-92ba-09807896f609 X-Archives-Hash: 11097133239eb79a0bb6c7290b4b298c commit: d8e72a84aebb1ac6094257935e5c5a589da1870c Author: Bernd Waibel posteo net> AuthorDate: Thu May 6 21:37:40 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 6 21:42:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e72a84 media-gfx/freecad: find opencascade-7.5 Correctly find sci-libs/opencascade-7.5.1 header and library locations. Closes: https://bugs.gentoo.org/788274 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/20708 Signed-off-by: Sam James gentoo.org> media-gfx/freecad/freecad-0.19.2.ebuild | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild index f2d55fb7b13..f7125e38c85 100644 --- a/media-gfx/freecad/freecad-0.19.2.ebuild +++ b/media-gfx/freecad/freecad-0.19.2.ebuild @@ -222,11 +222,22 @@ src_configure() { # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) + if has_version ">=sci-libs/opencascade-7.5"; then + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1 + ) + else + #