gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-cpp
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
54 files changed, 345 insertions, 417 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 89794fa042af..6ac89f0e0e0b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index e204433e3f95..1a0243ac44da 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,3 @@
-DIST atkmm-2.24.2.tar.xz 849784 BLAKE2B 2cd96268cf727de1ebe83428e98f1d21f8dbd1a72ef01be80ec28d169ff0ae9ac375bbbd1a530f3c47b60b49a40e317fe39645d74f6be3c017edcb9735bc0236 SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
 DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
-EBUILD atkmm-2.24.2.ebuild 842 BLAKE2B 3a971115b7b91ddc7cbe56f2cbf6a94283090767627c506d93bf21510527d39a8fb298b1a2f42959132dddbc265d362b960a4ae2640290154685946d578963ec SHA512 54fc1a5bef95840a2208452c2e9229fbbe70249fa36be408bc3e478472bd59842bd73e3d51e097f66c6185b6120d222134b7b867866738cf014f7f15ca27f734
-EBUILD atkmm-2.28.0.ebuild 822 BLAKE2B 1f4149355b858d2942131f13ee033952a78a341ae9aca3b006a16c8db1d14db640d9ecee19bb0150f7d1257d424d247a462a9869362933ba70cae041dcb5ecb1 SHA512 cf91315adadda8c8a4f7113ab6cf4b614a1b7db05ada9bb9b195118f23c83aebd1c1d7dd78a82aa4766094bd6157c9bea3929bdcb004e90856a8c28337424640
+EBUILD atkmm-2.28.0.ebuild 821 BLAKE2B 516c41b39508107db527277671d2da1ab800b32e9b9a6cbcfe324b6512463d09e259a9c68aec02a2ea7bcce7920a31620ef233d8f493f994537c96d2d4ec2808 SHA512 5ef9710ec7b8b39a4e19edbd485ad18b9ddb3e35a309c1a12d854247b518769e9c416492d273ac7a50b47a4d91daa93a2db90f7e079f33add763f955625d2b9d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.24.2.ebuild b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
deleted file mode 100644
index 2b72f9de79f2..000000000000
--- a/dev-cpp/atkmm/atkmm-2.24.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 1d1c85676aa2..c0d2f2904ad6 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index e2c22ebf53f2..86c8ffbfcb99 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -4,8 +4,8 @@ DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2
 DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6
 EBUILD catch-1.12.2.ebuild 803 BLAKE2B acbd83bf8eb3f430fe160db5d944677ab624aa9bd14e363ff41dfddbdd1c03dcbdcd8c7dcee78c6a1f541a55229ad680dbc347dacd846c03c6c7b96f1e0ce322 SHA512 1ad95762728b22ab9f6d73742b82b17697089cbaed9d53e18b17c82cf6759a50dd29113d35808a38892a21613050e057d0c2effcbdc134590046b3bd80a7c915
 EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
