gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-cpp
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
91 files changed, 707 insertions, 673 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 35527ef82d20..c6b31eb496cf 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 ec94a4867788..09bb08a204c2 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,5 +1,6 @@
 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 abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2439 BLAKE2B 7640ea553046a8935b173d2043dbf2cd0fc26c4918fed0387f8cfdb924a897dba6b25165d154a9bc351d44dd01b971cbbe2705745eaecc432beee32030fa66df SHA512 ab0461284e0e3a1e40a3bf727d52ca6a6fa77b1cb36565cd7466aaba8064522195f0e22217603f4ceb304eb75170418e3fcb5e3a114c58aab29f46a33ad1f99d
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
@@ -7,5 +8,6 @@ DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 EBUILD abseil-cpp-20200923.3.ebuild 2026 BLAKE2B 9dffa70b9c9fcaa4c20fa06d6c775d52d35919690619ebc24d4b35da1502f587cdece1bc2f6532c2246210216082d0e6c21b9620acb3161abde70d3ccb8b6689 SHA512 6e3a4125ed1320e938f373607c25fe8823323d13ae031256e615cf5d0a547fb39c4fc6269091d21efa3905adad9002869fed7b74e61324ff9d8a8530a807f807
 EBUILD abseil-cpp-20210324.2.ebuild 1891 BLAKE2B da7b42a49acb82ceb39e7e5906b4da251bc9e6a8ddc8cb0159a75da8780b2cdc3c904417880126092f85cf730a73a92356d170d8e643cc1693c4eb95af692df5 SHA512 4105a51bc824f32e8f122df992cc370d3ef5541f06e77b13eafe2cf5dd0a9387a0aa81c7b86cec90df0321d70c8f4bd6f766d13a0f12379a29410d16c4ad8f75
+EBUILD abseil-cpp-20211102.0-r1.ebuild 1678 BLAKE2B 515f893fe2d8f3e601ee73507d06e454d34d9ef13ec37f8c6fb9af6ae23a54e959b8f2be6009084b006acddcf1dc2bc6471ffca6ad249e2a949f3adc4c49d24e SHA512 a0cec1b50c94cf30378ddc23337ffe52ea28d0336d277ad76b5fab0990971aac10e6bcfc693088108665a8b270634889ae09093ba65752d5e8a39991b82ddc87
 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-20211102.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
new file mode 100644
index 000000000000..9873c85b8ee8
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+# and no, 1.11.0 is not enough
+GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
+GTEST_FILE="gtest-${GTEST_COMMIT}.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 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.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() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
new file mode 100644
index 000000000000..45a9fc5406e8
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
@@ -0,0 +1,58 @@
+Fixes compile failure with CUDA nvcc
+https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10
+https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235
+
+From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001
+From: Abseil Team <absl-team@google.com>
+Date: Tue, 1 Feb 2022 13:52:49 -0800
+Subject: [PATCH] Export of internal Abseil changes
+
+--
+121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:
+
+Internal change
+
+PiperOrigin-RevId: 425707805
+
+--
+0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:
+
+macOS CI: Avoid depending on external sites like GitHub by prepopulating
+dependencies and setting --distdir
+
+Our Linux CI does this, but for some reason was never enabled on macOS
+
+PiperOrigin-RevId: 425668638
+GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
+Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
+---
+ absl/container/internal/inlined_vector.h |  8 ++++----
+ ci/macos_xcode_bazel.sh                  | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h
+index cd34a413a..2baf26f3e 100644
+--- a/absl/container/internal/inlined_vector.h
++++ b/absl/container/internal/inlined_vector.h
+@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+                            inlined_ptr->GetSize());
+     }
+     ABSL_INTERNAL_CATCH_ANY {
+-      allocated_ptr->SetAllocation(
+-          {allocated_storage_view.data, allocated_storage_view.capacity});
++      allocated_ptr->SetAllocation(Allocation<A>{
++          allocated_storage_view.data, allocated_storage_view.capacity});
+       ABSL_INTERNAL_RETHROW;
+     }
+ 
+@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+                                        inlined_ptr->GetInlinedData(),
+                                        inlined_ptr->GetSize());
+ 
+-    inlined_ptr->SetAllocation(
+-        {allocated_storage_view.data, allocated_storage_view.capacity});
++    inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data,
++                                             allocated_storage_view.capacity});
+   }
+ 
+   swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated());
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index f1417edb4712..9ab8f511b2d7 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,4 @@
 DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6
-EBUILD aixlog-1.5.0.ebuild 574 BLAKE2B 84c69f956f3641a298933f4fe475afc9a32a830695fa6b6617844b141f89421cda8f2cc454efe826ae9877aa3f49d5c221f4958770ebb569756a9721138a8ac0 SHA512 0233c8275d2aa02515fb8d3c67b2ff459c38fbbcaf59ae9855229fad52514e0fd0f37110592a20ead254608b0fc1cdd63915c9a1c101e38cf61f38745f63f9b0
+EBUILD aixlog-1.5.0.ebuild 579 BLAKE2B 6bdd774dd8338321b95bfaf295e441588891ef855c09fde505d806038d60ecdf5954be7892e5bec4a40867b62d5e70a1fadb43343ea5ba0e0fdb3b94e619c37e SHA512 9040235c6ab6fb773ad2ddb42ac95d958554a0b8a7754f31dae49cde44eb8eee0e6e96759711904e67c27db7f287f63520c01897e81ac938273a5d8126e95901
 EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
 MISC metadata.xml 499 BLAKE2B 7dea962d454843ca3cde921a8dd30fadcb75f163f8ccf16a51b0d3de5176e8f6cae4788271f9924d5edd79e3e7b4ebe118e55f7397b8b5a8a8d1ec03d2a44241 SHA512 20dbf828621fdc1a4379192ed16d3f1e37bb8c5fe9974638f0b8e7c330d007133a589f5e8d23560d19de3c7c5eaa52c2d1e98d61be9326a998376a45c8f866b2
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index 17957bb3d65f..caf257c07eb3 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index a490f860c220..db7706810a39 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,5 @@
 DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
 DIST atkmm-2.36.1.tar.xz 736828 BLAKE2B 5dc5d8fb9a29fe16bad0aea7737110df08f10504b5994239015a85ebfd98b6e38414259ecb6819e1dd9459fdf49e0f6b85c5ed9936802bd56d5c154c91443add SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
-EBUILD atkmm-2.28.2.ebuild 866 BLAKE2B 18fe31ab284e42ce8d4a9e097e4ac727e1333055199fc6b0a06ac5a04f9d9680ffecb6d2ad8755550ff3ebaf79fdd0e22042ba281b6693526cc282202bad725d SHA512 1ea03aa14e4be6950a57a938fc1550bca2d9760e1349ce42adaa9217da7443e675908b0e260d4f8583d1924674e7156bbda72a0a93311d137a6924be1608cac9
+EBUILD atkmm-2.28.2.ebuild 865 BLAKE2B 324a1566fd2b8777d454470ab9fdc6d0ae3b269c5b5f4893388999fac04f4c66bdc70460f91158ac28ff3f9b3038ca1a4f76500aa38b68831fa7f38eb7b02226 SHA512 9b8c5055cfd5f588a122b6f98a0064a863f98b5da9b4c1426ee0286c565b7f4e06d3cf2e140f69bbfc3941d4279e4ca94f4a70c467e5b0903696033af762ed20
 EBUILD atkmm-2.36.1.ebuild 863 BLAKE2B 8360bffc96c0d2fc657ce0137e7211264d48a7574068f6b9e9e0c651edaedd63f89b1f174d2e98125d274476a124b43dc7910a3d3153e54f3a4072cabc72e494 SHA512 d6955f07a9d272934107da1f01c350eb27e03d3bd435f83ca0d6ec07b513871c66c83adb9c6324d44767d56ef9f2d472e1ac553c9bfda7bccf90c53e5695a87f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/atkmm/atkmm-2.28.2.ebuild b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
index 12cb0726d76e..e247f63c3ee2 100644
--- a/dev-cpp/atkmm/atkmm-2.28.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.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=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 8ec77f40ba40..db237f9dd176 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,10 +1,3 @@
-AUX benchmark-1.5.6-system_testdeps.patch 312 BLAKE2B 082c0db683594a33943daad3cd7f7f8a6b28631ea8ac9fbcce47209e1b7174b5b88f6516e7d8516f8b553819f7592ae038d6bd2bfc3b8db4bc477455a400f2a4 SHA512 bf48a1f87c2e5581bfc53dd64eb108df09c26468b97b90227354a2ce911c6ed1d5dedc1cc4e04d15178aa36423c8b20c95117331ab642c8211bdae09f271c6b5
-AUX benchmark-1.6.0-disable_Werror.patch 461 BLAKE2B 3f286f7f8fc6dffd0a8c072ea9773046e816b972b27a510b2b31b0bf0447477c8dee3df5bca7a7ecfb112046856a00ba8e3e95ba14a8bc8652de7c37db0db854 SHA512 520d276314e4f0c59240521e909a0c1e7cb6cea107f291badde0def1f2f70b307f0fd3725ccbffd63cdfcda65605a208eeded46b9fc27746c50bc50c5049c3cb
-AUX benchmark-1.6.0-versioned_docdir.patch 303 BLAKE2B 7cc8c4d61bcbdefaef17cebf1107010e966dd35b69afe1cf762b3796d05b135d5cc2a85fb246ccda33e511628f0606a2d596e0f09e45d11f8e8f8154f42099ba SHA512 e704352323699a7827f4e125e5ea2989e02381d2984ad024f0712d95c8cc4772b167ad85d9e5d4ddd86541432a792ca2d9b7855c939a591fabd7d2ed6b25c3b5
-DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
-DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
 DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
-EBUILD benchmark-1.5.6.ebuild 809 BLAKE2B 5c5555f9335d84c2412698ca19418ddea0507e9ea1aaea1f554967a070770e695bcef1070a089722c0a572219236a08d4c074bfe9f9b63f152907d550ddbb0d3 SHA512 6308f898d7e0781bd7f9482cdaf51bb865cb616af0a568e354eedfd4e84a7f1d839bde000859c09f1ccb02dc3ef7766bd9fb932fd44c3045651857e64f518c6b
-EBUILD benchmark-1.6.0.ebuild 912 BLAKE2B 72b146ecde7c39665b220814f969b3c8f06d21fd79e47c58beaf42452ea9ccb9f882bf378e39508034080d36c3ff06ab293405e1f882988f86e5b873657f5001 SHA512 e2855e4908a476a5e93c0f3876bd85ae9b5d48357b2e822153e1d09a783d801c98637bb29ede406212c8e1e3d192b6ddbe5896a2a26700ac13e0eb90bef727c6
 EBUILD benchmark-1.6.1.ebuild 905 BLAKE2B 131cdbc6ccf04ab0219ede935d260281184dc2ba2c6874ee1569da02fab8060c26d7de054c3ad348b19d147d04d6788180d0403531eb8283a4cb067d115aada8 SHA512 b5ace21709296e56663780195ee147e43e5cb71670a6877be6752ef6c03c94c843f83b979c2f97bd83f66e4b36b981f932c20333fd77ee871d7a7110123eda71
 MISC metadata.xml 563 BLAKE2B 2c825b6895d64a3e5e4ea6b61a707e03e14873bc5fbe9f67a756a56c8edd0dd04dd8f3aa1d1a80bf8b4921f25aad19320222b3607494ab512d3713152b1ce41e SHA512 09856cb99c18336b143b725f8acd7fce84d7cce2aea22f03f80934f6681161fcf667f084af236fd654051acf4a261c7e25026822ce3ab79d6fef0ea3212a601d
diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
deleted file mode 100644
index 3c1508d4ecd1..000000000000
--- a/dev-cpp/benchmark/benchmark-1.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-
-RESTRICT="!test? ( test )"
-
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
deleted file mode 100644
index 79dd281a1d6d..000000000000
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-
-RESTRICT="!test? ( test )"
-
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
-	"${FILESDIR}"/${PN}-1.6.0-disable_Werror.patch
-	"${FILESDIR}"/${PN}-1.6.0-versioned_docdir.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
deleted file mode 100644
index 98aa94904075..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -307,7 +307,7 @@
-   if (BENCHMARK_ENABLE_GTEST_TESTS AND
-       NOT (TARGET gtest AND TARGET gtest_main AND
-            TARGET gmock AND TARGET gmock_main))
--    include(GoogleTest)
-+    find_package(GTest 1.11 REQUIRED)
-   endif()
-   add_subdirectory(test)
- endif()
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
deleted file mode 100644
index 8a3de98008ea..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,9 +160,6 @@
-   add_cxx_compiler_flag(-Wall)
-   add_cxx_compiler_flag(-Wextra)
-   add_cxx_compiler_flag(-Wshadow)
--  add_cxx_compiler_flag(-Werror RELEASE)
--  add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
--  add_cxx_compiler_flag(-Werror MINSIZEREL)
-   if (NOT BENCHMARK_ENABLE_TESTING)
-     # Disable warning when compiling tests as gtest does not use 'override'.
-     add_cxx_compiler_flag(-Wsuggest-override)
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
deleted file mode 100644
index 156e8b0c2a67..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -120,5 +120,5 @@
- 
-   install(
-     DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
--    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
-+    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
- endif()
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 7df9f5b45db6..2961bfad8f98 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.14.3.ebuild 1032 BLAKE2B 3c73be20cf646e8532abfb8312e028a5ba9757e327b04d80d2235bdb8df97f5346493b2cf9740275a753c164a478a8ce491b6f9a357339aa974811338cbe2c1c SHA512 16cdcbc0186dd32edd347e026348d16a816cc13ed7009faa37bcd96099a6c45d7b6adb3d6022f316b6b31e14ad8fecd1b1b8f985c92a8b3171efd2c221d29903
 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.14.3.ebuild b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
index 19bb074bda69..a3f3af9b4280 100644
--- a/dev-cpp/cairomm/cairomm-1.14.3.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.3.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="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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 fdf2d0814f2c..94524da6e4ff 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,10 +1,9 @@
 AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22b3c297ffcf6c6cc5ce4ef21310cdc030587cb2d26841040ae73a15bca0c86be1813de49667904648baf89df34779fb6e97b18e19 SHA512 bc524945b7570fad29482bafdc0f7d35a180dc3a000a5e2cdc14c5fbc54684cabfa0448d53418c122a99fca6955fda5afbac25c46fc1e7c6aa16f4ad687bac76
+AUX catch-2.13.8-musl-tests.patch 854 BLAKE2B c593febfdd8d18912a0ceac2d63c3af21ed917df0b8ba416fe6d40adee5c2f5472c282e5c325fbd98ece23b27ef6b1975bfc4855808c8e7df86ee08c06a79845 SHA512 7a54bc2c06204203da6277866f793adcf14edcff915a12f3ad75b0b5d919dc06bcc5798188d3b002a0a872e2d8589178123c9960a25d0ff42b7be227be52fddf
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
-DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
 EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
-EBUILD catch-2.13.7.ebuild 917 BLAKE2B 0d76845c51cfab5f90c87c07938f6e1001713b6cf9e043c8840ae2af7c141e402d22719b174fee2163dca1951feb99f10bbc8b5fb26aad9a25f1b4f9ff564f05 SHA512 e084a3882f717ea9c6bf3b6062182e257f191dccb30b3d37bef66bc8574bf63e6cce0014fe6b7d508411aa429c879d8aec66052d31afa446c4b3feccef7a0bed
-EBUILD catch-2.13.8.ebuild 917 BLAKE2B 0d76845c51cfab5f90c87c07938f6e1001713b6cf9e043c8840ae2af7c141e402d22719b174fee2163dca1951feb99f10bbc8b5fb26aad9a25f1b4f9ff564f05 SHA512 e084a3882f717ea9c6bf3b6062182e257f191dccb30b3d37bef66bc8574bf63e6cce0014fe6b7d508411aa429c879d8aec66052d31afa446c4b3feccef7a0bed
+EBUILD catch-2.13.8.ebuild 966 BLAKE2B cd760e459aacbb982d7e540a74140006d4a64c0a8679c7010e02bf7e53784ce2d5826685a202d2e6be4b23fe4267e563df3908aec4cf2931f41c2c318f6e7c05 SHA512 49bf3e035b7cb254795701b58c5b3fac004f7065b563c273d5c26ce8213b5767b742ec3cb89a2e77b22eb7c0ac4cd871285a2c74d1dd9d4327b1f88a724f3450
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-2.13.7.ebuild b/dev-cpp/catch/catch-2.13.7.ebuild
deleted file mode 100644
index a57a9d4e9d0f..000000000000
--- a/dev-cpp/catch/catch-2.13.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-else
-	MY_P=${PN^}2-${PV}
-	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCATCH_ENABLE_WERROR=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	use test &&
-		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/catch/catch-2.13.8.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
index a57a9d4e9d0f..9711bc919ca8 100644
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@@ -28,6 +28,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}-musl-tests.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
new file mode 100644
index 000000000000..86c60c15f34d
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
@@ -0,0 +1,24 @@
+From 3e88ccff3ba573fb6d1ab746596411eebe310a6b Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Thu, 31 Dec 2020 16:24:16 +0100
+Subject: [PATCH] Do not match exact amount of spaces for errno macro expansion
+ in approvalTests.py
+
+E.g. musl libc expands errno() to __errno_location() without a space between, glibc has 1 space.
+---
+ scripts/approvalTests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
+index f8b9425c7c..73e9b83239 100755
+--- a/scripts/approvalTests.py
++++ b/scripts/approvalTests.py
+@@ -44,7 +44,7 @@
+ 
+ # errno macro expands into various names depending on platform, so we need to fix them up as well
+ errnoParser = re.compile(r'''
+-    \(\*__errno_location\ \(\)\)
++    \(\*__errno_location\s*\(\)\)
+     |
+     \(\*__error\(\)\)
+     |
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index c62bab80c7a4..edba7835cb58 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -4,5 +4,5 @@ AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e4
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1537 BLAKE2B 58ec47185232e9128ccbc0c10101986265bf259ba1f6a933827a213ee876bbffbbb7ff13ba5960210ec2a9c3251df9d06b1e0541ae12c1b0cf79228d5d8c9fa8 SHA512 58c5614b945e1b92a5078761a42745c16801ca7b7417065d79fa30f593cbb6b05a25fa104f33eea83ec56c73d87e389591adcaf1d1537715e2638f6bcc6bfe11
+EBUILD clucene-2.3.3.4-r6.ebuild 1528 BLAKE2B e3985a992717b6bbaad60be1330e1f07f8fa68ae6fbaf843fb22bcdf16ea58323d85ba10d071efd2aeeaa1168a009a40cf43ab3d8863be3b593abfa359646d00 SHA512 8efdac83d376d6938d7da37f86c3ef93233c9dc72c431cc5c54b832ccc31a42129e261a5428be1e69b21a5f713a7f6d1827599bb79b1d51531926893de13197c
 MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 89e1b97f6728..6ee79676be5a 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.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
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN}"-core
 MY_P="${MY_PN}"-"${PV}"
 
-inherit cmake multilib
+inherit cmake
 
 DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
 HOMEPAGE="http://clucene.sourceforge.net/"
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index f465ef44a959..8bc654e070cb 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -2,7 +2,7 @@ AUX doctest-2.4.6-remove-unused-bla2.patch 665 BLAKE2B 2c91d9905421944f5c2d1fd5e
 DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
 DIST doctest-2.4.7.tar.gz 2281756 BLAKE2B 9e10a30ca20ab08c4b5e7bc65e6d89e7fde45da7e6ff8ecbf9e848c7c61a7864bc4fbb49b0b1d2d6eeab16da2b4a2d935d06a593dab9be1fdb400e8ab641af7e SHA512 bb2d410397700aa7be1161fcf26949524d4f7c333bb9ffe7d223dfd14e770d6eeff75336f27fe0c8051dcb6c403c6b3af506872f6ba207d2d86cc9e9d1d2bfbf
 DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
-EBUILD doctest-2.4.6.ebuild 598 BLAKE2B 47fbdfc6f79b4db6d4f7279c719e57b4d5fc058f189c7e1c9e92f93ef9eaa17a79d218b245f384b6ce29f81a3a4776c4d685fbcc484e1e3194c6338758bb47e8 SHA512 8815679b1100e26d8e5bf4dc56bd192a47940278657518e206b7fdcb94eb1a4f43b0082a7d1316bcb25ffd65f8151a16a567b4d0f988536f5b5488a629ecfbee
+EBUILD doctest-2.4.6.ebuild 602 BLAKE2B 901726397e929185369fce55da53dfd2b2abb58ee00ceab766cddd8e9b907813f24f50d1355f43db29a618364b136ed47cb6b279a99b0d507ee8e068cc8c5145 SHA512 518556cd10a57ff0bba1def28183045ef03d4f755462c9448e41a446b47085458695f5e5a9faacd203e49dc7c6d9814e2fdeea70149364bf94ddd88db2cf72fe
 EBUILD doctest-2.4.7.ebuild 543 BLAKE2B cf7173e37f68eee74297a15d35eba3d5a096d2bf230df8de4965f8c18b56575828feb7e1e991f57247b3ee235460732c7e0858bf39bb5046325c1ab48d99aa48 SHA512 0a9885b2bd2795fb8a48107f56a11f1d45304ad175204f7caee4675e2879e6a4279bcd98098adb0d7de7051caf966d2aa85140c00f4777632d14fada56babc28
 EBUILD doctest-2.4.8.ebuild 544 BLAKE2B f6315f245067139c3f11d95a4fcc426cb40fa7b938442d6518d65a293dab19d056ac23c8009181bf5aaf4757dd9c6065e38f896527c7f663d2b2e31bf80159bf SHA512 5f6467ce06518c8e20d6451569f4df412afc9e30198f43fff446a0d5395b881aa57465d802cf3a5970fba042db33534386faf91f279d70dfcf8c53a656ee64c8
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild
index dfa43f1f2015..c8d01f2279f3 100644
--- a/dev-cpp/doctest/doctest-2.4.6.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctest/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 387c699725d3..8defaecc0ae7 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -2,5 +2,5 @@ AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c
 AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f6b6a58388d6d9cb9b4b925f68311443f79cb3f94c8c50adc14f2165530c43b735abc4aa21340868d9330c1e9b4fa SHA512 ad8d10c90136188ffda547b8d8781e9d26bc43d1dba7e9c3ff12f8a73725d1b331dd47bccdd331f998a0b03251eb2e3373a8cb39284f82c4bc63a5a703f21a46
 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.4.0-r1.ebuild 2551 BLAKE2B c0ae5d0bfd726dd41802cdc3779f3764c1b0bb20ab26bcc01ab702ece9a576d10076cfd2ca8478c4c8775c4e502fc03bcf7926ba30f88f57f107ffd1ec22b14b SHA512 60cc64c87f5b098765ad70447ba8d331031986cae5d5697d670270cbf05607b05bc17a88eaa13f3b4566a97492e117e3fa0481b6daa7292b80c0dbb6c5d99842
+EBUILD eigen-3.4.0-r1.ebuild 2558 BLAKE2B 4d115bbe1ef1377c0b7fe3667d5b5de0c2daf414b2eddf967c1151253c7b73e4c519f55f2a71c0e20ee0ccc56c4814167563d36d58a356ef3a50e2c7adcdfa7b SHA512 970d6bc2765d4b6655bb94c79044812be2e775017db9c78482e4f6155dd8a2788dd2739736d1ac7b7902e90a4d122703d5bdb82a332186cb1fe8508c8bf9ac5b
 MISC metadata.xml 887 BLAKE2B f6d225ff8a5b80f64b8e326962953b412526a0706c5dd7d9724d813a0e903d4d689f6a03249d33f1302c7575688e3246987bce6438163bb3130e7fee020cf9ed SHA512 a779ec093ee5008f881c07d3c3c9ea730a3393f8f9b6f1dde036b215ce30a006317d5f765df66f424491269179980cf3433061f693d902f5ac2e3341b4166ac8
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index 173ae17f83f3..6703c424542b 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.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
@@ -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="~alpha 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
diff --git a/dev-cpp/elfio/Manifest b/dev-cpp/elfio/Manifest
index 74158e77c88e..714fda278c62 100644
--- a/dev-cpp/elfio/Manifest
+++ b/dev-cpp/elfio/Manifest
@@ -1,3 +1,5 @@
+DIST elfio-3.10.tar.gz 4243841 BLAKE2B a4cd5e7cb8b2f13cd7341adacb623b996e07e8ac761cd0f1e8eb20a87770fa936bf97ad79a0ff8d700ac41278bae7c5dd00d277f4c2d47e73340aaf607b7ee49 SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9
 DIST elfio-3.9.tar.gz 4265086 BLAKE2B 3f2f40930ad82b9bd4f53f14c117e71e5c8ba39f0952555c51f196ca03b187702347c80db30ecf6ad9d19bc4edfae18d1b3f04d4cd09e2b85f9bba9736e0a78a SHA512 479c4132ac3575940bd1e8190ba5253e54ae57f38319d7bca75ea85ee2f744f5d5b460d2d4ceb17eca0d0561c6e281673f050bbdab2f5ff526c031c220876bf1
+EBUILD elfio-3.10.ebuild 570 BLAKE2B 211ec77a13d0d94845564a2a9124300aaaf707c8e42d7d7cf3fb22c2d7147e4f9275acc53d54e24e32fc9bff35fe6aa026770ddb7ddd021b66d10bad7464e3d2 SHA512 05ac2316053f66abd5f2bafbd45ef74a4a2efab094c59b99636b94f2d2f9f4981ae2139c75231a2907e2dde70a4e23b7d83cf29d893c6f0fadbc4ab018af8ce4
 EBUILD elfio-3.9.ebuild 570 BLAKE2B 556224ef72b205a7dd76477c72a907edd4756f5398770d77e40071caee21a4043866d28d023153a8a5f27bd74172b28c47ae032f54937fc678ce319880fff843 SHA512 34e82cfb62d20126a412f7539330d63c9ed3c1247256cf9bc15758e6d24304d7cb539ae2c371bbc30babdb7858fe6c117a10d1c0c5ab7115da48e02cff5b2414
 MISC metadata.xml 317 BLAKE2B 4b62079a213f05ca0fce72e62582010a9c82e11e714347c6753a1919bb8586896cef8afa5c378ffb00a5427aea6219fe7d78cc3572e214c3b2e8b09507ca685d SHA512 d550d765b42e68da41164297145ed8534b6bfb8f7976e6df57f76fb0fc8558262f010d988b66ea368d45e7c4bbbc879f6b91abba21c3f14871605e39589e5047
diff --git a/dev-cpp/elfio/elfio-3.10.ebuild b/dev-cpp/elfio/elfio-3.10.ebuild
new file mode 100644
index 000000000000..18f8232d6cfc
--- /dev/null
+++ b/dev-cpp/elfio/elfio-3.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="ELF reader/producer header-only C++ library"
+HOMEPAGE="https://github.com/serge1/ELFIO"
+SRC_URI="https://github.com/serge1/${PN}/archive/Release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN^^}-Release_${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DELFIO_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
new file mode 100644
index 000000000000..bfcd473b553a
--- /dev/null
+++ b/dev-cpp/folly/Manifest
@@ -0,0 +1,7 @@
+DIST folly-2022.02.28.00.tar.gz 3600258 BLAKE2B 5943b0e4b6178c8293714f673ed289daed26b1dad22dcb52dc80475f385961cf0a690accc44139f245f2df5cf10c0bdb5638c8bed52cb97fefd3ad6d8dc147b8 SHA512 91ee21e463ffc6eee3b0e5e0244721a9612337b9afe92645556a154f521aec1070f4f381962247bb9bf11592efb5b8bb01f70d1a66acd3444967538062dfe826
+DIST folly-2022.03.07.00.tar.gz 3604306 BLAKE2B fe255678d6f827c82ada3e136742d07bd62dfb81c1250ca6bae9a4f3e1f015904032da8de1488342da1326fa520b448c63a59ef7e0139ecb0844a1ae19c1dfed SHA512 e63eff137711ca71b5a78469e4feff1b4e7b65465413eefb91b7c0cb26b94e1d581a305a9df9937ce05bcd8af3dc465adb816ad95538689811d8ab5b5b9f269f
+DIST folly-2022.03.14.00.tar.gz 3605018 BLAKE2B 11a58e3c23c1e1299c16821e552d500f8215d2fb2fbdee3699b8487e1073196dfc322461e7670d3968c703d84b0b526d2479bcb74005b763f195ce48f04a419d SHA512 0b3710862360788eb55dc40703e3862f57819acf217287f13ce125b56692c4e5b1de12289f02520ecca9007fa872a69e8936df0ec9260adf974a88286489a9b1
+EBUILD folly-2022.02.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.03.07.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.03.14.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.02.28.00.ebuild b/dev-cpp/folly/folly-2022.02.28.00.ebuild
new file mode 100644
index 000000000000..b644181fecc6
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.02.28.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog[gflags]
+	dev-libs/boost:=[context,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/folly-2022.03.07.00.ebuild b/dev-cpp/folly/folly-2022.03.07.00.ebuild
new file mode 100644
index 000000000000..b644181fecc6
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.03.07.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog[gflags]
+	dev-libs/boost:=[context,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/folly-2022.03.14.00.ebuild b/dev-cpp/folly/folly-2022.03.14.00.ebuild
new file mode 100644
index 000000000000..b644181fecc6
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.03.14.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog[gflags]
+	dev-libs/boost:=[context,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/metadata.xml b/dev-cpp/folly/metadata.xml
new file mode 100644
index 000000000000..a512b80f6fcb
--- /dev/null
+++ b/dev-cpp/folly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/folly</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index d185cf3e0eb6..8a607c9a9b15 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,7 +1,5 @@
 DIST glibmm-2.66.2.tar.xz 7603104 BLAKE2B 5696391bd5dbb35f8c961250af6d9b2644e900ac6a800054e9e7630cbf4882c17ef1bf8cf322e89a3bdbe613d13d4a045920bfc1071442daa3afc78afa8cd759 SHA512 097af6b140a5af3e52cc2c5d251475a5aa923d0c528c3cbc97f31d3a95868bcb3aa2328047ca94a55ef7fd188f271917dfe29faa86f477a441f0a024284216f9
-DIST glibmm-2.68.2.tar.xz 7844508 BLAKE2B 890f3a8f15580891df000acfe365989a6b09a63712b5f24f999a70e62983c725c9aef2b386b8995933c41b345164bb0b330b6cb0af182476f14657db8ba7d0cf SHA512 96b2970ac47e6a8de2d4352412f0107fbdcb61942d27f20a2f533f9704304e5f55c52829567457e7c925f830a69c739bf00676882741ed2969e52caf3e135c46
 DIST glibmm-2.70.0.tar.xz 7874312 BLAKE2B 5d0fb24444b8764e3f972f342a540164debb841f74e5d27db721feff9baa70c9ff5821b26642cb8c5da048f9a1271b1ed7283d9f0338ba0f184be396981310e3 SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518
 EBUILD glibmm-2.66.2.ebuild 1256 BLAKE2B e850bb1ec055ec7e830b4aceb303b8b8fedb24c1acd9de5bd5932fa8d61760fefcadea24b95c0a4a24c1f0d211b8921202060796d7e63c1b4075264fb9d6e6cb SHA512 ff78e19e8bb53abac62e36fdfda170a063d966f1a49af1aab43148cde9a304122b6e3be5b6b052fef3d518c312402e1b312fdedddd3dea6b13c5b2db92ca526b
-EBUILD glibmm-2.68.2.ebuild 1212 BLAKE2B 6ac56c1ae49905fd307dcc1a5f292d452da1a6972fc09492c9b1f841abd398fe49139c927e9b69c76e80d42fe6b8491b732feb8b6f74748ed35c9e0a3f84b459 SHA512 7d7dd0301bb7844998531499a4ebfa4a74b83a643ad7ca3a4ed0df511bcffafcf2194e0f43594af136282610bb501b5392a254f2764891e5956308a30bed9272
-EBUILD glibmm-2.70.0.ebuild 1213 BLAKE2B d56412fa2387ecb92ad006039beee1a7bb059d872387fdd825d248f68ef69645aa987eca6bf1b7129fa90ea6642ba7441d8edbc2bc72aa0ff3dae7514d56ba5f SHA512 5373ffd0b2c98b61879da9473b693d6fe940841b82c0be01392017fd575f4d76050dcf43fdecdddfb37006b3003dd2d852034c248ed7ab3fbcdccb49ce7a80d4
+EBUILD glibmm-2.70.0.ebuild 1212 BLAKE2B 58cd0a0cbb861d29153f8dfb1e28a15531cdf1fb1c75e46281d48a742f1a1c1bb051268a69f810d24b4f7fb2b71f40526b50407641ca387e033cc4fad6826042 SHA512 094d370ff18425a9cd353eac2193bab1722145a79a087d475487b3b158e6a715257435f7a8862dbe2489d3fc07a66b0ebd3bfdb936c989d0fa09301a6cd8159d
 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
deleted file mode 100644
index 4fd62005baba..000000000000
--- a/dev-cpp/glibmm/glibmm-2.68.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-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"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		$(meson_native_use_bool doc build-documentation)
-		$(meson_use debug debug-refcounting)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/glibmm/glibmm-2.70.0.ebuild b/dev-cpp/glibmm/glibmm-2.70.0.ebuild
index 8cf7ffdce6e5..fa089ef8ecd2 100644
--- a/dev-cpp/glibmm/glibmm-2.70.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.70.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
@@ -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/glog/Manifest b/dev-cpp/glog/Manifest
index f06903c83965..18a092792784 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -6,5 +6,5 @@ AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec0
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-EBUILD glog-0.5.0.ebuild 1429 BLAKE2B ba5188f937326fd28e1260c7a83703e4d3c3b154e1ec233a26903c94715dba9694f0091c11c2ad47b6fc06ba762a1dc9e7e151e0892092f7584dd2572a7fa213 SHA512 a71219128458c1f132b9e6e2d6d6f11869370d0f23fe457072360b83b4d38d67fd4c696f86ac3567495a88c8ce9ffe78201b4c969365717c7de1b7d4b28cc541
+EBUILD glog-0.5.0.ebuild 1434 BLAKE2B 41a5f681a1b2d94c4122bcce5306fc999f40161a159e68ad78fab56b9bcb5d88caa6f309224f095cd540f00aa191b6fa1379b5e888ab62cb113160c578c5a23c SHA512 630a5b158fe228f22f4025594ca9b9741ca1abe11ddfcd65280111e60e46b19e8558d59e17bf63c7979af1b50c48259f679bf2d60782717ae5b42522c181e6ce
 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 0c9b38f9a7c0..fe2ba7a63245 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 12f3a9993f35..708fe5a96fd9 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -4,4 +4,4 @@ DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571
 EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
 EBUILD gtest-1.11.0.ebuild 1890 BLAKE2B 7d27c3ca1d3cfcbdcdc5d8730d48c6f1a75e1a8de89ebaeb93d6a14e70aea59c11641fa8f7e4f6eb039b7bdf23bb8080cd9ab2a0ffde4f61fb64ef57fe937103 SHA512 84a857c4a5d1e4eee302e2fe055740ee57474136a9a7d003417d214117ce8803b0229b73691e17703f8c62871f11e74b1d9af6c9127de5400ec370993a6ca5e2
 EBUILD gtest-9999.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
-MISC metadata.xml 566 BLAKE2B 9500d2b76c2ab413e2113a67dc071ef02e3520e2db4996c04205f0d97ac3cc1b2a5f412da27460e9446920765a76507b85aed5d6f2c01a3399ffe095549a4c44 SHA512 abe19d395e258cdb2dca0510cb8d2b4acbc0ea907493672442c1343d9b68a748c244c2ac10044a4e1c659c5bd1e89159fad8ba267fd1d0643447f5d2691aa92a
+MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index c870874aadca..2a73b6d6508d 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<doc lang="en">https://github.com/google/googletest/tree/master/googletest/docs</doc>
+		<doc lang="en">https://github.com/google/googletest/tree/HEAD/docs</doc>
 		<remote-id type="github">google/googletest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 7ab1acf54969..8b11d8d68eaa 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,9 +1,7 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
-DIST gtkmm-4.2.0.tar.xz 13850496 BLAKE2B 0e39824085fde11ebe3ecd65e3fbdb1778f307292a51b98955f4fa1418e7d1a349838126093b0a2b6d628b66d39bffffba76f66d2928999f777a4abb7961dc77 SHA512 c4532c427da0a37e4f8ba6f0e6d3975c3f84db461bc08263a4a81e6ee9e750112a2b4b0c5000ba22f8fd4fc5f833ef320f2c1f56580157f7ae41667ff15ccc72
-DIST gtkmm-4.4.0.tar.xz 13829052 BLAKE2B 1572f4fcbd15526b980a511b10eb0663964ea1fdc5b5f728399415bf053f913646c4c5fc7bf6f93feae9749693260e2d09fd04ed93a7150993f36ac17645d7be SHA512 d6f20213e9ea7a13e2b9822f220a5cdeaef9a9406abee813e0eebdb540839f25f4c19cc7669c24184bef471f5529a7897cd16ee679266148f3181dd2cfa39eb4
+DIST gtkmm-4.6.0.tar.xz 13910344 BLAKE2B fd46c2e0fbda32daf472cae00591ab2cff6027dc0dfeee627ab1e3ac8d44066e702781ba452926dd808b30de260f9f6700242b0d80abd91b2b3ee5faef6eee17 SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.5.ebuild 1373 BLAKE2B ba7b1f30eac84a57a4eefdfc2c14559d3917b4dfeb195e1e8ff081abeb64fef9435c7c875f5de81655ee52f8ba604820b9502a742e5364be200b7bc47062ad0c SHA512 80dfc41a6ac56fd6f465a5d98d4cf9f1672fc77cff68148b068e86bdf78907dc06eb9a17399318ef33fd9aa832a9b97ca48e13bc6307475978d60a439271ebb8
-EBUILD gtkmm-4.2.0.ebuild 991 BLAKE2B 8de35a8d4fec1676826cc47d8ffd259ff7535c5553a0673b47c24b472804d5a4dd47162cd79f8c2ad49a4bb9c0d75616bbe99b88497639b15b485575445c780f SHA512 1c997384cbd0187290f86e0f8b0a54d59e296179abdd4639642eef3824159a1bdb8eea266280fed8be1c3b445b3ed62b1c0dbcecf0e3cb7e1569c352de5b9dc1
-EBUILD gtkmm-4.4.0.ebuild 992 BLAKE2B 7d1f682ac39ffe461995a543f23634ccc6c13758b21af460c0671587ac0d6f6696784ef07ffb3bb9caf4e0d63d931cbf4e6c43a91508504d2b91f41601d1f774 SHA512 1b37b4053b12a79e4cac90f2c32020f2e47fc22deec360f54eacc5afd0c11e7bfe8a440be4c6e0fe61a398175770ac50a956c5d94ded4bd5d791138c4335b034
+EBUILD gtkmm-3.24.5.ebuild 1372 BLAKE2B fad17eb7a7aa67b1fdba65d42558bc5facef1a28b036635bcb2ec2813114ce259f3200d9b6aa06f0fc78353b1abbd8ed0fe9bee2668786b90b06e3e818d9db49 SHA512 8b8d26eb6b3d15c159ba466ee12cf28dff55d5c95622c31647b8a85cf65c4caf820a8e135019fc97cce7ef2ba10710b8ebdc0450568e8bc3f54299549a3df89c
+EBUILD gtkmm-4.6.0.ebuild 991 BLAKE2B 7299f8bfdc1dcc8e9ddc75d251540368555f09c9c32112dee19d4f0c4151b9f655cde42b8bee58748225743369d58754252cb96b1041c3801d9a6fab684f0027 SHA512 516c52e0839d3ca3349358f32b167ee5e6bc9dd8cf59da58e42f6eaa1a542b6a5e75c2f3d649dd99e29717d0a1b2327995d7a682905e1d1c6339fc91242ae3bf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
index f386d00d4178..16031f43abfc 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.5.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="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.4.0.ebuild
deleted file mode 100644
index f3e7943a72bb..000000000000
--- a/dev-cpp/gtkmm/gtkmm-4.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?]
-	>=gui-libs/gtk-4.4.0:4
-	>=dev-cpp/cairomm-1.15.4:1.16[doc?]
-	>=dev-cpp/pangomm-2.48.0:2.48[doc?]
-	>=x11-libs/gdk-pixbuf-2.35.5:2
-	>=media-libs/libepoxy-1.2
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-libs/libsigc++:3 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuild-demos=false
-		$(meson_use doc build-documentation)
-		$(meson_use test build-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.0.ebuild
index 3d04a8cafe5c..7b8a615f09a0 100644
--- a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.6.0.ebuild
@@ -18,9 +18,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.68.0:2.68[doc?]
-	>=gui-libs/gtk-4.2.0:4
+	>=gui-libs/gtk-4.6.0:4
 	>=dev-cpp/cairomm-1.15.4:1.16[doc?]
-	>=dev-cpp/pangomm-2.48.0:2.48[doc?]
+	>=dev-cpp/pangomm-2.50.0:2.48[doc?]
 	>=x11-libs/gdk-pixbuf-2.35.5:2
 	>=media-libs/libepoxy-1.2
 "
diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index 1b850c2efc0f..969dd05865cd 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -1,3 +1,3 @@
 DIST gtksourceviewmm-3.18.0.tar.xz 1079780 BLAKE2B 973f06a3baed8d5ab541b2f179f773391fe562cab2fceffd0366748acafc4bfc1d4717d969bdd5a5716f892ff497b89338f8b3cd085aebb9c033a40b29d3c0b4 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c
-EBUILD gtksourceviewmm-3.18.0-r1.ebuild 660 BLAKE2B 176bc3af22e4143a622792e79c5749f9ece54493fcf7ca19634935ea8f9d5f8bab8e51de64895c6896ee61e02a00d02e74105ffb5079e885676c91e34220ddc5 SHA512 6cb7550b1ce300268b9b61a03b252fb4a72aff4cb632627eb38b845cb0e36163ea29065a5f5126db617dfbb9e00ce2ee6128e00e9d60ae6650e00efac9b7cfaa
+EBUILD gtksourceviewmm-3.18.0-r2.ebuild 613 BLAKE2B d232c1f3241ba542c4f32ffb4cf41bf357eea8406a52d4cf9ea090bacb880d5d737c92bafbb0d9f774f11fcf21b29429733d83ad659ed0f79a221cddb7601d8d SHA512 2e6f691ae7c33d1b56c267f66bdd2eaf8839cb2c46cde28ee93fe97e6d47a2f05f0e473c4f5a2c984a51dd86fb2d48ca955fd37fbcd5d593763a72baf4415855
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild
index a44c29f5fc79..25437c7d3f99 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
 
 inherit gnome2
 
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
+LICENSE="LGPL-2.1"
+SLOT="3.0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
-SLOT="3.0"
-LICENSE="LGPL-2.1"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46.1:2
@@ -23,12 +22,12 @@ RDEPEND="
 	dev-cpp/cairomm:0
 	dev-cpp/pangomm:1.4
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
 	gnome2_src_configure $(use_enable doc documentation)
 }
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index fc3801c74fe5..67a02ee15cff 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,5 +1,3 @@
-DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
 DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
-EBUILD kokkos-3.0.00-r1.ebuild 1025 BLAKE2B 6de741ddaeedfe6d99e698b3c28c34c1bfba1e77f0cfe500f18f230c61c9931322348c5f70fc775d87f9643d12349e0da9374b61295ced1018a63fa433dd2981 SHA512 726aa350482c3688df355e65bf229c8949336b0308efbc76242c07fa71bd3e95548a8f9226c2d1c9d531ad18cf34aa5865f98087686dd86abd988a83914cbb09
-EBUILD kokkos-3.1.01-r1.ebuild 1250 BLAKE2B 314cb23bddde827d9844f032a6064db954c23b620b8c16ce107e6a1c1833a85cf20e9a516baddb09b1ccfe0749320d93b081b27a87b7cad664d777ac5f6d8add SHA512 67b6734d5a815da0fb4be6ea94d36d424f0b6bcbcf81ff2ad757918f4b693e51981b6f3ae54e5bb25ec4f5062ab79631f42fd0c4625a9dd8e0f7a2e7b9b3b211
+EBUILD kokkos-3.1.01-r1.ebuild 1180 BLAKE2B 4892615435bcd64adc21e5f8795782d1b1b980f35cafbbc1437028775ab17e8a4f34fa903f4ff600b62c9320ecf351ea7aa793a73b2969631993bbb2e60ea5d6 SHA512 e8bac82af04075d1a7ebcac60f8124d51b9343041ad022dc71d999c6310acf1936726d8f6b0e14de364a0bd16d839e7628d5278e92d73ec92d7d18422cf00a87
 MISC metadata.xml 254 BLAKE2B a78564cb4b2bc87f6bba710cf53a3cb19dbd43363361b936e2041b564a2840172c4bbf1e42a5fb1aff7adb5a4843c36cb4e53a75989137343cfea0655add5a19 SHA512 83ce2926ad7bdadbf376ce803de60225491e26c23739394f46787d443648f747b84c962193b85230d22e936534c0d5d2ca7a759f33a1fb22c2d0ceeb0ea1f2ab
diff --git a/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild b/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild
deleted file mode 100644
index 3f10ae6936c0..000000000000
--- a/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -x86"
-IUSE="+openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-apps/hwloc:=
-	"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
-		-DKokkos_ENABLE_TESTS=$(usex test)
-		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
-		-DKokkos_ENABLE_DEPRECATED_CODE=ON
-		-DKokkos_ENABLE_SERIAL=ON
-		-DKokkos_ENABLE_HWLOC=ON
-		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
-		-DKokkos_ENABLE_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild b/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
index 52828debf318..bc59929572fe 100644
--- a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
+++ b/dev-cpp/kokkos/kokkos-3.1.01-r1.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
@@ -17,13 +17,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="sys-apps/hwloc:="
 RDEPEND="${DEPEND}"
-BDEPEND=""
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/dev-cpp/libgnomecanvasmm/Manifest b/dev-cpp/libgnomecanvasmm/Manifest
index 9622b1c0d3ea..ee1ab0910e41 100644
--- a/dev-cpp/libgnomecanvasmm/Manifest
+++ b/dev-cpp/libgnomecanvasmm/Manifest
@@ -1,3 +1,4 @@
+AUX libgnomecanvasmm-2.26.0-disable-building-examples.patch 412 BLAKE2B e3b8e817a89d0991a0fc9db5ed3c0e478362a36afca566d59e36310f2cdd5822c099183d0260b6c125d483cd10284f504b5c14ee467e553ebfa9dc288198a834 SHA512 562aeefa89bf0028dc42cabe07a7ffcc6cdeacb72bb7cd550e868dbd2936b7912834c60458ead4936a90881c2129df6344d7b80b44559d2cda71cfd528342ba8
 DIST libgnomecanvasmm-2.26.0.tar.bz2 327215 BLAKE2B 87cfc59d0825ad2b345bbeff7ba6ce74744228a359d61c8c6b86cef308827c78410b4633737ab9040f6dbdf7f37ed0ea376d28ab4194266f9c784b8b07d1f76d SHA512 23795c856674b79f82d2e5cffdfdbf67a387fe6a21081fef1d96d0f614a121710c7f1e175612a286f5946a60cea4e8506aef7833a7bdf73084d6266c09aad66b
-EBUILD libgnomecanvasmm-2.26.0-r1.ebuild 1026 BLAKE2B 6f13cb2f7474989ee9a7cbf1c94cdaf8d3fcac23ded3ae2d8a3a02da8c4f6e1d7249d268065dafe48524549d25454e18b4f32544b1c3fa677fdc6aa505f8b0dd SHA512 0c62e7d3ac6b791ec6082db0d8b179f06f1b1603fa5726ddc8e12d02b7badcdfcaf879935cdad74d136bf609c7d18fbf44243e710c13b4e9a6e5e7023a1ec7a1
+EBUILD libgnomecanvasmm-2.26.0-r2.ebuild 829 BLAKE2B 3afed8d013369055d9e813f066b2b953d706f444ea368857986922add47514101ca29282b8082f843f8fa849d5e7292da04b5dd73e34d5743cfb5476f9519a59 SHA512 acc53f7f6bf047525cc6ef1cbe545503af87266ad47ed83da6c41b77518a2a982a637a504e0660f7cd5bcb9cbe1a8879f0584a1ed3af53b8633a2526cd87d441
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
new file mode 100644
index 000000000000..e750a355967f
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
@@ -0,0 +1,13 @@
+don't waste time building the examples
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -195,7 +195,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tools libgnomecanvas docs examples demos
++SUBDIRS = tools libgnomecanvas docs demos
+ DIST_SUBDIRS = $(SUBDIRS) scripts 
+ EXTRA_DIST = libgnomecanvasmm.spec.in \
+ 		  build_shared/Makefile_build.am_fragment \
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
deleted file mode 100644
index d18b3c0b1342..000000000000
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for libgnomecanvas"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=gnome-base/libgnomecanvas-2.6
-	>=dev-cpp/gtkmm-2.4:2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
-	gnome2_src_prepare
-	append-cxxflags -std=c++11 #568300
-}
-
-src_compile() {
-	gnome2_src_compile
-
-	if use doc; then
-		cd "${S}/docs/reference"
-		emake all
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/*
-	fi
-
-	if use examples; then
-		cp -R examples "${D}/usr/share/doc/${PF}"
-	fi
-}
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
new file mode 100644
index 000000000000..d403ca365935
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="C++ bindings for libgnomecanvas"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+RDEPEND="
+	>=gnome-base/libgnomecanvas-2.6
+	>=dev-cpp/gtkmm-2.4:2.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-disable-building-examples.patch )
+
+src_compile() {
+	gnome2_src_compile
+
+	if use doc; then
+		emake -C docs/reference all
+		HTML_DOCS=( docs/reference/html/. )
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm examples/Makefile* examples/*/Makefile* || die
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 06e5e2fefb6e..a409174f4165 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST libjson-rpc-cpp-1.3.0.tar.gz 182354 BLAKE2B 512392c37e61833a98c1f682bdbb3ed0e3c72ff56f17407d49e5a0f134795daf5ff4c2702dd5222bfc8962b2c9a56c0c7856cc8fe1b923ea68c369a24d334b5c SHA512 4eb53c7b77845a0e845e42413c491dcfa1d6f72411276e8614dae6612edde8905013588465437ea39c5cc5700c2d48df07d15c83222924fc24e015fb9f7a02ea
 DIST libjson-rpc-cpp-1.4.0.tar.gz 179478 BLAKE2B 1b5807665a5e055790a6ca3e977845ab6b8dc7fbcaf6baece170567cc4c5b16202b74cb72f47136a075352ee408dac26de85cf02e41873cbbb55aeac1145e1a6 SHA512 28774604fe91f0893fb36017f648556dced71cb731f0f76c95084af5dd35e167b69a0f5fdb64557ff273f7dc971bc6c469e4f32ada35d7cac18add18baf2f5ae
-EBUILD libjson-rpc-cpp-1.3.0.ebuild 1599 BLAKE2B 6522db61c865f0321e2a31ee328c71e83bdf82279392301e58a501130b5da84f6f0204d7893eed9ba80906dc6b90ef9e742e47c71cbacc2c8a390d66a1972dc5 SHA512 a24983c48e39fea8ecdc4bb0075f02b9be6adeb314e46a6ba7affa5915f73a8ec69b0d9823bc9679110c4b6a31670fb604586cf4b8f1f8255521b2e0f133c750
 EBUILD libjson-rpc-cpp-1.4.0.ebuild 1417 BLAKE2B 22e144ea5f9deb415a056a9c2d79851f56211fd7430ee967fe5296a4dcdc4f83d51b898c085b6fb802e52bbbce29cd573cce14e111ddd3addb9104bd74942347 SHA512 afca40e02a33282c2e40629f7add147ffcb2ac00d0dffc013e29e7e337aa8deed166c5d9864cc1aeba7099235dcafc40bef8f472f7a504ddd6510485ffab23e5
 MISC metadata.xml 907 BLAKE2B 169c4043abceb19542bb448f160ad6d6786d7f3c6717e449f46c6f0945d79fdc87751df2c2932e37f360b215bf31e3295d71944f03a48bfc1f6411bd6fec4c75 SHA512 ceb779b13b2688ff828ac28b92fb22603a9f102f7bdf0dbb4b9ccfc90dc895088e076f8ea6599a288023d151aa8153e5e49f00ccaece07a1ef6c26ad5e362a61
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
deleted file mode 100644
index 81b0d2bc5010..000000000000
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	http-client? ( net-misc/curl:= )
-	http-server? ( net-libs/libmicrohttpd:= )
-	redis-client? ( dev-libs/hiredis:= )
-	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch:0 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTP_CLIENT=$(usex http-client)
-		-DHTTP_SERVER=$(usex http-server)
-		-DREDIS_CLIENT=$(usex redis-client)
-		-DREDIS_SERVER=$(usex redis-server)
-		# they have no deps
-		-DTCP_SOCKET_CLIENT=ON
-		-DTCP_SOCKET_SERVER=ON
-		-DSERIAL_PORT_CLIENT=ON
-		-DSERIAL_PORT_SERVER=ON
-		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
-		-DUNIX_DOMAIN_SOCKET_SERVER=ON
-		# they are not installed
-		-DCOMPILE_EXAMPLES=OFF
-		-DCOMPILE_STUBGEN=$(usex stubgen)
-		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
-	# Tests fail randomly when run in parallel
-	local MAKEOPTS=-j1
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 4488aa19af82..ca98945d7d2e 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,3 +1,3 @@
-DIST mm-common-1.0.3.tar.xz 272932 BLAKE2B 90459cfa75dbcab8bb9b0512f3f3f3703850000e4ea0124afb020c476fce9948ec0128d67510b13482d52f165ba0b7a8aa72e6b1afd4a88554fa52bc4f5598d2 SHA512 fdd79e9a2ca3d7ed311a6994bd04e7cbf2b1562c39968d309765ce3b5268128f98b3f1c08a434b460276e6d911d302a12ccc7aebd6cd67e4df13241a97034a70
-EBUILD mm-common-1.0.3.ebuild 567 BLAKE2B d34816e233e5e97a8973c4e0ebeb1729680c83f6140986978f053db23f4fbe18ab00a5e1f125b3afe0591e59950a707e3c66f136a42856d053539d9e64a213f9 SHA512 f6a326056c275761c43a7f49b65ce2c5bdf897aae1f2e0a4d99d1d7230c675e1c2da7dbf504237d39187edf259ae89cb9f2e188a9a30c598c85136d0746c6c69
+DIST mm-common-1.0.4.tar.xz 290164 BLAKE2B 2731c501ed79d2481b9094639bad1971e5a27e6416a7433982481e939bd44202f7e5769f3a9dbe5b7fd2e09a3f7bd4687d7ce85d79dafa877f5cc3c333f9d526 SHA512 e686f19cb4d40a3dda68e30b98b43fca3db51b387e28f5569bef0cfbb1cc3a7d72503ec5dfa0f2621dd349ac4c9c21f0fe93bdda224026534c509fbb60400243
+EBUILD mm-common-1.0.4.ebuild 568 BLAKE2B 8b85d81b55cce113acfcbf055ddb0c7e1225377633c6992b29ba3421e2a4a71f0072305c06e6b1022bdc8a050f71bd18b40e3c0e24b64f2dd2cc92f5ec6cfee2 SHA512 87440ff1d7aa91e074c0a587775db16a5b8ceb39c7e37798011bf48ccdf6fe0e131ff2f6aef1c4a6f500ed54c93c44ee1c56d975022e0f6d421ce534f2afd3c2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/mm-common/mm-common-1.0.3.ebuild b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
index c313e2e311c1..7eb43d535b2e 100644
--- a/dev-cpp/mm-common/mm-common-1.0.3.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.4.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=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org python-any-r1 meson
 
 DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 88d6685377c7..d519926dad74 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,6 +1,8 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c57b5cceac5fb0c99574c00a0bc6d4bcd7f340eb0bb452485422562549a909f0e9c85a060df468386e7d74f1a575d8554cc485f SHA512 fb4e32901d9fa7e511ccb84043c6df9d4dfb26f973c32d5d92fd389c0b20dadf3b6a749ef5b23660093cd20b280c8ade924f8e7e5af41c3a5695a3ca94c9e3c7
 DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
+DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29
 EBUILD ms-gsl-3.1.0.ebuild 758 BLAKE2B df50b3032701baac02546d84da973b5a1aefa6f03ac1580949693c6e7db96b3b12a02f7c207a947f4c6661300842af661cebb084f0fb3ed3335094ba5980e6f5 SHA512 166b99b80ed80447f9b826a26dbfc0fb786add6c1381abe9bce349a7991cd6a0b25efb1b8fecdad24e8519a3d12ca8b40e0276b758699f3495026a33f8d3c5f9
-EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03
+EBUILD ms-gsl-4.0.0.ebuild 710 BLAKE2B 2e25f0985282009a375df2a78c2707e981855b22c2921fd897b73562a0045e58c0b2d2769ce17686c71542fbcb26ae9083cc69732c9def984a16052091a56b4b SHA512 55f59dad8bd6343a9fe4e02a8458477c5ab644a648ec3a47374d907118a635006da04e8e6e96ac107dd8d0d4fca515450dc9d897d16f6e830dedd026c6a30c86
+EBUILD ms-gsl-9999.ebuild 633 BLAKE2B 733c6f2ece34314ca2af2fd9f8521dfc52212e0cf90207e595d09ef66f213d7dd78fd5803615084040552a717893064375e4c4e28675464ca8c21dae78664fb5 SHA512 842ee3cdb24d17675b7033b5e0a8b75f99c736fb5449326d4c109d7ddbc8cadc8779880632bb7a1e1086e7db0a9ec6bb1d10dad9c499a178fb903cc635a3c801
 MISC metadata.xml 467 BLAKE2B f30f6175d21dfc95ece2a0352c2a5f67e50079ebe7b2c8be813edc18fe539d3005f1c42b1fcc41c386032893fe7270833136dabab0bcf1cc81b53b8987eb0292 SHA512 2fa2e9a4f9568587274bed47a29484d19f8695f1fea385eecda146f2141a43118419624b5dd71769f00967d7082bbc9a5276f7e0c1c2efda6c3d406c7371ca54
diff --git a/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild
new file mode 100644
index 000000000000..5163b667edb2
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
index d7f19d2bb295..79f60335475e 100644
--- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake git-r3
 
@@ -22,7 +22,6 @@ DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
-	"${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch"
 )
 
 src_configure() {
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 072ee696c744..363516ee2a15 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -7,6 +7,6 @@ DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612
 EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
-EBUILD nlohmann_json-3.10.5.ebuild 1707 BLAKE2B 9da7b49fd416886d6a394315f53bcd5eb770c551661f8d5555af920ddd181db794a10e038eb46e78225097d9be5ba5df38af6cd911aba17d356170823504b42a SHA512 bc597ffe28c6d8d1f7cb0c616d4679d4ac749e9f30a2c28950c7aa06871766d7c528801d43b31805c0534081398326e1ee7d199d47d7f451c0409c0d91938481
+EBUILD nlohmann_json-3.10.5.ebuild 1703 BLAKE2B 77bbdc5037eeb1c93ac89b08d46beb650a2686b0658acac15a6ae07bf0859c8e62332f85cb348c542bb7173282e5dcc198ec26691d600fad8e787d162d5c8cfb SHA512 218a275ca8c3dec9b69cf7517481a5886fdf514a141c101f79cdacd14e6f306f80306292a0732b63c99d0ea2c7929397296089b267a940191e0d7e23452b2c9a
 EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 8bc260638ed9..64ba3b9af5c7 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 # Need to report failing tests upstream
 # Tests only just added, large test suite, majority pass
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 61f18354575a..2c10cd44ecfd 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-3.0.0.tar.gz 10101772 BLAKE2B 9caa1421d0c499548151ed6d673d6ba6435bdd5608ead3f029b724dc7b3cb9dd5f64204ec32fa38ff17744d9f4691aba083579c983bd9c8fa6afeb10ce5c9c0d SHA512 0bc2a5256feb73a047b7d9c9fb69809aeee41c21a564f7c4be1cd3c0ab6fe68b3db2c5959f678748a2340203e8822459c370b674a3ef6867c17b4b63956f5d25
-DIST notcurses-doc-3.0.0.tar.gz 141494 BLAKE2B 7c4e464672239065432b0381c67b79540a9bddf304be90b9140ed360193b7face0aabf5086a877cdc5ef12aca69a76dc30702a65d703a28b2a61d5876752a0c8 SHA512 ab4ddac027963c5c9203f48a4a51bdcecaca28cef3158c7cc505f48eb89eee9b7f3399f0fa1919ee8959b69139a051c860c72b5feef9e417750fb3141f521ab6
-EBUILD notcurses-3.0.0.ebuild 1194 BLAKE2B 0f1c8b0055168e7dbbb02ac725dc08ca712d78b1a1cc404aeafa47df7134738929d62002a07f0a74c03c6f09ebeea89c43e394841c2d79de332010aa27de1583 SHA512 64c705cee8bc09bc858d52fd8dfa4b048c40c0fb3394b8652b4dd68567148b3a88e07e0d6317f9243b97ae8cbe8b6fe90109b877bfcb44fdc8dc0dab5fa55fad
+DIST notcurses-3.0.5.tar.gz 10135637 BLAKE2B a0ce682dca69de15eb17b153a96e7159ae2ff00f36694dbd72caa6fe0938bf52a5a1e1319ca8f3f011c56fb51fcb23e1b029b6b3307153f8c8768a58fd150aa8 SHA512 81aef639afc78225c4eb81f5576b773a5714476f09062f5ff290c10d4ab6ad3d67646c836556a0404f638684bfc3774897f75408033f447a6a14529c5f9f04b6
+DIST notcurses-doc-3.0.5.tar.gz 148376 BLAKE2B d899a21e40b5c39ee455326c607301a73fbe63f7e5336323397441bdb127324b50c444de578de08752a735b38476549c54b3902a0f4675722db6667ecd383195 SHA512 88537f912b9044337542d0c2dfa3777f5837a6a9fdbbe9ba2152c2e2874fca1c54a73e9f6459b9bd78784f4b3042845e9dc3ef7018cf9be043c6111eda70a82e
+EBUILD notcurses-3.0.5.ebuild 1344 BLAKE2B 23a5c07d51c1c6adc2fcf8e8ac2731075d3d63846749786e20b2198f07bdc6192be6e08af64efbb6251b96801d04e11a47ea04ec0cdb4ff6de324a5ec038bdb7 SHA512 03de5562d42f2bd39662ca6b117518f70753efdab879f3b69bc68a563429d53dd333a168ca351d811846e7e47431c84dedb21995f30d92b6bf38421dc94e1672
 MISC metadata.xml 870 BLAKE2B 67904fea263b93b4fe7cf331087c1c04aed9d8010f73cc38bd9bebe0e695cd67af728bf962c4459c99bbf7218edf02720f3889d24b8184be85a9472faec56f13 SHA512 b418cbe7abf512f9d94637e624eb05831a35d08710431c9a3f53c01d038e273116d1d755308157608fe486aaee60feb99d73f365df1d5d4c7db51f5b75e33c2b
diff --git a/dev-cpp/notcurses/notcurses-3.0.0.ebuild b/dev-cpp/notcurses/notcurses-3.0.5.ebuild
index 1f79a82691ed..5ec6a07f7781 100644
--- a/dev-cpp/notcurses/notcurses-3.0.0.ebuild
+++ b/dev-cpp/notcurses/notcurses-3.0.5.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
@@ -37,8 +37,10 @@ src_compile() {
 	cmake-multilib_src_compile
 }
 
+# warning: these will fail if you don't have your (utf8) locale available,
+# or the proper terminfo database for your (hopefully correct) TERM.
 src_test() {
-	multilib_src_test
+	cmake-multilib_src_test
 }
 
 src_install() {
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 1a6d80d6e473..ad960da0cad2 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,9 +1,5 @@
-DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
 DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
-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 929 BLAKE2B 5a2c12fa51c6881f85e89a5066dadb41efc24a9d69853d9e506a49383f29f8ff4a7d70407dccfbd13dd587caae0b3ee5517a8f5cd03f5e254407862f743c85c4 SHA512 c4e0baf91dbb57f2ad9c7b0b53c8a8ff7695a2275b574c8498653a17e15245b66fca5ed728a91395acc757150bea8da7523daa8fae04cbefed58f1a446c12fd4
-EBUILD pangomm-2.46.2.ebuild 936 BLAKE2B cc03e12faadd011a6b752b021bc12e816cdd64755c78ec26392b22294f6ac151e3be1b5b01beacfed71a52b6a75b8ef0b1b62e8d2f92af6636a5eb90239a203b SHA512 e70b8e74b45435bcc4f36158d55bde06e6cede02bcaaaa4bff8ab34531fea8c8409cbfee8102f5a137acb1a66fc0d1f18a1a26182445be2e4223b0dd53ab72d3
-EBUILD pangomm-2.48.1.ebuild 940 BLAKE2B de3f43873f0e0fdb6391ba91b26e4143b40494a7d93281f9f0882687a093e3d2382a83781ddc420fcadc117b633efac9e8e1797714e1ce33d2de9b78980d98b1 SHA512 ee6889d7e74a7f6b5bd0416b0f3756234ccab849b0637afbbbbe70701f9829cede8b56118bb09c97e39695e934b46c25eab0d612ad5359be4b512f1abb56c9fb
-EBUILD pangomm-2.50.0.ebuild 941 BLAKE2B 19c335bae50ef054e92bd1662c30296a77ff27f173d57c11193d83f16e18c8ebd5f66e1aa04d188df16a399b8a58aa5a4cf07e94b1d27d841258d839fa20c373 SHA512 037fe7147732d5a73c296c3833f362eded545cda2820c0099273afca3f1db8d203c334bedf2250327c0835637faf2a7d6679cc9e3bd50d4c7ed01a61c318e7e9
+EBUILD pangomm-2.46.2.ebuild 929 BLAKE2B 8e06a4e676dfd9971200c4f08dfa9edc17458b16377190ceb506413248c1596ba11cb1edd993a707411f6d591df8b6148323c2b65f191e65becad5e4bc8228da SHA512 42395588c0a5b79a147ea6b69fbfc4a2a6f64922261fd6302a86ad4dca27c867e3ce9f8aed3575e9a440ba816ff8bd18eb9e2b1868aa933ba9cf1fb8516b540a
+EBUILD pangomm-2.50.0.ebuild 940 BLAKE2B 677008eba5cf3fa3784cf80cde6e7750ed9d929335779db5679563c1119a6b21e5dc803bda209d520067c8c8b385bb54cc400002bbf57df3030cacfabf38d2ec SHA512 56c299bf32e0c6e5a57ce640412af926dec7f6001ed2ef95671ec6184482b430d8d1cb0c5f127b0fe6e7a399346781ba2194578522a7887419c93c40bebc77d2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
deleted file mode 100644
index b5acddc83b1b..000000000000
--- a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
-	<x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=false
-		$(meson_native_use_bool doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/pangomm/pangomm-2.46.2.ebuild b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
index 9bb444efdde0..f739fa1d4116 100644
--- a/dev-cpp/pangomm/pangomm-2.46.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
deleted file mode 100644
index d3180893feda..000000000000
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-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"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=false
-		$(meson_native_use_bool doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/pangomm/pangomm-2.50.0.ebuild b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
index 7cbee5d0f71b..0e562fa01831 100644
--- a/dev-cpp/pangomm/pangomm-2.50.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
@@ -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/popl/Manifest b/dev-cpp/popl/Manifest
index f495c8104f79..dd47b9f453c5 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 583 BLAKE2B b3714be199a9fc0eb40faa75c59202db6fe6c76688547a109e3c82ed84c6a09f32e2022a2a2731c1bfa5974de40844d7e090f0ea1e5df779954c6d3a541e71e3 SHA512 85f2f89cb3ad048ea93840b072c499bb0327d9fb05e0215534d2155c4100b989261f4e963f9c0babcb3807a3175adb99f782b8290a342a9e5227b60f03df7f9e
+EBUILD popl-1.2.0.ebuild 588 BLAKE2B b5060497d1296712f887a97c140398704ed7212b485048f90fefd37ee0e94da8069a07097aea014e451849bed8c7fafe0b8dd9632c128ff0791db5fab45c214b SHA512 84b549380a7f9926b706557f28d9d1dca5006a6fd932c15e850d6332e0152de9be19972a413071289deedb44a0b2868679e65b50022ccc11bbe73d14bfc3b0ea
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
 MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index c86b01b390a9..5206f267709d 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index bc95fafb3b89..988746aa078b 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus-cpp-0.13.0.tar.gz 55448 BLAKE2B 5790e74f5bb783070b6928adf9d850dc59ff8507d580a96549e62a2ea9ca1cf5b5de0fb445dd373bbae6da3fdae59d1dbf2eca5e04dc3d6adb58e5c52da1e666 SHA512 d2c6708047cec1998697931d5e9b420dfa513ade9f298761b08ae87a5526cbe64476ebc56793c21d8c3d741e3a4db5ce8d27af1d39b4ca30a45de34f40fdca67
 DIST prometheus-cpp-1.0.0.tar.gz 56244 BLAKE2B 51ff199c0cd09367de873310a835b7a4a5893de11a6115b3de8ef142eb12b326ea7498a8adc155f3bbea6389da41eef91b5ef23cb0227ef1d1ceb64e4d7eac2e SHA512 baeb12725dd47b170e1ac94c23b2b18ba8aa11dedd95af7adee8fdf9ddebaddfca1ef75c30b1d65c94e1cfbcba2c41e0f4686f1a1de66beaba7dcd70ab190164
-EBUILD prometheus-cpp-0.13.0.ebuild 827 BLAKE2B db34157d5a96e09bac17e977bf16d678d7e6045baf521efb1270b246744d11bf563d4ee338669dadf09249f5bcf122835963d1118deeb74196b4f861346af611 SHA512 4f02623e6d3b1f2bc90b550cc40c9e424547b7afe7d6f72fe3fe1e0768b82ebe0d15171c07349e3d7bdefbbf29c38efbdf56ec74d8a4a6ec36dc007777d7bb4e
 EBUILD prometheus-cpp-1.0.0.ebuild 827 BLAKE2B db34157d5a96e09bac17e977bf16d678d7e6045baf521efb1270b246744d11bf563d4ee338669dadf09249f5bcf122835963d1118deeb74196b4f861346af611 SHA512 4f02623e6d3b1f2bc90b550cc40c9e424547b7afe7d6f72fe3fe1e0768b82ebe0d15171c07349e3d7bdefbbf29c38efbdf56ec74d8a4a6ec36dc007777d7bb4e
 MISC metadata.xml 826 BLAKE2B 309447cc55a501661cb9bfa636bc54f7ba6c2ee2aec545b5a1a38fbbeaf7180fdda0c768ff941844a1cb83ce9b5d89520a0a143e5e0f87b86f57ca8aea82bd2f SHA512 7e2fe05bc17e6b40fffe6b75849953ca8dd6970adb38d5e5fa38bd03f9aea38df14ddb675dee70b8930cca4a9ec3c01c2bdf4ed36f4db2c4d5e4152e13ed09f4
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild
deleted file mode 100644
index 07f8033472af..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~x86"
-IUSE="test zlib"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-		-DGENERATE_PKGCONFIG=ON
-		-DRUN_IWYU=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/pystring/Manifest b/dev-cpp/pystring/Manifest
index 948e082d5f31..0b8a82a2185f 100644
--- a/dev-cpp/pystring/Manifest
+++ b/dev-cpp/pystring/Manifest
@@ -1,4 +1,4 @@
 AUX cmake.patch 2385 BLAKE2B dc19b5e192b6403c283b89055c5acbf6abc87722a7b76142c5e41dd6a8ba287981bb05337f6f6d775d9b1bf7c92dd602c4f459857570aac44ee5ec05279eeeb9 SHA512 533ef9fc79a48cfd51d4aa3b9ea77da9e25b3024082aaa40388453fb38b24701f20fa0c7c832a254a5ec61e67e77169294808f4dee4f9f573fbb532cfe415ca4
 DIST pystring-1.1.3.tar.gz 18364 BLAKE2B caab1a3b1dc688ad6ecbb32e5e8139bb883a88b78ce8a021229924d57376e94b17d89277e2fccf4f7ec478c81ee9259c5e56848f4388c44b2eab9cfb841bcfb8 SHA512 a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6
-EBUILD pystring-1.1.3-r1.ebuild 749 BLAKE2B 728806e985232c50a2b4a8ed1501bedd16948ba1cf8552f42f79f6dd500cf946899f86fd965d7fd562590e19437c78d6a9dd9456a2c39a03012e99af99c70c43 SHA512 a0a0b9b91678cd2031b587f6670ed2722f04bda1db3acd85e0ad8a7560070f06a93c0c4728c57b1834de4587af39dde8782b381b0bbe9f64f2fed5b2d562760e
+EBUILD pystring-1.1.3-r1.ebuild 755 BLAKE2B 76c78c862023d07cd48a63d1cfd83601881d28eb5302e5a061629b3aa92b4dc8d1472cfe76117e7cc93db5c88ed24466118fa16fbb6caafcb40c4b58fa31dd9f SHA512 a496d4d590ac4319e6db57e38cf2b4b23efb3572355bd6c8e38afa9af889b201670ed5731539336fe06e95fe6501501cfb004793aec1a0c34b1562d6e5f710e6
 MISC metadata.xml 486 BLAKE2B a18d073c90097ec2cea226520618f43ec2c1c81bae1e30405f0b99ae912ad146467bbc875cc640188475f7de7739e2085bf8c933e1d31b024ecc763a1f58eaf6 SHA512 462cb9958cdfffff17a18afad1d0528be7e0b6f0be151f3c59eac8c9b2a25e18afb1477264c90113c26dd60156ee26f6f16a6d5c8d751fbecf6e6d727753e8a4
diff --git a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
index 2a716f8f1a5e..7256d7703bc2 100644
--- a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
+++ b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]];  then
 	EGIT_REPO_URI="https://github.com/imageworks/pystring.git"
 else
 	SRC_URI="https://github.com/imageworks/pystring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 BDEPEND="
diff --git a/dev-cpp/range-v3/Manifest b/dev-cpp/range-v3/Manifest
index 3466e1046268..a86ef91624bc 100644
--- a/dev-cpp/range-v3/Manifest
+++ b/dev-cpp/range-v3/Manifest
@@ -3,5 +3,5 @@ AUX 0.11.0-no-werror.patch 1543 BLAKE2B 31a87abcfbfd23d1f585053befaa869a7299c74d
 DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
 DIST range-v3-0.11.0.tar.gz 533136 BLAKE2B d325b14a9d812cb7a600a947126bcecf9384bec987edbad42eec38560415d075815ab92e3f92dad291029fc3e1b1afa1ceaf54443b4a536078047fd32d344394 SHA512 9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4
 EBUILD range-v3-0.10.0-r1.ebuild 854 BLAKE2B 17533e47f71866b1b7be5b7323e7179513dad88287a61506bb1fb145004927a64a2809682b91c548cc89f544238ee3cbbc2ec42159a3686f5a5c8cc4d63a9f0c SHA512 9d326cb93b3bc3fd32adf43ee6229ea672d56be1c711afe0724cd012451d570ac4ea9404992bee1faa64c4cdffacfef78193192953626a771780bb17939cd5cc
-EBUILD range-v3-0.11.0.ebuild 1172 BLAKE2B 0708a054f4c5dd9ba1cad5ced547307619f206b5b9ebda7fa595f86b63b9260afd0a7060ee8720d2302f86018ec3306492be3dba7106b4d947d63665b2d21366 SHA512 27daf17b2fa2a842cff664df94a2c36d2cae20c28f1aae3586be7c010d70302bab7f21378cd148ebf53754b42a95268d0e5f0e87562ea1e3c28a830585c74ac9
+EBUILD range-v3-0.11.0.ebuild 1179 BLAKE2B 1e260af6ee8ed41229a0856ca59f20191c0b137f34f05be0b014980acf1e1ee60c3926420e8f0f201c8059015f14f835932ed684c721afdebec3640b772e6ccd SHA512 48ae5e0090755b42e28f1e73011afd708f86619d558e06396596cfe2fdc6c040db252c2193498fc201d501e15bfacd02cca3ea6f9db76b5ea3632a6a21eb26f8
 MISC metadata.xml 810 BLAKE2B bdebf063bfd0652ef3a38f5c96f08fbcfe3933937aa00883d39cc216a79ebfd65fa3c538d15ab0b5b4855ef7696b98e14c292b6587f2d870ca9d4eb6d7d7e96c SHA512 b24ff8d2452b70c34a941c693e6b2bc256fbcc23a49acabdb7126d593b44de30116d9543edf57bf49ca5c6ba854b851b802167347a08736b16a1b200c28aa5fc
diff --git a/dev-cpp/range-v3/range-v3-0.11.0.ebuild b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
index a23c13d69944..2c78e057a78e 100644
--- a/dev-cpp/range-v3/range-v3-0.11.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index ca41accd14fe..cd36fa4bfdc4 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -1,10 +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 2014 BLAKE2B 8e48717d5eed3bcb342362fff22f2b140dab2e78e52e1c82e936766bde0bfe41d04c9386075950a8dab3a4bc6b0bf21ffd8e47ae5e78b43e67d636db05bbb46c SHA512 3a64ba8c56013146a09f90ffa7e7a7bfe74ed3a81860c0bd6e46bd0083245339e7f9d800a0f661121a5f6ffc14ec09645ebcea2b52f095491196cff7eb8cb8be
+AUX rapidyaml-0.4.0-no-download.patch 821 BLAKE2B 9b4122343ce2afdaffeffe7eaf9193395db2d7fc924e44cd75f735e697276501102d058ba95ced225993f0423b0bdef778c3fdfd95b59dcdcd718d96e6e2a4ae SHA512 4dd4c91704308d931a61f3841297d1f95986fc7bc9ab03d0c44583f061762b0af1240e6f6ad8784de2185c45fe09fb87bcc34f07bed655f13c80395ff6eaf121
+DIST c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz 22163 BLAKE2B c3ed63e9e92dbcba63faa415d4de56ce275fb3b493238235930c629362d75e08ca2f6ec2ad34fda12154544b9972e45b75c24c5a9c80d9d7a68febe6f6e462c8 SHA512 c25d1122851ef2d46b00a2fd5083313c742758530a0d5a9c0353ccd637fbe38228ef8fb45bc8addf9006cc7655dec4b4fc571af13dcedf75f19c551c5011e377
+DIST c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz 11985 BLAKE2B 15cc7c1bd9a1693e5419e4904e1cb30f297c7003e1480014f7782d35d0222cb000643901e6afffbe13bdbb61aa10aa4ce759c5333b327b81d3ade1e043283310 SHA512 93f4e8854cf3a5f00beb9a427004a360961caf47c53aaa817f5ca43f4cab7bad6333ba35aad24d1e7aecea75f9f3a8628527ccb0be241bdec25c5aebfb0be8e3
+DIST rapidyaml-0.4.1-src.tgz 910816 BLAKE2B b9ef92045009b1b38d9142b2856e747edf446261c2271ee580a3aa51a3b5a2b0dfbdbcd1da6c520697dff092e9918f273d77e3f1b1e1a6ee28305aac648e6b4e SHA512 99051f452d61262188cb824623dd950cf51e0db48f519e45e7ed1edf40f3445f73547f1fc0de6b5654a7a6986d48fd3659f72f2d46019af77349957ee14cdd79
+DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
+EBUILD rapidyaml-0.4.1.ebuild 2075 BLAKE2B 4eda64eb090318f63afecb5aa0494819b5d5608341b64967e1411ab5f682dde87fe4e0454dcf4eaa45431ffc1225e3c88483b894f54cd90b3f76fcc5a565ace3 SHA512 b6d9a300f42ff568259bac7551b4bfc9d49020fcd9cfcca07bc9a5ecb921c76a1d565688c6bfb67d9e72df366ad1c06dd9cbe1c4bb2a14f062b72fb6e3d51a37
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
index 97c4926cd9d2..51fb56e7ed6f 100644
--- a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
@@ -8,16 +8,16 @@
 +c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs)
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -103,10 +103,5 @@
+@@ -155,10 +155,6 @@
  
 -    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
+     set(tsdir ${ed}/yaml-test-suite)
+-    c4_download_remote_proj(yaml-test-suite suite_dir
 -        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)
+-        GIT_TAG data-2022-01-17)
++    set(suite_dir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite)
+     if(NOT EXISTS ${suite_dir}/229Q)
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
index 64b80e293129..cf4cdabc759f 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 
 inherit cmake
 
-C4FS_COMMIT="1abba005074022f07d2d9d11ec6a786f2a1f1380"
-C4LOG_COMMIT="b8b86f33fc7539661e302171ee6dcc4a17859e67"
-YAMLTS_COMMIT="bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3"
+# see *-no-download.patch
+C4FS_COMMIT="f78cbd86a77c976395c9834726a14a1bba059af0"
+C4LOG_COMMIT="e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d"
+YAMLTS_COMMIT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
 C4FS_P="c4fs-${C4FS_COMMIT}"
 C4LOG_P="c4log-${C4LOG_COMMIT}"
 YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
@@ -32,9 +33,9 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-cpp/gtest )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-no-download.patch
-	"${FILESDIR}"/${P}-system-gtest.patch
+	"${FILESDIR}"/${PN}-0.3.0-libdir.patch
+	"${FILESDIR}"/${PN}-0.3.0-system-gtest.patch
+	"${FILESDIR}"/${PN}-0.4.0-no-download.patch
 )
 
 DOCS=( README.md ROADMAP.md changelog )
@@ -51,7 +52,7 @@ src_prepare() {
 
 		mv ../${YAMLTS_P} ext/yaml-test-suite || die
 
-		PATCHES+=( "${FILESDIR}"/${P}-tests-no-install.patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch )
 	fi
 
 	cmake_src_prepare
@@ -59,7 +60,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DRYML_BUILD_API=no # TODO if a consumer needs it
+		-DRYML_BUILD_API=no # TODO if a python consumer needs it
 		-DRYML_BUILD_TESTS=$(usex test)
 		-DRYML_DBG=$(usex debug)
 		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 33ec7b5ccfbb..596ecc8633e2 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +1,6 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
+DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
 EBUILD robin-hood-hashing-3.11.2.ebuild 492 BLAKE2B 18958ad16e59d345e69cdd24f4fa2c31a870b90a16241ae252dd9b8973f668b0db46e139ebcaff5be559b524a504267a99b3ea1e202d80c9fc8f99e036b70bd4 SHA512 54c7c9921bb594cfb46c4b5bb7b5233ede6438f0734678f753236faf98e040d3a1a68e4e87c0da2f1ad473d975195f0efefeb34c4d17c24112cc4c67051723bd
+EBUILD robin-hood-hashing-3.11.5-r1.ebuild 606 BLAKE2B 1881149c302b751d85fa43e62889e95b14db2a8259d27662a00c21820fdd6b9bc32241fcfee98c52894f75f30da93f4b18cc7d35be5d99cb2341322b2e466ef0 SHA512 530bd15d8713006f6314e656731749648753e5316d08b86d63b1451510076796e3f3e95c0ede5739dfa76b873e965baeedde3fbc0c61cfca7e1f5197866405c2
+EBUILD robin-hood-hashing-3.11.5.ebuild 607 BLAKE2B b615db6a41521b1491cdaa5e06966a641e9c9191614be51070636cab1ddee03a44b9e2cfb587669c9d2c5b2a24029c2f117c1c41711a9e5ab4b2ba5e86ed8321 SHA512 308fc84a03f4a0403d9f9ddfbf3d1d5ad17b435f772be80a588ea3b9068b2f470ed569a3c88de863514531da59564b37b9464d6d73c283663b3d633224a1a39b
 MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
new file mode 100644
index 000000000000..152d26b69823
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
+HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+        local mycmakeargs=(
+		-DRH_STANDALONE_PROJECT=OFF
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/share/"
+        )
+        cmake_src_configure
+}
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
new file mode 100644
index 000000000000..4fff4a53f17e
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
+HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+        local mycmakeargs=(
+		-DRH_STANDALONE_PROJECT=OFF
+		-DCMAKE_INSTALL_LIBDIR="${ESYSROOT}/usr/share/"
+        )
+        cmake_src_configure
+}
diff --git a/dev-cpp/robin-map/Manifest b/dev-cpp/robin-map/Manifest
index e2e8a1dc25e9..d360b0be6817 100644
--- a/dev-cpp/robin-map/Manifest
+++ b/dev-cpp/robin-map/Manifest
@@ -1,4 +1,4 @@
 DIST robin-map-0.6.3.tar.gz 64506 BLAKE2B 46a2b5b47346016695db0c49f73cfbf8530b7db0a31527030eb00f3b6f0695325ab6fe16de1e60d6b1d0793818bdd1e31e50117f2e2e4c50154f65b38ac66d84 SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b
-EBUILD robin-map-0.6.3.ebuild 502 BLAKE2B 159600dc8f19618ce93ff5f58fc80cba234ae7700685d9e54b4b3b11b59b19a028ded4719bce1a449243af5070e01b9f7b7489cb9d930573ea9d7054a350226d SHA512 36b12444e22c878ab08f411891aa27d579fc3ef6dc09db34de2403193c907d413b0c6ef7aa447a58894fdf5332c32f0cd9c76985a7036b6b20a4518edb4ce371
+EBUILD robin-map-0.6.3.ebuild 509 BLAKE2B 5dadc9271c94156fc401511e0e52d791d6e52ac463ebf8b7b6e3141e2ea09dd8379b36bcca378b899e353b48a8a6234fbe67176cc1f6ddc162dc37b73f0dbc30 SHA512 9a4a9ec944384b25dec8ad9c086b80939a18ca79bb7b7a8cfa2bfa6d9718f5b5460124ce86bcab59c753203f52cd57d9c95ce149f095a3b77f4cb9e438fe402a
 EBUILD robin-map-9999.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/dev-cpp/robin-map/robin-map-0.6.3.ebuild b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
index 78a6b31dd3fb..38e1f14137ce 100644
--- a/dev-cpp/robin-map/robin-map-0.6.3.ebuild
+++ b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest
index bd74c601a86a..ed6a7d0188c5 100644
--- a/dev-cpp/string-theory/Manifest
+++ b/dev-cpp/string-theory/Manifest
@@ -1,5 +1,7 @@
 DIST string-theory-3.3.tar.gz 588360 BLAKE2B ad87857e6d5e3cad1346b759457b434de7612b97e1b19016b1dfc987ac67f0cab318745b14fe1f432cc921ffb1d33b875a2a62f0bc56d815dd35b405a9f08560 SHA512 86209333dce341078c3b973084bd9f3b8ff2ccac0e07a5e6acf5973bd1cfa420897b531b2d1bd6aba9f5ccc8927f85d91f06796ac0e62ec8a735564a0387d2f4
 DIST string-theory-3.4.tar.gz 588522 BLAKE2B 207c490293401829d28590291166bcbeefde4ecb3b70d1cc2751d7582c53cf234b7e01579d3bfbe55681708e4d3e22cedbd6fe96b2fdad1c3ef158bb7a080593 SHA512 36ad82c6da276b7cb66d350ceb4bed2a66f768a6604b2981331ceec6a96d03cc3a7e7e5f733de88ec15e0ea41f99f8657b959a51149c540f530d06268c5657ff
+DIST string-theory-3.5.tar.gz 589905 BLAKE2B c2bc926b8568efc1fbe27861619bd8249ad788297dd537cff393d212b3bb12a529847b740fc8ba82dc28501fb05800eb8debf3e4832cf145b5c13882ac45e900 SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6
 EBUILD string-theory-3.3.ebuild 790 BLAKE2B 7f5f08a59ee1233e4ab14e520fa837e65c1697215dc8330526a7011ba66a1d28c6f7e953f36b89231dc5e44bdb9dcfccc94f54c3a060a4df37b3341b9df2741d SHA512 b6f1d3baa1c606e0bb470aec7305dae97c7096b876768e45e250bb68480198a5f278a5ce9a9ef654bb29f35e2d435caff1eeba7c59e4be6866bc98b3eb519bc3
 EBUILD string-theory-3.4.ebuild 802 BLAKE2B cc4e8331a2f414d6ade504544a10d412bd22aeb8b7a30f3f649c5500ca6809c89ea6c7c5feafa9a5ffe6f7c019d89eabe0cc21f352c9450b6a0524af03c78017 SHA512 83ff1a846aec28d307df60e5c22d3647db104114ede4a3e627fa7f7cd2d077ceca134a2f323e63d591a0a4fcfbd953c05803e2303d1c2e4c86811d2988584bce
+EBUILD string-theory-3.5.ebuild 802 BLAKE2B 20d8c5575a7e07f15be927d02e0cf39065bdd54482c3a47285ec6d2c2f3339b093421819df1b5c62327b69ae5fcc9055e4b76071247db458ee201ff5d70a9071 SHA512 942dcd3a3ad750589c22871b0f7b504074e4b3fbdfeef0203d6efa06f49054dca2427216acd43235bd4d438fd0bc1b425b969a76ecdc3084a35d0c54a1a82151
 MISC metadata.xml 500 BLAKE2B 08b32a1ccda4c649272e269b206ad3771a4d645c4566010ad3e674744e4645d601cb7bae27f99c48d0c8e071fbac312873e7cbe02eca65d42c0e12402955aab6 SHA512 8bc725507c83c4c266ed23138adff9f547a8a7039fdef9c865e4a6234bf365ddcc432c42ca3d089392df0def3b711a8d085063dfb7fb94dba36c266469d8fe36
diff --git a/dev-cpp/string-theory/string-theory-3.5.ebuild b/dev-cpp/string-theory/string-theory-3.5.ebuild
new file mode 100644
index 000000000000..0ad4291f9488
--- /dev/null
+++ b/dev-cpp/string-theory/string-theory-3.5.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
+
+DESCRIPTION="A flexible modern C++ library for string manipulation and storage"
+HOMEPAGE="https://github.com/zrax/string_theory/"
+SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/string_theory-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Drop -Werror from bundled gtest
+	# bug #766468
+	sed -i -e "s/-Werror//" test/gtest-1.10.0/cmake/internal_utils.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DST_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	./st_gtests || die
+}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 2e2fe65f5dd5..759b70cf69fc 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -3,10 +3,11 @@ AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb149
 AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545
 AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
 AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723
+AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d
 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-2020.3.ebuild 3328 BLAKE2B 49da765405909bdf94c7e315ae00b4503113db99ea1c13e411a5349bd52b816b36654e06a2cb7c8d10b66caced270f8a7bc2d9c569296ecf4f99a91accf2301e SHA512 19edba39e17bf21471309fb769a3ffb0af06b6cbf61f3523767b8980ea2655cca96edd6191ace397610d9e2460a2e684361077e57b82393500950255dd0a7c8a
 EBUILD tbb-2021.4.0.ebuild 1003 BLAKE2B 60f60e47a512ee0a715cabc1f7bf876aa8f4be338cf3563ccc5aeb6b4f8c83dc6671e1fe168a96c2e856c95912fd5766021040ce593b5d656e95136f7afff5e2 SHA512 27a5925c68d5f369753c72e4cd8bb472cdc9e21758e7b3e1d144afb374f12d92964b1721d39c885c6da9500aed0aecee17914ffc87a675721e7b6a5d41c43a60
-EBUILD tbb-2021.5.0.ebuild 1189 BLAKE2B 5f55875bc4d6f3da0868442875d65ffbb36e92f827e0320c296e878c21bca2634cdae4b35d9f39cb8eb37e7ad1e4ed4b4585387458ccc19bd62c6631489a3f04 SHA512 17f764fc39968acea653edba7ec130068e695e80bde783d26ab1fde0af68834e5af385fb9f2b57c8944411899292d98c1b2f6532251da7c8658df0669c4741f0
+EBUILD tbb-2021.5.0-r1.ebuild 1277 BLAKE2B 76bbb45fbec3510069a131972bb7d8bfb729c21c099de260d06d1cb323b120305b316e7ff616c4ad4c1346199ff170c314001d4088e17970a216ac34aaca620c SHA512 d58b8047284b92b1fb879c96759b31ce6926e3a812c0e4c55ad48999f91b1aa183234d4bf145f7a37fb82748f24e0b76fc60de471cfe73345d0deb2bd8fc4536
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
new file mode 100644
index 000000000000..111bbf123d9a
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/832700
+https://github.com/oneapi-src/oneTBB/commit/6a15b64093c51ddc00bdf4a6b49d4bbec1574a12
+
+From: Rui Ueyama <rui314@gmail.com>
+Date: Fri, 4 Feb 2022 19:32:11 +0900
+Subject: [PATCH] Make tbb compile with musl libc (#748)
+
+TBB resumable tasks are implemented using getcontext() and setcontext()
+on Unix-like systems. These functions are deprecated in the recent
+versions of POSIX and may not exist. musl libc does not provide these
+functions.
+
+There's unfortunately no way to detect musl (musl intentionally do not
+define macros like `__MUSL__`), so __TBB_RESUMABLE_TASKS is defined if
+`__GLIBC__`. glibc-compatible libc's such as uClibc defines `__GLIBC__`,
+so it should work as a catch-all condition.
+
+Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu>
+--- a/include/oneapi/tbb/detail/_config.h
++++ b/include/oneapi/tbb/detail/_config.h
+@@ -268,7 +268,7 @@
+     #define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT
+ #endif
+ 
+-#define __TBB_RESUMABLE_TASKS                           (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__)
++#define __TBB_RESUMABLE_TASKS                           (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__))
+ 
+ /* This macro marks incomplete code or comments describing ideas which are considered for the future.
+  * See also for plain comment with TODO and FIXME marks for small improvement opportunities.
+
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index c654a5fad29f..3cdf62035bbc 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.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
@@ -142,10 +142,9 @@ multilib_src_install_all() {
 	einstalldocs
 
 	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+		docinto examples/build
+		dodoc build/*.inc
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index 6b2ff50c7c4a..22d714102105 100644
--- a/dev-cpp/tbb/tbb-2021.5.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch
 	# need to verify this is in master
 	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
+	# musl again, should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
 )
 
 src_configure() {
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-cpp
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)