gentoo resync : 14.12.2020

6 files changed, 99 insertions, 2 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 640948841f11..58a3d348fb73 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 467c225a0a11..3ea59dee6d5b 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,6 +1,8 @@
 AUX corsix-th-0.62-gcc-10.patch 241 BLAKE2B 78ab7aebd36fe16b63e111f459f324f3165a3df99f29771584c074fbd7fa29849e9e9d66b55592340b6292a48006ab003f2f09a767a58e5f40fe9630eae25075 SHA512 a85c8613ab94903db4b42f74c326620f81c6f9212a78b42e656b57e00c455fba7c457469e07c7ab9a144032e7d3aa244fdc269c3aa520fdbd9bf4c373fd766ed
+AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5581dfec0a290966ef0ec79c977b69575b26a22843829679a7c0225caabe2b570b9b6a38e025115f3a2cf0597b0dad9dc78f01f36d SHA512 52dc61c7aa8c170da225801f2eb06140e9dc28c4d55853eac99b573475a21fb03b945de676898719927abd517b34ecce2aa5c4998ac6e6fcc673cf2aaf7cdb9e
 DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1 SHA512 73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
 EBUILD corsix-th-0.63.ebuild 1314 BLAKE2B 7dbb0afc14be51a70fde1630be9c41249623019123d03008d65f2d163a884f4d81fcfb9738f51f34dafaef02d48566a08e6ffc23e82111746344109897c8abec SHA512 175d20ab2a78cec92982a4a337670243d1281ba0f5ce95e0c5f68240e3634fca20d4ccd9897739d87d46e821bee8e5e19f1ebbbb4bac0ef6231ad95cc7928f6b
+EBUILD corsix-th-0.64-r100.ebuild 1954 BLAKE2B 10cc84893f919fab0639b986956fc5ac503b15fb948549a71f581b96ab3c62f0deb163729c729d656aa9c868a6e0c33710836a0f02a98bb137782204347c06f0 SHA512 b46c422d3e28c50d416fefa5b0c9de5865fb2825c27306c9dc09eb570fbc363af8214710dd9a96713d20dfc740a012b1f99aafd8cefc35789ad0b86754a2e2e5
 EBUILD corsix-th-0.64.ebuild 1262 BLAKE2B dfc654c386e0fd18f4117c357d43652b75c2c152f59794d9ed20f84eb3604f51bd26503596819a26dfac31e3cda622bebe44c05a5733f31ef5220b64a09441e9 SHA512 5cc2438eb9a63d6ed3f2fb92d9a07f4587b3c3b187b9834edea1b2f3b4ce8bfe5e7538e8e839b23dc87be5af18253d4f6e1d8db079acd5be32dfcbe78b90cff9
 MISC metadata.xml 716 BLAKE2B 16fe66f9f3fce58b6b17df3906fdcf4e9b7a9a49be872ba69cd5deeb47bffca495ff3a8b8c89fc71cbe8b3960954a462aff8c10c6afd34c18acef95931c382f8 SHA512 643ef59451c07fd3e61b22fb9891cc2478dff78c1e2a50ed455b15bf1c01e49d384af177c687e48b2bd6590278ac121458a94760a25bdc064ce309ff5ab3b868
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 000000000000..0b163556250d
--- /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 000000000000..d57fa953ad05
--- /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/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 85dd80da78ed..6bf3afc785d4 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -11,6 +11,6 @@ DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b680
 DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 EBUILD openrct2-0.3.0-r1.ebuild 3939 BLAKE2B 54a337d6885a3dcb7b22125c1c486e00c4e56c89337af2b82594a5c240fc9db52948d80d0f1a6469014880820cc63a13865c49015ba51acf4c314ec956dc0fc1 SHA512 49ef33f4b00dfa6794a16bef60f4e46ac7f63dd76dfe4308961d95af06a9cae4add7966a7a468753dc50c2693a84369899182981e3a0e82013a796458a08e9cf
-EBUILD openrct2-0.3.2-r1.ebuild 3964 BLAKE2B 8ad3b267b1058565019e18cb3b0651c725921015b66ef13e8bab8cd4c49f195bfee832594775ab7f1de5bebe1fd69c0e4c1094a353b754c9fc42f881e488b0ab SHA512 a715ed53899dc872949ffbe4366dcdc03a80e59fd492a5fe510c5b70f092428d96094f2fd38408e8f0fd88a69897b14e4fdb75d64e5fdaa66f41449daa8ed655
+EBUILD openrct2-0.3.2-r1.ebuild 3963 BLAKE2B ce8a4f7c0a9ee9e7777f5511f4d679ce0172179ea18d6452d98abd40473dea01879b6cbe42d0bf1faad0a63073539e40178fc03ada7bf8aec977387d57de1eef SHA512 577c8dd7f6f7f948caf2a3b6e32d57835d2ec4dfe5619e0fc163b90639b9083e9db669c5f23ab1833dcc330094774e2149301256a6e70242edb5f046ee211b31
 EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d37135db8e8d701a80658aa26906dfa5c863d2bc1096eeb8860e7cb34d9bb4b12f812010d8333a0c75b34214741fbaf54fee1f183dd6280a2b81baa9c4d0755 SHA512 f9e65e96326e2c012aa1e2bd79576dee7da6f925cb7ba835afb54d8f1b3f950a4ec8edd5d3683e423731e437a75b31f260696b2645c5434af6a240d95ea05d87
 MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
index f27d85fc6c3c..5a1847da7c74 100644
--- a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="