gentoo resync : 07.05.2021

6 files changed, 43 insertions, 22 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 8c2bc394ea95..56678797bae6 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 40640b5bd5bd..c0122ec3bc3c 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,13 +1,13 @@
 AUX openmw-0.46.0-fix-cast.patch 12792 BLAKE2B 583ca033350e16116de85ba3bfc121bc2a444686a4e7c75388880835e708e0860c787ee6504b6f907b6749afd23acaea87b84aeece5553a2e61562142d223257 SHA512 7784c327cb442e20afb0409f0f5ef2791fa9dbe3c15b6a8e60baabec7a1179778577ac60e5c14e9e83868c15db1aaffa145006ce4d0140f0db4869c6eb0f8b9a
 AUX openmw-0.46.0-floattest2.patch 8586 BLAKE2B b419473aa1f00b327654b0f3862819f296d8390ce9a290ebd98fcf39175d85045ad85bf1ca9521a6f033f836a7331e1511e3005f2ac2f15b43c45b22641d281f SHA512 286e9fa560f62f5a291c622a7939c57e8c674ba1a4762c6a20a8fefe0b91092ffd7a1663dd70f4cc287833de0a8177329bb58e1e87b3cc9ed0d22a4a4cd71c9d
+AUX openmw-0.46.0-gcc11.patch 1061 BLAKE2B 897b6c68962196a1446b68e1bd0fa08d5ffd60d1fe15c809e3fcb0ef9dce98e2e5177c2379db151d32c1b5b52cd0c28e51d3c37c49e68bd0099202bc1ced7ca3 SHA512 9687370fd4583d1cc1199798ce8644ac86db7d591df157efb1d1361e176ce71814d7ab27d334cb432af3f7ab8750a2bb7d27e159a696803bbc9c2f67adb65098
 AUX openmw-0.46.0-missing-include.patch 682 BLAKE2B fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e SHA512 d0d47fe249e8fb366e00e272dc62853f8a2aaa75d45d83d270891e76674c1382fd3405e674e3b6c383bbc17125c4471893e77251744deae4d17bc373d847a638
 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 3766 BLAKE2B f8d83102b723c9be576499f7a50ba9fefe59451fb3c7ae6e9a38e19690d776488a6b015375b6830749a1de211b440c5ce54d2bdbd3ff535822940206873692e7 SHA512 80c47896eedbeec7becfcc62d1cad2131363795021fb7ce5243c268475d2495a1dc4ed280e3103e606447bb70508e1660470eeed3b819a8d4fab1235f33067d9
+EBUILD openmw-0.46.0.ebuild 4271 BLAKE2B 266aa3ea0493528004925f517259426ea49fc4c1dc65dd061af105311e24c8c9e3946a2051a6a51ede62fb04d7c7788f2627fdd0143ef729871114386a58ab36 SHA512 bd9eb1cb1fcb3cc886a25a324199ef8140da9b485f4871a968921c98f502dc7ab417a605f8b9ec8d34620d704f571300d0fb91cfbed0deb207598ea584e73033
+EBUILD openmw-9999.ebuild 3722 BLAKE2B 22b5f1ae5910526a369e8e12a42f99df6ae4c07aac965eed34fac152a41069c6ba2a2673c5852aff806ad76ead799f33874bb3c0726df45d13147d5176b3ed79 SHA512 f6cb2ba05beca13214e1389571e5e70d6d2292cf4b1940d85a4a0f206882c5ecebe46c709aef6fe48375cc35ad0133a92896b07e045673a2126a7ccb7e0bf1a2
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/files/openmw-0.46.0-gcc11.patch b/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
new file mode 100644
index 000000000000..0dc3106fb3bf
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
@@ -0,0 +1,36 @@
+diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
+index cb3a1b2..62cfeec 100644
+--- a/components/sceneutil/mwshadowtechnique.cpp
++++ b/components/sceneutil/mwshadowtechnique.cpp
+@@ -24,6 +24,7 @@
+ #include <osg/io_utils>
+ 
+ #include <sstream>
++#include <limits>
+ 
+ namespace {
+ 
+diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
+index 035c19a..aba1b81 100644
+--- a/components/sceneutil/shadow.cpp
++++ b/components/sceneutil/shadow.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <components/sceneutil/vismask.hpp>
+ #include <components/settings/settings.hpp>
++#include <limits>
+ 
+ namespace SceneUtil
+ {
+diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
+index f998b78..e0e47dd 100644
+--- a/components/terrain/quadtreeworld.cpp
++++ b/components/terrain/quadtreeworld.cpp
+@@ -3,6 +3,7 @@
+ #include <osgUtil/CullVisitor>
+ 
+ #include <sstream>
++#include <limits>
+ 
+ #include <components/misc/constants.hpp>
+ #include <components/sceneutil/mwshadowtechnique.hpp>
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
deleted file mode 100644
index 3a8486250a8a..000000000000
--- a/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-0.46.0.ebuild b/games-engines/openmw/openmw-0.46.0.ebuild
index 5de3fb3d92af..9b4a6bfa4e9d 100644
--- a/games-engines/openmw/openmw-0.46.0.ebuild
+++ b/games-engines/openmw/openmw-0.46.0.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
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-games/mygui
 	dev-games/recastnavigation
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads,zlib]
 	dev-libs/tinyxml[stl]
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
@@ -72,6 +72,7 @@ PATCHES=(
 	# https://gitlab.com/OpenMW/openmw/-/merge_requests/163
 	"${DISTDIR}"/openmw-0.46.0-floattest.patch
 	"${FILESDIR}"/openmw-0.46.0-floattest2.patch
+	"${FILESDIR}"/openmw-0.46.0-gcc11.patch
 )
 
 src_prepare() {
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 512ef3855897..7e624ccea45f 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	app-arch/lz4
 	dev-games/mygui
 	dev-games/recastnavigation
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads,zlib]
 	dev-libs/tinyxml[stl]
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
@@ -63,7 +63,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
-	"${FILESDIR}"/openmw-0.47.0-bullet-debian.patch
 )
 
 src_prepare() {