gentoo resync : 28.04.2019

4 files changed, 4 insertions, 111 deletions

diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index b98ccfbf7899..7cd8001d39ac 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,10 +1,8 @@
-AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
-AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
-DIST glm-0.9.9.3.tar.gz 4577239 BLAKE2B 167312e95a43417dba59481b1d45976d9249af9fda9ebb6d0ec598e706bc2469b8c0928877683d47335e0c55ee881a20c1c7f648dd77e183880f7c2792bd5277 SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
+DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
-EBUILD glm-0.9.9.3.ebuild 862 BLAKE2B 9b34afe8021029980017534376e5fb49faeb7e5ec1ebf17859424cfcacdfc4cd10a3943df9bfae3888cd5317e024ceaaafbbdc6590c75ae908b3cec6c030f017 SHA512 7f004b7285c6304a2e268b7cf6f14f7bb8e79a5ca23bf181446797afe8c57731cf19995448f8cc88c967006418d03f6799ef23ee3471b4a8a13a2e3b60d6a71a
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
+EBUILD glm-0.9.9.5.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
deleted file mode 100644
index d7744aed5551..000000000000
--- a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Bug: https://bugs.gentoo.org/638312
-Upstream commit: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db
-
-From e37cf6e47fa4305c82845103b17af58f6cfe23db Mon Sep 17 00:00:00 2001
-From: Christophe Riccio <christophe.riccio@unity3d.com>
-Date: Thu, 17 Aug 2017 00:08:37 +0200
-Subject: [PATCH] Fixed GCC 7.1.0 failing tests #666
-
----
- test/core/core_type_mat2x4.cpp | 4 +++-
- test/core/core_type_mat3x4.cpp | 4 +++-
- test/core/core_type_mat4x4.cpp | 3 ++-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
-index 17afebf91..eea3e46f4 100644
---- a/test/core/core_type_mat2x4.cpp
-+++ b/test/core/core_type_mat2x4.cpp
-@@ -1,3 +1,5 @@
-+#include <glm/gtc/epsilon.hpp>
-+#include <glm/gtc/constants.hpp>
- #include <glm/vector_relational.hpp>
- #include <glm/mat2x2.hpp>
- #include <glm/mat2x3.hpp>
-@@ -83,7 +85,7 @@ namespace cast
- 		glm::mat2x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
-diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
-index e3b78d31b..74a45d87a 100644
---- a/test/core/core_type_mat3x4.cpp
-+++ b/test/core/core_type_mat3x4.cpp
-@@ -1,3 +1,5 @@
-+#include <glm/gtc/epsilon.hpp>
-+#include <glm/gtc/constants.hpp>
- #include <glm/vector_relational.hpp>
- #include <glm/mat2x2.hpp>
- #include <glm/mat2x3.hpp>
-@@ -87,7 +89,7 @@ namespace cast
- 		glm::mat3x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
-diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
-index 3966c2b7f..fd2aca8b4 100644
---- a/test/core/core_type_mat4x4.cpp
-+++ b/test/core/core_type_mat4x4.cpp
-@@ -1,3 +1,4 @@
-+#include <glm/gtc/constants.hpp>
- #include <glm/gtc/epsilon.hpp>
- #include <glm/matrix.hpp>
- #include <glm/mat2x2.hpp>
-@@ -263,7 +264,7 @@ namespace cast
- 		glm::mat4x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
diff --git a/media-libs/glm/files/glm-gcc73.patch b/media-libs/glm/files/glm-gcc73.patch
deleted file mode 100644
index 68033b5b6f63..000000000000
--- a/media-libs/glm/files/glm-gcc73.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h
---- glm-0.9.8.5.orig/glm/simd/platform.h	2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/glm/simd/platform.h	2018-01-26 15:38:57.584130263 -0800
-@@ -111,7 +111,8 @@
- #define GLM_COMPILER_GCC70			0x02000A00
- #define GLM_COMPILER_GCC71			0x02000B00
- #define GLM_COMPILER_GCC72			0x02000C00
--#define GLM_COMPILER_GCC80			0x02000D00
-+#define GLM_COMPILER_GCC73			0x02000D00
-+#define GLM_COMPILER_GCC80			0x02000E00
- 
- // CUDA
- #define GLM_COMPILER_CUDA			0x10000000
-@@ -283,6 +284,8 @@
- #		define GLM_COMPILER (GLM_COMPILER_GCC71)
- #	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
- #		define GLM_COMPILER (GLM_COMPILER_GCC72)
-+#	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3)
-+#		define GLM_COMPILER (GLM_COMPILER_GCC73)
- #	elif (__GNUC__ >= 8)
- #		define GLM_COMPILER (GLM_COMPILER_GCC80)
- #	else
-diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp
---- glm-0.9.8.5.orig/test/core/core_setup_message.cpp	2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/test/core/core_setup_message.cpp	2018-01-26 15:37:56.953298475 -0800
-@@ -86,6 +86,9 @@
- 		case GLM_COMPILER_GCC72:
- 			std::printf("GCC 7.2\n");
- 			break;
-+		case GLM_COMPILER_GCC73:
-+			std::printf("GCC 7.3\n");
-+			break;
- 		case GLM_COMPILER_GCC80:
- 			std::printf("GCC 8.0\n");
- 			break;
diff --git a/media-libs/glm/glm-0.9.9.3.ebuild b/media-libs/glm/glm-0.9.9.5.ebuild
index 6d61f3165def..169bf319fadf 100644
--- a/media-libs/glm/glm-0.9.9.3.ebuild
+++ b/media-libs/glm/glm-0.9.9.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils