165 files changed, 2163 insertions, 763 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 78a34e8e2a2d..ce436d6addfb 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 add6c2d52bb8..1dad17b90d5f 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -5,6 +5,8 @@ AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b6
 AUX abseil-cpp-20230125.2-musl-1.2.4.patch 2203 BLAKE2B 74ebf85e5f35de255fbf5a757655fedd8f5821558ecf700fcc06e30950ce4bb802ca2431cf8b15d05ddc3a7bf2818eec49bf38c2e33d033df0c2973983340ed4 SHA512 404a3c25135573292cbe90f3fb459172a936abc2ec4739e57b8a1dac300a3e0b848ba18aaab5f6dfd12315de736175b962174022a7969149221bf595738bebb1
 AUX abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch 2148 BLAKE2B 978304f3ff8f46ac8fcd7c708f464cacf657f5f4f76a5bab5c4db6e14dcde0bbc7b2ae03c8b74a527218eab737cbacb9219b1a87ee2af8dde8795d3c1b43c7af SHA512 c94ba837440e2c49f3703492f0eb51c7f1930d8d700660d6db56985ad05fe61d3c97656ba8e0a818b843f04c939bdeb4134005420ad561068c52f64ee481f091
 AUX abseil-cpp-20230802.0-sdata-tests.patch 1541 BLAKE2B ae6cebeefc794e89101bd4d0a3a1c022e651dfdb312401fbbf035f6c2afbde8162c132f692e89a075cb1811ae9e0708652c469107047cba49618c0ef752eb108 SHA512 bda7cec902c1f71173b4e7bf2e35c3fffc5de216dc84680e9a0de56b1bb5b9ea4f50cb603e690275e1fc9e2fcbc8ad998a8dadb655fb96d28a651ac80bc2f764
+AUX abseil-cpp-20240722.0-lto-odr.patch 634 BLAKE2B 33a26f207fb0ba8978188091eb32b926cf955cb4272a3afefbd9d02a9dd92f05d0f6bc571540c1c8c18e46c35b19d5ad4db395bc5b63fab21ae7adb5054f208c SHA512 bb9629d746d400ad785e3c12bbc213505c364ebbf3668af46e6cfbf83cca9b8d221c5ecca1d3646241bd2e3369d4ca956b03e404646d0e7e3de0308c27f59578
+AUX abseil-cpp-atomic.patch 494 BLAKE2B bce1f9e400b495f11652743754b8120736ee043c18b2ef8f1d89d676e6dd0cc014df8d1050d9ea17c628b8c05aeb0de143b384e62fbab4675a573c4b8f53e0a4 SHA512 887e8bffca7acfa94f0e72f7f22319c365f31b55f94da155672b610bf6e4013fa73df5a7d9c8179f2d9f23926aca190f113b971ee073b36d464d60f45223fef4
 AUX abseil-cpp-include-cstdint.patch 1268 BLAKE2B 693dae2368d0a816950e69fa7323437734dee1bae844f9abd957f136686a711b8d8ef92fb55c9910905e2633ccf82dd107c209f53082d1202127c444c54697ac SHA512 72f8461db4ac35a285a782eea9b70f3c387eee07804842f1880c91fa3dc32c19319462a839b2657cdd9f632868d866e5c6cac7fd5b801ac4434073d824d8729d
 AUX abseil-cpp-random-tests.patch 660 BLAKE2B 60ef86170310b6ababed9f07fc2e40ca12b278f2202de3d1ae3f028eb081b3de0ba6e245211457e0c2d764142916c2a3c7a46c813ba2bc5536c50edebaf4c3f6 SHA512 d2356539fb38a16cc52cd11106d87613c46a4757827bdea22f4a42f5ea7d557387477ce17a20fa54051488f66b1e628be9e539948cdb1e87970174d3894b1d80
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
@@ -13,6 +15,7 @@ DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5
 DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70
 DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
+DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb
@@ -23,7 +26,8 @@ EBUILD abseil-cpp-20230125.3-r3.ebuild 1640 BLAKE2B 534ee2c085dfb77471eb34a47491
 EBUILD abseil-cpp-20230125.3-r4.ebuild 1711 BLAKE2B 801637ded0d238591b0f6fc581e9640424def79d6a5c6414060254e105ef0fda1ea15815f25b23b0894c67fc0132e9ec1aaf1af10823df38f6b653499221c05d SHA512 81bb4091ffe42841581d2bca66528d23ca831ff4fc1b0fd76c6f8ba16dbadab558be4b9772af802a799ea9d50089e3150009b32fb62b23b5c298111ce30c73d2
 EBUILD abseil-cpp-20230125.3-r5.ebuild 1764 BLAKE2B 8c2ec49ea1596ad8f971414d06d8d957e1eebf26858868e95ec82fab990174817e21530aa0969aef024297819fe24658f7a07ad6cf5c336e120e88d961b878f8 SHA512 b685bcd81ee099888290d7111d4ddd7cd413cb191a59667dc5c2a57b1e2f0358525c8f3c222a24b7fce0a66e17da88020d97e26e5900d91b95ce1abbe597cf2a
 EBUILD abseil-cpp-20230802.0-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
-EBUILD abseil-cpp-20230802.0-r4.ebuild 1761 BLAKE2B fe7475c6b062a8c1d33d563252ef5918fc30a2d4dda267fb72ebd04bbafb172f2956c2573d4e578b85f7530ba20fc4455ddc06cc55af4f131600f183496c6129 SHA512 7a24e5864c1cbd0bf317d617f4e2db8f0d27780edcc4ddf4de07f8c31ca60f445ac048c620592febf7b6088b61c73b3866660b66bc357f781b9b58f9ca4c6694
+EBUILD abseil-cpp-20230802.0-r4.ebuild 2020 BLAKE2B c29d5683173e4f720a799446bac5ec041985e633a70f1c239edc7c54dffb4b9fcafec366ace8fe3c62a686b4f2dde58313500dffdd024b08af54b45cf661edd6 SHA512 f05658f83346bccbc0e0fc86ccd3750f8ddef863328308d6bf5fe4f03a5e1316e1b4a3231218f3a7094a959ba74b7dce32b136602a505091c2b607707d060073
 EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
-EBUILD abseil-cpp-20240116.2-r4.ebuild 1799 BLAKE2B 8e6174644230108a792b5d62e7a268bf8320321cf862e6503d00f4ac52489e081e91f24daa62a0dca7db9ef370e4e1b2ce161d23bd279745181022891bc975e6 SHA512 376f986332ccc637328a7d4c765aa33f0777a889647357720e53b4545f9ae6b80f1e837496ab012e32bf005196425fc0fb630fdbf80870337a03fd71e889a349
-MISC metadata.xml 250 BLAKE2B f2e7e5ef7661a51822a5d563f7a835c3606c9bbb9688d599637e0950aa68dbacd67592a8c5306528653dd2b5f7100dc6f5e6ac69c5d7bf9777b12c984b53304c SHA512 99565f4efff02cf80efcaa76ad9247db3c0de6f855f37337579cfcd6e01f72a6e176d5e69ef1a1d338afee6a07c1620273fe56af046a60f195de4d8894a8d7f9
+EBUILD abseil-cpp-20240116.2-r4.ebuild 2054 BLAKE2B 4c3d16b79cdb84a2e40f8640dba22887be98d6b4e02733812fca4a07192380dcb57111c30dc2f15c0f560d4817e341de7bc26b6acd70aceafb532c078775cf90 SHA512 cbace15d0e28c45c88e9d833df30d53ad746f41be878110205f6faf221d45f906b20da97275ace060654fdfa3cbe836b6fad2ab22c186e66d7c016184a41244f
+EBUILD abseil-cpp-20240722.0.ebuild 1987 BLAKE2B 17ba98e7ffdc4ddaf1c54249c3c44ed08d218492135a6021eb0f9f5956af026c9fba525ffb5a922baa020323d8e6e353afc58f688df6070846bfdd0e85a1e25d SHA512 7b4ffecab49151da3940c138521870167ccf404f9054d960c1875b0046e1c8c2a256fb20b0e98a516f890893de7da52337fb75e3821475753a0709c94c211ba5
+MISC metadata.xml 511 BLAKE2B 368361dc6f2e55afb5af3623635272b5a7ec9444a09e7fd0be2879a7dfa2e168c0a1b994d84878a6cd422423103f317b20b543aa11ca00656199e2d3a3a4bad7 SHA512 fc164cafaca7a59e4891a1f5c7f93f790c4b163c0310cbb915f9450de023296d8ed440a89a51230aa9869c70ed55a2b1c54ca3579761cd880df9bccbbde801fd
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
index 81fab0813b28..94183102f81d 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
+	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
+
 	# un-hardcode abseil compiler flags
 	sed -i \
 		-e '/"-maes",/d' \
@@ -66,3 +68,19 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
index ea6ec8cea293..c51b3cdc3c0b 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
@@ -37,6 +37,8 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
+	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
+
 	# un-hardcode abseil compiler flags
 	sed -i \
 		-e '/"-maes",/d' \
@@ -66,3 +68,19 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
new file mode 100644
index 000000000000..ee2f18ad5fdd
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV:2:4}.$(ver_cut 2).0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+IUSE="test"
+
+RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	# "${FILESDIR}/${PN}-random-tests.patch" #935417
+	# "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+	"${FILESDIR}/${PN}-include-cstdint.patch" #937307
+	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
+
+	# 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
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING="$(usex test)"
+	)
+	# intentional use, it uses both variables for tests.
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING="yes"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch
new file mode 100644
index 000000000000..93c07b701948
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch
@@ -0,0 +1,30 @@
+From 05ed7fe8985d4903fb33031519eb3bc3d1211fa9 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 30 Aug 2024 02:14:26 +0200
+Subject: [PATCH] lto odr
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/absl/flags/CMakeLists.txt b/absl/flags/CMakeLists.txt
+index 7376d11..9914f73 100644
+--- a/absl/flags/CMakeLists.txt
++++ b/absl/flags/CMakeLists.txt
+@@ -326,6 +326,7 @@ absl_cc_test(
+     GTest::gtest_main
+ )
+ 
++#[===[
+ absl_cc_test(
+   NAME
+     flags_flag_test
+@@ -349,6 +350,7 @@ absl_cc_test(
+     absl::time
+     GTest::gtest_main
+ )
++]===]
+ 
+ absl_cc_test(
+   NAME
+-- 
+2.46.0
+
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch
new file mode 100644
index 000000000000..4a999760eb0f
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch
@@ -0,0 +1,18 @@
+From beee02af5b83cfe72159e2579fa3c6e0fb8f93db Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sun, 8 Sep 2024 17:09:17 +0200
+Subject: [PATCH] link to atomic on ppc
+
+Bug: https://bugs.gentoo.org/918981
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/absl/base/CMakeLists.txt
++++ b/absl/base/CMakeLists.txt
+@@ -131,6 +131,7 @@ absl_cc_library(
+     absl::base_internal
+     absl::core_headers
+     absl::errno_saver
++    atomic
+ )
+ 
+ absl_cc_library(
diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml
index 8984c4885cb9..16dd7edb45a5 100644
--- a/dev-cpp/abseil-cpp/metadata.xml
+++ b/dev-cpp/abseil-cpp/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<!-- maintainer-wanted -->
+	<maintainer type="person" proxied="yes">
+		<email>negril.nx+gentoo@gmail.com</email>
+		<name>Paul Zander</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">abseil/abseil-cpp</remote-id>
 	</upstream>
diff --git a/dev-cpp/ada/Manifest b/dev-cpp/ada/Manifest
new file mode 100644
index 000000000000..adc189ed7f2a
--- /dev/null
+++ b/dev-cpp/ada/Manifest
@@ -0,0 +1,3 @@
+DIST ada-2.9.1.tar.gz 384701 BLAKE2B ad4a03100de06179c71c4d368cc349a630f8273550840cb19ba3e0cc4d296bfc59fa827bd3ea261609e4f80ebd2adbe7be1450040b519be5844febdcbc55f0f6 SHA512 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b
+EBUILD ada-2.9.1.ebuild 666 BLAKE2B 13fd4e501ce3ac6c2f8711959100ba8b89337352ab7f9c589ebada47777ad1533c63f95d87de4d7573916a73076404163b38b543629b734f980f3cc168ebadd3 SHA512 1b612fba1e15ec4fbe802aba36f4bf58d477a89f11a1ff0b3b6ebe26402bc2737e3dd23c56d096a7fc69f169c1d96c37135f7a05d94778407a2bc953a9e7dbe7
+MISC metadata.xml 502 BLAKE2B b38e8b4c9a196d09f33042485198301ac75d57f2b737608258c55a27b81f4b8b167f8e86641c52e11c8d31e7a1af3e1373ba498f99f1abbf93ad8874b9292065 SHA512 8fab507739a2a9f86d165a6b0a0d19c9172c4bcf6790a0fe4879aad4ebe5247160c143cd89e9a5337c49d7db0a45ad2103a062b35206c61c215f8c24afbdf1b4
diff --git a/dev-cpp/ada/ada-2.9.1.ebuild b/dev-cpp/ada/ada-2.9.1.ebuild
new file mode 100644
index 000000000000..f5903ce2becc
--- /dev/null
+++ b/dev-cpp/ada/ada-2.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="WHATWG-compliant and fast URL parser written in modern C++"
+HOMEPAGE="https://github.com/ada-url/ada"
+
+SRC_URI="https://github.com/ada-url/ada/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv"
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		# Building anything other than the library requires the CPM package manager
+		# which isn't very well equipped for packaging...
+		-DADA_TESTING=NO
+		-DADA_TOOLS=NO
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/ada/metadata.xml b/dev-cpp/ada/metadata.xml
new file mode 100644
index 000000000000..c71625e8a5e4
--- /dev/null
+++ b/dev-cpp/ada/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>esteve.varela@gmail.com</email>
+    <name>Esteve Varela Colominas</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ada-url/ada</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index e754da46c71a..488cc0c888bb 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,3 @@
 DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6
-EBUILD aixlog-1.5.0.ebuild 587 BLAKE2B a1f4879e4ddf07933170d631d725c29b3dc9ea651d36e011a2f4b77536b70778a26eb350ca791f1d9f49b8ed92b4bda40f0fed7ce27e68464019346671ca4d53 SHA512 7302b12e29866ec8d17cc584c6eda822678417ff51e8d018453859dd7de1901b34e10d275d2c73f3a367c97c4d945e46e7cb8e5fbdd1a9970f808586c5fece59
-EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
+EBUILD aixlog-1.5.0-r1.ebuild 451 BLAKE2B 3715cb4a5ce8df8be79a36c3a26dc95748127da8183900773c740533549e3f84369fa58fe10bce4f4904ac81f7f7185d8b9177ce1b580552631bc5b1422095f1 SHA512 8ad6f10e8db6a320043e2a74b902351a28e95b97983982297e8ec694e926f1a2208587766243eccaf90fe00992ad32d6284fc934656c0b677ea6b50bbdd21856
 MISC metadata.xml 499 BLAKE2B 7dea962d454843ca3cde921a8dd30fadcb75f163f8ccf16a51b0d3de5176e8f6cae4788271f9924d5edd79e3e7b4ebe118e55f7397b8b5a8a8d1ec03d2a44241 SHA512 20dbf828621fdc1a4379192ed16d3f1e37bb8c5fe9974638f0b8e7c330d007133a589f5e8d23560d19de3c7c5eaa52c2d1e98d61be9326a998376a45c8f866b2
diff --git a/dev-cpp/aixlog/aixlog-9999.ebuild b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild
index b1164d6bbd11..19f3905fb04e 100644
--- a/dev-cpp/aixlog/aixlog-9999.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild
@@ -1,25 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Header-only C++ logging library"
 HOMEPAGE="https://github.com/badaix/aixlog"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
deleted file mode 100644
index 8fbd29963ef3..000000000000
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++ logging library"
-HOMEPAGE="https://github.com/badaix/aixlog"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 5fcfca8fed44..5b258348aa28 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -2,7 +2,7 @@ AUX asio-1.30.1-pkgconfig.patch 505 BLAKE2B d5c8d55444a47608f681dfbac9978edebb20
 DIST asio-1-30-1.tar.gz 2842718 BLAKE2B b99f6e1ab03c4da9bc802e04d66b46ac2374f7da9f65dd98dd3da3cf1cf507548ae2645343a63378ab91d665fc6e2efe5c5262f33757e851973534e23291abb1 SHA512 6b5f41479e20500dff6c535d8e3b096e11815784923bb4c0f68f69be59c80d7ad99c7e0380a1de4dd350e6cc6a79315d4645378a9b8d70d9f8d28a17f1cc68af
 DIST asio-1.28.1.tar.bz2 3383257 BLAKE2B 9d98152a6cf8b0e2a807275092b23f6198d8175fd7260499be7561cea2e6723c1a8478107315b7163cdc31d6eecab552550393ab3b1cfb686dcb4157d1e91fe4 SHA512 fadd7748675743ba9110f873bf57f2400a5c9c0dc03c1d6cd7f0988bc70ccbbff6cb6140f5dd236d2d874fc82a6f216406e8892808e915aae5119fe9d95743de
 DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a
-EBUILD asio-1.28.1.ebuild 1292 BLAKE2B f1a68c5338831c80f586f10207896fd9e0ee366d942542e9e65a13ef9b16652b4a4aac83f9c6cf8c28001505a092278a98679c18971266c248998cede51ea2c3 SHA512 889122ea7d5ba268c6b069e77eba129764eb31def43e34c2e423603a635ea53d30f5405d350a2ef500c34c5772e4f3c0190760ae0f7474235ce0b88049446be4
-EBUILD asio-1.30.1.ebuild 1095 BLAKE2B 0c28bbb7d5ddc62a5ffed0ed43648d18d0259c6e623e7870f436b45dab3370c9a8fbd169308b480b51013b04e042c02c3fb4196ba84f77fde0fbf70652dfdfad SHA512 f5c1659cfeffec7a682f3dda76f38a907f243f56779f11602944e9dab8ee102f7017be95876f5ad0f4b888ca4b49bd330cf80eb8501813491264aae892cc866b
-EBUILD asio-1.30.2.ebuild 1229 BLAKE2B 40d18f77c8dcfb28a45f734dbf8097f016094e9e8195fa64a2ffacfe235b0485d02cadf3c2ff8ca738d27fb27622c935e8614ec76a01f937ec795e4882cc5659 SHA512 ead0899ed6b29c030692c399d86d5488243ca1f5d654b53e99de62cec1be6ff2c85ea4eb049919f8ed1892e5c4c90c9468b87c815fdad83aa223de945996c04e
+EBUILD asio-1.28.1.ebuild 1286 BLAKE2B db9b0ef86a8433b1ee0e1fb751717b5251965293e33d0acf245c58000a9054884ea9c40cf9d2067c8e8fd83334decd017979f908778cc5125d3451633aca15d6 SHA512 7006dd621b1100aeb26022a4c09f94db4599931ae5518242e2a2b91196d48cf2ad7d7b14f1716cc70308da436bde2395730663be97496ad5a019dd70d3cbbf59
+EBUILD asio-1.30.1.ebuild 1089 BLAKE2B 7633d01a99d4e2aaf5e58bfab9d5e96a6565b4a259ee106072e79e68d9c7a5731a91689e08651d3fbc45699549df07e1dbd408be96c8eeaf79ec6ff2c78c81a0 SHA512 22e126155245e4581041b151da10409a25ca2adc2b94c331ffde6e572c700d7d0cc778aef716bf95845464af109ce59b5f190e6273a10dece1ca02054fa0c060
+EBUILD asio-1.30.2.ebuild 1223 BLAKE2B 1ca6ef6020a6bd2d94ceb654f2fec162a67d9d9e6be4cdd34551740492b7ad59ee4fb9b8d73931305be8e86ce3cec203232b3c03c750f74e06827490cbb68db4 SHA512 62423039b467650a5206c39f7811cfe3aae058a176ab42762ce0e6925b9c8f92ef0dfedacc459e24e04153afc09f258929f46458f9f4610aa907d8b2025528e1
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.28.1.ebuild b/dev-cpp/asio/asio-1.28.1.ebuild
index 9b25fd181067..d0dd31b2e4c3 100644
--- a/dev-cpp/asio/asio-1.28.1.ebuild
+++ b/dev-cpp/asio/asio-1.28.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/asio/asio-1.30.1.ebuild b/dev-cpp/asio/asio-1.30.1.ebuild
index 064e9c09bbe5..1ce3605ab0aa 100644
--- a/dev-cpp/asio/asio-1.30.1.ebuild
+++ b/dev-cpp/asio/asio-1.30.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/asio-asio-${PV//./-}/asio"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/asio/asio-1.30.2.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild
index 07f26a2ebb90..dcfb5fbe38d4 100644
--- a/dev-cpp/asio/asio-1.30.2.ebuild
+++ b/dev-cpp/asio/asio-1.30.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 08d5a2be5ff2..3e595482e9a6 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,3 +1,3 @@
 DIST atkmm-2.28.3.tar.xz 691164 BLAKE2B 07468f4bdf2b790873517907c4564ccd513bb28500c14b1db50bcfed0c51ca8401a95989c0c61460c905125e6d0c71560f59190c5fa38abdc2d133991d519f45 SHA512 ebc25e9de4b9de6df7097ab485fb0675d8c83113d99a444eec91df0908073362bfdaa9b03fc4c3e91766109d9b94b88df041851176ecde578cf932b526ef678e
-EBUILD atkmm-2.28.3.ebuild 915 BLAKE2B 21b3e3597a7964c5976937ff21b8e1448e538c55297598761b8cfd5f6c9cb6f87dc2b61dc67fe8ae4a595b943f198197e4d1eb603f99021d7161a934d35b331b SHA512 f8e143acee9e34ae738d08fb58dd665722eb06a121557468639de79d82c17d11c8aa3dc83e1db7bb3aaf83917c9511f21d2587c95a3554ea74338e795955bb77
+EBUILD atkmm-2.28.3.ebuild 909 BLAKE2B 0643853b2d8501c0b6cc5dd6e7329a89023117e70f6e07b1790dae2d3c6ed23710ca9fa17a4e4edb7138e9152760ab9db55d5ab5c87fabfd84bc1ab2ed1ac212 SHA512 b982796d943b58984a019641e67171eee56ef3b44715b1220a5e9b18d0f511e105c6fa8df1f4dc7575e19802139907d1502e8034ba9fa4ca60ed1fc5bad73b04
 MISC metadata.xml 346 BLAKE2B 646d3c728888a3ee86d200f002a01e147bcbaae64fbc55f63e09bfeebfbc364b062160b2fcedae549f5e256fe2498b004e6cd42e501a58040cafde009efcc4bf SHA512 e755038a33f9933af455a04e88d1c468620461c6e959581fbe87ba278988e59f5adff6fbb099ff6d3fe2d672d57cb4d005e675842d97a78cb67b96a7bc98a6c1
diff --git a/dev-cpp/atkmm/atkmm-2.28.3.ebuild b/dev-cpp/atkmm/atkmm-2.28.3.ebuild
index f9a95dc8bf73..b8437c5aa6d5 100644
--- a/dev-cpp/atkmm/atkmm-2.28.3.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/atkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/dev-cpp/azure-core/Manifest b/dev-cpp/azure-core/Manifest
new file mode 100644
index 000000000000..637863e028aa
--- /dev/null
+++ b/dev-cpp/azure-core/Manifest
@@ -0,0 +1,4 @@
+AUX azure-sdk-for-cpp-soversion.patch 12323 BLAKE2B b9bb07576b4050ab2f4378b6b41a61e7d5f0636e0933bca13ca3f94ce1c8391828fbfb523821109e6f28bcce6009e62393ecb52d497be27ac40184c0c58b1153 SHA512 47f821ebb3f4a670efa4b76070087ed1e295fc838addc89ad4fd1379ba47f0d39fa63017efc4175609735e6e12b77ce14771afddc95102c3f631c02474b6b30f
+DIST azure-sdk-for-cpp-1289063cc2a7ba01fa7a8c7cd92155ef401c4cba.tar.gz 3130906 BLAKE2B 8fab2710f9c8bc5eb69b5f6bc389cf00cfaba1c6902ffa9a9e67e96bd91e508a9b1c643e57fbe74c68fa840bc707e00672ca0e3979baaabefb021849bb5815bb SHA512 19d122bd153ababd90d238a94b8227e56c17a677dc478fd680c099856fc874367a4c8aa83ccf372139400772951dad69899471970ac18088f901d67047b7755f
+EBUILD azure-core-1.14.0.ebuild 1073 BLAKE2B b1b66ec813192f57cc41ac501554750041e4ce92279abd81e08d59a4c31a051183dca713ec56b5fcd3885c6ebc458b6ad0856cc24378bfd261590a971d7b86d6 SHA512 222ea93c5c9c484f3f675476b8bfdcec8b53c261f2f59c87014b6a127459a51321c17f172227f323a5c5011cd78068e4d3ce4588e114a07102b3f07019783936
+MISC metadata.xml 336 BLAKE2B 20544d6b685b5fcedb7cedc0385a151f67711d351c2c285d53ff9128041f6455b42a89c3b709e73b4de49b21187f490b6ecf653e67328dfe3abf0fb0b6aaf438 SHA512 9adcc8ac58314efaa2b8daf6f11a42fe60942cf2e3c94ed85738ddd882e17589456955adae9a48226026461b98fc9805afda9f1e1f21959b2f57bd0647a4846a
diff --git a/dev-cpp/azure-core/azure-core-1.14.0.ebuild b/dev-cpp/azure-core/azure-core-1.14.0.ebuild
new file mode 100644
index 000000000000..1fdf31d0c265
--- /dev/null
+++ b/dev-cpp/azure-core/azure-core-1.14.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="1289063cc2a7ba01fa7a8c7cd92155ef401c4cba"
+MY_P="azure-sdk-for-cpp-${COMMIT}"
+DESCRIPTION="Azure SDK for C++"
+HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/"
+SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/sdk/core/${PN}"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT="test" # Too many online tests.
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl[ssl]
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	cd ../../.. || die
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-soversion.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DWARNINGS_AS_ERRORS=no
+	)
+
+	AZURE_SDK_DISABLE_AUTO_VCPKG=yes \
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/*/copyright || die
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+}
diff --git a/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch b/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch
new file mode 100644
index 000000000000..550f9f228478
--- /dev/null
+++ b/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch
@@ -0,0 +1,216 @@
+diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+index 8dec8cf..dff3461 100644
+--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt
++++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes
+ 
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 3ef7bf8..e99d57f 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE
+     PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+index 23cf7d1..3834d6c 100644
+--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+@@ -80,6 +80,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
+index 87c5cfd..9dbf5a0 100644
+--- a/sdk/core/azure-core/CMakeLists.txt
++++ b/sdk/core/azure-core/CMakeLists.txt
+@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+index 2152690..4af757c 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob
+ create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ 
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+index 0ea0b8e..e0dbe51 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK
+ create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION})
+ 
+ add_subdirectory(test)
+diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
+index 57fe6bb..3c21177 100644
+--- a/sdk/identity/azure-identity/CMakeLists.txt
++++ b/sdk/identity/azure-identity/CMakeLists.txt
+@@ -117,6 +117,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-identity ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+index 5f70eb3..b065d33 100644
+--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure
+ create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+index 0806e09..8014038 100644
+--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B
+ create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+index 6217fd1..2de5e64 100644
+--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_
+ create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+index 7cc62a8..3664d8c 100644
+--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+@@ -115,6 +115,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI
+ create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+index f87ceae..657ef33 100644
+--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
++++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common)
+ target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
+index 30f056d..ce90e8a 100644
+--- a/sdk/storage/azure-storage-common/CMakeLists.txt
++++ b/sdk/storage/azure-storage-common/CMakeLists.txt
+@@ -107,6 +107,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+index 71905c8..ac82507 100644
+--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+@@ -92,6 +92,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+index 891f954..cf6cd92 100644
+--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+@@ -88,6 +88,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt
+index e567623..2e340d5 100644
+--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
++++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
+@@ -81,6 +81,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
+index 038e267..d7e7976 100644
+--- a/sdk/tables/azure-data-tables/CMakeLists.txt
++++ b/sdk/tables/azure-data-tables/CMakeLists.txt
+@@ -106,6 +106,7 @@ target_include_directories(
+ target_link_libraries(azure-data-tables PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt
+index 84e3d17..43f3320 100644
+--- a/sdk/template/azure-template/CMakeLists.txt
++++ b/sdk/template/azure-template/CMakeLists.txt
+@@ -78,6 +78,7 @@ add_library(Azure::azure-template ALIAS azure-template)
+ create_code_coverage(template azure-template azure-template-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-template PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-template ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
diff --git a/dev-cpp/azure-core/metadata.xml b/dev-cpp/azure-core/metadata.xml
new file mode 100644
index 000000000000..5db219e6b1ee
--- /dev/null
+++ b/dev-cpp/azure-core/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Azure/azure-sdk-for-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/azure-identity/Manifest b/dev-cpp/azure-identity/Manifest
new file mode 100644
index 000000000000..fef029e836d9
--- /dev/null
+++ b/dev-cpp/azure-identity/Manifest
@@ -0,0 +1,4 @@
+AUX azure-sdk-for-cpp-soversion.patch 12323 BLAKE2B b9bb07576b4050ab2f4378b6b41a61e7d5f0636e0933bca13ca3f94ce1c8391828fbfb523821109e6f28bcce6009e62393ecb52d497be27ac40184c0c58b1153 SHA512 47f821ebb3f4a670efa4b76070087ed1e295fc838addc89ad4fd1379ba47f0d39fa63017efc4175609735e6e12b77ce14771afddc95102c3f631c02474b6b30f
+DIST azure-sdk-for-cpp-4b913e073e50466e8b2d674e65234e7b66d7db49.tar.gz 3130918 BLAKE2B 09f85c1d984b74de2ecfe7de3953b5d4d9898dd087d5a507f4a9a26ab79782a03022adf0fe5cd27cf998fbe277279a3dc0b3cc1977a8599338229146263fffaa SHA512 d243465b248b671495cf94c6d6a53639f6976cfd888a7963e98ba7381ae2b659e39af0102be31e2ad6912b4d3c78bbfc8038318fb98cfb736f5aa99d38207d93
+EBUILD azure-identity-1.10.0.ebuild 1099 BLAKE2B 8bab720a0229a15a2fad690e6872ba46d7886d3599f4289abb441bf907b0fdaacc6f8f6f4ae75fa3a2d7e3e7aa945663a3b9eceef37134b550a62c76465cb623 SHA512 c5f0708942aa75a3919aaff10f7ff62f73c8ffc71dde1ceea8a9880fdd1c6c168d39898a6bcd30d40eb365671e64575341689e929e666fc989b6752a153b1365
+MISC metadata.xml 336 BLAKE2B 20544d6b685b5fcedb7cedc0385a151f67711d351c2c285d53ff9128041f6455b42a89c3b709e73b4de49b21187f490b6ecf653e67328dfe3abf0fb0b6aaf438 SHA512 9adcc8ac58314efaa2b8daf6f11a42fe60942cf2e3c94ed85738ddd882e17589456955adae9a48226026461b98fc9805afda9f1e1f21959b2f57bd0647a4846a
diff --git a/dev-cpp/azure-identity/azure-identity-1.10.0.ebuild b/dev-cpp/azure-identity/azure-identity-1.10.0.ebuild
new file mode 100644
index 000000000000..fae8226b7eb9
--- /dev/null
+++ b/dev-cpp/azure-identity/azure-identity-1.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="4b913e073e50466e8b2d674e65234e7b66d7db49"
+MY_P="azure-sdk-for-cpp-${COMMIT}"
+DESCRIPTION="Azure SDK for C++"
+HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/"
+SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/sdk/identity/${PN}"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT="test" # Too many online tests.
+
+RDEPEND="
+	dev-cpp/azure-core:=
+	dev-libs/openssl:=
+	net-misc/curl[ssl]
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	cd ../../.. || die
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-soversion.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DWARNINGS_AS_ERRORS=no
+	)
+
+	AZURE_SDK_DISABLE_AUTO_VCPKG=yes \
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/*/copyright || die
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+}
diff --git a/dev-cpp/azure-identity/files/azure-sdk-for-cpp-soversion.patch b/dev-cpp/azure-identity/files/azure-sdk-for-cpp-soversion.patch
new file mode 100644
index 000000000000..550f9f228478
--- /dev/null
+++ b/dev-cpp/azure-identity/files/azure-sdk-for-cpp-soversion.patch
@@ -0,0 +1,216 @@
+diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+index 8dec8cf..dff3461 100644
+--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt
++++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes
+ 
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 3ef7bf8..e99d57f 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE
+     PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+index 23cf7d1..3834d6c 100644
+--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+@@ -80,6 +80,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
+index 87c5cfd..9dbf5a0 100644
+--- a/sdk/core/azure-core/CMakeLists.txt
++++ b/sdk/core/azure-core/CMakeLists.txt
+@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+index 2152690..4af757c 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob
+ create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ 
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+index 0ea0b8e..e0dbe51 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK
+ create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION})
+ 
+ add_subdirectory(test)
+diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
+index 57fe6bb..3c21177 100644
+--- a/sdk/identity/azure-identity/CMakeLists.txt
++++ b/sdk/identity/azure-identity/CMakeLists.txt
+@@ -117,6 +117,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-identity ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+index 5f70eb3..b065d33 100644
+--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure
+ create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+index 0806e09..8014038 100644
+--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B
+ create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+index 6217fd1..2de5e64 100644
+--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_
+ create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+index 7cc62a8..3664d8c 100644
+--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+@@ -115,6 +115,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI
+ create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+index f87ceae..657ef33 100644
+--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
++++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common)
+ target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
+index 30f056d..ce90e8a 100644
+--- a/sdk/storage/azure-storage-common/CMakeLists.txt
++++ b/sdk/storage/azure-storage-common/CMakeLists.txt
+@@ -107,6 +107,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+index 71905c8..ac82507 100644
+--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+@@ -92,6 +92,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+index 891f954..cf6cd92 100644
+--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+@@ -88,6 +88,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt
+index e567623..2e340d5 100644
+--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
++++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
+@@ -81,6 +81,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
+index 038e267..d7e7976 100644
+--- a/sdk/tables/azure-data-tables/CMakeLists.txt
++++ b/sdk/tables/azure-data-tables/CMakeLists.txt
+@@ -106,6 +106,7 @@ target_include_directories(
+ target_link_libraries(azure-data-tables PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt
+index 84e3d17..43f3320 100644
+--- a/sdk/template/azure-template/CMakeLists.txt
++++ b/sdk/template/azure-template/CMakeLists.txt
+@@ -78,6 +78,7 @@ add_library(Azure::azure-template ALIAS azure-template)
+ create_code_coverage(template azure-template azure-template-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-template PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-template ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
diff --git a/dev-cpp/azure-identity/metadata.xml b/dev-cpp/azure-identity/metadata.xml
new file mode 100644
index 000000000000..5db219e6b1ee
--- /dev/null
+++ b/dev-cpp/azure-identity/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Azure/azure-sdk-for-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/azure-security-keyvault-certificates/Manifest b/dev-cpp/azure-security-keyvault-certificates/Manifest
new file mode 100644
index 000000000000..252f6af854e7
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-certificates/Manifest
@@ -0,0 +1,5 @@
+AUX azure-sdk-for-cpp-doc-assets-dir.patch 2464 BLAKE2B d48f57b682b3547293cd395b888451daa3d77d81ee8836a005c4416cb26f1744d9b8d608522d8330aed8357b8aa71e85c1fd88e8d375868a4dcba0e826108e96 SHA512 0cfd4d2c777acf38bdfceed81fd60b23b3021e1cc49da4fd1c8da730dd5a39d66b5a95c67ab29f29c5280e3f94296447a5c3546e777d9e8a2dd0559b3cfbea6a
+AUX azure-sdk-for-cpp-soversion.patch 12323 BLAKE2B b9bb07576b4050ab2f4378b6b41a61e7d5f0636e0933bca13ca3f94ce1c8391828fbfb523821109e6f28bcce6009e62393ecb52d497be27ac40184c0c58b1153 SHA512 47f821ebb3f4a670efa4b76070087ed1e295fc838addc89ad4fd1379ba47f0d39fa63017efc4175609735e6e12b77ce14771afddc95102c3f631c02474b6b30f
+DIST azure-sdk-for-cpp-1d22b9bc578fec09364f7271ff7bd679d713e1f2.tar.gz 2966243 BLAKE2B ca2b1ba84dc358bbdee752329bcecfac42ecf19b4b89ba6998625a3612d9387226e58c50be683eedfb5cde9678e2508a4212b95380ccb1d7451a3092b01fd27c SHA512 991a10ad5ed45b93a8681e97a77c9aa91a25c8b2622c08862471484c9cb0c94354e83553505b20f0e05472bbc984bced0130429b770931c1dbf23a9bbeb22b8c
+EBUILD azure-security-keyvault-certificates-4.2.1.ebuild 1140 BLAKE2B a882e3b6f657a082527c9dccd693193b96d90ef8f479b49ce7ca826b7ed17947efcd6ef9a67515741234c67b28ae05c685e3f9cde24adaea9c6669195a2489dd SHA512 bca10fd8c92d36c63d4320116ded911cd10439f972021bf5f927afccb689e221d376b41e6d63e83308bdd8966ade43521b1e15e91db2c1e2dc41548103ef1c3f
+MISC metadata.xml 336 BLAKE2B 20544d6b685b5fcedb7cedc0385a151f67711d351c2c285d53ff9128041f6455b42a89c3b709e73b4de49b21187f490b6ecf653e67328dfe3abf0fb0b6aaf438 SHA512 9adcc8ac58314efaa2b8daf6f11a42fe60942cf2e3c94ed85738ddd882e17589456955adae9a48226026461b98fc9805afda9f1e1f21959b2f57bd0647a4846a
diff --git a/dev-cpp/azure-security-keyvault-certificates/azure-security-keyvault-certificates-4.2.1.ebuild b/dev-cpp/azure-security-keyvault-certificates/azure-security-keyvault-certificates-4.2.1.ebuild
new file mode 100644
index 000000000000..3af53771d877
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-certificates/azure-security-keyvault-certificates-4.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="1d22b9bc578fec09364f7271ff7bd679d713e1f2"
+MY_P="azure-sdk-for-cpp-${COMMIT}"
+DESCRIPTION="Azure SDK for C++"
+HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/"
+SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/sdk/keyvault/${PN}"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT="test" # Too many online tests.
+
+RDEPEND="
+	dev-cpp/azure-core:=
+	net-misc/curl[ssl]
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	cd ../../.. || die
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-doc-assets-dir.patch
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-soversion.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DWARNINGS_AS_ERRORS=no
+	)
+
+	AZURE_SDK_DISABLE_AUTO_VCPKG=yes \
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/*/copyright || die
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+}
diff --git a/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-doc-assets-dir.patch b/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-doc-assets-dir.patch
new file mode 100644
index 000000000000..7346d5ae8332
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-doc-assets-dir.patch
@@ -0,0 +1,51 @@
+From c8f662204f7858a38b485c23b387e5abdf13042c Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Fri, 20 Sep 2024 17:17:50 +0100
+Subject: [PATCH] Fix building docs from subprojects by not using
+ CMAKE_SOURCE_DIR
+
+The generate_documentation function currently uses CMAKE_SOURCE_DIR to
+find documentation assets at the SDK top-level, but when building from a
+subproject like sdk/core/azure-core, the variable points to that
+directory instead.
+
+Fix this by defining SDK_ROOT_DIR, which is based on PROJECT_SOURCE_DIR.
+This should always work as long as each subproject calling the function
+is always 3 levels down, which is currently the case.
+---
+ cmake-modules/AzureDoxygen.cmake | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/cmake-modules/AzureDoxygen.cmake b/cmake-modules/AzureDoxygen.cmake
+index 31b2e2f..eb64c39 100644
+--- a/cmake-modules/AzureDoxygen.cmake
++++ b/cmake-modules/AzureDoxygen.cmake
+@@ -14,8 +14,9 @@ function(generate_documentation PROJECT_NAME PROJECT_VERSION)
+         set(DOXYGEN_PROJECT_NAME ${PROJECT_NAME})
+         set(DOXYGEN_PROJECT_NUMBER ${PROJECT_VERSION})
+ 
++        set(SDK_ROOT_DIR ${PROJECT_SOURCE_DIR}/../../..)
+         set(DOXYGEN_OUTPUT_DIRECTORY docs)
+-        set(DOXYGEN_LAYOUT_FILE ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/DoxygenLayout.xml)
++        set(DOXYGEN_LAYOUT_FILE ${SDK_ROOT_DIR}/eng/docs/api/assets/DoxygenLayout.xml)
+         set(DOXYGEN_RECURSIVE YES)
+         if (MSVC)
+           set(DOXYGEN_WARN_FORMAT "$file($line) : $text")
+@@ -45,10 +46,10 @@ function(generate_documentation PROJECT_NAME PROJECT_VERSION)
+             az_
+             AZ_
+         )
+-        set(DOXYGEN_HTML_HEADER ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/header.html)
+-        set(DOXYGEN_HTML_FOOTER ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/footer.html)
+-        set(DOXYGEN_HTML_STYLESHEET ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/style.css)
+-        set(DOXYGEN_PROJECT_LOGO ${CMAKE_SOURCE_DIR}/eng/common/docgeneration/assets/logo.svg)
++        set(DOXYGEN_HTML_HEADER ${SDK_ROOT_DIR}/eng/docs/api/assets/header.html)
++        set(DOXYGEN_HTML_FOOTER ${SDK_ROOT_DIR}/eng/docs/api/assets/footer.html)
++        set(DOXYGEN_HTML_STYLESHEET ${SDK_ROOT_DIR}/eng/docs/api/assets/style.css)
++        set(DOXYGEN_PROJECT_LOGO ${SDK_ROOT_DIR}/eng/common/docgeneration/assets/logo.svg)
+ 
+         set(DOXYGEN_GENERATE_XML YES)
+         set(DOXYGEN_GENERATE_LATEX NO)
+-- 
+2.46.0
+
diff --git a/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-soversion.patch b/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-soversion.patch
new file mode 100644
index 000000000000..550f9f228478
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-certificates/files/azure-sdk-for-cpp-soversion.patch
@@ -0,0 +1,216 @@
+diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+index 8dec8cf..dff3461 100644
+--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt
++++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes
+ 
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 3ef7bf8..e99d57f 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE
+     PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+index 23cf7d1..3834d6c 100644
+--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+@@ -80,6 +80,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
+index 87c5cfd..9dbf5a0 100644
+--- a/sdk/core/azure-core/CMakeLists.txt
++++ b/sdk/core/azure-core/CMakeLists.txt
+@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+index 2152690..4af757c 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob
+ create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ 
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+index 0ea0b8e..e0dbe51 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK
+ create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION})
+ 
+ add_subdirectory(test)
+diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
+index 57fe6bb..3c21177 100644
+--- a/sdk/identity/azure-identity/CMakeLists.txt
++++ b/sdk/identity/azure-identity/CMakeLists.txt
+@@ -117,6 +117,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-identity ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+index 5f70eb3..b065d33 100644
+--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure
+ create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+index 0806e09..8014038 100644
+--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B
+ create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+index 6217fd1..2de5e64 100644
+--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_
+ create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+index 7cc62a8..3664d8c 100644
+--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+@@ -115,6 +115,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI
+ create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+index f87ceae..657ef33 100644
+--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
++++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common)
+ target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
+index 30f056d..ce90e8a 100644
+--- a/sdk/storage/azure-storage-common/CMakeLists.txt
++++ b/sdk/storage/azure-storage-common/CMakeLists.txt
+@@ -107,6 +107,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+index 71905c8..ac82507 100644
+--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+@@ -92,6 +92,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+index 891f954..cf6cd92 100644
+--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+@@ -88,6 +88,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt
+index e567623..2e340d5 100644
+--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
++++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
+@@ -81,6 +81,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
+index 038e267..d7e7976 100644
+--- a/sdk/tables/azure-data-tables/CMakeLists.txt
++++ b/sdk/tables/azure-data-tables/CMakeLists.txt
+@@ -106,6 +106,7 @@ target_include_directories(
+ target_link_libraries(azure-data-tables PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt
+index 84e3d17..43f3320 100644
+--- a/sdk/template/azure-template/CMakeLists.txt
++++ b/sdk/template/azure-template/CMakeLists.txt
+@@ -78,6 +78,7 @@ add_library(Azure::azure-template ALIAS azure-template)
+ create_code_coverage(template azure-template azure-template-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-template PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-template ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
diff --git a/dev-cpp/azure-security-keyvault-certificates/metadata.xml b/dev-cpp/azure-security-keyvault-certificates/metadata.xml
new file mode 100644
index 000000000000..5db219e6b1ee
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-certificates/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Azure/azure-sdk-for-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/azure-security-keyvault-keys/Manifest b/dev-cpp/azure-security-keyvault-keys/Manifest
new file mode 100644
index 000000000000..c36841b15882
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-keys/Manifest
@@ -0,0 +1,5 @@
+AUX azure-sdk-for-cpp-doc-assets-dir.patch 2464 BLAKE2B d48f57b682b3547293cd395b888451daa3d77d81ee8836a005c4416cb26f1744d9b8d608522d8330aed8357b8aa71e85c1fd88e8d375868a4dcba0e826108e96 SHA512 0cfd4d2c777acf38bdfceed81fd60b23b3021e1cc49da4fd1c8da730dd5a39d66b5a95c67ab29f29c5280e3f94296447a5c3546e777d9e8a2dd0559b3cfbea6a
+AUX azure-sdk-for-cpp-soversion.patch 12323 BLAKE2B b9bb07576b4050ab2f4378b6b41a61e7d5f0636e0933bca13ca3f94ce1c8391828fbfb523821109e6f28bcce6009e62393ecb52d497be27ac40184c0c58b1153 SHA512 47f821ebb3f4a670efa4b76070087ed1e295fc838addc89ad4fd1379ba47f0d39fa63017efc4175609735e6e12b77ce14771afddc95102c3f631c02474b6b30f
+DIST azure-sdk-for-cpp-1d22b9bc578fec09364f7271ff7bd679d713e1f2.tar.gz 2966243 BLAKE2B ca2b1ba84dc358bbdee752329bcecfac42ecf19b4b89ba6998625a3612d9387226e58c50be683eedfb5cde9678e2508a4212b95380ccb1d7451a3092b01fd27c SHA512 991a10ad5ed45b93a8681e97a77c9aa91a25c8b2622c08862471484c9cb0c94354e83553505b20f0e05472bbc984bced0130429b770931c1dbf23a9bbeb22b8c
+EBUILD azure-security-keyvault-keys-4.4.1.ebuild 1140 BLAKE2B a882e3b6f657a082527c9dccd693193b96d90ef8f479b49ce7ca826b7ed17947efcd6ef9a67515741234c67b28ae05c685e3f9cde24adaea9c6669195a2489dd SHA512 bca10fd8c92d36c63d4320116ded911cd10439f972021bf5f927afccb689e221d376b41e6d63e83308bdd8966ade43521b1e15e91db2c1e2dc41548103ef1c3f
+MISC metadata.xml 336 BLAKE2B 20544d6b685b5fcedb7cedc0385a151f67711d351c2c285d53ff9128041f6455b42a89c3b709e73b4de49b21187f490b6ecf653e67328dfe3abf0fb0b6aaf438 SHA512 9adcc8ac58314efaa2b8daf6f11a42fe60942cf2e3c94ed85738ddd882e17589456955adae9a48226026461b98fc9805afda9f1e1f21959b2f57bd0647a4846a
diff --git a/dev-cpp/azure-security-keyvault-keys/azure-security-keyvault-keys-4.4.1.ebuild b/dev-cpp/azure-security-keyvault-keys/azure-security-keyvault-keys-4.4.1.ebuild
new file mode 100644
index 000000000000..3af53771d877
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-keys/azure-security-keyvault-keys-4.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="1d22b9bc578fec09364f7271ff7bd679d713e1f2"
+MY_P="azure-sdk-for-cpp-${COMMIT}"
+DESCRIPTION="Azure SDK for C++"
+HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/"
+SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/sdk/keyvault/${PN}"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT="test" # Too many online tests.
+
+RDEPEND="
+	dev-cpp/azure-core:=
+	net-misc/curl[ssl]
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	cd ../../.. || die
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-doc-assets-dir.patch
+	eapply "${FILESDIR}"/azure-sdk-for-cpp-soversion.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DWARNINGS_AS_ERRORS=no
+	)
+
+	AZURE_SDK_DISABLE_AUTO_VCPKG=yes \
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/*/copyright || die
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+}
diff --git a/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-doc-assets-dir.patch b/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-doc-assets-dir.patch
new file mode 100644
index 000000000000..7346d5ae8332
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-doc-assets-dir.patch
@@ -0,0 +1,51 @@
+From c8f662204f7858a38b485c23b387e5abdf13042c Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Fri, 20 Sep 2024 17:17:50 +0100
+Subject: [PATCH] Fix building docs from subprojects by not using
+ CMAKE_SOURCE_DIR
+
+The generate_documentation function currently uses CMAKE_SOURCE_DIR to
+find documentation assets at the SDK top-level, but when building from a
+subproject like sdk/core/azure-core, the variable points to that
+directory instead.
+
+Fix this by defining SDK_ROOT_DIR, which is based on PROJECT_SOURCE_DIR.
+This should always work as long as each subproject calling the function
+is always 3 levels down, which is currently the case.
+---
+ cmake-modules/AzureDoxygen.cmake | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/cmake-modules/AzureDoxygen.cmake b/cmake-modules/AzureDoxygen.cmake
+index 31b2e2f..eb64c39 100644
+--- a/cmake-modules/AzureDoxygen.cmake
++++ b/cmake-modules/AzureDoxygen.cmake
+@@ -14,8 +14,9 @@ function(generate_documentation PROJECT_NAME PROJECT_VERSION)
+         set(DOXYGEN_PROJECT_NAME ${PROJECT_NAME})
+         set(DOXYGEN_PROJECT_NUMBER ${PROJECT_VERSION})
+ 
++        set(SDK_ROOT_DIR ${PROJECT_SOURCE_DIR}/../../..)
+         set(DOXYGEN_OUTPUT_DIRECTORY docs)
+-        set(DOXYGEN_LAYOUT_FILE ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/DoxygenLayout.xml)
++        set(DOXYGEN_LAYOUT_FILE ${SDK_ROOT_DIR}/eng/docs/api/assets/DoxygenLayout.xml)
+         set(DOXYGEN_RECURSIVE YES)
+         if (MSVC)
+           set(DOXYGEN_WARN_FORMAT "$file($line) : $text")
+@@ -45,10 +46,10 @@ function(generate_documentation PROJECT_NAME PROJECT_VERSION)
+             az_
+             AZ_
+         )
+-        set(DOXYGEN_HTML_HEADER ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/header.html)
+-        set(DOXYGEN_HTML_FOOTER ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/footer.html)
+-        set(DOXYGEN_HTML_STYLESHEET ${CMAKE_SOURCE_DIR}/eng/docs/api/assets/style.css)
+-        set(DOXYGEN_PROJECT_LOGO ${CMAKE_SOURCE_DIR}/eng/common/docgeneration/assets/logo.svg)
++        set(DOXYGEN_HTML_HEADER ${SDK_ROOT_DIR}/eng/docs/api/assets/header.html)
++        set(DOXYGEN_HTML_FOOTER ${SDK_ROOT_DIR}/eng/docs/api/assets/footer.html)
++        set(DOXYGEN_HTML_STYLESHEET ${SDK_ROOT_DIR}/eng/docs/api/assets/style.css)
++        set(DOXYGEN_PROJECT_LOGO ${SDK_ROOT_DIR}/eng/common/docgeneration/assets/logo.svg)
+ 
+         set(DOXYGEN_GENERATE_XML YES)
+         set(DOXYGEN_GENERATE_LATEX NO)
+-- 
+2.46.0
+
diff --git a/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-soversion.patch b/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-soversion.patch
new file mode 100644
index 000000000000..550f9f228478
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-keys/files/azure-sdk-for-cpp-soversion.patch
@@ -0,0 +1,216 @@
+diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+index 8dec8cf..dff3461 100644
+--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt
++++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt
+@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes
+ 
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 3ef7bf8..e99d57f 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE
+     PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+index 23cf7d1..3834d6c 100644
+--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+@@ -80,6 +80,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
+diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
+index 87c5cfd..9dbf5a0 100644
+--- a/sdk/core/azure-core/CMakeLists.txt
++++ b/sdk/core/azure-core/CMakeLists.txt
+@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP)
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+index 2152690..4af757c 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
+@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob
+ create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION})
+ 
+diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+index 0ea0b8e..e0dbe51 100644
+--- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
++++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt
+@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK
+ create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION})
+ 
+ add_subdirectory(test)
+diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
+index 57fe6bb..3c21177 100644
+--- a/sdk/identity/azure-identity/CMakeLists.txt
++++ b/sdk/identity/azure-identity/CMakeLists.txt
+@@ -117,6 +117,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-identity ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+index 5f70eb3..b065d33 100644
+--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure
+ create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+index 0806e09..8014038 100644
+--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B
+ create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+index 6217fd1..2de5e64 100644
+--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_
+ create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION})
+ 
+ if(BUILD_TESTING)
+diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+index 7cc62a8..3664d8c 100644
+--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
++++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+@@ -115,6 +115,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI
+ create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION})
+ if(BUILD_TESTING)
+ 
+diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+index f87ceae..657ef33 100644
+--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
++++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
+@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common)
+ target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
+index 30f056d..ce90e8a 100644
+--- a/sdk/storage/azure-storage-common/CMakeLists.txt
++++ b/sdk/storage/azure-storage-common/CMakeLists.txt
+@@ -107,6 +107,7 @@ else()
+ endif()
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+index 71905c8..ac82507 100644
+--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+@@ -92,6 +92,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+index 891f954..cf6cd92 100644
+--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
++++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+@@ -88,6 +88,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt
+index e567623..2e340d5 100644
+--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
++++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
+@@ -81,6 +81,7 @@ target_include_directories(
+ target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
+index 038e267..d7e7976 100644
+--- a/sdk/tables/azure-data-tables/CMakeLists.txt
++++ b/sdk/tables/azure-data-tables/CMakeLists.txt
+@@ -106,6 +106,7 @@ target_include_directories(
+ target_link_libraries(azure-data-tables PUBLIC Azure::azure-core)
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
+diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt
+index 84e3d17..43f3320 100644
+--- a/sdk/template/azure-template/CMakeLists.txt
++++ b/sdk/template/azure-template/CMakeLists.txt
+@@ -78,6 +78,7 @@ add_library(Azure::azure-template ALIAS azure-template)
+ create_code_coverage(template azure-template azure-template-test "tests?/*;samples?/*")
+ 
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-template PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-template ${AZ_LIBRARY_VERSION})
+ 
+ az_vcpkg_export(
diff --git a/dev-cpp/azure-security-keyvault-keys/metadata.xml b/dev-cpp/azure-security-keyvault-keys/metadata.xml
new file mode 100644
index 000000000000..5db219e6b1ee
--- /dev/null
+++ b/dev-cpp/azure-security-keyvault-keys/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Azure/azure-sdk-for-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index eb64f004b7a9..d2ec86ab1cd2 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -2,5 +2,5 @@ AUX benchmark-1.9.0-fix-documentation-installation.patch 1476 BLAKE2B 7c5848f754
 DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
 DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25
 EBUILD benchmark-1.8.4.ebuild 878 BLAKE2B 6233945fe9650081b11d16dceaa507dd71c715a1a97e195e6928789edf70fcf49bd05ac34a4509b4d0689713764d1a9e28e783d47ebfd99bfe1e72c8d46b7d2e SHA512 613d30096278b361be2b1963507c4c295fab63e61bd9fa84214da5af0c24197fc6b33e4390d26d5588b772465fab0c018f0dd8c3142cf6956abd2d77925cea3a
-EBUILD benchmark-1.9.0.ebuild 1796 BLAKE2B 41d9258a09d862c047da2b8a77c7cceb02cf3e2c3c6c0aea5d822578825fa093f3eaa4e9cc3f0c8809cb68b547c9caed08e4db2755e881c8067c92471e25e7cd SHA512 a37865ba4538efbb7b8f0618c79085d1c1878860398e82fbd99409169b3a85dc81bd39aa7756d745aeef5eee8bfb2716982db79e7d3766c32eee90ea8d08515b
+EBUILD benchmark-1.9.0.ebuild 1792 BLAKE2B dcd8faa6217e0c599ca54f8e1cba8f22ddb5afd977dde0e38917e502434cc24d9440ea05a62ece1ec87c69b3975021b0838415ac52e5e5b9408f8cbcc2288fe2 SHA512 a0d21e3197898af8a7afe64a241c95987af59326781c415d41317f7e2e72d8a8f1320349c1d08b08cd3cda10076bc5e922e91f44a23d251c222a3ab94ce38a03
 MISC metadata.xml 1447 BLAKE2B 84a378fdce6b9590457deb8f273fde40828c3156ca70b38f58e81248468d349f228d8eeb4fc4325614ce4b1e77fd4c8c4c275156b8cc125b7cb3c874da6acbc6 SHA512 3c8e6088b0ecd4f1075cb35972db3ac200636a9be7e63036777f840145195fb3b977829efcdd12649d9fb1913925a2d731c3d29abf581613f8d8e9dbe2006577
diff --git a/dev-cpp/benchmark/benchmark-1.9.0.ebuild b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
index 46af0a1dbe0f..4a62d10f234f 100644
--- a/dev-cpp/benchmark/benchmark-1.9.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/google/benchmark/"
 SRC_URI="https://github.com/google/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 IUSE="doc +exceptions libcxx libpfm lto test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 2f246cb26fdb..05510a6d69da 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,5 +1,5 @@
 DIST cairomm-1.14.4.tar.xz 618548 BLAKE2B 611e05b66e731d470c6d9a64c2eb4aee68aa73be5c05cb7e741e9a851ef15609cfc9fc27177531880b16517e62cf5c3f7669d4f7e7c5c78b9bc7d829e27f4d25 SHA512 9e2692837f55a2e66cd7e9d0a8033a35524df1c3186a53a9be75d71e899240dbc8959c914471e61e311812dabaf815e732142686b42fbdc75a71c05b41013d33
 DIST cairomm-1.18.0.tar.xz 632520 BLAKE2B e05135eb2e22ed6002821567dd951644febc173b04e001f3574d6dac36d0c6d012c3806e7485fa7856402945934c653c4546855a8e97b016130edac31726d827 SHA512 d358a765136e244773b4a0fdcb2d9c81dd0b76f7a27c7108f94df9765f2d790f5f50b5645c09c292efce3e012528f85114d51916450c5fe6fa87d09f5a405d4c
-EBUILD cairomm-1.14.4.ebuild 1227 BLAKE2B 74c5f28e92422690707af119d7b18f095fc330edf90662d9dc09a54bb2a7bf38df0636cc9591f3aebea5e8d181b1728c609596492c6cefcd066b5ca1dded2876 SHA512 6a09106a0f34ae04379361f68fae01a98b2012307f61a8a2fd106c8cf72fc2b1bb430d829389dc05266c4d4ce474f25e3c0cef5693bc5096066b870be36e550f
-EBUILD cairomm-1.18.0.ebuild 1223 BLAKE2B dde1754b4c7c72ffef842513b0317a40e141c1527b0b7565725bf4cd6740e26958ac24044e90042b956ae98fbc6b4869c5e35422725ce79cdc21463b27948991 SHA512 a9df1243966a98ad5e7a60d589aa19ebbb3af45cf11cfe0c4d99ad04a782c9a8d241af1f573e66af1b5201b7ddea18a9ce62bf329cbc29d8b24ff78516ebdb67
+EBUILD cairomm-1.14.4.ebuild 1221 BLAKE2B 1cc1f2932dac1ec895696e91f1a776a97cc0886628844d09cd0a8d77e83c92ba315cd070f1b49fe2cb0c0ddcab8aab18837d8ee44284cac8b85a61280b433237 SHA512 f9ce76f81400658073670676ce7aa40162c6c72578557a1bf25465efac015ef6895a1568db864df9c844c95835fda46efb0a6bfd0239e0994af5f24bcdd79623
+EBUILD cairomm-1.18.0.ebuild 1217 BLAKE2B 9ec1e543c7b6f74dfce6a2decddbc09c8ad48150dbedc39d1a62cc19af9224f3920b1af25c9e57e9e038404f886f24abd8e37794e91eab1eb751b6af8ca0d0c2 SHA512 e0681faf8ffa12da65a0e0185cde28b9265b6d96ca8bb11097fd52e14011f753a8867ba032f4fe8ff8e3a2c84010dc238fba570a56735a9ddd51ef9a191ca126
 MISC metadata.xml 354 BLAKE2B 89439085126a4fb94f11d8d498cf44b7024a82eb0296e7378f408a983f692bde88e1d9d4e53efdd2fa682524c12f441b2e30df64c600179ce07f488befa74cfc SHA512 2df4139278fd773753caf2030e0eff1c6d5e62fa509cb4196f3c2726a62395fc289b3439f762b677cc751a292302622658ccff73cdea100c77dcf2838637d06b
diff --git a/dev-cpp/cairomm/cairomm-1.14.4.ebuild b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
index fcca8361042a..ca24052866f3 100644
--- a/dev-cpp/cairomm/cairomm-1.14.4.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
@@ -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 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/cairomm-1.18.0.ebuild b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
index 11ec3b96345a..db7a1766c04f 100644
--- a/dev-cpp/cairomm/cairomm-1.18.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 93e9269f3307..c3dd80307ba8 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,19 +1,12 @@
 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.10.tar.gz 662225 BLAKE2B d8a2fb0e6f6a6f1ea25a860975ab596404ed41f4aed979a3c86da0140ce580fc3cbe12d44c1c936bac9ce8ec1813b2cb5d7d161be46c6924026f9645ca13aeaa SHA512 33c2292d5d315128a73f8cff27e92f86f3af30c45ce199297110b3cd2bf7d67a972fbcf7415aed1c467c384e0e3c63900c90faedff1d74c9d94b9e3e43df5ee2
-DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
-DIST Catch2-3.5.2.tar.gz 1159985 BLAKE2B 6aa810926f68098a8ac18bf3b045b0bf1be3632e3b34a59561c337312d0501199df7baf49d242c0dd6eeb3f4a9ca77c5545b86092e10865452f7bacaa13ea2a3 SHA512 1b9d5f35144f6c7acef0e76558a4adf3ff41c2c2292fbdcb3e2c2917fa2deb7fba593738105dd3c111f02ee8aca64010cf68f69bb8fb1815dbf771b509ab0576
-DIST Catch2-3.5.3.tar.gz 1169512 BLAKE2B ad515d379b071e015f593b3c6a1a66bafa3ca7c083f95ebba59603993a3a8ef40073a883731e83458bb0d463d3e53369e0474a6bdf0aef57e567f13bcc11d6a7 SHA512 57c996f679cbad212cb0fde39e506bade37bd559c0e93e20f407f2a2f029e98b78661e10257f9c8e4cb5fd7d52d0ea1eae3d4a1f989c6d66fcb281e32e1688f6
-DIST Catch2-3.5.4.tar.gz 1172449 BLAKE2B 2dee5ca34304032d92bfe147f9beff42c9b1db82b36bb0472a75f911d273cba4d881c3eccac4086eea6a77356defdab4b6d1a54cacd023eb8f904d12969ba60b SHA512 c22ad6a2fbf8665b8775d72dcdc6bfde324eb224fcd897ebce5e62c7ac7640823550198fff45e1ea548a5923db4392ce7009ff784ef78bd59356a2aae5337976
 DIST Catch2-3.6.0.tar.gz 1181300 BLAKE2B 37c56cf5537cb5fb66c1a4a9f15cd0b8e5f993f1f6ab1aa442d15b6290f2b1871abd97bccbdbf22694c4a86c736216c3006d36a82566bc9270704a5a11dc2672 SHA512 09c728a04d69b0692d6e2f7ceb5889dc69309406c27f7f2b5d383245a5357657c5540dd64a7a4a6e19388bda68105002425286468578b69b20e3a75366871ce2
+DIST Catch2-3.7.1.tar.gz 1193290 BLAKE2B 2205e74652ea5db2c2b3e56fbfedc71af77ab39741a9e1e8e8771e5cf4d554c75d3b1c57014fb8e2bce538715a4e305103b066ba5603af8b4e45402bbf87cc63 SHA512 e04c676e6bb3d7791f51a1caa770c4675d79b5396c9ba029c01ca0938e53bfa374dce117fccf753a89f3663192c91356acc9bc195e4866d215855df0667faff0
 EBUILD catch-1.12.2-r2.ebuild 860 BLAKE2B 8fa4f7d7663063b94684d010de522d84797b9dae64f2a317f9c6aca4c1e81f4f3fff3bf0318be47adb4f5ef4d1072fdb82fcfd36073833f3bebf1b9e3dfb0a6b SHA512 2689dcce5cfb1905ff55bf5062cf4a0f976b1e5a397a3964200695842d9ad00e4167b5eac6d105f577752a9f4003963cbf880b3069744d78f825ad60e513ce8a
 EBUILD catch-1.9999.ebuild 758 BLAKE2B b551fe477f41b1b8294244f3822762bd56d9f7e5576d793b48ee22fed68c93b0b49eec288a578fc9df12980166b2bcd11c1bd535901939852573c716639f167a SHA512 ace668452e8667068b6ab0a0701e59c91065f47b7c955bf999941cf4ceec430d60df973bf451e2c8ac654d98ad7ee4a2ee4367ca4db792d6565406db7d4e9f5c
-EBUILD catch-2.13.10.ebuild 977 BLAKE2B 25788bc631552cc6426f8dabf70a69397d1c976d7b96fe738aa1552a9fe5e66cdaf642a0044b9bbdafada19aaad263a61747e9b9f14505b676d30025ce570b8c SHA512 a3d263eb74ef2e8b4f8bf7667214032d713502577ed088d83b15c5bbf195219cb0c61030873dc802314926ab92d9bcc942de2396ee53418a1f93dc3d402e194b
-EBUILD catch-2.13.8.ebuild 1012 BLAKE2B 6d9ed3c4811c39fd9706896d41d048d2e17155d45759bd7509988becc9aa8d00267f444fc0d76c5c05a68a6ce55d5936537d31139156c9e459a11f209ece2b38 SHA512 1b9f7cebbb15abb3c50ad9452ad2336ce87023b77a42b5f5450dfdea36a5c1477899d6ed7153cc6ceb15145c6721634c3391b7b0b3eed11abbd068e2ad4f53b8
-EBUILD catch-3.5.2.ebuild 1001 BLAKE2B f54bed2b5ffbc6f9312736e5006bd49d7dfc579fd214d00e9aede0ff840c606763524ea01b2861f5a43dfdf8e3527b730e26b51a8abdc59be37c452b276da1ef SHA512 860d76cb7b2a1b0f5b6aae04cd07acf40205726ac650d6f5351d151744b5a33fec31194dc1a01c8acd03bcfae620a4a8c409f6db1335e844813af352877acde1
-EBUILD catch-3.5.3.ebuild 1009 BLAKE2B 655212eabcd56ab04f7569aac764b0f79b3e542521fbabc096c8256d68ec895ea6c58ab0ad4ae8ece8290fa5a849e472488894d7bbb410c883c086953b5bdae7 SHA512 20a5aa63d1cb679ffb7af373dc056993747199fab7b8cd857af94e030114ed48f04de793119c0944e207c7050d6f5c8d6092b5abfeafca69c4f4dedc276d062b
-EBUILD catch-3.5.4.ebuild 1009 BLAKE2B 655212eabcd56ab04f7569aac764b0f79b3e542521fbabc096c8256d68ec895ea6c58ab0ad4ae8ece8290fa5a849e472488894d7bbb410c883c086953b5bdae7 SHA512 20a5aa63d1cb679ffb7af373dc056993747199fab7b8cd857af94e030114ed48f04de793119c0944e207c7050d6f5c8d6092b5abfeafca69c4f4dedc276d062b
-EBUILD catch-3.6.0.ebuild 1002 BLAKE2B 40fb2c0c1d2908cefac78183f5403864099637a78a611570426f3b1ba2283981e3f0779ddf60e888b5a909a4c479ae176e8117f8a9d82df2af5b28870a0a0b43 SHA512 c2e4d8af797415684d32ff5b410ab1892eb71a611b3a8c2941dfb6c4af937ed19660ac9188696220a84efd76c8a8485579179b953031277a002408a26022893c
-EBUILD catch-9999.ebuild 1009 BLAKE2B 9dc56f59783ec8812d6701a2ed347e039c655f8ad874e20e5058d1667ba3c061cebd8824af1345e76fd90973b439aa3469bbaa564382f04545d0f43e9bc3d7af SHA512 dd9d0e08934ddb10273a2f6b5642bcca5471976f034cf026eec09da7d651553c2193d7f0928dbfa385333f21ef9a21a44185f3cc480970a97e83a08ec4f96103
+EBUILD catch-2.13.10.ebuild 963 BLAKE2B 2392b94dda54b089ed0bca01d7f9cfcb4a084a1e2a10690e1db76aa98c71b1a20242601d20cb5acb800712503c5aef0e58e7cdbf71d3ad05d4756c7fd2e96dd4 SHA512 3d3d441df8a9d5b9442625a2170473a3ebef7da58ad6757136a8ca50c7604c0d70f7e3207cb9e4c9438e225b9e2f97487067b31a52338791fd47c8393fe3ae34
+EBUILD catch-3.6.0.ebuild 1001 BLAKE2B 95d7c8e2cc6b5dfff2f1bf25538b75f9180dd4857aeaa01d6c49ef2fac1b401c7390cdabb9010b47e097a2b1e5289083bd1cb95af126a90569f1ebf881b0428c SHA512 f340b1337d5331b07f5e7c8c27b352ad5feea95cb31f938ecb251b103038ec6d6cc2394b365a06b710fd52a7fd405c4f807260faa08237e3c26b825e9a454dc5
+EBUILD catch-3.7.1.ebuild 1009 BLAKE2B 8331affd316e8a8b7b2489ada360b365a3c31d4fda78a8856a23bd6412860bb93cc28c234118f47e34e7f1ad9af2b19ff6c11d1cb60424758853c0b92733e5b3 SHA512 7f3d19ca9f04009ded12804df9dc10f6d958fc04c1cc149b05a6a8d26eab4f6b55df829ccbfdb8977e96d09131ad1ef9ade3e03f3e7810ccdaf0cbc9e7e7f508
+EBUILD catch-9999.ebuild 1003 BLAKE2B a10c49462859f5a6c3c1ab1c236f5a454baf56fdb8257ca66bbf9c3f811e0bbb90ce447aae575a5b105d16e297f9ceec9d16f33a6121a03d85fa6bc026b46bc6 SHA512 d907e2fcec23df6494b8c9f7524ab6c097df582e2b1bd988011e0cac4cd73b780e5fe2827d707a4ec43813d99dfe7a014efebfb376b76bad51ef80f0301e29ed
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-2.13.10.ebuild b/dev-cpp/catch/catch-2.13.10.ebuild
index 78018fe27f69..8cbf0b9240cd 100644
--- a/dev-cpp/catch/catch-2.13.10.ebuild
+++ b/dev-cpp/catch/catch-2.13.10.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/catch/catch-2.13.8.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
deleted file mode 100644
index 2a080fe0caae..000000000000
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc 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} )"
-
-PATCHES=( "${FILESDIR}"/${P}-musl-tests.patch )
-
-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-3.5.2.ebuild b/dev-cpp/catch/catch-3.5.2.ebuild
deleted file mode 100644
index 8b8c8c695764..000000000000
--- a/dev-cpp/catch/catch-3.5.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc 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_DEVELOPMENT_BUILD=ON
-		-DCATCH_ENABLE_WERROR=OFF
-		-DCATCH_BUILD_TESTING=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/catch/catch-3.5.4.ebuild b/dev-cpp/catch/catch-3.5.4.ebuild
deleted file mode 100644
index cde2d006ed7f..000000000000
--- a/dev-cpp/catch/catch-3.5.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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_DEVELOPMENT_BUILD=ON
-		-DCATCH_ENABLE_WERROR=OFF
-		-DCATCH_BUILD_TESTING=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/catch/catch-3.6.0.ebuild b/dev-cpp/catch/catch-3.6.0.ebuild
index 31c6d23ac8c3..b5f48ba33271 100644
--- a/dev-cpp/catch/catch-3.6.0.ebuild
+++ b/dev-cpp/catch/catch-3.6.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/catch/catch-3.5.3.ebuild b/dev-cpp/catch/catch-3.7.1.ebuild
index cde2d006ed7f..f7caddc14d24 100644
--- a/dev-cpp/catch/catch-3.5.3.ebuild
+++ b/dev-cpp/catch/catch-3.7.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 1b1704c908ca..0b01d9e0b739 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
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
deleted file mode 100644
index 86c60c15f34d..000000000000
--- a/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 e7314984e9a8..2618e260882c 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -7,5 +7,5 @@ AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f
 AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207
 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-r9.ebuild 1655 BLAKE2B 143d2dd7efb7e1f702fbfbb953b1c5d9d9ffa94441fe62bb1b9c787ee6f034d72b065fbdb106460949d6caf0b405f5afdc0c9137000e3ee569a45f1d02317eac SHA512 1104577d680705313023ab9afdd2a6abb7838ba11ea6d90df05b77b037d2d6aa98c44dc69edf27d000a4f31de35b7e1d257e01aed2c0e7056a118969d1201171
+EBUILD clucene-2.3.3.4-r9.ebuild 1649 BLAKE2B 85765625ee4ec3e58b406679e9cdfcb0f9500d16c6647fea92e55563f99572c726975aa7ae015e5a564cb217942eb38cb48856c40bdf74916026e16fcc98db3b SHA512 04baed54243be8155b374257472d4ab56adbc7672df6234cc76025c8ca1daacdfff21b3700490afa9b4675c984d669830720fe51bde3aeb09d52fcacf849aba2
 MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
index 37746cd881f2..d7e51e7ba444 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 8a3b263f6a63..8a4e8e6bb46c 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,9 +1,7 @@
-DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
-DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b
-DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee
 DIST cpp-httplib-0.16.3.tar.gz 1157548 BLAKE2B 986a33043ddf86623f70f50244051089cb6b824866ee247de13772263c691fde2b10e9eeef2078265f0a91b5744dafd2940892cff03c1a9cfd4b35df0d446522 SHA512 1a0d40f17b526db74dfa51903f0d15876b20c836a438be8f87ac2b18e535c3fad1822fbad9cf97053705a2cedc8171ab648e2e8c823eeb2e180c347283f3de9a
-EBUILD cpp-httplib-0.15.3-r1.ebuild 2251 BLAKE2B 9e6e6fef227f0b3b2e118ecef130f0a57d2877e0c4854016ee1ba6c2951a3f18b92cc660b7def42d4e6b3cffdf570eac6637ed502b9133297b2ff25a3441a0bd SHA512 191160987ddaed74c328a380b3363c02b62edfe4e3216fcc3de9d211e00e90855f02641d2dc05f4ec8e98bffd41308ed251db4921b7cda8f2fd69541b54b21cf
-EBUILD cpp-httplib-0.16.0.ebuild 2273 BLAKE2B d07c2a9cd5cfe8b486a587856b67bc7e960c503b6e84c6c011465717791b2b4e632232f31c485fe89d7f339849dce9629b73b7740ad9e51d2de9eb113f6fdcc2 SHA512 73b1e0c09b23afa5211bce0d424dcf1b1e583fc22aad839450f033798fceb86db67b7e6b61e2c1e36d01b3c8ede5f433bf521ceb396597a53f61c96a866bed1b
-EBUILD cpp-httplib-0.16.2.ebuild 2352 BLAKE2B 3d978a8da9edc81eb64ef7d7eb51abaa562b2701f8f51f0d8b9f7e53cc8197f01e9b17ac7be554870c934154a23fddf20b55f24d37f73a53904afc522a80f54e SHA512 2b974b667285768e4fb29317b0b007dd3ccff5dce1ede08ba6a7768864c279d8d1dc39ccbd9ea9eb23b58002782f505000f75865ba9129c49aa79fa7bbd841cc
-EBUILD cpp-httplib-0.16.3.ebuild 2352 BLAKE2B 3d978a8da9edc81eb64ef7d7eb51abaa562b2701f8f51f0d8b9f7e53cc8197f01e9b17ac7be554870c934154a23fddf20b55f24d37f73a53904afc522a80f54e SHA512 2b974b667285768e4fb29317b0b007dd3ccff5dce1ede08ba6a7768864c279d8d1dc39ccbd9ea9eb23b58002782f505000f75865ba9129c49aa79fa7bbd841cc
-MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
+DIST cpp-httplib-0.18.0.tar.gz 1321763 BLAKE2B 7807c2f4e3a6a0703a1253f0ec4ac7ef5fbcfad000e517af034a2aff64393229fb47830d215a1959e9893a66f51d19989c33b6b646b79be71e69687fe08cbbf2 SHA512 35ff903d51fee5428d7a95a0406460f8a18d1b5653f6ec8f353d7a2f1084598e599b24d0401f7214d5ee8d9764c74a4e617fff55acd4e6733ab1b9f2d7d4403c
+DIST cpp-httplib-0.18.1.tar.gz 1323636 BLAKE2B 8335c9a4d69d7e9b2e7e3c4036b49627536c8d6cffa7a5ae2c3dff693c5458f7fa2f89f3da2c130325069225d3204ec579900d5c5266dff7a9c732c134b39907 SHA512 6dd1054d0171594bf871a918b5540cc67981a48f7dbb82e9029a4877afc6d8c36e2f69411f5eec7b052bf0245554d01f33ef2180f42a15f6b8dd86ebb2427a41
+EBUILD cpp-httplib-0.16.3.ebuild 2345 BLAKE2B 7db6fc04933b01998aee1625286b90a4493cd0827a52bdc5bca83cdc618376f464955cadaf9b394426e35cf6f882c3e46f41e21435db83bc61d6cf3ce7afc074 SHA512 de16cd8a1427d52af38e2a720639933efc7d1ea832b8bed42b9cedec03345a3bb283897daefa145510b80f3b3f723afb6fddba6669105faa387efc60206c3e66
+EBUILD cpp-httplib-0.18.0.ebuild 2381 BLAKE2B 278349677e050af68a1b532c550a89194f5dfa7a1f180265433583cfc08f8d6a492aff0ff327be7880449e04cffbfa561595cadd924aa45d9d355e0915ee51e3 SHA512 4677c16d4583e5ad57f21e4600aa8ccfd6509beab76e8db0255babe6c55b92180b4b64f44f1b7ee9f4f63ca3a90c6b20268f08f6ed88044634f0069af0e3dc7b
+EBUILD cpp-httplib-0.18.1.ebuild 2388 BLAKE2B c66c6ec0ac6cce1cb14ff50cbea9a35f606cf09c459f2e8207f614bba3c7d363bc331d9751039cace5c6b5c51bca210e85062c1514c90fcf836f33c8cce85c98 SHA512 da218f7f940cfbab85157d15c718681c2bec554359914135f7ce68fd1e1b0b662269ad52cc013b522025a8ceed18dbb65bdeaed6fdd0eb9b810a0a1a661891f7
+MISC metadata.xml 659 BLAKE2B c9c46e9a3121e3c3f81bc1f141a21847128a3a56014dd9128d2a81b0926daa61255d8343c3616ea30a22c6e5079ef0d2c5cc0b4787f41c5723ec01113c92d202 SHA512 796b439f7b02af71da07f5a434bf99ad3403c9e425163aadebbb2bc2c73db32291fbb72ddfaed97db2a7a1bc05950738faa1eddfa88e65ea80601075f99d1975
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
deleted file mode 100644
index 71dc06d9a302..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake-multilib python-any-r1 toolchain-funcs
-
-DESCRIPTION="C++ HTTP/HTTPS server and client library"
-HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
-else
-	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-IUSE="brotli ssl test zlib"
-REQUIRED_USE="test? ( brotli ssl zlib )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DHTTPLIB_COMPILE=yes
-		-DBUILD_SHARED_LIBS=yes
-		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_test() {
-	cp -p -R --reflink=auto "${S}/test" ./test || die
-
-	local -a failing_tests=(
-		# Disable all online tests.
-		"*.*_Online"
-
-		# Fails on musl x86:
-		ServerTest.GetRangeWithMaxLongLength
-		ServerTest.GetStreamedWithTooManyRanges
-
-		# https://github.com/yhirose/cpp-httplib/issues/1798
-		# Filed by mgorny's testing, fails on openssl >=3.2:
-		SSLClientServerTest.ClientCertPresent
-		SSLClientServerTest.ClientEncryptedCertPresent
-		SSLClientServerTest.CustomizeServerSSLCtx
-		SSLClientServerTest.MemoryClientCertPresent
-		SSLClientServerTest.MemoryClientEncryptedCertPresent
-		SSLClientServerTest.TrustDirOptional
-	)
-
-	# Little dance to please the GTEST filter (join array using ":").
-	failing_tests_str="${failing_tests[@]}"
-	failing_tests_filter="${failing_tests_str// /:}"
-
-	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
-}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
index 43d66265bb25..82aa4bbda953 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.0.ebuild
index 461e273e83ef..736278e707ad 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.0.ebuild
@@ -18,11 +18,11 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
+SLOT="0/${PV}"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
 
 IUSE="brotli ssl test zlib"
 REQUIRED_USE="test? ( brotli ssl zlib )"
@@ -86,6 +86,7 @@ multilib_src_test() {
 	failing_tests_str="${failing_tests[@]}"
 	failing_tests_filter="${failing_tests_str// /:}"
 
+	# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
 	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
 }
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild
index 43d66265bb25..9972ed866068 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild
@@ -18,11 +18,11 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
+SLOT="0/${PV}"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
 
 IUSE="brotli ssl test zlib"
 REQUIRED_USE="test? ( brotli ssl zlib )"
diff --git a/dev-cpp/cpp-httplib/metadata.xml b/dev-cpp/cpp-httplib/metadata.xml
index 2c799a5ed146..78f768d283a3 100644
--- a/dev-cpp/cpp-httplib/metadata.xml
+++ b/dev-cpp/cpp-httplib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>xgqt@gentoo.org</email>
diff --git a/dev-cpp/cppdap/Manifest b/dev-cpp/cppdap/Manifest
index aed7ddb0e28d..148543540a84 100644
--- a/dev-cpp/cppdap/Manifest
+++ b/dev-cpp/cppdap/Manifest
@@ -2,5 +2,5 @@ DIST cppdap-0_pre20230605.tar.gz 100715 BLAKE2B a7b6f745b7445242544deb2cd5b93bb1
 DIST cppdap-0_pre20240802.tar.gz 101733 BLAKE2B 18302d37493ab38b579b0a00756e18efbaa1620e705e2bb54b24ccb3388837ea8aed28c880b358b670006f84ccb7df036125d1c2f7bb210ba51fa0caebef0759 SHA512 2432c2b413d956661342555a50ab2ed4cdf86de5e7bbda0822a2e7359ad034a0b0150bb6b98dff0d1a3d64e89cd8de67a7a620dd4c9e220a7ed1f9f80e5a36e6
 DIST cppdap-gtest-0a03480824b4fc7883255dbd2fd8940c9f81e22e.tar.gz 874709 BLAKE2B 706e6d168e080494ac63cf607c189f55f5e98100fd744dd184a8217173f66891aedb8779a9c8b0aa289889d1f73e18c50ef65d8c70228e2a795a5e5081f66894 SHA512 55867a2e39647a7846506446d642dcd740711dee8c0dfe25887fd6ad361161617f3d462bdb415dfba20693849949c022e97e2de65dd731cc63b9466edd1c8b87
 EBUILD cppdap-0_pre20230605-r1.ebuild 1432 BLAKE2B 73b55cdc52822fc2b6f4a0af4ff7771927c90393d3fdd467e303caa2a5eb4cd71c2f95b41606e62f7e39112917fb888553226b7bee3849480c1787f5777be3dd SHA512 2eb49dcf1a932b9a8ccdd0aa777d57f01aac7a06a811a83354dde8b9ab0b213df80a72c3e68577d12211028342fa10521de7bc9a48282772af5d108298274730
-EBUILD cppdap-0_pre20240802.ebuild 1079 BLAKE2B ad944b06d388a8b0ca7b2134e909b4143ac097f760cd395bfacb07a64a73b340e377c93e0f329512d2293ed2baa2c50d6415dc0a9a6b501c7c1be6b4b0610112 SHA512 1e41befa4de233877d001e4aeb7685a61ec6abb58b6544885e514d37f0e0fa1492a9fb178edd533d366c936f966cc476784a697d98f7a47d43a4329d8c4859b2
+EBUILD cppdap-0_pre20240802.ebuild 1075 BLAKE2B 212c0f8609623fe908d46329a8eec4fe8d1054069b396357015bcc38bd5b4ccdd78c17bda2012e17c8ba143df49408b9eb77108e9c2cebd7a9fddffd4aefad31 SHA512 f8c92247cd2b2ac478bd93a67cd79b242d10ac177afe127d8a2ec7ade67f92f1970e5b1f0549072a1f4648662e07f52d838bee10384bc753690c85c6d6d61120
 MISC metadata.xml 336 BLAKE2B 1af53ad3c19922104b16ccdce9681ed7f3ec0b7629ff10864504f040e13d230668b945e912689dfab11ce3db908de1b57cf6a64ad5355b4ace02a81490cf3bed SHA512 15ccaee98d37b7fa915a9fd209cc9bdece01f3935714347ff8e261d66922a6bffd50df1017c75cedb0050883c7def7ad7d9d2f6ddd55116f7c8e73786d92af89
