gentoo resync : 17.07.2021

6 files changed, 175 insertions, 4 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index fcc1f3d8be3c..7e8283aafe2f 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 9f8eeaac40e2..a6c70f40083e 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,5 +9,5 @@ AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9de
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 EBUILD openmw-0.46.0-r2.ebuild 4282 BLAKE2B 78ebe705fe5e2365b3a2e0684d7e8bffd4ea6c94e0890d4e67377d5b6b03dd6c86c13861106c660cc65c39691d4c4df1f09d016fcf5f5eafa65c0d1412b14d61 SHA512 0c77d328ff9398cb7fe361c5ce19653905adf41030e7f041be9a9948b4c88c1a3e84b0283e32afb960c8f30cd55d2019b128c2fb1ab9887ad678b072865dc969
-EBUILD openmw-9999.ebuild 3727 BLAKE2B 554dc7681cf47861b0e970387391ebb5f4f4a843cc73b6a8795c83bdd4a71133ca86b6b99dce2ff1972fc464d039183a3f46e9f34a59e13c101e93b78ae2a21f SHA512 a0030693c3b0f237a470da259ecf705101b2c217aeaa551ee0234d95b45f941eb388993681b4254fcb8f1d85c20df5292d541fd34569bcdf07defc9197f93e19
+EBUILD openmw-9999.ebuild 4172 BLAKE2B 2f19592efdea0f822a71b80b289b5e75e6b6eb8bfbf87c56967a3638362a519bf7696ba4a10e47c770e51769cc164255caba3d23f912abcbb386d977ba44fab0 SHA512 e51ce2640fb002ac389f2673e6d2f91b316a5965f8a8f2802910d1d9a3ced64ff94fb35eaa4995b6b3a0c6e89433214b4be39eb3205f3f4f43c5beb6749444b9
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 9b13f4d95f9d..82aa73331fdf 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic xdg-utils readme.gentoo-r1
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake flag-o-matic lua-single xdg-utils readme.gentoo-r1
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
@@ -20,12 +21,13 @@ fi
 LICENSE="GPL-3 MIT BitstreamVera ZLIB"
 SLOT="0"
 IUSE="doc devtools +osg-fork test +qt5"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 # FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
-RDEPEND="
+RDEPEND="${LUA_DEPS}
 	app-arch/lz4
 	dev-games/mygui
 	dev-games/recastnavigation
@@ -48,7 +50,9 @@ RDEPEND="
 	)
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-cpp/sol2
+"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -70,6 +74,7 @@ src_prepare() {
 
 	# Use the system tinyxml headers
 	rm -v extern/oics/tiny{str,xml}* || die
+	rm -rv extern/sol3.2.2 || die
 }
 
 src_configure() {
@@ -96,6 +101,20 @@ src_configure() {
 		-DBULLET_USE_DOUBLES=ON
 	)
 
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DUSE_LUAJIT=ON
+		)
+	else
+		mycmakeargs+=(
+			-DUSE_LUAJIT=OFF
+			-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+			-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+			-DLua_FIND_VERSION_COUNT=2
+			-DLua_FIND_VERSION_EXACT=ON
+		)
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index fde4b2bff29e..8677ba7d6442 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -2,7 +2,11 @@ AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b3022
 DIST stratagus-2.4.3.tar.gz 1123537 BLAKE2B 90e40b2b277b5c52977f3c0ae2ae8f2e65d940d765e2ca4f7def4f8cf903399350f5e46f6dc6fbc38f3a53c7ca9ecaf5cf38025ec69154972869f28da37865d4 SHA512 16271c4fed3fb75fb8fb08e363e72713ede7979ea7e25b7c83db2fa9a0688fb7927cad3379e3b23e172c409cf0f6db18f7c6557d19a693c9a7f24109b56d2a56
 DIST stratagus-3.0.0.tar.gz 1149659 BLAKE2B 62a14bdc84462f22867b836b9a83f58ba31c7793c20f25cd8a0ca58adf7e5a38ee4559e96dddf8eb61dd1572dac55e08b16c95f8b7590644da0d0ffd040e0360 SHA512 baef3636471134c53ae0a60471f217daf694c20f439db125cf31cc33a510be456486aa905950aec15f28acada1af39a245e97fc85045d849b10532939a8f3a83
 DIST stratagus-3.1.0.tar.gz 1188722 BLAKE2B 7eefd0d1c2ab35e657d8dc3c90c279deab073588c7a5830e317b99d72518b3d9b1260b56952e1deeadccc79334442441896c0d9520891a5eeea75da52871a4b2 SHA512 41f4dc6e6232cdd31258b7c402c64d3604c77b07bd46f29474a4b4979cd30dec809faeb5f0034521e26442c4afefba3076154a632bd445f57e04801b4199573b
