gentoo resync : 16.09.2020

25 files changed, 265 insertions, 69 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 4337ccd75565..d54186d92cdb 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 20f0a17d4ef6..1a93b8a47878 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,7 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.16.1.tar.bz2 1493978 BLAKE2B 810fd735a0cbea8e07bfe30cbf02d44469c3c7eebed3822766c0a658fe8972681232afe4a6124537886fafd0769eecc40b8eabbcaa2771b84b93cda56329394d SHA512 e8cab449887e3e362f9d3c2aa1b1bbb2f81954aeaf2cd12cefe7f848cdc30e1a576130b49f551efd49611b9d4941e724baea42739c043e158626f3c982b75311
 DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
 DIST asio-1.18.0.tar.bz2 1724947 BLAKE2B 6772a70c035e7df08484703b6f2fa294b6a1ade4b1e661481df0e790fe4a36d74f0f4b14023c7505fc599c4eefb3e3baf392fd7897c10c07707a0474870a6557 SHA512 4b21b72463951ffc5ef72636858955ae5af5ce0dec4c835fccf3c7e8ccfa10bd97530bfc2ec9c3f601374da8300ac2e61418845d3331c980fa9876057bbbb1e0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.16.1.ebuild 980 BLAKE2B 93c1570ab4c7d9a7ebe0eab38c7e59cbe8f0f253f893ee61fce4687b58a180249e196e16131d94d4eb609dc691f3bb2471f938ffc397c0ef6297851096601022 SHA512 e0d83ec9c30147dadad5cf11c151efe4bfde83980c655067639943d19a6d6ab94cd8ca0b8d80d560d348341c9e83fd9d569425e8ecb7b5e9b4a364a80e9cc25f
-EBUILD asio-1.17.0.ebuild 1185 BLAKE2B b28dec040d32e10b40508e1e9323ae473bf1ceb6f937267349db03a4ca451d8c2ef1f5da57bf99d327946282d16e8cbd8794fc5a5bd24171b0762c040b73590c SHA512 fd47b7e2b14c115ff1b2bfebe5020062c8ec7e3b552e4dde85568d1251a09af2acc353438bedc8537aaf2f39ffdb201e28a92bc86d8667050eedf477768ee1a1
+EBUILD asio-1.17.0.ebuild 1182 BLAKE2B ac2cfb623111f9f7d4e64ddeaa395f3f4126aeccd666f82f0145ad62bb4a166cdaad9735bd7400071873e9e6b3718e20986150969ca2acb12dd81cbbfa9218f5 SHA512 4c518c0cc5988a5b821735df8fff7953c5511cb69efbcb8f44584867d1a195cd0f7e896fbf7187b9091324960c379ce5b2e46200e0fdd2440935911e44bd8c90
 EBUILD asio-1.18.0.ebuild 1187 BLAKE2B bd32997c2ee92bcb2854e5f6491467017b129d75bd2fc166caffbffd0494821eb083009fc89b090eaaf8c88971cc16b838fdc221b4bfa8c2731c30c99b98c21e SHA512 16dccbbfe6f1b40aa626465d8a3cb4c15dfbc34a638d727852c723ec8f31c398b02fa0041bea0617799023397954518099d152265033110faaadc7193b98cb18
 MISC metadata.xml 456 BLAKE2B b92702f7cd621e3bb4191c6dedc380e21d934e7299202b572c68e9bb029fb0abd1b834bc053b18ddd6293d65d522ade938791fdc6a885a85aab63e3b90f0adf8 SHA512 451257fa1e2f3ccab92aea2e81984de91ffe61e61ba57d56fe86d06a09dbcdb6491e13b2e7e3dc02c0cd924b19bde0000772100eaef8929b1a3779d174e918cf
