From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 286FB1581B9 for ; Fri, 03 Oct 2025 01:09:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8482434173F for ; Fri, 03 Oct 2025 00:42:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7C1EE1104A0; Fri, 03 Oct 2025 00:42:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 71B0E1104A0 for ; Fri, 03 Oct 2025 00:42:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6B4E341540 for ; Fri, 03 Oct 2025 00:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB44F3A83 for ; Fri, 03 Oct 2025 00:41:42 +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: <1759451669.688b8ac75eb520b8bd33433eef7deeff43b03042.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-1.0.2.ebuild media-gfx/freecad/freecad-9999.ebuild X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 688b8ac75eb520b8bd33433eef7deeff43b03042 X-VCS-Branch: master Date: Fri, 03 Oct 2025 00:41:42 +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: c2d74cb7-622d-45a5-8f9f-35e428d50c3b X-Archives-Hash: a88b09dac8575f206c9451091c4629a8 commit: 688b8ac75eb520b8bd33433eef7deeff43b03042 Author: Paul Zander gmail com> AuthorDate: Thu Aug 28 14:23:59 2025 +0000 Commit: Sam James gentoo 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 gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43984 Signed-off-by: Sam James 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