gentoo auto-resync : 13:08:2024 - 11:06:03

7 files changed, 200 insertions, 8 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index ab561284546f..6533e5e2eade 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 8a6d0cf486fc..cf8f2f69e75e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,6 +2,6 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2d
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.3.19.tar.bz2 8935152 BLAKE2B cc4ae515278ced52186683ae44b0ebf0aba9569fac12c5a5646b2a420663154651edcbf7eba18a040127f2d90dbffa1f48000529e8adc944d22fb314ce53c091 SHA512 ad5a4dd455a92bd9032c0f01084c0c114e4a91e60d53f200a754e54e1f8e08fd8e9008ea9f97f69410ee842fdc6c2210091d4ac5e5c6da6ba19f47e22438d207
-EBUILD flightgear-2020.3.19.ebuild 4335 BLAKE2B ddeec3b3705f0c6441818efb2b1a167338f5346ead4bad2eedc5c95439d30e18ddd7eafad4ff1ee901dfc31c6c6d0dcb009644acbd643f1a18feb0cc3999402b SHA512 9003e14d6e44d862449909b5ce908697a1c1d44f8d6bbf08c245f6b10318437469bbba9d15169f176d1cabcb74f1000c994441ec34b7685d3b424d67d63881cf
-EBUILD flightgear-9999.ebuild 4451 BLAKE2B ec070f97f3c90a2422af08b9eb575629a4197c3a0bde6a9321e831ff715b69dfa282b9f79b11cb4699a668cf29a6716cda8944381083f5b250ece89e9017a3f4 SHA512 638239c7608693aadf71e6cfcc6ccf4baa62f85c9bb628ddbe71945c28f7c7661fb6bec142e61a8975e47958247471653a5b995d0f2e902f377c79533c18625c
+EBUILD flightgear-2020.3.19.ebuild 4495 BLAKE2B 5b7e62d71bf5c4f3769e7fe12a578a003a7dabd0b3fe9f7398fcb366d2285421c6f012487666d830e44aa7ccf5b71816e89c57e849999984f31a22ea9cfa9400 SHA512 e620a25cc920fc244a172db151361b0bf01f96420e797ec6c8f6a2f8fab54ea9d274d864dec7afba0814104e444636a552ec5c08035769dad7685c15d1b48f8a
+EBUILD flightgear-9999.ebuild 4575 BLAKE2B 5c7e4c47c347d3a39c710b62bd55ceadd13112fc4a26cb61ead0533a48f3064efd54f59bcb5113fb82f90200118fa1cf45e54434dd2db1ab3ce2abdb6cf6fa65 SHA512 328c0651e4077865b7af4c733e3d0c624403ca2e8fd696c9bdc7570e704bc5d7a945f15649e67a33799609d4bcdf64b241ba99ba1dbc811564c77aee87fd6145
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/flightgear-2020.3.19.ebuild b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
index fffe97177e82..9d6373a47ddb 100644
--- a/games-simulation/flightgear/flightgear-2020.3.19.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
@@ -79,6 +79,11 @@ pkg_setup() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch, -Werror=odr
+	# https://bugs.gentoo.org/859217
+	# https://sourceforge.net/p/flightgear/codetickets/2908/
+	filter-lto
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 		-DENABLE_AUTOTESTING=OFF
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index b35e56b521a8..720c1042bbd6 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs git-r3
+inherit cmake flag-o-matic toolchain-funcs git-r3
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
-	git://mapserver.flightgear.org/${PN}"
+EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
 EGIT_BRANCH="next"
 
 LICENSE="GPL-2"
@@ -81,6 +80,11 @@ pkg_setup() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch, -Werror=odr
+	# https://bugs.gentoo.org/859217
+	# https://sourceforge.net/p/flightgear/codetickets/2908/
+	filter-lto
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 		-DENABLE_AUTOTESTING=OFF
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index d46e74a3377e..d4566d03919f 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,12 +4,15 @@ AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.4.12.tar.gz 21881586 BLAKE2B 4832f55883fa30e16c4d06231516329143e02e440dfc0d48c66eec162016c619cdaf8b421a891506276a3dd53def76b9c1fa97b97252b3683c5ceb30f4fd3c64 SHA512 dae0e4e42306853883c17523b3c814775ff782b1e50683aa72a278d121132610336f9307299f86dfdc27310b2f8403fff4d34a68a8814f6a7bba88646d587922
+DIST openrct2-0.4.13.tar.gz 21879688 BLAKE2B bd578f2a303331697ee0f5c7c9bb142a805806a7e5c057933eb3382d3b6d86a555c8b361841c33024c957763fd0fbebdabf80cc360b4903054ca91fb9a65fc85 SHA512 043f1b1e8b60b1a939e3c0e63db3690dde602ab87adec1d187d2563c514adbadb0c0a2384ec47a56b8a9adf03c35d6b80a5a71032b0084ec55656c88aa172daf
 DIST openrct2-objects-1.4.6.zip 5411575 BLAKE2B cb570d88815f82231340aa012e632fd669ac336f6d79227f602d9e702c78944dbeb805a8fb468874c7e67b0b4d6ed0a21559ed81a5e065d08ae35d1133d67f90 SHA512 d739ab2416b45b95dbf13a148bb4e8687bbf4c228429c455a35ff55235eb21da743ed31dbb133e2dde07fc4c4fe250ecee7a15ec7fbb6708fb6f222f9f69ae42