+DIST stratagus-3.1.1.tar.gz 1189631 BLAKE2B dd81b354d90cd3483674d0b9728abf9a7c6b8e2c2ab49683d8da37a80dca26eafe3bfed022b3917ab7f6f1d09c68724def5a8d107dd735dbab58cc72b224fbd3 SHA512 b5c5e3d767cd96be0fcc13476452e76ea106ddf870117f0e0b97113455c8a54a6547065b242d9a255d87c59ee755e604489e68a5ecc2e5275b32b7b5b5cfae6b
+DIST stratagus-3.1.2.tar.gz 1190124 BLAKE2B 35e9b8d33a0b6926ba7a450b893679d323dca9507b9fe2cd27ec8ee5c80deeecf8e35fd8b92eed86f308b5a8abd017d6306a08b4268c06de3c3d0fac7b74eba1 SHA512 c12012b08b04a419b0d3d35860b22fa426e06181d6ecd2998b11419227f3c226a6d584a5c3443939dfe63e0cc657eaad914f04810431bc72b7697cf8f4465b18
 EBUILD stratagus-2.4.3-r100.ebuild 1585 BLAKE2B 207b0a52a39c7704491a8e64181336401e5594f1103e6d14933df721f08f34755e066199033c9a13eba77237de8892e6964790b974622fa31c6a8c130f7a0c75 SHA512 873a5079b9783abf710df210876048f6928f06e1963cb75ed13bc7cf549b9d97fb10a0f04bbf3afde13209777013efef35225a3349e69437f8f3eeb14b8cd3ee
 EBUILD stratagus-3.0.0-r100.ebuild 1567 BLAKE2B f7cfe263858a99bb53a45cf07a57f50fe892dfb2a6aa91f88bf869fe7ff4ee10d83570470acea132f568af8de54bb2168c81de36136522c8e3e605f3972dd54d SHA512 44d075c38ebd05c4f80bc817307645e3d46477742ba3f0142a4fd48558b50fec7fa7eb9a7a17eaf4199317949f5c98f3509496569865fcae0f61a89782383dbb
 EBUILD stratagus-3.1.0.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
+EBUILD stratagus-3.1.1.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
+EBUILD stratagus-3.1.2.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 MISC metadata.xml 526 BLAKE2B ae5eabae36efabcfa6af79a4ec6be482532af44eddb2725b5405a013dbc12171440c8790cae30c5e21dce0eaa605bfd0273c6f7e985149b9b0b5c6a9e86a2dc2 SHA512 b1ec75815ac742ab9c9a69ffc83bf191de9ba5c6b461a1094d6827e90d104e9db63a92f2094e93cd235265ffb8e4c690f51cd5729b86bfe74a8f30af069444e6
diff --git a/games-engines/stratagus/stratagus-3.1.1.ebuild b/games-engines/stratagus/stratagus-3.1.1.ebuild
new file mode 100644
index 000000000000..b457463d8b3d
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="/usr/bin"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-engines/stratagus/stratagus-3.1.2.ebuild b/games-engines/stratagus/stratagus-3.1.2.ebuild
new file mode 100644
index 000000000000..b457463d8b3d
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.1.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="/usr/bin"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}