diff --git a/dev-cpp/asio/asio-1.16.1.ebuild b/dev-cpp/asio/asio-1.16.1.ebuild
deleted file mode 100644
index 9af756e04a9c..000000000000
--- a/dev-cpp/asio/asio-1.16.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples libressl ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.17.0.ebuild b/dev-cpp/asio/asio-1.17.0.ebuild
index a27cf64cf497..e81139edfc90 100644
--- a/dev-cpp/asio/asio-1.17.0.ebuild
+++ b/dev-cpp/asio/asio-1.17.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 # test searches for libssl during ./configure, and REQUIRED_USE is easier than
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
new file mode 100644
index 000000000000..3eba467ed67e
--- /dev/null
+++ b/dev-cpp/benchmark/Manifest
@@ -0,0 +1,3 @@
+DIST benchmark-1.5.1.tar.gz 154896 BLAKE2B cb8d74b3e6662e35ea12809d8b62d1e3a6849668840c84697e7f4b2d29eaf68688bb1cda6f43c170e70366de88a93af79bb709d55dfc8d79140c11a31855a46b SHA512 1e8782ab6846b8b29c5eea41ed1ba19dd92a46a135cf74acdc588e2cd5ef05581c644d20fc0d6403456d65417538e1db80109ae87989601298b2fc56ae3c3161
+EBUILD benchmark-1.5.1.ebuild 580 BLAKE2B b9cfaafdadc15460de9e82ac2eea626b60b0e9f1137f4d43cbdaf1a48a6e05fe0722e5697293c4b780d81ee25b07894364596a2b293f210108740ec98ca667f8 SHA512 c176e0a30ce1dc759a1c552c20c8d2828f5446d922137ad2da790cfbfbdeaca55c7a8ebd2e5c4fec788ee729345a583149b20ab8186cc117066a3bff63db5668
+MISC metadata.xml 599 BLAKE2B e7ccfaf68072c7afdc8a1bc7abf3788e566c49dc88bc3fdc4f78a71360293aa310e55e34970544388e604d886e145d3b21d20b058e47d70c89d4dd57405fc980 SHA512 512145e4f2352d1f44c4d5dd43605e24081424219faded0c25271aeb03533e0a48816b66918b24e0025026dbf566b6cb86d581e1b71471114101bcfecbce9679
diff --git a/dev-cpp/benchmark/benchmark-1.5.1.ebuild b/dev-cpp/benchmark/benchmark-1.5.1.ebuild
new file mode 100644
index 000000000000..c64fe45b19ae
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_TESTING=$(usex test)
+		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
new file mode 100644
index 000000000000..49126cc81f10
--- /dev/null
+++ b/dev-cpp/benchmark/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/google/benchmark/issues</bugs-to>
+		<doc lang="en">https://github.com/google/benchmark/blob/master/docs/</doc>
+		<remote-id type="github">google/benchmark</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index ccbb8c11d2ef..59113d5cc7b0 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,5 +1,7 @@
 AUX cpp-taskflow-2.4.0-do_not_compile_examples.patch 2634 BLAKE2B 6b326b97e721061892abe0e01bcfb49dffea91b641684b1c860c8f8384153103107d9ab26dfaa4b577897e49f45fa2a6cfaaf5cf49409afa429b5dd0c7aefda9 SHA512 21b61ba80536cf8baa24c67e35902b66fb98408f86be8a4611b15304525c2e14a20af80507ccdd4d6a365303abdc38d1d199f1888baa0a35a04483a837ddadd5
 AUX cpp-taskflow-2.4.0-fix_installation_path.patch 739 BLAKE2B 6cf25c76b91d3e60c7a9f35bcf0d5a89f28dd42efb32c3fa57eefd9b716e9905d20cd8becc0a47cf74f992bf2e77b6051034f62533dbfdab4b57a70a4b24eecf SHA512 36e2284da55eba9ca24a34e8baa105a28e411d54927378f6978c96c19af08a760fc4f3caff6ec4f325d63ca8974e7b66e27e3c69ba39e22f6b8e67d3ae303b24
 DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f
+DIST cpp-taskflow-2.6.0.tar.gz 68626469 BLAKE2B d85b1615be47c1e98e613e7875424892613205a0cc3f380f7d6fd0521045c5750441e9267382ec5282299e4074a7b85f442e53f38a2f12aff7d3d925a94b8773 SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133
 EBUILD cpp-taskflow-2.4.0-r1.ebuild 603 BLAKE2B 0620b659d11e94d1fde1e6f53767a98aded76fc8f7b2af238e0ff4a900484dbae00a288e12bce48a4c3adde8ced548dcef577528473328408e93219b1e49ebb3 SHA512 fd5822c2ff54904142ebf6fc5c36f263ce16178d6b161aa412dad4cb378f9e9449943e2a836cc815c9e3d6ef4f4f32bed6ef86ae0f712689cc81bb2cc4b9887f
+EBUILD cpp-taskflow-2.6.0.ebuild 873 BLAKE2B 61b2318d8380aaabf27a8965bf5759b90d8941d9c7cb183273141d462fc4cfc0d41b705fc5a69537d5154325298634dde3808a207ea0bca29f49b230e589bf47 SHA512 914ad99f49f82aa63a8a700ac4c9e6bd6f0e9af0b0e90a651f7d02fb0b180fd5b1e359b8b9fbab7557a0ca242c9440a9384d66d7a9ee5ad1c0291fcb4eed033a
 MISC metadata.xml 662 BLAKE2B 9a3c9f4208ed92f0957323e281cedd321b9e15c15af231eeca1b88b8e0d87df81a546afd8877f496151c0815cb566d9e205fe1eb8b8fce33114435e2c66f75ab SHA512 9b0b6de9d422df44507429af356aa0d31411a564efe4a58065cdff38845f1e1e53fef6aef8a8537ccfff8ee36e3e77beff65aca3bda4efb2a5f3166c41ea68d2
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild
new file mode 100644
index 000000000000..aba4692adef3
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://cpp-taskflow.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/taskflow-${PV}"
+
+PATCHES=(
+)
+
+HTML_DOCS=( docs/. )
+
+src_prepare() {
+	default
+
+	# fix library directoy
+	sed -i "s#/lib#/$(get_libdir)#g" CMakeLists.txt || die "sed failed"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# FIXME: enable CUDA and TESTS via use flag
+	local mycmakeargs=(
+		-DTF_BUILD_CUDA=OFF
+		-DTF_BUILD_TESTS=OFF
+		-DTF_BUILD_EXAMPLES=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if $(use doc); then
+		einstalldocs
+	fi
+}
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index a7887c3a0007..e6a249351120 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,5 +1,6 @@
 AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c7980fa0e5372db69465ccf964e7294213ae459e200a39f2721849df94a8433febcfb225813af3b43bc204b0edd3d64c SHA512 b8c4701f22c483078fb7d25df60c8f002f47573ec434a309b1a3739aecc1c51f79852b06f46c1ed9ae4cbec0e7d70aaabd06bc59e561c19d81b05388d3cedc61
+DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-EBUILD eigen-3.3.7-r1.ebuild 2277 BLAKE2B 0dfe545dc1e223b91b48a57466af09105441a81f996abdbb9ea046ce4408423fae8ca58195f50d2816325084271fa7f23511a0982ea13aa6ae00d8dc7830076b SHA512 850afeb64f71531e5fb5595b4665d750f4b4933aadd1f08e08e6eeac3efa3f52373585f446d12a69f1dba203bb3732febfa89eeac03e440c6716fbd3c1f0c849
+EBUILD eigen-3.3.7-r1.ebuild 2254 BLAKE2B 6c995f2ae16a005a2992f34f2373db06690616175649f3f1750fcfb0f3875676a40a742f2504fe32ce127b1bb8090d44ec0983bab595d81af7d2edb05cd064a5 SHA512 03f623ff907403db989cb2941dedd0cda5534bed87b7c405383774d344e45695bec3011212b9d8a56c9752bf788a404ab2268b14ce854506dd206da9386b23f0
 EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
index ed987bda82b2..344701df58b4 100644
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake cuda fortran-2
 
 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/3.3.7/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="3"
@@ -50,8 +50,6 @@ DEPEND="
 # METIS-5
 # GOOGLEHASH
 
-S="${WORKDIR}/${PN}-${PN}-323c052e1731"
-
 PATCHES=( "${FILESDIR}"/${P}-gentoo-cmake.patch )
 
 src_prepare() {
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 403ea444d88c..4fa87c537715 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.62.0.tar.xz 7398144 BLAKE2B a289c2e6a5737d9fa3d507e4741c1d19e949244db5a6eaec2329bda92e7e0a78e33acf9668ced19a52507fa88531da63fa35cf59dfb44ad2a7a8fa0839c7dae4 SHA512 f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de
 DIST glibmm-2.64.2.tar.xz 7438116 BLAKE2B 6ff458e90a5dbc606a2e04ecd3589262a1b96e827dba245985467818a7a4ba80a9c4cb15686fe479636cb8ce7e1db3334195d6334d7ec56327076cad87e22170 SHA512 0130af9a16981a54630150db6f4b1a95458d72d650c5e4781ee97ce624ec98c600b79ebf234d212e025781453fd11d78b9e8273235ffa143397423418fe970cc
 EBUILD glibmm-2.62.0.ebuild 1648 BLAKE2B 1f64aaa8ec3d65a32d2c0e3fc2c7542258b1140aacf0f3d05d4e6629390e16aec2f7ef055dc9b324387fc19375d8a1abf00e5b6d9072944050a4f59ae5c8975d SHA512 958cc44d550aa19dd4acee8c4a1c8345e3ed83e36f6929ef7eb76513716615f8b39c888d33be7507eec4a6288e46e2877a9f7e7ecf90a404b137caba070cc4ea
-EBUILD glibmm-2.64.2.ebuild 1460 BLAKE2B e7f89747861a54e734b2ef12d3996f5ec0c4e552d04d3e49f741e717f2ddc9aa099c3106eb717c36b4610da1b665f14456a7ed82b45af8967428e2330780da6e SHA512 6a10140583e3c8bd4628ed67cfed7665891b406070576d1bb80ebbb698d91c27c121ac6d98e4f3b5b23b2cf69bb8ffd9b32b3a2dfab53aba50c73e8028c12c60
+EBUILD glibmm-2.64.2.ebuild 1459 BLAKE2B d9ac8c0ed3515dc0a45a53be508a160cc5c62e91977d0c096bca85d07c5420ee83f3ecf71a10d3042f33a6d06c9341596010e5ef39d65924bc8c5e964a4e9ae3 SHA512 2fc4be3c554000f2c62ff1e844d173c1b15d7c48083581cd86a1ddbb44067d27bcda486c440d2d027a5cf4a72b9248f0d4aee00a35705f4e197466d3672b2914
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
index 9c07f5333aff..cd1b373613f2 100644
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 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/gtest/Manifest b/dev-cpp/gtest/Manifest
index 15f30f66f938..61e36dab12c5 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -2,7 +2,7 @@ AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc3
 AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.10.0_p20200702.ebuild 1842 BLAKE2B faa0ccc6af4f2de130c89d44f5525ff4998c289d5377abe503fa907257dc516455ec643da92c7dfd439dae358d4cc8ba317deb65ea72dc780e21eb205c5cdbfd SHA512 586e0286527663de08c50556f4a6da60114b89e4dad6c7dbdd77090009ab36b8857ae4b6ce3f772faf7831a7503b77f2c168cc59f890a08aaecd567aa0eb47db
+EBUILD gtest-1.10.0_p20200702.ebuild 1840 BLAKE2B c37f8fcb44f4dd4a5747f7e5b27f7b785b3ab9177f5ff28eed287acc6996d1ae2891c56a36690379e261a6acf78785797f3b4b539af555f6c0a15596c95ac152 SHA512 45cf56b4bdfe0455bb809996611b0e36bd5a76cc58f5a681e2b08f4288ddb45b26130a72590b51862e5513332ac55870819127540b315fab8dd40756d6085f19
 EBUILD gtest-1.9.0_pre20190607.ebuild 1758 BLAKE2B ade6b31a300fdcdc0cc43524640fc82740595b2b8be848848c77c9395dd609068192faf910d5dfb85e951f83847bacb1837c05d5e4b081595f6c3c2a1da18fdb SHA512 11a96924838187431e8e5a9713dc4885932edbfd912bc1d7291f6f55aae591d803526a20aa43d94b626920a4592bacdb7fb98ff54469f16b990f38edfc89cdf3
 EBUILD gtest-9999.ebuild 1707 BLAKE2B e3b986cad521ba806e07677e999571d792fe79151e0e8e81093749d51c49908165be06118b47b6ddf58e890aafaca69cd470f4a116aeac868b8ad2c7ef499a8b SHA512 67227afb86efd0d8f51a9e52ea7032bf149f9e2ecdef282db1951f7dd269f404ffe6875a453ed83115ed0674bf13bd02b870c726f6d64e5cf314868d7bbb5c5c
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 4804dac673cf..8e6366694d8f 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -21,7 +21,7 @@ else
 		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index b2360c53a610..3496c7804c19 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -2,4 +2,4 @@ DIST gtksourceviewmm-2.10.3.tar.xz 742184 BLAKE2B bfd61f3ca29afa4b01fef651849189
 DIST gtksourceviewmm-3.18.0.tar.xz 1079780 BLAKE2B 973f06a3baed8d5ab541b2f179f773391fe562cab2fceffd0366748acafc4bfc1d4717d969bdd5a5716f892ff497b89338f8b3cd085aebb9c033a40b29d3c0b4 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c
 EBUILD gtksourceviewmm-2.10.3-r1.ebuild 996 BLAKE2B 307fecc9161d49415db64e6fd51dcab84f8a3b21c5c439615672df03bae49c9f08d5ba97606144b7fee4b1d4e4d61c739b8ffb69a502c764a6d7724f3c3326dd SHA512 f99d6f782dace300684c4cb586fc0a3ba8878acf18d2628ae16fb96f673986706b8260908af4ec5aa228a64617f3f4ecab5823705af10af2fb7a21987e1fd290
 EBUILD gtksourceviewmm-3.18.0.ebuild 659 BLAKE2B be522f66b7daa040a9b21d48796590e0541cd1296aae2d50afcab2f181f550bdc1cc1aad218de1311d6ace7a00bd4c6b493786a3a72b4dd3c22b4b999f6736ea SHA512 268b2ad731c6f97ceb62d8778d59f9abf981a6c57d39342386f924fa309e843b7950b1727b3981266d19f98a8f08037ef741ff13db3a72510eba4afae1f5b3e0
-MISC metadata.xml 342 BLAKE2B fc1ffaf34f8e22ec33fa92bfda29fc9fbdaaf36f619db8b0e195aa83dd0083d68f197f55b8654cc878c3562675e56cccbdd0e7e1771fb492fc47ab5b41f0f55c SHA512 f422091476e8cbb36d443d00396344c0943b3e8d482fffbef3272c656df9be44ed31eef6a20478430e7f7364832a7d86fc82df964436a3cb6ecf7f59c8d23d6b
+MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-cpp/gtksourceviewmm/metadata.xml b/dev-cpp/gtksourceviewmm/metadata.xml
index 2d330219aab1..4cbddcaa19ad 100644
--- a/dev-cpp/gtksourceviewmm/metadata.xml
+++ b/dev-cpp/gtksourceviewmm/metadata.xml
@@ -5,7 +5,4 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <longdescription>
-    Gtkmm (C++) wrapper for gtksourceview
-  </longdescription>
 </pkgmetadata>
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 9c90d07d459b..0db743ab8673 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,5 @@
 DIST mm-common-1.0.0.tar.xz 269312 BLAKE2B 549708486f3c7df699b966e818dde4888048f30db94a78b721b8ba0e6cffa949f0c6b32e3f03861a3646f4547724997441a2f4eee1a597fb78c28e89882344e6 SHA512 5f90964ae7f47ef16919c5ae20fa38436d04e0cf6eb4b868c3a498631e1995dc5363728ebfed2678266de08adbd1c326d1a77755b232d98d02acc034f08412db
 DIST mm-common-1.0.1.tar.xz 271144 BLAKE2B a5c540c9004103298627146e6483de1345f1c3c1c6a48e3f0821a42f1e875f1753df5d5e8164d4c95e844a3b0229a45e697a49596a0671c9717a7561bfc621de SHA512 1dd5fe5fbcc04c6d42cbf4ff33a06058fdb247f6ed9ce958f7231eb99ca7e4b41ea2b91611e0d3909e0fcc9f45a6a4b2c119c0bd3da8afb1741256ca31e1a33b
 EBUILD mm-common-1.0.0.ebuild 529 BLAKE2B e158955f92fb135245e6324b3b598f55634e43cda815b7af1680e8d0e79d3fecd0b44a443cd3927c73d6965d7d07ee27f48e508cc4b7d9dcd0fe668533ab2406 SHA512 53ddf6fe44d63fa71fd678c11a5709d4a8040f6685e7094ee13f0c2e17d61f04fddfb21d429ed29df8eabb2450390bfaf47f5fd8cc3c5eb8666781eac6128d1f
-EBUILD mm-common-1.0.1.ebuild 528 BLAKE2B d94e28674ff3574cf05588fbe592fefdd8ad94d9641d6e5f89c32ae7c11965d90bccf14de931386c8e07d7da402071dd6f81a329268d8fe66e4a5d65765ba153 SHA512 0a0bae43e62a2af69b78a9cf4cb509b16c98e59ca53a5e95396879d128dec41acb092b1df8c2a11dc7ff62dfe1ab0527b6b2c05da87c5ee3c1db1b16c9414510
+EBUILD mm-common-1.0.1.ebuild 527 BLAKE2B a14476a9c5d88dd6bd8fe270eea3c52f4d84048ec3da27b60ccaa03aa9207d566f10220e90e96c0eb85aae259de62fb313176bca7fa354f9483538ebc5f171c2 SHA512 80bd545e6acb3a4e42e81261fff8d27c5dd3caab55fb48429e16085144359104177445432fff4a7b662ca39a1b7bb5bd21f61d4b3e4fba529329f74035655e1a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-1.0.1.ebuild b/dev-cpp/mm-common/mm-common-1.0.1.ebuild
index e4b133b36a07..3af71a919439 100644
--- a/dev-cpp/mm-common/mm-common-1.0.1.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 2efe2fe676c5..41343c89a393 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -8,4 +8,4 @@ EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a7183899
 EBUILD ms-gsl-2.1.0.ebuild 790 BLAKE2B 410765af2d63169d15543f3ce9bc2685f01737cddb0ab19631f516e8556bed80f851104d504bd9f4513f3b56ed74d58a094887a97e02f2fd2694bfb1b6826772 SHA512 e2ea2e252a7eae5e31a60611198ef39cb576d047efe601d782e98386bb336b014b94f5f13f2c9cf2ede9f52d0a6eac946f0a559408e4573c9f6816957d771612
 EBUILD ms-gsl-3.1.0.ebuild 735 BLAKE2B 209f4b1dc78b573891a2e1cb0bf9b3994d68ce1b8f65728ff5ed84ad971e3e732e01e436404fd85583892318624fb942738c5cb42e89f6f22dcca4c9e2924ce2 SHA512 47e7741b78f73d18b76decbd6e90ae81d921bf5d240ece37257a7475c923fed3cce394e585a3283b3b0768afa340e9e136b2e78c77b67c84fe1cb4c9d76bd570
 EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03
-MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
+MISC metadata.xml 436 BLAKE2B a56035e3f8e1a7a9f174beab2295972c57525325689333227592ea19e1b641317909d4491b30889d621bbc6775062feacddca77e16ef3d45e8464d9a7dd9d87c SHA512 07428e8e2b2a76ae4ae6b083cf6c25fbca2508307f492f9e75d1d1786df2bdc785fb6cf773e1bb2016e0ad9c826b2dc24750f1389cca7b6692f811ba4a52f863
diff --git a/dev-cpp/ms-gsl/metadata.xml b/dev-cpp/ms-gsl/metadata.xml
index 7b3ec3f962e5..07ec8daf5079 100644
--- a/dev-cpp/ms-gsl/metadata.xml
+++ b/dev-cpp/ms-gsl/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Microsoft's implmentation of the Guidelines Support Library.</longdescription>
 	<upstream>
 		<remote-id type="github">Microsoft/GSL</remote-id>
 	</upstream>
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
new file mode 100644
index 000000000000..00abfdad79b7
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -0,0 +1,4 @@
+AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch 2180 BLAKE2B cd864a68def30f4bf64eb56afc2666ebe7e56a645da1df7e143d7874ae36ea8ecc82a2d5f8aeba5939866b67baeb6a457937355d275375c3bd93b1340bf00ac7 SHA512 3f1dbd41a953e897a1e18a97ef239b73ee1a00475d210406ada3b17686ebd52698c125670a217bb2fd75bf43437640426d48d1c5216ed313c2aceee6bc9fed68
+DIST prometheus-cpp-0.9.0.tar.gz 43924 BLAKE2B e2b26b257e44c63ae5bc2a703d0ee9247fd8f093ef58a3b00dec022af9cb56b18d20b74ccdb91899e2385b036c332b62d9959b9258082ca420fecf48926139d5 SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891
+EBUILD prometheus-cpp-0.9.0.ebuild 861 BLAKE2B 5646744ffc35576379efda8660d4766dd5a31f34688e1e1ae8ed203c78741c2a3081ac17d08ecd42bb470c473494f382fd7be520ec7fb272f0eab8fa0b86fd8a SHA512 173615b28f1d1d73f871b22c6fbc8d787cecce06529ce39a5e9bb03dc4ca9672d74ec2a71666b627b445fd104606ef7d2c5e5fc187e645fc227525f58c98e876
+MISC metadata.xml 957 BLAKE2B e5ad4d542af4a50bfe542f810c937f79065d7a77f5733bd9e3ce356da4dac599eacf980ad5650e91da3a64c9a050f08dfd24acead0538884fbe01253cb008130 SHA512 06444b55464c8301512b2f6c25f8d0e0071cab367cca4111bd21891b66ab7432b7e637f4ed46803c189cc657677ed35a8c351a11e440f8f1ccd48c9a5d636626
diff --git a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch b/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
new file mode 100644
index 000000000000..ced0b80e83e9
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
@@ -0,0 +1,80 @@
+From bf6e2ce56abe2a710181f0365a21ca2dafd2a8f5 Mon Sep 17 00:00:00 2001
+From: Gregor Jasny <gjasny@googlemail.com>
+Date: Fri, 13 Mar 2020 13:16:56 +0100
+Subject: [PATCH] core: Skip serialization test if locale is not available
+
+Closes: #345
+---
+ core/tests/raii_locale.h      | 15 +++++++++++++++
+ core/tests/serializer_test.cc | 21 ++++++++++++++-------
+ 2 files changed, 29 insertions(+), 7 deletions(-)
+ create mode 100644 core/tests/raii_locale.h
+
+diff --git a/core/tests/raii_locale.h b/core/tests/raii_locale.h
+new file mode 100644
+index 0000000..592d74f
+--- /dev/null
++++ b/core/tests/raii_locale.h
+@@ -0,0 +1,15 @@
++#pragma once
++
++#include <locale>
++
++class RAIILocale {
++ public:
++  RAIILocale(const char* name) : savedLocale_(std::locale::classic()) {
++    std::locale::global(std::locale(name));
++  }
++
++  ~RAIILocale() { std::locale::global(savedLocale_); }
++
++ private:
++  const std::locale savedLocale_;
++};
+diff --git a/core/tests/serializer_test.cc b/core/tests/serializer_test.cc
+index f935a3b..6cb8f0e 100644
+--- a/core/tests/serializer_test.cc
++++ b/core/tests/serializer_test.cc
+@@ -1,9 +1,13 @@
+ #include "prometheus/counter.h"
++#include "prometheus/detail/future_std.h"
+ #include "prometheus/family.h"
+ #include "prometheus/text_serializer.h"
+ 
++#include "raii_locale.h"
++
+ #include <gmock/gmock.h>
+-#include <locale>
++
++#include <memory>
+ #include <sstream>
+ 
+ namespace prometheus {
+@@ -25,15 +29,18 @@ class SerializerTest : public testing::Test {
+ 
+ #ifndef _WIN32
+ TEST_F(SerializerTest, shouldSerializeLocaleIndependent) {
+-  // save and change locale
+-  const std::locale oldLocale = std::locale::classic();
+-  std::locale::global(std::locale("de_DE.UTF-8"));
++  std::unique_ptr<RAIILocale> localeWithCommaDecimalSeparator;
++
++  // ignore missing locale and skip test if setup fails
++  try {
++    localeWithCommaDecimalSeparator =
++        detail::make_unique<RAIILocale>("de_DE.UTF-8");
++  } catch (std::runtime_error&) {
++    GTEST_SKIP();
++  }
+ 
+   const auto serialized = textSerializer.Serialize(collected);
+   EXPECT_THAT(serialized, testing::HasSubstr("1.0"));
+-
+-  // restore locale
+-  std::locale::global(oldLocale);
+ }
+ #endif
+ 
+-- 
+2.28.0
+
diff --git a/dev-cpp/prometheus-cpp/metadata.xml b/dev-cpp/prometheus-cpp/metadata.xml
new file mode 100644
index 000000000000..ece2117d6db5
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		This library aims to enable Metrics-Driven Development for C++ services.
+		It implements the Prometheus Data Model, a powerful abstraction on which
+		to collect and expose metrics. We offer the possibility for metrics to
+		be collected by Prometheus, but other push/pull collections can be added
+		as plugins.
+	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/jupp0r/prometheus-cpp/issues</bugs-to>
+		<doc lang="en">https://jupp0r.github.io/prometheus-cpp/</doc>
+		<remote-id type="github">jupp0r/prometheus-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild
new file mode 100644
index 000000000000..75d66bcbc3d2
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Prometheus Client Library for Modern C++"
+HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
+SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/cppcodec
+	net-misc/curl
+	sys-libs/zlib
+	www-servers/civetweb[cxx]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gtest
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-core-Skip-serialization-test-if-locale-is-not-availa.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PULL=yes
+		-DENABLE_PUSH=yes
+		-DENABLE_COMPRESSION=$(usex zlib)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_THIRDPARTY_LIBRARIES=OFF
+	)
+
+	cmake_src_configure
+}