gentoo auto-resync : 09:08:2023 - 15:30:17

3 files changed, 14 insertions, 2 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f111d3646fb5..a7619698b308 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -3,11 +3,12 @@ AUX freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 701 BLAKE2B 963afb463ac
 AUX freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch 746 BLAKE2B 7cba7847956b9f6dbb4161c2bf70a72790cab98a1110c98ac34160c9dd5005b87ff9a2c71e42b7c4523f3fff9cc428ca0ad3b8f61e13b73d1b3bfdd142f5794f SHA512 08d3a8b849eed184b557b8e918c77e294daa40dad81944e19f0ce0c3a8477910ef6cb426e83a986d03050f1a1bfd935b5efbc27146704930d48ff65cd73389db
 AUX freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch 3622 BLAKE2B fb68ca931c5fa67873d5a60a8b175d6481c572e233974f8b59545f05aef13ced9baf576a51f4aba89020ecb794f39431bca5e8e081536db34f3a15737a11e374 SHA512 ef2ea194176ff10fdf71b7335a84ab97dead7093f9f46b562e8e659ae793d8d7a1e204cdc0be253d3fc4402a88caf95694f1249c38908f150263a00ec37150c7
 AUX freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch 703 BLAKE2B d31431701b8c2d9d47b6cb1dec60c69469972a8200953b123655a212d15fbd36b663395bc0e27ead94bd0d4065f656fc8227d06278839f457a81501c13d50307 SHA512 90b2c1477c2f255d19dea90eb0aacabdfec9ce80bad912db0296565255640d3d5adf9bca45327986ccb702eef669c4204e219d62aa26f4b9017f5220216c1635
+AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516
 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 606 BLAKE2B acef2151a4ddc90a40ae565fe89032d832a8596b9f9c2608b6b8c3e76125b69b9be12db34d72e3646bd76abeae041bb3f0fd33a0933f22174f48095634568dc2 SHA512 f1d830591dc6532d9517e13da00cfc886e70fc57ec84f7a406f68096a683dd4b86909190858e8aba69c4f668dd963d8de3765e8363ce9661718ac873c729f3f6
 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
 EBUILD freecad-0.20.2-r1.ebuild 10408 BLAKE2B 503eb47d56c92d9a95727825366a7b16a03f6df378e6a0fe300bed5300ccce77af5d13c09fb797cc6b0deed46747001ded8f439331e34e373e4bfd5ba59cf74a SHA512 ea4520aeb24c1baa91469b5f2f672d8d52217a31901600a8f3f4dbb9a7dff3faf9724e9dd79c39b36ff08d5a63f8acce6779eb1ebae004f951a5a857df522a8d
 EBUILD freecad-0.20.2-r2.ebuild 10385 BLAKE2B df9d6c357735e35016585e4514a28f3819fff42b9090dda6fc00c3aa41523985fe249e935b858a4bf39b1faf226712b191db62d27ffc77fbf44bc18abe28ca4c SHA512 fc19d0fd6bdcd1abc0dc8f99ced84e39842d4c3f9289a9d5d544da06799aae400f9d91ab607db02bd96e52dd658fba8b70a18fc96114a5b563eba4b6dbc26ff4
 EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb
-EBUILD freecad-9999.ebuild 10296 BLAKE2B b1117309aa0b63862a8ee9c5f0014f5df9a9d03b2ea4f5233e682ee8d428e1d2090dc0e83bf1a2262eea163bc7e98f46273aabd91919627f55b9f089492e886b SHA512 3895e3f9a6b3496a8dadf4f14935942a5be8076157a59366677f8460ccbd159513423eeab2aef5a13c99d3b87bc285f93ae0f28faaac409786c427021a0c554e
+EBUILD freecad-9999.ebuild 10297 BLAKE2B 72093c04c322ceb02759f1e7e1426ca505df0acee9bb2fdd7a47e6de8ac79db76777de0b76c03fb381aaddb94cbc591aa71004a191eb2527e96f752a0331a389 SHA512 250226533db15d27d30d5b3dbbd6b4227a66c0709da20204e403defb878bf2fa512a2ed9feb28a334ae0b22578b9eb30b68f4e73307b3be5fb899008e7748ec2
 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2
diff --git a/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
new file mode 100644
index 000000000000..dddacfb289ef
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ else()
+     option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
+ endif()
+ 
+-if(FREECAD_USE_CCACHE)
++if(OFF)
+     find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+     if(CCACHE_PROGRAM)
+         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ce6c3efe2731..3c44e3745979 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
-	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
 	"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )