commit:     acca9d04991575dad5d9930110e6ed3ec199d859
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec  4 11:06:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 21:52:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acca9d04

media-gfx/freecad: port changes from v0.19 to live ebuild

Switch a cmake option, to allow proper configuration, if both,
sci-libs/oce and sci-libs/opencascade are being installed.
This allow to further simplify opencascade related logic.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23179
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/freecad/freecad-9999.ebuild | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/media-gfx/freecad/freecad-9999.ebuild 
b/media-gfx/freecad/freecad-9999.ebuild
index a4a2fa3acc6c..2852f295c8e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -234,17 +234,6 @@ src_configure() {
                # Use the version of shiboken2 that matches the selected python 
version
                -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
                -DPython3_EXECUTABLE=${PYTHON}
-
-               -DOCCT_CMAKE_FALLBACK=ON                                # don't 
use occt-config which isn't included in opencascade for Gentoo
-       )
-
-       # bug https://bugs.gentoo.org/788274
-       local OCC_P=$(best_version sci-libs/opencascade[vtk])
-       OCC_P=${OCC_P#sci-libs/}
-       OCC_P=${OCC_P%-r*}
-       mycmakeargs+=(
-               -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-               -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
        )
 
        if use debug; then

Reply via email to