diff --git a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
index a590a1f1bc61..e4991d2cc9d5 100644
--- a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
+++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/curlpp/Manifest b/dev-cpp/curlpp/Manifest
index 1cab1fd0f62c..fa39405d5fe0 100644
--- a/dev-cpp/curlpp/Manifest
+++ b/dev-cpp/curlpp/Manifest
@@ -1,4 +1,4 @@
 AUX curlpp-0.8.1-fix-pkgconfig.patch 1324 BLAKE2B b1b2e235b586cab2c08b35b52784e654cec32159b6ca37a53ac84ca36acad87c0f96cb403069d27c78d2fdb0fd70b02c70631e6dfdfcb5765372af4ca89c304e SHA512 04d7d9800f02b1364728d71c80ab6af1f16abf35224ff07623a925895360f06a8afad4795dba2e6a1403b860905c9114f114e53ecfca9b4186d8729248aa3c75
 DIST curlpp-0.8.1.tar.gz 143017 BLAKE2B 7f3911499b42077c9f108b0355005744300383836a1c82dcba80207482b231527482fb17dcd78a7f288903e996afaf49a4478c7cb5c821bf597b26f4450a430b SHA512 a46b47150c0f0f1f0056e08966ce2fefa5e86fc729406e0220fbcf400da5409f05c87b636b13da3c4d4460c1177aedb494b9569bbcd9012326d4d5f59376397e
 EBUILD curlpp-0.8.1.ebuild 664 BLAKE2B e12ae70c4030c070d164fad853aba00992e0f4d320340228e06bb1303c882a6d519d1cd203d253eebde848b41960eb72338bf4bd0d0062a2e233e8c4b096d628 SHA512 081b126e5f4c5463d91da94b163bf0d605c78b177a8b267c31f058ff06d654e0291386af36170498731c75fab5c42b29985f7dd7a12e71b8d2ceb71ffb933389
-MISC metadata.xml 796 BLAKE2B 85996bee4498e368b11f77eb33f2813d8650d9c193f32bc6e1021597a376eec9411ab1eb50c873071cc9b464e9abf4665f32a22e36eccb7f413d22b49a2907f3 SHA512 8a95aac399bcdc8a9e9af98a18b04790b72838bbbc957cd096e5d7220fc1772d5ba90a0dc1a4303b14159dab93376b3f8dd2ac62cbc3004d543d00477e943dca
+MISC metadata.xml 546 BLAKE2B 4921a123ca7663b5a28fc0802bccb54f663201bf801e8365b89ebaa4a72d63305f452719b778f26b9626fd2cb65a88010beba54012e8e1861d71717345951b36 SHA512 1559189f865c5fce19f7b8a34c9e6fd9e51d1c6fbb3e53094aa54aa4783950d7d90bd22e3e370078834c53788ec40ad676525be4e6c4a08d8a840ed566fb1964
diff --git a/dev-cpp/curlpp/metadata.xml b/dev-cpp/curlpp/metadata.xml
index 045b624e941f..bde4b97dec12 100644
--- a/dev-cpp/curlpp/metadata.xml
+++ b/dev-cpp/curlpp/metadata.xml
@@ -5,14 +5,6 @@
 		<email>xgqt@gentoo.org</email>
 		<name>Maciej Barć</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<maintainer>
 			<name>Jean-Philippe Barrette-LaPierre</name>
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 7b7d5f71a592..27e738077d2a 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,4 +1,4 @@
 AUX doctest-2.4.11-backport-pr770.patch 2746 BLAKE2B f82437dfc44151b4b155a3e800824247356f666e6d80342096d91f07cbe351198e78b2e4cf6fc23091947ada9b518c4c4fc8b9f0cf56546acb36351ef0e06c40 SHA512 cf4464f9ff66520c4e0b413849d98b775772ff5e039b3921f6165a218f40642e62a5a79ee8e9c7fce3d27bb0a9ff61ccafb075eff82abb35e6950a2abcc94773
 DIST doctest-2.4.11.tar.gz 2183312 BLAKE2B 277f22f3a9e275dd9f5cfffeeaf8346577223c2b872606f21fe5b8462573917a59a88bb61de145a92be61129396f9b4a87d94f4723e362428b1bd856ed84fcfb SHA512 04425686057079d3f1a6f767c487f1953050f553dbff9fc42b42dde1358fe26e46bf6219881bbfce625f15cb9c229474d82688120eb2cb2b1d8138db0cc91b3c
-EBUILD doctest-2.4.11.ebuild 752 BLAKE2B c4589e7f8da53f18271b7a093a483da23cbb9b158149afb05f3ca24c92b084fd0982ad7cb2724a8f0c4141e1f619dbe40741bb008383be7c86a7c503862bd3b8 SHA512 fd482a4ab59d0326f4591d53d1feb7208bc2a22dcad2195de4e4bc861179e32acbde8649d3657dc472ea39fdbcf99a19cb8989a19055bd6c60426e74fef78c03
+EBUILD doctest-2.4.11.ebuild 746 BLAKE2B f47ab1652bff35da1698a5d107c72f02d2f1013d9f9d16a6c9f547c05f89e2d73abd31ea2722afa386c3239a5da306df686ba961437d27d10d5f388e0a7ca718 SHA512 85e8070ac29b9680d26f2c2a6e900d2cf59d892265a45073d45aed8025905f2741dc195045813771351a7af231a06e7a231f79c97e8f19bd2a890e60a5cb5336
 MISC metadata.xml 326 BLAKE2B 3e72d429b6ab5c634954d5a9ed16f7ba2097800afac3d9d87cbf6926f196560351f5b5248dccf11b3da9e4a74f267fb1ff9ead8c18a458a87154dfc3514e7596 SHA512 381c172bf088b047ebba38d5c38d55f81b45e3a846aa54747ea01a23708b20f9f8434b18397318b4472b455990dc4b1e6626b821e2ab89cf5ad6ad92a813ed1b
diff --git a/dev-cpp/doctest/doctest-2.4.11.ebuild b/dev-cpp/doctest/doctest-2.4.11.ebuild
index 62633e219795..7c2086c10353 100644
--- a/dev-cpp/doctest/doctest-2.4.11.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PATCHES=( "${FILESDIR}/${PN}-2.4.11-backport-pr770.patch" )
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 530d9bf67e93..fb4cf9e2e1dd 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -9,8 +9,8 @@ AUX eigen-9999-please_protect_your_min_with_parentheses.patch 1979 BLAKE2B 50da0
 DIST eigen-3.4.0.tar.bz2 2143091 BLAKE2B a32aac13cbab68cfaaa252d8a406e6a36ecfd1239361412b1f9baa08284a94467479c08ffae10cb847e9916472b46b1c1af4efbf81f957c8200a4379acd42c42 SHA512 cc488eb111e0e248744d2bc4475b345b5fb82361dff226a5b73a33bd0388de8c219cff8cffcf8f476b672fc0e223f339e8c6a1cfb6293840a4a6abf232438a89
 DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
 DIST eigen-lapack_addons-3.4.1.tgz 6215074 BLAKE2B 564c3398de1f4ea249b58957a482cda0b5eb99e5021e1f18abf3b4d2893fed48912bfa8386681fcae03dd933eea91644f7429d47a53684d64462209a6ae76f30 SHA512 5a827d0befb521cb430f0d63f5000e7955359bc637cdb7292d942712e98c0702570a5b650a72fc609bf5b43633661c0e51de7761ae892df6ff0aab667f436edf
-EBUILD eigen-3.4.0-r1.ebuild 2588 BLAKE2B b24a464408f8f03282db44144e07080a0bac0b71a38d0847af12f8e506d218f437ebfba0b8ba5ccb654c4d317ecb8006ed02f0b63673038a5f91ed35968762ca SHA512 be51f2e62f6f954365dadefb1e33d7dd5bb094ff33d954b75ab1bbd2a1d0d8e54a673bb44040608668bbe5d936dd16e169cd5b16e9a3fdbe61fdc11a21ccc870
-EBUILD eigen-3.4.0-r2.ebuild 12325 BLAKE2B d1ca7a402652d4e02573bed1e752b41308b8e96e86259cbf6238a514602d848bd50b1da806b3eca71d42cfecc153ebaf8dc498adb1c171e3a4dd64312350ca17 SHA512 30d8749e5ce808e8c70fdd6ce5d82a2c0d16eb1be303dbf4da0ed93743b7874549d1ec7700205d2b3c7712eb8d0cfa91d093155ac2f602400fd5202c0c552de8
-EBUILD eigen-3.4.0-r3.ebuild 12384 BLAKE2B 20fac08e54380979ab413ac4d9a6939298c38130a06131d0dddf9ae72bd7b63a47a9effb3296eaf047ad885874bb53ff9853af5720be12dc0a7efc9a5a8c14cd SHA512 a7891132bffb927458c0505d551437c6e6d5cd2b6866a2fbc0c7b190eb28ae5b33936088fdf119a613eb1d1e07d48ec5b97fcb312a0b6c3bf436855c47a63c30
-EBUILD eigen-9999.ebuild 11683 BLAKE2B 405987f4e22b99670a07c7a593f1f33317e6b3d8e44f111757145f63ead1a36247e4c4feb6a4078590c277e0d46ce04a305771221ac64ac75e7daaa14c25f95d SHA512 60d8ead0d69e9cebb415e2682f89dda1be3bce484c18505ba7bec1ea38653663b58d3d729b3ac5e34d3d11d0c958a6050bc4d19faf51fbeab2e13b9914952532
+EBUILD eigen-3.4.0-r1.ebuild 2582 BLAKE2B bfd78a8ac892c51f99d607938e928904e491585b74eafd724ded58efb6a13303e6f5fe6a33cee1f111e56235864456f9467d8a7a12b886640ae7d37dc51f4691 SHA512 397fcb6ed18bb179eda04a48311c07335dda72141998b930eeef421f2fde5ef7225d7736b4abbb734266acfa0a5bbdf61d2d25417322de911cd24aefbc0c4020
+EBUILD eigen-3.4.0-r2.ebuild 12319 BLAKE2B 3076170c708ff5bc1954f9f3945103419201a6517f66864e8a4084739fd2b346169b404b38d08abb85fa22057f75ecf3cff2d0ff57c2c94f9aa26224cd397d7b SHA512 2cfc5fab7b369b3c3dfafb955c059474b7073788ee0805ee7f98b01ee9e155806b18027d6e31b8449aa58aa477406f4354bbb240a6022b6433a6c07610c64162
+EBUILD eigen-3.4.0-r3.ebuild 12384 BLAKE2B 235552c6417e980080a778f5a5464cae04837c50f8f8480a440706cea81e7c06b4c683c0f1c1b798b36bc3fd2adf5e274095c47e1482f1bdb83d8b598774604a SHA512 4d70964d7f32262622f68033791c0ac3f203c7724d4c7162779bd4b3e59e6667e4c15f1cd72f3cbb0f975b8f2627d2b2b46d9f854826e9411dea164b534cd0b8
+EBUILD eigen-9999.ebuild 11677 BLAKE2B e42dc3426e06b7b2f6ad1be6bc7b227c6cabcb9f91cc6f04a0eed655a78bc34057a190d49d6e065b770667cf0d38f1559a944a1e24cb40ac74c7e81d5e590695 SHA512 46159693c5f19c7a8385b49081e2dfa6a7b710f290fb3e38d2da8b3ea88293118c995c539302e9649e8e33ad9e0a83f899d3610fa8a7e45366585908158186b8
 MISC metadata.xml 2122 BLAKE2B ce2287db5f80ce761bc100cc0f6fe3dd549dda68853f0fc40d362e9dce72d5a5398b3d2b9562aa8feafc5b869adaab78a87b65499404df072c35d353ec2f5cd8 SHA512 446fe2316a72f8c058445f4c14bfe4683476f1a041d9af55ab3d1f76b4e2b6e83d0f7aad4a7febcd7c4c5bdfdf1efc30483aaa276ace6ac941488ee3d137c5c7
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index c2124e3ffa08..708a6acc8779 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 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/eigen/eigen-3.4.0-r2.ebuild b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
index 26773df2bd7e..02a83d1063b8 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
index 91904f16f7ab..7b368f254261 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 219f6dba7d1c..b4f6ac524ee0 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/fast_float/Manifest b/dev-cpp/fast_float/Manifest
new file mode 100644
index 000000000000..ad53de531881
--- /dev/null
+++ b/dev-cpp/fast_float/Manifest
@@ -0,0 +1,3 @@
+DIST fast_float-6.1.6.tar.gz 101727 BLAKE2B eb9833f7bff6e6086db1525fcc71231c5cc8f47985aa4c71078d896afb5fea20c41bfdb55de6c1e8c9cfa6c9b842331f340115590683e1d9e6a3ba40f4148870 SHA512 d2dbd2537f433329a76539c061238af080125526b7822fbfdf0f70ac0a6800114848b9be0fdf9c51dbb22211af3bdcf9829ed9cc4a47fd28ecdeecf7c5d4b663
+EBUILD fast_float-6.1.6.ebuild 932 BLAKE2B 4455ffef2bc8dd9ddfea12440a2d001953943e644eb56f3d838052d9055dda8fa494286b52658728589b08feeaf78b9de9ac10b199dd3c2024c5566fbaff76e3 SHA512 7c7dc89323e5d95caa4701a811905bbf95d6a7bca1a2f927a8a0b8b0770f59ed64862b2dde986e0f51b293622493cc3196b390a02849b1068dd1c7879c8f7312
+MISC metadata.xml 485 BLAKE2B e4083d4fbbe17c0ae9e645a312bbb3523a5c90e461ec4168e9e808f358ede9376d7d02dd58ea07ff594056ae11445c030ad5ef6fbcc0514416cf8600cd70bd7d SHA512 4868fbfc454bd279f1dd1bc958f69c0955a5f3b2aeb06bfdd58f37d7f7275e90f73962fcda358338ebf9100668ae0d4b624f3347848e83d9faa9c47516c88b83
diff --git a/dev-cpp/fast_float/fast_float-6.1.6.ebuild b/dev-cpp/fast_float/fast_float-6.1.6.ebuild
new file mode 100644
index 000000000000..275cb2b493bf
--- /dev/null
+++ b/dev-cpp/fast_float/fast_float-6.1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast and exact implementation of the C++ from_chars functions for number types"
+HOMEPAGE="https://github.com/fastfloat/fast_float"
+SRC_URI="https://github.com/fastfloat/fast_float/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-cpp/doctest )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=( -DFASTFLOAT_TEST=$(usex test) )
+	# Avoid passing these without USE=test to avoid cmake warning
+	# "Manually-specified variables were not used by the project"
+	use test && mycmakeargs+=(
+		-DSYSTEM_DOCTEST=ON
+		# Unconditionally calls FetchContent
+		-DFASTFLOAT_SUPPLEMENTAL_TESTS=OFF
+	)
+
+	sed -i 's/-Werror//' tests/CMakeLists.txt || die
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/fast_float/metadata.xml b/dev-cpp/fast_float/metadata.xml
new file mode 100644
index 000000000000..ec84f74b1736
--- /dev/null
+++ b/dev-cpp/fast_float/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>stffn.mobil@freenet.de</email>
+		<name>Steffen Winter</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fastfloat/fast_float</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index d287a3a75a0c..3cea7921b8ac 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,4 +1,4 @@
 DIST gflags-2.2.2.tar.gz 98704 BLAKE2B 54cbf3b0a422d662e89c1921614ae9f20a4a383524d374d1e7ce1473eff0a6e121c1a2255df0b9d27ae9866c8e63094b908534c5fd2173737033cc0f184a5e4f SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
-EBUILD gflags-2.2.2-r1.ebuild 1059 BLAKE2B 0cdb99a8e3290e4e5e4cad995cb52b2c1228870a9685f7faec73e50d05efe5eaa8dd83ff4736c0a6778b6bee0d76f15dd5f5be799b04ec057a00441d2f69bae6 SHA512 2d443fa89dd54ba622e21386d0b1fa091578059cd7541608b6131ac7fb6e24597967b646ec6b5e987b61b60ee5d70d6563ec6ec860038c5c1457af7793639e80
-EBUILD gflags-9999.ebuild 1066 BLAKE2B 23fc75e77551362ee23c414cb571ab0410038b1f948fac3686e2c6cfeb1bd5f1b8f5d07a73c34916a9e5b84423dd7579c7f0c56b2013a422a0ec4e0f1c657e58 SHA512 5348253c9ed0795bfeec89e22102dab7518348db3d474e8df480ecc4484c143f2dfae0aeb2ddc0c2c8962cf5b8441293c61f2d9b37327d600f7bb32f5615b236
+EBUILD gflags-2.2.2-r1.ebuild 1053 BLAKE2B f6fe20edff9c2ee31b44367e7054d5dd8d5ff8f57068dc835834fcd825076c90d13195e1255ef13cc1dbc425f4919d51d68696b5c8d9b13c7b1a7e2fb37effe1 SHA512 22edd330d770f885e480829a0d0ff2f307e9f5855952b39fb53949522952a52c6bcffba4a8182692e2f737b20083fb6ff292b0cb1baa8f7c026d3018deea395b
+EBUILD gflags-9999.ebuild 1060 BLAKE2B fd791ee50a531b43aabaf99465b0cdf54fc92c2415b196195e3db1508368ea320ad457c822fd3f3a3d1ec7cc5ee1f4b5b7665a0da515c7019afbd3243e278012 SHA512 294f54f4d32a04cc49a2e8f67f12a36ac0bdb766cdd42f4a849062aa0ed680a8bd0c2543a310204088a20c48a37ec0ae8d017e52b9f199c1e697266b3ac71ea5
 MISC metadata.xml 304 BLAKE2B 60a6da87c20f4ada3ec9a2422aff9f3fb9eb1a4705f95dbd571188162d2463c29816c96749afe2b79121111251152c41cad9c3ecc71c7cbff39b1b828fd3e1dc SHA512 d05d1c3c886539f75bc1edcac267dbe1c38db77563680091c2a3aab915a0982a43fe9570b5c8b6180a9d2b7fdc1cc96dca313e2a7339a4a6f398cd09eba90f9e
diff --git a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
index a841f16304c3..7b79194640a1 100644
--- a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index a6c7626265c0..2dca97cfe29b 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index c35b60d405a2..89b882e17f2b 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.66.7.tar.xz 8773780 BLAKE2B faef7b6a9ca91aed3ac7ddeddc0413f87daba4b8d1e887431bd7db8b7cae66ec449292bbb0fb9e4e574d1ce680853ab0ffb476abd76c19257c7434389ba3d2cc SHA512 09b99622c051afd264d7a9b23025ee28ec870c6d23a5084ef7192f67b96fb8f16be5dbb2e8a4ff8a1d4ff873d3e73b4e25dee122049266687f471dcd3989b5bb
 DIST glibmm-2.78.1.tar.xz 9486784 BLAKE2B 2875d93b0cedb6bf84cb463b1c73743c55dc446ee0c1dce36344a8e0ff77cec8d890d1e3b0f1d4a841d293ab123cc60bf5c6b55ed9a0456fe235d928bf28ff05 SHA512 5ace15c492be553e2c6abd8d0699197239261feaa2b45ff77181f59bb98b584dc822bdd46dbdee35691cc5a955a3b88e03f58532459236fd780823354c35d0a6
-EBUILD glibmm-2.66.7.ebuild 1287 BLAKE2B 8d8eceeba69ccd2f5125311e66d7dd62cf3616bddc646b4c69e5f88d3e3761385d8b9b01136824d34aebd0f211cc6feb7b8c9c7074d6bcc25b2e9ba3c7fb6b19 SHA512 4c075a364dfcb7529ac845e7a2885800f989b9fe23e88875be5592c8d2d93e00b8a8d592933d240743a7deaa5ef0a63e1d7302bd009093f2270804fe8506af35
-EBUILD glibmm-2.78.1.ebuild 1248 BLAKE2B c8018bd53de7b9ee75952b3ecc1f94e348ea58f27a048d9106985766f410aa8c77c4db7570e6cdbfab12f340e3c33d2292ce3024b4afe3584c7283be4c7ed0f0 SHA512 01d3599049d05ee8e3b11c49c7beb164cb2bd758da330cc49200d14b46dea8a1140c443eab8d6e8b7dd00d9b66984b4119d5f3611ecb3cde0e0aaff783c48b6e
+EBUILD glibmm-2.66.7.ebuild 1281 BLAKE2B 15a7f265fd0ea3ff6894b7eb6a00fc029fb5ae9f3419860473027ed6dfa1986ad39f376912ae84d5423fcc1061ab1cb67dae9d89a5f14b0b690915330c42dbfb SHA512 97d0dc69016368d65c436a38b28a8e9b5f405060fc5a49036e3870a6fb88cfef6269110398b09b1640e978417ec9384f2b407c54e75836459b24825e958da6e2
+EBUILD glibmm-2.78.1.ebuild 1242 BLAKE2B 2467b61c128028662d8bbd8cb6157557c3f37509f3c0a4c79beeff55cda87d287dbde54ea457d1a0c823fc136a52be26efff730cc3e69d102bc93570196074b1 SHA512 e5ea928840227fe71382613a0df8ed1d6d75e167bccad30a29c969404537b79263bfc2b8b65c5a2f367908400c7a20c6f2b542d99dae34b3d2aa1cea2f5420c7
 MISC metadata.xml 347 BLAKE2B 0f49cb5cb997a9eaaf002de24fc194635c44b9ec75b7ca00dfb7157d6d65750dcdea3ae269fab353e06f80ee3cfd5a316e9ac909e90bbfb348b024ae66f460ce SHA512 6a9c01425d4df29d240bcc8ce91ce042f80ae8bddf78776bc1180beea36ad7657cf3337e7c2cdb0b560f3e146ab20a2ecf9d631f87004421cbfbd8d0dee2d558
