commit: febb7b197dd214a577942eddcc0096984ec0b8d3 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Fri Dec 3 23:11:36 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 4 21:52:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febb7b19
media-gfx/freecad: don't fail if oce and occ are both installed Switch a cmake option, to allow proper configuration if both sci-libs/oce and sci-libs/opencascade are installed. This allows to further simplify opencascade related logic. Closes: https://bugs.gentoo.org/827936 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/freecad/freecad-0.19.2-r5.ebuild | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild index df0faac7f980..c9287ed91fa5 100644 --- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild +++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild @@ -223,17 +223,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
