gentoo resync : 02.05.2018

2 files changed, 11 insertions, 3 deletions

diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
index 9d2a43c223f3..35c8177cad8a 100644
--- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
+++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
@@ -1,10 +1,10 @@
-From 402dd069acc1944428fd9f4ed3620a157028f6cc Mon Sep 17 00:00:00 2001
+From 683aacce5b642a3c735f8040601e0de345d028da Mon Sep 17 00:00:00 2001
 From: Jan Henke <Jan.Henke@taujhe.de>
 Date: Sat, 17 Mar 2018 19:47:52 +0100
-Subject: [PATCH] Disable -Werror when compiling tests
+Subject: [PATCH] Disable -WError when compiling tests
 
 GCC 7 generates new warnings on some of the test files, which lead to
-build failures. -Werror generally is helpful while developing to enforce
+build failures. -WError generally is helpful while developing to enforce
 a zero error policy, but not so much when packaging. Gentoo bug 644042
 ---
  tests/CMakeLists.txt | 2 --
@@ -22,6 +22,14 @@ index 0e08d77..86e9af7 100644
          -Wextra
          -Wno-missing-braces
          -Wnon-virtual-dtor
+@@ -129,7 +128,6 @@ target_compile_options(gsl_tests_config_noexcept INTERFACE
+         -Wcast-align
+         -Wconversion
+         -Wctor-dtor-privacy
+-        -Werror
+         -Wextra
+         -Wno-missing-braces
+         -Wnon-virtual-dtor
 -- 
 2.16.1
 
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch
index 12d92605dda8..12d92605dda8 100644
--- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch
+++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch