gentoo resync : 22.12.2021

3 files changed, 63 insertions, 5 deletions

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 6ceac3cbcb65..6b78c1ec4922 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8
 AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b211501846e2afb14d9d6617c713e487ffd3ef079c8f75b3113252fbc401da25b53ff6498f01b66bd4e9c1b30c51483b4c32c4ae1b338885966c SHA512 945f00ea986ebcfcaa536a5abf1cab608c96fa211bb839e9d577e969b842eb757307b501740c6015623eb10604f7aa6f7e5c736669cbc46676abe1434296e8ae
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
+AUX openrct2-0.3.5.1-ccache.patch 2459 BLAKE2B 9068bfa1444a71ce76423894ef7b0f615e8b21ace75231a7daa8febcb2e807342302d312b7bc923fcda342845d34bc4d10fe55264fe376db79d7f869cccc6e66 SHA512 821568cddd703eae871541a30aef3586bbd83d6cde722070d99d395c5fb1eaee96e8e79533ebff53ce8490468fc4ca0baab5def998fc5c7c475c87ed4478ccf4
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.3.4.1.tar.gz 14222683 BLAKE2B 170a3beef36f00c1ad7845d8005e0d1e84c9ea4585e650f6bd9bf5ef2cca721b4b274e1a12801d7273a03860eb4c6f564bed9003359f1f4faef7abbf6ab5a028 SHA512 23267ce782d491a042a1733694d4bcdefb9af8a03eb70e0b9f13a464411d238d6c6962dc3cf57275e1641095c4bb859698fd1dae80df5b757a6718d42e5da57f
@@ -12,6 +13,6 @@ DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a0224
 DIST openrct2-replays-0.0.59.zip 3090846 BLAKE2B fbbc808bf3d39a41c3f99d489fb167b7044d0f5c17254599bc4bafd9d43af7bcb76712f643f7d2a6645d30fa98d0ef52bc6fb8ca3c774eba8077e2c62297912f SHA512 6677f2e16380daf925a146925e0f48d41612baf43a0d44f9cff7d1d0786cf3db77afe47cc6237c988c9ffc21fdd9007868a6b92b9cec48d80143a91fccafebb0
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 EBUILD openrct2-0.3.4.1-r1.ebuild 3909 BLAKE2B e44800b080cb0469490f82a7e79dbf18c02f217fcf6c34588eee95f6e14b30a8725cb3277374c2a0052a9f1cd5bb11d4f37c214c690d5494281a02e166e2b7bd SHA512 5f274a1b7056b850906b9e14f2117ca11263c486ae085ba4d47a8c65fdc5feae492f5b6d5adcd2c8b5453f43547af54308e8c7d98ca79803eda36469c916e33c
-EBUILD openrct2-0.3.5.1.ebuild 3911 BLAKE2B 2e474cf3dce7eb7bd631e228cd6cf02839daf02baee449f69e1f3686b3982910d4d99c22d546d42b2aca73692b9106643a56871ee6fb258a9af0e6527ed06aad SHA512 bca69421f0d19a8772904b38d807b67e4165b3b540ddc6b5bb7a5c519b803fd8db05bfca7331fe50e8c4c11e9c2b059b0d4bd200e1f8d52bdf4234f554551628
+EBUILD openrct2-0.3.5.1.ebuild 3951 BLAKE2B b451fb9fb7fb2318f68586fb149e35c18cb3ba7aba3c071f9db1e041512d28e543913f3725f8821daa5e5057b72e5ea80307f990cb7091fad7756ed4f9a28855 SHA512 6781199c96dd9a4b521174005e6aec4d88185e99d8474ab04bbc0cc10919e42c8a0e4580d329112c98ab6c26882db198cfcbba42e0d8f88ef86fff39c5a89ae9
 EBUILD openrct2-9999.ebuild 3865 BLAKE2B 058cdf89f35f5a5447f4b083fa53c7967e6673780ca5de7c630d62f2a12d3eb634e9d1d3cd8561c3479ca0d8e5c26465fcdbfa7ffeae63a387523627081716a6 SHA512 0e7467c7acaf5a4706afe365d56ff9ae1d62293cf6679dd1be20da82dce493bcfdefb135bbb35a8862ff12d9b1a0687c5aad05016cb4bc118c590e603ec198d5
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
new file mode 100644
index 000000000000..97a529c6a8e2
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
@@ -0,0 +1,58 @@
+From cb6d7418c53e10bd4120891f6a2312d3ef839ca8 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Sun, 12 Dec 2021 23:04:58 +0100
+Subject: [PATCH] CMakeLists.txt: update CCache handling (#16185)
+
+This PR updated slightly the handling of CCache. With the current
+implementation, when CCache is not being installed, CMake will complain,
+that OPENRCT2_USE_CCACHE is not set.
+
+This logic is slightly updated, so the option OPENRCT2_USE_CCACHE is always
+being available and when this option is enabled (default ON), it will
+search for CCache and warn, if it's not found.
+
+The idea behind is, as in Gentoo, we never let CCache be used by the
+package itself, instead, we enabled it globally. But this the old logic,
+on systems, which don't have CCache installed, it will complain about
+OPENRCT2_USE_CCACHE not being used, but we have to make sure, OpenRCT2
+will never use by itself CCache and this message will be gone..
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ CMakeLists.txt | 23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d202cf5a9b8..566f3a8a9688 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,16 +8,19 @@ endif()
+ # if it is available
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+-find_package(CCache)
+-
+-if (CCache_FOUND)
+-    option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
+-    if (OPENRCT2_USE_CCACHE)
+-        # Use e.g. "ccache clang++" instead of "clang++"
+-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
+-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
+-    endif (OPENRCT2_USE_CCACHE)
+-endif (CCache_FOUND)
++option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
++
++if (OPENRCT2_USE_CCACHE)
++    find_package(CCache)
++
++    if (CCache_FOUND)
++         # Use e.g. "ccache clang++" instead of "clang++"
++         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
++         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
++    else()
++        message("Usage of CCache was enabled, but CCache was not found, so CCache is not being enabled.")
++    endif()
++endif (OPENRCT2_USE_CCACHE)
+ 
+ if (APPLE)
+     execute_process(COMMAND /usr/bin/uname -m OUTPUT_VARIABLE SYSTEM_MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
index af9c013eb4ff..6563d4bf797d 100644
--- a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
@@ -21,11 +21,13 @@ SRC_URI="
 	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
 	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
 "
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/icu:=
@@ -66,13 +68,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.3.5.1-ccache.patch"
 )
 
 src_unpack() {