commit: 688b8ac75eb520b8bd33433eef7deeff43b03042 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Aug 28 14:23:59 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 00:34:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688b8ac7
media-gfx/freecad: use die instead of rm -f, use ESYSROOT We don't checkout src/CXX from git. Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43984 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/freecad/freecad-1.0.2.ebuild | 8 +++++--- media-gfx/freecad/freecad-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/media-gfx/freecad/freecad-1.0.2.ebuild b/media-gfx/freecad/freecad-1.0.2.ebuild index 714a8404cc18..b2646da2b973 100644 --- a/media-gfx/freecad/freecad-1.0.2.ebuild +++ b/media-gfx/freecad/freecad-1.0.2.ebuild @@ -269,7 +269,9 @@ src_prepare() { sed -e 's#pcl/point_traits.h#pcl/type_traits.h#g' -i src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp || die # removed bundled pycxx - rm -rf src/CXX + if [[ ${PV} != *9999* ]]; then + rm -r src/CXX || die "remove bundled pycxx" + fi cmake_src_prepare } @@ -294,8 +296,8 @@ src_configure() { -DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command -DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program - -DPYCXX_INCLUDE_DIR="${EPREFIX}/usr/include/${PYTHON_SINGLE_TARGET/_/.}" - -DPYCXX_SOURCE_DIR="${EPREFIX}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX" + -DPYCXX_INCLUDE_DIR="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}" + -DPYCXX_SOURCE_DIR="${ESYSROOT}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX" -DBUILD_DESIGNER_PLUGIN=$(usex designer) -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 8c3377ce97c9..b5fa459de58f 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -270,7 +270,9 @@ src_prepare() { -i src/Mod/Fem/femguiutils/data_extraction.py || die # removed bundled pycxx - rm -rf src/CXX + if [[ ${PV} != *9999* ]]; then + rm -r src/CXX || die "remove bundled pycxx" + fi cmake_src_prepare } @@ -295,8 +297,8 @@ src_configure() { -DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command -DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program - -DPYCXX_INCLUDE_DIR="${EPREFIX}/usr/include/${PYTHON_SINGLE_TARGET/_/.}" - -DPYCXX_SOURCE_DIR="${EPREFIX}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX" + -DPYCXX_INCLUDE_DIR="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}" + -DPYCXX_SOURCE_DIR="${ESYSROOT}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX" -DBUILD_DESIGNER_PLUGIN=$(usex designer) -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