diff --git a/dev-cpp/glibmm/glibmm-2.66.7.ebuild b/dev-cpp/glibmm/glibmm-2.66.7.ebuild
index 1b62c91362bd..239dd34663c4 100644
--- a/dev-cpp/glibmm/glibmm-2.66.7.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.78.1.ebuild b/dev-cpp/glibmm/glibmm-2.78.1.ebuild
index 447b4cd169cb..a8e3d22a6aa2 100644
--- a/dev-cpp/glibmm/glibmm-2.78.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.78.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index c9f7f21dc0b5..3080d9d9b11f 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -2,6 +2,6 @@ AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3039 BLAKE2B 3df4edd58d1a
 AUX glog-0.5.0-vmodule_levels_changeability.patch 5980 BLAKE2B e6d57f0570e7ef849a52cf1cba91f1b39e7a8e08e994585dee7948effe54c9a53fcbf50468891d1122b1fbbd9763bf5b51a2a37c34035fc7380d90076cd3b8bc SHA512 53ff691227f8c9386ddc1b223001021ab31fbf8ccc2fe06a0372952e66ebe4903e99ccb4139c65efd06b1ccd9a5c73592466195de263b69f3c45ce89ea9517f8
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
-EBUILD glog-0.5.0.ebuild 1506 BLAKE2B 869ed3d3b2be384250d53bcac744354dea33296667822d40227d317d9bd99135dc3edfb0b9632e66663569561af83ac665c17427ed3755e74ef2d865f4679078 SHA512 f9fa6fe43960ff1b61a3d2c50a28c6890bfa9427ba20cfa5760f2c0ecf9fefd6efd76bc52b5fe1de41a1bf58efae3239a3f0fa6759e3a5025e56124da1f40684
-EBUILD glog-0.6.0.ebuild 1222 BLAKE2B 6a88a5648b71743b8b7124adfd94dc468ed6ebe44066455d3862b28306ca3dcf5ec182308f56375a7f54eb085fcdb211d89d23135cf45fd3d84e6661c51de0a9 SHA512 5cfbeb151f8ede3006423564c5091770c5583004c2c8c918c65f150f5c971a4d168d3eb6ce0e6634124090895ec3ff4f52fb843dccaabe21bb332c31738985d9
+EBUILD glog-0.5.0.ebuild 1500 BLAKE2B 38909cbdb53082c12d6532c6bf319dfaa0650d82406039d3b9fc28b8a98f64c782712a2576befa1d1eba9987e2e50690cb85d6d61235bcb9df4364ac2dbe0405 SHA512 195f6e70efceebc2453c07f8b086e50552add1e28b418b49eadb91140b236b1283ac61e4e84c7159d298b5268e1d874b1223efa6c060dee4c1d3da931ae34de3
+EBUILD glog-0.6.0.ebuild 1216 BLAKE2B b4d8a24e3d5bac1c325041eab17fa0872a80e258c10ac5ed9c28ea39a6b78ce27a77d7b9991d2fc27ca5deb31447eba7b46100138b65713119157573caf8c09e SHA512 7f51f57f79c79b00c3b6ee160dc0088d5ddc2ee25cc45845436464205e1e4347e8aa5865ee78d4645735aa3c0a6f10cb35133b16ed912930e15802f0c0f91c3f
 MISC metadata.xml 590 BLAKE2B af2c7346ac5b7fd48346a2ff37ceaabe6a165004ec0dc6763a96bfdc31436c2d874d0c8f603c841b2bfe74d911b53000b9958c24bcb2c355b7de485185d83043 SHA512 e7d7e16afaba5d5961ff6fe9ea673ec1c26f5a2d502edb428bfc1bbd7b226ee25cf7abb296c8827404c65ad692d09966be37c95d0d7e4c56e5191df5b3367e8f
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index e2ac655eab68..6e7df7821fe7 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 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 082818391c35..069eec682395 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~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 caba32b09a81..53933d52f0cc 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,8 @@
-DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
+AUX gtest-1.15.2-fix-gtest_help_test.patch 545 BLAKE2B 2190dfba1b5f7ec54e18633a0f89ab9a98784f243b1b26daaebffadb55fcc863adaa7eb714202250034cede801c8f9bcf402683d2bf35c5f6ab13401ae4d7455 SHA512 66a7cb06ce56635f963db21637d5b5cf8a0671b0ae7594f63f7fc1e2dad99816459516d6e14a794fd026b82ffd2735eebe5501aaaa5a6b6c63f176447fd672fb
+AUX gtest-find-re2-with-pkgconfig.patch 891 BLAKE2B 5fc210c1ddff06e94493c0adc59d8db557606475aeb7c557ff98406850cedd1562d78f0f26d0a6c570e811a5a38218256c502bdaac6673a2b59293299e247eea SHA512 6625f1a8cbc59187aa5526c1a55f5851253de90744bcc14c3f5e2360ab1cd3be921893c5c90e3fc0eaadaafb446728ab6bc3f5ae456158e0f4b5dc84438df88d
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
-EBUILD gtest-1.13.0.ebuild 1870 BLAKE2B f2ea03a8fa7c5d8c39b4a8af7e1a2ee7871fb0636fa457b1a0b850e0307d0f030228d0c7b60fc5b9545cd412b5b6d2886ccc690977682fbd307ff4bf82967a85 SHA512 4fd2ad52f159021aa883364dc0ec5c65376d6efff0279c9aaf516df5f258678df2c2bc84d5b19d638aa7831138e9af3dbb64ea7f7e80ae09923d02a9445ac4ba
-EBUILD gtest-1.14.0-r1.ebuild 2001 BLAKE2B dd8e1a1da489984695880791e4e4eb0da4369395908b7de3a2ce4df508f4e2c1e01bdd267e43fcea5d6f4c3237b2e997ec7a29556179be9df9aed034231d76ce SHA512 4dae89b191ae44b1f7326c7712cf5b0ed9b372e212c9f8860f4339f4904d1abc955246bcb31dcac5c578981e23cc36e9468dc884a63f53741288e8bc2b6ffe56
-EBUILD gtest-1.14.0.ebuild 1755 BLAKE2B 50437b841c5a62f9f1d39e499bd2190bc0aa2e024fb81e4b834d3c44182e0d349bf8afe07b59a9ebf8ec375c27b234b09572849c34b51f9f7b47400ab7f2c440 SHA512 6888c92fa06a074cc83a8a99b661d2d5db561bd4860e205b10c58d3327eefd7baf5fad8b314f212001df595aa0c225164081420ebd37f6d7423471d9be4a8460
-EBUILD gtest-9999.ebuild 1996 BLAKE2B c42acf93040334dd0300980e64d6ad662b0e33b4147d6e2dc2ec10ca9d618d4b2e21840963c114258579439dc736bf6db2b2d11cd56defb2ea7e27210efbcda3 SHA512 be1189ec0f6e3319d3d7b32208c51e6d4d6b8312750ea2ee0d8438ad61a1a1320302ef60645a6c68526c53bd1cf1cc84bd98869b3e61fa8803876714b18793b8
-MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
+DIST gtest-1.15.2.tar.gz 872667 BLAKE2B 2525d7a8572364cc2c2c129197201fc31e3cb4aadf4be37a995447a9b8e393205628e666dd190dca9a169b693883a5a2a5cafd6432cc3d1263a0c834ff8cf121 SHA512 9046841044a2bf7edfd96854ad9c44ffae4fcb9fb59a075b367507c0762a98eb32cb6968d46663228272e26321e96f4dd287c95baa22c6af9bad902b8b6ede4e
+EBUILD gtest-1.14.0-r1.ebuild 1995 BLAKE2B ee3fac63616ad3179d8f0c7fc1ab035a294c8840fe2c3ac6d88199b3472dd9d14082b367a34d430da2c3c3b47c3440cc5f5fd5fc99ad6381b133c931580c43bb SHA512 74d78336494d57b67d2ba22aefeecdfd7cf78353ea135c2b2b1e6d023c1ea417725ccbf0f5a226f187ecf9bfc3ae54bd2db125a7f8d25d70cf8e2326d9db062c
+EBUILD gtest-1.15.2.ebuild 2258 BLAKE2B ff37b84c1d7bf056b90a2779740793da1631b50fee6fa3d98e03eef3deac3d8549acf38e5159c1fbb578e0e21ae09247cb881ec6fb694e1cd19e87a1e90e36d9 SHA512 7f7cb15f4790692637978f46537fdba2e6caadf4db45030ef93bb384b94ea2e13d7fa605be757368a0bcefff36b6b3136327b380c834e6024f7fa26fa63b4082
+EBUILD gtest-9999.ebuild 2258 BLAKE2B ff37b84c1d7bf056b90a2779740793da1631b50fee6fa3d98e03eef3deac3d8549acf38e5159c1fbb578e0e21ae09247cb881ec6fb694e1cd19e87a1e90e36d9 SHA512 7f7cb15f4790692637978f46537fdba2e6caadf4db45030ef93bb384b94ea2e13d7fa605be757368a0bcefff36b6b3136327b380c834e6024f7fa26fa63b4082
+MISC metadata.xml 699 BLAKE2B dd19af9dbf315b62e6519246f338d1d281056f88aa06872578562cafe2019525aba5b6fc6eb0b74960c67a505272ea0e704a2eca382941f6f8ea6a5b2bb2d891 SHA512 8d7483d9a0085c5aa04abe858a56952decdcbd2cae2642c000077d60167f0f0a15c588158d64cafa999afbcd8d3677458075026e5f4c3d531631974611362c59
diff --git a/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch b/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch
new file mode 100644
index 000000000000..1ba087a53e39
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch
@@ -0,0 +1,17 @@
+Similar to the bazel build, gtest is supposed to pass --has_absl_flags to
+gtest_help_test if building with abseil support but neglects to.
+
+--- a/googletest/CMakeLists.txt
++++ b/googletest/CMakeLists.txt
+@@ -293,7 +293,11 @@
+   py_test(googletest-filter-unittest)
+ 
+   cxx_executable(gtest_help_test_ test gtest_main)
++  if(NOT GTEST_HAS_ABSL)
+   py_test(gtest_help_test)
++  else()
++  py_test(gtest_help_test --has_absl_flags)
++  endif()
+ 
+   cxx_executable(googletest-list-tests-unittest_ test gtest)
+   py_test(googletest-list-tests-unittest)
diff --git a/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch b/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch
new file mode 100644
index 000000000000..3a78ae15cac3
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch
@@ -0,0 +1,32 @@
+dev-libs/re2 is built with a Makefile which doesn't install any cmake modules.
+For now, use pkgconfig.
+
+Bug: https://bugs.gentoo.org/940734
+Signed-off-by: Peter Levine <plevine457@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,9 @@
+     find_package(absl REQUIRED)
+   endif()
+   if(NOT TARGET re2::re2)
+-    find_package(re2 REQUIRED)
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(re2 REQUIRED IMPORTED_TARGET re2)
++    add_library(re2::re2 ALIAS PkgConfig::re2)
+   endif()
+ endif()
+ 
+--- a/googletest/cmake/Config.cmake.in
++++ b/googletest/cmake/Config.cmake.in
+@@ -6,7 +6,9 @@
+ endif()
+ if (@GTEST_HAS_ABSL@)
+   find_dependency(absl)
+-  find_dependency(re2)
++  find_package(PkgConfig)
++  pkg_check_modules(re2 IMPORTED_TARGET re2)
++  add_library(re2::re2 ALIAS PkgConfig::re2)
+ endif()
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
diff --git a/dev-cpp/gtest/gtest-1.13.0.ebuild b/dev-cpp/gtest/gtest-1.13.0.ebuild
deleted file mode 100644
index 6ed984c01511..000000000000
--- a/dev-cpp/gtest/gtest-1.13.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/googletest"
-else
-	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		SRC_URI="https://github.com/google/googletest/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz"
-		S="${WORKDIR}"/googletest-${PV}
-	else
-		SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
-			-> ${P}.tar.gz"
-		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
-	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
-		googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GMOCK=ON
-		-DINSTALL_GTEST=ON
-
-		# tests
-		-Dgmock_build_tests=$(usex test)
-		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# Exclude tests that fail with FEATURES="usersandbox"
-	cmake_src_test -E "googletest-(death-test|port)-test"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newdoc googletest/README.md README.googletest.md
-	newdoc googlemock/README.md README.googlemock.md
-
-	use doc && dodoc -r docs/.
-
-	if use examples; then
-		docinto examples
-		dodoc googletest/samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
index 931f57f2e5cf..4187a128ec02 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/gtest-1.14.0.ebuild b/dev-cpp/gtest/gtest-1.15.2.ebuild
index 307c8242b1c9..f7916479456c 100644
--- a/dev-cpp/gtest/gtest-1.14.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.15.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib flag-o-matic python-any-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -29,34 +29,51 @@ HOMEPAGE="https://github.com/google/googletest"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="abseil doc examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
+DEPEND="abseil? (
+	dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]
+	dev-libs/re2:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# Exclude tests that fail with FEATURES="usersandbox"
+CMAKE_SKIP_TESTS=( "googletest-(death-test|port)-test" )
+
+PATCHES=(
+	"${FILESDIR}"/gtest-find-re2-with-pkgconfig.patch
+	"${FILESDIR}"/gtest-1.15.2-fix-gtest_help_test.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 multilib_src_configure() {
+	if use arm && [[ $(tc-is-softfloat) =~ (softfp)|(no) ]]; then
+		replace-flags -O* -O1 # bug #925093
+	fi
+
 	local mycmakeargs=(
 		-DBUILD_GMOCK=ON
 		-DINSTALL_GTEST=ON
+		-DGTEST_HAS_ABSL=$(usex abseil)
 
 		# tests
 		-Dgmock_build_tests=$(usex test)
 		-Dgtest_build_tests=$(usex test)
 	)
-	use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	if use test; then
+		if use x86 || use x86-linux; then
+			append-cxxflags -ffloat-store # bug #905007
+		fi
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
 
 	cmake_src_configure
 }
 
-multilib_src_test() {
-	# Exclude tests that fail with FEATURES="usersandbox"
-	cmake_src_test -E "googletest-(death-test|port)-test"
-}
-
 multilib_src_install_all() {
 	einstalldocs
 
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index ecb89314e216..f7916479456c 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -29,10 +29,22 @@ HOMEPAGE="https://github.com/google/googletest"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="abseil doc examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
+DEPEND="abseil? (
+	dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]
+	dev-libs/re2:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# Exclude tests that fail with FEATURES="usersandbox"
+CMAKE_SKIP_TESTS=( "googletest-(death-test|port)-test" )
+
+PATCHES=(
+	"${FILESDIR}"/gtest-find-re2-with-pkgconfig.patch
+	"${FILESDIR}"/gtest-1.15.2-fix-gtest_help_test.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -46,6 +58,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GMOCK=ON
 		-DINSTALL_GTEST=ON
+		-DGTEST_HAS_ABSL=$(usex abseil)
 
 		# tests
 		-Dgmock_build_tests=$(usex test)
@@ -61,11 +74,6 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-multilib_src_test() {
-	# Exclude tests that fail with FEATURES="usersandbox"
-	cmake_src_test -E "googletest-(death-test|port)-test"
-}
-
 multilib_src_install_all() {
 	einstalldocs
 
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index 2a73b6d6508d..982d3d7ce6b4 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -9,6 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="abseil">
+			Build with functionality provided by <pkg>dev-cpp/abseil-cpp</pkg> and <pkg>dev-libs/re2</pkg>
+		</flag>
+	</use>
 	<upstream>
 		<doc lang="en">https://github.com/google/googletest/tree/HEAD/docs</doc>
 		<remote-id type="github">google/googletest</remote-id>
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 09729387c60c..a2a72441cac5 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -2,8 +2,8 @@ DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b783
 DIST gtkmm-3.24.9.tar.xz 15122612 BLAKE2B bbc80e5140a5c003817a1d6a0e63ebdab971fe9c92cf07d2edcbb8a3ee5e2371ab7b932a5c9af56da096d3e37d6e76101ad25d9cea5074d29d31f97e69960c3d SHA512 6e6e53d7d434f51758ffddce00dbae61074c54a5d3a5bb852fea558147af4ca6c40f9fcf4e7f9fafcbbc22ea33cdd99ea06208b72542c7e75f4dca19a80c6724
 DIST gtkmm-4.12.0.tar.xz 16359928 BLAKE2B 84b5f5ee5ef85c9f6d32d3047ab794f4ded3fb33665e18b4b6cacfc4836f5549e9cd32103963de367d0957fa58eb55b02ed06a3d3c6b6777c296d1c1fe3cabbc SHA512 0bde82ac1331c86810bb513362c81a30b0abaf906af4cf4b0607b85362125d8a15307fb5c51c6497fa9292acce437af027c4e336231dd18d72251f43e3d23688
 DIST gtkmm-4.14.0.tar.xz 16713784 BLAKE2B 27366963f25b704d71a2afabc4e04ad3ab0986f9094a62c6897cabb7ad8c318db94da79197e375da231bd972c1173c3af7a27ba28173f5f692c2e8682c31cd0f SHA512 94cf1f764e539b8b1fdff101f6e134c5e2bc9379f1dae3b6daef66ab94e90f5e70a41d8eb94842fd54c0f8706c565e975fa2adf6e4c6913cecaeb3c8cf00a1cd
-EBUILD gtkmm-2.24.5-r2.ebuild 1539 BLAKE2B bf277f4718556c99499769537d1487bb061fe21c42a75a35045f2d584400746bf5b1975258915898aed7aa0071350a5fd4d7f26dcbec02892e2beaea6bb87a1e SHA512 e53ae5dc8f57b2f4d32b47498cf763a2471f2fc812113ab326d88fa354949472edc21a4257469664da5faf4f6cc50123b0ac7eab81ffafbe6d0b01f2f3883d0b
-EBUILD gtkmm-3.24.9.ebuild 1436 BLAKE2B 5e316688daa0a77f662747af5ad28d717fb95ca5e44c6b3f5a9c5d948aa864b17969efe53e62f84993ff156935667c29fc7001d96beac1d73343c47985c960d2 SHA512 eac072b1dbb61f9a06c26572c4b36edc86fbaba01933c044c3c0e0c882c1acc871166e6cdab28ae0b9fffeaa5672b42df7d760d82b27fe2f45ea56b3c40b626e
-EBUILD gtkmm-4.12.0.ebuild 1042 BLAKE2B 17e7055c1bfaa53ef813179131b4f25f25870c45903aeff0a21eac734cdaafb66620feb3881ac29d5664b35da79eed3ff3daf22ce25da7567470e8149110d900 SHA512 50b8529558811ead387f23e9dff66eecbd574964e0d2f9e2a5f4e9db8b2f306f6795077653ad9847f59776ac86bbd0934d6b5af333d5afb4f157e448bceb1831
-EBUILD gtkmm-4.14.0.ebuild 1049 BLAKE2B 3a3afc211da8c83d4b423da6f959686bb2f4fcd1a37bd031c8cbd5f7f03e9bb044548f986fe86fe7d54494960f0228866148aa32609dbd4d306233595f00a41b SHA512 d30bfe381853b8bb6aa57c73867f1f4a8a72a027ff628fd8151dbb7aa84deae3a444dc0e8f761e7c5887b2ea6d60bff19f6c625cccf2a24addb549fc6366cf24
+EBUILD gtkmm-2.24.5-r2.ebuild 1533 BLAKE2B 440a5546d0e09997990f50759a4d7ee3f6cc1c2b476fdd813f400959f2ab9df9c25e1ec7901fef5130e7186a5076c5fb9a8155268f6b60c03567147f115534f2 SHA512 0a9529fae0681f1b85f5c08bd75a8f31acd4a1c6490b2a7af0533bb431f97a0a6696680c1029d2d9708ac6f8896feaa3946b08c0d5fbecaecd6be33ad4d856af
+EBUILD gtkmm-3.24.9.ebuild 1430 BLAKE2B 8974098e6209536e433f74d1fbb2853e483106004926dba6e3b70a0994f683c2541eeb2a8256f9a98187ee0322b8b6082f577ce9636c6cb2774014589a41984d SHA512 077d9ad2f373c7ffbd01f4d755c423db2baeec3d16c3aac6bbcead63b53ce6e03c27903b8a5ac272928cbb1f04d8a9c62bd3ab6fed4e480390c810d320559741
+EBUILD gtkmm-4.12.0.ebuild 1036 BLAKE2B 17eb0952dffae86a9d90b4cab8d03bd2a02781f989e683615136a5d21447626e35db5ce533441d8ce1c8848489533f05698ddd62209b7da2d45681ca806291bb SHA512 ecb449081307a6d26d7ae941e17a5a7abe8061dee36a607525ad68d9e81954790604365acfbc81478c43a4d2dca84e872c7e72eeacef3edcc2ea2de149ceedd2
+EBUILD gtkmm-4.14.0.ebuild 1043 BLAKE2B babad04d3e1a2433ab8e1858d32b67a16fd9781bfca801dd8b181cbcecbfb8239eeb3f7cd854617767bb72938cdc58e7cb61d2c04708c8fbb14f88faa161a215 SHA512 93c36aa5ca07eab7ef9c36d5acc2fe1c06e0262fe1ffde700fa5647d8296fc91b20892d7dfa6cc710980bed4e4ca91547649793b850d69ef0858b3b6e8d40b6a
 MISC metadata.xml 346 BLAKE2B 590b61bebe118f44f4ac99d2590e6285138507599c79325441d534c727fa610f587d2c4eab35ef34f5a60f8c7f08346924c5ebcfcd74bafe704f81f3144710fd SHA512 2c4cca6bfad460aa0d0730f2e1355384be69fe30598145e4a2c22c46bbea4c3d9dbc46f863da35be01a54ad091a4b0d70e3f09b7e89013c1beb367eda0fb490d
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
index 362b10e1252c..45c1c8e551f8 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
index f0d1a12ae4bb..ff5dc7cef540 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="aqua gtk-doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.12.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.12.0.ebuild
index 17ce2bd644bc..b003ab663f9a 100644
--- a/dev-cpp/gtkmm/gtkmm-4.12.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.12.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild
index e9a4ece0d90e..d1570fbdcf31 100644
--- a/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index af2901063763..32c02f22f1da 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -6,10 +6,10 @@ DIST highway-1.0.3.tar.gz 1770704 BLAKE2B 5454f7e661270f25d1439a2a3d649a0f9970d7
 DIST highway-1.0.5.tar.gz 2012129 BLAKE2B cd7673bc5e3a32551554c83c4e1beb31f9855d9ad9550f156be2fb9e93b20391bd98d4b3ed4d0edf0a2786e403dcca86f4a50d00c27f0e08242dc66e2e6b2262 SHA512 0886b60147b78807e40c4987438fe664b4fbc012c3c681a45f3043ee4077afa493cb75550bc18ae160d00e527bf15bcf1f14220ea8561a4baacb3317fc25e347
 DIST highway-1.0.7.tar.gz 2055819 BLAKE2B da10291124dfdb5d9fd2b661f4d7e594c1e80e4159c9d704e1b4203facf7a0603e7ba808ffb1d8f1aba13d992df24abdb0ae89807329fffb67dee78b58574c28 SHA512 6ee5007ec13ac20b5d816b38a1b31c31a06678ca6d2ea090dd75e364f04cb2cf7ad8a82d1bdfff51079efa54b9a95fb554d62e6cc1bbf7d7e794cb272032d8f5
 EBUILD highway-1.0.1-r1.ebuild 1000 BLAKE2B 785d94ce1c5bda32873bae32c693eeb56672a1ae639dffbf8b6d609eb093f89adfb8ba262e7059bc64af8126ef80b6f80156ebd8386447377bfdca9023ed2a8c SHA512 3cfded30d2f7342f019bad820581629ae34edc1585f7e9442a164bfa122bcaa3f6a24d61d433c36f2bd199f1344efa1afbde3f7218b3d1ff0313c76b01c25136
-EBUILD highway-1.0.3-r1.ebuild 1088 BLAKE2B 2480c977a6917c8c73535266a3551ef429b3e983116b42da23b081dc37be39e11b63928c8ca74e174d4dc6155ca4209318d1ed17867085d6a6224d6960ab2918 SHA512 dfd974802114483b35fb21be722bcd7648819ea8a1277e956e22a1d1a998657998a779fb6fdf224a4e84a576c53088a08c6b891fc6b5e120ae301e4ff7721749
-EBUILD highway-1.0.3.ebuild 1019 BLAKE2B 61447444b75bc7fdb09363992aeee6d454400f6d22288f972c0b48d18bf4eedb791bd1a5761ed7edc24f7f846926f3f34b290bec2c74abcb201d1e01282f4b4a SHA512 745b3be032f06e186791a758ca0d399327d9c4ee8b18c9e0ca87ebc862aee170aec0dd051a35502615b2df09894a66bfa9176ef4c4678410af00594121cd1e68
-EBUILD highway-1.0.5.ebuild 937 BLAKE2B 5dc370af85a93d6864cdd01b113f7c6099b078e9488386e69c2c9e138983eb643c20dc2500df8cb7514b69445f2624a9498ede326b06c4b7948c7dfc01abc693 SHA512 100aa26a702801b0a56d39675b30f7a4fbb48184f1e392261362b688a25847e835ad4ffef65dc3b9c75e9c7718eafce26a712ad8c5b83df84e765b84ad65e3d2
-EBUILD highway-1.0.7-r1.ebuild 1015 BLAKE2B e4e14788a80ea3d5b5ba3fac20af2619fc10c8131ccbc7bfbdd30c1cbd4d8d6b4ecacae93e24b1c3295226fd2c380007a30e92cc88d7ed2712d890f3c4a3f7be SHA512 4dbe747aced1cb881ee490210cff69dc5ead45852f2c698f812ac7601a0ecab865564495a66e7edf1254b5deb312ad62d06513e6840912eddc91b9049e74b81c
-EBUILD highway-1.0.7.ebuild 931 BLAKE2B fa1630639e5b53bf696ed93bee6cf7bf2d117a76d7a0b7c44d68d974a026b26f2884ef62fe15410e8b0ae2f7ca4d8e6d24c928e3b37238c2defae188654a5979 SHA512 73185c0b76f4d6d489387c5c5cb6ac244bde6f60676c9e0f3354969ecfcbb0078e074ae849c404e0874daa88ea338aa5cb523b801662286594d2d8deb8662d3d
-EBUILD highway-9999.ebuild 930 BLAKE2B ae08b4b970402c4afa31b7add6d6201dc1e10d8d7b52019de21b13903fa4d9ee48d541a936be6baf2d9d766f78b4c9358d3ae879c5ff16c8034d04c37ed01b6f SHA512 325ecb955be3deb5592ed0a176a67517920e3321929b444e1e0b683a3e336fa9107607cabf6cc8a93a466124348d6c3a94c30528a343f0a9a8a19511b565e9ab
+EBUILD highway-1.0.3-r1.ebuild 1082 BLAKE2B dbe7c7fa8cd013ddde0a79da5a73768a99633983d300cbc5de1d97ce04f976ca7139a9a9a087aa55e88d364ec133a71de94b867ab3eb6097892cbb6f131d54d5 SHA512 857f540b01a8e28350ed9857351b3c2b80ee1bddd9ccaec53f6a7cfc3832a32f3a9b2efc54cfcaf5ddaece3d05eb5d733585593142a24269fd201257b1ad6056
+EBUILD highway-1.0.3.ebuild 1013 BLAKE2B b0926754b43676b61fa2bbae683668b5844d7572c14202d3cb1833f62b9e761d7be91bc731c849aa41ed4996736188f09d74d8cc4f858709a199fa027e4c384a SHA512 5b46e348b0d3a771782c7dc128824f3199c7acbb92085db939017e542565daf5901d75e063da9236dda07f4863eb59f99b93a8271c2cbcaec939e59a7c5b4bae
+EBUILD highway-1.0.5.ebuild 931 BLAKE2B 40654e399d046f6d8583fa475821680d82ef11aff8e069305e9a6e9669d1eb28158e533ec77b90191c4c4d934dd2d74ffdb7a8b9c504d26a6f18d45498ca750f SHA512 5bb3b2f8457e756f9d67bfa8fd2feafb28fa113409513839241f7f2ef7b041aa79958220d3dcdcb970a0895f2fb206ab14d112ee34ef4ae283678f6086155a48
+EBUILD highway-1.0.7-r1.ebuild 1009 BLAKE2B 07d0712367fba097d8d45dc2ee48daf133d8184d3bfe79ed7c8aa705ec138070c07befa88ae432912136d02e75d29fc6ab9e366e25d2700668546c94bd754ffe SHA512 5d880dc503834b419e3c0f865a67130e3aebd8020f0c63dfbc8777c6e4469dc50567b188b9dfcd1dbf9f135d03d1ef904a53057ae786b9f4129cb22099d33c7b
+EBUILD highway-1.0.7.ebuild 925 BLAKE2B 93e1ae67f608545b70b995583d631feb2d6f05a2df467ad6dde9b4f782a0810039aa246b8ecac1080870460b78423802219d36a8ec345155ff45398f46d8f4b9 SHA512 7b10ab4fbd0a3c5a1bd1a5d749c9718a95ccba1d4e3a75d015e48fd1dafcd766c9d034cb2effd9092feab1b657231ccb48c7ceed80399fef5f02c3af5cd69f39
+EBUILD highway-9999.ebuild 924 BLAKE2B 440bd36c2230450374e569f77a6d61904563a1768ce74715190139bf360756bcec4262cbc01e6dc90a57dbb70d8ded39c424ca3f62e01cd9f05023fdb4444259 SHA512 632555492ba533503e7c55c1fd932a1033f1bff95d116c3dbd82c5c0d6f5abae3bf26b5f94a1cd5055b96dbfd6bf7757f885b6ae29b1e131d016bf93c3057aa7
 MISC metadata.xml 700 BLAKE2B 23fb803289745f094f19cb7dc6b296f56a3bf712b39f87ee563872496edb5798fe9f36ec1d8a9d9af52d26b589bca354bc58a3c039753156e09a154de27cb960 SHA512 b47da71c110bb91b523dd970a1ed8f4d40c1cc067c170d10ef0ad412850967682303e610c352d7c6425d7bad33d58f90a6d3a34a333a38e427c65a8341c3ec21
diff --git a/dev-cpp/highway/highway-1.0.3-r1.ebuild b/dev-cpp/highway/highway-1.0.3-r1.ebuild
index ca9b6d7281fe..d110e1b64e4c 100644
--- a/dev-cpp/highway/highway-1.0.3-r1.ebuild
+++ b/dev-cpp/highway/highway-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/highway-1.0.3.ebuild b/dev-cpp/highway/highway-1.0.3.ebuild
index 86b378e34909..c4d4ed034ee9 100644
--- a/dev-cpp/highway/highway-1.0.3.ebuild
+++ b/dev-cpp/highway/highway-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/highway-1.0.5.ebuild b/dev-cpp/highway/highway-1.0.5.ebuild
index 9314e1341deb..2d510812f3d8 100644
--- a/dev-cpp/highway/highway-1.0.5.ebuild
+++ b/dev-cpp/highway/highway-1.0.5.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/highway-1.0.7-r1.ebuild b/dev-cpp/highway/highway-1.0.7-r1.ebuild
index fa5684704b39..106150a69cd2 100644
--- a/dev-cpp/highway/highway-1.0.7-r1.ebuild
+++ b/dev-cpp/highway/highway-1.0.7-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/highway-1.0.7.ebuild b/dev-cpp/highway/highway-1.0.7.ebuild
index b2446c1464af..3656c0a4977d 100644
--- a/dev-cpp/highway/highway-1.0.7.ebuild
+++ b/dev-cpp/highway/highway-1.0.7.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index fb0f2177c586..af752cf34a06 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index d59c05a45365..44f857ca8f13 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,5 +1,6 @@
+AUX libcmis-0.6.2-boost-1.86.patch 1841 BLAKE2B a452e78528c6b46c5518044b8d3a5c2cb082a0fcd3fa21d897f8e5b626497472f960458a8b1ef4731da46351b3f58e3f78160154dd2d1c05490574838e55f4ef SHA512 310d7eb9093f40cbbd2280dd805305a535ce5ed3d9baebb6a71ae17961be768042c659c529c99a2b7132248d1450f45861b85ec5ad03c9bf1d123ac2fcc3e4e6
 AUX libcmis-0.6.2-libxml2-2.12.patch 762 BLAKE2B 1c63319f018b94e4c5609b7ae53faead48afd611613d2dca5b15ac67ef83546e4e7b70a9bb9eb6576697f85019d9358ae96cdd0a8bebbc09458aa2376e1f38a0 SHA512 06e9b18d1459858692c5cc07fb6243ba0ff6af475db6f8c8fd5c7f96ca086222ecfc36043a4bb0e27e3fbce671a12d0f852dd69d6473675ea637db21bc99a66f
 DIST libcmis-0.6.2.tar.gz 296218 BLAKE2B faad99e09b2721cd56b0d47d2a9589e06222ee7881006e936d0943d5e8afc588fcda721ef282ad7d55c785407a9885c90cbce1d172ca012c4a13cc51da0c15b6 SHA512 a75a69623f34149c39c382c357396b8dd719d589a78424fc3b5d9de84ffbf3f889bcaaed9a01f91b491a507c189347d3d9252db238fddbb522ff8ba9ce7b5ade
-EBUILD libcmis-0.6.2.ebuild 1201 BLAKE2B 8f0352f030d38c03c485e2a53ef4b472c4192db3cc48abd0fdb928127ca5f28b7b4a2110b5dd2f162b2d09fb2b2b72a08df477900decfd3d30a4b59d3f281764 SHA512 aa505b451f07f73b088c9b286b7f432a99700288962fdca8b9f24dc13e92c834fe5fef7f85d74895727cc777f3d66d021b6ad329c3886c5a34fb910f36112e1b
+EBUILD libcmis-0.6.2.ebuild 1282 BLAKE2B 31c8f79601a070144d9e4043beae5d7a059f8edba78d1453876dfdfd62398d727cb1af35007f7275ccacc510ad922cd587c1e428d90820a050028d0eded3bb3d SHA512 c64595419c5e79e1df8575dbc385bbc2233ba886ca9d8b16c75bb1587f7793d7b37b3f3e3bbfe7813809b13edb22f27653751a03ff318336beb855fa36ac283e
 EBUILD libcmis-9999.ebuild 1100 BLAKE2B 1eb20b6836ef2caed2f8bc6e0af59fed9257c4c0e930befc2f5e19dda96dfe408d3878a51d50390d98f27580ee2fc44e33290a309d192b6f992d8461ce40a637 SHA512 e7a7638e8035e76cec570ddb37bc77e2531e0dc53918205b72120b18dbeaa6bdf82f395ddf49eca0c25c8e2930a1bcc996cccaf6be3bb57202e6af68be6b222e
 MISC metadata.xml 426 BLAKE2B 182f7dffcb4df586fdf436512fdff32b98308711021e4a307c3c61262c5e68495da7d4ce833695bec7ea3f098e20fa067817895e7b4420ec19b920b249318527 SHA512 10ed11b843ba2c39fcd0519997fec47647bb45eabd0b5f6df0994748c0fb876216e7f451851dbe84a112468a7d6b38c5608c7ac7ada2ee08549ab1801ce81cc8
diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
new file mode 100644
index 000000000000..5d2a9ba404e3
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
@@ -0,0 +1,47 @@
+https://github.com/tdf/libcmis/issues/67
+https://github.com/tdf/libcmis/pull/68
+
+From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 31 Aug 2024 12:39:39 +0200
+Subject: [PATCH] Fix boost 1.86 breakage
+
+The fix does not break building against <1.86 since we're now accessing the
+object representation of the return value.
+
+Fixes #67
+---
+ src/libcmis/xml-utils.cxx | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
+index e487d17..cdf088f 100644
+--- a/src/libcmis/xml-utils.cxx
++++ b/src/libcmis/xml-utils.cxx
+@@ -531,16 +531,22 @@ namespace libcmis
+         boost::uuids::detail::sha1 sha1;
+         sha1.process_bytes( str.c_str(), str.size() );
+ 
+-        unsigned int digest[5];
++        // on boost <  1.86.0, digest_type is typedef'd as unsigned int[5]
++        // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20]
++        boost::uuids::detail::sha1::digest_type digest;
+         sha1.get_digest( digest );
+ 
++        // by using a pointer to unsigned char, we can read the
++        // object representation of either typedef.
++        const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest );
++
+         stringstream out;
+-        // Setup writing mode. Every number must produce eight
++        // Setup writing mode. Every number must produce two
+         // hexadecimal digits, including possible leading 0s, or we get
+         // less than 40 digits as result.
+         out << hex << setfill('0') << right;
+-        for ( int i = 0; i < 5; ++i )
+-            out << setw(8) << digest[i];
++        for ( int i = 0; i < sizeof( digest ); ++ptr, ++i )
++            out << setw(2) << static_cast<int>( *ptr );
+         return out.str();
+     }
+ 
diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
index c20057c85432..5130a7ba2744 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
@@ -41,8 +41,12 @@ BDEPEND="
 	)
 "
 
