gentoo resync : 21.06.2020

16 files changed, 140 insertions, 21 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ec582ae4b97d..e66c043c0d3a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index d254b5aa7808..92c27cad4550 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,3 @@
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-EBUILD eigen-3.3.7.ebuild 2356 BLAKE2B b3a5f8f30908af24cd5360079b95d27310741cf4aa222835370528c122b06b56a02f53aeee64be985474d41382d17c6ce6eee74bb64fff0a58924ab1af124da8 SHA512 5cdfb466e2e4745e470a89c0ba58369f20c3b7bced00187cd302d3b73d5ecb6cf16593dbe8224e193708ad73d5cfba0019269676e6321744456ed0b18cde4f37
+EBUILD eigen-3.3.7.ebuild 2445 BLAKE2B 2839ad4f33933b837191a8ee19481ea8600ebdc9adb38b1e01f291a13faa09d97b582c8e99d2ff4a48a9e3c5de4e592c3376f016cc8c448afa84708236774e44 SHA512 84bc4a4bf75c1333974f4e3ad59b42c6af8be42d594ad8934a3465978d80277495a909a63735b65a12dd938967863c036fc0d4cf158fe94cea19edacb60e7f26
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
index 25453c922e94..8d2a3fc5fac9 100644
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="MPL-2.0"
 SLOT="3"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="altivec c++11 cpu_flags_arm_neon cuda debug doc openmp test" #zvector vsx
+IUSE="c++11 cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 RESTRICT="!test? ( test )"
 
 RDEPEND="!dev-cpp/eigen:0"
