gentoo resync : 23.03.2018

6 files changed, 32 insertions, 3 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9531c6b3ce2e..8fd8facad357 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 9643eab92816..a11f88a5b0c4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -7,7 +7,7 @@ AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd
 DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
-EBUILD gtest-1.8.0-r1.ebuild 1678 BLAKE2B 536638897a81855d95bfde3f6702e8e814931dc74827b6c4ce2a85f1aca07862b99e48d2ab0227a75fb2de627f9f954cb5e983981e9f0c87132cf8e70096cc88 SHA512 3ebc0342e470cd3b7ce6f40045726457fa999c71934d060ed1b1dd06a12cbc95c5816002b53e5bc96cf81d0f3a94c752fe37a61fc0a345c31f7ef252e3a0a8d7
+EBUILD gtest-1.8.0-r1.ebuild 1677 BLAKE2B 2db29e4209dc4004f22db66a37792277fc01027af885577a325243d133d00310b56d62998d8947349b84622324cbd54ecade4b11dbe9e6b949338a177e10bcc9 SHA512 b6126c0cc6e30f0891c0e7fd6d6c591035847be7ba6db206d259c6d51f0b93842dcea7ad86ce0c8df66a58415ee3282e45bdef9c83fe67bdde5c162caa6ea4f1
 EBUILD gtest-1.8.0.ebuild 1637 BLAKE2B 15153bf61b468799c48c25b300794eb3cf93d9751ead2d50d2dda59f09a4c5ea1c6a319083290cb3a93a983ee2552a3162a9c770e724907427533cfd8e7aafd9 SHA512 ac3680806d6e30e926ef29ab24042d419cd4c872b6a7d4d11b75bb50ccf64c6f029b8c59800dd92f3c5e2a8a72b4840277b4750eae8bc46021e44fc95845670b
 EBUILD gtest-9999.ebuild 1826 BLAKE2B 8751e8332d63e36f30d1bc10782c2103e7a40b0f9a454bf29cb92ec92502221cb74aee2158f54b2fb634aa119c6fd1d7faf496fac4569e7ce461205f805123b7 SHA512 9a31a176bba34993a6bbc56dd0cbc0a3b78b293c4d850a0471968c8759fd58a3ebaa1922b2eb293810a697b85894c1daee5d125a42013b6356b9a04596d21114
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index fa5db663ed34..5b7606447052 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 5a1d5a9c6ec9..e772e6926ce1 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,6 +1,7 @@
 AUX ms-gsl-0_pre20180108-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
+AUX ms-gsl-0_pre20180304-disable_Werror-644042.patch 867 BLAKE2B b56327113837e40512e5d19aeaeb9ea2a7770aa75a4583f29e3f332ed823f1ac9310044e7f211c688309fb877be55dd6f06f7a1199d9819a63ec5402dc2791b0 SHA512 4dd57cf54d7bf63c3aa5c98464e43517c856d3f9b8222c53a55e55f6587295d8fe22370bec24c7661a14eb414ccd34cfe2fd3268aaef44ca77b2994460f73498
 DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
 DIST ms-gsl-0_pre20180304.tar.gz 57458 BLAKE2B 642807c07d9d4dac2752a46178d46d275f62dbb1193bf78f54dfaa5ca18eab2998c3a6d7821cffab49a44d50b2ab72680e612827cad710b14aa823aa503f51e1 SHA512 def4ce81e8b5a720eb9319ca3662b0738fb155429018275eb1ada9388d8825ed167db0102cc425594b412c06850338f1a5e1f062bf7b8e2c91badfa7ed203553
 EBUILD ms-gsl-0_pre20180108.ebuild 691 BLAKE2B f9aad64c668fc74cb94d419dd3cc607ad3255a165a826b3033c387d96b83bd346dd4a7825da5c800f5fc64ba3d1f286cf57044cb347ac93365f14b778cc007ae SHA512 59dd335079191e874c5580183e57bcd02381deb3395716fe6bce126ddeb9674ac1f81ea947872e3eee6dfbafe21430d063f3a00e6cc5b527cd8d5106f049b52d
-EBUILD ms-gsl-0_pre20180304.ebuild 707 BLAKE2B c765a95b8a3adb39a8b3f2d3a68be7b5edee1c13916da05b0bb2699c75610674f8cac87046741b07449d7daeda730794f07a7be35b65a1cb07915772be9a7552 SHA512 be82855b7d9f8484f4ea2052faf390fc4fb0d0fe3c9168efdd2ee44c8ce60d93a4d40f14455861372c71a75b223908351f1d95e70e7b3d47bed4068590a8d223
+EBUILD ms-gsl-0_pre20180304.ebuild 771 BLAKE2B 6bf1d6d7bdc7163108bb22ac638c5b50470575cc9cec51451d2ab266b0527ecdfba385650d130f4a5c3a1893c2499f759346528aadd8f9c1bc395aefedcea5f6 SHA512 6f7a55fb781ab12415556897c416c15d9a884aedf0b4a9019c99daa0d6722b6a0d856b4c236ef87bfe93f9a77ebd28f846422c785075961b9a859d7c2833d923
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
new file mode 100644
index 000000000000..9d2a43c223f3
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
@@ -0,0 +1,27 @@
+From 402dd069acc1944428fd9f4ed3620a157028f6cc 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
+
+GCC 7 generates new warnings on some of the test files, which lead to
+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 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 0e08d77..86e9af7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config 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/ms-gsl-0_pre20180304.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
index c80cd2a3517a..34943ad4bf80 100644
--- a/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
@@ -20,6 +20,7 @@ DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
 
 PATCHES=(
 	"${FILESDIR}/ms-gsl-0_pre20180108-use_system_catch-636828.patch"
+	"${FILESDIR}/ms-gsl-0_pre20180304-disable_Werror-644042.patch"
 )
 
 src_configure() {