gentoo auto-resync : 05:01:2024 - 02:02:12

5 files changed, 59 insertions, 3 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 2edc7635cb30..376d61c29015 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 8723719ed0c8..6c3432821214 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.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b15bfcb433b1c586dab100839bba49867c374669e27f9677c82f16c727b939dec28e95fbb42278b9661935aac3cc23fe6b8ad8b64901a029 SHA512 6f2359f8fbf1fc915909fe404300e016d4f8d55f3b0f59dbdbf10e6376c38c412de23394c2138fb56666be059221c60a8b488a6965f1b6be19e834a6fc624b53
 AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307f79f923dffffae1b47af55643b64d2776c075ad237530d0a0a074ffd62a18ce021d72fc3c4b4126e2880683c75648908 SHA512 8526095e8716d4885524483e6fe6b6f2ba7edf29bc7bd30602f37aebd5bafdc3a299e5890d3844fc1d573c69244d5415f7d02791e6ac73f9e421f88987bce2dd
+AUX openrct2-0.4.7-musl.patch 1834 BLAKE2B f2d939c659f0fedef6f7a0078d745e3163e488adc71f3ce1cb2dc0ec52ead5e887d8ad35417468d5c11e88d223fb0c9d180685d0d30c45ddc123000c34731674 SHA512 1004b8a8660e27c86872e7245da7c0bc93fc3547bb95d8d6d017ae9c4c296577f4401bc6721aeecd6732ecdb7dd998c96576074679238f421bfd77faec4bb3cb
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.4.7.tar.gz 21677290 BLAKE2B 934f26bd2117f4c5be1a20e5eff10a07a260a5f01d1df2f95f2a4b66adf603868e5ea33a88398857f35851575c38f28e6c98b7912ebe0cc3c97b745cbb280b02 SHA512 704007298d35b90cba592719649d066a2e8e546044f39ca0edddebd4c9e8e864ef8d1314e3bc5eaadf38fb2df54d9cb33ee9cb1cba3defd099aa34ea2a985a90
@@ -9,6 +10,6 @@ DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23
 DIST openrct2-opensound-1.0.3.zip 3820122 BLAKE2B 74265800595e36ac943bf2ee5d9c8f6cb3bbd5be3713d9590cb81faac4a75154dfbf9806b1b55e9c2426c84e3cf313a6271fc378ebfd4fa94821683157be5470 SHA512 89784703fb2cda67b5440e06381b44e59ce4a42a88004761c76f0c2b23f78be3692e5fe5e2c8655943e04f7a45e479cfcbc2c3998202222dab16a092b9a73195
 DIST openrct2-replays-0.0.78.zip 1829988 BLAKE2B cf11a05f6ba5a2808cd4c016ac3c7537a0b49b67fd5ef5ab705aebd4ddc64dd4a82ea12d9c082fe66cebb57437c0d81052bcddfb94a0c9f7aab024a82c2e2ca8 SHA512 c6ff18c2206192ed4fb56535732137229f9bced96da00037d691bc64dcdb102cffe37f180054319e7c8ef8dbbd7de49792c3a7e845199fa180612ed97a149b32
 DIST openrct2-title-sequences-0.4.6.zip 2547725 BLAKE2B 5f7b36cd1372106923000775307ea7ff8c142c3b1d026d84b86f255a629b0a2ac16a682300999789229a8833d4c7327c858c04710ecddfb97af1858ff121a5c4 SHA512 bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da
