gentoo resync : 20.10.2021

6 files changed, 166 insertions, 19 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 49a3f389b177..2f8c8116a3fc 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index 13e7b434e3b2..840345eb1c50 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,3 +1,3 @@
 DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
-EBUILD box2d-2.4.1.ebuild 709 BLAKE2B 1684eeffdba3be8ee32938b408ee2d75d6d2b0501bd7050ea25ee9b760462e5b126f50603e243ec1b2b4f846d99317ce1234598c76ee467f8d889b45048569a6 SHA512 b48c285bc8871acc99d770b3b85c5ed290a747bbaea6d1d393c60d97df2098697d79e8d9d7f5f30a654eb78f9fa9df02faaf3b2d2061c3070520c4f951c8ad04
+EBUILD box2d-2.4.1.ebuild 903 BLAKE2B 60359b545e6467a259a1bfdbd4e10885fbddcd520dd71bdff50bb07ee7124fc48867c650270ef93c018918440cbe057834367b69ae7329c8af18b041a9e31de2 SHA512 36772e0c80b447e898ca349a9c5384125ba8c426ae6f5c30f628f7b8c66c21b417f3b58f9fa332a5c4dc6c5a6f67756e5f33db7dcbf572d6b49b4b5f046b26a4
 MISC metadata.xml 334 BLAKE2B dfc66d58b4c54e7f04ac51ad4669e282dcd91ddca795be323bb47b0088a89bbb765a39bdc1d998a7f5afd77e5450c94ac6ba48f5b3f77d8a9a769d2e44f35533 SHA512 0d809e8099f314755b04431e40ad01a8f91ef2246a4129f64dfb413251b2b259e694999c7f7489c5d87795ab197464c27651cd3c404b62b3d270913da385a09c
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
index 0fe84b500b23..aa15726dd78e 100644
--- a/games-engines/box2d/box2d-2.4.1.ebuild
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -15,8 +15,17 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
+DEPEND="test? ( dev-cpp/doctest )"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	cmake_src_prepare
+
+	# unbundle doctest
+	rm unit-test/doctest.h || die
+	ln -s "${ESYSROOT}"/usr/include/doctest/doctest.h unit-test/ || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 253187341e20..da8481d68e72 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,6 +9,8 @@ AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda2
 AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9def640457bcc8ce9df842e4423e8fe9634f7069a820602710fe4315d06801159aff53520843f92155865d294234f4712fed7 SHA512 fb156f963aa103fc04b515faec0ef536e47da78da9ee5fbc2cc4ccaa51d382a229d3ee8a07b007d34442200834a9aba41489cea85e90c73f9acc6943e2274079
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
+DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d SHA512 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
 EBUILD openmw-0.46.0-r2.ebuild 4328 BLAKE2B d8a1286c1d414f7c8cfe7f1341e15fcb1034694cdddfbf4af64aed41a35c1e946e6c95597b7e63e2b15b7aa81a16766a4973d238514e010390507e877bd7dec4 SHA512 fce808ce7de850286b0d748f367b4465098c0eeed249f551ff2d2fcd0eaf803c810da502b460aa99cb838f082bd05caf84bbb57a1e434040fe790a3b9e83c595
-EBUILD openmw-9999.ebuild 4125 BLAKE2B 73515500ce259aeaf3115db761f1b4d03f779e1c82e9c18d3037d53eca25def6b25b0a17a785ce77cbe5d1e15c2f85d75fbf6dc005b1747473447b5b815ecfbc SHA512 263987258fb94202c981fd93b28313d54c8b7cb20c82ba353a99501b10a304b33e5547d195fa805c849934bfa06dd3bce3893f4da73548dcc930290fd17b4605
+EBUILD openmw-0.47.0.ebuild 3559 BLAKE2B c024f1fcbea83c266babeba9140c544f4061726433dcb63522b454dbc3a9ac31778bc6a6d6aadcedecda0e5f257008f5352b5e65eeaf1052cc663eb345acc809 SHA512 dc3efa8a516b0d6424f9643b069664ab2cf123e8a2401e7d2f59d4742ef003264a9cd5eb629fdb5480f657ac7fd8617327a633d06be6ae3bd9e7734e44d4db1e
+EBUILD openmw-9999.ebuild 4004 BLAKE2B ce9554f2cd1afdda34a34b0aeee704e15c3f4653d7d70ceebed54ae41dfa8cd4937ee4260d77b558dc6239dddc07d2c7d2c6bd25649c89440d047edfc68ea9d3 SHA512 3fd47b8d9f3a1cbff2a62d966153e10398ac7c2aaa52985e7119a7142f751899b6e24465cd8a06ab0e9061d424c203d71ed20f7e6fe2044509106a33a89cff24
 MISC metadata.xml 1454 BLAKE2B f0cfc77e752bbd3b7a4cd1bee5d7e76aa913e402525928980f728273807be80555fb03e8b9891d28fea8b941c3e632395322536f006b94dea5a00d74bced610b SHA512 9aa67b87fd886d8c3fe29f5eb3f5fbd943a7d690c1dca21a34746a286d0b193e36ec8c96b75554ca3f98c4d149dcd7e072aa702b09c6670d63739a3c8b766df3
