gentoo resync : 09.06.2018

7 files changed, 2 insertions, 124 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 13e31d1b3069..783a2fcdc70a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 38336aa70ea0..86896d0044a4 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 1675 BLAKE2B 336faa5f69d97eaf129e61ddcc5079b19703c54f257b4c2409dc456f104f7d002095ee4f150107b57b5cd4a8198d8f9e8821c10121b07b796f909fab21d6b3c6 SHA512 29b44d2fe5bb89aeb4891b0743a4905c4ff61a8cad86724ded982323e3b60d62a8f763c478bbd61174b7fc8377eff25f656e274e4d4591212bbd6934bb8d4ca2
+EBUILD gtest-1.8.0-r1.ebuild 1674 BLAKE2B 0d4cd7279a96426f013fd96c43d7c8613c458585c9e576b19cab9c5ed43572e33ed9190f667f164195a4d4b192924dcb26b97f7365578d6c1e70d6f342c281d3 SHA512 f827c28e93ed16c55cf0e3e8087373170e1d848f163a45e0530580c40780997629a49e534e5f0a399bf6888a92f506bf9730994e774b77a0bcaaa123d215df3a
 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 0b4f5c979906..96cb8b936bfb 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/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 394be2036121..5942c29be0e2 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,9 +1,5 @@
-AUX yaml-cpp-0.5.3-gcc6.patch 1768 BLAKE2B 979b0ce92ceb0305f3b063b926c2d01e06507adcca2ea8dfabc656678f8fcfe8a66a839cef5adaece8a1b9b8cc2dfc97f97b80b073594f25e80fcc1810c98ef7 SHA512 be0d4cab18312329e37c114cf739fe143a6f635669a741f149fd32cf54bc0307f80a5383025dc04700a8c1ae33de68185f85d516ceb32e364317db06563a8b39
 AUX yaml-cpp-0.6.2-CVE-2017-5950.patch 1697 BLAKE2B 7b13c947e471aa08ec718cecfd43666689cbf0137ed6328ab550f722c409f19ec6437a5458180a3c334ebfe899ef67cbee04237fd230ac06fde863c3adc231f3 SHA512 0ba8bb8d81a98b77cde3dd386fe237dd11aae53011419042ff0b72b643ac2c1fdb7753ff524d0c5d319f7d601b417d1c6ab2419c728c4015197f83ce3eaa34b2
 AUX yaml-cpp-0.6.2-unbundle-gtest.patch 2204 BLAKE2B 733b6eed366ca33085251c3c6f3655060d3cc02a77f5f53a21c9163b894400c7418c3d9f032c8f6d460d58b35594f6ba1cd8eea0a667fbe1849a8eb866074ce5 SHA512 8cb227c2e156bd642be29b15ae7a7de9e4839d6f4b5e0132982659eaab442347d3ef3eedd1bfb8f936a5a1dc98b6d41be915f7da53fd6764f8b6becbaf6cff98
-DIST yaml-cpp-0.5.3.tar.gz 2016737 BLAKE2B 6c10d44fe04fdd81cd61c909acdb576834f5358dd44353723b04d8a42bf8a1312cfa752e445c84f93c6ce76358b2d42dee5263f6fbd47a1f928d1cd28aedef07 SHA512 5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0
 DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
-EBUILD yaml-cpp-0.5.3-r1.ebuild 798 BLAKE2B 7934aba0c61b222341b99a64d4aba8853ab7a4aa985feaafb5f3e64e94b851d86c50cb40652cc062b995277fb6d6a78fcccfb0f04a829c4100ca5473f37b06c9 SHA512 f1bb48e5ea79c1ec1ab1a53e2947bbaf6d0d857dd66c8216e2d31048b0b0a8e1d2decd0e8bd943cbdbf6628b8db812bf598900cb19d29aa6a5720a5a3ca638f2
-EBUILD yaml-cpp-0.5.3.ebuild 797 BLAKE2B 8bbe93179b538d9752b8a0a850b4eb23c423b65df19bf8f6344f343142b9e9dc0b88bf652f952537a9432dadf74e45cad2c24ce63908a329be67bc9d2da56dde SHA512 7ba8c623a04d5ca58e4f0398a08f35f93828b309d73f03d150f6345134544efccb4ba1ca87ded44744025f4c320576976cc8ba52d86604d7cbd0caa5a796376c
 EBUILD yaml-cpp-0.6.2.ebuild 901 BLAKE2B 1048d5123d5f034625e0caac09bfd90b36f67052a42557e05d8a445b662a295920cb5f9448414c0158b3f273ff60c7c5e46620b7a814c4e975c38e2dceab57b2 SHA512 562ffa3c2fe1f5aff2f7e3058f1280457e6f1480c6f97c1d7fb1d576327fd42390321cd4984c377d3736492fc808fdedafed8cac374d2422d4f8bcc4643b5c33
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
deleted file mode 100644
index 88ee25fa0acb..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/609176
-Upstream PR: https://github.com/jbeder/yaml-cpp/pull/514
-
-From a83a1b3a7bd0a5a4eb458d898b057f6a8d409b7e Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Mon, 24 Jul 2017 02:00:24 -0400
-Subject: [PATCH] Fix segfault in gmock when running tests
-
-Taken from https://github.com/google/googletest/issues/705#issuecomment-235067917
----
- test/gmock-1.7.0/include/gmock/gmock-spec-builders.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-index 312fbe87..2dd733b6 100644
---- a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-+++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-@@ -1370,6 +1370,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
- template <>
- class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-  public:
-+  explicit ActionResultHolder() {}
-+
-   void GetValueAndDelete() const { delete this; }
- 
-   virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
-@@ -1381,7 +1383,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-       const typename Function<F>::ArgumentTuple& args,
-       const string& call_description) {
-     func_mocker->PerformDefaultAction(args, call_description);
--    return NULL;
-+    return new ActionResultHolder();
-   }
- 
-   // Performs the given action and returns NULL.
-@@ -1390,7 +1392,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-       const Action<F>& action,
-       const typename Function<F>::ArgumentTuple& args) {
-     action.Perform(args);
--    return NULL;
-+    return new ActionResultHolder();
-   }
- };
- 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
deleted file mode 100644
index 6bf29f127ca7..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.49.0-r2:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild
deleted file mode 100644
index f889e29358c1..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.49.0-r2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}