7 files changed, 90 insertions, 136 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index b2e10f3b7654..24d920a8787e 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 58320325752c..86e0c03102d5 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,4 +1,6 @@
 AUX corsix-th-0.66-cmake_lua_detection.patch 499 BLAKE2B 939992cced1c18dc5a6c53b892e8d2adbe084e9bf028c4c858e3c809a4bc5df0b304aae020994d8b94052bcda60486affb080096c688eb6120950ea626f5db9b SHA512 bcdbbe851610afb863b6c58700ab03f3c426cd6f9a9795d853a819bde3e9ac0d89a1d99eb04f2559f9ac80344c03aa1fc8c99cbc80c7b81e4e3739af6db6bdf4
 DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B 7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75 SHA512 a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
+DIST corsix-th-0.67_rc1.tar.gz 4127427 BLAKE2B c6f7c40dac0780b0c00de0ec7432b86aa4c09a0ffb0eaf87e58abee7b934b2c9fc9e151b86a7edf588ca1a65d42b27eeb9f63ec64f1a5250e2b7e1f60d2d3226 SHA512 cb104ba81a1c70bcdf49f0659bd544fc003b8a89dd8bbfa504676086da35b4817702b02933b4fcf239f6ac784c091d28867db246a8f6242952f3abdfdb959690
 EBUILD corsix-th-0.66-r1.ebuild 1901 BLAKE2B 0e3161eae51fbcc795490e3a9182ef3be13adb1d79058c10435f647fe66340b62a19634f8335a14cefa4ef92af1c7c958f02d2833cdaaae1e2014dbce972147f SHA512 66224bc0718f3f0d0c297209334dc08dc6b5bec62073b46b23c34b00550ab9f420ad103db1706ca81c5c72e3f55c15170c91b3c1ecaf328305ff8bf1d1572f8e
-MISC metadata.xml 717 BLAKE2B c32582188f6a89239fbec43977d4d126075de2d599c8496ebf01e0a7d919550739913d0290afb24544cc8ea4ff2177a89bbcdaa14ba5e4654d8a7f7db07be294 SHA512 3b3387491e7c51efcc777675e9b996c5648b8e0f5fc7319345a500e60aad08c2a5ca5a9fc0d46928fc60346151232daaf719e7a5ed5fb8a1bc03c40313652ca5
+EBUILD corsix-th-0.67_rc1.ebuild 2031 BLAKE2B 436e7ffa5a506d31cbaa2bc8fbcebb201aa63d928dfa7d7a0fe1425bd9c2022d440e3a71e64fbc9d94955124f118a34ae32c0cc883dcb0bbd7fd752abe7f8e90 SHA512 e3278ddac798ec71b35b607d604d45e7ee28b416e76346187fc8a904aedf3dbd4b2de6620b8026c6bb855d4532a76f76fb7597426b9448ca9929afcfe6d62431
+MISC metadata.xml 780 BLAKE2B 604dff99fbb107226d6edf80a3648ebb5b7d5793745d4275ed106d8e313cbb2319510490279071807bc5bb293458c96a4f5f7a5e6442e397f2331d62f518d2ae SHA512 38586db6e150a9f87988c32e7e69afef5f079e1b49803452b4655a407bdc810b9d829be2406c278f81e315c11033d43e51afabef1a91c2c84638b6afab706c92
diff --git a/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild b/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
new file mode 100644
index 000000000000..fb20bf9d939b
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake lua-single xdg
+
+MY_PN="CorsixTH"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="https://corsixth.com"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+IUSE="doc +midi +sound tools +truetype +videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		>=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+		>=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+		>=dev-lua/luasocket-3.0_rc1-r4[${LUA_USEDEP}]
+	')
+	media-libs/libsdl2[opengl,video]
+	sound? ( media-libs/sdl2-mixer[midi?] )
+	truetype? ( >=media-libs/freetype-2.5.3:2 )
+	videos? ( >=media-video/ffmpeg-2.2.3:0= )
+"
+
+DEPEND="${RDEPEND}"
+
+# Technically, build-time generation of documentation could use any version
+# of Lua (or to be precise: if in src_configure cmake has been told to use
+# LuaJIT documentation generation looks for LuaJIT, otherwise any
+# dev-lang/lua slot will do; see the first few lines of the bundled file
+# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
+# with the other slots of same, try to keep the deptree sane until we get
+# rid of unslotted Lua.
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		${LUA_DEPS}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.66-cmake_lua_detection.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(lua_get_version)
+		-DBUILD_TOOLS=$(usex tools)
+		-DWITH_AUDIO=$(usex sound)
+		-DWITH_FREETYPE2=$(usex truetype)
+		-DWITH_MOVIES=$(usex videos)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	dodoc changelog.txt CONTRIBUTING.md
+
+	docinto html
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml
index 3dac5f6d9022..500a549db1fe 100644
--- a/games-simulation/corsix-th/metadata.xml
+++ b/games-simulation/corsix-th/metadata.xml
@@ -13,6 +13,7 @@
 	</longdescription>
 	<use>
 		<flag name="midi">Adds support for background MIDI music via SDL_mixer</flag>
