gentoo auto-resync : 17:10:2023 - 04:01:13

5 files changed, 34 insertions, 104 deletions

diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 5a5d48a5088e..6c41322e8e25 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,6 +1,4 @@
-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
+AUX corsix-th-0.67-cmake_lua_detection.patch 965 BLAKE2B 3b1ec0a795793efd3a6765b83eeea503e624e778221426775f11bab6fbf03eca9da2265358111d816a8b8c0f0c3dc86a976e476d2732ec311d42a6177296a4db SHA512 5b375b190699e0dbd23c1f2683a0a065fe41f748ba492c2dfcc7d8eac7e9695119e392faa1c39eaa20b5a0093b479b9cf602ffef1bb260c27dc388e3ecce9f97
 DIST corsix-th-0.67.tar.gz 4127698 BLAKE2B 3b95b2439b779eab88a680fc3543fc4695cab7eac09ec2b20f892e95faaaf176c4d6c4862a9cd716958283922a7a6d8d1011346f1ef7c7a2f43ccca0c0b076c6 SHA512 b0e245a8aed9ad36e1040f88bbf8bf031bddf8dead0c59bc99a3c7f19cd6957c52e8185b2b737e78d57c73a58e460360428c81d5df1f6660aa17c7ec91ac62ba
-EBUILD corsix-th-0.66-r1.ebuild 1901 BLAKE2B 0e3161eae51fbcc795490e3a9182ef3be13adb1d79058c10435f647fe66340b62a19634f8335a14cefa4ef92af1c7c958f02d2833cdaaae1e2014dbce972147f SHA512 66224bc0718f3f0d0c297209334dc08dc6b5bec62073b46b23c34b00550ab9f420ad103db1706ca81c5c72e3f55c15170c91b3c1ecaf328305ff8bf1d1572f8e
-EBUILD corsix-th-0.67.ebuild 2031 BLAKE2B 436e7ffa5a506d31cbaa2bc8fbcebb201aa63d928dfa7d7a0fe1425bd9c2022d440e3a71e64fbc9d94955124f118a34ae32c0cc883dcb0bbd7fd752abe7f8e90 SHA512 e3278ddac798ec71b35b607d604d45e7ee28b416e76346187fc8a904aedf3dbd4b2de6620b8026c6bb855d4532a76f76fb7597426b9448ca9929afcfe6d62431
+EBUILD corsix-th-0.67.ebuild 1865 BLAKE2B 80252339231a35fac110af5407d1fdc116f335a463e97068fde13d1ee9d0237f39fb813fb2aa4e8bcde357787d78053c42a1f4335c5a4797a6db60e99df8c0ff SHA512 3e01e537ff39090d174aebf160a4c7a18d24e6796f086fa38ba491512a43d2e50b8c093e7d28e82260dfea31aaca01748e14c46465f5c79bb3a7dc9265e48d92
 MISC metadata.xml 780 BLAKE2B 604dff99fbb107226d6edf80a3648ebb5b7d5793745d4275ed106d8e313cbb2319510490279071807bc5bb293458c96a4f5f7a5e6442e397f2331d62f518d2ae SHA512 38586db6e150a9f87988c32e7e69afef5f079e1b49803452b4655a407bdc810b9d829be2406c278f81e315c11033d43e51afabef1a91c2c84638b6afab706c92
diff --git a/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
deleted file mode 100644
index 3ce5a4f5640f..000000000000
--- a/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 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"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="https://corsixth.com"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +midi +sound +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)
-		-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/corsix-th-0.67.ebuild b/games-simulation/corsix-th/corsix-th-0.67.ebuild
index fb20bf9d939b..abeaae5f4a0c 100644
--- a/games-simulation/corsix-th/corsix-th-0.67.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.67.ebuild
@@ -39,23 +39,23 @@ RDEPEND="${LUA_DEPS}
 
 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.
+# Although the docs could potentially be built with nearly any Lua version,
+# we need to ensure the necessary Lua modules are installed, so pin to the
+# same single version as runtime.
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
 		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			>=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+			>=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+		')
 	)
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.66-cmake_lua_detection.patch
+	"${FILESDIR}"/${PN}-0.67-cmake_lua_detection.patch
 )
 
 src_configure() {
diff --git a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
deleted file mode 100644
index f85d1bfb0b89..000000000000
--- a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
-index 1544810..05ed3b0 100644
---- a/CorsixTH/CMakeLists.txt
-+++ b/CorsixTH/CMakeLists.txt
-@@ -133,7 +133,7 @@ if(MSVC AND USE_VCPKG_DEPS)
-   target_link_libraries(CorsixTH_lib lua)
-   target_link_libraries(CorsixTH lua)
- else()
--  find_package(Lua REQUIRED)
-+  find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
-   if(Lua_FOUND OR LUA_FOUND)
-     target_link_libraries(CorsixTH ${LUA_LIBRARY})
-     include_directories(${LUA_INCLUDE_DIR})
diff --git a/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch b/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch
new file mode 100644
index 000000000000..b5a62a81a615
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch
@@ -0,0 +1,24 @@
+diff -Naur a/CMake/GenerateDoc.cmake b/CMake/GenerateDoc.cmake
+--- a/CMake/GenerateDoc.cmake	2023-08-06 04:02:29.000000000 +0100
++++ b/CMake/GenerateDoc.cmake	2023-10-16 23:26:11.527720737 +0100
+@@ -5,7 +5,7 @@
+   set(LUA_PROGRAM_NAMES lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 lua)
+ endif()
+ 
+-find_program(LUA_PROGRAM_PATH ${LUA_PROGRAM_NAMES}
++find_program(LUA_PROGRAM_PATH lua${LUA_VERSION}
+   PATHS
+     ENV LUA_DIR
+     /opt
+diff -Naur a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
+--- a/CorsixTH/CMakeLists.txt	2023-08-06 04:02:29.000000000 +0100
++++ b/CorsixTH/CMakeLists.txt	2023-10-16 23:23:20.119763454 +0100
+@@ -132,7 +132,7 @@
+   target_link_libraries(CorsixTH_lib lua)
+   target_link_libraries(CorsixTH lua)
+ else()
+-  find_package(Lua REQUIRED)
++  find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+   if(Lua_FOUND OR LUA_FOUND)
+     target_link_libraries(CorsixTH ${LUA_LIBRARY})
+     include_directories(${LUA_INCLUDE_DIR})