gentoo resync : 28.04.2021

4 files changed, 5 insertions, 175 deletions

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 8e66f4f5b345..86a5fb3351e0 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,14 +3,11 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
 DIST openrct2-0.3.3.tar.gz 14107179 BLAKE2B 9c19bf8f88ef7aa33c345ec46c3dc70ae1221fcad075880a86bd3a577835640002126018d2a5251e063d6259cdd3cd4bde58097feb9095b793538b363b827c5d SHA512 de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
-DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
 DIST openrct2-replays-0.0.31.zip 1783829 BLAKE2B 70ef5a5ad89b531baefecfa4c673a4d41e18c4ef5586f045a2174bf39d61bc59ebd5deee23abbba138bd9b943f056134845c8710397b84fc388a5e268025b7d2 SHA512 cb26543ad44a9d2c5d4a22e666c9efce605b0de34ac7cc8f42853792f50b8eda9eb551d2e6d0724fc4d282c83043718fa074cdd5081a9f12aebdc62efd2c082c
+DIST openrct2-replays-0.0.38.zip 1765056 BLAKE2B b42fcca434c353e2d5a58e81bfc867221e23e357d334474f5c71d82b6046b7c8fee7e2b41f8c1e3180169125ba897c49af954e3074ca17499dec778e4c7be0ae SHA512 625249b1708bc5530699c1e9b7afee409d42691c0b6214c6a8f8acb2bcdcd3cf28468496d5b56e3ae1620af8e865d314bbdc65209ed1392a84ad62ea0ffd8900
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.2-r1.ebuild 3962 BLAKE2B b729a666bef756a63e6473b9a6cac608690311f08a9bdd25a90d9a644e1122e38f3d23d9cc3bf41c4b0090dc61b24b392fef6cf248487f99a50a64324dc0d89b SHA512 61f6577fb382260851bc22e87e41181973b58b2cd5cb835b58687fbffa814e7c833bf6aa3fe4b51b2d5025de157f0b02e6f0b642b7c3fc3f199407138a7dd1f5
-EBUILD openrct2-0.3.3.ebuild 3969 BLAKE2B c98d2e3eeb8b5a7ebea482f9542acba6277bcab8191147a125737651788ad1cabef26197ab7f868af70efe3c9a612db5bfaedd4b7991bdb8c5437ac7db2543a6 SHA512 f1e682c3a3aaa9a4e5df7ab3d3e07a38a2424385a55ed54b48da977b4fee6e9e57d1603d1fc135de7fba847945586528563b9b352fab2c36ec51debc89471a56
-EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d6af84320469f67b4b1f494c9cc7b16041e43434cb8b30f091ce202565402faa09ac18611834d7da1170372266a904333c3e59b2407f960f1ce581d3cb49f25 SHA512 2b67063b3434caa5e5163f5884e95ffb3a0cf8f716ff390bcbc2bfefb05ec2745af9b84421446dd3016a91bdd7e0f90ab21140e5bbba21f5ea6ee319eff5d4ad
+EBUILD openrct2-0.3.3.ebuild 3967 BLAKE2B c491d473edbd3957c9b0bd6da341c6d5608b08646fcae66aa5a93e35bcf6047fd581ff460e6fcf6eaecb9714f5c58abea0151d9e5d0e3c81bbe4c8c5a78f644c SHA512 6752f524da5a4a219818ffa0b732d60c7304ee4799e9113554dbc3e9e1df525d4ef1f7ea482d0dc2e0b9d4056f0975a74cfc2b009a45ceab2e83f1e3a37b769d
+EBUILD openrct2-9999.ebuild 3924 BLAKE2B b043871630c269258e57d5a38faa9518a2774f5380ebe636053ec72459f312591e1e095c7f9f6af91b5817c0dc0543f4fd94c9c743fd7a533582e49858da4875 SHA512 84f24cbb6e48f306eae91236820c7d09f7445585999c36989f9e63daaccc013e6d392032ae470ecea1bf0338bc0c280b9213b9ce889bdf71fa6bab5ee9a78a78
 MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
deleted file mode 100644
index ab825ca0f215..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.0.18"
-MY_PV_RPL="0.0.19"
-MY_PV_TS="0.1.2c"
-
-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 )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
-
-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 )
-	)
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( 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
-"
-
-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"
-)
-
-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_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-0.3.3.ebuild b/games-simulation/openrct2/openrct2-0.3.3.ebuild
index 54af75482582..820c8e5deb39 100644
--- a/games-simulation/openrct2/openrct2-0.3.3.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 67f3ef57ee5a..bce8ca40fdd6 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.0.21"
-MY_PV_RPL="0.0.31"
+MY_PV_RPL="0.0.38"
 MY_PV_TS="0.1.2c"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"