-# https://github.com/tdf/libcmis/pull/52
-PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523
+PATCHES=(
+	# https://github.com/tdf/libcmis/pull/52
+	"${FILESDIR}"/${P}-libxml2-2.12.patch # bug 917523
+	# https://github.com/tdf/libcmis/pull/68
+	"${FILESDIR}"/${P}-boost-1.86.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 684058af1b61..eee46de31fa9 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -4,6 +4,6 @@ AUX libmcpp-2.7.2-incompatible-pointer-types.patch 1003 BLAKE2B 4da1ab72e1ece885
 AUX mcpp-c99.patch 1874 BLAKE2B 75e3c31435b6e61d47bbd46c81098d01659ad168308d4b31503cb553efbe525b925feb112bd549dea1138fcd8003633f3a64af57c300c6d89519fa61f3d55944 SHA512 73f0d07bb97b040f91f3c34a60c2275a6752a5cdd77f17982aaa1c68ab15f9052f2f69e916dc9a526853a5b5216d7edd63a987bf8a6ed3e99c14ac4e662e8b95
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
 DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
-EBUILD libmcpp-2.7.2_p5-r1.ebuild 933 BLAKE2B 31ec2e57f9f792fd990ceaaa54ef37d1484416c8251925934488305a39d2b78c70b8ccf3d29e3d3d3685ed308da792629348ff8d3394c686acfa48f551b9ff8a SHA512 2d4ce6475f661369afc3e257f9ac0f1c1cb959629e16056cdd8d5edbbac52074306076eac15be1bd52373de506b9747e9e8d25906fad3db5185148e27857b36c
-EBUILD libmcpp-2.7.2_p5-r2.ebuild 1025 BLAKE2B 380d4fe6a8cbb77729a4b3720dde8fcf5b2bb1448f26c54668da3ebc9d96c994469fe856664fdf3060df07a096707c4d8e4a3bafc1dbd247f50e640528669e40 SHA512 7cce67a8d3c2c9616dcded961687745299acf51fd083f0b7fa7486eb7e66432c998ea3c14a46332574e19e40ff7ca6df341fb572d581fcf982460bcacb40191d
+EBUILD libmcpp-2.7.2_p5-r1.ebuild 927 BLAKE2B 5916a804d658b127c81f4a42960ab36b294b670b5a79ecfd21a372ccd9e8f9960783e632b91ae49137a598f7d46755b5bc5b03a12c29795bb4597fc50455d508 SHA512 20cabc267fe0037ae700dead383f53c4a4beac44fcdde3e78d6bb1afb8b4b91ce2e9ac4be3eb30461ff1c9f73108b75f66fd4b4d68c095f35ac95f15b1a69861
+EBUILD libmcpp-2.7.2_p5-r2.ebuild 1017 BLAKE2B 124c72fc8d8a74321d51792049cb52327105059fface79cf649931c2fb27cffa501a3aaca22dd907a8ddac8e3d3178b58a602325d69184b610be610230ad9eaf SHA512 a5d216c72e0da671482432c128a0b5c9b398ec6d32ea9cd0f3b98db90aa7c2f978a16953feb993dd3fc7e7de377f5b87c28ff0c4e3d84960ec2347471d7de512
 MISC metadata.xml 242 BLAKE2B c3104b4c49aa49dc9855ea0b1469084d84e3c66395bd368859edefe22ff374525cc05752f56acc5e6976cda7564f54fc736d91019a143d74d5598bfad7595c41 SHA512 122762f21cf0e354a83c94569028bc356ab1af71727787d8bd1402a67690bf0a3a32ebd6304a249febfe942f5f0a1b1e2c07d81b31a05a8abae530e00c21e3e9
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
index 8ef36c6691b8..ab7a44713537 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
 
 PATCHES=(
 	# bug #718808
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
index 464b0a740fcc..1cba310fb86c 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
 
 PATCHES=(
 	# bug #718808
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index d2c74e84cff4..4e291ee2424e 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,5 +1,5 @@
 DIST libxml++-2.42.2.tar.xz 848924 BLAKE2B 75c28447b41e50f1484a8670042af819f90619acd36eaea3bf68ed197745836c3ede38c208a851e59a345cb2657989f569fd0129724916f87d90105ec3c0fc2c SHA512 214da4c8120fedc96adf6ad965b65be9f4deb53d86f41667c236c52e1e3aace819fc61b096815879cc38aaf12ac77fbccb050088ce6bc3ff03030dcc81e4a8c9
 DIST libxml++-5.0.3.tar.xz 843720 BLAKE2B 0c85171962c9637f71846a6a4914229f2ad6c60a0315743543526d78a33baf2e86f21eeef2279c8d51233d40fd059aad266c80c365decd587c5c54a303ad93a8 SHA512 418723a96f018fb8e332847d0ab601eda38c99d6be48c83b6cda6f07789e5ecac76bb417540e29d0abace2828a74eb1e08695ff2fc92ebf3e7458364547ef675
-EBUILD libxmlpp-2.42.2.ebuild 1288 BLAKE2B e1b1ab60fcfc0262f5754a06c2ad5b89f31da17298a0d7c7c289fe4e020ac2074beb627f8667b97d0de789865b1818a8ffbb2ef972bb9b2c34c942c3b76ba74d SHA512 3d9300e51a174f457a6404e7e8a421b5f16eaa74a25ca186ed6e8fc6001b5e0c27299da60081dccbbe459d5f2d6ea24471f07d8d0d60c8df575c60d838a73d3d
-EBUILD libxmlpp-5.0.3.ebuild 1195 BLAKE2B d27ad10fe951168fa6b359bf2979fb333faf463f47de2f6d982c83a9d146c486a76c30adfc8c7a1b3fced1365e8544ef8a49f059a578e25be5adb6d694b3fb12 SHA512 9920a0ef59882725d0fb5185fdb26a66626284af4c0fed3bce2f9ccf29effe95a7f247792d4ffa0977158f0417f5ffede34b5fe27c8fc35ac37434edafd81408
+EBUILD libxmlpp-2.42.2.ebuild 1282 BLAKE2B a523f07e7edb119442a662888566462d085fe647d3d53b931551162d60821caec4371be2af1d05b5be143cb1789d3138e68e2769a7882658812e6add835d6bd3 SHA512 18ca5762efd149edd8b06afd50d111ee2d7f66b14ef5e871d68301fc6f1045f34f5977efcd384bd53384777f35ca746ed43dbd54f4c1d564aab0e283a55de929
+EBUILD libxmlpp-5.0.3.ebuild 1189 BLAKE2B 4879c4bfef86c86e0363b4ac20466576043d58fa36b76a61b03910c9382218e20888793df2eb0e3859a1a92e03f6cf949c8b662a52e5446a19135fbc11796208 SHA512 09160bf89cbff1758198572d7647b44683222950299ab999775cddf114b28c0a2c710555555a7aa91f6d76c4848cc57ae7046a7f9273164966d3159c34c59de1
 MISC metadata.xml 358 BLAKE2B 8b582150db49d0c4ac43268c59fa182078c0c2d8e4b7db6f4a0008cc4bc0376038024de6adbbd438528025419d480c456d1eca6e4b27bf7cd610730ba2af5940 SHA512 fc5f35fa1bab9635e576db3cff7b5151ca60a74401cbe182dc2aa923717a10ca87002773339c2fbf234feddd8f16a7c7a2f6b47ea8fd14424cbf7f900effca57
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
index ab3e7f24e905..1e3524a1cb79 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
index 0cb0f12fdbdf..86e0e85ed073 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 406dfce6de98..ce166306c9f5 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,3 +1,3 @@
 DIST mm-common-1.0.6.tar.xz 287832 BLAKE2B b633f37a470b558c16ce4a260384913ddc64df2ac94e25e2b7b05300c5c7b51826477bff655154572bd7eafe583b4cb056e7c9dee3d3e699dbf200490da0591f SHA512 2141ce9dabdae153e5708b09d30e7917182888e521ff0c2a4f85c7ec2dd86b2c8753e0513bf9c9f9a00d4e579173ffa859a3efd006e706fdfa2f33b0e77af48b
-EBUILD mm-common-1.0.6.ebuild 630 BLAKE2B bf105ae7df4983a1c0bffbc8209747533820d9b6acf292b781f891c0afe30d8e95843a7d0a5a7229270d5313a756486a8c8ae1a17be3bcc82d559b9a1ebe51a8 SHA512 f5d56a0460670b102cc12ab979ed58d0a507a1f3a0af970bbb3bd89dcda1c7f4aa00af34e80cf03c1ea9313a4de622412d6ecdb3ac548cd8388027085528fe92
+EBUILD mm-common-1.0.6.ebuild 624 BLAKE2B c52ce039a8fee04890bdc771377894864436b8e057728a2f0d2085bd882735e73cce8d4418506f3af4f1906d1d7fd80d193f1b1a25544f62b2d17b662ea1fa92 SHA512 3de1f2f689ef915cc665401cbdc98383991f17b8cbd73f6891a83230726fc3a671fbf48fb8837958ffb258ce5b026811bd70ad28afa1f4974cef47582f559b0a
 MISC metadata.xml 375 BLAKE2B 99cf75d543b1117e8262134dccef447bcedce2e1f5d5e0fa42dd1b854b81da966cc5e84350db3f19783be81e057d533b7bad65031fcfde2e7ead80673888b77c SHA512 22790f5392e48faa34a533ef11c10aac1662937d97ef5b9d62fdaeeddd52ece5b0455942dcdead2d836287be8de21b362c6be8ec3ecb291a1a5f1a63cb677e05
diff --git a/dev-cpp/mm-common/mm-common-1.0.6.ebuild b/dev-cpp/mm-common/mm-common-1.0.6.ebuild
index 02d3cd018b0f..cbc82d293368 100644
--- a/dev-cpp/mm-common/mm-common-1.0.6.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org/ https://gitlab.gnome.org/GNOME/mm-common"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="${PYTHON_DEPS}"
 
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 1f4a80d802f0..61aa45d4e0ab 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,5 +1,7 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29
+DIST ms-gsl-4.1.0.tar.gz 57901 BLAKE2B 337725333c0fba4bcbc5f70e997f3c78af916a93761cf7f90e90722884963a4caa9871fcfa94f7edae95a248d75b6e51339f1b8bb428cb6a95c8ee1489163336 SHA512 1db14bebab5f2bc0752214f9bf1b84a056b7d83b4a9d296663c43103387baee60373447f62c4e9bc0b8df06a7ce0571a4e2b4a31441c866894eee3ae258fdfc8
 EBUILD ms-gsl-4.0.0.ebuild 711 BLAKE2B 9eb3664277177d7de5009b6d6072fd0e1cf1289e4cd044dff0425e04c566adc88f850e02de6a0122d52349b19017cc889192e64fd5345714057b4ae72f49a9e7 SHA512 384a4e38f7bcc30fb63cd620514e7439fcd0923421ad421890be963fe76dcca66d4fd98dd82003659bdf6a090bb96be096547968365294745dc2164538ed7042
+EBUILD ms-gsl-4.1.0.ebuild 685 BLAKE2B 4089c4240e45533bf6f1b3351bc2ffbcad08510c47d6f0cdd08c87822cfc0aedee2f25af0b2876b52b2fcbb74b42bcc0e8bf43c25932fb8db0c5b6f07e2d044b SHA512 276feda93d3930595db2e8d8d2bd17fb80d5415f99657e4e351353f4d0b077775997a93535ebe89cfdb9a80f16a980a90bdf7c86ec7ff2424c5046e561793e18
 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.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild
new file mode 100644
index 000000000000..f0bd28aa7742
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# header only library
+DEPEND="test? ( dev-cpp/gtest )"
+
+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/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 9e3644955485..d30a196cf187 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.46.3.tar.xz 674428 BLAKE2B 241b902e65ebb2cc213f479832503f07daad736e168ad7e841f3a22e8640e0365167cb29122cd1bf7080bf7b283ddb92aa71aee9731ea878a1ef26f88c3796c6 SHA512 c0925f295b372bca7b5ede28476ed00e691911e041632969e5e4c30fcf338bac069ba031d4f48601877524b90af47f5238e444e2de7501f1ff25dcda9dd9a9c8
 DIST pangomm-2.50.1.tar.xz 754608 BLAKE2B 3581db044e95fb78e2f8e67868735d6626d052099076c9b46668a255bb8df2cbc152dbaf730bfe2a3b47610a1a4e1903d83950d303d59913d9ff123a882db772 SHA512 bffc55eedc4f278480a74afcf119b79a295bf5775123f582746ba425e19e2690d627baa9a9813b70db9e063db7efe959f365567dd7bcbc1fc862212ba8225a98
-EBUILD pangomm-2.46.3.ebuild 986 BLAKE2B 2a4d9f84f39cf60aa6b20894c8e82ba9f64f355eede42b1fe922eeb4ae6288826b8254d5df939745e1c380758fead4063e375c0940e69eea6dfbaee0104304f2 SHA512 804f2e4450cb3c2feb3b2b127f068f93318f75c7af1a4a7db5e2bf037afd899b26ae8a34c077427e54ea61522aaf4c2511823953cb659b6cd34ae69c5e35158f
-EBUILD pangomm-2.50.1.ebuild 998 BLAKE2B 572de01e37277ebb7db2f5757609825cf7b21acebc2fa94ad3f932ad2efd9e21e8124828e0fb9729afba8cb6bf311dd7461a4ab82498451fc1882e44448fff46 SHA512 008f1177490c268029f6d3a2f41292415981af9827fe1eac5273c46cb6f7eb2efe4f202b0af61c4e2b9834e65ad95061c93bb27586ef62d9bd3ac65c5efa39d6
+EBUILD pangomm-2.46.3.ebuild 980 BLAKE2B f0075d4115cb554a7530c52dc883f75e0729f5917904830f34a4d061a29130b66e04aeff5612b55abdcddcb5b6b02d66259ae131454f3b9f31d9cbb46c63a312 SHA512 87a5f7761a6536369705c1f8f6c4e1b0e32d7a43f3e1cc59e2e7336980a6e2ad758204d86a0f5029b7ec5d179f87df9c740065d45a4fe09698a87cc3ef0e0bdd
+EBUILD pangomm-2.50.1.ebuild 992 BLAKE2B 97449fd4b2eee5d8a22c85bcd3cacf6a7e9276a98a568def9d206880a82fb65de2027b9a7a86a0c85016668a4ac558352556ab49f9c941bcb68b9818e88e23d5 SHA512 729174d0236018bb29362d316e795512cc6232886fc3e1c1da625d2504af3ad4ebcdf6837ca8ae93ad86561737bc13e50c91b8af0f65f68b0e9601b9c9acf477
 MISC metadata.xml 348 BLAKE2B 1718eee689e97a9159c1372c9dc7509914a1cd11301fec1f13ab62234f063d123620c8dc524264851ed915cb5723b0925be33938f601d19b6b239963feeec0c2 SHA512 c74344baf34d5f2ace67d3f226bff6bdb8b4ccbd85c39345a4861b66765bfd666daa9aef1512b4e0d9c0cf3e4268b96b2d7abc92bb87be67ba304b2e4284888a
diff --git a/dev-cpp/pangomm/pangomm-2.46.3.ebuild b/dev-cpp/pangomm/pangomm-2.46.3.ebuild
index 32036cc5e7bc..51a136f8f0fa 100644
--- a/dev-cpp/pangomm/pangomm-2.46.3.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/pangomm"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.50.1.ebuild b/dev-cpp/pangomm/pangomm-2.50.1.ebuild
index e8414b90204c..2488c89768ce 100644
--- a/dev-cpp/pangomm/pangomm-2.50.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/pangomm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index 3abf04a76a65..bb49e933250a 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,3 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 598 BLAKE2B 3f12b34684fbaf4847f07aedb6a85b774bfbdaa6f019c7fcb5ae4e645778e671d29bd88af17400b995e789c425bfd4a85a53b7c8c59cd0e8278e77ea07d9f3b4 SHA512 8133b8a9683fb46dce090f08e475192441da83ae723b8bcc07f6c04e6735aa644b346d2199798ade91062ccaf4beaa5584d4297271786db4bd28bb677fdefe8d
-EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
+EBUILD popl-1.2.0-r1.ebuild 463 BLAKE2B 7cf9802162959e251f00f8759e774398c8469c26d690fd7f12a761447683db3080ef2ed96ec2286881f8507e3acb1b5bde1ea0152056bd12bcb2e460fbe16c2b SHA512 b93beed9ecf5b278a300088906a61967b197b12f0cc3ea2d3c65b4f26044cbd5b8d5f9296b87e0e99dc6cf11a3395e4d6c281ee7a7d443d9d71e2d3a00f0be9b
 MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252
diff --git a/dev-cpp/popl/popl-9999.ebuild b/dev-cpp/popl/popl-1.2.0-r1.ebuild
index f58b83ff2381..7e45b64608fa 100644
--- a/dev-cpp/popl/popl-9999.ebuild
+++ b/dev-cpp/popl/popl-1.2.0-r1.ebuild
@@ -1,26 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Header-only C++ program options parser library"
 HOMEPAGE="https://github.com/badaix/popl"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/popl.git"
-	EGIT_BRANCH="develop"
-else
-
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
deleted file mode 100644
index 83cea89db642..000000000000
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++ program options parser library"
-HOMEPAGE="https://github.com/badaix/popl"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/popl.git"
-	EGIT_BRANCH="develop"
-else
-
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index 46c499ee65e3..fc28a481935f 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus-cpp-1.1.0.tar.gz 58489 BLAKE2B af24fbc34e79c04ec80dbf4430de5a2cf0e66b7de4c06f9b37e6bc3ab7f868b948db486a4f962c7986748eff1247eb0119ad5b581ac01129ce6bfa10f7b53ec7 SHA512 0715a0eb8a7f7065e01b8039c261eaa98a77a8d035783ccef9333fb06eecd75599959807ec157514c60ed435841bcd0cdd8cd295bcf7cd88e21e1099ba12be89
 DIST prometheus-cpp-1.2.4.tar.gz 73953 BLAKE2B 75ca7b8c88408b54ab806dcc8ecaa48c9d29a7cbb76fe786fc76e114fa0bfcacaced7d899f8aff24060c9cbb4836d144b25fca2ac45438982789bcf881fade67 SHA512 8c15492054189b736e502258c30aaaae0fac3c9ea61907260e6e3cd29fe4077451f9e49fd580508aa6e21691209545d9cf87011be5b046fa097a53a133167553
-EBUILD prometheus-cpp-1.1.0.ebuild 827 BLAKE2B 8f3e24ea6980ca9cb40c0aa12d16e233090ac255c439ff1db0e747b17276a2c30a1e913bd9a2593b7fb1cf68d6d40eb01d6c25670cd4a5225d8f8998905949e9 SHA512 f9fcf730f91205c19194aed4979f63d03468f55e9f40b0522be4e1ab69fedbaea3276172d47980c34b7514c1884bfb1f494225355c87f6b54aa17abde2270636
 EBUILD prometheus-cpp-1.2.4.ebuild 827 BLAKE2B 419cba5e372798b831b2d71c122a952f2b4f4eaec20197dd129047af1bc9cf3a1773b590b737054388d530e697131c5b34c7e03bdc71d514a364d020231aa2e0 SHA512 2959f2b55e76807005f69b82a79c4c1dd0e9348ef23ad823fce5a834c4fcdc9229edbc9776606d9b6d20c011a552f23fae0ec573a7dd478655f3e79f3df21ce1
 MISC metadata.xml 748 BLAKE2B 775f8524975b71263a032d1d7511c3406adb930428ba5f955489e8a5a70a023a96fd83a4a4eb53a528c5ffb749133420dc0a5d06a1b389ed09288ad17ee8bfbf SHA512 02958fbce2234ae1a99d9fe2a5dcd8a096c4d49ca7a403d95029f99cd4c21cdcb0cbe79af376cb02cb645c557114f79ecd9d04707ed77aece039d05a66712fc5
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild
deleted file mode 100644
index 6239a46b04df..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 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/range-v3/Manifest b/dev-cpp/range-v3/Manifest
index 89b6fc88ef1f..1c2e1561dbd2 100644
--- a/dev-cpp/range-v3/Manifest
+++ b/dev-cpp/range-v3/Manifest
@@ -1,5 +1,5 @@
 AUX 0.12.0-fix-any-1.patch 1252 BLAKE2B 307bbfa93cbecc4b58ff04172958e5d32c7e4f83b19140e6b3819517cb23a9089654954390e081a3ed82dc299f3bb1e3d0b257ed46b5f24cdb926bcaa28506e5 SHA512 617dfae7cf816cb554136a895f277541a2fa0030e78df60bcdbe6e3a2728f7d702b7c82ac15089f4c3a0fe83e92199b95c665a696471ceac70c8966d66381f25
 AUX 0.12.0-fix-any-2.patch 5500 BLAKE2B b1d5df033bdda42d7db172e07a6577d398603ddc262d409529463866f0e5ebd87ff5082941313b61a346c8bae1ac6870103e307c123d525c49eefc97a00af26c SHA512 51dfa7f70020b174666034636de4e326c80bc292c6e579731df95ba07ec60a9523b4f231bd31a0f8217f23e4fd64be785dda3af8e018ebe7b17ba087fe6446f2
 DIST range-v3-0.12.0.tar.gz 582834 BLAKE2B 252066fae70aae76450226f2c17248662de4778dcebcd7dbaa2bf757c1bfe3e7441f65e41e3110c1ae83ae93a41c54d6c006dbf5482ffbe09a3aa4f51d02df9c SHA512 b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0
-EBUILD range-v3-0.12.0.ebuild 1221 BLAKE2B 43e6ed94902a160daea9f2d7c70aba1c23bad5020d8f15c06a7537fbe0a16d3fb3c577404984a164a61ca6aec780e2becdf346b0d041904d49529a7b72dd6def SHA512 84397fceb94b7032f64a6cd9fc86fce7b311dcfec72d0367f6d07897ea47932d70e3eb8fddf3972f4c3e9b1eaa92497bed53fc318ba9036dfa1871fca06061a1
+EBUILD range-v3-0.12.0.ebuild 1220 BLAKE2B 93eb77f5b99870691c48edeb75ff47154d4592a44b5ec437a83e2011f943564a119fbb4fe8b47d6bb6b249cb167a9202fac665aa0899253666487053a2c880ad SHA512 795e8bfed5f53ae4abf9f28198a0255c3e9dda65bf89ba3e76464b86c71f99b391183952153e090d5c34d177d9ddbe5b4e398be1933384d73c5428eac6c4bed8
 MISC metadata.xml 810 BLAKE2B bdebf063bfd0652ef3a38f5c96f08fbcfe3933937aa00883d39cc216a79ebfd65fa3c538d15ab0b5b4855ef7696b98e14c292b6587f2d870ca9d4eb6d7d7e96c SHA512 b24ff8d2452b70c34a941c693e6b2bc256fbcc23a49acabdb7126d593b44de30116d9543edf57bf49ca5c6ba854b851b802167347a08736b16a1b200c28aa5fc
diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
index fd75ecd9247b..b2ffd55a091c 100644
--- a/dev-cpp/range-v3/range-v3-0.12.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.12.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 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 19ee5c139784..4edd384cb27f 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,3 +1,5 @@
 DIST rapidfuzz-cpp-3.0.5.gh.tar.gz 309782 BLAKE2B fd7547e5c40696c217c8ea2aa98fb83b98606cde7439a5d51c80b4de30002896d9e95365d3c6ac56c32d8a8432c94ce2050b856a7e850a3f37035c5d0ece795f SHA512 4e0a7e28a54612fb11eb331449aa4fdfde1fbd2bf59b295f9eb68903cd647a639fa04d71aa7a8c88ddb7be6646cd3d0f1f5400eb53644b0ae96590037e74f771
-EBUILD rapidfuzz-cpp-3.0.5.ebuild 637 BLAKE2B 7eb8542f2b107e874541d757bf52d492c4ede70ac87f8db938dd30de5b72c02c8fc58dcdc9aa4fa306dea4b7a32608bd922212c087962151287ffa760f24a729 SHA512 8942fbf48246ea0a131f7b27a27e0c43d80b99791c4e7b20b18133957b8f833462d4d9730c0036525aa1c09031a56d60e97554642bbe1a22b1e9337a863ecc37
+DIST rapidfuzz-cpp-3.1.1.gh.tar.gz 310477 BLAKE2B 2227b61c56a37854336698e0649e8db6f0c5432f60f4501805cd16add3c6324f203788006d92e0271ec67a74916c5ac5a6290edbc7437ba2014fd25e6a0e415f SHA512 204ee06c1e51b786f0a2efd32a1c2467c3bff2738e8258e6e8fe44b5569afe7c665af1051fdd05dcc98704f3045f5bd2afcba5dba3fc0b34e2facf8944478b48
+EBUILD rapidfuzz-cpp-3.0.5.ebuild 631 BLAKE2B d13241e64eadc1fe3230266944b12050f647f2e00a77656434c1b3790ace3f4648b6a9e53655562beb102685650cb874214bae9d073b537d8c97c7fdfe6caaee SHA512 b481d2c6533dac5f3e824a2a5ff1ea53b3cefdb9f498f72ab0a034c594a2f67bf28fa9d395f3dad58272317df5f6605c46479c773d00af0dabda84edbf2b0e1c
+EBUILD rapidfuzz-cpp-3.1.1.ebuild 638 BLAKE2B ba377c1712a0b93600d24af773997a0ccbccc622c2749848507d048f59f9bea74d1fb987aced2543584cd8b67b3b26fcdf8f903911d892144f7fb5bc6386f268 SHA512 977ae16b5bb87dd74fd3f5401592dfccb1198ee06b3da1e6c1ec1e80c11f0e552918453460def8368d8339495c9ee87c0fe586b479ac9565ad06e5bc70358749
 MISC metadata.xml 336 BLAKE2B e425e950b6a0524afb6b996f846fdda73310168d6415a67570ac01a75a2c9335b4f5785bda271a2cf88bf5d7e3708582d958d1fa658d12f36fc5455df9763573 SHA512 868c16a2c2b178fa38e65568aeacf5b96a8d4ebf4521094a0da106194de0acefd017d5f7c827d89a9711c6b80d5603a01d9e15ba9b167c55954f3d653ccc6ed5
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild
index e9c6bbefe8e2..09332916ea08 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild
new file mode 100644
index 000000000000..b5e48d9aebfb
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 1f95466beb61..1de17b9ae016 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -1,8 +1,12 @@
 AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
 AUX rapidyaml-0.6.0-no-download.patch 1574 BLAKE2B ab5ccb742f4015f9936b760227d43dbe2a9b99a5419117cac5098997b6be51f46b3f473fdfa69a5640a045c7bdb8a5b232639b1df1eb57eb4cbbd8d218adb5e4 SHA512 a3884965fb2a7cf7221645fcd4940a0a523aa46658d516c5fbd3554fa2f9cebe038ce805f41dd464e59b048afb9908092bc5e8a45fb0875ad3421d0544e0d4f3
 DIST c4fs-0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b.tar.gz 25156 BLAKE2B 864a6a75c5ebe15d73fb6ffa5a83cd6448f37a0f465bf3992fc5bc1000f06d6e945c99b9a4f8f3625499c47ea719a49dd340d11e37c11ed759d1adcb1ea585be SHA512 58149c055b1f87abb12a01b042600a2927bfe7afeb878ca4523b658b0736aff6f752cd579c748cf9d4c85b4229ea50a1e70d633f85f9041fe157765286fa5233
+DIST c4fs-59cfbae26b821f4d4c50ff0775219cb739fa7f46.tar.gz 25149 BLAKE2B 8c8fbc59112e5a2e5d2a9aa8a0dc6665466ca309b78bbd5fe0203489bd8823097c79ff09f0dd1d33595f5b052fc95bde911580b8b083ee63f349a7fd0d0dde86 SHA512 3a76522f230c26bbe3b893421b1785259a79a4e7e01f83a2530f35af5d2a10195e4b85cfad6e8a6942715120f3c3b7f3eec3e95ac043ac5b47029dcd0ee8c3cf
 DIST c4log-457a2997e8ea26ea2a659b8152621f7fead1eb48.tar.gz 12056 BLAKE2B f0dc357c8beb28b2fa73e77f85918c3285be08a6e6c750317b7babddfc2372532d56b29a01adbc2284b7e850aeb2a45f1b24599acca0d0feccf5d60c00432627 SHA512 f728b34c000bbd58ad02d003697de1185feffc1a349600153a7d851f8dac28b88433e97c81dcb14769a74faa9e3d86b297536e8764d6e00b886f11bb2343518f
+DIST c4log-f4cf64caedd622a739aaa3ecb67a5aac105c2919.tar.gz 12076 BLAKE2B a5d09011d65aabad37f6821430a48e2ab0808863c34c750c7685f3de4b112251a6c7679b5d8962e83f3fe0847cbc9d80b791ec58907a4ee613dda950c947b553 SHA512 097c4566ad4f2906299e544ee067b01369433b654590cf4cf87cb56017caa5757ba037fef5ed1fd00c143a59e8d66013b07a28ad014903d761919a5ddda7c9d1
 DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde
+DIST rapidyaml-0.7.2-src.tgz 10139792 BLAKE2B f50005a313414073281258ed66d973adb9cf22995bf8742727b5f1910f05065bb14baac7273e437c450f72e984b713680a83951706f0cc0564113c406a07748c SHA512 076420688d9e230627ec48013928ede74a65980c1bf5335a187270f90958eb15af11e7958379e4915dbd35723f2eadfb425531a460fb0a0467559f9d1ba34b6e
 DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
 EBUILD rapidyaml-0.6.0.ebuild 2252 BLAKE2B c09be1414db7519fb861316be9ad31d0aed26d708e2dffac15c904268320bd88d1c0f8fe7324f37d62a176dd77604ebc271f9d540166f59fd15b6c41d156443d SHA512 bd7117d6e2fb0fd42c325f83e0c944b6e7b3aa5d947b28e27fc4ead94fcd382210c3259ce8e6a0ac23a11c16508a696b2c2248e7ea581bef391d7f2a15cf40f5
+EBUILD rapidyaml-0.7.2.ebuild 2942 BLAKE2B 7c36fc1d3f2a7f103121f0cc7cf77714c7989113bb6107bb419fd644f50582baccec6edd4da63b0eb953084799939fdabc44bc0d22aca7b2119dbf77e341f357 SHA512 f2ed0493e7c4310da43646c2709943e3337b999dc1f8b401cad9a21a0974bfe75fcb15c264689350b9212165fc3eb29a31ae0b71f9edca7ac0a182fe8115dc73
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
new file mode 100644
index 000000000000..107332c03e0e
--- /dev/null
+++ b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+# see no-download.patch, match with release date if "master"
+HASH_C4FS=59cfbae26b821f4d4c50ff0775219cb739fa7f46
+HASH_C4LOG=f4cf64caedd622a739aaa3ecb67a5aac105c2919
+HASH_YAMLTS=6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f
+
+DESCRIPTION="Library to parse and emit YAML, and do it fast"
+HOMEPAGE="https://github.com/biojppm/rapidyaml/"
+SRC_URI="
+	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
+	test? (
+		https://github.com/biojppm/c4fs/archive/${HASH_C4FS}.tar.gz
+			-> c4fs-${HASH_C4FS}.tar.gz
+		https://github.com/biojppm/c4log/archive/${HASH_C4LOG}.tar.gz
+			-> c4log-${HASH_C4LOG}.tar.gz
+		https://github.com/yaml/yaml-test-suite/archive/${HASH_YAMLTS}.tar.gz
+			-> yaml-test-suite-${HASH_YAMLTS}.tar.gz
+	)
+"
+S=${WORKDIR}/${P}-src
+
+LICENSE="MIT Boost-1.0 BSD"
+SLOT="0/${PV}"
+# Bumped fwiw, but believe the future of this package is to be last-rited --
+# its build system is a maintenance headache and the only remaining revdep
+# (jsonnet) is not only incompatible with this version but upstream has
+# switched to single-header version and will not be able to easily use
+# system's anymore: https://github.com/google/jsonnet/commit/4003c4df8ee
+#
+# Leaving unkeyworded rather than do extra work until likely last-rites.
+# If kept, will be dropped to m-n given I no longer need this. Feel free
+# to take over and drop this comment if needed.
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-no-download.patch
+)
+
+DOCS=( README.md ROADMAP.md changelog )
+
+src_prepare() {
+	if use test; then
+		# also need c4core, symlink the one included in src.tgz
+		mv ../c4fs-${HASH_C4FS} ext/c4fs &&
+			rmdir ext/c4fs/ext/c4core &&
+			ln -s ../../c4core ext/c4fs/ext || die
+
+		mv ../c4log-${HASH_C4LOG} ext/c4log &&
+			rmdir ext/c4log/ext/c4core &&
+			ln -s ../../c4core ext/c4log/ext || die
+
+		mv ../yaml-test-suite-${HASH_YAMLTS} ext/yaml-test-suite || die
+
+		eapply "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch
+	fi
+
+	cmake_src_prepare
+
+	sed -E "/set\(_(ARCHIVE|LIBRARY)_INSTALL/s:lib/:$(get_libdir)/:" \
+		-i ext/c4core/cmake/c4Project.cmake || die
+}
+
+src_configure() {
+	# not looked into, but tests fail with lto and USE=debug fails to build
+	filter-lto
+
+	local mycmakeargs=(
+		-DGIT=false
+		-DRYML_BUILD_TESTS=$(usex test)
+		-DRYML_DBG=$(usex debug)
+		-DRYML_TEST_FUZZ=no
+
+		# TODO?: enable this+tests, should(?) be easier to do with >=0.5.0 but
+		# still need looking into (please file a bug if actually need this now)
+		-DRYML_BUILD_API=no
+
+		# rapidyaml sets c++11, but (system) >=gtest-1.13 wants >=c++14, also
+		# see: https://github.com/biojppm/cmake/commit/e344bf0681 (bug #893272)
+		-DC4_CXX_STANDARD=17
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test
+}
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 59e4c3f2daa2..6238c7871336 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,5 +1,4 @@
 AUX robin-hood-hashing-include-cstdint.patch 357 BLAKE2B debcd55902985d2f63e3a61c8774e14bf37849ef0b9f13513104c52351f499f77062d65f86211fb908569c43a38203977e4e250ecea96d7a29abb5d5cba4d416 SHA512 3599a407a8a27ce13b7e29b108599aef2af2cabb76ccbeb3e15f52b18b1a726c4bb71b95c8e67c6f1f38bfd090d780b113d82d8f38d84109cc56bf126fd9aa31
 DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
-EBUILD robin-hood-hashing-3.11.5-r1.ebuild 586 BLAKE2B d4daa6220cb51afe1bd31ceaf0eb0dc4c622016bbf642dd7099f2de583098d0477643e33e0d80d7c4cb8adfad490449a4a047aba305d843af754187c1b819927 SHA512 9caff99a89320cfd3ee7edb230829811c75e4573bbdeaf21ae892e29c935556924c3cb09c6cf7410b4483cb03f113ab333ea231549b059223e5deb49aca0e592
-EBUILD robin-hood-hashing-3.11.5-r2.ebuild 647 BLAKE2B 4352815fd7bce4ad76bef312bf872b310f1220a2186196abb660517fed52c528c271cd51f9ef831d521898c90c50c116a1d66a707bd87e63e767eb550860dd96 SHA512 c3390502d05f1ec67ab595a9994dbfcfa01f4f8c15016d1a70aaf26fe2020131271633b44d5d30d1d14864639c105876f1732db3d7cabbf4e000355d56f27cfa
-MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154
+EBUILD robin-hood-hashing-3.11.5-r2.ebuild 640 BLAKE2B 3315ac5c18665ecb445c61376d98159bb69bff7043c01283f67e44a53d7be77c3eba157e7ca105ddb582f03c33c97fe3bb115dd97727f2daa5f19173c09356b4 SHA512 6c9a4f34b35ca558dba4ad4b23855b8f1cb71ac53c76ca41a08572341bc52e3eb3ea69aa17c2af460d6c6bd0b5af8214d2b38c6a709dff7379dd2791f17ce0c6
+MISC metadata.xml 341 BLAKE2B 70763ba1910df598dc7697be0a9b1da1966496425fcf03a0b628a613187ef70b713e2c0cfdb862085123567e8c0fc5ac7053825c2fa8a3da9ff51108e92e9f17 SHA512 8ca98b78a1b91fda2fdd3afd3e6c566a511777530c07c8055f95a991ea16b38f663b7c1c0564e0e8b8536d720b85a1f2bdf17b125ca826f250127f011123c240
diff --git a/dev-cpp/robin-hood-hashing/metadata.xml b/dev-cpp/robin-hood-hashing/metadata.xml
index a557cb9cfbad..3dd614efa875 100644
--- a/dev-cpp/robin-hood-hashing/metadata.xml
+++ b/dev-cpp/robin-hood-hashing/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">martinus/robin-hood-hashing</remote-id>
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
deleted file mode 100644
index 6eadea18b048..000000000000
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-KEYWORDS="amd64 arm arm64 ~loong 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-r2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
index 9e31bea3b72a..af33088be0d7 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
@@ -5,14 +5,13 @@ EAPI=7
 
 inherit cmake
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 PATCHES=( "${FILESDIR}/${PN}-include-cstdint.patch" )
 
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index 0209c81b6920..187c82f8c464 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,6 +1,8 @@
 AUX scitokens-cpp-1.1.0-invalid-vector-access.patch 904 BLAKE2B a2bdf20f09ed3e44ce46a4a253a9a24da2a5a549b480653863dadf650df12ee30301d6dec1731f7cc1e292eb14279b1c369ba7990fceccbeed291a2e5e14c08f SHA512 f5bb785c1eb59f0509aac70efd162079c286a8142045bc9856ec92d197bfdafb0ba743618ddd9708b6dcaadbb73f77a4162c0d9823ff19d5a90d7c77af69421b
 DIST scitokens-cpp-1.1.0.tar.gz 311446 BLAKE2B a515d834df04125ae9167cb4656def7df43c9f1ba6d701379257cdd0fd51b61a119e6222591fbe9c1d7ac7000b1b4590d12e9f9238810c0791397a9d9846f6f7 SHA512 e71474afbde45149fbd642918e802f7430603a14add7171525fd08fdfbfb9dc4ae5b151341d2c11b294f352cdf76315e5c1f089daca12a1c9db304f6b2c89276
 DIST scitokens-cpp-1.1.1.tar.gz 311677 BLAKE2B ea880a50b5e3e6f17c4bb11b7021df5e22cb4bb496fc17395a9886ebd359bc7f2522a0b1dd89e8aaa477a1302613f5da6d0a40f903e056736abc35ca1230518e SHA512 f5b42078fce6c1e812eedb456cf1275eaddfae5715193fd566f1f7a598b5632f81f3893efb220c57ff89d233c375c68785c8a6a1c3d3db6d3757979d87916265
+DIST scitokens-cpp-1.1.2.tar.gz 312169 BLAKE2B de6053f9319074b442e074b643042095e0bb5c796d1874ec1f7ace35b8f45825314fc2b086820d86b4f7d384974ce1b62ae4180bfc14744b722cf5c240d7521c SHA512 d7898b5717b6df6cda7c30c33dd993e81f30befa62522a920db96ca39611658b16347338c67e3acbe7a9c88d5e273d935ec1109420e7b66c700136315e513938
 EBUILD scitokens-cpp-1.1.0-r1.ebuild 1480 BLAKE2B cd199977beaf9c872bc00c6dc344b4450ced455bfaa1bbff646b15c6a3300359a8c66c52a0daca6f9b4882530eeb581d19d81e695f8ab2a341680aefa0ab2b6c SHA512 42daaafb71e5afa224df2bcaf6314cb101a6865277d70901c98bc206871133ec699dbd46a73c7ac36a34690f20e9fa6ef71caf3371ab5a614b051be03c5dc34d
 EBUILD scitokens-cpp-1.1.1.ebuild 1413 BLAKE2B d9e5646f1e42e1395afb8af809f0846476f1f48c7c5a8e517132abce364248cc20904d621597c1e9773a8f2cba500a2b3abf2a82e315e1728b4c3a3180cb64ff SHA512 69e13b094ad62de9137a8383fb836ea7ea6f183547d2a51dddc265674990c33bb6053725dafe50339489403ee6c35969a30e244c2cb008fa7f520c06b67e1f7b
+EBUILD scitokens-cpp-1.1.2.ebuild 1413 BLAKE2B d9e5646f1e42e1395afb8af809f0846476f1f48c7c5a8e517132abce364248cc20904d621597c1e9773a8f2cba500a2b3abf2a82e315e1728b4c3a3180cb64ff SHA512 69e13b094ad62de9137a8383fb836ea7ea6f183547d2a51dddc265674990c33bb6053725dafe50339489403ee6c35969a30e244c2cb008fa7f520c06b67e1f7b
 MISC metadata.xml 1067 BLAKE2B a3af60b824b07a0db1f2497b7a8d8dea6a4c5a0a225be98e0bd2c35e701197210d0905c213fda060536cacf68e7b0181bad0f849c3dc9eac709af8c1c1df9169 SHA512 e87768329cb90205fb98cba59ddb911414c202cf03de358030aca79766b9834b3a3be4f00ba1a50f5171281852b85b5dc0211a6b7943c4cf0de94e794dd4827a
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
new file mode 100644
index 000000000000..c12cad405a66
--- /dev/null
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
+else
+	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"
+HOMEPAGE="https://scitokens.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	<dev-cpp/jwt-cpp-0.7.0[picojson]
+	dev-db/sqlite
+	dev-libs/openssl:0=
+	net-misc/curl:0=
+	kernel_linux? ( sys-apps/util-linux )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Unbundle dev-cpp/gtest, dev-cpp/jwt-cpp
+	rm -r vendor || die
+	# Fix include path for picojson.
+	find src/ \( -name '*.cpp' -o -name '*.h' \) -type f -print0 | \
+		xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die
+	# Disable network-based tests relying on external services.
+	if use test; then
+		sed -i	-e '/^TEST_F/s#RefreshTest#DISABLED_RefreshTest#' \
+			-e '/^TEST_F/s#RefreshExpiredTest#DISABLED_RefreshExpiredTest#' test/main.cpp || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
+		-DSCITOKENS_EXTERNAL_GTEST=YES
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index c83766a8f5ac..6b43006ff684 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,5 +1,7 @@
 AUX sdbus-c++-1.4.0-fix-pkgconfig.patch 3950 BLAKE2B c3205ab76542328e087e09cb51fb1f7ad0d6ae62ce2bd70c9302dd5470da35655bb767bcc732a2f24ef17f2da44d7c19bedf1e907a52d305ac43fbff675c78df SHA512 e8210de333156e69ec3bac855a827dc5a17dbcb0c646d50bcb7320612f3b97a80265e8828bb78c255da4ca862ebb403c2254d144564e650a0536fc26a9ebff1f
 AUX sdbus-c++-1.4.0-gcc-14.patch 735 BLAKE2B 206126f96f28f52a17d18bb134b34a5b3c99c657883bf79f0884d27771793733773cb337a05fc86ef689aec5c8eeb2a074de046062846243aec352a1f137e689 SHA512 d70a06274a0f218830d2787cc76f1bcd2df4605e8fec9030a7083590b51f6d0f00d8c97156d363534182c0de8a08f4f982b88ef732675dca80f5860977075e39
 DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76
+DIST sdbus-c++-2.0.0.tar.gz 243202 BLAKE2B 946a7d87b882ae44843864311fc93ddf010a4f3fe3d341fb5d3f05890f2693d341082007db94f57eee06bf60e3f3a1adc35e63bbf057883b4a6d0b466791def0 SHA512 638453d2ea0d5ba556eacda59ca114896bf275d227b33b525259bf69dac3d766df6586046e6ea83a8c1afe9fb0701f4d358819ed9300bab598e775a0a2880917
 EBUILD sdbus-c++-1.4.0-r1.ebuild 1903 BLAKE2B a60b025ea048495b473491cbc649cbe2157f10f4819a8cb4aba0444a3f907fb3735761d6457dd9ffa1297d70a351b8541f15d40de11faccfd5ba0d939dfc9d3c SHA512 dae6bb8d788e3ad70f66a90d1bcab525d84b1602bee54ff73d8a448f17eff1e165fea3284128a57fd4ddce2ca9fd70d9009536a0707e47bd77541baea1d43c67
+EBUILD sdbus-c++-2.0.0.ebuild 2072 BLAKE2B b37bc8458ee51ef0732c6ce02672907e9797f9ffc0a237f12a034eb19c86d30a6072634c8d6d060f10072878b595df70ad36b824f6796b03733589b1f61b9692 SHA512 c5eb82506a227e60945824bbe0f8c89b9374404082c4cc994d16069c3357b4f9a2ddc625048a86e2f559a7bcbf3ddb4a0da9df18f74bbb5b4dfac53356f85f7d
 MISC metadata.xml 506 BLAKE2B 9782068264c44c006c345fa1ffc32eb47e4f526dc0cc371f2ae2cf0d480bccf065aa1cea17ceec02b40269fb029d6473b5dc531546571e558d2a78184f029bed SHA512 347b6ae706fc9878a356e8fa35026ff693989ccb4ea702ff4727e9d256863d2225718be0d40591895970018d5161163b42fb3423594a083794025fb9f73f5167
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
new file mode 100644
index 000000000000..24a9ea5018f8
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson cmake
+
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sdbus-cpp-${PV}"
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="doc +elogind systemd test tools"
+REQUIRED_USE="?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	elogind? ( >=sys-auth/elogind-252 )
+	systemd? ( >=sys-apps/systemd-252:= )
+	!elogind? ( !systemd? ( >=sys-libs/basu-0.2.1 ) )
+	tools? ( dev-libs/expat )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.14.0 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOXYGEN_DOC=$(usex doc)
+		-DSDBUSCPP_BUILD_CODEGEN=$(usex tools)
+		-DSDBUSCPP_BUILD_DOCS=yes
+		-DSDBUSCPP_BUILD_DOXYGEN_DOCS=$(usex doc)
+		-DSDBUSCPP_BUILD_LIBSYSTEMD=no
+		-DSDBUSCPP_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+		ewarn "Not running the tests as a D-Bus configuration file has not been"
+		ewarn "installed yet or has changed since. The tests can be run after"
+		ewarn "the package has been merged."
+		return
+	elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+		ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+		return
+	fi
+
+	# Can't use cmake_src_test with dbus-run-session. Don't bother with all the
+	# extra arguments because there's only two tests.
+	dbus-run-session ctest --test-dir "${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	if use test; then
+		# Delete installed test binaries.
+		rm -rv "${ED}"/usr/tests || die
+	fi
+}
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index fca7b1d4140d..4facd37dd162 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,4 +1,4 @@
 AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8eb00ad2b8fc33e26840ee0a9ca63c73ea37aa99548d3c741d70647078424f27906946f261b07d764be9adaf47c1d13bc4bf6d302f SHA512 6732a3197550f75ce7a83d61882938d841694f41e9daec51ef36206306fdabdd33dd46eaec106a8877826098b8227368c1ed0962d36aa220abd0336713667bd4
 DIST sparsehash-2.0.4.tar.gz 323154 BLAKE2B 8e0da89a6ae684271293f048092d6c79d14818f7ab9d4fa449414b3354f9e7769d9b0cc724227c47a1be7c7357cdac5cf6f3873047a08c8f085cc457858a8826 SHA512 40c007bc5814dd5f2bdacd5ec884bc5424f7126f182d4c7b34371f88b674456fc193b947fdd283dbd0c7eb044d8f06baf8caec6c93e73b1b587282b9026ea877
-EBUILD sparsehash-2.0.4.ebuild 535 BLAKE2B 4193e724f2289877d7f2026abf31446c60176d87d19ad95aefcc220acf16fa9dfe8757bd649a7a5edf60ca051a6b55559de1395e199ed576eba59910f2b30949 SHA512 3113d72f49fdb3711effee15cb490b0dc23439b5d4eea08a54e9a3dc9964fe2d62bca56cc35633c14a0796e28c715029e9cff635f8fab63e86769b7d1aeb2404
+EBUILD sparsehash-2.0.4-r1.ebuild 534 BLAKE2B be04e7d3df438968d3afc2ceb0ea58449cc481c2b5bb77f149ff19ff8a41f30419da1150ac2bbd71fb26726b86a9fb6469b867a76f787be4e36efb3a86e01846 SHA512 cfc0a378f0b4a09d2536a267c551dd934c42eba6b9abb281bdc48328cf7dfda85144964e4c1b5c06ac28710523c1787b085f4c82a5b0a568c1ead480967c3959
 MISC metadata.xml 334 BLAKE2B 13c59a7f06e31a02327cd4a394645f9b0e05f9703d093ab401fe6a0bf0ad8810283b3fec4cb0a87d9b87925bce0703cbeb5bf57717e7975e3fed4ce15965e850 SHA512 80339a3d0f36902822493ce7fcf0734840eeb8a107838e5d95b2ab59aa5e55f3c50bcfc266f4a989c768ae758b0fa5a22d18e0bbf070d7f1150e076ae0d4d544
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
index f2c96528a8b1..eb0a80c4bc0f 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="An extremely memory-efficient hash_map implementation"
 HOMEPAGE="https://github.com/sparsehash/sparsehash"
 SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
-S="${WORKDIR}/${PN}-${P}"
-
 PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
 
 src_prepare() {
diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest
index f6e5d938fdd8..fce031c56a25 100644
--- a/dev-cpp/taskflow/Manifest
+++ b/dev-cpp/taskflow/Manifest
@@ -5,9 +5,9 @@ DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d414
 DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d
 DIST taskflow-3.6.0.tar.gz 66335249 BLAKE2B bcdc6d721e32b7c40f65ed5bd115d2c0083663e8b51c0e4460baa5f62e576382a45e8da735119b577d8a6ae7a64c72431654471a3b8335997fdf4f9191ad64af SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8
 DIST taskflow-3.7.0.tar.gz 66383509 BLAKE2B 92a9d56f0101d507b7f924ce9038d6d43a5f39c9270582f910644ad281ea2cee3f8fa39f3ee4e748f90d013d57a3bc2f24842e328ab345bc580d1a9a5de4f308 SHA512 2faecc9eaf9e7f24253a5aedbb4ef6164ba8b5181b7f2c65d8646c21300f28278d7817e928eeab7e85ec2b9644508a8665bab1a7482ec85a7f6de18cecb32d6f
-EBUILD taskflow-3.3.0.ebuild 999 BLAKE2B 405f61b5a518e1697e3b660fab9443be2faa72ababa1ad43ac05ff549ebcfa7d3c9266699911ad424a688d290a21ca1e667f0c6328f8fdfd8bf01b37bf804cc6 SHA512 539ab5cf20898cd77ab9b8e0049f0cbaaa02d5918e33d694ceeafc26d8c04f90b8c50655130c5834d7481f069582c83d0296a2ec7995c117ea301391983a937e
-EBUILD taskflow-3.4.0.ebuild 1013 BLAKE2B 8a61754d0113ea6b7d3359c622e6da4831769170b1f40e04002b5eaf6ff21db3b498d6a6b29a650e92af2be892052d0606078f90838c804c86ac97bc0170a58b SHA512 667382c9a64d7e813efcf1373dc101650a1ed9dc68cfea6df94d6049a2446c50e559be652782ce9c70296bbea3c2d47eeef4574ad672128d99fcc741e7ea8de6
-EBUILD taskflow-3.6.0.ebuild 934 BLAKE2B 59e254e388d85bda9db1695ba00dde703d38f9ace398676ac20edece62b7d31e7d478db4fef1443181841703cad92ce5edf1771ff58ea0cc6b8b431ed40bbf58 SHA512 ef127e1a2aa52e632648a5d1f41068e8dbc0bbf7d3e9357c246bfad77f19a9a7870d519613674bc2a0bea7e61fa9ff329d2fa434749917766cea73951b12b5d9
-EBUILD taskflow-3.7.0.ebuild 941 BLAKE2B f66ac77853f57123d771e785401248f3303fd259b8001bc581f9318113d24d35474c756fbd3a377700227133af9db422a01e2e09bf2499fad30b9ab095a779a2 SHA512 e535884be3ff89358d10b8504336727c253b60cf683b3143968770ff4eba5a9ab478b3fb8a788b68a5162fc0d1fe82373d83028ef1d2633cb3867e5fd3854190
-EBUILD taskflow-9999.ebuild 1018 BLAKE2B 07a6537fa522fdd836f9b31ad5511aa93b1bb1d5631c6f07a9724c37b79e05a5fb42da3ac96ae01de94abf989fa15b8f43537571e4d0e70a8ed545e6e0f52282 SHA512 8b14aba4c334384deafdeb59643a07798f36d5bfa2a762e765c584f6c3ecbea15de16bcf81d46a884a27c240fd2b3915fe507825eed02e14ff785e68924ab243
+EBUILD taskflow-3.3.0.ebuild 993 BLAKE2B dc147113f2cf791e7a3ca8297b55f837d0dd23acec54e5224a5169c2049b667470169433bb9455a07093f71eb0c7b1ad18e5dd13ac01a1f960ddf91e12f42d65 SHA512 47e30cd96f7db95179c23e06ccbfac1cea58d6d70fb774a5391a978bf22977448d134ab27499d08ff652624c385f02e980210a6bc3145d6be0bb5249b09a9a59
+EBUILD taskflow-3.4.0.ebuild 1007 BLAKE2B 0e2a13d81a3e0c34ed52f7c6e15924520cd6885805f4d238ac25999899971926b155f38dfa93c2440613adec52e85e5f714956b94b726d4790d9c88ccfc5a58f SHA512 399a79821e647a6d55cb199bf2cc93c63f2369f37a374118453ad73f4ad096d9e517e1c1f759a5ebd1f1e1fe870ca2f24d72444f334c9e7c32f48d32ec3c622c
+EBUILD taskflow-3.6.0.ebuild 928 BLAKE2B e3a75dd88cd004dc57a2bd717e8a8ae9ef8b084b11916bc45cb0866e5f3ab4acc218fab633ddfaab620e17b540cade31eb18687b591244fb599e7742da15e46e SHA512 bdd5d2f6415ce6a710f7dbc179d88074cf556bcab3ee4682a7a959250645ed9537af2d158f41ec51d38ab4048c60c114afd88a25c9350fc5f7bf27c2ad591aeb
+EBUILD taskflow-3.7.0.ebuild 935 BLAKE2B 0febb708a71227b2aabe2d3c0c5d04e35a9b5f19d655027a73cf5e0b26bb4e277320e13d12bfeab9bf65097d7665b55a13652b6a406c8b54a9035d3c40cea90f SHA512 ce09f6e9714412d531aff090ee63eb8021c21d6592d96ac167b8ec318d21c5a1bfab422fe45f9238f428ab138cc605fb7b6da26e45e6d09fe7f90109e8099de1
+EBUILD taskflow-9999.ebuild 1012 BLAKE2B f916e531738a8c916cbb46bf22082d0504a41628846aaf4f8c17b9763717ccad3b8c2fd8318e2bd43f0e3c9e1ed0a7274596136f77cd1136c5086744cd2f5950 SHA512 1336557cb9b23f1e3d0c4e2a7208bf7979c823e27df17a44e8fda4ea1f377bf498a71f8b67bac38c2dcf91154f43696a9ed2878493e9a65e76146934743182de
 MISC metadata.xml 651 BLAKE2B e10047de786b002d6c270c5e7bd4b618a435188c4d15d907e771b7d638832e41e1e7b6d4a367878c8b46a2ea774afdbdf6e5f054e90dadfd87dac3042c471fea SHA512 44ef280af91998e08aa97e8dfb9b3a5d26b67f1416d58c7e8975f12516549a76b9b9763158207add9b581bb08559d95721fedc35984916011e5af4eda155a87d
diff --git a/dev-cpp/taskflow/taskflow-3.3.0.ebuild b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
index 27b159cb6268..7b2991224da5 100644
--- a/dev-cpp/taskflow/taskflow-3.3.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-cpp/taskflow/taskflow-3.4.0.ebuild b/dev-cpp/taskflow/taskflow-3.4.0.ebuild
index 5909982c9530..1430fd5016e7 100644
--- a/dev-cpp/taskflow/taskflow-3.4.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-cpp/taskflow/taskflow-3.6.0.ebuild b/dev-cpp/taskflow/taskflow-3.6.0.ebuild
index 7e1fc394c892..24549c65ae8f 100644
--- a/dev-cpp/taskflow/taskflow-3.6.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-cpp/taskflow/taskflow-3.7.0.ebuild b/dev-cpp/taskflow/taskflow-3.7.0.ebuild
index a9a00cd40a3d..596e01e98f87 100644
--- a/dev-cpp/taskflow/taskflow-3.7.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-cpp/taskflow/taskflow-9999.ebuild b/dev-cpp/taskflow/taskflow-9999.ebuild
index 0a0560906b3d..d718a2e18db8 100644
--- a/dev-cpp/taskflow/taskflow-9999.ebuild
+++ b/dev-cpp/taskflow/taskflow-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index f1240193e74a..67f6f46cb2a8 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -8,9 +8,9 @@ DIST tbb-2021.12.0.tar.gz 2617255 BLAKE2B 3e1db8b1972a7225c5355def66ae40006e6e0f
 DIST tbb-2021.13.0.tar.gz 2613916 BLAKE2B 0edd2d8a966dba673e50827629491924140a302430f4380e7cd9914f3592eaf6515204c7267649237970a5482cc030f0c29cbddd1476f16caf46989f70041058 SHA512 1f536b98c4eb331c3ba21e4b36362c932d7852b974ea7237b5f7bffb0e996d76f688c7ac534cb56f5866cfdffd5d3f015521b4c2ca21e584503070782ca82a2f
 DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c
-EBUILD tbb-2020.3.ebuild 3437 BLAKE2B 16b92e3a47f6ff29b92163d589f90fed7cffa31f1e2d1f4e81c1e06cdf184401662be048beafa20caf924e777424b8186dc35393a4b8edbf2f5cde75d96040ef SHA512 11ef97cd4d8ce9f7f6b5cc235c13106e03d218d88ba52ea2776ef3f2e186adbf5b2f081a856b086e6d3184b4469d130f23636acec4a662a803e8e6a6dbdd4c44
-EBUILD tbb-2021.12.0.ebuild 1423 BLAKE2B 1752a9546d5c9291fc5c3081ebb237be2172cc071143e587dc5a2278143279d756308a9f3f445069da8c6a41d6cab1f124625963fffc0a0e27b0f11df9bf695c SHA512 48ee55cdc0a33d8b7ffa56fe88791d13469fb0a21a75d81410f616dc59013f38bcf34c08d15691ae7973093d9d1f3761568da96b7079ba50f2400589651fa086
-EBUILD tbb-2021.13.0.ebuild 1423 BLAKE2B 1752a9546d5c9291fc5c3081ebb237be2172cc071143e587dc5a2278143279d756308a9f3f445069da8c6a41d6cab1f124625963fffc0a0e27b0f11df9bf695c SHA512 48ee55cdc0a33d8b7ffa56fe88791d13469fb0a21a75d81410f616dc59013f38bcf34c08d15691ae7973093d9d1f3761568da96b7079ba50f2400589651fa086
-EBUILD tbb-2021.7.0-r1.ebuild 1092 BLAKE2B 449710ffde68b12225ac8bccd749f54abda65e6764339cdc56b855e2fceb084362971302d1f9bbc6c8742cbdccb430d02b9fe0babfa46a3d5f3c246c679efe8d SHA512 a4af6752b60e17c22215f2455643e3ebc3440dadc058196f0482fdde08bbf95184ad1fdf9fb3f6409287d6406c3b4803fd30c0a1b349fffdc9bf10a4db14ed52
-EBUILD tbb-2021.9.0.ebuild 1431 BLAKE2B 5ba9cc84b2dd2f587d2858b98b04433c538fc8798d052247aeb7e882774fccc31356390448f0d352f0d7cae5a4a47d5ba965fa48cc8a610f4b2117a32bd47c44 SHA512 86305a5ef1a9eaa83bf027d2952f9c3ce2ffe1b6b9a1ae6383bc671f00349e119b563829a4a36a0d2aa7cb3c496ece8e4dbfd4d2d815a5fb5ea2bf7fd249a835
+EBUILD tbb-2020.3.ebuild 3431 BLAKE2B b283e9afa2d918f8915d3e8f3e5f8a9730ab8424bd1587393c5e6254e1a2b767b7c0fecc0997f3970b37bab499bff13943cf099547b4da664a12b0c9f5bc5816 SHA512 b4b51539006965353ff8759dfad12053071db5cfb8479bea1b0c5f9c58d22d70d12859e13412959844a7104744454a0290a46aff332040c0af15a6d09423306a
+EBUILD tbb-2021.12.0.ebuild 1417 BLAKE2B 2af0947eb0bc96fbda1ef7c48731fbd62836d0a9ff14baee03732ffb69dabaf166814812ece873c0993f1510672a19774e858fa20f1af857bad9f11bc9f3d631 SHA512 4f3045557f16df3c6963f0a9d157c178cbdcecca56b7d1abcf29001e750cd43c77dbf4ba5cf8056d6ba00026572930dfc4049c906878ce9385309724659708aa
+EBUILD tbb-2021.13.0.ebuild 1417 BLAKE2B 2af0947eb0bc96fbda1ef7c48731fbd62836d0a9ff14baee03732ffb69dabaf166814812ece873c0993f1510672a19774e858fa20f1af857bad9f11bc9f3d631 SHA512 4f3045557f16df3c6963f0a9d157c178cbdcecca56b7d1abcf29001e750cd43c77dbf4ba5cf8056d6ba00026572930dfc4049c906878ce9385309724659708aa
+EBUILD tbb-2021.7.0-r1.ebuild 1086 BLAKE2B c513c44a8d03d23986f7fb2d636f081e9b9e5c46fec30f63ba91dda7af6f62a90b92a2e8bcaca07be0da4ec9e4230628fad6bde8aeadbb7c05e75e9267d542b8 SHA512 4b37456c7d580f7717cebd522cb0934c1303971333a12d9e905dcdb302987d3cb9fa62a66e9d2a29088e60edabac58d8708b3d3ba2250ca12162ddd61c0afb11
+EBUILD tbb-2021.9.0.ebuild 1425 BLAKE2B c303fc9f13ff1d35e6338a16fdf26345beab1e341427932b557eef04867e6849f3d6dbe4909e60aeaedd06f912cf88757a8be41dbba63ca272d9b77728e674f5 SHA512 2a25e8ab9509bfc4b81c104fbc04c28721cb1526e447b9e489e6f8a77e427aeb8c5beff6e0a82c602a0e2cdebc5d2566844dac5e8355da4d6d927c99ce7cf38e
 MISC metadata.xml 696 BLAKE2B b8003afd9cf4ef7a07aab27f5a5263604fd32ca98ade51ed5a3872a53ea45c2151a49b0a9bd997219a58ef4e37ff4c969df716ee7e9987bf43c9fbc132dca245 SHA512 b95aad151a300ae292c519d7d792e2b4bdf471ef786c77904e279a203a4ebb24514177a1a8663abdf2ea6899c63e007dbc7a69cf1c0b53f6e3d3b486d66243d7
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 36dc24e44018..a4a8523b1c41 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/oneapi-src/oneTBB"
 SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples"
 
 S="${WORKDIR}/oneTBB-${MY_PV}"
diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild
index ac958e5973a4..c4ce0e2090fb 100644
--- a/dev-cpp/tbb/tbb-2021.12.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.12.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.13.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
index ac958e5973a4..c4ce0e2090fb 100644
--- a/dev-cpp/tbb/tbb-2021.13.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index dd9c26717c7e..4ce310a4a962 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 8b1ca16deaa8..40e9314966f1 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest
index 9ff259749d77..e8b5a1ce08e4 100644
--- a/dev-cpp/toml11/Manifest
+++ b/dev-cpp/toml11/Manifest
@@ -1,3 +1,3 @@
 DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b
-EBUILD toml11-4.2.0.ebuild 530 BLAKE2B 5790c78ef41feb0f6da40e8c54ca9a81d3c5db149d0925c2df93b41cf515b214f1763fbd20a18ae985115717d2cf019851eac82eb8b47ca9efa52faccd43cf9f SHA512 cd0eb90f7fb52c1261b2a0a23ea12dfedf63574c23a13cf43de3f6ff6bf3f75edd18e1a93a678fc83888a911b97ad65b2051076d6399a16a89531dc7892a0a4e
-MISC metadata.xml 402 BLAKE2B 3036a6fb020f076c47ad30c901b5f8a5e36af312190df2e8ae84cd374731b9711fb48b3d8f7f3463edd7b50ae99b6e4dc78d4e60dfa3b3ccc56cf4c806082063 SHA512 e438104524445b0a27547730396437403a2885403c5611fad81e438282517195b44f81040540162c7ee0ace9758f99c19feb0772ab2d8ad0cd6f853aaf64e6de
+EBUILD toml11-4.2.0.ebuild 542 BLAKE2B b7b00264619b8276f461a8d0f721b60254133978bbdff02e9a0a66ef79c6fe4afd19497cc76d4e1647ed947243e28b772bb699c7786c4ad3770964c2722cecea SHA512 fcac5125de929e6538d95d10ef1b8a56b69acda1f9b9c1117febb548e0c497b6278174da603993aed338203b37de457e86d9b300c8aa8c62c191f0411f9a7e61
+MISC metadata.xml 403 BLAKE2B 5831a13c1900d7a6442d4c6bd2325e626528740d4efeb20a7098fd89484c5441b526631545a6a0c46bb6a75850f97149c4c272d448f79a69447a9e7f070fd016 SHA512 28783755b55d3d7d86998c801289f0e87a455b84d3afe1263015b72dfd85edd4317f899eeb135e7664510e55777aacbddb3e2018a3c1ee57e6a5e63fb115dca6
diff --git a/dev-cpp/toml11/metadata.xml b/dev-cpp/toml11/metadata.xml
index b6d01e802127..a13712afd757 100644
--- a/dev-cpp/toml11/metadata.xml
+++ b/dev-cpp/toml11/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild
index da9ac1e07435..29e92d2f1353 100644
--- a/dev-cpp/toml11/toml11-4.2.0.ebuild
+++ b/dev-cpp/toml11/toml11-4.2.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/ToruNiina/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index ba11c9366c96..001354dac412 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,5 +1,5 @@
 DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112
 DIST tree-3.18.tar.gz 1179107 BLAKE2B d05f90c58e203800a7482d0d7b36625dc32e9d3321a65f80fda380d2d7c214be1f47bc01d9f20fe2e287eeafdebe4180940ba7dbc7f78c12072193cbb95c2df1 SHA512 df9047fcd92ac5137af47dd03582fa1ba87651f112a91a1d61eecf3916af1a2130e1841e954af9b6eeb167da33c9e50c2662ecdcc5317e67173ba50f77afeae0
 EBUILD tree-3.17.ebuild 743 BLAKE2B ee1f494c9b7a0b29c220135e3304e638e45e820718967582814de04e66626ec8dbb6c132fb4e739c4b7cdc49f89f9398da9516fa3900ec8bedeb5a3cc3491c08 SHA512 4d45fa7d72cf2aba431d8fb4560dbae9608b0f6152433c2844af683b767495bbcec666b11bb967b48ce178ed2f28bf11cba2d4699fe31f8dd30b1ae4f67d1a9b
-EBUILD tree-3.18.ebuild 746 BLAKE2B e57385f0c0d8640ee66d4464fa92f58507828902e452e93397e8d422ae0890592be318079b15e5cc147e1f1c6f4910ddd0f2da64fd92378efab4a3a60f8b5a58 SHA512 6e9d12f29c7dd7d0c3f5a437cb847ff12d457c3adc13d992523c2b716781196c26f2de92e2474c65188492c724f213299a07b7b34aecf7a7a194cc926b87f72b
+EBUILD tree-3.18.ebuild 743 BLAKE2B c869c27ed0ae602088c68c096717bb4907623b77ebdf107302d3fb00595591ed9716f13c3dd1dc5e846c22981b42f6288c1a624898c06bc5c7789495c2a34a42 SHA512 d78afd9900a16749392cb0404f524246dcda47355876daab57c8f619bfab0c79526b00aea731e5f360be0ff9273367582497a0ccb6077fc117ca84eae4c6acf3
 MISC metadata.xml 701 BLAKE2B e0367f9eee54369769f24c6024fe76d5b934d67dfcd5b377ea69516885194060e74f5c70d32ae78d2c71ded893126ee69e19bd5a3778cbea4de560e3c7751df5 SHA512 636c94cc96c157e89b74f26dd72bed483e0525bc8d992cb2dbda443790dfea8d0335e2f870e02ea56509c2152a63a70799a74c706a1ee33117e5dc50268b6ae8
diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild
index 33b480f4a325..917ad3c60aed 100644
--- a/dev-cpp/tree/tree-3.18.ebuild
+++ b/dev-cpp/tree/tree-3.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_configure() {
 	tc-export CXX
diff --git a/dev-cpp/valijson/Manifest b/dev-cpp/valijson/Manifest
index 275c6ab7d5f1..ba73dc4c6884 100644
--- a/dev-cpp/valijson/Manifest
+++ b/dev-cpp/valijson/Manifest
@@ -1,6 +1,5 @@
-AUX 1.0-fix-macro-typos.patch 2966 BLAKE2B 5f8307c6a71cd4066a6f68af78e3f35294490688c65fdee7dd3a7d0394de0210a13a784255bba761e408870d9d76691bd6f298e9ecb7c0e7f3b816f71a805742 SHA512 6da572cb86237758708d171452eb8ba88e7f2cda1baecfaf8dd2f674b04de0cdd2d57c9041f517ff472714ff2ad66e66aa4e432931f09bfb00349c1c48b8e6da
 DIST valijson-1.0.2.tar.gz 723131 BLAKE2B ada64202d1c82f4e24c8fb3935a070ee40a24e8b75712fd4392f19c93c363d293db788cd1481ed3a857721fcd6f87e2d91c3b9779863fb6e2421ba4ee4f1d1f7 SHA512 c1141e533d6a791a01883c5b7ab9501eebc39057a850d784670a4bcf99bff3fee4c3120107128dcaa9db0505adf2ae794700620c02163b3e636f0b635031df80
-DIST valijson-1.0.tar.gz 721078 BLAKE2B 74f4a061266a6ee8fba9d93b4e1df20dc828d85169f865bdb60ba9f5217ee422324a09788b02b4ddd18a92d906c64863a5bd7c1250f8bdb62fd9f00f3d73c7e7 SHA512 a206954b11e92cbebbebf094e6f0925a270ebd6bec49cbdb7adda5a4cec93587a5a61ebbce105846c3950cf5df74bfdd5f5bb1ffbf73315f45c7a6cda2b77db9
+DIST valijson-1.0.3.tar.gz 727517 BLAKE2B c0bf5bc3aedf1462ae7cf30d64acc6d91e620cdd747f13f05f25df07074731dc2b611a07cb6204a5883641bd73c80dc4042a5a804e2aac23a24464add378ea7e SHA512 5ab67d27c8906c116e65198831ebfc3e5a1772087b7cfe316bde7d2bbd78a7ec3bf0e8fc803fc4528779fe2515e72711b8cb14f05ca6f5bf01af2b5e9ca396fa
 EBUILD valijson-1.0.2.ebuild 521 BLAKE2B 9dfa466b0a68b75923ac58bfe2af461f155de502d16ef8fc2b8756c21c922ab3c278f6ec9f8f8a9d8a9e7fed3fa7459945fa85fa4680da1f89a45cec6d5360bd SHA512 5e5904aff20d69b6f812cfc70fa5ba7ad7d99c9c8d42effc5eeb8ebe972a19e37d81efaf693be7483d5d69f8cf49159dd7ed05dfe16516b731e0d926b7d0d204
-EBUILD valijson-1.0.ebuild 577 BLAKE2B 7773d8d58ee2a589e36bac21710cf611c64dddf0d7a5ad8baae774de35e70662f4ddee675d3649f4fa6d7139901ba9065b6799e20bcf61b241451b04d292c51c SHA512 7bf65b7b19b584dc9637a5c4d048a3c9e96e3980c1f7829e3d726fa70de0e8eb75969d4196bb54d04013f35905589a28d80d361008189aa1fcd9312852238a6b
+EBUILD valijson-1.0.3.ebuild 523 BLAKE2B 283be5a77334c4fc4220834d545080eb5bcb008f187456c666676871d2e6d0f14fcba1cf1d9ce96048fbef6ba22ceebe547c5b229c52898dc7108f9246b17370 SHA512 334ce0ecd45bf78fbe3761c942905b382328ef9c1ec70b2ee4e7a102e5d88705fa1f7a8166e1c4945b41ec8757c3f2e848a8eb7e3ff6d3f18ed2c863e0f037e8
 MISC metadata.xml 498 BLAKE2B 415d770e91c8304ace73ee5ff1ee079d7e1c09c6eeac26123e4ba4615194829a0c8bedfe27e2e803cddb101b30c3bd94b6003523fa0ec849972303b0f37f59e2 SHA512 dfaf020b039378127a159f2f8b66f1488b671817c34b77b01e19f24c117306c88801e26990fc434b4f9c23d1620631cf048ff9c281017135e46c7b7acbbfb8a0
diff --git a/dev-cpp/valijson/files/1.0-fix-macro-typos.patch b/dev-cpp/valijson/files/1.0-fix-macro-typos.patch
deleted file mode 100644
index f90e88dabe92..000000000000
--- a/dev-cpp/valijson/files/1.0-fix-macro-typos.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-Patch from:
-https://github.com/tristanpenman/valijson/commit/f1ff3518281fe347c97b78384d6bb645dbdd4788
-
-From f1ff3518281fe347c97b78384d6bb645dbdd4788 Mon Sep 17 00:00:00 2001
-From: Austin Haigh <austin.haigh@hach.com>
-Date: Tue, 1 Nov 2022 13:29:16 -0600
-Subject: [PATCH] fix typos in preprocessor macros
-
----
- examples/valijson_nlohmann_bundled.hpp         | 2 +-
- include/valijson/utils/boost_json_utils.hpp    | 4 ++--
- include/valijson/utils/nlohmann_json_utils.hpp | 2 +-
- include/valijson/utils/property_tree_utils.hpp | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/examples/valijson_nlohmann_bundled.hpp b/examples/valijson_nlohmann_bundled.hpp
-index 806f329..915bebb 100644
---- a/examples/valijson_nlohmann_bundled.hpp
-+++ b/examples/valijson_nlohmann_bundled.hpp
-@@ -10561,7 +10561,7 @@ inline bool loadDocument(const std::string &path, nlohmann::json &document)
-     }
- 
-     // Parse schema
--#if VALIJSON_USE_EXCEPTION
-+#if VALIJSON_USE_EXCEPTIONS
-     try {
-         document = nlohmann::json::parse(file);
-     } catch (std::invalid_argument const& exception) {
-diff --git a/include/valijson/utils/boost_json_utils.hpp b/include/valijson/utils/boost_json_utils.hpp
-index 1168903..0fbd6c3 100644
---- a/include/valijson/utils/boost_json_utils.hpp
-+++ b/include/valijson/utils/boost_json_utils.hpp
-@@ -20,7 +20,7 @@ inline bool loadDocument(const std::string &path, boost::json::value &document)
-     }
- 
-     // Parse schema
--#if VALIJSON_USE_EXCEPTION
-+#if VALIJSON_USE_EXCEPTIONS
-     try {
- #endif
-       boost::json::error_code errorCode;
-@@ -30,7 +30,7 @@ inline bool loadDocument(const std::string &path, boost::json::value &document)
-             std::cerr << "Boost.JSON parsing error: " << errorCode.message();
-             return false;
-         }
--#if VALIJSON_USE_EXCEPTION
-+#if VALIJSON_USE_EXCEPTIONS
-     } catch (std::exception const & exception) {
-         std::cerr << "Boost.JSON parsing exception: " << exception.what();
-         return false;
-diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp
-index b3cbe20..77e5771 100644
---- a/include/valijson/utils/nlohmann_json_utils.hpp
-+++ b/include/valijson/utils/nlohmann_json_utils.hpp
-@@ -20,7 +20,7 @@ inline bool loadDocument(const std::string &path, nlohmann::json &document)
-     }
- 
-     // Parse schema
--#if VALIJSON_USE_EXCEPTION
-+#if VALIJSON_USE_EXCEPTIONS
-     try {
-         document = nlohmann::json::parse(file);
-     } catch (std::invalid_argument const& exception) {
-diff --git a/include/valijson/utils/property_tree_utils.hpp b/include/valijson/utils/property_tree_utils.hpp
-index 2317f12..7438980 100644
---- a/include/valijson/utils/property_tree_utils.hpp
-+++ b/include/valijson/utils/property_tree_utils.hpp
-@@ -24,7 +24,7 @@
- #include <valijson/utils/file_utils.hpp>
- #include <valijson/exceptions.hpp>
- 
--#if !VALIJSON_USE_EXCEPTION
-+#if !VALIJSON_USE_EXCEPTIONS
- 
- namespace boost {
- 
diff --git a/dev-cpp/valijson/valijson-1.0.ebuild b/dev-cpp/valijson/valijson-1.0.3.ebuild
index bc4327b63333..b0c20539683e 100644
--- a/dev-cpp/valijson/valijson-1.0.ebuild
+++ b/dev-cpp/valijson/valijson-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,13 +11,9 @@ SRC_URI="https://github.com/tristanpenman/valijson/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD-2 Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-macro-typos.patch
-)
-
 src_install() {
 	# there is no target for installing headers, so do it manually
 	doheader -r include/*
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 5344cabed370..fb39fffe1961 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -3,5 +3,5 @@ AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 12
 AUX websocketpp-0.8.2-fix-boost_find_component.patch 950 BLAKE2B 16e80dcdf6a0af95fb7ac8b1c52fd9205379da13787dbd3d023a79a2c6e611ca093f49acc4618d7db0c2397126e4e6ec2cb1633116be658347f2403faee16d7f SHA512 192fd716040e91a6912407778a1c7a208a29ceaaa48aacb0fefddcd622d2ecde68093aff837b0cf4c3d8dc40cd9a5f4714040aa2264a1f8a01190b174a2a12b1
 AUX websocketpp-0.8.2-fix-clang.patch 1042 BLAKE2B 8d453efb82fea72a0a4b2ed5ab7ec44975ee963cbb99cf0c69bcd3ef2eb4482334981c711e9f0780c1f59353b74cf8543528d9889d2cac51ad746a59eae28ab1 SHA512 7c7fdbe70627cd39a4936fb0118a3d347753a1c6150c8801544b753ba4b5cd8c653043035fa164e31f2a41d09662d4abb4429140c14e42e2a195094e06574766
 DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
-EBUILD websocketpp-0.8.2.ebuild 1276 BLAKE2B f4f85a38bbb97ec17fe946332ad990208542e8bd9f4e2a3dbad052fd9a397f9b7b6f49f664fce33890898f26bb045c975f2d92f6377472c109c798242a05231f SHA512 fdacdf448f1055403013b42242294667c51a2a4c1c3ffc02af8e781a1f618f95364dbd8c0c230a37e507b7538bf794b652397c2f86f4a5afae2bbf76ec078209
+EBUILD websocketpp-0.8.2.ebuild 1270 BLAKE2B 47e18a61da1af6a3ff7d8b9650c0d632618f4e30cad55dfa4ea7f5aba16ede19281846261c3a88ef2c4eba1509f6ee5c186482c0e2003116541fe79c454a8a34 SHA512 d464b07dc7de25807f15654a461915d40b8129356f5a6d73acdb7dae6f60806acf51cf281f69a7de1f595e8ce04f44f4e0905588eaee17a704d8404ecf396daa
 MISC metadata.xml 252 BLAKE2B 4beafc2dbc69f457e4880196afd696198e1d4006e76836d7581c4a3098bf68d58da79344c88974c92a63303dbd0199d5de0bfd984adbc358ad92da2a9edd96a4 SHA512 20cc70561adba76fc4ac65953dc2a2dfc4b8261d6a56bed78d00b7aa8e0edd507bc851bf7c1dba138b55175dd1d1bb8b4f853fe96242046dc7611ab10cfb0a5b
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
index f9e11a9d8c95..1932daa43fd4 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index 02ede58ed931..edc262e1e4a0 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -8,5 +8,5 @@ DIST xsimd-12.1.1.tar.gz 253141 BLAKE2B 29efbb045d8ade8737d702a73f3d0a912111dd4f
 DIST xsimd-13.0.0.tar.gz 259967 BLAKE2B 63267c75a7e8ed2e8689a912e79a1d012ff3cf3813969f97a640801e372ec9e66a6e3d3034b6918a30dc3374e8211fd1107f1309156354b6bca6ba17c6f132b4 SHA512 cdc42ddad3353297cf25ea2b6b3f09967f5f388efc26241f2997979fdbbac072819ff771145bc5bfa86cb326cca84b4119e8e6e3f658407961cf203a40603a7f
 EBUILD xsimd-11.1.0-r1.ebuild 1034 BLAKE2B fdc6a900c039da14a5091ee7ed4a9ea9e2611610a9bd812fc6be91544e08e2f91d101b0800e70c8df224bab2d08677723e9aece300edbca585d9e31ee9425c4a SHA512 0e00b0d9143cd2c2736be80f35616fbb17789bc9696efb9ee340d13243b2c1c299314549faeeb6e02b3029e96709d8e7c108fe2b58cd5658aa60a8e9ff44c1e1
 EBUILD xsimd-12.1.1.ebuild 1045 BLAKE2B 263ebcc57be8996455820190be8d339f4f22ceb17d4da6e8f1438502307b429b091cf721d2ea9e55e7a2a6c66e65d1d824a271af3f5aeec0d66aa519c2e345c7 SHA512 998d903d3841879ce50c7e812b74d04bea52f49eb02222d886d4322f4cd7dd386c6eecf95f39b26668c93d91ac899c2c336ba6a677d3bd354e07c5aff52d8ed3
-EBUILD xsimd-13.0.0.ebuild 1156 BLAKE2B 4d9e98b81e4dddaa290d2b4a7ede0af27929838c32d8056532d01e0670601203447a588c8008dd0181c8fb7892827178dbe70a80241558ba7ee3c61b5e452cbf SHA512 1a0ba1839d8b37dca5194fa0f768db02539154f0f9ebf83bdeb6912bc4d7d63dd7bcdc6a3110dd7b0f304855709a8883c6b0126de0a64b5aff3be277c8475200
+EBUILD xsimd-13.0.0-r1.ebuild 1564 BLAKE2B 2f3eed364ae5a83412d8fee2f640005c365f0f742568deb80511cee41893361551aa982b724c8f83126125441136b3c817cf6e0f51d8705e32428137ae1103b6 SHA512 fdc268954d0aae16030fb9536beacc88b3c6096266afb06c9bdb2dd0d3ef51a63747acf9c6a982539b18ba77c367475174b847d257a9c002935311ddbdddcf42
 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885
diff --git a/dev-cpp/xsimd/xsimd-13.0.0.ebuild b/dev-cpp/xsimd/xsimd-13.0.0-r1.ebuild
index f6fa6899c716..167d9662c0cd 100644
--- a/dev-cpp/xsimd/xsimd-13.0.0.ebuild
+++ b/dev-cpp/xsimd/xsimd-13.0.0-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake python-any-r1
 
 DESCRIPTION="C++ wrappers for SIMD intrinsics"
 HOMEPAGE="https://github.com/xtensor-stack/xsimd"
@@ -19,9 +20,11 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	doc? (
 		app-text/doxygen
-		dev-python/breathe
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
+		$(python_gen_any_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
 	)
 	test? ( dev-cpp/doctest )"
 
@@ -32,6 +35,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-13.0.0-detection-simd-with-mitigations.patch
 )
 
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/breathe[${PYTHON_USEDEP}]"
+
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	sed -i \
 		-e '/fPIC/d' \