gentoo resync : 12.05.2022

7 files changed, 196 insertions, 9 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index c90308c9c52a..1b38a2a4cc23 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 0ed120d6c70a..b2d8b7734c24 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -2,14 +2,18 @@ AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b
 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-0.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b15bfcb433b1c586dab100839bba49867c374669e27f9677c82f16c727b939dec28e95fbb42278b9661935aac3cc23fe6b8ad8b64901a029 SHA512 6f2359f8fbf1fc915909fe404300e016d4f8d55f3b0f59dbdbf10e6376c38c412de23394c2138fb56666be059221c60a8b488a6965f1b6be19e834a6fc624b53
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84
+DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-objects-1.2.4.zip 3392474 BLAKE2B 5f539cbbdd93828cebfa6977c6c11ac878c3ec39e0b937ddf00e598f874ccf5f1822e02d6c7e508a42e2ee01242b304b013f07d16dbf94085191b62f76b8dbfb SHA512 910538010d1258f73f8290dd79ef24f463e2afcf0e5876b5f7b6a0671250fbea11180474440df6f0c3d6c356948c5f7a305a44214b53695dc26f15158dfd5214
+DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
 DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
-DIST openrct2-replays-0.0.62.zip 1466858 BLAKE2B 651e46a554e90d7692c2dc0f8dcffaadb58ffaf7f9a282d499f4c032c8412730da58f660d03b0e73d26893ce7b9a3a437029893acd7f3fd4e9267ce85eb0ee68 SHA512 69705858ebde1dc9a698915c0d5ed56e1c9d5cb29b919d99eebefe81fdb68d9c17acc58431618410b69cf67ad14e1994ec9ac86530127ca87cdc5603de899137
+DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
+DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
 EBUILD openrct2-0.3.5.1-r1.ebuild 3968 BLAKE2B e489d7be25d664fd73efdb62e3551cb3eb537545ec8f4f83b1ca06f073872bfc56ff343e08725a33a8fa5ef4918daf40dc3710c04e0fb4ac57d9e54a07721158 SHA512 951b457cde394a64c7cacb05b854312855a6b4b3ff06fb7c2777019a79c7b4f18b8b6de52da5eddc77e935ad13990189ea24c5a624e499a8c66dd38f5b7c6721
-EBUILD openrct2-9999.ebuild 3884 BLAKE2B ef9bcdba674eee668c0ceaeea3d2ba5f817754d0e480c90a3beda641777a19b31638581ef039ac0af4a8e83647be50dcf80e3f115ae19ee881f433ad83821e0a SHA512 bc77222dcbe772579566cc5e677bdc54748e88681e45ac50a53f6765ee620600c2eb576bfb47570377cf44c32d4ed93f76c57d042fce14401a0eeec4b11aea3d
+EBUILD openrct2-0.4.0.ebuild 3926 BLAKE2B 0096a095c1e5b28ceef5f3cbc51102f51cac080d045c032dac059eb7c99e2a67f50b4c1f29b7f749ba468b2d8229566991f486285ce9446c6976300f0aa7fd64 SHA512 c3dbc24caadee03596c692723c8bac3507b6b48f13217061d202b107e2da75b01b3775171a64c7e1a3ec02892fe2fe247d68fcfb015d323fbf438f9f0c540c58
+EBUILD openrct2-9999.ebuild 3883 BLAKE2B 2685d376f7e1f4e7d3f9739fe7add5992ad1297c7fdead8db7d9918b0d4a0026c1456c2c2f568ac2cd1fb6516da860f1369a4333f0be4ebd20141733bbf84c0d SHA512 5378717cb97f736f745058b09e9ffc3fc857e4231a76f1af024ff80f60ca9ebd2f02ef11b0029023c0d31425e34e083f9e7a2a14e63d2acf048c7ac2ad1b4fc8
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
new file mode 100644
index 000000000000..b90d48c63c33
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
@@ -0,0 +1,18 @@
+--- a/src/openrct2/config/Config.cpp
++++ b/src/openrct2/config/Config.cpp
+@@ -638,6 +638,7 @@
+         log_verbose("config_find_rct1_path(...)");
+ 
+         static constexpr u8string_view searchLocations[] = {
++            R"(/usr/share/openrct2/rct1_data)",
+             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
+             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
+             R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
+@@ -683,6 +684,7 @@
+         log_verbose("config_find_rct2_path(...)");
+ 
+         static constexpr u8string_view searchLocations[] = {
++            R"(/usr/share/openrct2/rct2_data)",
+             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
+             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
+             R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",
diff --git a/games-simulation/openrct2/openrct2-0.4.0.ebuild b/games-simulation/openrct2/openrct2-0.4.0.ebuild
new file mode 100644
index 000000000000..4a5b89ba4216
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 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_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.2.7"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
+
+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_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.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 ~x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:0=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		opengl? ( virtual/opengl )
+	)
+	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.2.6-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".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
+		-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)
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		$(usex test "-DSYSTEM_GTEST=ON" "")
+		-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 293da48f84c1..cd60805a4bee 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -12,9 +12,9 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.2.4"
-MY_PV_RPL="0.0.62"
-MY_PV_TS="0.1.2c"
+MY_PV_OBJ="1.2.7"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
 HOMEPAGE="https://openrct2.org/"
