gentoo resync : 04.01.2022

39 files changed, 454 insertions, 291 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index cd613b57136e..d60941c0c75e 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 5c4a900fb82e..ec94a4867788 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,16 +1,11 @@
 AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3
 AUX abseil-cpp-20210324.1-glibc-2.34.patch 720 BLAKE2B d24511a6b929d8bc15fce316f46ce6a3f8686357f72d97f2ebc8365ac04cc93afbf801c24ad8a488a4cbefa615ddc3141ccd25890b005bfba8e53e45276ec664 SHA512 05e53e5175328c2907a346ed01163bf8d0c6d51ffb85c58aeed507ca10444fde29adc86dfd259f9cbaafa35aa6723f531fdf05749b6c1248f094ed672d74fa14
-AUX include_limits.patch 310 BLAKE2B 42e5ba8bfe63f12128c0cc31cf2a535bed86925dddf37cf4e5f974c0e039f95d6740dce301004e097cf2f4cbc4eb0e1dea05afd1fbd720cdcbfc0a7c2325be25 SHA512 7909eda4244fa205f540ed4b279af0231834157f5389bbb42bb2510a1df0c7ce2e48604c98740e82cbf1cfcc3dea4a36e1c90b66b779f234991254f15f73288b
-DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
-DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
 DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
-EBUILD abseil-cpp-20200225.2-r1.ebuild 1371 BLAKE2B 12b6b1be611e1d35877e68b0e17f32a1fb39ba9e9e1d73938e00fd949ca73f2df42024954dae12eeddf60f4efedadf1b824fdb14a685f9469dc4d0e539b14e00 SHA512 bd9496152e6844562b011f38833ab204bf1e28adc4d12e2e23e9fb8106e806327d3c6de03058eee5cd51753b4fc9c6e5fac83cc51ed78965dd5f4c908c6f8791
 EBUILD abseil-cpp-20200923.3.ebuild 2026 BLAKE2B 9dffa70b9c9fcaa4c20fa06d6c775d52d35919690619ebc24d4b35da1502f587cdece1bc2f6532c2246210216082d0e6c21b9620acb3161abde70d3ccb8b6689 SHA512 6e3a4125ed1320e938f373607c25fe8823323d13ae031256e615cf5d0a547fb39c4fc6269091d21efa3905adad9002869fed7b74e61324ff9d8a8530a807f807