+		<flag name="tools">Build tools for decoding RNC files</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">CorsixTH/CorsixTH</remote-id>
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 04bb32a787df..53bdebb7fe2f 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,10 +1,8 @@
 AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358
 AUX openttd.confd-r1 376 BLAKE2B 9208c9da8c90d74d36204c2c78f14b28fa3bf5ec730e2f56b6ae163b474b2169b003fb4d869810a2404cc0ad2e0e5bf9c78417057a762e965787b955431db629 SHA512 a3ca192781b0bf4a1105f13890bc34b3d68a365637adb2254b7b048fa5a1fde80b95415711010b8144135465c2a9cd1a8822cc3bbd2e0161a728c16acb1d0509
 AUX openttd.initd-r3 1052 BLAKE2B b4f57691ef749e8aae4be2fb3cf1826b00fa609afbd1f0d863fb6177fe70e4b6254831ea5c89aa74bac9e2dfddf050656dc43790a412870add8baefeb57d9500 SHA512 5064fb633aea2d2720f189a3a5a9f07541394d7760274465bd9837ec4a04009597b984821424f234941972958754db33bc5cc174b7b075c8915fb2231dd3e6f8
-DIST openttd-13.0-source.tar.xz 7422316 BLAKE2B 8aa384847681a61c74e1d56c86600fe7ba273d4721bf2b290dcbdced830e7b6872ae458d02d986877c92d5027bbfe8e9eccbcc74b791b3e9332c142fbc078953 SHA512 a2436eb8aae6967e1e3bcf5f67c2346a8f80af723509d668157e785424c2245086b10077783857acf8840068a37a0e9094f04fda36887ef7e799f360075a8e8a
-DIST openttd-13.1-source.tar.xz 7407360 BLAKE2B 2d289defa38583c95f90322964ba43756468d7fa50087267119f00ccc3688e68e22631f41b091d44b1afaa878f8621f27ba58a0623d5be9420b61833dba8d6e7 SHA512 059eb71da295e8d7bdf939d9c02ff0bb5dbfbfe3fe1f40e7d370918b4c6b7a57c56d039a72c3fb42067159cbb08d956d07f700828f8a9e1e938a5d6550033813
 DIST openttd-13.3-source.tar.xz 7417568 BLAKE2B dbeacb0e40af76feda5fd9946a63267e4ce9f342be4479bca24e04be7dbf05453184396e2b78f62ee045d636f70f5969ee1b1f045c68961a80875f7788a570d2 SHA512 bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
-EBUILD openttd-13.0.ebuild 3667 BLAKE2B 0614a19402473bff873779d828df265be0a017a7b97ea34c1c80e9f7071a7351c781356581c3d68e2150820d4c2301ff4a2a5e058cf06a25e86e68c3bcf64299 SHA512 5e3f315c26d01f4c0034a102de0476899bcd7895e91ab6605ef060c2165d4021ab397be9bde27f68a4396bfa3dda9cee2598707a0b9a863a56955784c1067b76
-EBUILD openttd-13.1.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
+DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
 EBUILD openttd-13.3.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
+EBUILD openttd-13.4.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf
diff --git a/games-simulation/openttd/openttd-13.0.ebuild b/games-simulation/openttd/openttd-13.0.ebuild
deleted file mode 100644
index abf0f06f0a0e..000000000000
--- a/games-simulation/openttd/openttd-13.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-RDEPEND="
-	dedicated? (
-		acct-group/openttd
-		acct-user/openttd
-		app-misc/dtach
-	)
-	!dedicated? (
-		allegro? ( media-libs/allegro:5 )
-		fluidsynth? ( media-sound/fluidsynth )
-		icu? (
-			dev-libs/icu-layoutex:=
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		sdl? ( media-libs/libsdl2[sound,video] )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=games-util/grfcodec-6.0.6_p20210310
-	virtual/pkgconfig
-"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			>=games-misc/openmsx-0.4.0
-			>=games-misc/opensfx-1.0.1
-		)
-	)
-	openmedia? ( >=games-misc/opengfx-0.6.1 )
-	timidity? ( media-sound/timidity++ )
-"
-
-DOCS=( docs/directory_structure.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_prepare() {
-	# Drop automagic LTO usage
-	sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die
-
-	# Don't force _FORTIFY_SOURCE via CMake
-	# (we already set it in the toolchain by default with a minimum level
-	# of _FORTIFY_SOURCE=2)
-	sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR=bin
-		-DCMAKE_INSTALL_DATADIR=share
-		-DOPTION_DEDICATED=$(usex dedicated)
-		-DOPTION_USE_ASSERTS=$(usex debug)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		# N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
-		# with USE="allegro -sdl" combination flags. There no other way to
-		# completely disable SDL1 support.
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use dedicated ; then
-		newconfd "${FILESDIR}"/openttd.confd-r1 openttd
-		newinitd "${FILESDIR}"/openttd.initd-r3 openttd
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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 shared or personal location."
-		elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info."
-		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"
-	fi
-}
diff --git a/games-simulation/openttd/openttd-13.1.ebuild b/games-simulation/openttd/openttd-13.4.ebuild
index 20010db20802..20010db20802 100644
--- a/games-simulation/openttd/openttd-13.1.ebuild
+++ b/games-simulation/openttd/openttd-13.4.ebuild