gentoo auto-resync : 27:09:2023 - 11:30:42

4 files changed, 2 insertions, 16 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index c1d36b13fe4f..e0289f92fae2 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 8fec05355f51..139b2e218725 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,6 +1,5 @@
 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 AUX stellarium-0.22.2-ccache.patch 340 BLAKE2B 0365157d357d55d321b297a61911dd52e7230faa9a4460c1373543e0e6021a2651ddff15457e35c966ee207db56fe4ba0cdc2dc4f9cba2255a8be9c75b2cc02b SHA512 62aa2767f02602b787560c48fa72de3c9d7ed09529abfa60bd7f11651913ea5ecabfa2ed1087a0aae16ec5b6a7f8706956d641a11fd7e29133f69041492a51b8
-AUX stellarium-0.23.3-ccache.patch 348 BLAKE2B cdd40904cdaffcd437e1c2c8a5e396870cfb5fb5c81cd8b8998864b382c0ec47291b85b4d2c168220e03ee4a8cf668ade3bcdcf6587587e53f960ad81cc2282a SHA512 a60e428e48d6a9a71f29871c0869b4af02f1285cd125de409f4cd4830df166c861b6999dd3faf45522016aa52003de3c45052170e31503b441b11fa6b6faa1c1
 DIST indilib-1.8.5.tar.gz 2122866 BLAKE2B 203b6c78664aaf3f87b7f697b76544e6ed0fa6db8ac0fe43e6ebcf00de404e96a49b8cd7f8b0be2e4ff5c7f902b3e34177a244a4a49069887f11d28aea073620 SHA512 4c583f7ff0d96d787c7d035e23074f42db3f836ec74a0a7a1595574ae2d32d56234b16abddabacaf9bd5a10cb88c6c37994aafcef86d65a665b2bceae87446f9
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
@@ -25,5 +24,5 @@ DIST stellarium_user_guide-23.3-1.pdf 32929394 BLAKE2B 0d4c1c4a667d963981dc7625c
 DIST stellarium_user_guide-23.3-1.pdf.asc 313 BLAKE2B 8e976d2528bfa3b35761c968da5970ce3b76694a1c9980f90dcd51e7f55b9f34fbf778acb6c0999c544787382274ff747edacaf23e685a6b0ac2d75170296132 SHA512 be300a11072b17df4e0ecd7e1fd25193e23e0214ccfee3e1748461732f7065a9c2c7c38bfaf838607204b0f7b1bda4917ac5973d6ff081718f1ed7cd12f29c7b
 EBUILD stellarium-23.1.ebuild 5625 BLAKE2B f921a0805b88b3b932532aec76f75776308800d1bcf2f77daa6cd82f5b760d7151b562fee1e8e0e8e6e1f4a8bd9ada0b1dc0599a2be0f9defc0660720bbe4e58 SHA512 fe18193f9ca5e8b2f646504e96c66e2a67ddc25219a4d1dd6618d75258cb8574f84f3c4c7f54f6f733b7d2e7a6d643151a7b2aedf2269bc93a5bac0977e1af38
 EBUILD stellarium-23.2-r1.ebuild 5854 BLAKE2B 501f48ffe4b3bc4a8653522b7a4b69707fe8d5555bdbaed163737b56bac5066a8d9d6b2fe94f42b453a5912a67c1515ff32e96527b4b01e351393aa55025aa9f SHA512 b3d6c02e5ea0f9c2ba6ca0cb761a0a316b7f857a018a652ee2f6f9178f664302dcf305ed43373201c49f2ad7ca28b94713074dda06cc5a4bf939957ddbe374ed
-EBUILD stellarium-23.3.ebuild 5854 BLAKE2B 56dff4349cbea894df8f1538211535f71bd5d734be91ca6616fd45e0efb8b98f7b411ac6f5c3243eb5cd06960d014c429028f9698dba9882f46dde5375c83c84 SHA512 24455420260662ae7c8459579081e25c0b18486f778e057162938bb30fba20609d43562ed3c4cc0d914b24a47460b29fc9c00b01d20ef595f3dacabd52267de8
+EBUILD stellarium-23.3.ebuild 5830 BLAKE2B 5bd89768da12ac9e1922560cd3842437a273e1465f2fd3b2dfc529cca3700159bd078a9c629fb8f3eda98fcc883a5cf04c043b49fb87c07a6b835a5424d2a6fe SHA512 7302a1b69afc8eebb43de37ce518158c5ff6c93d9dc6914e8ce8901f7ac0bc46b62d05d6223305ce22bd3cf3b0cc1d3e10db2e03dc888794cfb5de1443b924b5
 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch
deleted file mode 100644
index e71c9f7f90ea..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't automagically use ccache https://bugs.gentoo.org/847439
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -196,7 +196,7 @@ IF(OPENGL_DEBUG_LOGGING)
- ENDIF()

- 

- # Use ccache if possible

--IF(NOT WIN32)

-+IF(FALSE)

-      FIND_PROGRAM(CCACHE_PROGRAM ccache)

-      IF(CCACHE_PROGRAM)

-           MESSAGE(STATUS "Found ccache ${CCACHE_PROGRAM}")

diff --git a/sci-astronomy/stellarium/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-23.3.ebuild
index 3df848b94c87..0287f1b313ff 100644
--- a/sci-astronomy/stellarium/stellarium-23.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-23.3.ebuild
@@ -101,7 +101,6 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-	"${FILESDIR}/stellarium-0.23.3-ccache.patch"
 )
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/stellarium.asc
@@ -138,6 +137,7 @@ src_configure() {
 	filter-lto # https://bugs.gentoo.org/862249
 
 	local mycmakeargs=(
+		-DCCACHE_PROGRAM=no
 		-DCPM_LOCAL_PACKAGES_ONLY=yes
 		-DENABLE_GPS="$(usex gps)"
 		-DENABLE_MEDIA="$(usex media)"