diff --git a/games-engines/openmw/openmw-0.47.0.ebuild b/games-engines/openmw/openmw-0.47.0.ebuild
new file mode 100644
index 000000000000..2ee105fb1152
--- /dev/null
+++ b/games-engines/openmw/openmw-0.47.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Open source reimplementation of TES III: Morrowind"
+HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenMW/openmw.git"
+else
+	SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-3 MIT BitstreamVera ZLIB"
+SLOT="0"
+IUSE="doc devtools +osg-fork test +qt5"
+RESTRICT="!test? ( test )"
+
+# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
+# used when BUILD_OPENCS flag is enabled. See bug #676266.
+
+RDEPEND="
+	app-arch/lz4:=
+	dev-games/mygui
+	dev-games/recastnavigation:=
+	dev-libs/boost:=[threads(+),zlib]
+	dev-libs/tinyxml[stl]
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/openal
+	media-video/ffmpeg:=
+	>=sci-physics/bullet-2.86:=[double-precision]
+	virtual/opengl
+	osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	qt5? (
+		app-arch/unshield
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx
+	)
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Use the system tinyxml headers
+	rm -v extern/oics/tiny{str,xml}* || die
+}
+
+src_configure() {
+	use devtools && ! use qt5 &&
+		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
+
+	local mycmakeargs=(
+		-DBUILD_BSATOOL=$(usex devtools)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_ESMTOOL=$(usex devtools)
+		-DBUILD_LAUNCHER=$(usex qt5)
+		-DBUILD_NIFTEST=$(usex devtools)
+		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
+		-DBUILD_WIZARD=$(usex qt5)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
+		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
+		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
+		-DUSE_SYSTEM_TINYXML=ON
+		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_src_compile doc
+		find "${BUILD_DIR}"/docs/Doxygen/html \
+			-name '*.md5' -type f -delete || die
+		HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. )
+	fi
+}
+
+src_test() {
+	"${BUILD_DIR}/openmw_test_suite" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	local DOC_CONTENTS="
+	You need the original Morrowind data files. If you haven't
+	installed them yet, you can install them straight via the
+	installation wizard which is the officially supported method
+	(either by using the launcher or by calling 'openmw-wizard'
+	directly).\n"
+
+	if ! use qt5; then
+		DOC_CONTENTS+="\n\n
+		USE flag 'qt5' is disabled, 'openmw-launcher' and
+		'openmw-wizard' are not available. You are on your own for
+		making the Morrowind data files available and pointing
+		openmw at them.\n\n
+		Additionally; you must import the Morrowind.ini file before
+		running openmw with the Morrowind data files for the first
+		time. Typically this can be done like so:\n\n
+		\t mkdir -p ~/.config/openmw\n
+		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index a716d898ad5c..0bad76f57453 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua-single xdg-utils readme.gentoo-r1
+inherit cmake lua-single readme.gentoo-r1 xdg
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
@@ -28,11 +28,11 @@ RESTRICT="!test? ( test )"
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
 RDEPEND="${LUA_DEPS}
-	app-arch/lz4
+	app-arch/lz4:=
 	dev-games/mygui
-	dev-games/recastnavigation
+	dev-games/recastnavigation:=
 	dev-libs/boost:=[threads(+),zlib]
-	dev-libs/tinyxml:=[stl]
+	dev-libs/tinyxml[stl]
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen[doc]
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 	)
 	test? (
@@ -78,7 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use devtools && ! use qt5 && \
+	use devtools && ! use qt5 &&
 		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
 
 	local mycmakeargs=(
@@ -95,8 +95,6 @@ src_configure() {
 		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
 		-DUSE_SYSTEM_TINYXML=ON
 		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
-		-DDESIRED_QT_VERSION=5
-		-DBULLET_USE_DOUBLES=ON
 	)
 
 	if [[ ${ELUA} == luajit ]]; then
@@ -121,9 +119,9 @@ src_compile() {
 
 	if use doc ; then
 		cmake_src_compile doc
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
+		find "${BUILD_DIR}"/docs/Doxygen/html \
 			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
+		HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. )
 	fi
 }
 
@@ -142,7 +140,7 @@ src_install() {
 	directly).\n"
 
 	if ! use qt5; then
-		local DOC_CONTENTS+="\n\n
+		DOC_CONTENTS+="\n\n
 		USE flag 'qt5' is disabled, 'openmw-launcher' and
 		'openmw-wizard' are not available. You are on your own for
 		making the Morrowind data files available and pointing
@@ -158,10 +156,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	readme.gentoo_print_elog
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}