gentoo resync : 25.11.2020

20 files changed, 382 insertions, 388 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index d725f4a11ab0..640948841f11 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 6566319f54c2..0762a32699de 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -3,6 +3,6 @@ AUX flightgear-2020.1.2-boost.patch 302 BLAKE2B 8abe7fc003ec905ed15983ab68672235
 AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
-EBUILD flightgear-2020.1.2.ebuild 4443 BLAKE2B d324ee1b454a441d169e65b3747ce8051cc1d7243a18f8b0b0786bd1df862b183b2a580313ac514fedf59bd4113d783dcf11dc7e1b956cbc3d18b20489957bdb SHA512 d15a09aa298f034a71299eca91d0066cf9a806ca054b9857de35c564416ae4b93b5f150f30b9c6d79da8c6f0273305b731f11415dbf25fe8cf545e5b26734d3b
-EBUILD flightgear-9999.ebuild 4461 BLAKE2B d66adce51f48fc462dadd2fe069d6b0696490614518f5d258c180f38546a103f7ee1df7df68f6b76612d072c6d4d04a4817edccbd5e8f54104d816dd2fcd981b SHA512 86fbff4a29c5a830b8178aa1501f70a3dc68f344fb0e62bfbce234be901a61d4e11b99351f1ed34b664c66e7032bb8903dded07bb08ee9fcb007363a7504b522
+EBUILD flightgear-2020.1.2.ebuild 4408 BLAKE2B fe573ff0479c98b739f0c36e9fb6b4ef6a8fa40ef5fbc5224cfe2b36a206b1e9a049c78c27a088c50adb40f88932823fb9b7156ac91a2a78db63b48dcbbc7d86 SHA512 a498f4fffd802ee58f2dab0fcefa6813c8b347a7d1fcbdabf727a6d8890d39d908a5472de751e7b0cac5cf8ca515e65489e9d271ac462f195e14369db1b53aa2
+EBUILD flightgear-9999.ebuild 4427 BLAKE2B d4d37beab755c928663f8c162a4b2bf46027f020e18507eddfc1038b93ac90f1419f125694acd619d106213f484d978f38e54be5e5f5e601544c4ed9bee18a0e SHA512 528945be4b75b80b297850b1b160e45568271183ca463d0794ad21060c69b5715b1c92d5406f84e0b00998247bb90cd37dc45b152a7408951ef8c7e0e6ee4be9
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index 5ea0ecfd8591..c472dcc0fa53 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake bash-completion-r1 toolchain-funcs
+inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
@@ -96,7 +96,6 @@ src_configure() {
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
 		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 85e77a5fdaa6..2eea53f95a81 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake bash-completion-r1 toolchain-funcs git-r3
+inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs git-r3
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
@@ -66,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+#	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -97,7 +97,6 @@ src_configure() {
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
 		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index fdcdbbaaae31..85dd80da78ed 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,9 +4,13 @@ AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317
+DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
 DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5
+DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
 DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a
+DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.0.ebuild 3937 BLAKE2B 7faff348ee62eae118db29824537a27eb326de846b71b848e573a46bae81bf1d9fc72204b74451eee9ed9f7e025acde11f85795732d0a7594bc3b0ca0a7536b1 SHA512 d4f0eac48b8b96a473477bf6f2e433467b9c99dce2ad7ea25ca91f08f5471edc72b2ac009d6e2376f088e6e9d8d69b89dbbefd1d27fea44b84446b4b48f53e0e
-EBUILD openrct2-9999.ebuild 3899 BLAKE2B 227af822417f2961bda6e7eca0b2b90e3344b5addefc9e4245262c72fd322ae558b6f0d1ef8f3d6e1df7f6d810a250f4e9056cea9a7aecfeccb9079253942c71 SHA512 f9776de8b7c109549869a51e953d0d20bd1cc01746ec1047c7b0d4eaeeeefe8cf78669fa3f4b5214089b2a72867e9cd7e440ef487222fa68f6c9282d34a8d1d9
+EBUILD openrct2-0.3.0-r1.ebuild 3939 BLAKE2B 54a337d6885a3dcb7b22125c1c486e00c4e56c89337af2b82594a5c240fc9db52948d80d0f1a6469014880820cc63a13865c49015ba51acf4c314ec956dc0fc1 SHA512 49ef33f4b00dfa6794a16bef60f4e46ac7f63dd76dfe4308961d95af06a9cae4add7966a7a468753dc50c2693a84369899182981e3a0e82013a796458a08e9cf
+EBUILD openrct2-0.3.2-r1.ebuild 3964 BLAKE2B 8ad3b267b1058565019e18cb3b0651c725921015b66ef13e8bab8cd4c49f195bfee832594775ab7f1de5bebe1fd69c0e4c1094a353b754c9fc42f881e488b0ab SHA512 a715ed53899dc872949ffbe4366dcdc03a80e59fd492a5fe510c5b70f092428d96094f2fd38408e8f0fd88a69897b14e4fdb75d64e5fdaa66f41449daa8ed655
+EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d37135db8e8d701a80658aa26906dfa5c863d2bc1096eeb8860e7cb34d9bb4b12f812010d8333a0c75b34214741fbaf54fee1f183dd6280a2b81baa9c4d0755 SHA512 f9e65e96326e2c012aa1e2bd79576dee7da6f925cb7ba835afb54d8f1b3f950a4ec8edd5d3683e423731e437a75b31f260696b2645c5434af6a240d95ea05d87
 MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.0.ebuild b/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
index 41e425c753d0..5a111a1f34fd 100644
--- a/games-simulation/openrct2/openrct2-0.3.0.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape )
+	scripting? ( dev-lang/duktape:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..f27d85fc6c3c
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
@@ -0,0 +1,167 @@
+# 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-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index f0a1d342c950..ed4aa33550f6 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -12,8 +12,8 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.16"
-MY_PV_RPL="0.0.17"
+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"
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape )
+	scripting? ( dev-lang/duktape:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
@@ -60,6 +60,7 @@ RDEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
 	test? ( dev-cpp/gtest )
 "
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 2950d98bca34..689f424d0dd5 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,9 +1,8 @@
+AUX openttd-1.10.3-icu68.patch 766 BLAKE2B 8d2ad4ddd3fbce89195982a5bcac5fd119d51cba58b9a5b6b90edf8c04041313eaf54167232aab1fdf112cadac1cf0190973cd2a807273544086f8e75226a91f SHA512 f52ed0b0e8e692c481cce579697f329a6f1495bcda834ae1566de9ec7f2cb3b791428d6c6b828d2d9d201572b5a6981d64e936fb33334c7e74d9e56e92d150a7
 AUX openttd-1.9.0-cflags.patch 1418 BLAKE2B 4c279bca0360d202d183488f61a19a5abc768cf55c2bb1ebaaa58ecd59f61584d4865bd7fc91260f14bd750b623884b88b6900e1c9cb89c007b32534e62ab510 SHA512 df1eeca21325b09c849191f7a60d0be1eee107a40b3cbb846f5c845d560f61a847ac66c427772c8e980d2ab2f51ccaa539938dd36c143f9af558293f9cf5c755
 AUX openttd-1.9.0-dont_compress_manpages.patch 1137 BLAKE2B aa03bf141f1dac450b90ad9b54f4022dc981e041f40cd5ad9b7b522910788fcf30c85ac8ee3ba480c76df67f11b8258de7fe785259796b67bebc1a49ce1ed6e3 SHA512 0985a5826dddfb9a03bfc686de5ae2a36362d635865fde9ec2ee340672556d82517db94197d7de04630ba7558bee5ad4543debafd46e5dfd2bbec2eaa9354a18
 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-1.10.2-source.tar.xz 6766904 BLAKE2B 959d3ba98022d3fd3ddb15844bc2d6f5eb54b470e2dfebdcd784428c1773585c116dd739bd6718879ac6d6ac6942737cd51b71bc77d6d82991fdcea1bc8aec1a SHA512 03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683
 DIST openttd-1.10.3-source.tar.xz 6815924 BLAKE2B f700304e723fe5c3fa9781432a387e061595bbc8de42f565ad57ac265d9e4bc14cbc659a3f6551019bfb31b8b56b180c272c6753a12b4cd2e13016a98dfe1679 SHA512 d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4
-EBUILD openttd-1.10.2.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
-EBUILD openttd-1.10.3.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
-EBUILD openttd-9999.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
+EBUILD openttd-1.10.3.ebuild 4960 BLAKE2B c0938b7f7e90ec22636942540f1afc2f5eaea2e57904064cff32eb1f021229aa312f84a24394023b8238cb22a14785b1d907659a15fbc9a152477f511ec60b4c SHA512 cd7c4a81cc53e58efc372d80c11322c49d1448054be30a352a8c45b4fb2d45c288a7da79c2ff31eb6d858400eb61f2416ba89b24f16445f9d8695a90d37f648f
+EBUILD openttd-9999.ebuild 4928 BLAKE2B 4c0524725573054c4209e67c8c668e04a175ffdf739dae514b2a34f754dc7722cab8b58382b60e89296300a199af40f29960f26e8c5cc208351f3d0e99c78982 SHA512 84b23f11ff8823944ebca485e98f94985e6dde85af65f49c750d861f280d808b9cdf2e409c2e7f126f3f0576fe4d2bbf9a9de72a575a417a09b2cb6c9d6beeda
 MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
new file mode 100644
index 000000000000..9596ab66606a
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
@@ -0,0 +1,28 @@
+From 842e0ed5e3220a0e5ab19e7b0892c9c72c230ae7 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 18:45:20 +0100
+Subject: [PATCH] Fix: build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/gfx_layout.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
+index 584a71273..ebd1afaa8 100644
+--- a/src/gfx_layout.cpp
++++ b/src/gfx_layout.cpp
+@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
+ 
+ le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const
+ {
+-	return FALSE;
++	return false;
+ }
+ 
+ /**
+-- 
+2.29.2
+
diff --git a/games-simulation/openttd/openttd-1.10.2.ebuild b/games-simulation/openttd/openttd-1.10.2.ebuild
deleted file mode 100644
index acf83d2f9551..000000000000
--- a/games-simulation/openttd/openttd-1.10.2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"
-else
-	SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl2[sound,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? (
-		media-libs/libpng:0
-		sys-libs/zlib:=
-	)
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
-)
-
-src_configure() {
-	local myopts=(
-		--binary-dir="bin"
-		--disable-strip
-		--doc-dir="share/doc/${PF}"
-		--install-dir="${D}"
-		--menu-group="Game;Simulation;"
-		--prefix-dir="${EPREFIX}/usr"
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with iconv)
-		$(use_with lzma)
-		$(use_with lzo liblzo2)
-		$(use_with png)
-		$(usex debug '--enable-debug=3' '')
-		# there is an allegro interface available as well as sdl, but
-		# the configure for it looks broken so the sdl interface is
-		# always built instead.
-		--without-allegro
-
-		--without-fluidsynth
-	)
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		myopts+=(
-			$(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '')
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild b/games-simulation/openttd/openttd-1.10.3.ebuild
index acf83d2f9551..bd35f84f89bf 100644
--- a/games-simulation/openttd/openttd-1.10.3.ebuild
+++ b/games-simulation/openttd/openttd-1.10.3.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
 	png? (
-		media-libs/libpng:0
+		media-libs/libpng:0=
 		sys-libs/zlib:=
 	)
 	zlib? ( sys-libs/zlib:= )"
@@ -62,6 +62,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
 	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
+	"${FILESDIR}"/${P}-icu68.patch
 )
 
 src_configure() {
@@ -104,7 +105,8 @@ src_configure() {
 
 	# configure is a hand-written bash-script, so econf will not work.
 	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
+	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+	./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -120,10 +122,6 @@ src_install() {
 	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -177,7 +175,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild
index acf83d2f9551..d3e0bdea7018 100644
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
 	png? (
-		media-libs/libpng:0
+		media-libs/libpng:0=
 		sys-libs/zlib:=
 	)
 	zlib? ( sys-libs/zlib:= )"
@@ -104,7 +104,8 @@ src_configure() {
 
 	# configure is a hand-written bash-script, so econf will not work.
 	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
+	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+	./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -120,10 +121,6 @@ src_install() {
 	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -177,7 +174,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 5b83f40f1580..94646ab91598 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,6 +1,12 @@
-AUX simutrans-0.120.2.2-Makefile.patch 2015 BLAKE2B 1a3aac151b1ead4355d4206064d1c773813789b0463b2cb90494ce759cfcd31b9ce7db5f8d52c055d9364bd7fec2e8096437e023e1e618f58a53b58666f98cdf SHA512 2d85d4a048a40c6a3581492f50f7d2364cfd36f6d0496fcf89406ed1d7ad091b218700b2e8d1f26e0bdd346b3f449e0c0d30ef4bffed30b351c1e424ce7a4439
-DIST language_pack-Base+texts.zip 1097263 BLAKE2B 08678f36a2425b84bf5f440a546af7ca6507ee17bdcfd3096335c20ce60c23a5375eb133f597806bed28db2d9ed067669e83a4df47443be0cb48bf151ba91ef2 SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248
-DIST simupak64-120-2.zip 4453079 BLAKE2B 910f7937d5eabe8c97f9b9fb6b1d0a63ffe5c7a897a83d5649581f629c1e6d000442399f3e181c0a6e2b08a6f9948354df1848b84df6c2d37bd65d4c303d1626 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
-DIST simutrans-src-120-2-2.zip 3900947 BLAKE2B 69e9f78883d1b611bc76bbff1dc46ab1a645580ec0114f342aeb5e243c643c0fa4d3684e8102a0196f95320b4f93a0a50a93bb61802e81236f286a2989ac646f SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2
-EBUILD simutrans-0.120.2.2.ebuild 1498 BLAKE2B 9ac5acaa5c8a3181e2e92a8c8c3def5a564bff80de99f1f90e6389480e5e2a6955321259c4504b42b5a5b2f70e289b925e1bb97ded6c8db1967613dd384ec2f0 SHA512 20cbfabc2f86bab1d741d6ccaab13070587e9e668db536cd48bcc1fde86b9b6e43e92da7daa51a77d573abdc345ddb40925660d72a2ac466ae93fc10e4cf0fc7
-MISC metadata.xml 332 BLAKE2B cbfe0465e3d6ce4bdda79fcac0b10b477c384630855de37cb25500225eaaf628a2b8a5bfc95f73d90c5f4b8ed0d213fbb7f8a28ee7e5333c59048d5002cb5886 SHA512 c8e6f7d4963c82a5d993a6edc3d8dfc925ffc9df28fbbadf6d2fa91f5f34c9afb4fc8f821a8a7e2e99522ec9bf2d2bc0a7f620337d2097f13af77016846dad36
+AUX simutrans-0.122.0-Fix-Makefile.patch 565 BLAKE2B accfd92e7df9458b8d347342fd268e507eb2a6f95253e34bf111639891328d5365ff9c4fa4f5e58cccb6e78ff34b69fca66439d024bb48c85e9735df285f935d SHA512 ef0469f74598359efb8ab052de754d2d4f649a636c03cc84a50d10fdebcaf6a62ce06556f8c2f2ec50b8686e2eec69b420aa7f11df29a1985e48a039d340b6d0
+AUX simutrans.desktop 191 BLAKE2B 67b06a42923aebf141cd2aec2393b1fd69ab87eccc52f6c714e9b5639452b74da0711a1bd9c7ed1ac1dc77b42d6c42c8f28cf5d2f30b1623ca3206cf6fabe9b9 SHA512 fee53e6e4b4b1d9a70a80a2fa5cd4cc4a47673f0bcb19dff73d2fed53819d08e06bba7841dc9ca25964063d68005c56228c565fce6dc43f19068458194deb744
+DIST simutrans-src-122-0.zip 4534293 BLAKE2B c4117baf82530adced1fbb60e099176b7b63ade07e10f741e19e41aedd4b65f5d7b6ab60145f3bce7ff88def9836eac88323b14aa74f2ce5f1c76eeaa6beb713 SHA512 7a044ceda9359847353c1dcd23c380d1ddcca901fd674a25b66d7bd0ede7f974525c5fc3b37781977e9946626f30b538c483166983ab8b7be9e73903dc9be0bd
+DIST simutrans_PAK128.german_2.0_for_ST_122.0.zip 186572954 BLAKE2B 1f21655660f947767657f79fa45f66cd434888c37596e17dbd8400ce684251c33617dc78096c34b23bad3f241cc4641029d0f12b5f09d199013582c89fa02ab3 SHA512 9e6250b333e6b31e0ad23f2629409c2b4914e5fb9cb0304baa1e70f0c268d5eca7db27d77b51f18fff57569df56eecb82c8ec9b48c3a3efacf7d47501546347d
+DIST simutrans_coalwagonfix.rar 10769 BLAKE2B 4ebb14c5585fcb09b2c9e70451a0a4f1133d1bf7a184c898463c4393026dcbaf10954430d83e64cd7430ec3e3708e0d51f04b805ac0c32656c138b001e617079 SHA512 503c795b4fdc168cc925a3b5ff385880dd28c8e3214a7c5aeb80e937378cf19b1f2408d19f2ab6ef066f47d6f6ab0955e6d5ec59981d1e76fbe3cd661b8bd22e
+DIST simutrans_language_pack-Base+texts-0.122.0.zip 1172877 BLAKE2B 6a1646d8bd1e74a54506cd32508b5dd9da3d2ce77c7920049fea6bd42c6b46b91e9b248860a352380a5f2bb1393f2bbc9b837dcb347c132c7132f6813a608212 SHA512 d87b4f65188f6efd7e277f6ae5796584e58a1302dae7246cd7b6e3c06d8cdc81c5eae647e12cdf7598230c588f66f5682d2be0e6628311343daf4bd46b441278
+DIST simutrans_pak128-2.8.1.zip 97430218 BLAKE2B 95b6788fd8e4f539b232e9de563227704f16c05951d8cd42ca3faf6b9f625d08108bda068417e9e04c14db8ee6fe860e9b8d958c703719223de770da36ee686b SHA512 c4635a446d9874fe1cf1a15a1ca8eaa50a0888c7679df540aa7509e30db6cb8f9519a27aad10dc481a7762c6c16bb5df64e18665652dcd777885adf0dae6736a
+DIST simutrans_pak128.Britain.1.18-120-3.zip 67251660 BLAKE2B 6dbebdf77985e2610f4283b1ae252a19cbfcc37cc1c6974e4132300f87c7d881bd87aba29bb01974d56d261ee6694fd81d0d4b09eb0a2854e38de6f278f91b53 SHA512 234a6c3dffa236ae98ba3372efb2e2b2808c0dcc0933ea5f339aa639e0705674435599e27228f0ee82f24af49ffbd7cb7c6c076ff6569a7ce622c6b8009c8472
+DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e77157674847d757a23f329aa452c9ea6c096f875d665bb2090df34886437a2d35519c83b38f03d06566bf052c1ffe3cad718c7c3dfe SHA512 f61ad804d63027e181bb99a92f48d23cf6a6f47047a1ba9e8f83383cc4e6d603c7fe260d0846613d43765d3fc933bf13ae063d8d8176f8aef41db8d6bf187773
+DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
+EBUILD simutrans-0.122.0-r1.ebuild 3184 BLAKE2B 4d9b66be5565d6abd49332d060a197b606a2756533a18c81e53b646aabc223b8ec139f471746b4e4406cb11da1a8230ba3ffc32d3fb7c136a719d0440159761f SHA512 5b7c1c8656a10c48fa21bd6f7b1c2af7575ae84464ff9de061d10d0929906909f4a626aa98728a4bbf261fca5dade69f01507d8915f5b796d00dcc292f92f8a0
+MISC metadata.xml 734 BLAKE2B a93266747deaebb5b9aea753e2bce21aae7b8d6a95fcdae7fdd33a1bdb5133446a7d7fcac775c3841a210a4fba20641ba3caa6ff0f89a52b055464f37eaa63bb SHA512 9efc8b367f5321562b107442606dd1378c4cf35234dd159acb0d0c498c60965a442ac2de95423d32e6649d2d4bb4d1c6f733c3a83bc086e32e534ba023d33b5f
diff --git a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
deleted file mode 100644
index f9fb48ab682f..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/Makefile	2017-03-29 12:04:15.000000000 +0300
-+++ b/Makefile	2017-06-08 01:41:32.605031258 +0300
-@@ -87,8 +87,6 @@
-       CFLAGS += -minline-all-stringops

-     endif

-   endif

--else

--  CFLAGS += -O

- endif

- 

- ifdef DEBUG

-@@ -110,6 +108,7 @@
-   endif

- else

-   CFLAGS += -DNDEBUG

-+  CXXFLAGS += -DNDEBUG

- endif

- 

- ifdef MSG_LEVEL

-@@ -127,6 +126,7 @@
- ifneq ($(MULTI_THREAD),)

-   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)

-     CFLAGS += -DMULTI_THREAD

-+    CXXFLAGS += -DMULTI_THREAD

-     ifneq ($(OSTYPE),haiku)

-       LDFLAGS += -lpthread

-     endif

-@@ -142,11 +142,13 @@
-     endif

-     ifneq ($(REV),)

-       CFLAGS  += -DREVISION="$(REV)"

-+      CXXFLAGS  += -DREVISION="$(REV)"

-     endif

-   endif

- endif

- 

- CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

-+CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

- CCFLAGS  += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

- 

- 

-@@ -514,6 +516,7 @@
-     endif

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -553,6 +556,7 @@
-     endif

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -568,6 +572,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer

- endif

- 

-@@ -594,6 +599,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lglew32

-   ifeq ($(OSTYPE),mingw)

-     LIBS += -lopengl32

-@@ -609,6 +615,7 @@
- endif

- 

- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

- 

- ifneq ($(findstring $(OSTYPE), cygwin mingw),)

-   SOURCES += simres.rc

-@@ -616,7 +623,6 @@
- endif

- 

- CCFLAGS  += $(CFLAGS)

--CXXFLAGS += $(CFLAGS)

- 

- BUILDDIR ?= build/$(CFG)

- PROGDIR  ?= $(BUILDDIR)

diff --git a/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
new file mode 100644
index 000000000000..5effe170758b
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile	2020-10-15 08:32:29.000000000 +0200
++++ b/Makefile	2020-10-23 17:59:29.008159331 +0200
+@@ -17,8 +17,7 @@
+ SDL_CONFIG      ?= sdl-config
+ SDL2_CONFIG     ?= pkg-config sdl2
+ #SDL2_CONFIG     ?= sdl2-config
+-FREETYPE_CONFIG ?= freetype-config
+-#FREETYPE_CONFIG ?= pkg-config freetype2
++FREETYPE_CONFIG ?= pkg-config freetype2
+
+ BACKENDS      = allegro gdi sdl sdl2 mixer_sdl mixer_sdl2 posix
+ OSTYPES       = amiga beos freebsd haiku linux mingw mac openbsd
+@@ -91,8 +90,6 @@
+       endif
+     endif
+   endif
+-else
+-  CFLAGS += -O
+ endif
+
+ ifdef DEBUG
diff --git a/games-simulation/simutrans/files/simutrans.desktop b/games-simulation/simutrans/files/simutrans.desktop
new file mode 100644
index 000000000000..01d1ec4022f4
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Simutrans
+Encoding=UTF-8
+Comment=A free Transport Tycoon clone
+TryExec=simutrans
+Exec=simutrans
+Icon=simutrans
+Terminal=false
+Categories=Game;Simulation
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index 9d88e43fb074..e411589b3ac1 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simutrans</remote-id>
 	</upstream>
+	<use>
+		<flag name="pak128">Install more detailed scenario data</flag>
+		<flag name="pak128-britain">Install British scenario data</flag>
+		<flag name="pak128-german">Install German scenario data</flag>
+		<flag name="pak192-comic">Install comic-like scenario data</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
deleted file mode 100644
index f175a36b9e03..000000000000
--- a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eutils
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-SIMUPAK="simupak64-${MY_PV%-[0-9]*}.zip"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="http://www.simutrans.com/"
-SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-	mirror://sourceforge/simutrans/${SIMUPAK}"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib
-	app-arch/bzip2
-	media-libs/sdl-mixer
-	media-libs/libpng:0
-	media-libs/libsdl[sound,video]"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_unpack() {
-	unpack simutrans-src-${MY_PV}.zip
-	unpack "${SIMUPAK}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
-	unpack language_pack-Base+texts.zip
-}
-
-src_prepare() {
-	default
-
-	strip-flags # bug #293927
-	printf "BACKEND=mixer_sdl\nCOLOUR_DEPTH=16\nOSTYPE=linux\nVERBOSE=1" \
-		> config.default || die
-
-	# make it look in the install location for the data
-	sed -i \
-		-e "s:argv\[0\]:\"/usr/share/${PN}/\":" \
-		simmain.cc || die
-
-	rm simutrans/*.txt || die
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto /usr/share/${PN}
-	doins -r simutrans/*
-	dodoc documentation/*
-	doicon simutrans.ico
-	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
-}
diff --git a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
new file mode 100644
index 000000000000..1d54030950e5
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic xdg
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+SIMUPAK_64="simupak64-${MY_PV%-[0-9]*}-0.zip"
+SIMUPAK_128_V="2.8.1"
+SIMUPAK_128_BRITAIN="pak128.Britain.1.18-120-3.zip"
+SIMUPAK_128_GERMAN="PAK128.german_2.0_for_ST_122.0.zip"
+SIMUPAK_192_COMIC="pak192.comic.0.5.zip"
+
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="https://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip -> simutrans_language_pack-Base+texts-${PV}.zip
+	mirror://sourceforge/simutrans/${SIMUPAK_64} -> simutrans_${SIMUPAK_64}
+	pak128? ( https://download.sourceforge.net/simutrans/pak128/pak128%20for%20ST%20120.4.1%20%28${SIMUPAK_128_V}%2C%20priority%20signals%20%2B%20bugfix%29/pak128.zip -> simutrans_pak128-${SIMUPAK_128_V}.zip )
+	pak128-britain? ( mirror://sourceforge/simutrans/${SIMUPAK_128_BRITAIN} -> simutrans_${SIMUPAK_128_BRITAIN} )
+	pak128-german? ( mirror://sourceforge/simutrans/${SIMUPAK_128_GERMAN} -> simutrans_${SIMUPAK_128_GERMAN} )
+	pak192-comic? (
+		mirror://sourceforge/simutrans/${SIMUPAK_192_COMIC} -> simutrans_${SIMUPAK_192_COMIC}
+		https://www.dropbox.com/s/3wwyrajrr2oqzo6/coalwagons.rar?dl=1 -> simutrans_coalwagonfix.rar
+	)"
+S=${WORKDIR}
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+pak128 +pak128-britain +pak128-german +pak192-comic truetype upnp zstd"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/zstd
+	media-libs/libpng:0
+	media-libs/libsdl2[sound,video]
+	media-libs/sdl-mixer[midi]
+	sys-libs/zlib
+	truetype? ( media-libs/freetype )
+	upnp? ( net-libs/miniupnpc:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unrar
+	app-arch/unzip
+	virtual/imagemagick-tools[png]
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/simutrans-0.122.0-Fix-Makefile.patch" )
+
+src_unpack() {
+	unpack "simutrans-src-${MY_PV}.zip"
+	unpack "simutrans_${SIMUPAK_64}"
+	use pak128 && unpack "simutrans_pak128-${SIMUPAK_128_V}.zip"
+	use pak128-britain && unpack "simutrans_${SIMUPAK_128_BRITAIN}"
+	use pak128-german && unpack "simutrans_${SIMUPAK_128_GERMAN}"
+	if use pak192-comic; then
+		unpack "simutrans_${SIMUPAK_192_COMIC}"
+		cd simutrans/pak192.comic || die
+		unpack "simutrans_coalwagonfix.rar" # Fixes invisible wagons.
+	fi
+
+	# Bundled text files are incomplete, bug #580948
+	cd "${S}/simutrans/text" || die
+	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	strip-flags # bug #293927
+
+	cat > config.default <<-EOF || die
+		BACKEND=mixer_sdl
+		OSTYPE=linux
+		MULTI_THREAD=1
+		USE_UPNP=$(usex upnp 1 0)
+		USE_FREETYPE=$(usex truetype 1 0)
+		USE_ZSTD=$(usex zstd 1 0)
+		VERBOSE=1
+		STATIC=0
+	EOF
+
+	# make it look in the install location for the data
+	sed -i -e "s:argv\[0\]:\"/usr/share/${PN}/\":" simmain.cc || die
+}
+
+src_compile() {
+	default
+
+	# Convert icon to PNG for Desktop Entry.
+	convert simutrans.ico simutrans.png || die
+}
+
+src_install() {
+	newbin build/default/sim ${PN}
+	insinto /usr/share/${PN}
+	doins -r simutrans/*
+	doicon simutrans.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}