+DIST openrct2-objects-1.4.7.zip 5411765 BLAKE2B 0ac59fbee6d22f832f52f03ad6e4e15bd60ba1955fc7a8f9deaf8fd114483cfdf20cd8ced42494716bf7a1d8dbeb7969cb1fa3852ae11e9afb0819c90ae6d389 SHA512 54f6872502333dc4063d0eca6d9e2cb6f7e6c7593be014a3c17df3b9a6dfa354b50c995953fb56973db8cef3733eedb3b64e680fe136724328156c1c590d9ae7
 DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
 DIST openrct2-openmusic-1.6.zip 42921141 BLAKE2B fff3ac6d944ed2021645c064de3daf88c11930bf8817e9c8620cfa73f2da076745dd5b5da36b616c8ee7b2ee0272228a88e264bf1ce948509dc90d77a7a87d5d SHA512 88e3242da45f372e06de04e58d03fc3d256b1485467a25a3f8878c03eb2570eea2c787a9e0416c1b040c15886723ced1379d762f941a23e4bd2fce81416123b0
 DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f03971b8a1d6f4280d008d5bf3e86b5d2cb46001a04edddeeb04a06a37801c3afbd35926beb54fe5a72c7fa88b50d0a0b18535 SHA512 fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a
 DIST openrct2-replays-0.0.79.zip 1934633 BLAKE2B 4b5c4d96be91055ceff8f5f5f1a894cc2544659983e61ac2f42d655229357b6a368553c1ee45d147cb360c8d54bb0ca78b61a9716efa8d1d7f37cd7c5ba50fa7 SHA512 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2
 DIST openrct2-title-sequences-0.4.6.zip 2547725 BLAKE2B 5f7b36cd1372106923000775307ea7ff8c142c3b1d026d84b86f255a629b0a2ac16a682300999789229a8833d4c7327c858c04710ecddfb97af1858ff121a5c4 SHA512 bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da
 EBUILD openrct2-0.4.12.ebuild 4569 BLAKE2B fc11671153b6d1ade624cc82f708a34b460e3ec28f6316af637128f57fd2ddf894c07223cb3a715260cd437f65a8b3dbd669e83b5d3c672a8351c6b57b6423af SHA512 69e60294b7d61db5ef98e315ab389660c393f55e9bb5b0d4d30e0e37a4fbe1a9eb3c08166b36d2591e63ecaf95b11a9fbd741f3edd1f5729de609a4ad73afdef
-EBUILD openrct2-9999.ebuild 4497 BLAKE2B 124c2630c8994638286375b3fc566ca3d6e50a821423f3e68bac6bf373811026edeed470f098fb4b6b8a78d773d9195a7800decf1680498937aefb1cc6027ac0 SHA512 8223319acd4db8c593188226c252d2a8a6a553853cff55c7e232eb4c10a9e3d90b98ae1ce2a153eb15495e33b5a873ff0a3510e87f8806009d2a565b47dd495b
+EBUILD openrct2-0.4.13.ebuild 4573 BLAKE2B a82503ff4175f07d04f5cea306508b49e54229fa4ab67b05744178527c0092c52c12440a54406cc00f9c2c293a6a7aacf57bc9ce4d086c31001783d1ce7e1576 SHA512 504ce90f79f635230451e72111cb6effad09a1ee4b8b3cada293d13b2728a405433e6b670aa633f994c17e6764d466daffeb9982408b4176bc7f8a5be6af0a2c
+EBUILD openrct2-9999.ebuild 4497 BLAKE2B 28cca23ad75cdaa30c7f0585858315ea8b5e07b4d1a62059c14a91a26673b44ef4a5dd14170b8a7723f0dd3c5058bce87ad8cb02aac4e2ba357e0b4071f60083 SHA512 0a079291d1e01ffba7c4880ced4e7f4131d92ad313c9e0e51ebe07c4b02b0a8a4f8c9cd6a5dfb115d625682ba93ba88d969c8b518257d6d0ad695104fd6d43ae
 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/openrct2-0.4.13.ebuild b/games-simulation/openrct2/openrct2-0.4.13.ebuild
new file mode 100644
index 000000000000..f5705c2f8f42
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.13.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_MSX="openmusic"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_SFX="opensound"
+MY_PN_TS="title-sequences"
+MY_PV_MSX="1.5"
+MY_PV_OBJ="1.4.7"
+MY_PV_RPL="0.0.79"
+MY_PV_SFX="1.0.5"
+MY_PV_TS="0.4.6"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_MSX}/releases/download/v${MY_PV_MSX}/${MY_PN_MSX}.zip -> ${PN}-${MY_PN_MSX}-${MY_PV_MSX}.zip
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/OpenSoundEffects/releases/download/v${MY_PV_SFX}/${MY_PN_SFX}.zip -> ${PN}-${MY_PN_SFX}-${MY_PV_SFX}.zip
+	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 ~ppc64 ~x86"
+IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		flac? ( media-libs/flac:= )
+		opengl? ( virtual/opengl )
+		vorbis? ( media-libs/libvorbis )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data || die
+	cd "${S}"/data
+	unpack "${PN}-${MY_PN_MSX}-${MY_PV_MSX}".zip
+	unpack "${PN}-${MY_PN_SFX}-${MY_PV_SFX}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_OPENMSX=OFF
+		-DDOWNLOAD_OPENSFX=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 970d1f606f02..5c53df8fae80 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -15,7 +15,7 @@ MY_PN_RPL="replays"
 MY_PN_SFX="opensound"
 MY_PN_TS="title-sequences"
 MY_PV_MSX="1.6"
-MY_PV_OBJ="1.4.6"
+MY_PV_OBJ="1.4.7"
 MY_PV_RPL="0.0.79"
 MY_PV_SFX="1.0.5"
 MY_PV_TS="0.4.6"