5 files changed, 6 insertions, 178 deletions
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 5d34fa5a360b..becc258d4739 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,14 +3,11 @@ AUX openrct2-0.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b1
 AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307f79f923dffffae1b47af55643b64d2776c075ad237530d0a0a074ffd62a18ce021d72fc3c4b4126e2880683c75648908 SHA512 8526095e8716d4885524483e6fe6b6f2ba7edf29bc7bd30602f37aebd5bafdc3a299e5890d3844fc1d573c69244d5415f7d02791e6ac73f9e421f88987bce2dd
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.4.1.tar.gz 14307739 BLAKE2B d50dd896128898725eb7bd347341dc23a5ef4e8c83d3334625f5484dc5d4214a6ba19981997291de3edb80baaf498e9b4fd83b460a2fd4fdc2100c080d3d0bb6 SHA512 795e94b025ebe8ce4386e59723e2442e950810652a1c95caa1e21a88bef5417c2cce18c93418788e75cd8e980ffda0dc73838693fbe2be108a4e269da9159f06
 DIST openrct2-0.4.2.tar.gz 16476190 BLAKE2B b1626c8cf8ec4100adb11e346515b68e6d7f5104bb95f756a04f170f0258b84a8ae84235c0defec5d994d1eb6c377feeadde1380d892a714f94469bd0cc5d689 SHA512 b047c4cfa4eb5e6257a9836bc85a1aab66504591c7a8f698b893290132d43d7e187a077d29b9f6fb712bfc62b9fcd063a70e7b5d36e2fc7dd61f3af0aff0163f
-DIST openrct2-objects-1.3.2.zip 3954437 BLAKE2B 21d79e35a3bad343a4f96e152f8b5f04820fc927557f0526e639f7c04ca1fac61804db02be57261deb01d65c81f67783ba9ed8e0230a90b2626fa2b63ed82857 SHA512 88b292961d728c1ad31dd9f68ba9a1201a59126887030b7b4a8d9fdbed758c1b9bd4f29fb924ddd3cf7b4c5fb7c95f576a00fabdef5a8403e287edeb1c740ff1
 DIST openrct2-objects-1.3.5.zip 4431827 BLAKE2B 238e1f97aae2b4958001b368b0cb7b86ed4a6999f9e45144a2d0e78d890df6f3d0edf49fe7a4e51766dc7ff1c26a6c814c6c5ad5836c46ced35efe34f8cab682 SHA512 7200a04b5f6e0f689859207554afc91fd53d9a3899eb88bc650c6883b18ffa7e6d1420a1efea0ab2e2926e10afeb352484ad04df425531ad3efc00dc6cb2acb1
-DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
 DIST openrct2-replays-0.0.69.zip 1479527 BLAKE2B 002735bcac99bd76988977869a82a8652c308fed932e4301bac7f76727dfe568f249367923a31f55eb17b807f2f5ce93a07b45941d5ceaca8b9761ad7bff4d1f SHA512 fd39ad2e4f3bdda9967e76f6e9b9c6845119814a2f00b770592500bce2787218002320b0df28d255cdeb4f707a82bb40dee27b7c01aef6dc5cb0dd6010332195
+DIST openrct2-replays-0.0.70.zip 1479468 BLAKE2B 862eed6955124d5a5fbe289aee8cfaca2b4b13c680174b041d9e6f79cd02fb5b2cae42c8ae5d58493b1896824fdde75a138c071192be6f46463e0ffa293accbf SHA512 f874c931329cf78c8e4b438eed05c7340bfb920a9b0d6394165a22517543efe4f760f112579aca20e0576659f0103558083af975d9486dfbd307ad61506c811f
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
-EBUILD openrct2-0.4.1-r2.ebuild 4078 BLAKE2B 9bc728353034f14dbb2c2f5ea39e8dbec0571b951ddb74ebd83f948f2871f8916a71a42462d5bec7812e29ae8a134b1afc2d0029843c845cb2051a5ddce8e22a SHA512 3be462aea6ceda3a71652522f970cfd530b059501e0734f007fa848ef9885acd824c751f15fe954e2f3cf93fefd696f1b761448c1e409709f442b7865d387cfe
-EBUILD openrct2-0.4.2.ebuild 4036 BLAKE2B 0a8937d9013abed8377a5614181649c9a7dcbad62029ea8dbdd7fc4062f6fa948d5c8310a1b7af5713aa0ba133440e43c2306a7c86e7e8ae6ddb2a9008bbc871 SHA512 66d2c647ffbda8b9e888fcc4974a67c95b69a2a65579e81a338007321d7bfac9f9e50bb360e73bfb892ce3ecac34f87692b6a98fdfe93967adfc51b3adf98b85
-EBUILD openrct2-9999.ebuild 3993 BLAKE2B a77c0a65249b0d0a6eb2fd9fa2a4962a536ef9083f0f7d6c90e2da068fb2c085f2083d3fff7d81e76d96a6657b379748e7a4f515fb92ed30800f11c29460dbcf SHA512 f60faceb1c8e19127dc9dfa11c918f632a352b1950dfea9ba30551b69d97a82c8662bd69c00e2ab7a3df9055ebd013f2ed5ca49ddbb714cc03ed684360cfd27f
-MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
+EBUILD openrct2-0.4.2.ebuild 4034 BLAKE2B 30714cc6e46f8d973c2946e17d9fd97f7fe63de461efd827cf91b28b1e696e9ef0ea5bbcd0bf6d775b797760cc40ef67f9ae3419f5c0bfbd0f8c71868d3cb3b1 SHA512 11d5a9ac81eba9f002309896298ae4ab3ee3eed6c47a2e4f08ee781e579b13fa69a9cf40a6f2fe580959ae9b7ddc42b435f2d8e78f0d13b915e590d29cb87cfe
+EBUILD openrct2-9999.ebuild 3993 BLAKE2B 6645ce109fe6c63c63fef56d4f68f3dc8d6f6635fcbe616cb7b29dae3aa85beb056b6174c79b9e59028ac4a5c2ad273bbe654f5d893410ec1c6ec596520a5a34 SHA512 e3b433b4f0a752ed6910277ead01d8b057789e6893bf99345f00c9c5c5a05fcc23e74797ff22a534a2fadefc0617b93dd67fd3682486dafe8e0a3f3048a911cb
+MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index 84afcaf3c252..5063d27fc7ed 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -15,7 +15,6 @@
 		sandbox allows the player to build a more flexible park with optionally no restrictions or finance.
 	</longdescription>
 	<use>
-		<flag name="lightfx">Enables LightFX for better lightning effects.</flag>
 		<flag name="scripting">Enable the <pkg>dev-lang/duktape</pkg> scripting engine for executing user scripts.</flag>
 	</use>
 	<upstream>
diff --git a/games-simulation/openrct2/openrct2-0.4.1-r2.ebuild b/games-simulation/openrct2/openrct2-0.4.1-r2.ebuild
deleted file mode 100644
index bf62ba9aaf75..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.3.2"
-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 +flac +lightfx +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/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
-		$(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_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-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-0.4.2.ebuild b/games-simulation/openrct2/openrct2-0.4.2.ebuild
index 744df62f60d7..a9e342c80f54 100644
--- a/games-simulation/openrct2/openrct2-0.4.2.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 79567389df61..22f2ae8dd01e 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -13,7 +13,7 @@ MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
 MY_PV_OBJ="1.3.5"
-MY_PV_RPL="0.0.69"
+MY_PV_RPL="0.0.70"
 MY_PV_TS="0.4.0"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"