gentoo resync : 25.11.2020

4 files changed, 14 insertions, 13 deletions

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index d9571ece6328..51766c7111e5 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -4,9 +4,9 @@ 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-mygui-license.patch 740 BLAKE2B eb5c6d6d8787b5e397e83aae36855349a4721d613bdfd8946f9b0ca430f3d7f503fe4b4bf64eb70df5b4f88ed9caf582166a27f4666bbe9e994ad3ad8b708739 SHA512 df508bc1bf8c4d9df6251b47d7ef3afbbbe600dc30cca582b5811b193c8371a9f3723d7e9e422cb28528e228bb2ee246d8c38c7b0cca3b49bc2972f59a555364
+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 4206 BLAKE2B 766941398d741237a34dfd714733fc8d8b93a501891aedef23ab617e2c8f076315c4c1b9149d0c64732f90d7da96986c91b1d6151602183d27468e20a210d968 SHA512 479a8c45a7de6a85c5cf207f1e42f5f6d0e5294a655de93259dca84c9afb6ab0b3f56c8a75da3988cea8b334df149f0ee1e044ec6e79f6cb4e335396d9441144
-EBUILD openmw-9999.ebuild 3823 BLAKE2B 6cc9a357f3106619194b8fde6984473f3759de8113c6fefcf3cad3ecdee7d39adafb2cd8ee778d9174bdb019623699ae7270aa78b22ae2b8cdd6d338098f180e SHA512 f50a90e4373fb97bdead9f9eea6d3aec8f8a3a3c80efc8776df10f3f35973380ee8ab8f9e32f8066afe9df3892855b83a8f30f01d43c35101c8e5d91fea76621
+EBUILD openmw-0.46.0.ebuild 4225 BLAKE2B 1117efd4e942dea2e6f84fd8cb544524acddc42cf8befc7ed0f8895ec0faa26143307669fdf5f8e5c6cd4f7412e947a1d7c64caecc3df3c98dffc7986f0f0c51 SHA512 a75ff440c5dcb63c33432accc9eb9e3ca647c6feb1fbed910afd649e2b668c501e9cf05d58cfb8db67432d0e050e739fca0e24ab1aa5f1aaab0ec53750b93784
+EBUILD openmw-9999.ebuild 3867 BLAKE2B b099ff8d20f7d9ac477380337f88f7aa078be812f53fa8c8ebb527231430edc88d02a77d98615e30a47a30edce4887e8ecef92c948775d22f877ac0127a86fe2 SHA512 2039f04de8acf7f45f1c7872f8c4e557253966f8320995fc04fff6036060df41be926e77ed727dbc39af240761c4c92b6aba8c15cc3d87dbcf27b3b3c5341d0c
 MISC metadata.xml 1423 BLAKE2B 6d7f6b2805b52571b305668ff9120318c3f2d87719f8e51e644b555c62ea9aaa4afa0f3a23ff67c8a08e04cacf3bdb3d9f7295985f980c27b57b53aa7b55c5e2 SHA512 31e201da1c43b973a57cf51276022c7e39371210ec2eb505f362cad4e669b5aef1f503e2511473880f2313b91a8f1f128db425f9538f58b7fc52df24ec066feb
diff --git a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
index d0da8a2563b3..3bf5915bb65d 100644
--- a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
+++ b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
@@ -4,13 +4,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index d69352c94..5f97c86e9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -470,9 +470,6 @@ IF(NOT WIN32 AND NOT APPLE)
-     #    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Plugin_MyGUI_OpenMW_Resources.so" DESTINATION "${LIBDIR}" )
-     #ENDIF(BUILD_MYGUI_PLUGIN)
+@@ -856,9 +856,6 @@ elseif(NOT APPLE)
+             INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-wizard" DESTINATION "${BINDIR}" )
+         ENDIF(BUILD_WIZARD)
  
--    # Install licenses
--    INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
+-        # Install licenses
+-        INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
 -
-     # Install icon and desktop file
-     INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
-     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
+         # Install icon and desktop file
+         INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
+         INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
diff --git a/games-engines/openmw/openmw-0.46.0.ebuild b/games-engines/openmw/openmw-0.46.0.ebuild
index abb4174bc5fe..5de3fb3d92af 100644
--- a/games-engines/openmw/openmw-0.46.0.ebuild
+++ b/games-engines/openmw/openmw-0.46.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=
+	>=sci-physics/bullet-2.86:=[-double-precision]
 	virtual/opengl
 	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
 	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 1183e5459a13..70603fec46ab 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=
+	>=sci-physics/bullet-2.86:=[double-precision]
 	virtual/opengl
 	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
 	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
@@ -96,6 +96,7 @@ src_configure() {
 		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
 		-DUSE_SYSTEM_TINYXML=ON
 		-DDESIRED_QT_VERSION=5
+		-DBULLET_USE_DOUBLES=ON
 	)
 
 	cmake_src_configure