[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: d3560710d8e3b50c746a1a87ae057882dd77da6d
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Oct 16 22:44:44 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Oct 16 22:44:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3560710
games-simulation/corsix-th: Fix USE=doc with better Lua handling
We need to restrict to the requested Lua version and ensure the necessary
modules are installed for that version.
Closes: https://bugs.gentoo.org/915515
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/corsix-th-0.67.ebuild | 16 +++
.../files/corsix-th-0.66-cmake_lua_detection.patch | 13
.../files/corsix-th-0.67-cmake_lua_detection.patch | 24 ++
3 files changed, 32 insertions(+), 21 deletions(-)
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..
--- 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 ..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.0 +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.0 +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})
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: b3b2246f36c7fb60f32d7842ffef47c3d8869644
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Oct 16 22:22:48 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Oct 16 22:22:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b2246f
games-simulation/corsix-th: Drop old 0.66-r1
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/Manifest| 1 -
.../corsix-th/corsix-th-0.66-r1.ebuild | 79 --
2 files changed, 80 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index b4fd70bd35e8..d6025c582c40 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B
7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75
SHA512
a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
DIST corsix-th-0.67.tar.gz 4127698 BLAKE2B
3b95b2439b779eab88a680fc3543fc4695cab7eac09ec2b20f892e95faaaf176c4d6c4862a9cd716958283922a7a6d8d1011346f1ef7c7a2f43ccca0c0b076c6
SHA512
b0e245a8aed9ad36e1040f88bbf8bf031bddf8dead0c59bc99a3c7f19cd6957c52e8185b2b737e78d57c73a58e460360428c81d5df1f6660aa17c7ec91ac62ba
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..
--- 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/*
-}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 9c62025cc8b49fcec46ea3a3e11beb022d7bdf15
Author: Ian Jordan gmail com>
AuthorDate: Sun Aug 20 15:17:12 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Aug 20 15:34:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c62025c
games-simulation/corsix-th: add 0.67, drop 0.67_rc1
Version bump to 0.67 and drop the old the old rc ebuild.
Signed-off-by: Ian Jordan gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32393
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/Manifest | 2 +-
.../corsix-th/{corsix-th-0.67_rc1.ebuild => corsix-th-0.67.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index a581758847ff..b4fd70bd35e8 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1,2 @@
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
+DIST corsix-th-0.67.tar.gz 4127698 BLAKE2B
3b95b2439b779eab88a680fc3543fc4695cab7eac09ec2b20f892e95faaaf176c4d6c4862a9cd716958283922a7a6d8d1011346f1ef7c7a2f43ccca0c0b076c6
SHA512
b0e245a8aed9ad36e1040f88bbf8bf031bddf8dead0c59bc99a3c7f19cd6957c52e8185b2b737e78d57c73a58e460360428c81d5df1f6660aa17c7ec91ac62ba
diff --git a/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
b/games-simulation/corsix-th/corsix-th-0.67.ebuild
similarity index 100%
rename from games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
rename to games-simulation/corsix-th/corsix-th-0.67.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 00380b2bca5e2b862cfc468e1c1663b83d4780db
Author: Sam James gentoo org>
AuthorDate: Tue Aug 1 07:07:03 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 1 07:09:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00380b2b
games-simulation/corsix-th: add 0.67_rc1
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/Manifest| 1 +
.../corsix-th/corsix-th-0.67_rc1.ebuild| 84 ++
games-simulation/corsix-th/metadata.xml| 1 +
3 files changed, 86 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index b735a4821e26..a581758847ff 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
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
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 ..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 @@
Adds support for background MIDI music via
SDL_mixer
+ Build tools for decoding RNC files
CorsixTH/CorsixTH
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: e0d812916b3cb314e7e4c52d57fc8635f6b5a851
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 22 13:47:41 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 22 13:47:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d81291
games-simulation/corsix-th: Keyword 0.66-r1 ppc64, #852971
Signed-off-by: Arthur Zamarin gentoo.org>
games-simulation/corsix-th/corsix-th-0.66-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
index 37a6785596eb..3ce5a4f5640f 100644
--- a/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="doc +midi +sound +truetype +videos"
REQUIRED_USE="${LUA_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/
commit: 34a593eb8e020de51c9089a1024f88ee48a2cfc4
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Aug 12 17:14:32 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Aug 12 22:00:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a593eb
games-simulation/corsix-th: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.12
Closes: https://github.com/gentoo/gentoo/pull/26836
Signed-off-by: James Le Cuirot gentoo.org>
.../corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch | 11 ---
1 file changed, 11 deletions(-)
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
deleted file mode 100644
index d57fa953ad05..
--- a/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/CorsixTH/CMakeLists.txt
-+++ b/CorsixTH/CMakeLists.txt
-@@ -103,7 +103,7 @@
- endif()
-
- # Find Lua
--find_package(Lua REQUIRED)
-+find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
- if(Lua_FOUND)
- target_link_libraries(CorsixTH ${LUA_LIBRARY})
- include_directories(${LUA_INCLUDE_DIR})
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 1779bee58dcab39e746ee8791914c04a48b601f7
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 06:14:37 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1779bee5
games-simulation/corsix-th: drop 0.65.1
Signed-off-by: Ionen Wolkens gentoo.org>
games-simulation/corsix-th/Manifest| 1 -
games-simulation/corsix-th/corsix-th-0.65.1.ebuild | 82 --
2 files changed, 83 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 962ac658fb26..b735a4821e26 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B
c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706
SHA512
b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B
7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75
SHA512
a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
deleted file mode 100644
index 3ac363b27b5e..
--- a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~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.64-cmake_lua_detection.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-}
-
-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,CONTRIBUTING}.txt
-
- docinto html
- use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: 3879aa52afd9e9b5f9cacd67a5eb3a06b9806dee
Author: Sam James gentoo org>
AuthorDate: Fri Jul 1 09:44:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 1 09:45:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3879aa52
games-simulation/corsix-th: fix Lua detection
I swear I remember checking the compile lines, too! I dunno what happened there.
Signed-off-by: Sam James gentoo.org>
.../{corsix-th-0.66.ebuild => corsix-th-0.66-r1.ebuild}| 1 +
.../files/corsix-th-0.66-cmake_lua_detection.patch | 14 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.66.ebuild
b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
similarity index 98%
rename from games-simulation/corsix-th/corsix-th-0.66.ebuild
rename to games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
index 07f24a781502..37a6785596eb 100644
--- a/games-simulation/corsix-th/corsix-th-0.66.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
+ -DLUA_VERSION=$(lua_get_version)
-DWITH_AUDIO=$(usex sound)
-DWITH_FREETYPE2=$(usex truetype)
-DWITH_MOVIES=$(usex videos)
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
index b201aa4877f8..f85d1bfb0b89 100644
--- 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
@@ -1,13 +1,13 @@
diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
-index 1544810..d9d3332 100644
+index 1544810..05ed3b0 100644
--- a/CorsixTH/CMakeLists.txt
+++ b/CorsixTH/CMakeLists.txt
-@@ -129,7 +129,7 @@ endif()
-
- # Find Lua
- if(MSVC AND USE_VCPKG_DEPS)
-- find_package(Lua CONFIG REQUIRED)
-+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+@@ -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})
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: ddd0f32707c42ec68ba35206436f7d82e6043a0e
Author: Sam James gentoo org>
AuthorDate: Fri Jul 1 08:59:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 1 09:01:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd0f327
games-simulation/corsix-th: add 0.66
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/Manifest| 1 +
games-simulation/corsix-th/corsix-th-0.66.ebuild | 78 ++
.../files/corsix-th-0.66-cmake_lua_detection.patch | 13
3 files changed, 92 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 277c736b9d1e..962ac658fb26 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B
c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706
SHA512
b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
+DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B
7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75
SHA512
a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
diff --git a/games-simulation/corsix-th/corsix-th-0.66.ebuild
b/games-simulation/corsix-th/corsix-th-0.66.ebuild
new file mode 100644
index ..07f24a781502
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.66.ebuild
@@ -0,0 +1,78 @@
+# 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 ~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=(
+ -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/files/corsix-th-0.66-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
new file mode 100644
index ..b201aa4877f8
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
@@ -0,0 +1,13 @@
+diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
+index 1544810..d9d3332 100644
+--- a/CorsixTH/CMakeLists.txt
b/CorsixTH/CMakeLists.txt
+@@ -129,7 +129,7 @@ endif()
+
+ # Find Lua
+ if(MSVC AND USE_VCPKG_DEPS)
+- find_package(Lua CONFIG REQUIRED)
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ target_link_libraries(CorsixTH_lib lua)
+ target_link_libraries(CorsixTH lua)
+ else()
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: bef5143b5d54db208767761f67c2b3aacd3428f3
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 28 15:15:43 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 28 17:00:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef5143b
games-simulation/corsix-th: drop 0.64-r100
Signed-off-by: Ionen Wolkens gentoo.org>
games-simulation/corsix-th/Manifest| 1 -
.../corsix-th/corsix-th-0.64-r100.ebuild | 84 --
2 files changed, 85 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 9a1a9ef71ed6..277c736b9d1e 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B
2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe
SHA512
c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B
c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706
SHA512
b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
diff --git a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
deleted file mode 100644
index 3d8959f55a62..
--- a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit cmake lua-single xdg
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~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.64-cmake_lua_detection.patch
-)
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-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,CONTRIBUTING}.txt
-
- docinto html
- use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 3383482d8fb448bed9d52c4c4a36643a49cc3ca5
Author: Sam James gentoo org>
AuthorDate: Tue Oct 19 00:16:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 19 00:16:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3383482d
games-simulation/corsix-th: Keyword 0.65.1 arm64, #805494
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/corsix-th-0.65.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
index 96f236c3d3d..3ac363b27b5 100644
--- a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="doc +midi +sound +truetype +videos"
REQUIRED_USE="${LUA_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 12c08f2ccf2bea9d90f1ae882f49cd382369e6a2
Author: Sam James gentoo org>
AuthorDate: Fri Aug 6 12:50:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 6 12:57:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c08f2c
games-simulation/corsix-th: add 0.65.1
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/Manifest| 1 +
games-simulation/corsix-th/corsix-th-0.65.1.ebuild | 82 ++
2 files changed, 83 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 6e83b2aeb32..9a1a9ef71ed 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B
2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe
SHA512
c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
+DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B
c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706
SHA512
b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
new file mode 100644
index 000..96f236c3d3d
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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.64-cmake_lua_detection.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+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,CONTRIBUTING}.txt
+
+ docinto html
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 41e3dd0706dfb6c0175399b1f04bbf2a1c9fe61e
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Mar 26 00:41:06 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Mar 26 00:41:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e3dd07
games-simulation/corsix-th: update comment
Signed-off-by: Conrad Kostecki gentoo.org>
games-simulation/corsix-th/corsix-th-0.64-r100.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
index 0b163556250..3d8959f55a6 100644
--- a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
# 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:0 conflicts
+# 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="
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/, games-simulation/corsix-th/files/
commit: 38bd62d881868ba616b0ee043727fa05e8bb1b8c
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Jan 27 18:36:11 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Jan 27 18:36:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bd62d8
games-simulation/corsix-th: drop old version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
games-simulation/corsix-th/Manifest| 1 -
games-simulation/corsix-th/corsix-th-0.63.ebuild | 71 --
games-simulation/corsix-th/corsix-th-0.64.ebuild | 67
.../corsix-th/files/corsix-th-0.62-gcc-10.patch| 10 ---
4 files changed, 149 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index ae594593e6f..6e83b2aeb32 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B
a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1
SHA512
73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B
2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe
SHA512
c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
diff --git a/games-simulation/corsix-th/corsix-th-0.63.ebuild
b/games-simulation/corsix-th/corsix-th-0.63.ebuild
deleted file mode 100644
index 9a427ca8e03..000
--- a/games-simulation/corsix-th/corsix-th-0.63.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="http://corsixth.com;
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +midi +sound +truetype +videos"
-
-RDEPEND="
- >=dev-lang/lua-5.1:0
- >=dev-lua/luafilesystem-1.5
- >=dev-lua/lpeg-0.9
- >=dev-lua/luasocket-3.0_rc1-r4
- 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}"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
-app-doc/doxygen[dot]
->=dev-lang/lua-5.1:0
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.62-gcc-10.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -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,CONTRIBUTING}.txt
-
- docinto html
- use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
diff --git a/games-simulation/corsix-th/corsix-th-0.64.ebuild
b/games-simulation/corsix-th/corsix-th-0.64.ebuild
deleted file mode 100644
index 78a3d26cfd7..000
--- a/games-simulation/corsix-th/corsix-th-0.64.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="http://corsixth.com;
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +midi +sound +truetype +videos"
-
-RDEPEND="
- >=dev-lang/lua-5.1:0
- >=dev-lua/luafilesystem-1.5
- >=dev-lua/lpeg-0.9
- >=dev-lua/luasocket-3.0_rc1-r4
- 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}"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
-app-doc/doxygen[dot]
->=dev-lang/lua-5.1:0
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_AUDIO=$(usex sound)
- -DWITH_FREETYPE2=$(usex truetype)
- -DWITH_MOVIES=$(usex videos)
- )
- cmake_src_configure
-}
-
-src_compile() {
-
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/, games-simulation/corsix-th/files/, profiles/
commit: 93e915dd5b6402818089203c77228ad300e3047e
Author: Marek Szuba gentoo org>
AuthorDate: Tue Dec 1 00:12:15 2020 +
Commit: Marek Szuba gentoo org>
CommitDate: Tue Dec 1 00:17:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e915dd
games-simulation/corsix-th: migrate to lua-single.eclass
LuaJIT is in principle supported upstream but requires one to override
cmake detection of the Lua library, and more importantly
dev-lua/luasocket doesn't support this implementation yet.
PUC Lua 5.4 is known not to be supported yet, see e.g.
http://lua-users.org/lists/lua-l/2020-07/msg00047.html
Closes: https://bugs.gentoo.org/752954
Signed-off-by: Marek Szuba gentoo.org>
.../corsix-th/corsix-th-0.64-r100.ebuild | 84 ++
.../files/corsix-th-0.64-cmake_lua_detection.patch | 11 +++
profiles/package.mask | 1 +
3 files changed, 96 insertions(+)
diff --git a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
new file mode 100644
index 000..0b163556250
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit cmake lua-single xdg
+
+MY_PN="CorsixTH"
+MY_PV="$(ver_rs 2 -)"
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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:0 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.64-cmake_lua_detection.patch
+)
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+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,CONTRIBUTING}.txt
+
+ docinto html
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
new file mode 100644
index 000..d57fa953ad0
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.64-cmake_lua_detection.patch
@@ -0,0 +1,11 @@
+--- a/CorsixTH/CMakeLists.txt
b/CorsixTH/CMakeLists.txt
+@@ -103,7 +103,7 @@
+ endif()
+
+ # Find Lua
+-find_package(Lua REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ if(Lua_FOUND)
+ target_link_libraries(CorsixTH ${LUA_LIBRARY})
+ include_directories(${LUA_INCLUDE_DIR})
diff --git a/profiles/package.mask b/profiles/package.mask
index 4335da53185..bbaafb49b59 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -569,6 +569,7 @@ dev-lua/luacrypto
>=games-roguelike/stone-soup-0.25.1-r100
>=games-rpg/kqlives-0.99-r100
>=games-rpg/sumwars-0.5.8-r100
+>=games-simulation/corsix-th-0.64-r100
>=mail-filter/imapfilter-2.6.16-r100
>=media-gfx/geeqie-1.5.1-r1
>=media-sound/aqualung-1.1-r100
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: c947c0af699d8206b1a9a0d904de690ac13100a0
Author: Sam James gentoo org>
AuthorDate: Sun Aug 23 20:41:15 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 23 20:50:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c947c0af
games-simulation/corsix-th: bump to 0.64
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/Manifest | 1 +
games-simulation/corsix-th/corsix-th-0.64.ebuild | 67
2 files changed, 68 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 6ae73ede0f5..ae594593e6f 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B
a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1
SHA512
73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
+DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B
2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe
SHA512
c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
diff --git a/games-simulation/corsix-th/corsix-th-0.64.ebuild
b/games-simulation/corsix-th/corsix-th-0.64.ebuild
new file mode 100644
index 000..78a3d26cfd7
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.64.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+MY_PN="CorsixTH"
+MY_PV="$(ver_rs 2 -)"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="http://corsixth.com;
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +midi +sound +truetype +videos"
+
+RDEPEND="
+ >=dev-lang/lua-5.1:0
+ >=dev-lua/luafilesystem-1.5
+ >=dev-lua/lpeg-0.9
+ >=dev-lua/luasocket-3.0_rc1-r4
+ 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}"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+app-doc/doxygen[dot]
+>=dev-lang/lua-5.1:0
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -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,CONTRIBUTING}.txt
+
+ docinto html
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: c366cf3b7dd5f784913fcea74dc35b91fa80c0f9
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun May 24 08:23:46 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun May 24 08:24:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c366cf3b
games-simulation/corsix-th: drop libav USE reference
commit c4528e5ad7 ("migrate from libav") dropped IUSE=libav
but did not remove reference '-DWITH_LIBAV=$(usex libav)'
from src_configure().
This caused configure failure.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
games-simulation/corsix-th/corsix-th-0.63.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.63.ebuild
b/games-simulation/corsix-th/corsix-th-0.63.ebuild
index bc96a1a09dd..9a427ca8e03 100644
--- a/games-simulation/corsix-th/corsix-th-0.63.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.63.ebuild
@@ -52,7 +52,6 @@ src_configure() {
local mycmakeargs=(
-DWITH_AUDIO=$(usex sound)
-DWITH_FREETYPE2=$(usex truetype)
- -DWITH_LIBAV=$(usex libav)
-DWITH_MOVIES=$(usex videos)
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: c4528e5ad724ec6ac35c7239883e2a21f3aea0ef
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 25 20:17:59 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 25 20:18:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4528e5a
games-simulation/corsix-th: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada gentoo.org>
games-simulation/corsix-th/corsix-th-0.63.ebuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.63.ebuild
b/games-simulation/corsix-th/corsix-th-0.63.ebuild
index 5364f218f86..bc96a1a09dd 100644
--- a/games-simulation/corsix-th/corsix-th-0.63.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.63.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc libav +midi +sound +truetype +videos"
+IUSE="doc +midi +sound +truetype +videos"
RDEPEND="
>=dev-lang/lua-5.1:0
@@ -25,10 +25,7 @@ RDEPEND="
media-libs/libsdl2[opengl,video]
sound? ( media-libs/sdl2-mixer[midi?] )
truetype? ( >=media-libs/freetype-2.5.3:2 )
- videos? (
- !libav? ( >=media-video/ffmpeg-2.2.3:0= )
- libav? ( >=media-video/libav-11.1:0= )
- )
+ videos? ( >=media-video/ffmpeg-2.2.3:0= )
"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: 4e55fb6ab69ba80761f7addeb6e6314aa4ae5989
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Mar 27 21:46:57 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Mar 27 21:46:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e55fb6a
games-simulation/corsix-th: Drop old 0.62
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/Manifest | 1 -
games-simulation/corsix-th/corsix-th-0.62.ebuild | 58
2 files changed, 59 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 96a770db1b7..6ae73ede0f5 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST corsix-th-0.62.tar.gz 3461932 BLAKE2B
5497cc944e51d80216f2b159249268a056193ef48837aa887d9ab8e7fd2e3134ae6f9517a6b2bd9293a97543dcc91dd76d5ce22e212f13dd7c02a79318c7ede6
SHA512
64fe4a6124cbf2e76934f2c081641119ded7292ce89124dee26c99c1d99f1979f9c520e73a403f0de751072bfd049a809773d6a919b7240b8a6e6b7aa1361bf0
DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B
a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1
SHA512
73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
diff --git a/games-simulation/corsix-th/corsix-th-0.62.ebuild
b/games-simulation/corsix-th/corsix-th-0.62.ebuild
deleted file mode 100644
index b7772ebb338..000
--- a/games-simulation/corsix-th/corsix-th-0.62.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop eapi7-ver gnome2-utils
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="http://corsixth.com;
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libav +midi +sound +truetype +videos"
-
-RDEPEND=">=dev-lang/lua-5.1:0
- >=dev-lua/luafilesystem-1.5
- >=dev-lua/lpeg-0.9
- >=dev-lua/luasocket-3.0_rc1-r4
- media-libs/libsdl2[opengl,video]
- sound? ( media-libs/sdl2-mixer[midi?] )
- truetype? ( >=media-libs/freetype-2.5.3:2 )
- videos? (
- !libav? ( >=media-video/ffmpeg-2.2.3:0= )
- libav? ( >=media-video/libav-11.1:0= )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_AUDIO="$(usex sound)"
- -DWITH_FREETYPE2="$(usex truetype)"
- -DWITH_LIBAV="$(usex libav)"
- -DWITH_MOVIES="$(usex videos)"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc {changelog,CONTRIBUTING}.txt
-
- newicon -s scalable CorsixTH/Original_Logo.svg ${PN}.svg
- make_desktop_entry ${PN} "${MY_PN}"
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: eedf648b5b7a7475e9df47359106a81e0efeb5f6
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Mar 27 21:45:52 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Mar 27 21:45:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedf648b
games-simulation/corsix-th: Version bump to 0.63, EAPI 7
Closes: https://bugs.gentoo.org/714878
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/Manifest | 1 +
games-simulation/corsix-th/corsix-th-0.63.ebuild | 75
2 files changed, 76 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index eb924872465..96a770db1b7 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
DIST corsix-th-0.62.tar.gz 3461932 BLAKE2B
5497cc944e51d80216f2b159249268a056193ef48837aa887d9ab8e7fd2e3134ae6f9517a6b2bd9293a97543dcc91dd76d5ce22e212f13dd7c02a79318c7ede6
SHA512
64fe4a6124cbf2e76934f2c081641119ded7292ce89124dee26c99c1d99f1979f9c520e73a403f0de751072bfd049a809773d6a919b7240b8a6e6b7aa1361bf0
+DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B
a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1
SHA512
73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
diff --git a/games-simulation/corsix-th/corsix-th-0.63.ebuild
b/games-simulation/corsix-th/corsix-th-0.63.ebuild
new file mode 100644
index 000..5364f218f86
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.63.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+MY_PN="CorsixTH"
+MY_PV="$(ver_rs 2 -)"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="http://corsixth.com;
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc libav +midi +sound +truetype +videos"
+
+RDEPEND="
+ >=dev-lang/lua-5.1:0
+ >=dev-lua/luafilesystem-1.5
+ >=dev-lua/lpeg-0.9
+ >=dev-lua/luasocket-3.0_rc1-r4
+ media-libs/libsdl2[opengl,video]
+ sound? ( media-libs/sdl2-mixer[midi?] )
+ truetype? ( >=media-libs/freetype-2.5.3:2 )
+ videos? (
+ !libav? ( >=media-video/ffmpeg-2.2.3:0= )
+ libav? ( >=media-video/libav-11.1:0= )
+ )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+app-doc/doxygen[dot]
+>=dev-lang/lua-5.1:0
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.62-gcc-10.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_AUDIO=$(usex sound)
+ -DWITH_FREETYPE2=$(usex truetype)
+ -DWITH_LIBAV=$(usex libav)
+ -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,CONTRIBUTING}.txt
+
+ docinto html
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: 610bb3553288b51ec7e013b2c0f6e18bca930758
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Feb 13 00:11:54 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Feb 13 00:12:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610bb355
games-simulation/corsix-th: tweak for gcc-10
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
games-simulation/corsix-th/corsix-th-0.62.ebuild | 4 +++-
games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch | 10 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.62.ebuild
b/games-simulation/corsix-th/corsix-th-0.62.ebuild
index dd775153d21..b7772ebb338 100644
--- a/games-simulation/corsix-th/corsix-th-0.62.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
src_configure() {
local mycmakeargs=(
-DWITH_AUDIO="$(usex sound)"
diff --git a/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
b/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
new file mode 100644
index 000..ff820f44946
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
@@ -0,0 +1,10 @@
+--- a/CorsixTH/Src/th_lua_map.cpp
b/CorsixTH/Src/th_lua_map.cpp
+@@ -26,6 +26,7 @@ SOFTWARE.
+ #include
+ #include
+ #include
++#include /* std::out_of_range */
+
+ static const int player_max = 4;
+
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: da2d7e252b8ccb3806c94fa7eddf7c4497cc08aa
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Sep 1 14:25:02 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Sep 1 14:25:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2d7e25
games-simulation/corsix-th: Revive package following last-rites
This was dropped due to lack of ffmpeg 3 support. This has since been
fixed and it supports ffmpeg 4 too. Last-riting could have been
avoided if the videos USE flag had been added and masked.
I'd like to add a theme-hospital-data package but not today.
Bug: https://bugs.gentoo.org/592700
Package-Manager: Portage-2.3.48, Repoman-2.3.10
games-simulation/corsix-th/Manifest | 1 +
games-simulation/corsix-th/corsix-th-0.62.ebuild | 56
games-simulation/corsix-th/metadata.xml | 20 +
3 files changed, 77 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
new file mode 100644
index 000..eb924872465
--- /dev/null
+++ b/games-simulation/corsix-th/Manifest
@@ -0,0 +1 @@
+DIST corsix-th-0.62.tar.gz 3461932 BLAKE2B
5497cc944e51d80216f2b159249268a056193ef48837aa887d9ab8e7fd2e3134ae6f9517a6b2bd9293a97543dcc91dd76d5ce22e212f13dd7c02a79318c7ede6
SHA512
64fe4a6124cbf2e76934f2c081641119ded7292ce89124dee26c99c1d99f1979f9c520e73a403f0de751072bfd049a809773d6a919b7240b8a6e6b7aa1361bf0
diff --git a/games-simulation/corsix-th/corsix-th-0.62.ebuild
b/games-simulation/corsix-th/corsix-th-0.62.ebuild
new file mode 100644
index 000..dd775153d21
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.62.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop eapi7-ver gnome2-utils
+
+MY_PN="CorsixTH"
+MY_PV="$(ver_rs 2 -)"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="http://corsixth.com;
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libav +midi +sound +truetype +videos"
+
+RDEPEND=">=dev-lang/lua-5.1:0
+ >=dev-lua/luafilesystem-1.5
+ >=dev-lua/lpeg-0.9
+ >=dev-lua/luasocket-3.0_rc1-r4
+ media-libs/libsdl2[opengl,video]
+ sound? ( media-libs/sdl2-mixer[midi?] )
+ truetype? ( >=media-libs/freetype-2.5.3:2 )
+ videos? (
+ !libav? ( >=media-video/ffmpeg-2.2.3:0= )
+ libav? ( >=media-video/libav-11.1:0= )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_AUDIO="$(usex sound)"
+ -DWITH_FREETYPE2="$(usex truetype)"
+ -DWITH_LIBAV="$(usex libav)"
+ -DWITH_MOVIES="$(usex videos)"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc {changelog,CONTRIBUTING}.txt
+
+ newicon -s scalable CorsixTH/Original_Logo.svg ${PN}.svg
+ make_desktop_entry ${PN} "${MY_PN}"
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-simulation/corsix-th/metadata.xml
b/games-simulation/corsix-th/metadata.xml
new file mode 100644
index 000..0f951195238
--- /dev/null
+++ b/games-simulation/corsix-th/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ ga...@gentoo.org
+ Gentoo Games Project
+
+
+ A reimplementation of the 1997 Bullfrog business sim Theme
+ Hospital. As well as faithfully recreating the original,
+ CorsixTH adds support for modern operating systems (Windows,
+ Mac OSX and Linux), high resolutions and much more.
+
+
+ Adds support for background MIDI music via
SDL_mixer
+
+
+ CorsixTH/CorsixTH
+
+
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: d653fa1a30f00348b4f60071ace39d99708716b0 Author: Austin English gentoo org> AuthorDate: Thu Jul 7 19:41:49 2016 + Commit: Austin English gentoo org> CommitDate: Thu Jul 7 19:47:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d653fa1a games-simulation/corsix-th: add maintainer-needed Package-Manager: portage-2.2.28 games-simulation/corsix-th/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml index a06c45a..4cefea4 100644 --- a/games-simulation/corsix-th/metadata.xml +++ b/games-simulation/corsix-th/metadata.xml @@ -1,6 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> + Use ffmpeg for playing in-game cutscenes. Use OpenGL for rendering.
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: b910c431f6d5de58283fe504c1896c763dfaacea Author: Patrick Lauer gentoo org> AuthorDate: Sun May 22 12:01:01 2016 + Commit: Patrick Lauer gentoo org> CommitDate: Sun May 22 12:01:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b910c431 games-simulation/corsix-th: Remove unneeded useflag description from metadata.xml Package-Manager: portage-2.2.28 games-simulation/corsix-th/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml index d45c30b..a06c45a 100644 --- a/games-simulation/corsix-th/metadata.xml +++ b/games-simulation/corsix-th/metadata.xml @@ -4,11 +4,8 @@ Use ffmpeg for playing in-game cutscenes. Use OpenGL for rendering. - Use SDL for rendering. Use SDL mixer for in-game sound. - Build the map editor (needs opengl enabled!). - - Use SDL mixer and timidity for in-game music. + Build the map editor (needs opengl enabled!). Use high quality fonts.
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/
commit: d25cd07865add490effebee76f8fc1f6085f8319 Author: Pacho Ramos gentoo org> AuthorDate: Sat May 21 15:08:05 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat May 21 15:35:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25cd078 games-simulation/corsix-th: Cleanup due to #231915 Package-Manager: portage-2.3.0_rc1 games-simulation/corsix-th/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml index 5259313..d45c30b 100644 --- a/games-simulation/corsix-th/metadata.xml +++ b/games-simulation/corsix-th/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - mik...@gentoo.org - Angelo Arrifano - Use ffmpeg for playing in-game cutscenes. Use OpenGL for rendering.
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: cb96db1781055042994e7cb7815e7c8ee231d75d
Author: Pacho Ramos gentoo org>
AuthorDate: Sat May 21 15:08:44 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat May 21 15:35:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb96db17
games-simulation/corsix-th: drop old
Package-Manager: portage-2.3.0_rc1
games-simulation/corsix-th/Manifest| 1 -
.../corsix-th/corsix-th-0.21-r1.ebuild | 62 --
.../corsix-th/files/corsix-th-0.21-naming.patch| 17 --
.../corsix-th/files/corsix-th-nodoc.patch | 11
4 files changed, 91 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 53f07f3..55ea375 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST CorsixTH-0.21-Source.tar.gz 3908197 SHA256
9a8b54644e614dc13d4b5d97bf023b8e023e0186f931695b8f4ec7e4577a4ead SHA512
6f75772a7af0a09d216f042eda437e4159061637b404c0282472dab4751b7d515e25c6a922bb51051cfe7c351396491ac68d7969e3f37dafb1862fb6c85b6b52
WHIRLPOOL
69e3a57581e0a7446fda839284d2200ed8be559403504a42cfa187c8180689b175a96fb7b15b2b124ac3605dd936190f8ee882f4ea464acdc81157f598b0b20a
DIST corsix-th-0.30.tar.gz 4345385 SHA256
4947ebdc50b01fde0aca797250d50b9806b9e6f3f4323872fd914f033f4c92e7 SHA512
1afd9d68dd6db82393e454e2c234179029902b701aafe4d2ca76381be195acba55f0ee062ce071a78cf3f5e8762e25452f386276aecc1af816553532b870964a
WHIRLPOOL
b01a1d72c0408c1d7d7d0a72e55c9b9f0863acfe064c07f4920c3f66bfb29fb0acf0a7e4e1d80e214b2e81d073e070427fbd8fca9cd34e14cda561159a88d4d0
diff --git a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
b/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
deleted file mode 100644
index 663f04f..000
--- a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils games
-
-MY_P="CorsixTH-${PV}-Source"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="https://code.google.com/p/corsix-th/;
-SRC_URI="https://corsix-th.googlecode.com/files/${MY_P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg truetype opengl +sdl +sound +midi"
-REQUIRED_USE="|| ( sdl opengl )"
-
-RDEPEND=">=dev-lang/lua-5.1
- media-libs/libsdl[X]
- ffmpeg? ( virtual/ffmpeg )
- truetype? ( media-libs/freetype:2 )
- opengl? ( virtual/opengl )
- sound? ( media-libs/sdl-mixer )
- midi? ( media-libs/sdl-mixer[timidity] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-nodoc.patch"
-
- # Use a coherent naming for installation dir
- epatch "${FILESDIR}/${P}-naming.patch"
-}
-
-src_configure() {
- local mycmakeargs="$(cmake-utils_use_with opengl OPENGL) \
- $(cmake-utils_use_with sdl SDL) \
- $(cmake-utils_use_with sound AUDIO) \
- $(cmake-utils_use_with truetype FREETYPE2) \
- $(cmake-utils_use_with ffmpeg MOVIES) \
- -DCMAKE_INSTALL_PREFIX=${GAMES_DATADIR}"
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- DOCS="CorsixTH/README.txt CorsixTH/changelog.txt"
cmake-utils_src_install
- games_make_wrapper ${PN} "${GAMES_DATADIR}/${PN}/CorsixTH" || die
- make_desktop_entry ${PN} ${PN} \
- "${GAMES_DATADIR}/${PN}/CorsixTH.ico"
- prepgamesdirs
-}
diff --git a/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
b/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
deleted file mode 100644
index b82b5fa..000
--- a/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
+++ /dev/null
@@ -1,17 +0,0 @@
CorsixTH/CMakeLists.txt2013-07-26 19:35:30.463506153 +0200
-+++ CorsixTH/CMakeLists.txt.new2013-07-26 19:38:07.944473631 +0200
-@@ -222,10 +222,10 @@
- ENDIF()
-
- ELSE()
-- install(TARGETS CorsixTH RUNTIME DESTINATION CorsixTH)
-- install(DIRECTORY Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE)
-- install(DIRECTORY Bitmap DESTINATION CorsixTH
-+ install(TARGETS CorsixTH RUNTIME DESTINATION corsix-th)
-+ install(DIRECTORY Lua Levels DESTINATION corsix-th PATTERN "*.svn" EXCLUDE)
-+ install(DIRECTORY Bitmap DESTINATION corsix-th
- FILES_MATCHING REGEX ".*\\.(tab|pal|dat|png)$"
- PATTERN "*.svn" EXCLUDE)
-- install(FILES CorsixTH.lua CorsixTH.ico DESTINATION CorsixTH )
-+ install(FILES CorsixTH.lua CorsixTH.ico DESTINATION corsix-th )
- ENDIF()
diff --git a/games-simulation/corsix-th/files/corsix-th-nodoc.patch
b/games-simulation/corsix-th/files/corsix-th-nodoc.patch
deleted file mode 100644
index 0fcae9b..000
---