-EBUILD abseil-cpp-20210324.1.ebuild 1935 BLAKE2B 0973f4be9298ef454978bf8d4a80a9f944b2a6e35d8c2b95f982267eae3ba1d6109d9a71ec620e06a20147a64ada2492d0ba52726072459635d6fad9757389be SHA512 b6a6e0013168b2b7c3121ea1106dd3e1b5f0f3f911209dd65e8cc8c8bad92eccd3d55f389449d273d9896ffa64b2fa8919c084f03abe1442551e9dc46422cbc7
-EBUILD abseil-cpp-20210324.2.ebuild 1892 BLAKE2B 3df902b257541d6f92a8b11f5f2057b7250dd8dff4334bc72cf2371d010ba0c73fa7c93d8a35e0fe80a63efb22f8768adf1c7e455645942ac2c7d956db7d5671 SHA512 87c3fd73056dc51e3ec02fb8d3b5a541233bee543aca99aa7db3b19d1173cbd2ea86539c4d6db77c88d07226896c49ab7edd44d1e501c17bf1beb96f6586327a
-EBUILD abseil-cpp-20211102.0.ebuild 1607 BLAKE2B 913a8e620bc40c7cfa55e89cb85379d59ef41e7f8f589b150a737194203c7b06c67d6692e63b39f69d551408547734520a70f442c854041858c113d92b151684 SHA512 7a3e3fd50d55c17f6d2eb77aa0582b10d6556b36b5a0b2c13d41726968478e5ecd871fb6e95a3e55f527e1c0da65eb19e5e21a34d62bc2d855198ed2d5d2774d
+EBUILD abseil-cpp-20210324.2.ebuild 1891 BLAKE2B da7b42a49acb82ceb39e7e5906b4da251bc9e6a8ddc8cb0159a75da8780b2cdc3c904417880126092f85cf730a73a92356d170d8e643cc1693c4eb95af692df5 SHA512 4105a51bc824f32e8f122df992cc370d3ef5541f06e77b13eafe2cf5dd0a9387a0aa81c7b86cec90df0321d70c8f4bd6f766d13a0f12379a29410d16c4ad8f75
+EBUILD abseil-cpp-20211102.0.ebuild 1603 BLAKE2B 5a8596e862086722f997f8db73df24135108b0b80fe169e8f970814894f66c186deb3a893377244dda4acd5f81392a4bd4e24b90ebc87039cbe0d6c8dac8db90 SHA512 9471e131323b7173e225231a0aa0841daea2f5700bfb6441406b81d7789946c09e3f77059d87008e2f7d70bed647fd09055dfa2305e34c28df422c24d9027cdc
 MISC metadata.xml 357 BLAKE2B 3137dd5248b0a7df5b0bf1af9c410cc5a8af300142d18d9d4110a74452f4b1a5f263dd1748a7b88eef0b1548b7203dc12c2678c6d07673f6766fdbc8a1297813 SHA512 3134c17c0f83d8ad16f081c506fd1f3e3ff06f1a2b615d56c4f05456c971acf8568768c2ed443f3a35725dd19f8d42076957fe2d25d049de277dea55903ea2ed
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
deleted file mode 100644
index fe5a91286a00..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-# requires source of gtest and other libs
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
-	"${FILESDIR}/include_limits.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-}
-
-src_configure() {
-	if use arm || use arm64; then
-		# bug #778926
-		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
-			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DBUILD_SHARED_LIBS=TRUE
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
deleted file mode 100644
index 087d0e5ce2b8..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-any-r1 toolchain-funcs
-
-# yes, it needs SOURCE, not just installed one
-GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
-GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
-
-LICENSE="
-	Apache-2.0
-	test? ( BSD )
-"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( sys-libs/timezone-data )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
-	"${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-
-	if use test; then
-		sed -i 's/-Werror//g' \
-			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
-	fi
-}
-
-src_configure() {
-	if use arm || use arm64; then
-		# bug #778926
-		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
-			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
-		-DCMAKE_CXX_STANDARD=17
-		$(usex test -DBUILD_TESTING=ON '') #intentional usex
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
index 8abe7806d088..af0821bbd992 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
@@ -21,7 +21,7 @@ LICENSE="
 	test? ( BSD )
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
index fc4916e27e71..f50605a6fbc6 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
@@ -22,7 +22,7 @@ LICENSE="
 	test? ( BSD )
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-cpp/abseil-cpp/files/include_limits.patch b/dev-cpp/abseil-cpp/files/include_limits.patch
deleted file mode 100644
index c64229db984a..000000000000
--- a/dev-cpp/abseil-cpp/files/include_limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/absl/synchronization/internal/graphcycles.cc
-+++ b/absl/synchronization/internal/graphcycles.cc
-@@ -37,6 +37,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include "absl/base/internal/hide_ptr.h"
- #include "absl/base/internal/raw_logging.h"
- #include "absl/base/internal/spinlock.h"
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index fdf7be4f0ea7..ff1a75d16cfb 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -5,5 +5,5 @@ DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd29230
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.20.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
-EBUILD asio-1.21.0.ebuild 942 BLAKE2B 42ad6e331a78b0a88b54f2f9b024d4509113670900b45db658aab8478c3b5853f09ee1fbcd0755d4a250ad62f8b3ac042a4f1697759655ef2565ef6c971ac813 SHA512 f61ce6db785881d4c1634480a5bc5249fd6a264d579191a6a654457e0005766a7a4afcd071e364ba5495e46bd10bbc0583cf973533d3e6a136cce75731bfc719
+EBUILD asio-1.21.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.21.0.ebuild b/dev-cpp/asio/asio-1.21.0.ebuild
index 118ab57ddba2..0e025f305eee 100644
--- a/dev-cpp/asio/asio-1.21.0.ebuild
+++ b/dev-cpp/asio/asio-1.21.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 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index d5270cfefa1b..7df9f5b45db6 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,5 +1,5 @@
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
 EBUILD cairomm-1.14.3.ebuild 1033 BLAKE2B 2b660377913e31f0f2b5d99345e21723393af72e2ec602d9edc49c98e55aef929a7c7191adf1e6f46ef615e21d5bc89f515b7d231ca8edd57611f9aa22a7b433 SHA512 e9f1dd80c55b8017e9aaf245ca69a6881cf1b115f59a3f49366d23ebe9da9dfb40ddeaa6dad89b25d4ea5983b2f4e7ca00d10c814f82cbb577bce2033095a8d3
-EBUILD cairomm-1.16.1.ebuild 1028 BLAKE2B 46b3e513b24c5ad50d6c2318b236211ff7a36ab15efb753a22b63e3cac529df096fa74b00610ac7122002c18fa41aa7c2903d45903fd8ef2962ce06da67f4e59 SHA512 cd3a377dc95f2ede06ea88e2bbb9004acf5370717983f55f7e4d049de1f3e124d45033f481e7500654980725f75c63ccb9e81022585ddca46d44b945197f1ff7
+EBUILD cairomm-1.16.1.ebuild 1027 BLAKE2B 5e78cc33ed762377e41c51c2f430e6fde5e18bf307263de24ce327a980bb10344066077fdf735e38b35acfbf8e9a4a84ce03c5c9b7612b8f42413bdafcb01eb7 SHA512 d71bcde0148760e91e90dd94601c9d42e25eea23d87ddc79f4606ca5e0d7a1c8d2846ba2d0e961b4cf1b471271e02dcfb9a056e53d53aac9efc5980ba9d4adaa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
index 5130d24cf117..c0f5c8564e53 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 8dfc59814442..d77f71c9a057 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,8 +1,10 @@
+AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22b3c297ffcf6c6cc5ce4ef21310cdc030587cb2d26841040ae73a15bca0c86be1813de49667904648baf89df34779fb6e97b18e19 SHA512 bc524945b7570fad29482bafdc0f7d35a180dc3a000a5e2cdc14c5fbc54684cabfa0448d53418c122a99fca6955fda5afbac25c46fc1e7c6aa16f4ad687bac76
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278
 DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
+EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
-EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
+EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
 EBUILD catch-2.13.6.ebuild 910 BLAKE2B fef5a8ee3771f072401f0d5af0805dee98ea1b84a6ebaeaa9e59a7c97a7d5a3da9d202b092a50eeaeb865308029f7c9f77bc4d25e5a09e1a0bd9724f0ae03edf SHA512 3dc06f4b01fea561422692e27fc55389da99f0860931b8bc40b581db74488921d5e22a169eb4011ac855bab94d1504b12b407ce54db14020a22aab6ec5801aea
 EBUILD catch-2.13.7.ebuild 919 BLAKE2B ab3f43e428fddc1488c25ec3a0ba27dedb4514dd33a486dc138b918771e50e8e5301b52296597454dbd04bb176e0b21db8ea79f8975794059f2bd32ea3954d5f SHA512 b47f064c75c197a5272cb25a7544b11293636e44876b2b2a6afc439d53fe2c5314bc437235ce453ffcd887881c31ad86ab8d5ca2a862cad916c1beec61b19995
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
diff --git a/dev-cpp/catch/catch-1.12.2-r1.ebuild b/dev-cpp/catch/catch-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..d458ced709de
--- /dev/null
+++ b/dev-cpp/catch/catch-1.12.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+	EGIT_BRANCH="Catch1.x"
+else
+	MY_P=${PN^}-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+
+	S="${WORKDIR}/${PN^}2-${PV}"
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!<dev-cpp/catch-1.12.2:0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.2-glibc-2.34-sigstksz.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r docs/.
+}
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index 3514580992a3..9b275ede9827 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -31,10 +31,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DNO_SELFTEST=$(usex !test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc -r docs/.
 }
diff --git a/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch
new file mode 100644
index 000000000000..3c6e08384a5b
--- /dev/null
+++ b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch
@@ -0,0 +1,67 @@
+https://src.fedoraproject.org/rpms/catch1/raw/rawhide/f/catch1-sigstksz.patch
+https://bugs.gentoo.org/803962
+
+commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680
+Author: Tom Hughes <tom@compton.nu>
+Date:   Fri Feb 19 10:45:49 2021 +0000
+
+    Patch for non-constant SIGSTKSZ
+
+--- a/include/internal/catch_fatal_condition.hpp
++++ b/include/internal/catch_fatal_condition.hpp
+@@ -136,7 +136,7 @@ namespace Catch {
+         static bool isSet;
+         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+         static stack_t oldSigStack;
+-        static char altStackMem[SIGSTKSZ];
++        static char altStackMem[32768];
+ 
+         static void handleSignal( int sig ) {
+             std::string name = "<unknown signal>";
+@@ -156,7 +156,7 @@ namespace Catch {
+             isSet = true;
+             stack_t sigStack;
+             sigStack.ss_sp = altStackMem;
+-            sigStack.ss_size = SIGSTKSZ;
++            sigStack.ss_size = 32768;
+             sigStack.ss_flags = 0;
+             sigaltstack(&sigStack, &oldSigStack);
+             struct sigaction sa = { 0 };
+@@ -188,7 +188,7 @@ namespace Catch {
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++    char FatalConditionHandler::altStackMem[32768] = {};
+ 
+ 
+ } // namespace Catch
+--- a/single_include/catch.hpp
++++ b/single_include/catch.hpp
+@@ -6540,7 +6540,7 @@ namespace Catch {
+         static bool isSet;
+         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+         static stack_t oldSigStack;
+-        static char altStackMem[SIGSTKSZ];
++        static char altStackMem[32768];
+ 
+         static void handleSignal( int sig ) {
+             std::string name = "<unknown signal>";
+@@ -6560,7 +6560,7 @@ namespace Catch {
+             isSet = true;
+             stack_t sigStack;
+             sigStack.ss_sp = altStackMem;
+-            sigStack.ss_size = SIGSTKSZ;
++            sigStack.ss_size = 32768;
+             sigStack.ss_flags = 0;
+             sigaltstack(&sigStack, &oldSigStack);
+             struct sigaction sa = { 0 };
+@@ -6591,7 +6591,7 @@ namespace Catch {
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++    char FatalConditionHandler::altStackMem[32768] = {};
+ 
+ } // namespace Catch
+ 
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index b032aeb810eb..a104141fc374 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,4 +1,6 @@
 AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40dcc2ea8c7357c3efd3e2b41c2be95f385297f021c54125bbc2695e753c7ab97f3e78a16497c11e980bb9a6f41eab0 SHA512 7b039ba0b668b9578f908c1bfe20ca725c8bc753f6b68f8540d3eddc8323f865096d0cb4e9274ef09d210a72844aed54888506be20c964b91c8bbd5e01a4229a
+AUX cpp-hocon-0.3.0-use-system-catch.patch 1897 BLAKE2B 962f56c329d0dd930929e6ffa0eebb828509a9ef6676f23489a33fac4b396ce68abc80645118f54dc57e1ce4234a7031189b4d1a0fe7b00741cb7f0c016a2a98 SHA512 bea1aeedd0eed39d660043c16cb04327577d2f28df65a134403de35b2aa9058f68018f0b673968639ef2adc66079618e4c387beef3b202d6492fbe92604734f6
 DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5
+EBUILD cpp-hocon-0.3.0-r1.ebuild 883 BLAKE2B 91aa2052ae27cafd925032f47b1b6f95efbb541596ce1c8d57f4072923388b5ec421607dc3f17dcdf8e17f6b3cebdbabf7f60fd14fa77dd395ec3c63a32a7da5 SHA512 a016968cb15e15a6e3cda59c7b3899c98ea09a2384cf8063180b63e28355c84a63d8b1c7e3c63c561127f5975b6c60e6f68f1dc17e154a0cb7cc312e3c32b055
 EBUILD cpp-hocon-0.3.0.ebuild 583 BLAKE2B 07e9241102d8402ca278e9c3bef86e961002e8cd66d142e2419bb0824bf7d7337bea4e34085c53ca1044a616c4fba19948a5a761b1fcb85ee82ad0d9e2104cfb SHA512 ae883347f8fe5ed11e1e62121efe7072bb354bffb830147ff47475fc305d4b168bafe617469128b1b1c5892179d95eb49e0b0af58b6a4d1865bf85373b7abbe2
 MISC metadata.xml 340 BLAKE2B f6689012de9c50abdb8ea3ae92cd2ed960d5c601c953d62f7fc9e1fe760f4df2631aabd3523368b2684c9b3d221e03f4ac9a24bdd12050d61e0e4cd049868a2d SHA512 4c824adec6b20595929856a2fe350348c133c41c508ff8586f0161190a5bf6ba572fbf2ca93c8bec0dd540a3749d3e9e1ce82441519c68e191771ba4c8bf50cf
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..e80181729b1c
--- /dev/null
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+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/${PV}"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-libs/leatherman-0.9.3:=
+"
+DEPEND="${DEPEND}
+	test? ( dev-cpp/catch:1 )"
+
+#PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.3.0-use-system-catch.patch )
+
+src_prepare() {
+	cmake_src_prepare
+
+	eprefixify lib/tests/CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch
new file mode 100644
index 000000000000..0964e3e7bc7a
--- /dev/null
+++ b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/823419
+
+Wanted to make this "proper" but Catch2 lacks a pkgconfig file (or a CMake one)
+and it's easier to just do this for now.
+
+Based on patch version of sed commands from upstream bug
+(https://github.com/puppetlabs/cpp-hocon/issues/132) and
+Fedora (https://src.fedoraproject.org/rpms/cpp-hocon/blob/rawhide/f/cpp-hocon.spec#_76).
+
+Makes tests conditional too.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,12 +16,16 @@ if (NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif()
+ 
+-enable_testing()
+-
+ # Leatherman setup
+-set(LEATHERMAN_COMPONENTS locale catch nowide util)
++set(LEATHERMAN_COMPONENTS locale nowide util)
+ find_package(Leatherman REQUIRED COMPONENTS ${LEATHERMAN_COMPONENTS})
+ 
++option(BUILD_TESTING "Build test suite (needs Catch)" ON)
++
++if(BUILD_TESTING)
++    enable_testing()
++endif()
++
+ ## Before we find any packages, we want to pull in the common leatherman options, as they can affect commonly-used packages.
+ include(options)
+ ## Pull in common cflags setting from leatherman. Don't override CMAKE_CXX_FLAGS at the project root to avoid impacting 3rd party code.
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -91,4 +91,6 @@ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h"
+ leatherman_install(lib${PROJECT_NAME})
+ install(DIRECTORY inc/hocon DESTINATION include)
+ 
+-add_subdirectory(tests)
++if (BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+--- a/lib/tests/CMakeLists.txt
++++ b/lib/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Setup compiling the test executable. C++ compile flags are inherited from the parent directory.
+-include_directories(${LEATHERMAN_CATCH_INCLUDE})
++include_directories(@GENTOO_PORTAGE_EPREFIX@/usr/include/catch)
+ 
+ set(TEST_CASES
+     concatenation_test.cc
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 15b9b88d9d00..387c699725d3 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,7 +1,6 @@
 AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c7980fa0e5372db69465ccf964e7294213ae459e200a39f2721849df94a8433febcfb225813af3b43bc204b0edd3d64c SHA512 b8c4701f22c483078fb7d25df60c8f002f47573ec434a309b1a3739aecc1c51f79852b06f46c1ed9ae4cbec0e7d70aaabd06bc59e561c19d81b05388d3cedc61
 AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f6b6a58388d6d9cb9b4b925f68311443f79cb3f94c8c50adc14f2165530c43b735abc4aa21340868d9330c1e9b4fa SHA512 ad8d10c90136188ffda547b8d8781e9d26bc43d1dba7e9c3ff12f8a73725d1b331dd47bccdd331f998a0b03251eb2e3373a8cb39284f82c4bc63a5a703f21a46
-DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
+AUX eigen-3.4.0-doc-nocompress.patch 873 BLAKE2B 0458b8e4c03fb8ef3f4ecd74d9f285ca8aa3787a0fd466922f45cb96386c8c5cd35116db4ab2caddc841e47cbf2678594ebf727153804878761dc455f08c2c81 SHA512 a4763cb037a16c12dc3d6a6ac075c7ff130ea9d2913f76472e61d821e45cfcce446ad11e43426227e7b60268a14cd952ee81104ca594c3710bde56d655f910b0
 DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
-EBUILD eigen-3.3.9.ebuild 2510 BLAKE2B 5a6792afa7132411ad9980ee7f8be71776f73991e7f3328595a29712d71491b9f433f033b9c422054a472a90b3e7555a5a4debd42fed7a704c15c36062efe2a1 SHA512 86e5e560bb26edd70469c0ccc372e51acdf8971c58ed7b9838744bd7ead54227d4cf801c8605348f6c37bf9edff4a0f6fa6b209cdc408249c9e4d8745b6375c3
-EBUILD eigen-3.4.0-r1.ebuild 2498 BLAKE2B 105842c4337b185b440d7905ad41a4f16002c472fa9493935d8a434f3e0973e5a0e347b2bf623ceffa01e1b0ed12917d38c45667a48326805c42bdeed93f45b3 SHA512 7db2f02c577a6a46241ca3fef0eb826e2fd43fbf7369723d29d96596cb7abc07039b8436ca5c3704436610d35ac1d2709be669bdbe3885f2070e964b5dc21488
+EBUILD eigen-3.4.0-r1.ebuild 2551 BLAKE2B c0ae5d0bfd726dd41802cdc3779f3764c1b0bb20ab26bcc01ab702ece9a576d10076cfd2ca8478c4c8775c4e502fc03bcf7926ba30f88f57f107ffd1ec22b14b SHA512 60cc64c87f5b098765ad70447ba8d331031986cae5d5697d670270cbf05607b05bc17a88eaa13f3b4566a97492e117e3fa0481b6daa7292b80c0dbb6c5d99842
 MISC metadata.xml 887 BLAKE2B f6d225ff8a5b80f64b8e326962953b412526a0706c5dd7d9724d813a0e903d4d689f6a03249d33f1302c7575688e3246987bce6438163bb3130e7fee020cf9ed SHA512 a779ec093ee5008f881c07d3c3c9ea730a3393f8f9b6f1dde036b215ce30a006317d5f765df66f424491269179980cf3433061f693d902f5ac2e3341b4166ac8
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
deleted file mode 100644
index 6d4b9b345248..000000000000
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( virtual/pkgconfig )
-"
-DEPEND="
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		sci-libs/umfpack
-		virtual/opengl
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
-	"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	cmake_comment_add_subdirectory demos
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
-			-i CMakeLists.txt || die
-	fi
-
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
-	)
-	use test && mycmakeargs+=(
-		# the OpenGL testsuite is extremely brittle, bug #712808
-		-DEIGEN_TEST_NO_OPENGL=ON
-		# the cholmod tests are broken and always fail
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON
-		-DEIGEN_TEST_CXX11=ON
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DEIGEN_TEST_CUDA=$(usex cuda)
-		-DEIGEN_TEST_OPENMP=$(usex openmp)
-		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
-		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-	if use test; then
-		cmake_src_compile blas
-		cmake_src_compile buildtests
-
-		# tests generate random data, which
-		# obviously fails for some seeds
-		export EIGEN_SEED=712808
-	fi
-}
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index efe66bd9b8a6..173ae17f83f3 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 # Tests failing again because of compiler issues
@@ -54,6 +54,7 @@ DEPEND="
 PATCHES=(
 	#"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
 	"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
+	"${FILESDIR}"/${P}-doc-nocompress.patch # bug 830064
 )
 
 src_prepare() {
diff --git a/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch b/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch
new file mode 100644
index 000000000000..b9c252ebb09c
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch
@@ -0,0 +1,15 @@
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -112,11 +112,7 @@
+   COMMAND doxygen
+   COMMAND doxygen Doxyfile-unsupported
+   COMMAND ${CMAKE_COMMAND} -E copy ${Eigen_BINARY_DIR}/doc/html/group__TopicUnalignedArrayAssert.html ${Eigen_BINARY_DIR}/doc/html/TopicUnalignedArrayAssert.html
+-  COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
+-  COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz eigen-doc/unsupported/_formulas.log eigen-doc/_formulas.log
+-  COMMAND ${CMAKE_COMMAND} -E tar cfz eigen-doc.tgz eigen-doc
+-  COMMAND ${CMAKE_COMMAND} -E rename eigen-doc.tgz eigen-doc/eigen-doc.tgz
+-  COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html
++  COMMAND ${CMAKE_COMMAND} -E remove html/unsupported/_formulas.log html/_formulas.log
+   WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)
+ 
+ add_dependencies(doc doc-eigen-prerequisites doc-unsupported-prerequisites)
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index bf6635058856..a05947bf80fa 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -6,6 +6,6 @@ DIST glibmm-2.70.0.tar.xz 7874312 BLAKE2B 5d0fb24444b8764e3f972f342a540164debb84
 EBUILD glibmm-2.66.1.ebuild 1255 BLAKE2B 20753f7a289f47fc393bfa7b155c2f8b056935bbd76a29808dba8a1ab9e3909912e39dc8c07032f5c96265150936e4c9f842a6b89fadf3e9dbd5e1a19da18b8b SHA512 58f016cb9a9157970afaa6ad9ea2fd70b1f360e34c1b32b442c5431e5e0098cbfb79ab8ac28cdf340f3e102fc74ae3a38daa07a66b9c6d383d9164dcc4c97f73
 EBUILD glibmm-2.66.2.ebuild 1263 BLAKE2B d9e9ed54517a2a322aaa15ea707b81d3a1e378a46adb678fe67e6e10d0cf97d6e0d5350cb96d76d2f5b785d7ceb4d0ffcbeeacf81f4d6717e83fbd709e5d5f1a SHA512 ab9659ac6267c9afa93d058736de43df3a72acaf4821482807adacd54b160847c8bffd82cf5d5a4b4115568b1dc107ee0fae2cf55e730d79ddb4fa28e158d353
 EBUILD glibmm-2.68.1.ebuild 1212 BLAKE2B f14e59f2fdeb8c35c2ad1ea08cf66ec76d4fbe1cb52b40acbb35030635c00f97b4af1d402e56188cfd5669e5df3b8c7553b3e6ee02bb0e4b2087e14733c77424 SHA512 a9adde41b1ccb31741dccbdf4ae45c74973cbc7419d066f3de5fb1ae0dd9b2e67099a9534893b9af05921375439ad75cc38dcc35d26e405a5987e64bc884e794
-EBUILD glibmm-2.68.2.ebuild 1213 BLAKE2B 3656f64800b84e19906b62ec05e29dffbcb9eef88e43e70f1be1e5e1725bf160a5702bf8005f3bbe52e2f8d0945240a61c4fcb915a4d209891a248ce235266fc SHA512 edc9f10adabb024ff710aab7fff34a9c663dad5ed0f669252da954756f3e15ef6eaa6e24529e0f472a81612c30094e79d3f459323c14121c1f1412071871010b
+EBUILD glibmm-2.68.2.ebuild 1212 BLAKE2B 6ac56c1ae49905fd307dcc1a5f292d452da1a6972fc09492c9b1f841abd398fe49139c927e9b69c76e80d42fe6b8491b732feb8b6f74748ed35c9e0a3f84b459 SHA512 7d7dd0301bb7844998531499a4ebfa4a74b83a643ad7ca3a4ed0df511bcffafcf2194e0f43594af136282610bb501b5392a254f2764891e5956308a30bed9272
 EBUILD glibmm-2.70.0.ebuild 1213 BLAKE2B d56412fa2387ecb92ad006039beee1a7bb059d872387fdd825d248f68ef69645aa987eca6bf1b7129fa90ea6642ba7441d8edbc2bc72aa0ff3dae7514d56ba5f SHA512 5373ffd0b2c98b61879da9473b693d6fe940841b82c0be01392017fd575f4d76050dcf43fdecdddfb37006b3003dd2d852034c248ed7ab3fbcdccb49ce7a80d4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/glibmm/glibmm-2.68.2.ebuild b/dev-cpp/glibmm/glibmm-2.68.2.ebuild
index b380e4af013d..4fd62005baba 100644
--- a/dev-cpp/glibmm/glibmm-2.68.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.68.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index cf78188fd5f6..590c5936dd03 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -4,6 +4,6 @@ DIST gtkmm-4.2.0.tar.xz 13850496 BLAKE2B 0e39824085fde11ebe3ecd65e3fbdb1778f3072
 DIST gtkmm-4.4.0.tar.xz 13829052 BLAKE2B 1572f4fcbd15526b980a511b10eb0663964ea1fdc5b5f728399415bf053f913646c4c5fc7bf6f93feae9749693260e2d09fd04ed93a7150993f36ac17645d7be SHA512 d6f20213e9ea7a13e2b9822f220a5cdeaef9a9406abee813e0eebdb540839f25f4c19cc7669c24184bef471f5529a7897cd16ee679266148f3181dd2cfa39eb4
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
 EBUILD gtkmm-3.24.5.ebuild 1372 BLAKE2B 5bc8877a0c54600b200f66e79c3d7e0acfb950a3562b2a9ec81f0849c2446318964996a030b771e2a07725a991827e9ce117c82a18abbf479e920da9da38ee71 SHA512 2d95aab3436eaf743018aab84442b873897262db759dc54f5eb024c6a989c45400b03582173dca4090dbb08a52cb943cbccd59d387d34275e0f68c6216e0681a
-EBUILD gtkmm-4.2.0.ebuild 992 BLAKE2B c75ce2d6fe1834102c9c62b1d1e931c419f8eb7397247e2e7e8af0d82d92efaa132d25570e817112e54a1eb181222d0b9c67b895f06441ecd74eaf9e6fda6a27 SHA512 190d547e443bffa10d545e6e21559b032efa3a1b7f23736e0b12fc862e55fab3a2e3b4c4a7f752b9e5b324e9526623fc51237b587b5c7373cf0ff36a82600d8a
+EBUILD gtkmm-4.2.0.ebuild 991 BLAKE2B 8de35a8d4fec1676826cc47d8ffd259ff7535c5553a0673b47c24b472804d5a4dd47162cd79f8c2ad49a4bb9c0d75616bbe99b88497639b15b485575445c780f SHA512 1c997384cbd0187290f86e0f8b0a54d59e296179abdd4639642eef3824159a1bdb8eea266280fed8be1c3b445b3ed62b1c0dbcecf0e3cb7e1569c352de5b9dc1
 EBUILD gtkmm-4.4.0.ebuild 992 BLAKE2B 7d1f682ac39ffe461995a543f23634ccc6c13758b21af460c0671587ac0d6f6696784ef07ffb3bb9caf4e0d63d931cbf4e6c43a91508504d2b91f41601d1f774 SHA512 1b37b4053b12a79e4cac90f2c32020f2e47fc22deec360f54eacc5afd0c11e7bfe8a440be4c6e0fe61a398175770ac50a956c5d94ded4bd5d791138c4335b034
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
index eb7e2245e9f7..3d04a8cafe5c 100644
--- a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index b1a8d964d7d4..e81a54c0853a 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -2,6 +2,6 @@ DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
 DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
 EBUILD pangomm-2.42.2-r1.ebuild 902 BLAKE2B f6007d42a4d7a3c96e629b55f48205302a210b3d148ff8f339da365783fef7be0293176742842c8d6ef1e6a982ffc25aca613156d3b9bfa4e487c64a8df1362f SHA512 b1c007e95ea89531a548bf0dbf41c4680cc5c29bae46d078cdcdf90d8957a1e774f7be0d6cdb04cad3c7d95c0ee2c3db115fd3182d17a5eed406ab12e6c6fffa
-EBUILD pangomm-2.48.1.ebuild 914 BLAKE2B 0148424dfea1af227bcafabda42393b725da368293a0c29de74d27ae9de4fc8ef80ef8745fb3aee1c2c46ab9b79cb92a488fd13b4930a102c982ec9ae417b038 SHA512 53172a7f948f21c98f7346ac149b9c14abd4b6eb1b000a16b0144dd830b8a293d05951c3b7657124574f0e221eddba6933ae52bba17b221d62eca29439d6d6f5
+EBUILD pangomm-2.48.1.ebuild 913 BLAKE2B 522a1085d98102885f01e29c1569319efb35e451767384ce628ccba8b534276f52d989f2e7d7abee77bb28dc911463f5fb0ddaed30a58f83f7f2cf0411b4c9f9 SHA512 669e597784bc7fa94cc4a6b3dcbe606f7232df4aa652fdf3106a16615644940a7bea66b9833cb9dd7ce542a88b93d2740593fa224b2b2603253d6460417b3912
 EBUILD pangomm-2.50.0.ebuild 915 BLAKE2B 21462900f08c9ff26a70237d382e4fac25908866a97e886b62f5802445d7b800813dd5027e38d8578f8d1339fb3810d124012af06198bde53aa77fde62b49f05 SHA512 2f19a6f0f7126dc91f8602dc18bf662658f6c49b935c454025dd2a604c0bb9ffa9229ed6f2774acf8781923836bfc5a042cbf875f02773ba0f1e4f0b23d43102
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
index a7d98ee56e48..40e232496a17 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
new file mode 100644
index 000000000000..fc360f7bf290
--- /dev/null
+++ b/dev-cpp/rapidyaml/Manifest
@@ -0,0 +1,10 @@
+AUX rapidyaml-0.3.0-libdir.patch 450 BLAKE2B 3058bfbeaa85a81396baf3048d32e7289b4e95c84fb623c4354122689c728fc3fa4e5930262e9058a2f1fbcf73384e1c0dda6cd5d8c701dc1c3091b972dc223f SHA512 2be0a933d8ceaff2f35febdf9098e0e93f40dfea30ccb27b5eb314a2e35f1c58e3b1fb21d2b54dc4cd1df7c5392c82ed739aeb2ab6da5e9d0d70bba1a29a61bf
+AUX rapidyaml-0.3.0-no-download.patch 833 BLAKE2B 57384e4349935acdaeec5b99a1b34090363939f7107db30a6022e974ad6c3f26ba6e02f835a93ced0c1570b968e65432495f4171d1f74d03fcec8bc9b40e2880 SHA512 02651715c80520cba1679a53206a3bd75d802401d22606e58fcbeb66e013c0d6a620b0fa08befc3a5d240919f64665d5eb5aec190eee1136e2df3267bb23214d
+AUX rapidyaml-0.3.0-system-gtest.patch 287 BLAKE2B 00569e1a19fb791bc0ba1c7a8b2b691db478f7e224a842e33c57d0f11d59275fac137e4a193261db7763e5d9a95b98cf17c2ae467bed29617a1f0c5b4544b607 SHA512 119827a88ccd82e8a78fb82593431f8fbb0efc3155043b9587d5909a7d0a944d01703d8f0a9179e6127c5484a292a94c761ca7f22069aa02f03c2a03ba730b8e
+AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
+DIST c4fs-1abba005074022f07d2d9d11ec6a786f2a1f1380.tar.gz 22104 BLAKE2B ea9a063de87962d620e98bad573b1eef9a65cffdacdeab241fd91982f3da93ab01b1bfd6fd87eac5def0b8523f6f2ce32e9321385fb07a6f108dcb68630af1f5 SHA512 00aa29f818a13301df3506ae2b0bc8b527a6d292eb09ccc69681c2ad92ec270aeb635680543dfe1e761a82206c97f8347337a152728eb49d918284e043d32096
+DIST c4log-b8b86f33fc7539661e302171ee6dcc4a17859e67.tar.gz 11983 BLAKE2B 8f2f18e85e01ffe76a2705d181260c7f1c0979009c09c6037097c7711d590f576816e39e869b30cad7b8134114eef55edad327e6224b09c6ba34dd389917af22 SHA512 a3f8f78ffe38426bab2f79748ecadb07e688d98ac75f907a9898ea93f0e7b1818253846412de24f4f755e0a7099aa886515cdd0b28b8c87786ad656a85bd3f9b
+DIST rapidyaml-0.3.0-src.tgz 696476 BLAKE2B 30b077e3ddff56f68108a02545efc77ae3684273891f36db61b714a9af414f1f01d147a7132619647796c863ec6ae2f2586c8bfe9e1c2d3c6e7e99d11d41ee8e SHA512 52a469b18c484d8def9239f6f7697f3c3b7760855c7af68a36988cc5a8031e1f5f900819b2af9770722628d0c14fa2cc776d1c07db7a8e85602c4d00aa4199a2
+DIST yaml-test-suite-bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3.tar.gz 54806 BLAKE2B 6574bed549759a1f3df7bcaa8051ab5e37ebb6dec878e1935dbf8f5c234f852c9ea037f90cc7bb93306cc5b1cd95f6fa8df885e51131eae50c9187d360110185 SHA512 814a654b6b04cf4e9b89ae40ba7daddb8f013da96e929ed618764c55dd23a45d8a97c456f526548cd95d673bcada3650383c3626bbbd0caa3fbdbc4b94496a6f
+EBUILD rapidyaml-0.3.0.ebuild 2000 BLAKE2B 52b678151df5e203cefb4e96bb5299506524e37cc4dfcb225c254c737f5a417d75df5b7f25ce2bfe90220ef737d81508f53f6bf51a5390c78638223a273166ad SHA512 340815fc2955531620bb7b3368065b55008f63ef0fbdbb4f4d5ec4bf76912255cc90da05d10acf804326ae412bbb09b2ac6a3a4ee89508c10b722f1f0f920e40
+MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
new file mode 100644
index 000000000000..a10fbc49585e
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
@@ -0,0 +1,9 @@
+--- a/ext/c4core/cmake/c4Project.cmake
++++ b/ext/c4core/cmake/c4Project.cmake
+@@ -2643,4 +2643,4 @@
+     set(_RUNTIME_INSTALL_DIR   bin/)
+-    set(_ARCHIVE_INSTALL_DIR   lib/)
+-    set(_LIBRARY_INSTALL_DIR   lib/) # TODO on Windows, ARCHIVE and LIBRARY dirs must be different to prevent name clashes
++    set(_ARCHIVE_INSTALL_DIR   lib/ CACHE STRING "")
++    set(_LIBRARY_INSTALL_DIR   lib/ CACHE STRING "")
+     set(_INCLUDE_INSTALL_DIR   include/)
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch
new file mode 100644
index 000000000000..97c4926cd9d2
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch
@@ -0,0 +1,23 @@
+--- a/ext/testbm.cmake
++++ b/ext/testbm.cmake
+@@ -1,4 +1,2 @@
+ # these are used both for testing and benchmarking
+-c4_require_subproject(c4fs REMOTE
+-    GIT_REPOSITORY https://github.com/biojppm/c4fs
+-    GIT_TAG master)
++c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs)
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -103,10 +103,5 @@
+ 
+-    c4_require_subproject(c4log REMOTE
+-        GIT_REPOSITORY https://github.com/biojppm/c4log
+-        GIT_TAG master)
++    c4_require_subproject(c4log SUBDIRECTORY ../ext/c4log)
+ 
+-    set(tsdir ${ed}/yaml-test-suite)
+-    c4_download_remote_proj(yaml-test-suite tsdir
+-        GIT_REPOSITORY https://github.com/yaml/yaml-test-suite
+-        GIT_TAG bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3)
++    set(tsdir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite)
+     set(suite_dir ${tsdir}/src)
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
new file mode 100644
index 000000000000..0e404f09d781
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
@@ -0,0 +1,8 @@
+--- a/ext/c4core/cmake/c4Project.cmake
++++ b/ext/c4core/cmake/c4Project.cmake
+@@ -2762,2 +2762,5 @@
+         if(NOT TARGET gtest)
++            find_package(GTest REQUIRED)
++        endif()
++        if(FALSE)
+             c4_import_remote_proj(gtest ${CMAKE_CURRENT_BINARY_DIR}/ext/gtest
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch
new file mode 100644
index 000000000000..97aeb72ee1a5
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch
@@ -0,0 +1,18 @@
+--- a/ext/c4fs/CMakeLists.txt
++++ b/ext/c4fs/CMakeLists.txt
+@@ -18,6 +18,4 @@
+ )
+ 
+-c4_install_target(c4fs)
+-c4_install_exports()
+ 
+ c4_add_dev_targets()
+--- a/ext/c4log/CMakeLists.txt
++++ b/ext/c4log/CMakeLists.txt
+@@ -21,6 +21,4 @@
+     )
+ 
+-c4_install_target(c4log)
+-c4_install_exports()
+ 
+ c4_add_dev_targets()
diff --git a/dev-cpp/rapidyaml/metadata.xml b/dev-cpp/rapidyaml/metadata.xml
new file mode 100644
index 000000000000..0955cf954630
--- /dev/null
+++ b/dev-cpp/rapidyaml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">biojppm/rapidyaml</remote-id>
+		<remote-id type="pypi">rapidyaml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild
new file mode 100644
index 000000000000..a31baebfcc2c
--- /dev/null
+++ b/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+C4FS_COMMIT="1abba005074022f07d2d9d11ec6a786f2a1f1380"
+C4LOG_COMMIT="b8b86f33fc7539661e302171ee6dcc4a17859e67"
+YAMLTS_COMMIT="bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3"
+C4FS_P="c4fs-${C4FS_COMMIT}"
+C4LOG_P="c4log-${C4LOG_COMMIT}"
+YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
+
+DESCRIPTION="Library to parse and emit YAML, and do it fast"
+HOMEPAGE="https://github.com/biojppm/rapidyaml/"
+SRC_URI="
+	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
+	test? (
+		https://github.com/biojppm/c4fs/archive/${C4FS_COMMIT}.tar.gz -> ${C4FS_P}.tar.gz
+		https://github.com/biojppm/c4log/archive/${C4LOG_COMMIT}.tar.gz -> ${C4LOG_P}.tar.gz
+		https://github.com/yaml/yaml-test-suite/archive/${YAMLTS_COMMIT}.tar.gz -> ${YAMLTS_P}.tar.gz
+	)"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="MIT Boost-1.0 BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-no-download.patch
+	"${FILESDIR}"/${P}-system-gtest.patch
+)
+
+DOCS=( README.md ROADMAP.md changelog )
+
+src_prepare() {
+	if use test; then
+		mv ../${C4FS_P} ext/c4fs &&
+			rmdir ext/c4fs/ext/c4core &&
+			ln -s ../../c4core ext/c4fs/ext || die
+
+		mv ../${C4LOG_P} ext/c4log &&
+			rmdir ext/c4log/ext/c4core &&
+			ln -s ../../c4core ext/c4log/ext || die
+
+		mv ../${YAMLTS_P} ext/yaml-test-suite || die
+
+		PATCHES+=( "${FILESDIR}"/${P}-tests-no-install.patch )
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRYML_BUILD_API=no # TODO if a consumer needs it
+		-DRYML_BUILD_TESTS=$(usex test)
+		-DRYML_DBG=$(usex debug)
+		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove shared private library that is statically linked
+	rm "${ED}"/usr/$(get_libdir)/libc4core.so* || die
+}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 9f769d8fd783..203fc329483a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,7 +1,9 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
-AUX tbb-2021.4.0-lto.patch 9663 BLAKE2B c05245283427d6a715e835492c099bf106f1d0c3213750b4370a2ef951d90f3be00361e0f2f4632e787dd4ee78294fce3a7c3292ceaa76eb41a8597e4ce9d67b SHA512 4b6fbdfe56a5b1ee890891f9154c7d231d21619bb3260cce0a64d56d6f2f3cf7843dc62d553f36360e702a88d49a20f8fd775488800c2a5308237183535bb247
+AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
+DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 518fa0a1a5ffc1b572b9366880f2e6a204e46f1751c923a76bd5cc96c69ad9bbc673bc89e23b9d46ef0c94e271d12001d0398d7e641d80a60d03fdaefa0789a5 SHA512 727e6797c6afc06f55359974add2b0578bcafa10b276bd603a8d6dc39adfe175cf89ee6c080d8543b4919bb9349adc812a4e3f39a5dcba68730acae30cc7be32
-EBUILD tbb-2021.4.0.ebuild 962 BLAKE2B cc32202a9668bde65cfd7df4ca8ea4d163c06f6beabb90c9b78a16701edab523ac30c86b26d12903efb4b7cab545c6e07ac5bfeafb95fc1b671f4acd96d0390b SHA512 920f4f0af51bbb40efb74b966fcccf9d9550d38f17533deecef6fce6d57a464b1a8b44071de5e4eeb9e4c83781179ed61d6a2c04487868e3568621ab0a324c12
+EBUILD tbb-2021.4.0.ebuild 933 BLAKE2B ab62b32a69703dcd5c6898b5b1c436ea02c7f6edec00c93612e933cde4fe4f851e6a06b7ed2d887b9f372f2ebc46474632536b948d101c2fd433be17c03bf897 SHA512 fd18c239eff4381968fb99db7bf6f01197a57489ffeeddd7352a7aa0e57300e1ca819093fa97802bf29334e6a6014737f20889d82ad81815af2485c454cf449d
+EBUILD tbb-2021.5.0.ebuild 973 BLAKE2B 211e3d1b57aee76396121d1987b3fb62166336a3876a5783a3d3d09ee6e4ac1b27642f2130e56067d0cbf558a04a305406bd3330719a01ab0a0d4da477dd41ad SHA512 585e108c6c097811f1ce46057d59cef9eb0bd1245f6d76ae860ff48c325192e508ea84a77db28693898ad83d78f83a4701ae680fbb5de1ac925124e7c2768d39
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
index 5be97b90605d..1c9705576004 100644
--- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
@@ -1,3 +1,5 @@
+https://github.com/oneapi-src/oneTBB/pull/608
+
 From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
 From: Ivan Kochin <kochin.ivan@intel.com>
 Date: Wed, 27 Oct 2021 17:23:32 +0300
diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild
index 9a99edb24ae8..930bcd958708 100644
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib flag-o-matic toolchain-funcs
+inherit cmake-multilib
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://www.threadingbuildingblocks.org"
diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild
new file mode 100644
index 000000000000..0a18fece5fd1
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/hwloc:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.4.0-lto.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DTBB_TEST=$(usex test)
+		-DTBB_ENABLE_IPO=OFF
+		-DTBB_STRICT=OFF
+	)
+
+	cmake-multilib_src_configure
+}