-EBUILD catch-2.5.0.ebuild 916 BLAKE2B 9a7efd65afb6de239b60e4323b23dc8b4aba7279ac7b17b2cd6a7c5db56b54b2bbc70d54cfe30d9a061e38d0c97c1c998858869911416f7d1470c393630e0d70 SHA512 fccb13c55cddcf03ed55d92ff32f19c173a96a4bf2c6123d53ebf0bc14565252c2d7363579342274f9b00f29ca35b3b92187bfc5986c43a9d08341784f451869
-EBUILD catch-2.7.0.ebuild 918 BLAKE2B 5a12b57986cc2962aaacdc4cad8f6e4ef3457cc93e651c50baa4a0c1c8959d75ae4f6015aab639fe3f791ed1cc66c0f587b860fea31073ffb1f502ff18828731 SHA512 05ae02b9b2b81b08075077b3fe324ea016d3b130543bccd459c09857336a712fb3dc41c24b741b48a12c7c5b941a288bfcebcdafd13a57f991a9799b2221488d
-EBUILD catch-2.9.1.ebuild 918 BLAKE2B 5a12b57986cc2962aaacdc4cad8f6e4ef3457cc93e651c50baa4a0c1c8959d75ae4f6015aab639fe3f791ed1cc66c0f587b860fea31073ffb1f502ff18828731 SHA512 05ae02b9b2b81b08075077b3fe324ea016d3b130543bccd459c09857336a712fb3dc41c24b741b48a12c7c5b941a288bfcebcdafd13a57f991a9799b2221488d
-EBUILD catch-9999.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
+EBUILD catch-2.5.0.ebuild 914 BLAKE2B 8d7d84cfdf672fa0b9d34dd485ad254232dd953cbfa737700483d0cc1f14e563c34a1933f6109aa9e02f43708cdf76362dbb5320c3940269723f140414bcfb34 SHA512 cf13093f304b747c2fcb98dba03b47183d5a8926250c40098746ad0114eaf65f320a4c5da9baebe88b1ca65d724d8ba2fce468768fb86c9623e86d4eef24eaec
+EBUILD catch-2.7.0.ebuild 916 BLAKE2B c4f1aec2962c2130fb7bdfa98604499ca3944de72beab1931669566c29e391c5a7caae830922d8fb76755c1692ec51c53f0fb84378f94d7e2d162b3539672c57 SHA512 293dcd57b58004378c8e1bb9c0cf9a924ff7e698bd564408039cea32d2188cc2d11c39c2a849f65fe614adb895ccd3df674c5884b6eda34b9b16a6f3aaefa40d
+EBUILD catch-2.9.1.ebuild 923 BLAKE2B 66b33e2f955846ec1fcfcebd1267a33aa8d4502008f0c9cf41dc21fa8d45ed1b82bd9aa092a9dd236ed6d5b942723245f760b5bf688af856578201aef23964e2 SHA512 7bc16b5e9567ea42367adfd973ac40b49d0a40007ac0d022f611244eeaede6f4d28a8cc4e398fbb15ffcf47e3f5097709545f87eb895d3a1d2e1251657bcd1dc
+EBUILD catch-9999.ebuild 923 BLAKE2B 66b33e2f955846ec1fcfcebd1267a33aa8d4502008f0c9cf41dc21fa8d45ed1b82bd9aa092a9dd236ed6d5b942723245f760b5bf688af856578201aef23964e2 SHA512 7bc16b5e9567ea42367adfd973ac40b49d0a40007ac0d022f611244eeaede6f4d28a8cc4e398fbb15ffcf47e3f5097709545f87eb895d3a1d2e1251657bcd1dc
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.5.0.ebuild b/dev-cpp/catch/catch-2.5.0.ebuild
index 2beda20f59a3..5af50e08abb7 100644
--- a/dev-cpp/catch/catch-2.5.0.ebuild
+++ b/dev-cpp/catch/catch-2.5.0.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/catch/catch-2.7.0.ebuild b/dev-cpp/catch/catch-2.7.0.ebuild
index 1a7d1ed8fba5..483403fa60f5 100644
--- a/dev-cpp/catch/catch-2.7.0.ebuild
+++ b/dev-cpp/catch/catch-2.7.0.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
index 1a7d1ed8fba5..fd90fc1a780f 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.9.1.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 
 	S=${WORKDIR}/${MY_P}
 fi
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 5318b054d396..fd90fc1a780f 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 
 	S=${WORKDIR}/${MY_P}
 fi
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index 5f1365849bee..bd3c96984c72 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,3 +1,5 @@
-DIST cpp-hocon-0.1.4.tar.gz 157988 BLAKE2B 3b9e3ec2c386446a2c1d078867b03fbfe2adc8160877288597c648eaf4af6e34f09b673780e6fb81ce9bd1724c1e3d6efc1102985d344a4d1d7bb48b15916190 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42
-EBUILD cpp-hocon-0.1.4-r1.ebuild 1012 BLAKE2B 4d57a1fb57ce39b31469ef5fb1298b07f485b3d2e74b6add0c83d11a0c5093c13e49cf9f6a350ad5917c9157d41b7181f790cd8d0d9f9d9906f881e35dd93252 SHA512 1cd0c36dd4a21e9a09ba5b1fd443108ebbc41851cb6ebf833c6768cadf992f32bdb1cea7df16626352d4fc6e50e4d3dadb3b7c340305d96f2e22943b3a465033
+AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40dcc2ea8c7357c3efd3e2b41c2be95f385297f021c54125bbc2695e753c7ab97f3e78a16497c11e980bb9a6f41eab0 SHA512 7b039ba0b668b9578f908c1bfe20ca725c8bc753f6b68f8540d3eddc8323f865096d0cb4e9274ef09d210a72844aed54888506be20c964b91c8bbd5e01a4229a
+DIST cpp-hocon-0.2.1-boost-filesystem.patch 1004 BLAKE2B f1e8db5e00283b526a45155a705f25efcbe790a08518697facb70ec0adee21a0a954258c09527ee75d50b91cde4824193596c2a53af4f2613ddd709862840a14 SHA512 1c73065ace6ec957b0d7241f680e475708deedad43d2a200b4877350e0712dbf13aea8b0c12c7a0d02c12e2c0b3f201ae85b952969eb66e390276bed83a5d7ad
+DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
+EBUILD cpp-hocon-0.2.1.ebuild 722 BLAKE2B 8bfd9e61c65ace0b422081b6f6d21dd40635bf89c2ea44b1c5c015e3338acb420e6ea00cf86ca24dd71e24776610ceaacea04da4a92b99fee912db138a54ab53 SHA512 4fd9d69a49ca6b2e28ced52e9b9415e7588da611ce07e45740ffc558aa9add2b946cbba6b0edde021526b705b9b9824a40f0352a666938f05ecb0167a6efaccc
 MISC metadata.xml 433 BLAKE2B 5b3b4e23af7ff914d5b4a3ba6425f469273ef8fb513766a07b3d66110688df34dfd68b43812905bea98cc39c2b3df06b5614bf504a78f4c2ce0c6d56bfe483a3 SHA512 7f890317b6cdfc71563359d575446ccf489d6ffb79ba541566fa747e4a0c1e077ec7f7c5263d96035bbfe77f6631cfb9000f715c348ed543492b7dc4cc7cd305
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
deleted file mode 100644
index 752c94b6d592..000000000000
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Provides C++ support for the HOCON configuration file format"
-HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=sys-devel/gcc-4.9.3:*
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-libs/leatherman-0.9.3:=
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if use debug; then
-		mycmakeargs+=(
-			-DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
new file mode 100644
index 000000000000..9c58708c6dc8
--- /dev/null
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Provides C++ support for the HOCON configuration file format"
+HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/puppetlabs/cpp-hocon/commit/caab275509826dc5fe5ab2632582abb8f83ea2b3.patch -> ${PN}-0.2.1-boost-filesystem.patch"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-libs/leatherman-0.9.3:=
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )
diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch
new file mode 100644
index 000000000000..8e0ddb924a46
--- /dev/null
+++ b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@
+ string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER)
+ string(TOLOWER ${PROJECT_C_NAME} PROJECT_NAME_LOWER)
+ 
++include(GNUInstallDirs)
++
+ # Common cmake setup
+ if (NOT CMAKE_BUILD_TYPE)
+     message(STATUS "Defaulting to a release build.")
+@@ -42,7 +44,7 @@
+     set(BOOST_COMPONENTS regex)
+ endif()
+ 
+-list(APPEND BOOST_COMPONENTS thread date_time chrono system program_options)
++list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options)
+ 
+ # Add other dependencies
+ find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -77,7 +77,10 @@
+ set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true)
+ 
+ add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
+-set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
++set_target_properties(
++    lib${PROJECT_NAME}
++    PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
++    OUTPUT_NAME ${PROJECT_NAME})
+ target_link_libraries(lib${PROJECT_NAME}
+     ${LEATHERMAN_LIBRARIES}
+     ${Boost_LIBRARIES}
+@@ -88,7 +91,11 @@
+ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
+ 
+ # This correctly handles DLL installation on Windows.
+-leatherman_install(lib${PROJECT_NAME})
+-install(DIRECTORY inc/hocon DESTINATION include)
++install(
++    TARGETS lib${PROJECT_NAME}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(DIRECTORY inc/hocon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ add_subdirectory(tests)
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index e61c89ba66da..61dbd80d5f29 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,5 +1,5 @@
 AUX 70ctemplate-gentoo.el 282 BLAKE2B 6004cc2b2e543f47c0c808bf494160c4b7e7e4768a954c1b0d99bc065a89145875dfc2b1e386bdf3a5e4dbb375a0bf5badc45b1666320f2a00fa8bd108f16c09 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3
 AUX ctemplate-2.3-fix-build-system.patch 1196 BLAKE2B db2efeaaae0a33b33bf81c6b968b809e31dfdf91ab5adb2a9851748c01a883e19a4b590002c20ca13e517c142264b8361fd6e5f3582a3650388bc4e0a5d6340d SHA512 4402af1034780d00f733231d9ce534cf54a4474a1153bc534274bc2f5163aba8b39e2ad7613151ffd34f3b7d4ba1d3a0c51badf8f1712aea6a1b65d963e3bea4
 DIST ctemplate-2.3.tar.bz2 564389 BLAKE2B e0c95ac534eb0b7fdff3e87e08f3b1b8aa735bec8eef05bebcf87a51375cbc93e768a18ba005248edda023869b21679dbadaf3d6462e71666fa5d85b96172851 SHA512 546645389a8bfed59686b62b43cb7d53714ac98e1b75311c217bb0f3b6201d5d486766b1ce7e35bf15032372e45c36b27008f54085bd0c9ef0dd0b7e04b8e3f5
-EBUILD ctemplate-2.3-r1.ebuild 1533 BLAKE2B 598894d1f1daaeef3ac7549454dda62c80822bbe33a5c725b2e104ae7edef09c4703015fe4cddd1cd1e71aa9eff07a59c4b2330d553b63d9fdc6622bb294060f SHA512 8e338af1b10165d16b113eb008f744ff96d68e4f242efa6aea3abe0add00526095ee7055e2b832f012042d182e573c4b3811c8974e33fb621935cdfbcd52ea63
+EBUILD ctemplate-2.3-r1.ebuild 1543 BLAKE2B dbcfc8010c9fc64b5c3dbf8c4a9ee53b4e629fed6b8cf31f5726be2d8a0ab4995635fa0fe5de6af4569438f11e1e699c73271227afd24244fd2e1587c12cfd8d SHA512 4403ad7458a0915e34aa429c6a7bfa8240d1ca885936a1e88d9594b3329b3821b96ef6499e3b958fe195c8c256e1bd25f766f5f6d56115d57c7aa9b78b6b1d23
 MISC metadata.xml 313 BLAKE2B 881d0e8b5849fc9ab98017806d6989ae27d27268bcfa6178db02eb2ef64e88509fd3230faa99440a866d9941832c1a7bf0dfc31f97244be2e04b3438db9bff8e SHA512 2d6beb50366ed619ca45b0552392b711e286f5d657946c7edc0c40aad5be2d1cc345ad1821649ac7d539f21880cb50c6d127a2584f19b82fad2d6cdc74644655
diff --git a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild b/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
index a578d0f6a249..36ba44df7ed2 100644
--- a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="doc emacs vim-syntax static-libs test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( >=app-editors/vim-core-7 )"
 
 SITEFILE="70ctemplate-gentoo.el"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index f44fcb9db3db..b92a19e06700 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,9 +1,5 @@
 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
-DIST glibmm-2.58.1.tar.xz 6778632 BLAKE2B e51e43cb9361147627c2ffc4c232bd8b15d935cc3a20a4fa8d98f5be9c45f7dd635aab69177d033cf65a6e39cee53bcc723be56cc8db966e88b00b5f9cb1f29a SHA512 c1a67412e6de3853557318cd921e6e73874a14ffd3cb51fc158b0d45fb1d5c2560e011b3b0be7f8cf8afee13952e824625d832e5237288b974c2ba20a6f042cb
-DIST glibmm-2.60.0.tar.xz 6874840 BLAKE2B 4d71bb394fe88d0a6b0286b1d9651e6063957f7d4adca6af16b2e5698d8f87984f37257c879fa4b655a03519d6adf6400695197d29e0dd14552ac3bf174f60e3 SHA512 ea0477d5cb6e59019e87f929630ff32ac38dd5e4fb53fe84ef64b5b41c1090c8e10a0a67b26c786ab4d9ebf64b993fa0044333b4aa8554c331a0a6d02039c5ad
 DIST glibmm-2.60.1.tar.xz 7132072 BLAKE2B 8d25287b7805d7196bffa909447db0e0fa0edd1c243b3ccdef91f1a6573ea0723cda8e88993e878e6c8440b23488b0ab8c9ed727bd4e2d4a46f56ba251510aa0 SHA512 89f1d10bd9b60232519e2e13c02b0b1010dacbe67a8bab06c3a5873649e5090ed3593d518bfd8e12933a08aaa5fc654b1475efc208e2256c7efd197274a28b79
 EBUILD glibmm-2.56.1.ebuild 1650 BLAKE2B 52bc2daf7242907d02315fd25e2275b724b08ba2f48f17cf9e8b36976e85c17e73e0d5639cefb5fd836fb3f99caf17e07cbbd508fecfe8b161de344d31196662 SHA512 d304995405205e58bb1b38a231dc1e2cec7954d30d4d16d7f8939183f7a11a33fbb1743fe10efaaf6dfacf2510018cb34ec479d090b99ff45ad5fa3558e3c074
-EBUILD glibmm-2.58.1.ebuild 1652 BLAKE2B ea16e976985e194e1d95206a4af5037b08a7c89e617810521618d25fce5c8958fa002c04108d3c1ff80b17416efb7d001a6d7bc7b5560e5ca823542fabebea9b SHA512 f5af8b892ef2e56ce283c58da281a0e89dbb672a12d5f139cbbeb7489a6276298b9bb50ad596e74a3ddeca1ac523792bb6992b5e80ec70393133f188eed1bbc7
-EBUILD glibmm-2.60.0.ebuild 1659 BLAKE2B 1ae1d667fdf9bb500127639b93a7a9f54eb8a13b1c23d23c508f6fa2ec2ddc27ee43fc92dc5f7dfbe21dae8b0c4b070634c50e5b4a6e2cd8ff49d4801822c0e5 SHA512 499edc9caabc07c84072940430773540e696c827a049c39cf5ca3f9c6bbc221f2e67ad1122308169a4bed14d2427d47b2d2f20901b8e80efc40a5fa87f50282a
-EBUILD glibmm-2.60.1.ebuild 1653 BLAKE2B f334e9c04f9591aee8f4f4bea403c8d98dcbfdc0959fa6fbda231abc2065cd2077f76188c6161a98da4386c494e5a69388fa15264a20a52dc56ab190f1475aa7 SHA512 e488221fd89c326e3a2ad8f71ced00afac5fc031e0ecc00499264f2a4ae99a9f299e5dcf3ec81306f955c850f1e71dfd0ae32bb79e34fb17c83be15ec516af44
+EBUILD glibmm-2.60.1.ebuild 1651 BLAKE2B 5b5ee9cf63e003b630425b137f4b4a7476201f4fb1c8eb7165e6a6a445bde8eb5b18ce9e9308a2585160c52c8a78407d8b2f60775c5ad0442986bde67726570e SHA512 bba20cfc240ad9c7e46d77b35eda498668ccc0ad4109f42dead804516398040194543eb3914323b6764c507be3f9394101068825aa1bf85d2eeaaad76c1ddd86
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
deleted file mode 100644
index a9698a9ca848..000000000000
--- a/dev-cpp/glibmm/glibmm-2.58.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.60.0.ebuild b/dev-cpp/glibmm/glibmm-2.60.0.ebuild
deleted file mode 100644
index ce57fc6e0e53..000000000000
--- a/dev-cpp/glibmm/glibmm-2.60.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.60.1.ebuild b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
index b119a2d526a0..3827d782a774 100644
--- a/dev-cpp/glibmm/glibmm-2.60.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index bff61aa05416..27a570a0dd7f 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -7,5 +7,5 @@ AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d0
 DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 EBUILD glog-0.3.4-r1.ebuild 1204 BLAKE2B 9d42deb4393209103cfe12326f38ed5b43fb5ba7237716b92b011846686512ba83c6e703993dee40307ea6a66406467d90eaf199ac8d271c83ea775c0e2ded30 SHA512 184fb374d97f3b0ce68fd2eac0c39fc60e35b774f200eb38f91be810ccf7b4adc2bc2f33e3fc77949ed1134f32648dcdd52f49602976a9e80ea6edeb39e8f232
-EBUILD glog-0.4.0.ebuild 1026 BLAKE2B fa3e86848379b11f6e5b150546eca725117e8f1aa831612c9ec8a04fbb6c77df47c78eefe570d8e19c4cb1831e87065adbbc81a9600f50a5146f340bd302309f SHA512 a5daf1580a22396713804053736893290fa0fc5784074719ebd1b4b1fd270253427f59e3e00120c33706a9142d8530b8bf67a7e815b6321628c9e605d1aa748c
-MISC metadata.xml 527 BLAKE2B a0ed7bafa31a61313d12431237947a4a1871df9bd13a6c95eee61d638d79a0ac5695a3fd4cdf22b696ccf632c1fa1d25c64b834649747fdd0b869cb2ba836b8d SHA512 37ba0ce628370098503c572a1af684a262872f4af72418ea7f8d3311fc46ce5a81940c762a1cc81ed779e2919b32d10d1c0eaaccb8025fdbb171f0e6c5300d53
+EBUILD glog-0.4.0.ebuild 1118 BLAKE2B 9bace5d2831236b2ba1aafd1858837b852e212ceb019f5155f91546106342bf748506ba45d851e801037de2bb3d6bfe22001606898753fcb7b9d7ace49f09568 SHA512 a4c8f05e36042a558f858994c4ed93082147cb689f8bf48fbba0cafe8ad11b7190275b28dd477dc51444ef1f716c9c25da4991e8385e80c411a0ca463c162505
+MISC metadata.xml 719 BLAKE2B 37aafa6b3ad08d9e26bcefd30d0f86b2d8339feec2b07818141e5b5b643287e7972e1f6328aa1f1a3c8dc6d2b9eb9692a5afb3064a690e69807da95c96d575d8 SHA512 6d67b0656b906fa51d657f00d8e801ae11a1db2ebee5c99e53278cc88c63e828f8a0770dae9e06a4bbf3947eba19d08380da849fa588c3fd061f66955eb452de
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index c5097b33e782..c81238fb365c 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,11 +11,12 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="gflags static-libs test"
 RESTRICT="test"
 
-RDEPENDS="sys-libs/libunwind[${MULTILIB_USEDEP}]"
+RDEPENDS="sys-libs/libunwind[${MULTILIB_USEDEP}]
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
@@ -32,7 +33,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		ac_cv_lib_gflags_main="$(usex gflags)"
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index c1620e13c078..2b1fb7a5004b 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<use>
 		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">google-glog</remote-id>
 		<remote-id type="github">google/glog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 8b6fd25ae9e4..161bf986e6c8 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -9,11 +9,11 @@ DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a143
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.10.0.ebuild 1740 BLAKE2B f821d897e772e7da001f7033af7f163e600246a23292c17f2871589156f13683b4ede68fe1a9919c513609802cb3e2604fa86106cb80d23a626cb870dcf1462f SHA512 e14ad3011f99752b0f339d7870102bda2e04c94e57241de4fbe99bc57aba7f918808319507e9b7ae878b0c32bea86b7d2a7f49450ec3f90cdf25dfb0471ee8c1
-EBUILD gtest-1.8.0-r1.ebuild 1675 BLAKE2B f1e5db5a628ff72cc22ddb7013fda0776d9e4c7deeb6af4018385e36d8cb637a5493c5743a4315e4b6a7aa629822c6e33f3cfd81a7ee0480638a195555802f59 SHA512 5aa279833eaf29e2f4f305d0b5008cf96bedefb340037be6a53627d1f416ad3781c58f252de4802c69a4529360cc27cb7e71872fb931c4f1c326ff110d73dcbe
-EBUILD gtest-1.8.0.ebuild 1638 BLAKE2B 56cb9b08353605da49f8de22d2d8afee96a3d401c60e45dbde06eaba6380a7a9180fe510a18f82ad68c55063c430078b8aa0ae9315ae218e58f107a8df5c8eb7 SHA512 9fbb7b3777e76b8524fbb553e9eb2a8bcb304a7aa3c9bedf2214d3e8d7f66746468261478e2e6a06b8c3794a90111fab84a71004517b8c10cf9299ed5e28a253
-EBUILD gtest-1.8.1-r1.ebuild 1667 BLAKE2B 06664715e9b4c0008afaee56ba74110b6360308fa1f91f1694f012969303f4033d3b5ea94c7834a5d7cd1bee88f22a6eb5b679ef81862a83c6289174e0312b1c SHA512 9189c9ad9e548c2fd600c061e9c92e2300382b1e9566f0f86cb78521a8169b1679e5c3e4c15f41ea7bebc27cdae174dc69201e270a569de56a03ed838d6b4db2
-EBUILD gtest-1.8.1.ebuild 1691 BLAKE2B db4f57387285e84c017e4a92c99bf53aec9ad4eb81087c55c9fccdf5d22256b1716ff9fcf94b579296699203510b136f91fb24f381cf70fe4bbeb9c1bcc0c3fd SHA512 c485ff0148314a6cfac0bfdcf5e98447ed113f8876ed79c51c141cd116ebf8309b24d79499e99ee0d7bc89a75e3f053042947cc1a7ade2fbb8fb448f36cc9753
-EBUILD gtest-1.9.0_pre20190607.ebuild 1759 BLAKE2B 33fda1052749c49b8dacbdc54335d3d81898e923effa9a8b1a410904edd0b8916d2d9e9f6282bd9c33131fb5a163a00edffbdccaba7898bbce26eef8f48109ef SHA512 87cc7c081f8659068a9091d7be0aae3e27a1bd44190629651298fefd0719fcf20424470a469f51321116db3f103d173ba7064a2706a96af4f6c041cad1eec77a
-EBUILD gtest-9999.ebuild 1726 BLAKE2B dcc5632e948fb62f97891c3875dd11726261b8525abb7c6c60f587620f1ca8bed1ea95c8f1940c7be888f964128eb9d7e996acdd11ba3fd1ede4d84b2c91eace SHA512 6c8680ddfa5dc57177a2f8719f01f9cae03e9b4325026ee5e68161eb012d2da290337deab17fdc202188e76bad1349c7020c77165280c903e7257981d51ad6a5
+EBUILD gtest-1.10.0.ebuild 1741 BLAKE2B 0c7aa86a1f1c7383083e7b9984ac42637271a82de50d2885c4da1bc70d960e155dd9396414ec0a59f46cba21db7e9d87ad2d44f57ad0352e60bb4df36191b4a6 SHA512 37b781ec3ab381d4fc2d4de0317044c82306fdec8b5bb9bd31f16ab277a3ecbd288ce95c79723d906a3df54fc34115ea528003c2effe430048c6217e3a44ed01
+EBUILD gtest-1.8.0-r1.ebuild 1666 BLAKE2B ca188c3667ce9ea028559a0e031b629dd558ca3856820b9f03db6af426e2eb1e28d4ee3b3cbdfc8147ed1c49ac36d721fd433c04ff8bced7701befc0a3ebf0cd SHA512 6f60e7996e5c07f90e36f067955616fd57fd40b29b04bd4d195b9c774c2c7243af3bf7710cca00d5d197ef2eedab3dee95662ed4bee73c27626aeb200e959cf2
+EBUILD gtest-1.8.0.ebuild 1629 BLAKE2B 9b4b16533fb26e2b4a847dbc23bb9f60f37b0d52e19e613734bfacb32014fa936d6b978e69b8bdd8d0625c394b6b61c5b9c29dc3e663e2fc31ab38a286856539 SHA512 35427ebb7c3f3675441c61640379b677cfc735ed9a0029af53757645b3c54d661aa6488c3c539fb71873ef42877db63d434c6f4351cf2c9e5f3aabf3ca056c80
+EBUILD gtest-1.8.1-r1.ebuild 1668 BLAKE2B a63eea44c8d7757ffd095878f9e0231721348b7a393ec22460d5a16fbcc13b547ff64c763afa23c5f149ea403d7d7cda1c8c289252c4bb55b2bdad506cde1490 SHA512 2b8b2052cdf95a0bb3cc34f994241fab2aaa2025047e7bd28abc3935909678f04f6bebbd0fc8bc53fa0d49e26d2d61c2de2728c1e3bdb3e9215dcd1341afe0d0
+EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 725aeb5f466117fcff146ce21a8b24c217e3b93a0d29ec818ce33e8be86d5cde49e496e2f89ff8d5be9727493c784d05c1fe62676eb109cbb47c7e8923e5bd88 SHA512 de9df7378257daf7230b3ca2dde490f12558182c8b11f338ddfd3686a11532f5e5f1a5a37c607ac39bc08c33642e5e355d115aa0d771342f3ce0f8adc88fbafd
+EBUILD gtest-1.9.0_pre20190607.ebuild 1760 BLAKE2B bb9ebf6d65cd801a439f6f7dc730c205d25180cd584d866443131b521abab4203e2603474eca43e79518c8a70a0eda4e94816d80ff388d91d2bb3007b99282bb SHA512 c16872db4385192bb875467c38d2442928c8e66d47bb934a16eb9c800701f4d9a17a37e3be05c2062b5beb8cb0c06b0f49f33cdbe3ffe21212e4d5ae54af14b4
+EBUILD gtest-9999.ebuild 1728 BLAKE2B 30adf75fda012ad988d1d164681c2934261912ec2ac10e46b7e426dd20c141fd2e3e3438a111945b30600b87c61a3d8d959830ae00e1d931aea69b0f4533b8b2 SHA512 ca8cb3485bd24e53d84da167ab9302674af422a90a2c1572328bdf75d99c00c18ff70eadd5ec7f4f692bcd0e69473ad3cc2bf20fed34786a0d8412d5935ed00c
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild
index 98d67d92032c..0b947a853db7 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 pypy )
-
+PYTHON_COMPAT=( python2_7 )
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 MY_PV=1.10.x
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 76673187e002..5fba674b6632 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit python-any-r1 cmake-multilib
 
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index 9f7ffbdb9aea..a2a23c63fefa 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit python-any-r1 cmake-multilib
 
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
index 771468eb8b67..5d8eb1931893 100644
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 pypy )
-
+PYTHON_COMPAT=( python2_7 )
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -38,7 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -54,7 +54,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
index a8cdd6890e66..586c7e0c69d7 100644
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 9a6cb10a49fd..3f9846728ea7 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
+CMAKE_ECLASS=cmake
 GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655
-
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 2fdd8d6bb364..8efe9ee65163 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -42,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -58,7 +59,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 005e055b14d0..86b85d3d2b15 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,9 +1,7 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac
 DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
 EBUILD gtkmm-2.24.5.ebuild 1553 BLAKE2B 98f3166080fa78cc6e21dc291218f770673790c40ecde84ce32d673e1314426c1a2176a3370949546eb23801260e913af331a7db9e0b7e0709421dab9be0b7f5 SHA512 229dbf0c25ec0ebd8822e775ddd3b183e8e4270e8797eee7ec8d8cda4e57b43fb756314735aef84e7903e4cec20db7d731b7730ff0e558744fba25d48abc5647
-EBUILD gtkmm-3.24.0.ebuild 1844 BLAKE2B 0c8bdda21577752a199dee5a2859fcecda6f64e6a8e67a366f83347f261ee140ff165c3d9821d97140c2f62742764f00e69104df949c3a8b4748d02b2970c660 SHA512 14f854a8952d32b23c838c47443d4d743ab465547b42c0f3fa8908bcbf81355ac6244f24523e50262492a131fb2723631f21612ac37763ef8f490f390867baa8
 EBUILD gtkmm-3.24.1.ebuild 1845 BLAKE2B 644ce6004858cfd8ab5a658fb88258c0b42163c2ce065476784ec18dd38a06d2f88c7af10f99a939025519687ef7074b97f95fe0de7f2701982367f1b56c4783 SHA512 51afbb25770290b6e8d567b97def39d1aa00bd8d5881154eb3769e17adad0099edfc9c36384169870cb2ae9d917411d2b4fa8ca418dfcb731e6013bc77cd69ae
-EBUILD gtkmm-3.24.2.ebuild 1875 BLAKE2B 4d3f2f8511af2cfe992954350237b76bf376ce7ef4a4c7d715a2cff0de4df8de1c1d072da0526581c5974785d3f9ede647f0066bc84cd50c416802c5e4cbdd3e SHA512 808a57597693fe2ec654de6d3ba3a7692d6a0878f68815aa5ac8cc94bbec149b50a660e17b228134f4b9ce54df1cf4784bf549a2d777f0b7eacdf1c12b1f189b
+EBUILD gtkmm-3.24.2.ebuild 1873 BLAKE2B a7ecc9c42997d6bc77373128269529148b8731a4f2019a8f25fc96976bbbe6441eb47c76115c317be82bec449663ff9bff478c2a2fdd915d67b4ea5db2f9de18 SHA512 206472024e838db44e4a69cff83c443773c9a87588de1b97a41daa44d4214f9ce18c6e5f7182e3b747c726e08f2bac9571d1518a448a6322a19e87f1d7eb2617
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
deleted file mode 100644
index 9020381f2cc7..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	# don't waste time building examples
-	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r demos
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
index daf9e43b50ec..125dc2c14e27 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 568dbf596012..9605e06856ac 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,4 +1,5 @@
 DIST libjson-rpc-cpp-1.2.0.tar.gz 180074 BLAKE2B e44f4ada4430db178949d89c3db8db18b716347d88c4f41fe558a88053ca3e2e4085fee28a87d32f710f76d57e0de9510383bc04e17adec36b754e3db2466d94 SHA512 b03507c9e9dc370d0efe94c3a69b25cbc06b99907a6c145034a283d38d7dd2188a1af89d0ce05837fde28ff96b5bd7bb0903f5865f3eae01d275929a68ea5f99
+DIST libjson-rpc-cpp-1.3.0.tar.gz 182354 BLAKE2B 512392c37e61833a98c1f682bdbb3ed0e3c72ff56f17407d49e5a0f134795daf5ff4c2702dd5222bfc8962b2c9a56c0c7856cc8fe1b923ea68c369a24d334b5c SHA512 4eb53c7b77845a0e845e42413c491dcfa1d6f72411276e8614dae6612edde8905013588465437ea39c5cc5700c2d48df07d15c83222924fc24e015fb9f7a02ea
 EBUILD libjson-rpc-cpp-1.2.0.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
-EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B 94d3a0d77ee6c007928c0f90b503a7b0ac041c783fdcd87766ae2ba09c4d419906dd06ac0ecdd9b23a86e78295961e3f5f1ca8ba14ed1514ee4d61074885c095 SHA512 c0dab0ba3eff39b3c8af50c562d3bc3e7ee714cd8cc4daaed3df1f78ef4ac373987b3b8c57c363697d0fd11f04add0e4bd810297919ad7eb11c84caa8e19f0b0
+EBUILD libjson-rpc-cpp-1.3.0.ebuild 1599 BLAKE2B 6522db61c865f0321e2a31ee328c71e83bdf82279392301e58a501130b5da84f6f0204d7893eed9ba80906dc6b90ef9e742e47c71cbacc2c8a390d66a1972dc5 SHA512 a24983c48e39fea8ecdc4bb0075f02b9be6adeb314e46a6ba7affa5915f73a8ec69b0d9823bc9679110c4b6a31670fb604586cf4b8f1f8255521b2e0f133c750
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
index b5214663cb01..81b0d2bc5010 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
@@ -1,20 +1,19 @@
-# 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
 
-EGIT_REPO_URI="https://github.com/cinemast/${PN}.git"
-EGIT_BRANCH=develop
-inherit cmake-utils git-r3
+inherit cmake
 
 DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
 HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI=""
+SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/jsoncpp:=
@@ -27,8 +26,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( dev-cpp/catch:0 )"
 
-RESTRICT="!test? ( test )"
-
 src_configure() {
 	local mycmakeargs=(
 		-DHTTP_CLIENT=$(usex http-client)
@@ -38,6 +35,8 @@ src_configure() {
 		# they have no deps
 		-DTCP_SOCKET_CLIENT=ON
 		-DTCP_SOCKET_SERVER=ON
+		-DSERIAL_PORT_CLIENT=ON
+		-DSERIAL_PORT_SERVER=ON
 		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
 		-DUNIX_DOMAIN_SOCKET_SERVER=ON
 		# they are not installed
@@ -47,11 +46,11 @@ src_configure() {
 		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	use doc && emake -C "${BUILD_DIR}" doc
 }
@@ -59,11 +58,11 @@ src_compile() {
 src_test() {
 	# Tests fail randomly when run in parallel
 	local MAKEOPTS=-j1
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	use doc && dodoc -r "${BUILD_DIR}"/doc/html
 }
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 07603aa7ff75..58a4f556e975 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,4 +1,5 @@
 AUX lucene++-3.0.7-boost-1.58.patch 1149 BLAKE2B 0021a7a27caabb92232adb42c7b1e8d4832902954018be4bf89e2765562e1e26cc29a67dc75be82f9d2ca7dfddd1e137fc742850d6707527da04574f2b1bbac9 SHA512 7fd0089895ab77da158a49510241fdc894bd3d30f7a6691ddc230f4d52631ec9222a04e13ef0a118f7838b4320fd313502f635c8f0827ba5bb4c6169fdd404b9
 DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
 EBUILD lucene++-3.0.7-r1.ebuild 799 BLAKE2B eae86b12c362a4d4bbde91a186e31ef0163233ae5cc921055f63a635f1332197329c1e14f0670248620a970bb9fb2f8868651e4bb4d75d80f68ad5b0c2bc9737 SHA512 215aa2e43b313b79401a90611f1c5bd79315ebb64907793f11d3f759ac29f49e667c7a0c93a3dc0f91f254e1d47c453a51b5fd35a1da8114cd6dbeddcd675ef8
+EBUILD lucene++-3.0.7-r2.ebuild 793 BLAKE2B 8a657fc2f19946e9417828c66f93563c663eee6b81472e63c51db7a103cb0d08c06b4e8832489d047c40d3cb61ed7131d0afdbe38749c32970d320350729e135 SHA512 371e3b56bf340c241642b880b0b2fb6b4c4ca1b9eff36ff9bf0d488b005c9355e5cbc1df0b1074839e17ffc66c42fc79bb21faeffdfbbf3593cc26908fb5ad4c
 MISC metadata.xml 339 BLAKE2B e503e6597ab8a20f9cb8613a4a4b7be729dd84d664b03fefa4cebe16da9adbea68de1adabf0055934815a70abfbdcd8f7603c7b7ff4a75bf8fac7973790a7412 SHA512 8864d26ad6eb0c9e565932a3f9a0e28e0e86c51998136e9ff56c2ef3fe0e7eb78bcc5d3b7a5e3acdbd0a89f3cf335e2af837a1ed3f0e492db42492e5a85eac26
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild
new file mode 100644
index 000000000000..84363e8ff778
--- /dev/null
+++ b/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="LucenePlusPlus-rel_${PV}"
+inherit cmake
+
+DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
+HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
+SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS README.rst )
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMO=OFF
+		-DENABLE_TEST=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 0c0b87bd6cbf..8bb34ca425fc 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,5 @@
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
-EBUILD nlohmann_json-3.6.1-r1.ebuild 822 BLAKE2B 942b7b682266918a2f1b26485efb4c67a3a787bff15317b818f9c4ecfbe5170a1c7e752a1055e268acf063cef0e5428ec67ce7795e5e716365d5fc4b2bf353bc SHA512 acc741720993c181f7a57159ee8c590025a8163eac291ffb81e5f10458510e2070ec5936ab7b63b6363d8dba7a1b6c1f8500e947ca66e5e11874571d43bfb54b
-EBUILD nlohmann_json-3.7.0.ebuild 826 BLAKE2B ad11525844e3218cc5f8fdfd53ae1555485a69c0a09373116cfb76c2c0a128e21eac91cb4b6df7132247ec234705d38eafe4b510120c4c1b09a3a016b5c8d826 SHA512 3da1d5e5080d2e9747ef8054a0003fb651631b6af2d7a4374c2202407833137e15434751f5e513a8dd9b67bb16b49203c813915496aaf47f65f502d44e273097
+EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
+EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
index d7e7355ddcf4..3f251a81fd24 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="JSON for Modern C++"
 HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
@@ -27,11 +27,11 @@ src_configure() {
 		-DJSON_MultipleHeaders=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use doc && emake -C doc
 }
 
@@ -40,6 +40,6 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc -r doc/html
 }
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
index ed480ec910fb..6c95f15b7348 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="JSON for Modern C++"
 HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
@@ -27,11 +27,11 @@ src_configure() {
 		-DJSON_MultipleHeaders=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use doc && emake -C doc
 }
 
@@ -40,6 +40,6 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc -r doc/html
 }
diff --git a/dev-cpp/rttr/Manifest b/dev-cpp/rttr/Manifest
index d91d6dc1dcf9..2255dd710b61 100644
--- a/dev-cpp/rttr/Manifest
+++ b/dev-cpp/rttr/Manifest
@@ -3,5 +3,5 @@ AUX rttr-0.9.6-permission.patch 559 BLAKE2B 9ac9ab0ca00da6b6d4061c1bc3f356f18dc3
 AUX rttr-0.9.6-tests.patch 991 BLAKE2B ae1fe61043840d7355106ee2b5b88c60a5b35eb9903a9c1639f38731eb9ace539dab29db751751b4ddd79d1647d5d2938d86c04c5afd76112f8a40f3742652ec SHA512 0e574432c329dd78f3dcea6072b3ce227cff990229a6bbbf9b928ac2da61e7586463a4805d08bef4d26bef9018c42bfd1c6cfddc99db6d27ad76e38841cd21b1
 AUX rttr-0.9.6-werror.patch 609 BLAKE2B 1c2911bbe3339a4891d83c1e5e09795fd890aae970c8fafa9a055e7e2cf3ec66bd4b0b6a7e04de7ae146cb11c6908abd4344cabdf23d8703d0f69f3c2c48aca2 SHA512 9eaa9068618e1d084c32dd23a6c9962bb4f18a73340d194ac88c57acf5d74666417785ca68564e4a9cfb7d2e812fba0e346c96bf5ff62c15ac580cd55544461e
 DIST rttr-0.9.6-src.tar.gz 1137269 BLAKE2B 53bb4ed75e20a82d2bd2e6c5667efe1ba6b6f2d8a83a3bd486870daeae57a36cdcb9f2acb6d47a6d1b2f36f00a262170efa4e321f6e7faf8d2c35c431bf47133 SHA512 7e0d4fa87f83feda0b926d4d0e52aaf0f369f25fe7e23e5ffe86c0bba159e8353cef44eed37611a81e8ccc8d6facb36942f940d0d0b965f873177d7078f91cf4
-EBUILD rttr-0.9.6.ebuild 711 BLAKE2B 8493674e8f7825d106cf289ca8d2960fb9d6cf87a51a0850c7c481556fa896196c494425f0a1c71046133cc25994a1a9f006165774f8cb0515ce6cba9c9de921 SHA512 09e95e6b594b4ad94cf9453d4eb0630834f0ad4abf2015c344030041fb0bd35c965d5cd2a991908aeebcf87ac03c8e5bc097a290673b41cfdffe17ec49e88d08
+EBUILD rttr-0.9.6.ebuild 699 BLAKE2B 36f5e1653e7ef1edc6153dfca4c7bce8bb384eb5fa8798af2f1c2117417fedf5451e76d56f8e182a16dd3a3e97f37ff5991a0012aea3fe2430da4d347b08344c SHA512 947fd85ef326c183d24fd1db88863982d4b207af4bee76cf324e2203b2e6b821f542573beb97ae353581b74be8d1739b15c23c4054c4e9082324e6f2e313d475
 MISC metadata.xml 292 BLAKE2B 2e7da24d451c6fa237bc7b69c2557872d42ee947009c100402ad719dbde2f71d713efbfff9b74b68f41b2de8f23278a2a41a1097c12b14c378a802779080dfa1 SHA512 98fa9cd44b8eee9d768bd28e8ad56fd4fcbc229af032fc3f0c85cf5707ac47544662fe6c3ec74f0ff6f5047653e46a654ced163bd3f6a0487dd1e92b121a70e9
diff --git a/dev-cpp/rttr/rttr-0.9.6.ebuild b/dev-cpp/rttr/rttr-0.9.6.ebuild
index 68f6af176d78..b85d69e5d1fa 100644
--- a/dev-cpp/rttr/rttr-0.9.6.ebuild
+++ b/dev-cpp/rttr/rttr-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Run Time Type Reflection - library adding reflection to C++"
 HOMEPAGE="https://www.rttr.org/"
@@ -28,7 +28,7 @@ src_configure() {
 		-DBUILD_DOCUMENTATION=off #broken
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index fb8310ee1e45..716a102826f5 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -4,9 +4,9 @@ DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddeb
 DIST waylandpp-0.2.6.tar.gz 178969 BLAKE2B aff9108691dfb2f27ac829865d3367a7f72de0a838b64f6265183a36a9ed5efbfcc9abcf724c784f5bda08c1a312cc7077fa55756b10520114dc8a23aa30f7a3 SHA512 b2d2f22864db830ec6a78282552a3e677f109c49381f21e80efec3cc65cad1820b1e10ad76d960e9d470f84060bb7f3edf0dcdd94025ae80a4a93ffcecfb8c5f
 DIST waylandpp-0.2.7.tar.gz 179121 BLAKE2B 6a8e77817962b8bd6ea93c059cd8cee9c655821bca0dc996b014d6085de1f88fe9a9f2b7c80a8b8fa405e898f7d96dc5d01f78288033d18184b5f0504c78c276 SHA512 67ec76d9bc0146472d70364c98b6b5af957c757a95d55c224ef2d9bf8b3ab15dc4f6333dca1ad803d94403be11abe7055db54d9fc708c6f5c0196f6a328a5ed2
 EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729ae28e5afa45163d775c96b0961bdcf2ea485aca2bd5c761003a1714ecd4dfe244124ba03e26490e051b0fee824 SHA512 5e996f8c29632d6a3e7aedb23fe97a93ffa23c43d19ec7f2d7e24bcc68c6114cc8d7bf33f370b437e35b32c6640a7f03e957b9d3647c2bc4bd4ac03c9faf1782
-EBUILD waylandpp-0.2.4.ebuild 827 BLAKE2B f634ef2225206060dcdc2ad3b93d4e5055c3020819b32d4715490e13f90075783f716f155b7b1b96872c57311a60973ed895effaba8259208be2923b2aaf6afe SHA512 badf44bfaa0b56ce7f7b0ed5b49b4ff02f92bf7d14511a296187feb4eb144bd23a66aec7926dee962f01e05ed2410b18d45e080a7e52c900a981957884020cd3
-EBUILD waylandpp-0.2.5.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
-EBUILD waylandpp-0.2.6.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
-EBUILD waylandpp-0.2.7.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
-EBUILD waylandpp-9999.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
+EBUILD waylandpp-0.2.4.ebuild 757 BLAKE2B ef705ed97db1c6439ec432bbc7175b888be131f3f31c498970ba7f685477464112c03892c7295b94d86c2c096ba60cd153328985235908b2151ebba2b85b154d SHA512 550a2f2723ba744a36d84ac54e578d68b8ab8ba5b1eff7b5b7b68859bfbc97f34e92f827c27a90edb51eca96370b4e877585b325468b79b7786861ffe126143b
+EBUILD waylandpp-0.2.5.ebuild 760 BLAKE2B 56c53cae10d93623b982b8d8efa5081834e0e9aa6241305ecf2683a18ec7448ff29e43902164b29c27c9ee2311d21b0faec48de1984e35fcfb0d1e94735173e9 SHA512 d943f5d03cba285b04f24d0d3800ca623480179ab3a57a7a94693cf17116beaa596ea6617ce722fee1ee04e70908d3b19bb6a873eb1e56e1747db00fc116a870
+EBUILD waylandpp-0.2.6.ebuild 760 BLAKE2B 56c53cae10d93623b982b8d8efa5081834e0e9aa6241305ecf2683a18ec7448ff29e43902164b29c27c9ee2311d21b0faec48de1984e35fcfb0d1e94735173e9 SHA512 d943f5d03cba285b04f24d0d3800ca623480179ab3a57a7a94693cf17116beaa596ea6617ce722fee1ee04e70908d3b19bb6a873eb1e56e1747db00fc116a870
+EBUILD waylandpp-0.2.7.ebuild 760 BLAKE2B 56c53cae10d93623b982b8d8efa5081834e0e9aa6241305ecf2683a18ec7448ff29e43902164b29c27c9ee2311d21b0faec48de1984e35fcfb0d1e94735173e9 SHA512 d943f5d03cba285b04f24d0d3800ca623480179ab3a57a7a94693cf17116beaa596ea6617ce722fee1ee04e70908d3b19bb6a873eb1e56e1747db00fc116a870
+EBUILD waylandpp-9999.ebuild 760 BLAKE2B 56c53cae10d93623b982b8d8efa5081834e0e9aa6241305ecf2683a18ec7448ff29e43902164b29c27c9ee2311d21b0faec48de1984e35fcfb0d1e94735173e9 SHA512 d943f5d03cba285b04f24d0d3800ca623480179ab3a57a7a94693cf17116beaa596ea6617ce722fee1ee04e70908d3b19bb6a873eb1e56e1747db00fc116a870
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
index c176d851c87e..5f2963921d96 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
index ea9a34e1e54b..582d9582390c 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
index ea9a34e1e54b..582d9582390c 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
index ea9a34e1e54b..582d9582390c 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index ea9a34e1e54b..582d9582390c 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 0c9f7d7517e2..95c68a15d3ad 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -2,5 +2,5 @@ AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92
 AUX websocketpp-0.8.1-boost-1.70.patch 5976 BLAKE2B f3bccde47637c8938b1a0acf95d855692256434be130fafc34311bbbb337c655022b77a301f4524029dc2841e2a47d9975f7fbed3ed004b9bd1ba65d87c6bf30 SHA512 34df3fc78415e0fac8d73a2afb2faa2e1e2bfd6e2ae6458e48a89354dfaeb7f3a8d95c5e5e0ffa2f8d096508e5a9636184b403def95501d027f2c68f5e096052
 AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 1227 BLAKE2B 26ac496842e4e23d254ba908679399ff8907253434430c887290cbd3b3beb14aaf69834cfc0b8f326f13c0f63ec7da535f0c8b438d20d7c1d2d4b5d5d2afb5cc SHA512 1ef7f2b71dcbeb386cd27bbf97f599f0c056b014423090ceb28e336c0f1527c6f8d6b04931144823c1d1deb14781508a0a6e869f69a9a232978851634f35fa0c
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
-EBUILD websocketpp-0.8.1-r1.ebuild 1058 BLAKE2B 1347e3d7bd8e6597633ed8f85e9e2a967857ae41b95fdf0ecb4097754c37d80cb6a02f132871900c02066e5eab98f6ff5e0f3629fd2d6a024b536ec491c5212c SHA512 32d9ca46e3821c3beb458d02f3d67e96e8ddea061389e2b191c02b83faa9066aa09ad619ac3a9dfe2b49ae3a42568e9a5f3cacaae49dd5ab7503324af9f63259
+EBUILD websocketpp-0.8.1-r1.ebuild 1041 BLAKE2B 2e3751948dea06b7892df0dba1c3a1222674a2ad1e3dcc525617c873451c8b371246c386ea41aa87f3a7a814fab8cfc90146188606a3e061a7d59197f82215f0 SHA512 fa6b55b79846c5d17422743e3398487bcaf95a42e835f10367c008b427058eb086a0819ab8b4b1fa566b59b386ce4aefae4a2f725bdba416485a459d6abaace0
 MISC metadata.xml 329 BLAKE2B bec1c49134f4f6cfd9c8487c0e607d609ed376853bd4022c3dbbee3f3932fb1925af6ec89c9ced2bafba9e3c2db67d3659e12e072e831ea0d3c95c5ae4ae621d SHA512 1cf8076fec3d5f414bc22c1eb74a1ebdb1f5c1711fd0b103c9da5cc8fc8f8fa30367c737d4b97bf22419cda1e327858817ef4b7109d703264ff6df3dd30a843c
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
index 4578afc07baa..16030b37783e 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.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=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++/Boost Asio based websocket client/server library"
 HOMEPAGE="https://www.zaphoyd.com/websocketpp"
@@ -31,11 +31,12 @@ src_configure() {
 		-DENABLE_CPP11=ON
 		-DBUILD_TESTS="$(usex test)"
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples; then
 		dodoc -r examples
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 99d6ed389570..e818ed025e8a 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,5 +1,8 @@
 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
+AUX yaml-cpp-0.6.3-abi-breakage.patch 1911 BLAKE2B e595bdf3dff91624aa75a233a6a95db3862a7bbe645a6219704fa25c0887321dc5c461d13b6694ebca31d0da795bb750701ad0c6b9f79be0eecd85b07a71a256 SHA512 0a3c0655a1319eda09796a7ddbcef8a27884cdcbc95d34d82b6202652da3b15d7afa6e22563af39f6c6c87b7a70bdee3c1216a5523604d309345d556ada702b9
 DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
-EBUILD yaml-cpp-0.6.2.ebuild 924 BLAKE2B 56f3450d20465d940472f09134c538dc5126665006f6342765b089c9535ba8848e5b08fdfe032f56f42e824cfb93803cf59f7818f5fca895714862fa027904ac SHA512 fc57193b84b8e68574ac917aa4248b2675570bb36ace2d4ce85d379f3c9f8a1520cb8e2305cc37a827b5ebf42ef94fadda0e2c8fcf64e3037d9fceda712771e7
+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
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
new file mode 100644
index 000000000000..d9160856c47f
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
@@ -0,0 +1,57 @@
+commit f5f288c7622d3547c29a8355b8ccda0155483b79
+Author: Till Hofmann <hofmann@kbsg.rwth-aachen.de>
+Date:   Sun Nov 17 22:43:20 2019 +0100
+
+    Revert "fix up static, so works as DLL (#559)"
+    
+    This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.
+
+diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h
+index 82fb79a..50bcd74 100644
+--- a/include/yaml-cpp/node/detail/node_data.h
++++ b/include/yaml-cpp/node/detail/node_data.h
+@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
+                     shared_memory_holder pMemory);
+ 
+  public:
+-  static const std::string& empty_scalar();
++  static std::string empty_scalar;
+ 
+  private:
+   void compute_seq_size() const;
+diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
+index 7a3deac..b363f86 100644
+--- a/include/yaml-cpp/node/impl.h
++++ b/include/yaml-cpp/node/impl.h
+@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const {
+ inline const std::string& Node::Scalar() const {
+   if (!m_isValid)
+     throw InvalidNode(m_invalidKey);
+-  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
++  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
+ }
+ 
+ inline const std::string& Node::Tag() const {
+   if (!m_isValid)
+     throw InvalidNode(m_invalidKey);
+-  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
++  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
+ }
+ 
+ inline void Node::SetTag(const std::string& tag) {
+diff --git a/src/node_data.cpp b/src/node_data.cpp
+index 6cfedfc..eba1ae4 100644
+--- a/src/node_data.cpp
++++ b/src/node_data.cpp
+@@ -13,10 +13,7 @@
+ namespace YAML {
+ namespace detail {
+ 
+-const std::string& node_data::empty_scalar() {
+-  static const std::string svalue;
+-  return svalue;
+-}
++std::string node_data::empty_scalar;
+ 
+ node_data::node_data()
+     : m_isDefined(false),
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
index 627ca917b845..925e955fe1d7 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
@@ -11,7 +11,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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..8a579eada7c4
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp"
+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"
+IUSE="test"
+
+# test breaks build
+# RESTRICT="!test? ( test )"
+RESTRICT+="test"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}/${P}-abi-breakage.patch" )
+
+src_prepare() {
+	sed -i \
+		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
+		yaml-cpp.pc.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DYAML_BUILD_SHARED_LIBS=ON
+		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+		-DYAML_CPP_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-multilib_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-cpp
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)