-EBUILD openrct2-0.4.7.ebuild 4571 BLAKE2B 7e0b4049cc8c21668fc694300ef0851d4550ba3f1793f1572c059bf0647c88c6c8081e4d7cf657d3f12be35e9448244b811e87eecf3ea86183ff7687c4b85521 SHA512 ce0fc002f7133507680d8a14a8851e6ba4fae445f2f5cfebb54b7d56616808bfffbcf04139cca0889201ea6deb21b13bcd8b16324ffb8f5049072c73f3933261
-EBUILD openrct2-9999.ebuild 4510 BLAKE2B 8764661ba97fac2308a0807815b8fc29fe0e8069c7b44144dbb3e4d799c3eaaf47b274c1515a9546f2cf96a546cae5c10b5a474cc1f09703b2817b9a427e374e SHA512 8c794a7d5c17a13e7ee7c16ec6f7e9a3cf50de1e71aad0da76f0e1fef288363e8098e7eeb36b3eeae50230cbcd1ca00e5cf8fd4ea486d38df9990bd566f4ed54
+EBUILD openrct2-0.4.7.ebuild 4609 BLAKE2B 4c3afb98964a88fdb5aea1dd4aa92700146e250a6cd004adcfa0d6b996f0b68c72956435639a53a8669982779b52ce9154fd789712116f9c5aba02641ec34de5 SHA512 4fa2ae251e94980c502b0064ae69ab442c4094ec7504b9e94ff5b98b6b8aed528fbbe15bf97b1611f922888f43fa0e28f4d3cfbaa3e8d4e132780154acde55fd
+EBUILD openrct2-9999.ebuild 4498 BLAKE2B ad2296a3ce88de5aa7044b34f6a3626f11d16140e5c1cd295001ad8fb6af5733a1c1bdd23a812bad84342e9dd80e04add8b24848e1f12b91e62997a5b569022c SHA512 6e37e550825b010ca22dba25953431a7d849b2092fe1547fe55872c43c57973e5c45d13b0217cd877a7bf03aff0eda9e4dea4bc993c84b860fc9328b321fe0dd
 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch b/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch
new file mode 100644
index 000000000000..1096bc018ff2
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch
@@ -0,0 +1,55 @@
+From 010c19ba61a3180dab6350aadc578414ad0c0051 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Mon, 1 Jan 2024 20:34:19 +0100
+Subject: [PATCH 1/2] src/openrct2/core/FileStream.cpp: drop ftello64, fseeko64
+
+The static usage definition of ftello64 and friends is not correct.
+While this currently works on glibc, this breaks on musl, as musl
+already is LFS aware. The solution is to drop this and add instead
+'-D_FILE_OFFSET_BITS=64' to the build system.
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ src/openrct2/core/FileStream.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/openrct2/core/FileStream.cpp b/src/openrct2/core/FileStream.cpp
+index 90a7f7a366cc..6fd7b7b1b42c 100644
+--- a/src/openrct2/core/FileStream.cpp
++++ b/src/openrct2/core/FileStream.cpp
+@@ -21,11 +21,6 @@
+ #    include <io.h>
+ #endif
+ 
+-#if defined(__linux__) && !defined(__ANDROID__)
+-#    define ftello ftello64
+-#    define fseeko fseeko64
+-#endif
+-
+ #ifdef _MSC_VER
+ #    define ftello _ftelli64
+ #    define fseeko _fseeki64
+
+From 7c638c786527a26a3e83d155ca8ff4d55f01347f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Mon, 1 Jan 2024 20:23:24 +0100
+Subject: [PATCH 2/2] CMakeLists.txt: add D_FILE_OFFSET_BITS=64
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ src/openrct2/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt
+index 367939c9622c..55882a1097d3 100644
+--- a/src/openrct2/CMakeLists.txt
++++ b/src/openrct2/CMakeLists.txt
+@@ -265,3 +265,7 @@ else ()
+     # Dummy target to ease invocation
+     add_custom_target(${PROJECT_NAME}-headers-check)
+ endif ()
++
++if (UNIX)
++    add_definitions(-D_FILE_OFFSET_BITS=64)
++endif ()
diff --git a/games-simulation/openrct2/openrct2-0.4.7.ebuild b/games-simulation/openrct2/openrct2-0.4.7.ebuild
index 46212d45c869..068fbd3cb2e5 100644
--- a/games-simulation/openrct2/openrct2-0.4.7.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.7.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.7-musl.patch"
 )
 
 src_unpack() {
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 79064ae23585..b38f1cc2b430 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -32,7 +32,6 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 
 COMMON_DEPEND="