gentoo resync : 12.03.2021

4 files changed, 21 insertions, 7 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index ccf072202c6a..9200dfd0dcf5 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 51766c7111e5..ba5773fb5f51 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -4,9 +4,10 @@ AUX openmw-0.46.0-missing-include.patch 682 BLAKE2B fa80b94d9ce91e1b05b96c02e80f
 AUX openmw-0.46.0-mygui-license.patch 742 BLAKE2B a36016cf4b29c31918376dd27082f42cdaeacd5e8fff5a2860b827ce3db6b7fd711b2c6b8453b3792d506ec31749fb457d11225c64ff792257e30c796013501b SHA512 43895daa22eaf5891d789abed22e6d9df3c6817a7060bee7407963dbd13413dcd8fce03f236b3d7e0d589d925e9cbfe5125c72b1b2735479bf56d122cad85383
 AUX openmw-0.46.0-nifbullet-test.patch 12675 BLAKE2B fadb3c75bd0fcf4f351f30c86cdc3b407f4f7e97c3c9c278f3e20197a5c78c5b9ff320c9a53bd04fd40114f3b851f9523dd390c75487832cee67b3de7ef228d6 SHA512 e63d5f1e3e3c03a94ff2e926b2ce54d611c12a29749eba8d3c20c4d1ba1ee437142e40b20c08d2da714d7e98d573f4b1e5eaa99425b6dd27aace0e1852bb0ccb
 AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda20f2617ad57ce11782c5d05d3deb0c51ae2e2c91f679b23da92b6b939479fe176e99d63705ab1a3bb9d20cc7c39ab55fff2ac3 SHA512 49591f413ff68fbb11b7742c44d138f234e69478eae3462a5a402ac626bf67283e18a05dd2e2cea33706cdeb54deaf28e8a788e91491ddfe0ce10ffd978fc4e0
+AUX openmw-0.47.0-bullet-debian.patch 529 BLAKE2B 562495a7804c5e7de435ec42f0d2f6707073ff38f2854732941acb033c1f6e4733ef9fe18ebf9e5783bc223b51bd2f25b23645af8f409e3666f616b0d7647767 SHA512 bc80d7784d37d4c3611104951a18e1e55333e483b92cc536f2e08f56ac7b6e65e4c853e24e17388d190093ebedfcea09c1af408ca7f51140192d3fe3c6cfc769
 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
 EBUILD openmw-0.46.0.ebuild 4225 BLAKE2B 1117efd4e942dea2e6f84fd8cb544524acddc42cf8befc7ed0f8895ec0faa26143307669fdf5f8e5c6cd4f7412e947a1d7c64caecc3df3c98dffc7986f0f0c51 SHA512 a75ff440c5dcb63c33432accc9eb9e3ca647c6feb1fbed910afd649e2b668c501e9cf05d58cfb8db67432d0e050e739fca0e24ab1aa5f1aaab0ec53750b93784
-EBUILD openmw-9999.ebuild 3867 BLAKE2B b099ff8d20f7d9ac477380337f88f7aa078be812f53fa8c8ebb527231430edc88d02a77d98615e30a47a30edce4887e8ecef92c948775d22f877ac0127a86fe2 SHA512 2039f04de8acf7f45f1c7872f8c4e557253966f8320995fc04fff6036060df41be926e77ed727dbc39af240761c4c92b6aba8c15cc3d87dbcf27b3b3c5341d0c
+EBUILD openmw-9999.ebuild 3766 BLAKE2B f8d83102b723c9be576499f7a50ba9fefe59451fb3c7ae6e9a38e19690d776488a6b015375b6830749a1de211b440c5ce54d2bdbd3ff535822940206873692e7 SHA512 80c47896eedbeec7becfcc62d1cad2131363795021fb7ce5243c268475d2495a1dc4ed280e3103e606447bb70508e1660470eeed3b819a8d4fab1235f33067d9
 MISC metadata.xml 1423 BLAKE2B 6d7f6b2805b52571b305668ff9120318c3f2d87719f8e51e644b555c62ea9aaa4afa0f3a23ff67c8a08e04cacf3bdb3d9f7295985f980c27b57b53aa7b55c5e2 SHA512 31e201da1c43b973a57cf51276022c7e39371210ec2eb505f362cad4e669b5aef1f503e2511473880f2313b91a8f1f128db425f9538f58b7fc52df24ec066feb
diff --git a/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch b/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch
new file mode 100644
index 000000000000..3a8486250a8a
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch
@@ -0,0 +1,15 @@
+This condition makes it link to wrong library on Gentoo Prefix on Debian
+--- a/components/CMakeLists.txt
++++ b/components/CMakeLists.txt
+@@ -246,11 +246,7 @@ target_link_libraries(components
+     RecastNavigation::Recast
+     )
+ 
+-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
+-    target_link_libraries(components BulletCollision-float64 LinearMath-float64)
+-else()
+     target_link_libraries(components ${BULLET_LIBRARIES})
+-endif()
+ 
+ if (WIN32)
+     target_link_libraries(components
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 70603fec46ab..512ef3855897 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ RESTRICT="!test? ( test )"
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
 RDEPEND="
+	app-arch/lz4
 	dev-games/mygui
 	dev-games/recastnavigation
 	dev-libs/boost:=[threads]
@@ -62,7 +63,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
-	"${FILESDIR}"/openmw-0.46.0-recastnavigation.patch
+	"${FILESDIR}"/openmw-0.47.0-bullet-debian.patch
 )
 
 src_prepare() {
@@ -70,10 +71,6 @@ src_prepare() {
 
 	# Use the system tinyxml headers
 	rm -v extern/oics/tiny{str,xml}* || die
-
-	# Unbundle recastnavigation
-	rm -vr extern/recastnavigation || die
-	sed -i "s#GENTOO_RECAST_LIBDIR#${EPREFIX}/usr/$(get_libdir)#" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -95,6 +92,7 @@ src_configure() {
 		-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
 		-DDESIRED_QT_VERSION=5
 		-DBULLET_USE_DOUBLES=ON
 	)