From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- media-gfx/freecad/freecad-9999.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'media-gfx/freecad/freecad-9999.ebuild') diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 8b29013224e1..490b29d07939 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -224,6 +224,9 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON @@ -236,6 +239,7 @@ src_configure() { # 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} -- cgit v1.2.3