@@ -71,8 +71,8 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 )
 
 src_unpack() {
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index d78c7abe4378..c9225564e99c 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -13,5 +13,5 @@ DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e771576
 DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
 DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71
 EBUILD simutrans-0.122.0-r1.ebuild 3125 BLAKE2B 13fac2abf5c04f7fc2436ce1d329d14f43a21cb74b8b1731a226ba50d5edb560aa97aeb12a92d6ea8377b92a28e89c34f9928385b3c05dc56177aed19391b989 SHA512 1df8bb03515b2231db1f44740c5f8eac531d19775c9cc468d93c0723f35cb21aad5fbd508970bbd1ed8828adaa68f6af29713e685990757812d6d5c4b6007475
-EBUILD simutrans-123.0.1.ebuild 2468 BLAKE2B 4114d5489da75d00096da2209f7593b273b51daa059e749cbe0de916cb6af44573dd7ba515000fb64be9cd6455f792aee8dd7cfa5fd1913681ae24d088adf84e SHA512 05bf61823669869a7eca289501a7137b47116f6cde12359ecc84cd300e5dc3027bef290293dc4df14631fc97c05d4756bb1623217aeffd4ab9f033d7b9a1c331
+EBUILD simutrans-123.0.1.ebuild 2475 BLAKE2B b87121729f017580ea0add9b53b529f8d2ce92133691c147a6d7e28bcf51286825b8f6d6303ccab8f1c4f226dc914899f5520caaa82f4da4f5cfa19d69f48e23 SHA512 91d8837356dcb695b93e1102055cbc88e5e15198f0e464c1f1aa673d1a180bd44d6ef4e34cecc9cece3d539f3ce5ddc993da6934b85a08b497b56f0e00333220
 MISC metadata.xml 893 BLAKE2B ecca9ce53820d4e86292a0d20e303bdeeed29173d7b8d1a287bf1c49bb9b0023ac07c64051167022e1b73f75fc753fbc6ed760d2677764f040b722afb4c23eea SHA512 af270cb6ba97426870720303b7942dde9edf918df597141572e4fc097e611bd1571087341d46e286cef94a7a79333643c87b99a3c2d3871024db043ea49abcaf
diff --git a/games-simulation/simutrans/simutrans-123.0.1.ebuild b/games-simulation/simutrans/simutrans-123.0.1.ebuild
index 9b027b6b7127..c113d11a5210 100644
--- a/games-simulation/simutrans/simutrans-123.0.1.ebuild
+++ b/games-simulation/simutrans/simutrans-123.0.1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="minimal truetype upnp zstd"
 
 DEPEND="