@@ -84,11 +84,12 @@ src_compile() {
 src_test() {
 	local mycmakeargs=(
 		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_ALTIVEC="$(usex cpu_flags_ppc_altivec)"
 		-DEIGEN_TEST_CXX11="$(usex c++11)"
 		-DEIGEN_TEST_CUDA="$(usex cuda)"
 		-DEIGEN_TEST_OPENMP="$(usex openmp)"
 		-DEIGEN_TEST_NEON64="$(usex cpu_flags_arm_neon)"
+		-DEIGEN_TEST_VSX="$(usex cpu_flags_ppc_vsx)"
 	)
 	cmake-utils_src_configure
 	cmake-utils_src_compile blas
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index a3e2b7d8e477..eb3e663fd92a 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,5 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
-EBUILD gtkmm-2.24.5.ebuild 1552 BLAKE2B 6a5463f40eaf99f01745680e9487f5dc2d0de1cb2e56090b2b55b12921bd9afd73281fc4892c8d79be13d01325ce5f3296a7096f07e0b5057c20690595863016 SHA512 0e6ea19b1c6cf24e202ea3e25b49eca8e5246cef2a43002942029067fa60a622dcf9fdbaeeef63cc9990b66190d166321b6e81f20b901399b50061dfd7e399c1
+EBUILD gtkmm-2.24.5.ebuild 1532 BLAKE2B bc5d9a6204ef9694fb82802639c9f33948fa3fef3f26ae4b4155b49aaf37e0d8ae693f24c12b92ffb3007dba774070c065ae22ac98b24d1b9f397145148e32ea SHA512 cf1be9d38f332d1de5428de821227a4d64dd16ce5cea93493785ed28dd7b130fc5b3b3db0b9b8e4d7fed9876c1cb2167ab5a40ceff6e2bb972b64f48c88b33b1
 EBUILD gtkmm-3.24.2.ebuild 1871 BLAKE2B 0f48e3659c01a22dd6beb9b08ffa0a163d2e0505f15ed50e976beb8c9c92f139e73666b3df20231772e7a66c46a93d8ed53700167011355c4db4539956992c47 SHA512 464f07a4306d8e26c3d6ae7a41fa080037af938546efae8a66dd6dc95fe259c4b73a6d981b44bee1b414986150a5cb26976164fb8ec9730ead8910e2c458e58e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index c24a8be726c9..e4cf763c5baa 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index e14084ad4dca..a521002a0c18 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,5 +1,5 @@
 DIST libxml++-2.40.1.tar.xz 955220 BLAKE2B 44c55ab0e9018af859097e1a753c1457f5694b282f8f5187b32ce908d34f7953b8e73f1e41750ddf5f5c912712539e32f608a33ab79f22644e15010f75be6c51 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a
 DIST libxml++-3.0.1.tar.xz 948796 BLAKE2B cdfa37f3aebdd8109653c50d6e977a443173fe4ff18b3644a030bba065c7ced01bedc98a273ab3a8def73f78efd2458afd16ec68df9f9109b816527383904025 SHA512 9b8ccea9df11d70bb23d7d9983b18d28c648aa0107f9654a79d1cfe97db4633b69dd4b97b76d155aca8553d014a314247851f18d0371717e44a056ee804ccd95
 EBUILD libxmlpp-2.40.1.ebuild 800 BLAKE2B 50f06a9d980b0eee80b8a99cb8e3faa9732d7f0e5a44e11c87bb8523580e504faaf51fc73786f66c6b4122eba44ff67bcb1d3c1fbce5b7176c2f36bc8db6a663 SHA512 3ffd68fa3a89a910f12de9b3befd0990a46947411691a3168fd58b6d37d32b2477c01766436f92d2192e0e591e94a426983d36d3d5e826dc46dbbca0e98c52cf
-EBUILD libxmlpp-3.0.1.ebuild 802 BLAKE2B aa6e5fe000accde6634b269e5d7641c41b2fcce31436f06af96f420c63275b55372882f80a6355d61392329836d5bb5e7c37fd02e32951d0e1cf433e6e1b33c6 SHA512 fa39a3a34ecdcbd2d09848e5e0c9649d867cc959c9985b9acc413d9d4499bd189941205182993350c9f75cbda014e03cd9656f1378b23123dc60ff3891bef4d8
+EBUILD libxmlpp-3.0.1.ebuild 782 BLAKE2B a28801555e72f9e19f6ea8eddd25254b94570641d7c404327b57c651fff55dcb23847956b99681241ee77deb4c353bb0bf6a195e1f812c3907f9235772054c75 SHA512 9729b7e9782310806bf314e5b91e497404fb8abd4af9aa21ef3f61800036ad7f13d03cf2dbfbe3029c3ad8aaf0e8eac3ed21cbc118eb4bf3fb090781ed6de141
 MISC metadata.xml 337 BLAKE2B 3368606516683ff4d4ac84b801ca062aabfc86f643f841f1e7a56e6ed3194623e6a87b87ec98d664cca5841a639d0c46c577c584bd7396fa7e4cde6d78e096d8 SHA512 62e1b8bf26625304a947ee1264ba6e9bc904f3276488e09624b7508094730b041a1d5140f43f82301e3fb2b4156b658f7add79dae6007750ae1f29360f944a16
diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
index 642563cfad76..2747db92aafa 100644
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 multilib_src_prepare() {
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 505f7f70e2ba..e596a5c3f07e 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,8 +1,11 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
+AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c57b5cceac5fb0c99574c00a0bc6d4bcd7f340eb0bb452485422562549a909f0e9c85a060df468386e7d74f1a575d8554cc485f SHA512 fb4e32901d9fa7e511ccb84043c6df9d4dfb26f973c32d5d92fd389c0b20dadf3b6a749ef5b23660093cd20b280c8ade924f8e7e5af41c3a5695a3ca94c9e3c7
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
 DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca
+DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
 EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a718389956488a4ac8ebdd9af9e06bd1ed7b88a203ab9290ab919c663ce4600fadc93af6ef48e6e5b259ed7567bd913 SHA512 56a1f4f52cb439a109e7c41a59266b6c0282ed1345265de6368a4e2caa57b31c1e9eb8091ebcbd1df4cfe8fa8b480479ecac59f31ff6f98e966f0775f7446b03
 EBUILD ms-gsl-2.1.0.ebuild 790 BLAKE2B 410765af2d63169d15543f3ce9bc2685f01737cddb0ab19631f516e8556bed80f851104d504bd9f4513f3b56ed74d58a094887a97e02f2fd2694bfb1b6826772 SHA512 e2ea2e252a7eae5e31a60611198ef39cb576d047efe601d782e98386bb336b014b94f5f13f2c9cf2ede9f52d0a6eac946f0a559408e4573c9f6816957d771612
-EBUILD ms-gsl-9999.ebuild 738 BLAKE2B 6370f30e2e84fb7620399ea761ac22392bdb6d283a856e5f5c53b892ae9d4a2279eb6d59e388703a2b70878c987d4a26c5c073cb345dfb914b68f1b9f7849e1e SHA512 acd80384e09fe1cdb6b2c2c2e2b550df8c2a1d66b6ee5f1e92b6d76f9524f4ea36ef2af9b09f0ce277905c6fd425664f13b9df3c9a1c968e9895d98aa732290a
+EBUILD ms-gsl-3.1.0.ebuild 736 BLAKE2B 6a146b5357462d04f18b5d7bc0f67040179fd541b80d0f26b1b09355024fc953f4288bd60f4eb5231c3d7609bc3da4b49d8f280c121a1c9235eb100245277c70 SHA512 d83a18b34b6d6cc0490a3519cbfd6aabc2404469f385d0729e7cb92e28d48a66a2f6f29d33848031d59e7d501e52431f6d01b9819479fe6c152036909105bd11
+EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch
new file mode 100644
index 000000000000..fa8d09aafe74
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch
@@ -0,0 +1,82 @@
+From 727e9b8312c7ae011b667152606afc0e04ea197a Mon Sep 17 00:00:00 2001
+From: Jan Henke <Jan.Henke@taujhe.de>
+Date: Sun, 14 Jun 2020 14:12:02 +0200
+Subject: [PATCH] Use system gtest instead of downloading and building it
+
+---
+ CMakeLists.txt       |  1 -
+ tests/CMakeLists.txt | 30 ++++--------------------------
+ 2 files changed, 4 insertions(+), 27 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 740cd31..f1bf7a2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.1.3...3.16)
+ project(GSL VERSION 3.1.0 LANGUAGES CXX)
+ 
+ include(ExternalProject)
+-find_package(Git)
+ 
+ # Use GNUInstallDirs to provide the right locations on all platforms
+ include(GNUInstallDirs)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2bd1bbe..c42afb7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -5,32 +5,9 @@ project(GSLTests CXX)
+ # will make visual studio generated project group files
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ 
+-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
+-execute_process(
+-    COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+-    RESULT_VARIABLE result
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+-    message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
+-
+-execute_process(
+-    COMMAND ${CMAKE_COMMAND} --build .
+-    RESULT_VARIABLE result
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+-    message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
+-
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ 
+-add_subdirectory(
+-    ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+-    ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
+-    EXCLUDE_FROM_ALL
+-)
++find_package(GTest REQUIRED)
+ 
+ if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
+     set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
+@@ -139,7 +116,7 @@ endif(MSVC)
+ 
+ # for tests to find the gtest header
+ target_include_directories(gsl_tests_config SYSTEM INTERFACE
+-    googletest/googletest/include
++    ${GTest_INCLUDE_DIRS}
+ )
+ 
+ set_property(TARGET  PROPERTY FOLDER "GSL_tests")
+@@ -149,7 +126,8 @@ function(add_gsl_test name)
+     target_link_libraries(${name}
+         GSL
+         gsl_tests_config
+-        gtest_main
++        GTest::GTest
++        GTest::Main
+     )
+     add_test(
+         ${name}
+-- 
+2.26.2
+
diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
new file mode 100644
index 000000000000..525d59e6e4c9
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+	"${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
index 767d0523e267..d7f19d2bb295 100644
--- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="Guideline Support Library implementation by Microsoft"
 HOMEPAGE="https://github.com/Microsoft/GSL"
@@ -18,17 +18,16 @@ RESTRICT="!test? ( test )"
 
 # header only library
 RDEPEND=""
-DEPEND="test? ( dev-cpp/catch:1 )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
 	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+	"${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
 		-DGSL_TEST=$(usex test)
 	)
-	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index d23966e1e6be..b41f426471e4 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.42.0.tar.xz 853064 BLAKE2B e0aac439565c4fc80c71cfdd430133373cca4c88c88484ab5b77a2a395154e3d381bc0158a9d312280f409ba325b547504016d8bc50830794dee13c199ee1e62 SHA512 2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59
 DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
-EBUILD pangomm-2.42.0.ebuild 944 BLAKE2B 43a685ef7c321c69f09c3273d447b12dd587683fc741e43599b8bcd524d3b22a991a48c8762592db699af50c506a789ebdf26b67721b8bd613f535062732a75e SHA512 c0b7d445edb0c0cdd5b4cd6f3abee7cf2e1c4348b2d0b542fbe2ced937726aeaea14f2393e8c79b79748883623dd24b57b37f79098f808c38521e453ad7df924
-EBUILD pangomm-2.42.1.ebuild 945 BLAKE2B d71ebc5f19adb2f9226967d227605898749c2c62db26b74da66e09827c6605445d1f40a74ace82c399d8ab6c0e34cb0a975ce6246ffa8e7da17610a96bdbcd9e SHA512 68354ac1b00148f6e6963f3e8427af78447623a510661dd7983f57fc4b37229b894d5f98ff400c09b166f6de8f115752aab2706218487b52bf87278e13329099
+EBUILD pangomm-2.42.0.ebuild 924 BLAKE2B 209051aea2a1e26b224cbf12c3cd2c82fc49428040e1f54a49d15387ab2d6aa91e54d5b00d14f44ed64c9a395c8a696c215f5fed731292b4eab5cf14a088c8a1 SHA512 f2cfc9637ff80374608d656e5ec076926a35aac6bcac1ac08163748aee94a951500f91e5315034b145bfd56abf67e91f8d3b6ef16d367303076429ecb3c9863b
+EBUILD pangomm-2.42.1.ebuild 925 BLAKE2B 90f585a7dbe0bbe95813cf8fde1c082856a090eed93db4346a929f4e17b659b29f2f2459760d6f008804c0f91daaf8c790cc5ac221dbe918870abe8f327ae25e SHA512 62a9caf65b5ac68cb406c23550be93d209dcad660a0e73597876037eab4f6a00e72583c1d4df7a58afe1e6e8f5f162170dee5a10051d74d1d676f8174b5f71df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.0.ebuild b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
index a26725fccced..f19e34ec2a2e 100644
--- a/dev-cpp/pangomm/pangomm-2.42.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt
diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
index e592edcb44b2..fefc39269edf 100644
--- a/dev-cpp/pangomm/pangomm-2.42.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 4e59c6d04231..976eb80b9f81 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -6,5 +6,5 @@ DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb5811
 DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
 EBUILD yaml-cpp-0.6.2.ebuild 923 BLAKE2B 56c096aaa6f7be157e5d83594968e2e65bfee0ea152a95f6a8d0d3b7aeff202a97ef8b70739b8430120978ecb416ddd94c15b9c20e25580fb12c4f011bf8251b SHA512 41a527eec285e4ce2122cedbcc6aed7ae38eb6b5ab21ae5d691205d7990a7fb6bebb9d8b93d4253939b96cd3b232e7b3ec596d5d3fc8ddaa2df35b13f0396af1
 EBUILD yaml-cpp-0.6.3-r1.ebuild 972 BLAKE2B ce630cbf1b1f58728cda0a79f8d922f8fa57eb1dbd11e64efe3983bf1fbe52412c59d651ca9bd7d53006670238953e67ecea4e9b224590020635d6431cf3fd29 SHA512 8796a6ce430f75762a7b3689a2c5a85922ee6329aefe1d998d9b4b99f0b1dbbad6ca5dc492a8104dd99c392606073cc02ef14d656db766647b5177227efcead7
-EBUILD yaml-cpp-0.6.3-r2.ebuild 1011 BLAKE2B d9190eefc6a50c9a8400fe03e0158ee5707bbd6bbeb45c409362b89e345be3880fbe571e3e29952d35cd0234efe45c4291dbea1b08ae60eaee16d8c9b9833e45 SHA512 b933fc3e00f6c88750d9ad3252881638fb9698e8ab5830116b0463a694830459f07a501eeedaf9fbf752bcf8253d4ee5e8bbe600e010aa3191df9c66d457809f
+EBUILD yaml-cpp-0.6.3-r2.ebuild 1008 BLAKE2B 72db675270af1fbdeb3ccf2281a262c75ecabd8ace9098f793bae08a663c2ed6219b9882bc482fb6b5e9240a7af4da2a7f32d04d3e3a5d7456fd6b3cf5123821 SHA512 6dac3f63470f1c4e82f16195cfa24726b281c83de7915b261d98833a0b7e882afdfb89d5d8dbd4babacdab1e467046b2139147376dbcc764169e4612758961b4
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
index 5dd5c5e5e7a0..98223343eb1e 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # test breaks build