236 files changed, 4734 insertions, 1773 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 4b23190db9b6..a21a7f63cd10 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 870357f6176e..71b2b68255d8 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -3,18 +3,31 @@ AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0ed
 AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53
 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867
 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
 DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2
 DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f
 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
 EBUILD abseil-cpp-20211102.0-r2.ebuild 1812 BLAKE2B 3e8b5486a5b9817c089cae614e17c7f095d5b4067af9c9da5fb98eeba772b41f154312f67789391a72267f3a2fa7a1062623b312bbf9b391c8b79069d20af853 SHA512 be4eae4177d0817871aee1a4b43d91f766e8186b26e8cda153c04e5894c3943764d86440f09a6177ead172c73706cd68f4be4c61b0e612ad3fbd6ce08ffcf1b5
 EBUILD abseil-cpp-20220623.1.ebuild 1732 BLAKE2B 8134bcb040be826b4f153afddc4c3aae86fd9d773afbf08b50bba323c0d067fd034c92fde3f9c15f73366e910f3641512e81cefa04bc5a9f2830d06e4b8ac3f5 SHA512 ac7802104eb66d08fdcc5904d1d9644ea1511c1f1d8bda2ba8931af6aa56ce5917d59bbb9e68354b8c4d1c38cba1507cb27420e681e3679c88d3bc9538b0e19e
 EBUILD abseil-cpp-20230125.2.ebuild 1693 BLAKE2B ad84c9a1b9b5983029aa5978f1fefc14700c1ffdfd4edf4a4cf2ff782d25cc339b2354a293c51d8853a6a2e0107ed3f7ea8e32685663ad760fc0245c7a4ac79c SHA512 6fe0f3a491f71fcd954201653fcf329385c738a7e43cb18adf802dc2f10c27ceb7c87e8e5303d20cce07dc1f905a5e094d6979a615b14b4cdb0cce5880b1a467
-EBUILD abseil-cpp-20230125.3-r1.ebuild 1543 BLAKE2B dcd09ab873b471c912ce3a36b3234289c875008878f45824735b2e05d1df5d349a731db0929ba00a0efbd743b00e6278961e14ce51368aad1df18f617f2d655c SHA512 65c8f2f7522365880dd0cd56757f8aa03d9d7ed63187c0fe71efad134893479a343c8c30ed6a08d9957379075b674e8a0e6f7c65585e8525bf5b8b9d6f9dec70
-EBUILD abseil-cpp-20230802.0.ebuild 1546 BLAKE2B 97f0ddd851ccc35fa9c87296f223861b35858bba86eb3be52a27beb9806c0ae15e33c52a3fdb244e3872bba854dec72cdd53bee6e0e998b027c857b431bf0216 SHA512 3713641f15a9ad62b5a84b50826dd58f84845c7393cf85e66e3d1bc4e5c24530b21a0eee744ca19c0a6ae1e1e44f5ef70cb5a2fc088f053870df49015848d9f1
-MISC metadata.xml 250 BLAKE2B f2e7e5ef7661a51822a5d563f7a835c3606c9bbb9688d599637e0950aa68dbacd67592a8c5306528653dd2b5f7100dc6f5e6ac69c5d7bf9777b12c984b53304c SHA512 99565f4efff02cf80efcaa76ad9247db3c0de6f855f37337579cfcd6e01f72a6e176d5e69ef1a1d338afee6a07c1620273fe56af046a60f195de4d8894a8d7f9
+EBUILD abseil-cpp-20230125.3-r3.ebuild 1640 BLAKE2B 534ee2c085dfb77471eb34a47491abff5a64aafc6052b3875645ed3e490acd0719855f79bc098bd9107ecc5bce406789804825a88f046d3cb47db83be1a7120d SHA512 55d1a88de4c1474c9b5e03e144a874bf15fb5f9b198a188f267d1290d9f92b7ba47106751d0ba6993b87436c49aa2a744d82edd32ee1235e21f6140c57289245
+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 2020 BLAKE2B c29d5683173e4f720a799446bac5ec041985e633a70f1c239edc7c54dffb4b9fcafec366ace8fe3c62a686b4f2dde58313500dffdd024b08af54b45cf661edd6 SHA512 f05658f83346bccbc0e0fc86ccd3750f8ddef863328308d6bf5fe4f03a5e1316e1b4a3231218f3a7094a959ba74b7dce32b136602a505091c2b607707d060073
+EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
+EBUILD abseil-cpp-20240116.2-r4.ebuild 2054 BLAKE2B 4c3d16b79cdb84a2e40f8640dba22887be98d6b4e02733812fca4a07192380dcb57111c30dc2f15c0f560d4817e341de7bc26b6acd70aceafb532c078775cf90 SHA512 cbace15d0e28c45c88e9d833df30d53ad746f41be878110205f6faf221d45f906b20da97275ace060654fdfa3cbe836b6fad2ab22c186e66d7c016184a41244f
+EBUILD abseil-cpp-20240722.0.ebuild 1991 BLAKE2B 5439781c8ffd0256ef1ba9b2ef1d32a3e781b4ca11b036fe0ad4de0ac597e0c0e141a38154357c91d3b62545babf993fe1d489f676a746094c1660f1e82c5e62 SHA512 23224da82d96ea7fd75e344a37025165d0486fa51dbf08e302a5ca2b00fc4dddadb185ca2c726b8bb025a0a305c8b7098e1a53d5b8dfd27472022b75a9128ba4
+MISC metadata.xml 511 BLAKE2B 368361dc6f2e55afb5af3623635272b5a7ec9444a09e7fd0be2879a7dfa2e168c0a1b994d84878a6cd422423103f317b20b543aa11ca00656199e2d3a3a4bad7 SHA512 fc164cafaca7a59e4891a1f5c7f93f790c4b163c0310cbb915f9450de023296d8ed440a89a51230aa9869c70ed55a2b1c54ca3579761cd880df9bccbbde801fd
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild
index 3ab7ae818f50..c248fe6ae1a4 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,16 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV%%.*}.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
+RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	test? (
-		>=dev-cpp/gtest-1.13.0
 		sys-libs/timezone-data
 	)
 "
@@ -31,6 +29,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
 )
 
 src_prepare() {
@@ -57,7 +56,8 @@ multilib_src_configure() {
 		-DABSL_ENABLE_INSTALL=TRUE
 		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
 		-DABSL_PROPAGATE_CXX_STD=TRUE
-		-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
 		-DABSL_BUILD_TESTING=$(usex test ON OFF)
 		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
 	)
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
new file mode 100644
index 000000000000..f1cf1e20630d
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-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
+
+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%%.*}.0"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+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}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild
new file mode 100644
index 000000000000..e16880542a7a
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-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
+
+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%%.*}.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+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}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+	"${FILESDIR}/${PN}-include-cstdint.patch" #937307
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
index 8efabfde0a90..dc13dfe5045f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,19 +16,22 @@ SLOT="0/${PV%%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
+RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	test? (
-		>=dev-cpp/gtest-1.13.0
 		sys-libs/timezone-data
 	)
 "
 
 RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	"${FILESDIR}/${PN}-random-tests.patch" #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -54,7 +57,8 @@ multilib_src_configure() {
 		-DABSL_ENABLE_INSTALL=TRUE
 		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
 		-DABSL_PROPAGATE_CXX_STD=TRUE
-		-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
 		-DABSL_BUILD_TESTING=$(usex test ON OFF)
 		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
 	)
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
new file mode 100644
index 000000000000..94183102f81d
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-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
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+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"
+)
+
+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=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	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-r3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
new file mode 100644
index 000000000000..dc13dfe5045f
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-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
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+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
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
new file mode 100644
index 000000000000..c51b3cdc3c0b
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-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
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~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}]"
+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
+)
+
+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=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	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..d9479e2682e9
--- /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-20230802.0-conditional-use-of-lzcnt.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
new file mode 100644
index 000000000000..1fa00d9ff622
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/934337
+From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch
+From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Fri, 3 May 2024 09:14:22 -0700
+Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations
+ of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are
+ available.
+
+GCC 14 and Clang 19 adds these new builtins. The g-suffix is for
+"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for
+"short". GCC never implemented the short versions and #1664 reports
+GCC 14 (pre-release) gives an error here, although this may be a
+pre-release bug.
+
+Fixes #1664
+
+PiperOrigin-RevId: 630408249
+Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc
+---
+ absl/numeric/internal/bits.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
+index bfef06bce1f..0917464d6ad 100644
+--- a/absl/numeric/internal/bits.h
++++ b/absl/numeric/internal/bits.h
+@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
+ CountLeadingZeroes16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
++#if ABSL_HAVE_BUILTIN(__builtin_clzg)
++  return x == 0 ? 16 : __builtin_clzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_clzs does not take 16-bit arg");
+   return x == 0 ? 16 : __builtin_clzs(x);
+@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
+ CountTrailingZeroesNonzero16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
++#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
++  return __builtin_ctzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_ctzs does not take 16-bit arg");
+   return __builtin_ctzs(x);
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/files/abseil-cpp-include-cstdint.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch
new file mode 100644
index 000000000000..7aa5c2f1eed9
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch
@@ -0,0 +1,33 @@
+https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9
+
+From: Christopher Fore <csfore@posteo.net>
+Date: Mon, 5 Aug 2024 10:48:19 -0400
+Subject: [PATCH] container/internal: Explicitly include <cstdint>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type
+   66 |   assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 &&
+      |                           ^~~~~~~~~
+absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   30 | #include "absl/utility/utility.h"
+  +++ |+#include <cstdint>
+   31 |
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+--- a/absl/container/internal/container_memory.h
++++ b/absl/container/internal/container_memory.h
+@@ -17,6 +17,7 @@
+ 
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch
new file mode 100644
index 000000000000..769ac6a56e39
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch
@@ -0,0 +1,19 @@
+https://github.com/abseil/abseil-cpp/issues/1528
+
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sat, 7 Jul 2024 01:53:19 +0200
+Subject: [PATCH] remove abseil::random_internal_mock_overload_set
+See-Also: https://bugs.gentoo.org/935417
+
+diff --git a/absl/random/CMakeLists.txt b/absl/random/CMakeLists.txt
+index bd363d8..7692a35 100644
+--- a/absl/random/CMakeLists.txt
++++ b/absl/random/CMakeLists.txt
+@@ -112,7 +112,6 @@ absl_cc_library(
+     absl::raw_logging_internal
+     absl::random_distributions
+     absl::random_internal_distribution_caller
+-    absl::random_internal_mock_overload_set
+     absl::random_random
+     absl::strings
+     absl::span
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..ac46bf261594
--- /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 660 BLAKE2B cc4cf205a97c6cf1008e3a8571c992fa9fee8e872d159b4f825c8871019b5ee4b600b363d9757d14494c4e83e20daece568b80041b4bd8576ee619f9a7db640f SHA512 07c3df5ce3bea6afe0a26a16352354876d908c60c3a6f0d8323a79d936e3951754d86d1e08e32dc707aa2fb18a6e1fee8e813f9e85e7c2fd89b1c7472ccbd007
+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..2eeab823b21c
--- /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 ~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/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index c08a6297438d..49e42e08d963 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -5,4 +5,4 @@ DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34
 DIST antlr-cpp-4.11.1.zip 534105 BLAKE2B acf854bb8f10f8afdb8df9aa1fa92176edc66bfe3e33ca4b57e138e29f7d8512dc0a31aee057e5997ca9e37ca7934c459ef725e831d34166c189a2ed7e6fbc51 SHA512 47a4f714cf195e454b4f66cace58f6dbaa144f44c25594735fc91b37289e9b3c8b5259c03925316754d3eb33af3e0b3d3fb0c5c9aef818b239799e4f1fb49ce6
 EBUILD antlr-cpp-2.7.7-r2.ebuild 1876 BLAKE2B 230b83b432af8a11bbd66e77471b634770b2e11e527b8b272ea5feaea09c5affa9aefc252348e11fcabb3d256ca8a679d0e5a81d69be614564c5f9ab9d78965b SHA512 4a2c8bb5da7caee4f48dd89d4dd9051a32abcce88e768e48fe6db68b03b6ca12f2006e8c7c304b85827e8601d2fff0abf2b7dea77b941aa30e6b286bc076827d
 EBUILD antlr-cpp-4.11.1.ebuild 615 BLAKE2B a24dfe94309dc05239e35484ed30fe65a729d9151b29c29dbf78bd4874d41d389479e4a1d93702f8d7eb7c8d3301bdf7068507de97dc38eb2f04505ccd5a6ec9 SHA512 38e36d6993e165a77b284a9b09d507711467c6d72fc559643053ad5fb5c0d12e59358bb1edbcc014ba0ebfe418b7d606ef7cd47e48571a4ba020f2107af1061a
-MISC metadata.xml 314 BLAKE2B 44614e69318b15302910048bed9f1a4acd92a1eb737e1861563d855aeec4e6f8f1a201f0bcbc039420a820e17f15d7deef68fb54b104d0c621def437c0457da3 SHA512 d03626431b434fe0b4fbbaaf7c860fd55390a1511c1f93f95747cc6a058795f166b73846b038bba3e843b6afdde2655ac3b7776a33276230efbaaa6d7b469d84
+MISC metadata.xml 331 BLAKE2B 8923f8eb8009acd5e439590eaff89308f798db5161157ec2c41d399838231b182999589e4cc83407d118cdf39b5d399f942804e1d1a7567e9081d201ad8656a4 SHA512 a581df0fcf88cb0d9fb242bfea94c5e10c325593768ca95aef6d8ec1690cb0d2801a7c714a91efe1b23a148dc18d13776e7206464d17baee1c3969574a5a1634
diff --git a/dev-cpp/antlr-cpp/metadata.xml b/dev-cpp/antlr-cpp/metadata.xml
index ad571d3247b8..541a3e9dfdfb 100644
--- a/dev-cpp/antlr-cpp/metadata.xml
+++ b/dev-cpp/antlr-cpp/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">antlr/antlr3</remote-id>
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index 5a2e6f57660d..55bb6d008f37 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1,3 +1,5 @@
 DIST argparse-2.9.tar.gz 103147 BLAKE2B 2862acd7dc43dea0f7a7a1e6c9541ec8e7b7ecc70ce72ad327b34f72a330799475490e7da4e3a07c9ab28ddec4f88911514690c8b438f36d7c02704fe26b0f08 SHA512 fa471e7d8c448510376e79927496f62775e6ed37e1dffefd607839e6005dfbc61125d0e18bfc1ff20f86cef7efd75339d7bb143dc6574d988f83c7c96896fa5f
+DIST argparse-3.0.tar.gz 116171 BLAKE2B 55a9aeaddf8ddaf8fa3e99d2ce3145a09c0ebfe927150928db683162e2227a61a2e7fbf8d272346e11912ece2cbdba313790586bd49c89352a03f0cafd01c3c9 SHA512 a7ed879eb3f71868cd84e513c0db63c4fecff1c9f0b34d6cfbe85d2439e83b80e97f713b497259c9775c9c7c1f639a08b73080045c51756de15e3d8c18b97116
 EBUILD argparse-2.9.ebuild 569 BLAKE2B c4378b69b06072bc37879d6555a594c5fd0ba0eb75969e42c034d629e34e7d7c0eda02b930d344d72eab52ba84ce0abbc49ee204bc5305730411523ea6cf055b SHA512 5fcef85bc8807a208c087d847deed4861fdf5ff1586c5f7bd2247c22f8c56e2021afa7c00f5cf5706e108d6a3c31499d286336aa4173250180cffb88cda64161
+EBUILD argparse-3.0.ebuild 660 BLAKE2B 6ff6bd55cb7823629bc5a3fd5d83d6c64bfecc806c49bcb156d52e2a8cd71b251273e58aa0d7869be0c520633a5ab5bb7ec6bd4360e056fd738dce987a91c217 SHA512 6c52a9cf7f4c1b9e15351873738da6a40874be7aa10e0a9514aaaa5cdc2cbaf8845deb40784d063e33b6c13bb82d44446a1331cfbc066ccb453cac02318fa83d
 MISC metadata.xml 330 BLAKE2B b2116c014f0385ca1a4d617dcb6c48ee60e39d82630fb716230c27f4de79ec6cd4611f9194aa9d8555cdb54e2cc22ab0a96cd755231ef99e272877a490226e5b SHA512 ef007277e64f992e40944f540606c9908ac87284d73dfcf252caa885da6c381bb33640544e841b857483c24dfcc5250a6e59a082cb463a02c059afd23069d686
diff --git a/dev-cpp/argparse/argparse-3.0.ebuild b/dev-cpp/argparse/argparse-3.0.ebuild
new file mode 100644
index 000000000000..d5d35ca948ec
--- /dev/null
+++ b/dev-cpp/argparse/argparse-3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Argument Parser for Modern C++"
+HOMEPAGE="https://github.com/p-ranav/argparse"
+SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e 's/ -Werror//' -i test/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARGPARSE_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	./tests || die
+}
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index eecd07b90d7a..5b258348aa28 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,5 +1,8 @@
-DIST asio-1.28.0.tar.bz2 3387977 BLAKE2B dc0431a6710f58ce037d6e6e1cf81606b6f8be3ac9fdf6f7a69a7998fadb4f3c9dace2aa99606a9570166f9637ca7f4b9ab6964599c78027a9f32a9d243d5684 SHA512 b3fa23caa4cbf1e374fade97102adb22a32c68bd4b050474987c065b516fdf042d46842c41ac94e71458f402fae2d05bc8f617ee523ffb6a74ef33d214e9acd5
+AUX asio-1.30.1-pkgconfig.patch 505 BLAKE2B d5c8d55444a47608f681dfbac9978edebb206b999aa7914b6d056bd18c252f001f58d53b587b2859c66495d6f8c3f74f252ddc9d7c25a8d37a394d843433f722 SHA512 b90f12054921913a6702863a731448e43635871e6fe1cb7baa80e5ad9487501704c634efe25592e661c999cafa61af2a4841add3221db28b1d29290eeea61446
+DIST asio-1-30-1.tar.gz 2842718 BLAKE2B b99f6e1ab03c4da9bc802e04d66b46ac2374f7da9f65dd98dd3da3cf1cf507548ae2645343a63378ab91d665fc6e2efe5c5262f33757e851973534e23291abb1 SHA512 6b5f41479e20500dff6c535d8e3b096e11815784923bb4c0f68f69be59c80d7ad99c7e0380a1de4dd350e6cc6a79315d4645378a9b8d70d9f8d28a17f1cc68af
 DIST asio-1.28.1.tar.bz2 3383257 BLAKE2B 9d98152a6cf8b0e2a807275092b23f6198d8175fd7260499be7561cea2e6723c1a8478107315b7163cdc31d6eecab552550393ab3b1cfb686dcb4157d1e91fe4 SHA512 fadd7748675743ba9110f873bf57f2400a5c9c0dc03c1d6cd7f0988bc70ccbbff6cb6140f5dd236d2d874fc82a6f216406e8892808e915aae5119fe9d95743de
-EBUILD asio-1.28.0.ebuild 1292 BLAKE2B f1a68c5338831c80f586f10207896fd9e0ee366d942542e9e65a13ef9b16652b4a4aac83f9c6cf8c28001505a092278a98679c18971266c248998cede51ea2c3 SHA512 889122ea7d5ba268c6b069e77eba129764eb31def43e34c2e423603a635ea53d30f5405d350a2ef500c34c5772e4f3c0190760ae0f7474235ce0b88049446be4
-EBUILD asio-1.28.1.ebuild 1292 BLAKE2B f1a68c5338831c80f586f10207896fd9e0ee366d942542e9e65a13ef9b16652b4a4aac83f9c6cf8c28001505a092278a98679c18971266c248998cede51ea2c3 SHA512 889122ea7d5ba268c6b069e77eba129764eb31def43e34c2e423603a635ea53d30f5405d350a2ef500c34c5772e4f3c0190760ae0f7474235ce0b88049446be4
+DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a
+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
new file mode 100644
index 000000000000..1ce3605ab0aa
--- /dev/null
+++ b/dev-cpp/asio/asio-1.30.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
+SRC_URI="https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-${PV//./-}.tar.gz"
+S="${WORKDIR}/asio-asio-${PV//./-}/asio"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/boost
+		dev-libs/openssl
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/asio-1.30.1-pkgconfig.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/asio/asio-1.28.0.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild
index 9b25fd181067..dcfb5fbe38d4 100644
--- a/dev-cpp/asio/asio-1.28.0.ebuild
+++ b/dev-cpp/asio/asio-1.30.2.ebuild
@@ -7,11 +7,11 @@ inherit autotools
 
 DESCRIPTION="Asynchronous Network Library"
 HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${P}.tar.bz2"
+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 )"
 
@@ -23,6 +23,10 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/asio-1.30.1-pkgconfig.patch"
+)
+
 src_prepare() {
 	default
 
@@ -41,11 +45,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	# By default it puts .pc to libdir
-	econf --with-pkgconfigdir="${EPREFIX}/usr/share/pkgconfig"
-}
-
 src_install() {
 	use doc && local HTML_DOCS=( doc/. )
 	default
diff --git a/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch b/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch
new file mode 100644
index 000000000000..c58b2a9df86d
--- /dev/null
+++ b/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch
@@ -0,0 +1,24 @@
+Install .pc file to /usr/share instead of /usr/lib because there are no .so files
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+ 
+-pkgconfig_DATA = asio.pc
+-pkgconfigdir = $(libdir)/pkgconfig
++noarch_pkgconfig_DATA = asio.pc
+ 
+ SUBDIRS = include src
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AM_PROG_CC_C_O
+ AC_PROG_CXX
+ AC_LANG(C++)
+ AC_PROG_RANLIB
+-PKG_INSTALLDIR
++PKG_NOARCH_INSTALLDIR
+ 
+ AC_DEFINE(_REENTRANT, [1], [Define this])
+ 
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 6b28bbedd14c..8b1eee1d7cc3 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,7 +1,6 @@
-AUX benchmark-1.8.3-backport-pr1753.patch 3386 BLAKE2B a89175e07a3aeca05e076e3c4a4506cfaf80b23f0ebc1ec1b28fa5b7ef78faf133f881aea0eab1b7336b47fed798f3e1b55e120adf0a78fc61d27a1867d259e6 SHA512 55d49b89c450a3a89ad82186826f8629d1bc92697e1d54ab804046d67c7e7b6b7b60ca78c741df5a16a0f50281efb70b86f700fbecae5d68019685cf00ea5cf1
-AUX benchmark-1.8.3-backport-pr1756.patch 2836 BLAKE2B ea3b1c34e9502488c0e6e6a343ba3c29083bdf0623e935008ac03f0ac7815fa9020327bab7e8b6be4fccf5d10bae8c305ea0220936fb608b02e0acf4cfa5ab82 SHA512 aed107584a5b81685a29b055221e903dc8aa4c92f67ac6654a1a120a507a0c51b20109eafb8ad5a459e9a609ca6e5e2d50234af1bddbe36e8eb9391ba3017cfd
-AUX benchmark-1.8.3-fix-32bit-test.patch 809 BLAKE2B 22adc089c727de1f93a19dbaed2549536b7b97b705e472c3126af6ebccb56665c1b4cf835a2e5e306233bc6415eed59401295645f79f679315a68a2275e60d91 SHA512 a14a9adc33e0ffb57177b946d6eae2e3a4faf34a24715b5acf0b0ff9fca372a27357b225eb5ffea05b8ebf033244752c6e7b15714946ec2f036fee483199e994
-DIST benchmark-1.8.3.tar.gz 250206 BLAKE2B 14b4af17184a88378314d11623b73c27368999fcff6e50986407a08739fdf388cdcbd140471b629cd2a9948f81073796f8a6c38d015be8413b7e4d4759715f97 SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c
-EBUILD benchmark-1.8.3-r1.ebuild 1034 BLAKE2B a5615935213f819755143ddf3eb3f35cf35c36c5d361300d41c0613e3338b286beb1f7c6dc6b1ff8c1e55bda310b79d6de016879a2aab413fee8a3556fbfb793 SHA512 48b07a73517ffeb46b7a6cac24a0fa454ae4d07d1d26fbdb951676ef4127fc6df36e21f0fd2bbf930a9a586e1fe7754ebbdf1d193eb736c473a8eaeff4369f75
-EBUILD benchmark-1.8.3.ebuild 930 BLAKE2B 87d167ea89f479241b01c2f322048647d34b83d1f1b85d22df1d30e7c23653fb8267c6afee743767baa73824d4bd2497082b278e0eaecb525a703b7a2dff480f SHA512 4cdf4bc984677e07b291ef223c9faabfec6a5fcd2b2f2574642119ba09d734f0480d24b5179fc5ed00aee8f68f6c63a70508a1b2bab2ceaef8e5be9f072e9546
-MISC metadata.xml 468 BLAKE2B 1cccded2d58d45121482aedc04732f83d8e1b034fa34eb037ae2e68922c6394b6ce7ad019cca64b0c2496e4328b124a9f06d9b8bba037e36e6f46f716acee9cf SHA512 c7a6087c885a8587799d32fcba2abdef1bac08eb7f6cb7ec195280b0464c962acdfe92cba1ca137bb049d895962bcbecc97b53818a24b84757263f90c345e094
+AUX benchmark-1.9.0-fix-documentation-installation.patch 1476 BLAKE2B 7c5848f7542c14f9cfe3c79e01153efb416b1f8892945b1cc3962908a246e83945b191581f544a8dc6972da00fe9af217eb9a70c29ae02f2a6dcc84e20ff1ecf SHA512 f6a7aef337539f0057b3f4c4ffa3e79e1de7451c7d0cb6bbc9a0374e04da38488e7cba9891857d240d9f0cc4a5cfed9d4c67a613cc5919843c80db3328f35432
+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 1793 BLAKE2B 1977e65338f743bcc16d0300c79af76a907d02e09219f4f499eb4438c081ad87daecdf4aae5378986b6cda41d07547ce69e06fa0baae49ff891ccecae04896ec SHA512 6a2825ad6ec2ddc8c8b10d5efab191673e529045d59d3a4ac7d39f166cae6fe1d8411f744e283f7e8ef52d82b4222b97b7fef0c803ffb57111ae9c8e693c4c0f
+MISC metadata.xml 1447 BLAKE2B 84a378fdce6b9590457deb8f273fde40828c3156ca70b38f58e81248468d349f228d8eeb4fc4325614ce4b1e77fd4c8c4c275156b8cc125b7cb3c874da6acbc6 SHA512 3c8e6088b0ecd4f1075cb35972db3ac200636a9be7e63036777f840145195fb3b977829efcdd12649d9fb1913925a2d731c3d29abf581613f8d8e9dbe2006577
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
deleted file mode 100644
index 5c20bb79f760..000000000000
--- a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )
-	test? ( >=dev-cpp/gtest-1.11.0 )"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_WERROR=OFF
-		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.8.3.ebuild b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
index 5112ab78a558..3ba3a6651fab 100644
--- a/dev-cpp/benchmark/benchmark-1.8.3.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
@@ -11,13 +11,12 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="doc? ( app-text/doxygen )
 	test? ( >=dev-cpp/gtest-1.11.0 )"
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/benchmark/benchmark-1.9.0.ebuild b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
new file mode 100644
index 000000000000..af033f45f6e0
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="A microbenchmark support library"
+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"
+IUSE="doc +exceptions libcxx libpfm lto test +tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	libcxx? ( sys-libs/libcxx[${MULTILIB_USEDEP}] )
+	libpfm? ( dev-libs/libpfm:= )
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.10
+	doc? ( app-text/doxygen )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	tools? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.10.0[${PYTHON_USEDEP}]
+		')
+
+		${PYTHON_DEPS}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-documentation-installation.patch" )
+
+pkg_setup() {
+	use tools && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_DOXYGEN="$(usex doc)"
+		-DBENCHMARK_ENABLE_EXCEPTIONS="$(usex exceptions)"
+		-DBENCHMARK_ENABLE_GTEST_TESTS="$(usex test)"
+		-DBENCHMARK_ENABLE_LTO="$(usex lto)"
+		-DBENCHMARK_ENABLE_LIBPFM="$(usex libpfm)"
+		-DBENCHMARK_ENABLE_TESTING="$(usex test)"
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_INSTALL_DOCS="$(usex doc)"
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+		-DBENCHMARK_USE_LIBCXX="$(usex libcxx)"
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc CONTRIBUTING.md
+	dodoc CONTRIBUTORS
+
+	if use tools; then
+		python_domodule tools/gbench
+		python_doscript tools/compare.py
+		python_doscript tools/strip_asm.py
+	fi
+}
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
deleted file mode 100644
index 1c2516c38e37..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1753
-
-From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:38:11 -0500
-Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture
-
-As documented, the real cycle counter is unsafe to use here, because it
-is a 32-bit integer which wraps every ~4s.  Use gettimeofday instead,
-which has a limitation of a low-precision real-time-clock (~1ms), but no
-wrapping.  Passes test suite.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/cycleclock.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index 931bba146..eff563e7f 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-   uint64_t pcycle;
-   asm volatile("%0 = C15:14" : "=r"(pcycle));
-   return static_cast<double>(pcycle);
-+#elif defined(__alpha__)
-+  // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit
-+  // integer and thus wraps every ~4s, making using it for tick counts
-+  // unreliable beyond this time range.  The real-time clock is low-precision,
-+  // roughtly ~1ms, but it is the only option that can reasonable count
-+  // indefinitely.
-+  struct timeval tv;
-+  gettimeofday(&tv, nullptr);
-+  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
- #else
-   // The soft failover to a generic implementation is automatic only for ARM.
-   // For other platforms the developer is expected to make an attempt to create
-
-From b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:46:06 -0500
-Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha
-
-And also, bail out if unable to parse /proc/cpuinfo.  This will
-preemptively alert users on platforms that need custom code for parsing
-/proc/cpuinfo.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 04d64dc5b..786bb1b41 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -513,7 +513,11 @@ int GetNumCPUs() {
-     std::cerr << "failed to open /proc/cpuinfo\n";
-     return -1;
-   }
-+#if defined(__alpha__)
-+  const std::string Key = "cpus detected";
-+#else
-   const std::string Key = "processor";
-+#endif
-   std::string ln;
-   while (std::getline(f, ln)) {
-     if (ln.empty()) continue;
-
-From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:49:24 -0500
-Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- test/user_counters_tabular_test.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc
-index 3e8fb1bf0..ffd3c0992 100644
---- a/test/user_counters_tabular_test.cc
-+++ b/test/user_counters_tabular_test.cc
-@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header,"
- 
- void BM_Counters_Tabular(benchmark::State& state) {
-   for (auto _ : state) {
-+    // This test requires a non-zero CPU time to avoid divide-by-zero
-+    auto iterations = state.iterations();
-+    benchmark::DoNotOptimize(iterations);
-   }
-   namespace bm = benchmark;
-   state.counters.insert({
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
deleted file mode 100644
index 6744d3cf212f..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1756
-
-From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 13 Feb 2024 20:23:20 -0500
-Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure
-
-Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs
-never returns fewer than one CPU.  There is no reasonable way to
-continue if we are unable to identify the number of CPUs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 786bb1b41..daeb98b02 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -474,12 +474,11 @@ std::string GetSystemName() {
- #endif  // Catch-all POSIX block.
- }
- 
--int GetNumCPUs() {
-+int GetNumCPUsImpl() {
- #ifdef BENCHMARK_HAS_SYSCTL
-   int num_cpu = -1;
-   if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu;
--  fprintf(stderr, "Err: %s\n", strerror(errno));
--  std::exit(EXIT_FAILURE);
-+  PrintErrorAndDie("Err: ", strerror(errno));
- #elif defined(BENCHMARK_OS_WINDOWS)
-   SYSTEM_INFO sysinfo;
-   // Use memset as opposed to = {} to avoid GCC missing initializer false
-@@ -493,8 +492,8 @@ int GetNumCPUs() {
-   // Returns -1 in case of a failure.
-   long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
-   if (num_cpu < 0) {
--    fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
--            strerror(errno));
-+    PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
-+                     strerror(errno));
-   }
-   return (int)num_cpu;
- #elif defined(BENCHMARK_OS_QNX)
-@@ -510,8 +509,7 @@ int GetNumCPUs() {
-   int max_id = -1;
-   std::ifstream f("/proc/cpuinfo");
-   if (!f.is_open()) {
--    std::cerr << "failed to open /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to open /proc/cpuinfo");
-   }
- #if defined(__alpha__)
-   const std::string Key = "cpus detected";
-@@ -540,12 +538,10 @@ int GetNumCPUs() {
-     }
-   }
-   if (f.bad()) {
--    std::cerr << "Failure reading /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failure reading /proc/cpuinfo");
-   }
-   if (!f.eof()) {
--    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
-   }
-   f.close();
- 
-@@ -559,6 +555,16 @@ int GetNumCPUs() {
-   BENCHMARK_UNREACHABLE();
- }
- 
-+int GetNumCPUs() {
-+  const int num_cpus = GetNumCPUsImpl();
-+  if (num_cpus < 1) {
-+    PrintErrorAndDie(
-+        "Unable to extract number of CPUs.  If your platform uses "
-+        "/proc/cpuinfo, custom support may need to be added.");
-+  }
-+  return num_cpus;
-+}
-+
- class ThreadAffinityGuard final {
-  public:
-   ThreadAffinityGuard() : reset_affinity(SetAffinity()) {
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
deleted file mode 100644
index 62e741687f9c..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/916278
-https://salsa.debian.org/science-team/benchmark/-/blob/master/debian/patches/0007-fix-32bit-test.patch?ref_type=heads
-
-Description: Fix 32bit-test
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2023-10-17
-
---- benchmark-1.8.3.orig/test/statistics_gtest.cc
-+++ benchmark-1.8.3/test/statistics_gtest.cc
-@@ -28,8 +28,8 @@ TEST(StatisticsTest, StdDev) {
- TEST(StatisticsTest, CV) {
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({101, 101, 101, 101}), 0.0);
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({1, 2, 3}), 1. / 2.);
--  EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
--                   0.32888184094918121);
-+  EXPECT_NEAR(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
-+                   0.32888184094918121, 1e-7);
- }
- 
- }  // end namespace
diff --git a/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch
new file mode 100644
index 000000000000..631e01881aa8
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch
@@ -0,0 +1,47 @@
+From 009874342ddcf6446bec308686c54bd387a212a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
+ <beatussum@protonmail.com>
+Date: Mon, 19 Aug 2024 09:12:57 +0200
+Subject: [PATCH] fix documentation installation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+HTML pages generated by Doxygen are now installed into
+/usr/share/doc/${PF}/html.
+
+The content of the docs directory is always installed even if HTML pages are
+installed.
+
+Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com>
+---
+ src/CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 32126c0..40e75e0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -169,12 +169,12 @@ if (BENCHMARK_ENABLE_DOXYGEN)
+   if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
+     install(
+       DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
+-      DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-  endif()
+-else()
+-  if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
+-    install(
+-      DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
+-      DESTINATION ${CMAKE_INSTALL_DOCDIR})
++      DESTINATION "${CMAKE_INSTALL_DOCDIR}/html/")
+   endif()
+ endif()
++
++if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
++  install(
++    DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
++    DESTINATION ${CMAKE_INSTALL_DOCDIR})
++endif()
+-- 
+2.44.2
+
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
index ac75eeab418b..0f523bea9937 100644
--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -2,12 +2,32 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
+		<email>beatussum@protonmail.com</email>
+		<name>Mattéo Rossillol‑‑Laruelle</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Enable the use of exceptions in the benchmark library</flag>
+		<flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of libstdc++ as the default stdlib</flag>
+		<flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
+		<flag name="tools">Install some additional Python tools</flag>
+	</use>
+	<use lang="fr">
+		<flag name="exceptions">Utiliser les exceptions inclues dans la bibliothèque</flag>
+		<flag name="libcxx">Utiliser <pkg>sys-libs/libcxx</pkg> à la place de libstdc++ comme bibliothèque standard</flag>
+		<flag name="libpfm">Activer le support de <pkg>dev-libs/libpfm</pkg></flag>
+		<flag name="tools">Installer des outils Python additionnels</flag>
+	</use>
 	<upstream>
-		<bugs-to>https://github.com/google/benchmark/issues</bugs-to>
-		<doc lang="en">https://github.com/google/benchmark/tree/master/docs/</doc>
+		<maintainer status="active">
+			<name>Google</name>
+			<email>opensource@google.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/google/benchmark/issues/</bugs-to>
+		<doc>https://github.com/google/benchmark/tree/master/docs/</doc>
 		<remote-id type="github">google/benchmark</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index a9d9552bc566..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 1226 BLAKE2B a912725791d5d30314e5b3a1bf59a6494b523f5bd58a753d1fde68f906ae605e77d446ab5730126385b7abcec21737119b2b121961512f8aa87ed3635f0a36f8 SHA512 95c31a344fc5a900052b8a4ac24432acf4ba96ec90f5006794f6c103bdea0772fffd0bc93b5e00ddd057174ce70ca409bc37b691591a570aa0d5f573e609cc23
-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 c1b5939d9a91..ca24052866f3 100644
--- a/dev-cpp/cairomm/cairomm-1.14.4.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson-multilib python-any-r1
 
 DESCRIPTION="C++ bindings for the Cairo vector graphics library"
@@ -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 829d17731031..1909cfabff26 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -3,17 +3,13 @@ AUX catch-2.13.8-musl-tests.patch 854 BLAKE2B c593febfdd8d18912a0ceac2d63c3af21e
 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 1009 BLAKE2B 655212eabcd56ab04f7569aac764b0f79b3e542521fbabc096c8256d68ec895ea6c58ab0ad4ae8ece8290fa5a849e472488894d7bbb410c883c086953b5bdae7 SHA512 20a5aa63d1cb679ffb7af373dc056993747199fab7b8cd857af94e030114ed48f04de793119c0944e207c7050d6f5c8d6092b5abfeafca69c4f4dedc276d062b
-EBUILD catch-9999.ebuild 1009 BLAKE2B 9dc56f59783ec8812d6701a2ed347e039c655f8ad874e20e5058d1667ba3c061cebd8824af1345e76fd90973b439aa3469bbaa564382f04545d0f43e9bc3d7af SHA512 dd9d0e08934ddb10273a2f6b5642bcca5471976f034cf026eec09da7d651553c2193d7f0928dbfa385333f21ef9a21a44185f3cc480970a97e83a08ec4f96103
+EBUILD catch-2.13.10.ebuild 971 BLAKE2B 60f89b72538824b76da7aaf2de749b8d0e5bb0f5cbad171f2294acf2f9d10458f4ff56bdf6b440985474f19cabdbbd927ad873393d62dc3059af59cfc69ca8b8 SHA512 d6189fbfc5fc92fe1bc86a3d9d7e47dac7935e31b77c58529183488d8ac2b16ff21e78abc6b5bf46b7ae027bfdc42ccd51c7cb94b740cc1e2f776756441c9a20
+EBUILD catch-2.13.8.ebuild 1006 BLAKE2B 8a772266ce3b1844928020f5911ad5fe4a79358950524b896576dbb23c33481adf8da50b72aa1734568a0ac440d021ee284a8c1411f12472ed2852f4948c0b9c SHA512 0294c0738ff0b1f8498071d94f27b7573f175bef1cb26abb81a1a2a9604197e9223296be52a68639dbc7b4060c2b87b23c33572e586504fb67be45d72b6a9899
+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..616ff9bcc3bd 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
index 2a080fe0caae..5f65bfce7ffd 100644
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.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/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.3.ebuild b/dev-cpp/catch/catch-3.5.3.ebuild
deleted file mode 100644
index cde2d006ed7f..000000000000
--- a/dev-cpp/catch/catch-3.5.3.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 cde2d006ed7f..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.4.ebuild b/dev-cpp/catch/catch-3.7.1.ebuild
index cde2d006ed7f..f7caddc14d24 100644
--- a/dev-cpp/catch/catch-3.5.4.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/cctz/Manifest b/dev-cpp/cctz/Manifest
index 45755616144f..046dfd99c128 100644
--- a/dev-cpp/cctz/Manifest
+++ b/dev-cpp/cctz/Manifest
@@ -1,5 +1,5 @@
 DIST cctz-2.3_p20230228.tar.gz 218332 BLAKE2B c29f2acf12d73387faf0087ef94b8624b5eefa2cf3136e0003e59a6a89b8a73f6de97f1962031ca1b1b1f4f6e888a363314aa1e160ad54c618189ad4a7d8f60e SHA512 ab6a103a6073a8169cd08587d2415dcab6c6e6c005b4b67fb69cc718b8b73a1331c5782b27aa4924aa5bdedc1563e31aa3ac76196078c50a13773d35d8df993b
 DIST cctz-2.4.tar.gz 222831 BLAKE2B c232b27cbfe5e45b6e1c51dd13c9a35c4a2e84b5d3e65ba6b4afb7683cac967a3b409382664a55d58ac67e53a1cf3dec9d97ecd59c5e2180c0eae4f71462fe33 SHA512 6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e
 EBUILD cctz-2.3_p20230228.ebuild 660 BLAKE2B d18673cb0a17df2ea1c190dcfa582dcc897aca3905fc26fc78d978373fc9b04d78ff22f467b2506de1f4dc85663e72ca272dd4c9b4b16a9807077c84a9e4868c SHA512 eea3dcd221f1613180003b22d0b39ea1a7218e1365f35757de2a8c45c51ded5e033f56b37e0563efb261eab509f7de3ff0f934d2762a6e0e582024698f2f8af1
-EBUILD cctz-2.4.ebuild 613 BLAKE2B 2ea8e78fcd760d224fc26d6612c07e53a89bd1fb1a6595cfdb0e488612b54d3e8a7b0521300b404a3437ef7cb7c749857de7390350e6b4561ddf082b0f3d77a6 SHA512 c3bdedc1f941d4ab9a5eccdc5289631da81f8ac756b9a14650fc4911967dac1d6e052813ef1f7ea5e6bda7481adacecd5fee88bf844de38225a42d766690ef00
+EBUILD cctz-2.4.ebuild 609 BLAKE2B dfe3184e5f809c5beeebf658468af95b3c9e336bf57602653e60c269946c678557eda1e6d839298c71dd3a97aee5bd64d72e860d654f1ba1c1bd7bef2dafa0d3 SHA512 714c0a7d9c450d1b0a4c7f102e864e630401c6cdaa18877b9625a25098fd63905afef7e4ac3c17cef867f6749518ee38a43f87c80eddd25182ce789d42f51e73
 MISC metadata.xml 512 BLAKE2B 77ff30bded40acd62952b195d6a079ca2e490aa17a02dd83e777a7e5fe87a70dfbac9da7107447bd0dcee19dc9ed7bca3169e165ab1ce7c18d45d2403b9dfd5d SHA512 1cfa31b17ac83e5e60494d85726e9a44d0d090d9d7e0ab351e7a939ff7db63b6ab960a1d18f4750b29933c5b079890be90aea3945be6b4b406fa7e27df2ca067
diff --git a/dev-cpp/cctz/cctz-2.4.ebuild b/dev-cpp/cctz/cctz-2.4.ebuild
index 18994d1290b8..2a2a1f041c09 100644
--- a/dev-cpp/cctz/cctz-2.4.ebuild
+++ b/dev-cpp/cctz/cctz-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/cctz/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/clhpp/Manifest b/dev-cpp/clhpp/Manifest
index 544bfc9b9795..12d5d13cd53f 100644
--- a/dev-cpp/clhpp/Manifest
+++ b/dev-cpp/clhpp/Manifest
@@ -1,5 +1,5 @@
-DIST clhpp-2023.04.17.tar.gz 115042 BLAKE2B df0db751eda9fe2f23a5e3ef97f263885a09ca4b341b24c9580522e84a192e9afe526a441d0e3660e8819492945b2ff89bff7c96cd1fd1b3bd6a177042ec759e SHA512 1e37af647a37737240de1622bd772e1f154a07c2d27e020487163c42d0833096c1a2f2f2185b8f6371889c2cad3992f0c7a9d233c36941367da743ee7ee8e486
 DIST clhpp-2023.12.14.tar.gz 123233 BLAKE2B 2b23639ad162921e01033fbacc1c4e57d9c28ce39c55b3564f162e5d6b6d9ed0e80aaefbd62de81157e165f01897e82d0ff4943c8ee620587840f4aece22319b SHA512 a90152d2f9c57d4724ef3ea33e1311914e49659042e916e467a9f16877d348ed62f909fe8423589976669b25241a3b996fbd7ac235a44e35947d1b87d3e3ef2b
-EBUILD clhpp-2023.04.17.ebuild 931 BLAKE2B 04ac707b17d11b1fc5dc83ea0d6f6c7b85d2970bb617da5afe29b53b4c543faf828e840df1331cb39495bea491b31e6ac07857e6599578005775f1065b7399b0 SHA512 0df6000f35eb499304dd4aa224d033be68b91ae586d3870e380f7e97f00d6d00cae38fe83a0038851665ab4f578f0f94f8c1ea9b22f7bdcd55effc649c8ddc2e
-EBUILD clhpp-2023.12.14.ebuild 934 BLAKE2B 63cba3680eaf3848d7a990956529002baa45338b8af5d32c55fad8a790cc3c66572946a9b62f1020523fb81e45687ceba04284b2612bdebf534d3f767d742e57 SHA512 d8cce17641a62b6d577fcc2627cd1b51fb010ba37443d86bb3b35149fb3506fe317eab6eb207e28f2c2506f2964aa49277d78c3e9fea4113c8c820a75045be1a
-MISC metadata.xml 346 BLAKE2B acef91691221b9b27c8153b22470984b76fb92c720b9017da5cbae9464839c9625ea1d8902d18bf711ef7fcb435a07e7baf781d998881fe8179780d68e4c505e SHA512 78da9f326b7064b15eaf832bda21362f0a6eb495ed6a63c01cafb961d4ec7791c0806bd5f14d774092783fb55bb57012dc5ed74c04d445fce38cf72bc3998f73
+DIST clhpp-2024.05.08.tar.gz 124818 BLAKE2B 57b22e1911d8e21b4f7bef1f39f9910dd80eb50844dc7c18b3c75e311991a37577a0671d9e1b10ff3fb3302568118e3fb69987beec6fbe8fc8da85fcd7addda0 SHA512 6396cd67a2edef6a76695857e3e45f7eeb8cdaa8c729197357c6374ac58b41caa37bbe8c3b7a1724d43d3805f8cd5edd53a8ed833d6415bf072745800b744572
+EBUILD clhpp-2023.12.14.ebuild 910 BLAKE2B 00134c45206af93acf6d39c63d6a583fd54128ae05d1f827751096f5dd9d1be7fd78f9bf2a8df353550159b98534a2d1c2b877720ce6885742caddd870619b67 SHA512 cb9ff07d57997b49df098a8dc5e69b529580602c8fcd84a54b3c78c3c2809c46444f2f126957ee836d2c51170b17911ef3d47e2c8af2a4de26474dd497ef29d5
+EBUILD clhpp-2024.05.08.ebuild 913 BLAKE2B 486c927d32d16855c1d3fd214785c2f82d3a04f793779ebbb77705afb25a8a79d66feab4316d9c979341df15c15eb0de5675e090ead4c22b7f0aa27044e78d9d SHA512 5aadbc0ee2d2a4173854a04e9bcceca110f2597f267fc5c2f2b21ffbf12b80c78e2bbdf4fe8f31211ab25f3d0f2cfa7081b497ff89cf06ae8bc6b59b68064bdb
+MISC metadata.xml 263 BLAKE2B 1eea312a01e0cddbbb0889500bb51edeb1b8b76a65c72d2b3e285d35ef0a005b3fb28fef3b368e43fcfc1f0c0b633124598def0b188fa778842948008080dee8 SHA512 0d84fc5f0697ffb0274c721c6e681e3bd472b51f45e72f6baa7e2189f8fb655fabe83380f3a3e758ec183daf4c20423915989f7e2f72831d366ac19f70e6ee59
diff --git a/dev-cpp/clhpp/clhpp-2023.12.14.ebuild b/dev-cpp/clhpp/clhpp-2023.12.14.ebuild
index a9a4c55d1789..d52bb6938cc5 100644
--- a/dev-cpp/clhpp/clhpp-2023.12.14.ebuild
+++ b/dev-cpp/clhpp/clhpp-2023.12.14.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
@@ -14,8 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 ppc64 x86"
 
 # Tests require CMock (NOT cmocka), which is currently not in Gentoo
 # and has been found to be extremely awkward to package.
@@ -33,7 +32,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS=OFF
 		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/clhpp/clhpp-2023.04.17.ebuild b/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
index 9c106083d8d2..cfd7e4b5e780 100644
--- a/dev-cpp/clhpp/clhpp-2023.04.17.ebuild
+++ b/dev-cpp/clhpp/clhpp-2024.05.08.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
@@ -12,10 +12,11 @@ DESCRIPTION="Khronos OpenCL C++ bindings"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
 SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/${MY_P}
+
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # Tests require CMock (NOT cmocka), which is currently not in Gentoo
 # and has been found to be extremely awkward to package.
@@ -27,13 +28,11 @@ RDEPEND="virtual/opencl"
 DEPEND="${RDEPEND}
 	>=dev-util/opencl-headers-${PV}"
 
-S="${WORKDIR}"/${MY_P}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS=OFF
 		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/clhpp/metadata.xml b/dev-cpp/clhpp/metadata.xml
index 4fab41399c23..dfca8492f8bc 100644
--- a/dev-cpp/clhpp/metadata.xml
+++ b/dev-cpp/clhpp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marecki@gentoo.org</email>
-    <name>Marek Szuba</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">KhronosGroup/OpenCL-CLHPP</remote-id>
   </upstream>
diff --git a/dev-cpp/cli11/Manifest b/dev-cpp/cli11/Manifest
index ff03a0bc6946..b7abf863105d 100644
--- a/dev-cpp/cli11/Manifest
+++ b/dev-cpp/cli11/Manifest
@@ -1,5 +1,3 @@
-DIST cli11-2.4.1.tar.gz 339023 BLAKE2B 4db4bacc30ae5526135fe354e4f707f6858cb42b0662daafdde23cf397701c5185794d72794d920ef8f66ce846aafa718ac24fb567b04144d5b15905ed4badd7 SHA512 965290d09977672d3bc3c57ca4b89a88c2c09461da6e866b18217d702d4d5a0977588fcb8fef1a3c3804e61ad80d276029f47469cc83dbfdc7021ee35f6b7269
 DIST cli11-2.4.2.tar.gz 343478 BLAKE2B b1a71bb9495ca86eac62af800919dd78899bd972cfc05035659a3c0a8d07f70ccdc076d18756ba20ddffe31c9dc346e4579474284e601497fcac6c6866e536de SHA512 fdb61c430f5b99a9495fda7f94bfc8d0fb5360c99beeccbcb3b8918713579aac97fa0dcbce296065d9043f141a538c505919c9810fd1d192661e8b48b6a2637a
-EBUILD cli11-2.4.1.ebuild 973 BLAKE2B 60966184046c55546e34c131baa074deb7ce54b65a0bd3412cca1d46ccaf2522407aa6497b6a18017cb07ef46efeaf041a4d14370468682543182d7949414976 SHA512 f56249e97ff2d56406e0646633eaa5bbde75f86e1e61a1c2272bc93301169edc64bed49352f372c16360d8baeb2d28ccab27205a46582f697e6426b5f7591e99
-EBUILD cli11-2.4.2.ebuild 974 BLAKE2B c7a469986392430c81caf1685ff532d8d0b4b1e5ab4d471e7a853138ab1dbcababf5026c5713c95014273ee25bc252e20c4cd4eee10707c4665f3b0f4f6b36a1 SHA512 6d2868d1ea7826763aa72376ddcafe4f6d5ec175262653cb264acc9ac49ba2c8bb4bb9b4096f7d6dc61af789f5f70bdbc687ab2dfefac0370f6085a51fee39c2
+EBUILD cli11-2.4.2.ebuild 973 BLAKE2B 60966184046c55546e34c131baa074deb7ce54b65a0bd3412cca1d46ccaf2522407aa6497b6a18017cb07ef46efeaf041a4d14370468682543182d7949414976 SHA512 f56249e97ff2d56406e0646633eaa5bbde75f86e1e61a1c2272bc93301169edc64bed49352f372c16360d8baeb2d28ccab27205a46582f697e6426b5f7591e99
 MISC metadata.xml 325 BLAKE2B 499d638738bfde90cf6d60e2de19e570c6da09897cfeabfe30fcc98971ef59bed98936dd0ef7cd2fa3a497131f8abd169777e514835d39a95d8c9405ec16411a SHA512 7cc05ee6e3544f0e475c8afe3a81ab47e93ec4e6d88bc635014ae4bc186eb965cee34675187706723d124292d138dfb22322d5328a4dd9ff185d069d2b605d2d
diff --git a/dev-cpp/cli11/cli11-2.4.1.ebuild b/dev-cpp/cli11/cli11-2.4.1.ebuild
deleted file mode 100644
index 1dc668e0e23a..000000000000
--- a/dev-cpp/cli11/cli11-2.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command line parser for C++11"
-HOMEPAGE="https://cliutils.github.io/CLI11/book/"
-SRC_URI="
-	https://github.com/CLIUtils/CLI11/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S=${WORKDIR}/${PN^^}-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-cpp/catch:0
-		dev-libs/boost
-	)
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLI11_BUILD_DOCS=$(usex doc)
-		-DCLI11_BUILD_EXAMPLES=no
-		-DCLI11_BUILD_TESTS=$(usex test)
-		$(usev test -DCLI11_BOOST=yes)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usev doc docs)
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md book/{chapters,code,*.md} )
-	cmake_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/docs/html
-}
diff --git a/dev-cpp/cli11/cli11-2.4.2.ebuild b/dev-cpp/cli11/cli11-2.4.2.ebuild
index 174cace30411..1dc668e0e23a 100644
--- a/dev-cpp/cli11/cli11-2.4.2.ebuild
+++ b/dev-cpp/cli11/cli11-2.4.2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${PN^^}-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index f929d53fdc07..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 1649 BLAKE2B c4b91c138ead102c209d3a7665230b0307e6c52a84fb15f61f439dff4e4a4cf8668c7cdf382a67a55feec2406de7b238848f422104c51887d1ff9eada59816bd SHA512 67106b1fa9a41c3972fbdddb08d610675a86a45e6df1e1d53c371b1c6bc2976cae04486370cdb5231c2a5230f6e26287353e5160fd87b2fddfecdadf2bec20d9
+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 78b17b98c862..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 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 1fce1feb0917..d7cb8c41955c 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,3 +1,13 @@
 DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
-EBUILD cpp-httplib-0.15.3.ebuild 2236 BLAKE2B fe9a7553f109a7b3c16eb5acb1bea6dc49dad91dd1f513c78c2319e87fa81ccbbc98850175f292ce736253e7b3638e2ab065671931faa795c2ea36f7351b0271 SHA512 45882d026c2ad64e11a05a0f312a1b77d2a854db19724a4488d0e3c38ae4cf93c898862e678eca4cfdf24016f04571a1a54c74488ebb8cae203f643f1d7cc369
+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
+DIST cpp-httplib-0.17.3.tar.gz 1258203 BLAKE2B ea6f51eea2b0bc859b13a4c5bcc9df62ef83c718941d2298f35eba58213fd68546c3347125d00a6e1378a1b31885ea4ed9a62a139411fff097055d135faa176a SHA512 9ee144727470af8a9f6ba953e95227c534ec87c1c89a17d511bb763091336c106e8d3a5fd8d4bf2c2274da0a64d42fde77eb95fb166e59f44bbbe906b3d327ec
+DIST cpp-httplib-0.18.0.tar.gz 1321763 BLAKE2B 7807c2f4e3a6a0703a1253f0ec4ac7ef5fbcfad000e517af034a2aff64393229fb47830d215a1959e9893a66f51d19989c33b6b646b79be71e69687fe08cbbf2 SHA512 35ff903d51fee5428d7a95a0406460f8a18d1b5653f6ec8f353d7a2f1084598e599b24d0401f7214d5ee8d9764c74a4e617fff55acd4e6733ab1b9f2d7d4403c
+EBUILD cpp-httplib-0.15.3-r1.ebuild 2251 BLAKE2B 9e6e6fef227f0b3b2e118ecef130f0a57d2877e0c4854016ee1ba6c2951a3f18b92cc660b7def42d4e6b3cffdf570eac6637ed502b9133297b2ff25a3441a0bd SHA512 191160987ddaed74c328a380b3363c02b62edfe4e3216fcc3de9d211e00e90855f02641d2dc05f4ec8e98bffd41308ed251db4921b7cda8f2fd69541b54b21cf
+EBUILD cpp-httplib-0.16.0.ebuild 2262 BLAKE2B ab4a6b960f173a364c37bb870be1fdcfe25048536624015cfd5947700d319f9094b2233be795644073a6b474eddcc5ab4a1e917e4ef41841b49f80690976ae07 SHA512 4a438b65cadc890abfdfede8cdaeb1860ae1099fa912610b77584017e5a5c0919ef82fb95b57cfd3d9478ff5a5f7fac4886456e8a8ecfd9167975e87474352c3
+EBUILD cpp-httplib-0.16.2.ebuild 2346 BLAKE2B 6314ddb9698c74d35c50597e28212ed8c37f30d01ccd187be14b18c9462a15838205ed6cbe3a730f1fdfe03ad0db3ad88ff687042ee3bcbe42036ebd6061376d SHA512 9d40115e55344adb36d1bad10dc3fd98d4d442f6e4721ec1807a1ff99559c9fd281652d94d8484ee3525d42abe7c6bcba07b2e33c2d5c33f8d160fca2c5c5dc4
+EBUILD cpp-httplib-0.16.3.ebuild 2345 BLAKE2B 7db6fc04933b01998aee1625286b90a4493cd0827a52bdc5bca83cdc618376f464955cadaf9b394426e35cf6f882c3e46f41e21435db83bc61d6cf3ce7afc074 SHA512 de16cd8a1427d52af38e2a720639933efc7d1ea832b8bed42b9cedec03345a3bb283897daefa145510b80f3b3f723afb6fddba6669105faa387efc60206c3e66
+EBUILD cpp-httplib-0.17.3-r1.ebuild 2388 BLAKE2B c66c6ec0ac6cce1cb14ff50cbea9a35f606cf09c459f2e8207f614bba3c7d363bc331d9751039cace5c6b5c51bca210e85062c1514c90fcf836f33c8cce85c98 SHA512 da218f7f940cfbab85157d15c718681c2bec554359914135f7ce68fd1e1b0b662269ad52cc013b522025a8ceed18dbb65bdeaed6fdd0eb9b810a0a1a661891f7
+EBUILD cpp-httplib-0.18.0.ebuild 2388 BLAKE2B c66c6ec0ac6cce1cb14ff50cbea9a35f606cf09c459f2e8207f614bba3c7d363bc331d9751039cace5c6b5c51bca210e85062c1514c90fcf836f33c8cce85c98 SHA512 da218f7f940cfbab85157d15c718681c2bec554359914135f7ce68fd1e1b0b662269ad52cc013b522025a8ceed18dbb65bdeaed6fdd0eb9b810a0a1a661891f7
 MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
index 8e738097790f..71dc06d9a302 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
 DEPEND="
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
new file mode 100644
index 000000000000..9740dfa8fb69
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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="~alpha 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.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
new file mode 100644
index 000000000000..607718d967de
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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="~alpha ~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// /:}"
+
+	# 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." PREFIX=.
+}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
new file mode 100644
index 000000000000..82aa4bbda953
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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="~alpha amd64 arm arm64 ~loong ~mips 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// /:}"
+
+	# 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." PREFIX=.
+}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.17.3-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.17.3-r1.ebuild
new file mode 100644
index 000000000000..9972ed866068
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.17.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
+
+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// /:}"
+
+	# 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." PREFIX=.
+}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.0.ebuild
new file mode 100644
index 000000000000..9972ed866068
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
+
+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// /:}"
+
+	# 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." PREFIX=.
+}
diff --git a/dev-cpp/cppdap/Manifest b/dev-cpp/cppdap/Manifest
index bedc0f1d2c09..148543540a84 100644
--- a/dev-cpp/cppdap/Manifest
+++ b/dev-cpp/cppdap/Manifest
@@ -1,4 +1,6 @@
 DIST cppdap-0_pre20230605.tar.gz 100715 BLAKE2B a7b6f745b7445242544deb2cd5b93bb13ee0faefe083a5e435d9a608fb453aceef1746738beb35678833f69521e637f2b8ca47fccd3e292a56e8a74c6435df86 SHA512 034f6282e992ec346715f84da1817a699937be174ab0ea09f750a693bed158b87ec6920e0ed1f7340ef5232e9634c5aebccd78527adde34b8abc4ff00c5f617e
+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 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
new file mode 100644
index 000000000000..e4991d2cc9d5
--- /dev/null
+++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# See https://github.com/google/cppdap/issues/113 re no release
+CPPDAP_COMMIT="c69444ed76f7468b232ac4f989cb8f2bdc100185"
+
+DESCRIPTION="C++ library for the Debug Adapter Protocol"
+HOMEPAGE="https://github.com/google/cppdap"
+SRC_URI="https://github.com/google/cppdap/archive/${CPPDAP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-cpp/nlohmann_json"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# Per README, could use rapidjson or jsoncpp instead.
+		-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON
+		-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=OFF
+		-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=OFF
+
+		-DCPPDAP_BUILD_TESTS=$(usex test)
+		-DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./cppdap-unittests || die
+}
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index 970b6780e33b..2b2b3faed328 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -3,5 +3,5 @@ DIST cppgir-0_p20240110.tar.bz2 130503 BLAKE2B 8bfca0abb6c17101dff4993f19b422454
 DIST cppgir-2.0_p20240315.tar.bz2 135008 BLAKE2B ebd304fe08ec9c203b9bfad1e63f3c0878ea9894487d10b0f5f47dfd41c826c5231cb91c1026b2a203e94bb3b017055c42264623ea6534e7eb78c99357308323 SHA512 e2fe3a042189e190a84c9c62ae5f44f2495a61e77e776b7862d8d673c2d94fe6968fa7f03f68291475cc1f00c46dd6f58d10fd2e6e2fdfab96479ef528937775
 EBUILD cppgir-0_p20230926.ebuild 985 BLAKE2B 67b6ffa45ae5f75904229138856e6aa97e1d04e2c3fe555caab4f204c16f303143e6c50d19eed21af2d9853ce88d41e4007916e9587a972433d7718ddc473337 SHA512 ed637963a617d3b3580ec0bc27c149672741071cbc59bf34ecd36771f3be05bbaac2ec604c5556816eafd9ff3daba96b437fc9cd5c6c24557cde3f56fcec5305
 EBUILD cppgir-0_p20240110.ebuild 984 BLAKE2B fd7b3e39d821aa5a9c59f141c9bc284bc5cd2fc4b080a58803f2af3e60af0a47c1d28a887bdae3ba9d09f16d376bd8ebfa36b871a7d1659494a7b972ee5e14d2 SHA512 cb3b07b99ddd31168c5b11d0f44287a5b9f816ffc61776cc0864d72145548901c0a14bc8a22db4c2fae723676d81f6bf0118050e48abba83942abfa8362281c7
-EBUILD cppgir-2.0_p20240315.ebuild 985 BLAKE2B d89b32f52117ef398986ac1b74a5d5579a092ada2e01a84c305464829842c4105de1adda3466b43a58880ef26fbc428c618dbdb9cadb1f223b91ef0976de5112 SHA512 5d1747be54442ef056b482ecf6f165514b92d59c03fe2a72662f5a5dc1d8540eb6df31226776ae84ce62883e7f7bc857d7d08925b3d32777d8a2730d79d215d0
+EBUILD cppgir-2.0_p20240315.ebuild 984 BLAKE2B dd5b68ef0ac66093201e01a6fb25c45600f18ffd24201fc95b884d4a3f2f2800de8a2c710e4635a8cdb25fcaf8bd19df8556412e525994f9f81e4cfeeb35cc8e SHA512 520b69d40487d15725bab8762c23c5450ea9affffbcbe1ca2a28cccda76cfce31ec3f494bcdeacc2ce02e5aca5bcb55bf251ea546214c9cf4c84abed6f8a166d
 MISC metadata.xml 567 BLAKE2B 0684a8a7347f840ff2d683d32ccf4fd37e0c617be78600dde97ad5f1bf5e897b01fbf40474eeaf3bd14a4efd99642dd7e062b05a61fc2a2f15722996b5422673 SHA512 fcd0bfcbaa4a4d684ab29bdc6ef3d251bc17206d548ce15644efa0a5b6cfc7e072c04c6a7e882307e73eb74347e971389fdb01462be28e5bbd9bb8c0ec8934e9
diff --git a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild b/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
index 8f7f7db42bab..b8b203459ce3 100644
--- a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
+++ b/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index 3c56ffb05648..590c780166e1 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,4 +1,4 @@
 AUX 70ctemplate-gentoo.el 282 BLAKE2B 6004cc2b2e543f47c0c808bf494160c4b7e7e4768a954c1b0d99bc065a89145875dfc2b1e386bdf3a5e4dbb375a0bf5badc45b1666320f2a00fa8bd108f16c09 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3
 DIST ctemplate-2.4.tar.gz 391923 BLAKE2B 96b585ed6ca323fc461857e1f2f381e0ca5c229d8c6039c24efcf34fb9ddf45cc36bef141af337e591e1cdd95ca510ea5ba1e539554322c578c25187b1906195 SHA512 4955489e7327bce18802d50fd9dfc8ac12af685e556d1c9d0eb2b7a2f4a9b6086e30be8388d694ec8912623738973d0c76e9ca97196c63c139ee5b468d4858b7
-EBUILD ctemplate-2.4.ebuild 1521 BLAKE2B 30641f29e497249c68c92612b14ce681ae765c0de7db3022124bd9ea5b629a91f1319916026254c0146ac677ba5a9c069492f50f51a316838ae8e9b1408e40a8 SHA512 46262f7a5a85774f10ce16b9ad1afd1c2df500177a3dafbd6fb69e554f259fcb6f01dba849259bc2e24d82328d4f947592a74832ed3b179454835791d123c01b
+EBUILD ctemplate-2.4.ebuild 1651 BLAKE2B 6a44571e567c38aa553c0a02873a9bc0406486cad98f562bc1ec2f0cfc5b8a06bad0c193a4d31a8b2b6249afdc86ffab1a2be9bdced439eeba42e5c6a975bf22 SHA512 34351348512026c0ef0cbfaaffd0f7e21b454289fcaf9e68765221cc4d2bb31e917b31fd2c21d5f5aa8ba261d07054d77076317cbf4f6018fb59a169c700c485
 MISC metadata.xml 314 BLAKE2B f6d4b334aa6c7bdc8e813da5170b39f55d111fc1112595fc5000f7b05866a518141d514e6496ad4bfef4c818646bfdccec88fe73a6caf1912c8cf65fb064b1ff SHA512 e9f7539c69d3a229e776513eddddc9a8b7151e4dea8d2782335f169d5a988c8f1e7e28fc3698832bc1fae58d47e5274d608e3ce5772a69bac1a2f4000c39e656
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index b1a2a9d2775c..8224d19db62c 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit autotools elisp-common python-any-r1
+inherit autotools elisp-common flag-o-matic python-any-r1
 
 DESCRIPTION="A simple but powerful template language for C++"
 HOMEPAGE="https://github.com/olafvdspek/ctemplate"
@@ -33,6 +33,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/924637
+	# https://github.com/OlafvdSpek/ctemplate/issues/157
+	filter-lto
+
 	econf $(use_enable static-libs static)
 }
 
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 99e3e0d4e34e..fb4cf9e2e1dd 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -4,11 +4,13 @@ AUX eigen-3.4.0-buildstring.patch 716 BLAKE2B f9453cab7a7e4609b5801b7f8470bac2ed
 AUX eigen-3.4.0-cxxstandard.patch 4274 BLAKE2B cd837966150b4cdd6a4080aba0b58785401adf03e3273b83cd03b4b999795b8d87419e31ed27e018feefda659627a3d62b538f7379de13c85fabfbcbdf9fa9f4 SHA512 473ea735425534403f6f66d1e3601e1fcaf6e1f2558f6b1b9695a69e05a4769d0951d4174d99f8853f3a0176d7c7722cbfb9942459da07bbe1636fd4cc847f95
 AUX eigen-3.4.0-doc-nocompress.patch 873 BLAKE2B 0458b8e4c03fb8ef3f4ecd74d9f285ca8aa3787a0fd466922f45cb96386c8c5cd35116db4ab2caddc841e47cbf2678594ebf727153804878761dc455f08c2c81 SHA512 a4763cb037a16c12dc3d6a6ac075c7ff130ea9d2913f76472e61d821e45cfcce446ad11e43426227e7b60268a14cd952ee81104ca594c3710bde56d655f910b0
 AUX eigen-3.4.0-noansi.patch 729 BLAKE2B 60088bddb6d79992e1f559f4977e6f51082cb6e382b6f481ef54b65d4db9c8042422ad3b26479f67151bf4455d448a59bebeada2cb651a32e7eafe86165ee1bf SHA512 a07851b377da8d927f27dd624a071a17176e76667bc2a38ef54820b7515fb7b0dffdb11200b7e85e10008b7bb69adafa3f4cae7fa237a1cb4c97f2b9ea2a9247
+AUX eigen-3.4.0-ppc-no-vsx.patch 6739 BLAKE2B 9b61a58c671353de4a8675af62d4168c8ec90164c58d159342c81cbd9d5823b08da7235ae5cbd9d316dcf4f3e200e61c3f61cb747b33d53e78b2f595b51c154b SHA512 f1788bc2893b2bc6929d564f0e7fa420e5c8b2829092c247bf9f38289d8f745e6c1f6a7a43bcb2ca8a6a5a0a1067acd20751506fc09e5b996f9aca9b700b5ab3
 AUX eigen-9999-please_protect_your_min_with_parentheses.patch 1979 BLAKE2B 50da0559d66338af6d27b8fd8ec5b1273e27bda992e40db62044c1d6a8cc4a066f0d9c9ca2061af4384decaaa7ebe4a4964c8c7dfb4e1b2abca10a1c9e9e2715 SHA512 a0ecb745768e2118af687c6b316520c782f23e43fc33f603b06c5bd9bea141161d9547eacdd16f0038ba49c0307670a7549d3ba570b54b8d44d3a96a94895ff0
 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-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
new file mode 100644
index 000000000000..7b368f254261
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="test"
+inherit cmake cuda fortran-2 llvm toolchain-funcs
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/lib${PN}/${PN}.git"
+	if [[ ${PV} = 3.4.9999* ]] ; then
+		EGIT_COMMIT="3.4"
+	fi
+else
+	SRC_URI="
+		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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+fi
+
+LICENSE="MPL-2.0"
+SLOT="3"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	neon:NEON
+)
+PPC_CPU_FEATURES=(
+	altivec:ALTIVEC
+	vsx:VSX
+)
+X86_CPU_FEATURES=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX512
+	avx512dq:AVX512DQ
+	f16c:FP16C
+	fma3:FMA
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+# MIPS_CPU_FEATURES=(
+# 	msa:MSA
+# )
+# S390_CPU_FEATURES=(
+# 	z13:Z13
+# 	z14:Z14
+# )
+
+CPU_FEATURES_MAP=(
+	"${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}"
+	"${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}"
+	"${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}"
+	# "${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}"
+	# "${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}"
+)
+
+IUSE_TEST_BACKENDS=(
+	"adolc"
+	"boost"
+	"cholmod"
+	"fftw"
+	"klu"
+	"opengl"
+	"openmp"
+	"pastix"
+	"sparsehash"
+	"spqr"
+	"superlu"
+	"umfpack"
+)
+
+IUSE="${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack mathjax test ${IUSE_TEST_BACKENDS[*]}" #zvector
+
+# Tests failing again because of compiler issues
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		mathjax? ( dev-libs/mathjax )
+	)
+	test? ( virtual/pkgconfig )
+"
+
+# METIS
+# MPREAL
+# dev-libs/mpfr:0
+# dev-libs/gmp:0
+
+TEST_BACKENDS="
+		boost? ( dev-libs/boost )
+		adolc? ( sci-libs/adolc[sparse] )
+		cholmod? ( sci-libs/cholmod:= )
+		fftw? ( sci-libs/fftw )
+		spqr? ( sci-libs/spqr )
+		klu? ( sci-libs/klu )
+		opengl? (
+			media-libs/freeglut
+			media-libs/glew
+			media-libs/libglvnd
+		)
+		pastix? ( sci-libs/pastix[-mpi] )
+		sparsehash? (
+			amd64? ( dev-cpp/sparsehash )
+			arm64? ( dev-cpp/sparsehash )
+			ppc64? ( dev-cpp/sparsehash )
+			x86?   ( dev-cpp/sparsehash )
+		)
+		superlu? ( sci-libs/superlu )
+		umfpack? ( sci-libs/umfpack )
+"
+DEPEND="
+	test? (
+		cuda? (
+			!clang? (
+				dev-util/nvidia-cuda-toolkit
+			)
+			clang? (
+				sys-devel/clang[llvm_targets_NVPTX]
+				openmp? ( sys-libs/libomp[llvm_targets_NVPTX,offload] )
+			)
+		)
+		hip? ( dev-util/hip )
+		lapack? ( virtual/lapacke )
+		${TEST_BACKENDS}
+	)
+"
+
+REQUIRED_USE="
+	test? ( !lapack )
+	|| ( ${IUSE_TEST_BACKENDS[*]} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.9-max-macro.patch"
+	"${FILESDIR}/${PN}-3.4.0-doc-nocompress.patch" # bug 830064
+	"${FILESDIR}/${PN}-3.4.0-buildstring.patch"
+	"${FILESDIR}/${PN}-3.4.0-noansi.patch"
+	"${FILESDIR}/${PN}-3.4.0-cxxstandard.patch"
+	"${FILESDIR}/${PN}-3.4.0-ppc-no-vsx.patch" # bug 936107
+)
+
+# TODO should be in cuda.eclass
+cuda_set_CUDAHOSTCXX() {
+	local compiler
+	tc-is-gcc && compiler="gcc"
+	tc-is-clang && compiler="clang"
+	[[ -z "$compiler" ]] && die "no compiler specified"
+
+	local package="sys-devel/${compiler}"
+	local version="${package}"
+	local CUDAHOSTCXX_test
+	while
+		CUDAHOSTCXX="${CUDAHOSTCXX_test}"
+		version=$(best_version "${version}")
+		if [[ -z "${version}" ]]; then
+			if [[ -z "${CUDAHOSTCXX}" ]]; then
+				die "could not find supported version of ${package}"
+			fi
+			break
+		fi
+		CUDAHOSTCXX_test="$(
+			dirname "$(
+				realpath "$(
+					which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")"
+				)"
+			)"
+		)"
+		version="<${version}"
+	do ! echo "int main(){}" | nvcc "-ccbin ${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done
+
+	export CUDAHOSTCXX
+}
+
+pkg_setup() {
+	use test && use cuda && use clang && llvm_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.bz2"
+
+		if use test && use lapack; then
+			cd "${S}/lapack" || die
+			unpack "${PN}-lapack_addons-3.4.1.tgz"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/add_subdirectory(bench\/spbench/s/^/#DONOTCOMPILE /g" \
+		-e "/add_subdirectory(demos/s/^/#DONOTCOMPILE /g" \
+		-i CMakeLists.txt || die
+
+	if ! use test; then
+		sed \
+			-e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(scripts/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(failtest/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DEIGEN_BUILD_DOC="$(usex doc)" # Enable creation of Eigen documentation
+		-DEIGEN_BUILD_PKGCONFIG="yes" # Build pkg-config .pc file for Eigen
+	)
+	if use doc || use test; then
+		mycmakeargs+=(
+			# needs Qt4
+			-DEIGEN_TEST_NOQT="yes" # Disable Qt support in unit tests
+		)
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DEIGEN_DOC_USE_MATHJAX="$(usex mathjax)" # Use MathJax for rendering math in HTML docs
+			-DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			# the OpenGL testsuite is extremely brittle, bug #712808
+			-DOpenGL_GL_PREFERENCE="GLVND"
+			-DEIGEN_TEST_OPENGL="$(usex opengl)" # Enable OpenGL support in unit tests
+			-DEIGEN_TEST_OPENMP="$(usex openmp)" # Enable/Disable OpenMP in tests/examples
+
+			-DCMAKE_DISABLE_FIND_PACKAGE_MPREAL=ON
+
+			-DEIGEN_TEST_CXX11=yes
+
+			# -DEIGEN_TEST_CUSTOM_CXX_FLAGS= # Additional compiler flags when compiling unit tests.
+			# -DEIGEN_TEST_CUSTOM_LINKER_FLAGS= # Additional linker flags when linking unit tests.
+			# -DEIGEN_TEST_BUILD_FLAGS= # Options passed to the build command of unit tests
+
+			# -DEIGEN_BUILD_BTL=yes # Build benchmark suite
+
+			-DEIGEN_TEST_BUILD_DOCUMENTATION="$(usex doc)" # Test building the doxygen documentation
+
+			# -DEIGEN_COVERAGE_TESTING=no # Enable/disable gcov
+			# -DEIGEN_CTEST_ERROR_EXCEPTION= # Regular expression for build error messages to be filtered out
+			# -DEIGEN_DEBUG_ASSERTS=no # Enable advanced debugging of assertions
+			# -DEIGEN_NO_ASSERTION_CHECKING=no # Disable checking of assertions using exceptions
+			# -DEIGEN_TEST_NO_EXCEPTIONS=no # Disables C++ exceptions
+			# -DEIGEN_TEST_NO_EXPLICIT_ALIGNMENT=no # Disable explicit alignment (hence vectorization) in tests/examples
+			# -DEIGEN_TEST_NO_EXPLICIT_VECTORIZATION=no # Disable explicit vectorization in tests/examples
+
+			# -DEIGEN_DASHBOARD_BUILD_TARGET=buildtests # Target to be built in dashboard mode, default is buildtests
+
+			# -DEIGEN_DEFAULT_TO_ROW_MAJOR=no # Use row-major as default matrix storage order
+
+			# -DEIGEN_TEST_MATRIX_DIR=yes # Enable testing of realword sparse matrices contained in the specified path
+			# -DEIGEN_TEST_MAX_SIZE=320 # Maximal matrix/vector size, default is 320
+			# -DEIGEN_SPLIT_LARGE_TESTS=no # Split large tests into smaller executables
+		)
+
+		use !adolc      && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Adolc="TRUE" )
+		use !boost      && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Boost="TRUE" )
+		use !cholmod    && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_CHOLMOD="TRUE" )
+		use !fftw       && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_FFTW="TRUE" )
+		use !sparsehash && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GoogleHash="TRUE" )
+		use !klu        && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KLU="TRUE" )
+		use !opengl     && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL="TRUE" )
+		use !openmp     && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_OpenMP="TRUE" )
+		use !pastix     && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PASTIX="TRUE" )
+		use !spqr       && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_SPQR="TRUE" )
+		use !superlu    && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU="TRUE" )
+		use !umfpack    && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_UMFPACK="TRUE" )
+
+		if use lapack; then
+			mycmakeargs+=(
+				-DEIGEN_ENABLE_LAPACK_TESTS=yes
+				-DEIGEN_TEST_EXTERNAL_BLAS=yes # Use external BLAS library for testsuite
+				-DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON
+			)
+		fi
+
+		if use arm; then
+			mycmakeargs+=(
+				-DEIGEN_TEST_NEON="$(usex cpu_flags_arm_neon)"
+			)
+		fi
+
+		if use arm64; then
+			mycmakeargs+=(
+				-DEIGEN_TEST_NEON64="$(usex cpu_flags_arm_neon)"
+			)
+		fi
+
+		if use ppc || use ppc64; then
+			mycmakeargs+=(
+				-DEIGEN_TEST_ALTIVEC="$(usex cpu_flags_ppc_altivec)"
+				-DEIGEN_TEST_VSX="$(usex cpu_flags_ppc_vsx)"
+			)
+		fi
+
+		if use amd64 || use x86; then
+			mycmakeargs+=(
+				# -DEIGEN_TEST_32BIT=no # Force generating 32bit code.
+				# -DEIGEN_TEST_X87=no # Force using X87 instructions. Implies no vectorization.
+				-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+				-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+				-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+				-DEIGEN_TEST_FMA="$(usex cpu_flags_x86_fma3)"
+				-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+				-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+				-DEIGEN_TEST_AVX="$(usex cpu_flags_x86_avx)"
+				-DEIGEN_TEST_F16C="$(usex cpu_flags_x86_f16c)"
+				-DEIGEN_TEST_AVX2="$(usex cpu_flags_x86_avx2)"
+				-DEIGEN_TEST_AVX512="$(usex cpu_flags_x86_avx512f)"
+				-DEIGEN_TEST_AVX512DQ="$(usex cpu_flags_x86_avx512dq)"
+			)
+		fi
+
+		if use mips; then
+			mycmakeargs+=(
+				# -DEIGEN_TEST_MSA=no # Enable/Disable MSA in tests/examples
+			)
+		fi
+
+		if use s390; then
+			mycmakeargs+=(
+				# -DEIGEN_TEST_Z13=no # Enable/Disable S390X(zEC13) ZVECTOR in tests/examples
+				# -DEIGEN_TEST_Z14=no # Enable/Disable S390X(zEC14) ZVECTOR in tests/examples
+			)
+		fi
+
+		mycmakeargs+=(
+			-DEIGEN_TEST_CUDA="$(usex cuda)" # Enable CUDA support in unit tests
+			-DEIGEN_TEST_CUDA_CLANG="$(usex cuda "$(usex clang)")" # Use clang instead of nvcc to compile the CUDA tests
+
+			-DEIGEN_TEST_HIP="$(usex hip)" # Add HIP support.
+
+			# -DEIGEN_TEST_SYCL=no # Add Sycl support.
+			# -DEIGEN_SYCL_TRISYCL=no # Use the triSYCL Sycl implementation (ComputeCPP by default).
+		)
+
+		if use cuda; then
+			cuda_add_sandbox -w
+			if use clang; then
+				local llvm_prefix
+				llvm_prefix="$(get_llvm_prefix -b)"
+				export CC="${llvm_prefix}/bin/clang"
+				export CXX="${llvm_prefix}/bin/clang++"
+				export LIBRARY_PATH="${ESYSROOT}/usr/$(get_libdir)"
+			else
+				cuda_set_CUDAHOSTCXX
+				mycmakeargs+=(
+					-DCUDA_HOST_COMPILER="${CUDAHOSTCXX}"
+				)
+			fi
+			if [[ "${CUDA_VERBOSE}" == true ]]; then
+				mycmakeargs+=(
+					-DCUDA_VERBOSE_BUILD=yes
+				)
+				NVCCFLAGS+=" -v"
+			fi
+
+			export CUDAFLAGS="${NVCCFLAGS}"
+
+			[[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS"
+			: "${CUDAARCHS:=$(__nvcc_device_query)}"
+			export CUDAARCHS
+
+			mycmakeargs+=(
+				-DEIGEN_CUDA_COMPUTE_ARCH="${CUDAARCHS}"
+			)
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local targets=()
+	if use doc; then
+		targets+=( doc )
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+	if use test; then
+		targets+=( buildtests )
+		if ! use lapack; then
+			targets+=( blas )
+		fi
+		# tests generate random data, which
+		# obviously fails for some seeds
+		export EIGEN_SEED=712808
+	fi
+
+	if use doc || use test; then
+		cmake_src_compile "${targets[@]}"
+	fi
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		product_small_32           #  143 (Subprocess aborted)
+		product_small_33           #  144 (Subprocess aborted)
+
+		eigensolver_selfadjoint_13 #  452 (Subprocess aborted)
+
+		cholmod_support_21         #  726 (Subprocess aborted)
+		cholmod_support_22         #  727 (Subprocess aborted)
+
+		NonLinearOptimization      #  930 (Subprocess aborted)
+		openglsupport              #  990 (Failed)
+		levenberg_marquardt        # 1020 (Subprocess aborted)
+	)
+
+	if use cuda ; then
+		cuda_add_sandbox -w
+
+		CMAKE_SKIP_TESTS+=(
+			cxx11_tensor_cast_float16_gpu
+			cxx11_tensor_gpu_5
+		)
+	fi
+
+	if use lapack ; then
+		CMAKE_SKIP_TESTS+=(
+			"^LAPACK-.*$"
+		)
+	fi
+
+	local myctestargs=(
+		-j1 # otherwise breaks due to cmake reruns
+	)
+
+	cmake_src_test
+}
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/eigen/files/eigen-3.4.0-ppc-no-vsx.patch b/dev-cpp/eigen/files/eigen-3.4.0-ppc-no-vsx.patch
new file mode 100644
index 000000000000..7cfeaaf129ff
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.4.0-ppc-no-vsx.patch
@@ -0,0 +1,195 @@
+https://gitlab.com/libeigen/eigen/-/merge_requests/1028
+https://bugs.gentoo.org/936107
+--- a/Eigen/Core
++++ b/Eigen/Core
+@@ -346,7 +346,7 @@
+ #include "src/Core/CoreIterators.h"
+ #include "src/Core/ConditionEstimator.h"
+ 
+-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
++#if defined(EIGEN_VECTORIZE_VSX)
+   #include "src/Core/arch/AltiVec/MatrixProduct.h"
+ #elif defined EIGEN_VECTORIZE_NEON
+   #include "src/Core/arch/NEON/GeneralBlockPanelKernel.h"
+--- a/Eigen/src/Core/arch/AltiVec/Complex.h
++++ b/Eigen/src/Core/arch/AltiVec/Complex.h
+@@ -100,6 +100,7 @@
+     HasAbs2   = 0,
+     HasMin    = 0,
+     HasMax    = 0,
++    HasSqrt   = 1,
+ #ifdef __VSX__
+     HasBlend  = 1,
+ #endif
+@@ -320,6 +321,7 @@
+     HasAbs2   = 0,
+     HasMin    = 0,
+     HasMax    = 0,
++    HasSqrt   = 1,
+     HasSetLinear = 0
+   };
+ };
+--- a/Eigen/src/Core/arch/AltiVec/MathFunctions.h
++++ b/Eigen/src/Core/arch/AltiVec/MathFunctions.h
+@@ -40,16 +40,14 @@
+   return pcos_float(_x);
+ }
+ 
++#ifdef __VSX__
+ #ifndef EIGEN_COMP_CLANG
+ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
+ Packet4f prsqrt<Packet4f>(const Packet4f& x)
+ {
+   return  vec_rsqrt(x);
+ }
+-#endif
+ 
+-#ifdef __VSX__
+-#ifndef EIGEN_COMP_CLANG
+ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
+ Packet2d prsqrt<Packet2d>(const Packet2d& x)
+ {
+@@ -74,6 +72,26 @@
+ {
+   return pexp_double(_x);
+ }
++
++template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
++  BF16_TO_F32_UNARY_OP_WRAPPER(psqrt<Packet4f>, a);
++}
++
++#ifndef EIGEN_COMP_CLANG
++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
++  BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
++}
++#endif
++#else
++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS
++Packet4f psqrt<Packet4f>(const Packet4f& x)
++{
++  Packet4f a;
++  for (Index i = 0; i < packet_traits<float>::size; i++) {
++    a[i] = numext::sqrt(x[i]);
++  }
++  return a;
++}
+ #endif
+ 
+ // Hyperbolic Tangent function.
+--- a/Eigen/src/Core/arch/AltiVec/PacketMath.h
++++ b/Eigen/src/Core/arch/AltiVec/PacketMath.h
+@@ -175,16 +175,19 @@
+ #else
+     HasRsqrt = 0,
+ #endif
++    HasTanh = EIGEN_FAST_MATH,
++    HasErf = EIGEN_FAST_MATH,
++    HasRint = 1,
+ #else
+     HasSqrt = 0,
+     HasRsqrt = 0,
+-    HasTanh = EIGEN_FAST_MATH,
+-    HasErf = EIGEN_FAST_MATH,
++    HasTanh = 0,
++    HasErf = 0,
++    HasRint = 0,
+ #endif
+     HasRound = 1,
+     HasFloor = 1,
+     HasCeil = 1,
+-    HasRint = 1,
+     HasNegate = 1,
+     HasBlend = 1
+   };
+@@ -217,16 +220,17 @@
+ #else
+     HasRsqrt = 0,
+ #endif
++    HasRint = 1,
+ #else
+     HasSqrt = 0,
+     HasRsqrt = 0,
+-    HasTanh = EIGEN_FAST_MATH,
+-    HasErf = EIGEN_FAST_MATH,
++    HasRint = 0,
+ #endif
++    HasTanh = 0,
++    HasErf = 0,
+     HasRound = 1,
+     HasFloor = 1,
+     HasCeil = 1,
+-    HasRint = 1,
+     HasNegate = 1,
+     HasBlend = 1
+   };
+@@ -872,19 +876,29 @@
+   return vec_nor(c,c);
+ }
+ 
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_le(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_eq(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmpeq(a,b)); }
+ 
+@@ -937,6 +951,7 @@
+ }
+ template<> EIGEN_STRONG_INLINE Packet4f pceil<Packet4f>(const  Packet4f& a) { return vec_ceil(a); }
+ template<> EIGEN_STRONG_INLINE Packet4f pfloor<Packet4f>(const Packet4f& a) { return vec_floor(a); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f>(const Packet4f& a)
+ {
+     Packet4f res;
+@@ -947,6 +962,7 @@
+ 
+     return res;
+ }
++#endif
+ 
+ template<typename Packet> EIGEN_STRONG_INLINE Packet ploadu_common(const __UNPACK_TYPE__(Packet)* from)
+ {
+@@ -1341,12 +1357,6 @@
+   BF16_TO_F32_BINARY_OP_WRAPPER(psub<Packet4f>, a, b);
+ }
+ 
+-template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
+-  BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a);
+-}
+-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
+-  BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
+-}
+ template<> EIGEN_STRONG_INLINE Packet8bf pexp<Packet8bf> (const Packet8bf& a){
+   BF16_TO_F32_UNARY_OP_WRAPPER(pexp_float, a);
+ }
+@@ -1390,9 +1400,11 @@
+ template<> EIGEN_STRONG_INLINE Packet8bf pround<Packet8bf> (const Packet8bf& a){
+   BF16_TO_F32_UNARY_OP_WRAPPER(pround<Packet4f>, a);
+ }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8bf print<Packet8bf> (const Packet8bf& a){
+   BF16_TO_F32_UNARY_OP_WRAPPER(print<Packet4f>, a);
+ }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8bf pmadd(const Packet8bf& a, const Packet8bf& b, const Packet8bf& c) {
+   Packet4f a_even = Bf16ToF32Even(a);
+   Packet4f a_odd = Bf16ToF32Odd(a);
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 7b06b5f1b8ad..3080d9d9b11f 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,12 +1,7 @@
-AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432
-AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
-AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
 AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3039 BLAKE2B 3df4edd58d1aa8380a722baab1b09d6d93d3750bd87d45e7496f81e3115ade12d925f4a4804f467d9a114a753ddbd78651f56b2b78076f026b8f85e7bbcd7d24 SHA512 362f1bc727e38bf17c68df90d33aa229b9ffd60618e80ed26d8127f2d80fee4792ea7179039ad8bd109c87cbfcc40fe2d9e6104397b63ee5221f8cc5b4b599d9
 AUX glog-0.5.0-vmodule_levels_changeability.patch 5980 BLAKE2B e6d57f0570e7ef849a52cf1cba91f1b39e7a8e08e994585dee7948effe54c9a53fcbf50468891d1122b1fbbd9763bf5b51a2a37c34035fc7380d90076cd3b8bc SHA512 53ff691227f8c9386ddc1b223001021ab31fbf8ccc2fe06a0372952e66ebe4903e99ccb4139c65efd06b1ccd9a5c73592466195de263b69f3c45ce89ea9517f8
-DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 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.4.0.ebuild 1139 BLAKE2B 4aad89f7c76c7744037cc2a72db92bd321a9c686022accacf55efb1f37b76a594b245f6d018f0f48cc246b3f281f7d280cf8829ae89dacfbe2eb224a311e553d SHA512 d80010ebb2d0a530b98bcc1af9a4b6f0c9c2ff94be9e9172e068ab0e6d5a2a501e72b6aa3df8c7307356cc92ac4062a5b2467948c916a0b109a57fcf1aff987d
-EBUILD glog-0.5.0.ebuild 1506 BLAKE2B 869ed3d3b2be384250d53bcac744354dea33296667822d40227d317d9bd99135dc3edfb0b9632e66663569561af83ac665c17427ed3755e74ef2d865f4679078 SHA512 f9fa6fe43960ff1b61a3d2c50a28c6890bfa9427ba20cfa5760f2c0ecf9fefd6efd76bc52b5fe1de41a1bf58efae3239a3f0fa6759e3a5025e56124da1f40684
-EBUILD glog-0.6.0.ebuild 1222 BLAKE2B 6a88a5648b71743b8b7124adfd94dc468ed6ebe44066455d3862b28306ca3dcf5ec182308f56375a7f54eb085fcdb211d89d23135cf45fd3d84e6661c51de0a9 SHA512 5cfbeb151f8ede3006423564c5091770c5583004c2c8c918c65f150f5c971a4d168d3eb6ce0e6634124090895ec3ff4f52fb843dccaabe21bb332c31738985d9
-MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
+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/files/glog-0.4.0-errnos.patch b/dev-cpp/glog/files/glog-0.4.0-errnos.patch
deleted file mode 100644
index c55716db1ba2..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-errnos.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: b/src/googletest.h
-===================================================================
---- a/src/googletest.h
-+++ b/src/googletest.h
-@@ -437,6 +437,18 @@ static inline void StringReplace(string*
-   }
- }
- 
-+static inline void IntReplace(string* str,
-+                          const string& oldsub,
-+                          int newsub) {
-+  size_t pos = str->find(oldsub);
-+  if (pos != string::npos) {
-+    std::ostringstream ss;
-+    ss << newsub;
-+    const std::string x = ss.str();
-+    str->replace(pos, oldsub.size(), x.c_str());
-+  }
-+}
-+
- static inline string Munge(const string& filename) {
-   FILE* fp = fopen(filename.c_str(), "rb");
-   CHECK(fp != NULL) << filename << ": couldn't open";
-@@ -452,9 +464,13 @@ static inline string Munge(const string&
- 
-     StringReplace(&line, "__SUCCESS__", StrError(0));
-     StringReplace(&line, "__ENOENT__", StrError(ENOENT));
-+    IntReplace(&line, "__ENOENT_NUM__", ENOENT);
-     StringReplace(&line, "__EINTR__", StrError(EINTR));
-+    IntReplace(&line, "__EINTR_NUM__", EINTR);
-     StringReplace(&line, "__ENXIO__", StrError(ENXIO));
-+    IntReplace(&line, "__ENXIO_NUM__", ENXIO);
-     StringReplace(&line, "__ENOEXEC__", StrError(ENOEXEC));
-+    IntReplace(&line, "__ENOEXEC_NUM__", ENOEXEC);
-     result += line + "\n";
-   }
-   fclose(fp);
-Index: b/src/logging_unittest.cc
-===================================================================
---- a/src/logging_unittest.cc
-+++ b/src/logging_unittest.cc
-@@ -238,6 +238,17 @@ int main(int argc, char **argv) {
-   return 0;
- }
- 
-+static int errnoForIteration(int i) {
-+  switch (i) {
-+    case 0: return 0;
-+    case 2: return ENOENT;
-+    case 4: return EINTR;
-+    case 6: return ENXIO;
-+    case 8: return ENOEXEC;
-+  }
-+  return -1;
-+}
-+
- void TestLogging(bool check_counts) {
-   int64 base_num_infos   = LogMessage::num_messages(GLOG_INFO);
-   int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING);
-@@ -246,7 +257,7 @@ void TestLogging(bool check_counts) {
-   LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4;
-   for ( int i = 0; i < 10; ++i ) {
-     int old_errno = errno;
--    errno = i;
-+    errno = errnoForIteration(i);
-     PLOG_EVERY_N(ERROR, 2) << "Plog every 2, iteration " << COUNTER;
-     errno = old_errno;
- 
-Index: b/src/logging_unittest.err
-===================================================================
---- a/src/logging_unittest.err
-+++ b/src/logging_unittest.err
-@@ -51,21 +51,21 @@ WDATE TIME__ THREADID logging_unittest.c
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 1
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 1
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 2
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [2]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [__ENOENT_NUM__]
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 3
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 3
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 4
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 4
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [4]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [__EINTR_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 5
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 5
- WDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 5, iteration 6
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 6
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [6]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [__ENXIO_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 7
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 7
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 8
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [8]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [__ENOEXEC_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 9
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 9
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 10
-
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch b/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
deleted file mode 100644
index 392ae8ca7819..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: google-glog-0.3.2/src/signalhandler_unittest.sh
-===================================================================
---- google-glog-0.3.2.orig/src/signalhandler_unittest.sh	2013-03-13 13:49:37.820188111 -0400
-+++ google-glog-0.3.2/src/signalhandler_unittest.sh	2013-03-13 14:07:11.980204520 -0400
-@@ -65,10 +65,10 @@
-   exit 0
- fi
- 
--# The PC cannot be obtained in signal handlers on PowerPC correctly.
--# We just skip the test for PowerPC.
--if [ x`uname -p` = x"powerpc" ]; then
--  echo "PASS (We don't test the signal handler on PowerPC.)"
-+# This test only works correctly on i386 and amd64.
-+# We just skip the test when not on those platforms.
-+if [ x`uname -m` != x"x86_64" -a x`uname -m` != x"i686" ]; then
-+  echo "PASS (We only test the signal handler on i386 or amd64.)"
-   exit 0
- fi
- 
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
deleted file mode 100644
index e53318ac66ff..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: fix FTBFS on x32
-Author: Guillaume Morin <guillaume@morinfr.org>
-Forwarded: no
-Last-Update: 2019-08-05
-
----
-
---- google-glog-0.3.4.orig/src/symbolize_unittest.cc
-+++ google-glog-0.3.4/src/symbolize_unittest.cc
-@@ -313,8 +313,12 @@ extern "C" {
- inline void* always_inline inline_func() {
-   void *pc = NULL;
- #ifdef TEST_X86_32_AND_64
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
-+#else
-   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
- #endif
-+#endif
-   return pc;
- }
- 
-@@ -322,8 +326,12 @@ void* ATTRIBUTE_NOINLINE non_inline_func
- void* ATTRIBUTE_NOINLINE non_inline_func() {
-   void *pc = NULL;
- #ifdef TEST_X86_32_AND_64
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
-+#else
-   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
- #endif
-+#endif
-   return pc;
- }
- 
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
deleted file mode 100644
index 9b10f2e2fc95..000000000000
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# -sparc as libunwind is not ported on sparc
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gflags static-libs test"
-RESTRICT="test"
-
-RDEPEND="sys-libs/libunwind[${MULTILIB_USEDEP}]
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.0-fix-x32-build.patch
-	"${FILESDIR}"/${PN}-0.4.0-errnos.patch
-	"${FILESDIR}"/${PN}-0.4.0-fix-test-on-ports.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		ac_cv_lib_gflags_main="$(usex gflags)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
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/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index b109eca5bd20..f488a88cb0cf 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index f850acb7ca04..b16682ceb6eb 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,4 +1,4 @@
 AUX gstreamermm-1.10.0-no-volatile.patch 856 BLAKE2B 40e2735424873d2dedda0a8ee2fcac848362741a08acb291ffe532e3b6a1d9af8967345f535148692b7322ecc74fb94a244c0841a57f571e6d6a37eda095c1fe SHA512 6babe0b607646c77850512df029be989256403e86010bcc198f782a04f357fbb3580c1015924b46af0ec2f3b9bb3c5b2f96b8a21befba8ee24c877dc32f59660
 DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
-EBUILD gstreamermm-1.10.0-r1.ebuild 1511 BLAKE2B 525a353444cc1022e9db42b18078fd5bc3222b6c25e93514ee776211daeebd790b95b3bb4fb05f46df8d7af19c3f3d96b48295acaec5db22be73c969649e3a91 SHA512 5471e2c3b58b6373000aeeafa4030c9bd1479594cf5bb970e4c9e98ab65143c07f2729cc1b88594a41fad0dd77d6452bf06b961c86eac014e5f0e28488901f33
+EBUILD gstreamermm-1.10.0-r2.ebuild 1522 BLAKE2B bc2f066db597ea5f1019ac885337a21f54b57f7a814e14d62eafe0d7356f29164a02984222b9e80abb69404953d7fdbf5ee390af8cb97e431578f9a3e8d5cc8e SHA512 180a5296df313c17215bdbf444b057d4012a2125640471ef12cf4642b5671b071fac9ba62422eb1071bc36403ba547c7aa742c7b38f84984b1fe1b091d8a57aa
 MISC metadata.xml 352 BLAKE2B 9a3468cbb99cc6d617b86d3ab5d63613435aec6e3b27025f67ea2476ae316b4ecfea8cb5eeed83b16723cd8c459d727038d9740ac40f11bf27c41fe81ffb480a SHA512 b160f16ea4fd4667ea70e5b7006723607555a7e337040767f038fb0bc2e8325ce0c630463a1742400b18191b07d1b311fb9416ac382a4cf978a6ef8dfa0d615b
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0-r2.ebuild
index a950c1971927..e9ba634485f7 100644
--- a/dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gnome2 virtualx
 
@@ -19,21 +19,22 @@ RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:1.0
 	>=dev-cpp/glibmm-2.47.6:2
 	>=dev-cpp/libxmlpp-2.14:2.6
-	>=dev-libs/libsigc++-2:2
-"
+	>=dev-libs/libsigc++-2:2"
 DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		>=media-libs/gst-plugins-base-${PV}:1.0[X,ogg,theora,vorbis]
+		>=media-libs/gst-plugins-good-${PV}:1.0
+		>=media-plugins/gst-plugins-jpeg-${PV}:1.0
+	)"
+BDEPEND="
 	dev-cpp/mm-common
 	virtual/pkgconfig
 	doc? (
 		app-text/doxygen
 		dev-libs/libxslt
-		media-gfx/graphviz )
-	test? (
-		dev-cpp/gtest
-		>=media-libs/gst-plugins-base-${PV}:1.0[X,ogg,theora,vorbis]
-		>=media-libs/gst-plugins-good-${PV}:1.0
-		>=media-plugins/gst-plugins-jpeg-${PV}:1.0 )
-"
+		media-gfx/graphviz
+	)"
 # eautoreconf:
 #	dev-cpp/mm-common
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 72a97d53597b..0bbf55017769 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,6 +1,7 @@
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 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.ebuild 1761 BLAKE2B 8b268bc060b2fbbc35557180b89e53e69a5236013b4f66daf594da236d41d46d228447319314cf2a44262977dfd279ff45424f62a423b8d4293251ddcdfa4c9a SHA512 a6c39e5a2124dabbeffdc448bc584c4fb98b227020d2fc12a9cc29f5a52b44fb2b1ddcd8d2647274d8b15900da5eec4bf231e0623b5d3e1a9ffb383425b2da01
-EBUILD gtest-9999.ebuild 1761 BLAKE2B 8b268bc060b2fbbc35557180b89e53e69a5236013b4f66daf594da236d41d46d228447319314cf2a44262977dfd279ff45424f62a423b8d4293251ddcdfa4c9a SHA512 a6c39e5a2124dabbeffdc448bc584c4fb98b227020d2fc12a9cc29f5a52b44fb2b1ddcd8d2647274d8b15900da5eec4bf231e0623b5d3e1a9ffb383425b2da01
+EBUILD gtest-1.13.0.ebuild 1864 BLAKE2B ffbff14affae137f9aee93bebf3e72b700b8af149b430543b0c21a2c06656f3c0084e4c5f1540e505c7b9422cf415ea24a8f94efc91bb462642d64ebc45e6109 SHA512 d599096c90d486baa02e29aea7c1af279183a865d18df1b0b79556b45f74965003b6c80953227b91f6f864d4c036f3e06848e97df5dbaadd7a83183b238771dc
+EBUILD gtest-1.14.0-r1.ebuild 1995 BLAKE2B ee3fac63616ad3179d8f0c7fc1ab035a294c8840fe2c3ac6d88199b3472dd9d14082b367a34d430da2c3c3b47c3440cc5f5fd5fc99ad6381b133c931580c43bb SHA512 74d78336494d57b67d2ba22aefeecdfd7cf78353ea135c2b2b1e6d023c1ea417725ccbf0f5a226f187ecf9bfc3ae54bd2db125a7f8d25d70cf8e2326d9db062c
+EBUILD gtest-1.14.0.ebuild 1749 BLAKE2B 042a0ce1623fb1738352c9d5b5aee2bf3ab5f390dea14dfe0af27a2d8b79cfb5fb47ae0239657e5a20cbc15256efae57fe3f30cc90b978d1a500d7b62c2e69e9 SHA512 c099afd9d7282d19c5da16f9e9ea08475d648c336ed5e9be84e49845d6e62f68d1b74405f2776cffd571d61c97126c0090f40bda5a7a4bdc694d995bf45c3168
+EBUILD gtest-9999.ebuild 1990 BLAKE2B bd63b9a51f052209f6e4658008c093597a0bddfbc75f3e078c244f10b043519f1b8e9eeb464737cc93eec4ba1538e7a3207ef8af087f0972b598ce2ff05eabb0 SHA512 a17e6f16a0b05f24552367f14eba0959f58dd476ff441f0d830b3112e0627c09fb9f53fbb93693ccf16e360ad0acc7b155b3f109d8fffb00eb9dd46d8ae512bb
 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/gtest-1.13.0.ebuild b/dev-cpp/gtest/gtest-1.13.0.ebuild
index 6ed984c01511..da5e784b43e0 100644
--- a/dev-cpp/gtest/gtest-1.13.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.13.0.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 ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..4187a128ec02
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 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_{10..13} )
+
+inherit cmake-multilib flag-o-matic python-any-r1 toolchain-funcs
+
+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 ~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"
+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
+}
+
+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
+
+		# tests
+		-Dgmock_build_tests=$(usex test)
+		-Dgtest_build_tests=$(usex test)
+	)
+	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
+
+	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.ebuild b/dev-cpp/gtest/gtest-1.14.0.ebuild
index 5351c69b1cd0..e0b2f35af40c 100644
--- a/dev-cpp/gtest/gtest-1.14.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake-multilib python-any-r1
 
@@ -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 ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 5351c69b1cd0..be39799c270c 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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_{10..12} )
+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 ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -39,6 +39,10 @@ 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
@@ -47,7 +51,12 @@ multilib_src_configure() {
 		-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
 }
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 5962d5f3e45d..a2a72441cac5 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,9 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.9.tar.xz 15122612 BLAKE2B bbc80e5140a5c003817a1d6a0e63ebdab971fe9c92cf07d2edcbb8a3ee5e2371ab7b932a5c9af56da096d3e37d6e76101ad25d9cea5074d29d31f97e69960c3d SHA512 6e6e53d7d434f51758ffddce00dbae61074c54a5d3a5bb852fea558147af4ca6c40f9fcf4e7f9fafcbbc22ea33cdd99ea06208b72542c7e75f4dca19a80c6724
 DIST gtkmm-4.12.0.tar.xz 16359928 BLAKE2B 84b5f5ee5ef85c9f6d32d3047ab794f4ded3fb33665e18b4b6cacfc4836f5549e9cd32103963de367d0957fa58eb55b02ed06a3d3c6b6777c296d1c1fe3cabbc SHA512 0bde82ac1331c86810bb513362c81a30b0abaf906af4cf4b0607b85362125d8a15307fb5c51c6497fa9292acce437af027c4e336231dd18d72251f43e3d23688
-EBUILD gtkmm-2.24.5-r1.ebuild 1516 BLAKE2B 3c892fe5f72a8e8b0b3d5530e8c30a8a3a850bcdfa77c7b4c4adec6962c6fd8485c737f2268d58441c40b161235f2c97f07ecba2b70fa55a1e2279a401d20632 SHA512 eb30d30c5b76fdcbb3a58acbcb6b92d1ae71fc12530ebdbd0853ebdd70d5b7cefc0e748671ce1cc87d7cac0b3de94ec293b8fde7ab222d1eabce78609d3ab525
-EBUILD gtkmm-3.24.9.ebuild 1436 BLAKE2B 5e316688daa0a77f662747af5ad28d717fb95ca5e44c6b3f5a9c5d948aa864b17969efe53e62f84993ff156935667c29fc7001d96beac1d73343c47985c960d2 SHA512 eac072b1dbb61f9a06c26572c4b36edc86fbaba01933c044c3c0e0c882c1acc871166e6cdab28ae0b9fffeaa5672b42df7d760d82b27fe2f45ea56b3c40b626e
-EBUILD gtkmm-4.12.0.ebuild 1042 BLAKE2B 17e7055c1bfaa53ef813179131b4f25f25870c45903aeff0a21eac734cdaafb66620feb3881ac29d5664b35da79eed3ff3daf22ce25da7567470e8149110d900 SHA512 50b8529558811ead387f23e9dff66eecbd574964e0d2f9e2a5f4e9db8b2f306f6795077653ad9847f59776ac86bbd0934d6b5af333d5afb4f157e448bceb1831
+DIST gtkmm-4.14.0.tar.xz 16713784 BLAKE2B 27366963f25b704d71a2afabc4e04ad3ab0986f9094a62c6897cabb7ad8c318db94da79197e375da231bd972c1173c3af7a27ba28173f5f692c2e8682c31cd0f SHA512 94cf1f764e539b8b1fdff101f6e134c5e2bc9379f1dae3b6daef66ab94e90f5e70a41d8eb94842fd54c0f8706c565e975fa2adf6e4c6913cecaeb3c8cf00a1cd
+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-r1.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
index d70b1362ca74..45c1c8e551f8 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gnome2 multilib-minimal
 
@@ -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 )"
 
@@ -23,12 +23,14 @@ RDEPEND="
 	>=dev-cpp/pangomm-2.34.0:1.4[${MULTILIB_USEDEP}]
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		media-gfx/graphviz
+		app-text/doxygen
 		dev-libs/libxslt
-		app-text/doxygen )
+		media-gfx/graphviz
+	)
 "
 
 src_prepare() {
@@ -39,7 +41,7 @@ src_prepare() {
 	fi
 
 	if ! use examples; then
-		# don't waste time building tests
+		# don't waste time building examples
 		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed 2 failed"
 	fi
@@ -59,6 +61,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	local DOCS=( AUTHORS ChangeLog PORTING NEWS README )
 	einstalldocs
 }
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
new file mode 100644
index 000000000000..d1570fbdcf31
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-4.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
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org meson python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk-doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?]
+	>=gui-libs/gtk-4.14.0:4
+	>=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
+	>=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
+	>=x11-libs/gdk-pixbuf-2.35.5:2
+	>=media-libs/libepoxy-1.2
+"
+DEPEND="
+	${RDEPEND}
+	gtk-doc? ( dev-libs/libsigc++:3 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild-demos=false
+		$(meson_use gtk-doc build-documentation)
+		$(meson_use test build-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_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/json11/Manifest b/dev-cpp/json11/Manifest
index 219248479065..3583ebce9ee3 100644
--- a/dev-cpp/json11/Manifest
+++ b/dev-cpp/json11/Manifest
@@ -1,5 +1,6 @@
 AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de5467a53c54bd3e0b82c91fcbefe1d6b8d35629a1d968527157720a19c478690d787a1baac634d4b927424d6e4c27abdc89427fe46b7f SHA512 0ef4a3ff19d2ffbf7772b83782ada2fcd2e3baacdd32d6a74931b035166041b7471800fbb01801dbe9b5b1cc003128dbb406a736da1f016c4cb1980ec11a9902
+AUX json11-1.0.0-include-cstdint.patch 258 BLAKE2B 2b7cb5abcbaaaf7c44f1b483716cd68e7a68a5d92f0107847aeb514b93c2b34da1311bd9465ba2077ef568cb7d1a7c150fc89e9adb981a9b59fd7821cefb159d SHA512 c7df20caa578d12a707b74fde88f856dbbf5e75176d7b9aca13f7fe9b501f4ca844fee5a4f2250b3c9de4afd1cd9ed1c26717a06ea4b1d239415cc154152305f
 AUX json11-1.0.0-json11.pc-do-not-state-the-defaults.patch 728 BLAKE2B d96a4a9b0cf5aece5c07181eff4a246c792afb431d1c35715e1c587811108cfef04dc19bbf7fdcb84ac0e5a289ef6697e2e468ef2dc8f190d38ffead8e6d2768 SHA512 98079b0266d30364e47622e58d8d203ef16296aa40c01e318cd7fd902b8d8adcca5c2cae0d09d203137cc219e9288fa7a1187fc8f8fedd4a1ecc68ebd73688e3
 DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3
-EBUILD json11-1.0.0-r1.ebuild 483 BLAKE2B 9ecd56a77aaf7cc7e116c877838fe84ddd8ac4d1b571a4802f97b74f29d74c78108a7540d0b16977f043f37bb2588d66ff3cb0b38320e6b7c7fe0a998499d114 SHA512 fb72bff069e37ae1ebb37f86cb88aaba7e7016c7d0eb162cabbd23fd8b0c297421790c14677fd5f9f35894a100dd75cfd43a4c2cfd6a04136bf1e769fe9fd0c7
+EBUILD json11-1.0.0-r1.ebuild 532 BLAKE2B 8a6c7744cc1e9d6a554cc23b22b5363316b15eec99885aadc8add27a22780070610ec2ea5c2bcc5f2cd5a0c0b6019d297e8012570e6d223d59c8c4d7b187f91d SHA512 79783561dcd536c93af34d5af60d0cb5063ffd94eaed239d0540b13c39f438df32b2120625db65d866468adc1bf1b1f558d3b39d5ecf9295be2d49b959ed1ddc
 MISC metadata.xml 326 BLAKE2B de17355ea68ddbed46fa6e2a41ef90ce0d810757f6974f40773dbb547723ef0664d145dc0718d4c01aaf6f569f32bb298e70f5faccadbd00f283304d4c3308aa SHA512 7e02afef76ec6bac01baead08ae25fd11355197abe23162eb41a055c6de8b1643d5a958b93ab39f87377ad166bfb7441a9aa24f21b382511a13a4ab8624056e6
diff --git a/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch
new file mode 100644
index 000000000000..29648cf15825
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/json11.cpp b/json11.cpp
+index 9647846..8266a14 100644
+--- a/json11.cpp
++++ b/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild
index ab8457f641aa..66b400e6f1bd 100644
--- a/dev-cpp/json11/json11-1.0.0-r1.ebuild
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,4 +16,5 @@ KEYWORDS="amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-multiarch-install.patch
 	"${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch
+	"${FILESDIR}"/${PN}-1.0.0-include-cstdint.patch
 )
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index 58541996f8c1..795ffb3f7eeb 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,3 +1,5 @@
 DIST kokkos-4.0.1.tar.gz 2322402 BLAKE2B a4aba2f7ffe7b7c93051ad65d398f442b753975eceb3f83ed1bff0b8c468e4ffdcb6437989e740c65fc550f17ef8ddf78ca50ca881d3953f886309dc7d6fc597 SHA512 cf6742f4be777b52673858b49cf68fdf335e760509688483e62ef41af5026070f69dcf39d010134c85dc6c4868f82a38900872be11ed43190432c8530b90deee
+DIST kokkos-4.3.1.tar.gz 2431142 BLAKE2B 158ceea3c62449f386613b17e996e4d11e9b95c38a92f69fb3c487b90cf5f07dffdafb6ee0a37eff5299e7d1db50efaed4b26b9baebeeea9d675d0d98dd420e4 SHA512 8180ecdec2f0a6167a85dd1eb268996b0310e82098f2329eccf658aff90118a7c85c2f7607984602de2ca48dc45c1dbf30a4843b35c42590e58d4b03beff474a
 EBUILD kokkos-4.0.1.ebuild 1307 BLAKE2B 49af4974d49b5f80c64aec156e388b0f10e578d00a27da67f7b15bc40f502ff48e9c739b8d2e8be1b1d6d6e331e184343e34b55bcaf97c4f8ea0b826014a7c6f SHA512 4f76de242f7842d4d6764296136e9eb8f30629e370b35249c6ece9d3d30d9f41eb8f6e9552b7b0de1959726b3b7ed54c164c048ce3c89728b7229484b7bbfd19
+EBUILD kokkos-4.3.1.ebuild 1308 BLAKE2B 52c905b0a914345661d9507c1973575a2d636cf58070501dba7a7b437e74dc5bf8befd63ce082510ebb9618e9c77e4a7063e798690a561bda4c06987629287d6 SHA512 c40b69d230cd428b8ecf1c84632cc1848b042ffdf69f93cadb90b2060fb0eba8025e3c399427c9fa3e2a28411dabdff917b10eb1e8eadef7c36e692e3a0396a6
 MISC metadata.xml 440 BLAKE2B ac3497ce481935eaef7f87c9f1c2ff7360b75a7d1f5f9bfc018726784fe3d1573ca16177e0ed956b494371def35bd592878bac27ec3862904b21714c556f937d SHA512 748c3608ee175243a8c02912d18a9297708c1369ac79af913e05a9d2155805fc9b6b366625223d977e378584a69e6bac749e5d3ee0a874d72385427d6149e5c5
diff --git a/dev-cpp/kokkos/kokkos-4.3.1.ebuild b/dev-cpp/kokkos/kokkos-4.3.1.ebuild
new file mode 100644
index 000000000000..208704232631
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-4.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="C++ Performance Portability Programming EcoSystem"
+HOMEPAGE="https://github.com/kokkos"
+MY_PV="$(ver_cut 1-2).0$(ver_cut 3)"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 -x86"
+IUSE="+openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-apps/hwloc:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
+		-DKokkos_ENABLE_TESTS=$(usex test)
+		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+		-DKokkos_ENABLE_SERIAL=ON
+		-DKokkos_ENABLE_HWLOC=ON
+		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
+		-DKokkos_ENABLE_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Contains "death tests" which are known/expected(?) to fail
+		# https://github.com/kokkos/kokkos/issues/3033
+		# bug #791514
+		-E "(KokkosCore_UnitTest_OpenMP|KokkosCore_UnitTest_Serial)"
+	)
+
+	cmake_src_test
+}
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/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 2906373d0437..3902409bf6bd 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,4 +1,5 @@
 AUX lucene++-3.0.7-boost-1.58.patch 1149 BLAKE2B 0021a7a27caabb92232adb42c7b1e8d4832902954018be4bf89e2765562e1e26cc29a67dc75be82f9d2ca7dfddd1e137fc742850d6707527da04574f2b1bbac9 SHA512 7fd0089895ab77da158a49510241fdc894bd3d30f7a6691ddc230f4d52631ec9222a04e13ef0a118f7838b4320fd313502f635c8f0827ba5bb4c6169fdd404b9
+AUX lucene++-3.0.7-boost-1.85.patch 2416 BLAKE2B 5984848b993da3107177f46b22748c2ede4b0986ae1c0bac6086566327eef4287229ef95c16d68e2846453e0055678e9d6795fbecd1dd0c2ca9aaea6115b1df6 SHA512 0af65afca3b0725a78774d9e443efdf6ef1463f9388c98f13f3823dfd3677cd7f3a82c8e9a8e20ec3322624cc85c0ec2b91ec668f1a822462ae9beda0d8ab44d
 DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
-EBUILD lucene++-3.0.7-r3.ebuild 800 BLAKE2B 3901a01a3d8bc88918eec7e47564694db66313d0f969807c1e3df0e34e5739a24122f2dd9d58dedaa5d5ced434009a0fece79ed07be7a02c3fb793ec070569e5 SHA512 c5de12a11f715326f096ebaa335cea47557e6a17748a7150b09d41603601601abf1ac16214a987b7abd5ae7a6342e654e9519f45db56e0b5516c2effe1ee798c
+EBUILD lucene++-3.0.7-r3.ebuild 838 BLAKE2B 4e26efe5c428b139343095dbd68b05bfe149e2857ed14896fa6f8cfd5f87918bae29737ae4aa238513d98c5f5a2885d9a7b76debd9ce5bfc6b927e37c438fd0f SHA512 8ee853e32fd39527cfeddf3809ee90dc99d302410babf708372150f81e4476ad9ad41fcdfe42ba295333df6110ef5dae07c66196c24ae99655901909f0816852
 MISC metadata.xml 262 BLAKE2B f970979571c8afdfdbdd843369bcf81c3700ef44b5afb996572e6466e5332adaa1adea1b5b41be4359eaac9cb0cee39c839df9a205f22575293c7ba7aecd7569 SHA512 07a7be70d8b9786c7be9d5a2bcf8f2cd0904d2ec6d3a060cf78c575e87f8b7f4f72d95bdcb291b63b03db46b49802e70d617fcb2182b814851c168799cba392b
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch
new file mode 100644
index 000000000000..05babf97a08d
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch
@@ -0,0 +1,64 @@
+From c18ead2b0c4aa62af01450cb12353a0baa51411f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Wed, 27 Mar 2024 12:00:18 +0100
+Subject: [PATCH] Fix build with boost 1.85.0
+
+boost::filesystem::wpath has been deprecated (and typedef-ed to
+boost::filesystem::path) for a long time; it is removed from boost
+starting with 1.85.0-beta1.
+
+Use boost::filesystem::path instead.
+
+boost/filesystem/convenience.hpp has been removed (and was being
+included without being used anyway - its only use was indirectly
+pulling in boost/filesystem/directory.hpp, which is actually used).
+
+Include boost/filesystem/directory.hpp directly instead.
+---
+ src/core/store/MMapDirectory.cpp | 2 +-
+ src/core/util/FileUtils.cpp      | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/store/MMapDirectory.cpp b/src/core/store/MMapDirectory.cpp
+index beac7828..46156e3a 100644
+--- a/src/core/store/MMapDirectory.cpp
++++ b/src/core/store/MMapDirectory.cpp
+@@ -36,7 +36,7 @@ MMapIndexInput::MMapIndexInput(const String& path) {
+     bufferPosition = 0;
+     if (!path.empty()) {
+         try {
+-            file.open(boost::filesystem::wpath(path), _length);
++            file.open(boost::filesystem::path(path), _length);
+         } catch (...) {
+             boost::throw_exception(FileNotFoundException(path));
+         }
+diff --git a/src/core/util/FileUtils.cpp b/src/core/util/FileUtils.cpp
+index 51508b57..d92efbb8 100644
+--- a/src/core/util/FileUtils.cpp
++++ b/src/core/util/FileUtils.cpp
+@@ -5,9 +5,9 @@
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ #include "LuceneInc.h"
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include "LuceneThread.h"
+ #include "StringUtils.h"
+ #include "FileUtils.h"
+@@ -128,12 +128,12 @@ String joinPath(const String& path, const String& file) {
+ }
+ 
+ String extractPath(const String& path) {
+-    boost::filesystem::wpath parentPath(path.c_str());
++    boost::filesystem::path parentPath(path.c_str());
+     return parentPath.parent_path().wstring().c_str();
+ }
+ 
+ String extractFile(const String& path) {
+-    boost::filesystem::wpath fileName(path.c_str());
++    boost::filesystem::path fileName(path.c_str());
+     return fileName.filename().wstring().c_str();
+ }
+ 
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
index 025c5aad888e..29cd859016d7 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7-r3.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
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README.rst )
 
-PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.58.patch"
+	"${FILESDIR}/${P}-boost-1.85.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/magic_enum/Manifest b/dev-cpp/magic_enum/Manifest
index 70bd308c4d7d..7e9a72032473 100644
--- a/dev-cpp/magic_enum/Manifest
+++ b/dev-cpp/magic_enum/Manifest
@@ -1,6 +1,7 @@
 AUX magic_enum-0.9.5-werror.patch 875 BLAKE2B b2add770c207262fdf631fad89347ae8299300c3c2aabd88f9b9f1b36b4a166f171d338d27cbcd69d14788ffc38cb0baa4d345b21dd7e41e937377d45e1edd6f SHA512 72da8efd9468f623f04feb443768231d45b481df092a4087a319027e50cb75ddbe59deeebcad8568c15f1edf467ba5e41ecfb3f04a6fdd512586f86a4889b71f
-DIST magic_enum-0.8.2.tar.gz 171915 BLAKE2B e8915aa7cafa9407d5d4ab3b6837fafde6b1cb75877c8b56f82568e6291ca317720950947b2dfc7e12ca459279ba4e809a8c5782fc04adc2d7636eddcb80122d SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
+AUX magic_enum-0.9.6-werror.patch 822 BLAKE2B 9f642d414db9369fb9562e6ebd5b35427f9042b6fc87f79998889aca9a16d2df49fe38916f8428240bd9d9a246fd74e15649b59e8e4a62bbdbf2586ac620200c SHA512 9907638ac8200b5e5b7d0e8852d64d870b553053c145c7440cb63edaf1038c9946d0480fcab1dee87a106e16d179d48dd90a62a54ec1c651668cc0df0b2dedde
 DIST magic_enum-0.9.5.tar.gz 198269 BLAKE2B c3c6bbf6c5d366813dac7df5fbfc48f414cf4235d842ef3a5a2fd8f2c2857e55243b7fbf7000d598e778fc8d2d54c7d6e34f8a97fa2eaf510572bf53f17500a6 SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3
-EBUILD magic_enum-0.8.2.ebuild 686 BLAKE2B d0bb6977096b53596464f585437d53a4a03518264cc100b58e49f033e69189a3a9617e5b8f84a6d78f1d9c37af23156cdbd0b4b2d53753043b75987b61f208d9 SHA512 e09532008abdb985e2bf19a57724d80e417d3384df26a283d35f1d05459d4b906e78e59ea66480827ea4529edfc7f06355441e77ca5d61aaf404d0dac2dcf063
+DIST magic_enum-0.9.6.tar.gz 199883 BLAKE2B 32909c5ea0cff32b14fb4fd5507f1f99cd45f572d56fd14f76aea3ca3c1fa16d08573568a7c7f9a3efbc9396450b2e897aa64de414b34a4c19b6c49f63aed506 SHA512 6154c816446e115f3b164df79ab8d8088eb76b632ee3fdc82ea17cc7ae8d04652c83e5cc587c2c4b334889904b101ba08a04c5837103af260768e93df17cc263
 EBUILD magic_enum-0.9.5.ebuild 733 BLAKE2B 61d90178a7204a5a73ac31c96e757c7c01dc4a4a02e6454fa5a506e2a115da70b96c80a5d5ce0b2f8e94d57de24ae342440469507397174c8e7b5e515aa7c4e8 SHA512 ef82538caabd71017c0e34b49fd84f2e3ef938783e3f6d131bd10e295fcece01afb2ee0d6252a1ed32ab79a2ad10706b6ea39755a2b288ddbc0f395ce959a06d
+EBUILD magic_enum-0.9.6.ebuild 732 BLAKE2B 86388f177402cacf4504900b80a77be48396fbb725e4786a2ea3758ae278cae467b9e3068e6e8583bde9c926aa4da9b7585dc16dc47dd3b8d4afe5f0fcca3d2f SHA512 bad4873ec408f2d04ad13ed28204029eb8ac22ee47b4fc173849f49a7eab9172193f47ce7cd8937fff495ec06c5508e63131a9904e00d3479b236c12ae3c05d5
 MISC metadata.xml 337 BLAKE2B eabb1d9eee57714c609421664a9c4c20ad428bb04293b73b229ad35fd9f49bf0ecd6b8b3b1ff7499ca8a9ac47a34e413ae641fc0d0fb519e0f0362ce06b101fa SHA512 0b40ac7094d30a55aaee08f37268eae8b793768aa2f0d5eba53ef0dc1f3f763f3066cd0a2cfb46bb3002fcebde6e631ccb4cf3a8da2db2742ccd2cf536e67012
diff --git a/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
new file mode 100644
index 000000000000..581df69ff82b
--- /dev/null
+++ b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
@@ -0,0 +1,22 @@
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -12,7 +12,7 @@
+     check_cxx_compiler_flag(/std:c++latest HAS_CPPLATEST_FLAG)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+     set(CMAKE_VERBOSE_MAKEFILE ON)
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
++    set(OPTIONS -Wall -Wextra)
+ 
+     check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
+     check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
++    set(OPTIONS -Wall -Wextra)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+     set(OPTIONS /W4 /WX)
+     if(HAS_PERMISSIVE_FLAG)
diff --git a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
index 4b3b1362dd0a..5a4a0dda0b76 100644
--- a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,10 +13,13 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
-# Tests fail to compile
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-werror.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
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/msgpack-cxx/Manifest b/dev-cpp/msgpack-cxx/Manifest
index d004e768d44f..94213dbebff2 100644
--- a/dev-cpp/msgpack-cxx/Manifest
+++ b/dev-cpp/msgpack-cxx/Manifest
@@ -2,7 +2,9 @@ AUX msgpack-cxx-6.0.0-gcc13.patch 1516 BLAKE2B b6da40e88b4e90cba6cdff1c68d8cb6ca
 DIST msgpack-cxx-5.0.0.tar.gz 476103 BLAKE2B e631a47e8d39b6ad9c2dd5e782fbbd5044c177e18c619fb52d1293e2c5f2ea7e766e7b26ce6cac36a2ff98217143e12456e0541992afb4f78597ffd3852f2acf SHA512 5ee0237eb1bf05bd4becad32ab145a8f0654f8f0e2e3452331ed3df088cda03ee4cdf1557ba867447e3e18baed924c105c76934f7009dac98b6dc69282c39d0c
 DIST msgpack-cxx-6.0.0.tar.gz 476132 BLAKE2B 89b6505511bd8f6994a2e61661c7a33bd1aa68804c081ec2fcaf074f845caf4338ac362916af9fb0bab7285b0d0508c74b229316fa75ef8083546ac84c4ca95d SHA512 90f89216676af5a656d570fbff5a716d1177fa1941b0a928b2da20e0b6cd6d0ca880b7369e085dbbca944499c05694a73df919042d8cd78498ed4b34b77a0e9d
 DIST msgpack-cxx-6.1.0.tar.gz 478452 BLAKE2B 14c6e28ab02957e6313a01002d05c23e2599f433656c8ea8033eb338c6e8b97d10e00a91e1e67bc3b944c3f9b46ad1ea11fc6905d50554699caeed7bd9cbc8f7 SHA512 935453432b53d2cbecc3e34d4fb17ecd3bbc6eae9087fa3c4445c90750f144ab39ad6461cc9552eec7ed2b222315c5f6e8b30d409eb34a98bebe02e03582fd41
+DIST msgpack-cxx-6.1.1.tar.gz 476459 BLAKE2B 6ec940af9b9e02d892c5f118791015baa6b12baa60c77aaf2ff867e8836f21b4f16c436ce448cdfeb7dc8f8a9356a75f3ac829eba9059ca5d78f42a4393700ff SHA512 6a3df977e7a9c8b50feb7c88cff7a78814d1d41d2f7a657dd37d6cfcfe24f44746f40a6dd46bd5dba7ea59d94b9e40c2baa62c08d9b02168ac93c58cbff3becc
 EBUILD msgpack-cxx-5.0.0.ebuild 1220 BLAKE2B b47929048aa23107e658adf336aba13ea7e7600265c21444571d16cf077dc00cd55abf2242a82bb1b7af1bb954db491bf69099b6cd6c4bc0fcec303292970377 SHA512 7f1ad94c478a5ae8a1877709b92ac0e70e77e075ee9e9f5eb3703695de04fb0ed599dd49e89730c419c308732fc8b55fc24d4846c247bd913a1be39ef1eb8c24
 EBUILD msgpack-cxx-6.0.0.ebuild 1277 BLAKE2B dbf52d685dc88f2dc2a9b0994160e8515299a6c3606328b3373571b458a7d3a939fea0c66e7da0378be49bdce228966f7cfdffc244ef4868728ba19a2698df40 SHA512 b9d2ce05fb8f81619f9e63ba8fe317d7a78bdbc07a44bf8f2e7543e704177a007cfa91c5cbc864011f8387b91db2ce2e9e0b5c8962d5d56951a9c6b779683672
 EBUILD msgpack-cxx-6.1.0.ebuild 1220 BLAKE2B b47929048aa23107e658adf336aba13ea7e7600265c21444571d16cf077dc00cd55abf2242a82bb1b7af1bb954db491bf69099b6cd6c4bc0fcec303292970377 SHA512 7f1ad94c478a5ae8a1877709b92ac0e70e77e075ee9e9f5eb3703695de04fb0ed599dd49e89730c419c308732fc8b55fc24d4846c247bd913a1be39ef1eb8c24
+EBUILD msgpack-cxx-6.1.1.ebuild 1223 BLAKE2B ecf06a7b34fb0c6758a932c39ac1f18e15d157fbc408dfe18c03f8e1e6c9bff02ee719e3d4ce7e68b676904d04edb8c127eefebff5b2a33ad32a9acb19d9c4f1 SHA512 229c5cc8f2055ec4fee5dfd9948764010c40d73e4ac8a4442df16e4b5fa98ef23d663f807be3102ae336d76322e599545c8b6116cc8e41ee310bc178a1374bdf
 MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
new file mode 100644
index 000000000000..62978b6f9fb4
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="MessagePack for C++"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+boost doc examples test"
+
+REQUIRED_USE="test? ( boost )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="boost? ( dev-libs/boost[context] )
+	!<dev-libs/msgpack-5.0.0"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/doxygen[dot] )
+	test? ( sys-libs/zlib )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		-DMSGPACK_CXX17=ON
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		-DMSGPACK_USE_BOOST="$(usex boost)"
+		-DMSGPACK_USE_X3_PARSE="$(usex boost)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_build doxygen
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc_cpp/html/. )
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index bb43c731f971..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 985 BLAKE2B f0f0ca429e1814d397447e0d178eda9882a19ae13c34fa84d725cff1036334a359ebffb16b036c9d211fef9dfb7ae0a0826a6d5499fc020ac13d147c4b98beec SHA512 21ac8cd7dfc9e686cade3763628a13605434560a8d37f7c9384a5567c8c938895dfa7809f811087d19317f5b5a74d6461a2a28fcb30fa1c2f66cc7b801e8d1f7
-EBUILD pangomm-2.50.1.ebuild 997 BLAKE2B 7ff0310a68d759cdd43080777dc8f838ae48a5efecdd8544947bae4839e363c9eabc2791ff29ad29afc4b3b308a39d9f07f96966f4e6b4bfc7f6492dd3988486 SHA512 51f5a78c30a6c080b6fcb7f3997533699d888b58b259873f549ebf4bb92bc2bab92c432449da84080a546a78015762515d223d664c63ec5557cfc1f6e239d407
+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 8b815a510093..51a136f8f0fa 100644
--- a/dev-cpp/pangomm/pangomm-2.46.3.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for pango"
@@ -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 c1015ac58a90..2488c89768ce 100644
--- a/dev-cpp/pangomm/pangomm-2.50.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for pango"
@@ -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 bf74b5342b03..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 826 BLAKE2B 309447cc55a501661cb9bfa636bc54f7ba6c2ee2aec545b5a1a38fbbeaf7180fdda0c768ff941844a1cb83ce9b5d89520a0a143e5e0f87b86f57ca8aea82bd2f SHA512 7e2fe05bc17e6b40fffe6b75849953ca8dd6970adb38d5e5fa38bd03f9aea38df14ddb675dee70b8930cca4a9ec3c01c2bdf4ed36f4db2c4d5e4152e13ed09f4
+MISC metadata.xml 748 BLAKE2B 775f8524975b71263a032d1d7511c3406adb930428ba5f955489e8a5a70a023a96fd83a4a4eb53a528c5ffb749133420dc0a5d06a1b389ed09288ad17ee8bfbf SHA512 02958fbce2234ae1a99d9fe2a5dcd8a096c4d49ca7a403d95029f99cd4c21cdcb0cbe79af376cb02cb645c557114f79ecd9d04707ed77aece039d05a66712fc5
diff --git a/dev-cpp/prometheus-cpp/metadata.xml b/dev-cpp/prometheus-cpp/metadata.xml
index b25065cee303..af77f88bef95 100644
--- a/dev-cpp/prometheus-cpp/metadata.xml
+++ b/dev-cpp/prometheus-cpp/metadata.xml
@@ -8,10 +8,7 @@
 		be collected by Prometheus, but other push/pull collections can be added
 		as plugins.
 	</longdescription>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/jupp0r/prometheus-cpp/issues</bugs-to>
 		<doc lang="en">https://jupp0r.github.io/prometheus-cpp/</doc>
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 eaa907a4ca00..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 1222 BLAKE2B 51aadc96e32717ac9c1c6b7dcc61048e89e46f90b52d875809d21bd1f8093a0038b35691b6514c8160a780aecae9ba19febc59712152b79893d459b44baa7890 SHA512 4a4b0cdf1d202e40cc083067f8a6dc2df73ac61d8019a9f511d2c9986e661ebb80547cff2c49ad6643cfc58e0bfea320185cd0691f3878abef459473db669e77
+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 1109148151c2..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 ce0401ad1d96..51214dba0a03 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,3 +1,3 @@
-DIST rapidfuzz-cpp-3.0.4.gh.tar.gz 301889 BLAKE2B eb4b27a0a6b4e5268036bb0fd79e57136685daf307d808de27515279bed63e1b934f504e9f7c22a20fbb028d322df824fce33398685708a2db3d11de93bd77d3 SHA512 c9cc50f7d68756d81a5d2c5efdd76e859fe5a199bf5e45179effcd85e32f0bb98b593b93c2aa57950a04c3d827af98efb13096b9669329881d658ababc059fd5
-EBUILD rapidfuzz-cpp-3.0.4.ebuild 637 BLAKE2B 7eb8542f2b107e874541d757bf52d492c4ede70ac87f8db938dd30de5b72c02c8fc58dcdc9aa4fa306dea4b7a32608bd922212c087962151287ffa760f24a729 SHA512 8942fbf48246ea0a131f7b27a27e0c43d80b99791c4e7b20b18133957b8f833462d4d9730c0036525aa1c09031a56d60e97554642bbe1a22b1e9337a863ecc37
+DIST rapidfuzz-cpp-3.0.5.gh.tar.gz 309782 BLAKE2B fd7547e5c40696c217c8ea2aa98fb83b98606cde7439a5d51c80b4de30002896d9e95365d3c6ac56c32d8a8432c94ce2050b856a7e850a3f37035c5d0ece795f SHA512 4e0a7e28a54612fb11eb331449aa4fdfde1fbd2bf59b295f9eb68903cd647a639fa04d71aa7a8c88ddb7be6646cd3d0f1f5400eb53644b0ae96590037e74f771
+EBUILD rapidfuzz-cpp-3.0.5.ebuild 631 BLAKE2B d13241e64eadc1fe3230266944b12050f647f2e00a77656434c1b3790ace3f4648b6a9e53655562beb102685650cb874214bae9d073b537d8c97c7fdfe6caaee SHA512 b481d2c6533dac5f3e824a2a5ff1ea53b3cefdb9f498f72ab0a034c594a2f67bf28fa9d395f3dad58272317df5f6605c46479c773d00af0dabda84edbf2b0e1c
 MISC metadata.xml 336 BLAKE2B e425e950b6a0524afb6b996f846fdda73310168d6415a67570ac01a75a2c9335b4f5785bda271a2cf88bf5d7e3708582d958d1fa658d12f36fc5455df9763573 SHA512 868c16a2c2b178fa38e65568aeacf5b96a8d4ebf4521094a0da106194de0acefd017d5f7c827d89a9711c6b80d5603a01d9e15ba9b167c55954f3d653ccc6ed5
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.4.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.4.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/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 9ed130eabbfe..1de17b9ae016 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -1,15 +1,12 @@
-AUX rapidyaml-0.3.0-libdir.patch 450 BLAKE2B 3058bfbeaa85a81396baf3048d32e7289b4e95c84fb623c4354122689c728fc3fa4e5930262e9058a2f1fbcf73384e1c0dda6cd5d8c701dc1c3091b972dc223f SHA512 2be0a933d8ceaff2f35febdf9098e0e93f40dfea30ccb27b5eb314a2e35f1c58e3b1fb21d2b54dc4cd1df7c5392c82ed739aeb2ab6da5e9d0d70bba1a29a61bf
-AUX rapidyaml-0.3.0-system-gtest.patch 287 BLAKE2B 00569e1a19fb791bc0ba1c7a8b2b691db478f7e224a842e33c57d0f11d59275fac137e4a193261db7763e5d9a95b98cf17c2ae467bed29617a1f0c5b4544b607 SHA512 119827a88ccd82e8a78fb82593431f8fbb0efc3155043b9587d5909a7d0a944d01703d8f0a9179e6127c5484a292a94c761ca7f22069aa02f03c2a03ba730b8e
 AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
-AUX rapidyaml-0.4.0-no-download.patch 821 BLAKE2B 9b4122343ce2afdaffeffe7eaf9193395db2d7fc924e44cd75f735e697276501102d058ba95ced225993f0423b0bdef778c3fdfd95b59dcdcd718d96e6e2a4ae SHA512 4dd4c91704308d931a61f3841297d1f95986fc7bc9ab03d0c44583f061762b0af1240e6f6ad8784de2185c45fe09fb87bcc34f07bed655f13c80395ff6eaf121
 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 rapidyaml-0.5.0-src.tgz 7273101 BLAKE2B b15033ae028c4704178dc4a017b5c1e858288d4713a2b96f5cfc19583e13b62031327f10ab045eec007e427eb7d71ba0e7dde2d743a81c3da0e20bc68aea47f5 SHA512 d7d65e759c466aa4cceed4d02d2c84284b205812be1de10495eef663a0b7d4adb7d8fe5f731f0f9ecba04d5d93cb1af760a83eb6d0630d25ee162f0c36b38e8a
+DIST c4log-f4cf64caedd622a739aaa3ecb67a5aac105c2919.tar.gz 12076 BLAKE2B a5d09011d65aabad37f6821430a48e2ab0808863c34c750c7685f3de4b112251a6c7679b5d8962e83f3fe0847cbc9d80b791ec58907a4ee613dda950c947b553 SHA512 097c4566ad4f2906299e544ee067b01369433b654590cf4cf87cb56017caa5757ba037fef5ed1fd00c143a59e8d66013b07a28ad014903d761919a5ddda7c9d1
 DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde
-DIST rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz 22615 BLAKE2B b774723d35658ffb56b187428089bdf2b5bebd470d0be3122bd1f99248d2537d4b31649c5e8b133b2cb28e8ec97a428a325701830708238878da07426fe7853b SHA512 d18be64060779af1b19ccafbbf26bc6c437ff5ed074bef5919ebef55bb9ad36a7abb183a99a86bada0447b15b8386c991ac9ab975d63aab77c3a57801358bf96
-DIST rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz 11978 BLAKE2B 554240c63114f1c0bd22295a39b683a59981f3e80352dce7aebe3af39dd6d1211c2c8df9f84f3f8c30775622e242a95c3a50572b30b557c269d3d9eb2ecca3de SHA512 9399e55e116b87b4ee4583e32c7a72bc3f7fd579fda69c515a5d0df5fc065246aaa1587ed937e7c6eb6df417810284496bb2eafa0879800cecbe17ecdbef5ae9
+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.5.0.ebuild 2237 BLAKE2B d61cd8f20e501ac14b1ebde2ee0cc4993eb104d7ff7477ab62eaec2e3abe99d27acd88bfc7343fd048c2a4e0d44e380be0bfe506d78234e45031fe336719ac1e SHA512 f8b4225ce34c2f023a69e411942b565903f858b71ea4e2b08c369fa7a6727f27593a5d72ea1f5ba63cfff0b19f27817bcf5463d424708c8b78310c330af96963
-EBUILD rapidyaml-0.6.0.ebuild 2256 BLAKE2B 4d61df1378582e24b914adf39704730bc0c5d7537b867cdce7a1b33210555e6075c1ffadf4f3035f4173be5b44cb30cec11dff2046f008f74c2c74965dc5cd59 SHA512 df04fcdd1251f10afe58d0034921eb03bed28cc956762aa20fb596e670082882bdd40bed4558a964b3269ddbbf551e418749c3b43db986ec91ba9dffa8aab197
+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/files/rapidyaml-0.3.0-libdir.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
deleted file mode 100644
index a10fbc49585e..000000000000
--- a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/ext/c4core/cmake/c4Project.cmake
-+++ b/ext/c4core/cmake/c4Project.cmake
-@@ -2643,4 +2643,4 @@
-     set(_RUNTIME_INSTALL_DIR   bin/)
--    set(_ARCHIVE_INSTALL_DIR   lib/)
--    set(_LIBRARY_INSTALL_DIR   lib/) # TODO on Windows, ARCHIVE and LIBRARY dirs must be different to prevent name clashes
-+    set(_ARCHIVE_INSTALL_DIR   lib/ CACHE STRING "")
-+    set(_LIBRARY_INSTALL_DIR   lib/ CACHE STRING "")
-     set(_INCLUDE_INSTALL_DIR   include/)
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
deleted file mode 100644
index 0e404f09d781..000000000000
--- a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/ext/c4core/cmake/c4Project.cmake
-+++ b/ext/c4core/cmake/c4Project.cmake
-@@ -2762,2 +2762,5 @@
-         if(NOT TARGET gtest)
-+            find_package(GTest REQUIRED)
-+        endif()
-+        if(FALSE)
-             c4_import_remote_proj(gtest ${CMAKE_CURRENT_BINARY_DIR}/ext/gtest
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
deleted file mode 100644
index 51fb56e7ed6f..000000000000
--- a/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/ext/testbm.cmake
-+++ b/ext/testbm.cmake
-@@ -1,4 +1,2 @@
- # these are used both for testing and benchmarking
--c4_require_subproject(c4fs REMOTE
--    GIT_REPOSITORY https://github.com/biojppm/c4fs
--    GIT_TAG master)
-+c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs)
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -155,10 +155,6 @@
- 
--    c4_require_subproject(c4log REMOTE
--        GIT_REPOSITORY https://github.com/biojppm/c4log
--        GIT_TAG master)
-+    c4_require_subproject(c4log SUBDIRECTORY ../ext/c4log)
- 
-     set(tsdir ${ed}/yaml-test-suite)
--    c4_download_remote_proj(yaml-test-suite suite_dir
--        GIT_REPOSITORY https://github.com/yaml/yaml-test-suite
--        GIT_TAG data-2022-01-17)
-+    set(suite_dir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite)
-     if(NOT EXISTS ${suite_dir}/229Q)
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild
index c552128f0d52..b96202b0016e 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild
@@ -27,7 +27,7 @@ S=${WORKDIR}/${P}-src
 
 LICENSE="MIT Boost-1.0 BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
index 0bc722c427eb..107332c03e0e 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 # see no-download.patch, match with release date if "master"
-HASH_C4FS=0130061b804ae2af0d6cd5919275d552eb1f2414
-HASH_C4LOG=00066ad7f624556f066f3d60766a2c33aeb3c6f0
+HASH_C4FS=59cfbae26b821f4d4c50ff0775219cb739fa7f46
+HASH_C4LOG=f4cf64caedd622a739aaa3ecb67a5aac105c2919
 HASH_YAMLTS=6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f
 
 DESCRIPTION="Library to parse and emit YAML, and do it fast"
@@ -16,26 +16,34 @@ 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
-			-> ${PN}-c4fs-${HASH_C4FS}.tar.gz
+			-> c4fs-${HASH_C4FS}.tar.gz
 		https://github.com/biojppm/c4log/archive/${HASH_C4LOG}.tar.gz
-			-> ${PN}-c4log-${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"
+	)
+"
+S=${WORKDIR}/${P}-src
 
 LICENSE="MIT Boost-1.0 BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
+# 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.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-0.3.0-system-gtest.patch
-	"${FILESDIR}"/${PN}-0.4.0-no-download.patch
+	"${FILESDIR}"/${PN}-0.6.0-no-download.patch
 )
 
 DOCS=( README.md ROADMAP.md changelog )
@@ -57,20 +65,27 @@ src_prepare() {
 	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 # don't call git for nothing
+		-DGIT=false
 		-DRYML_BUILD_TESTS=$(usex test)
 		-DRYML_DBG=$(usex debug)
-		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
+		-DRYML_TEST_FUZZ=no
 
-		# TODO: enable this+tests, should(?) be easier to do with >=0.5.0 but
-		# still need looking into (please fill a bug if need this right away)
+		# 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 >=gtest-1.13 wants >=c++14 (bug #893272)
+		# 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
 	)
 
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index cb9a16c43216..063574d53b8d 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +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 641 BLAKE2B bf1089925ec0abb4af3e668b725878d87a58a20c6386fbb64a0fe816b02306704772e55011fc25d31450127ac1bbde59f6a4b117baad5e2d553b144d5831b372 SHA512 cd30c21690049dcd2e21a8ce381fb07bea6df84035ac7b387eb49892a8a84c9996cbd204c09a8d9d143247cbff802845001f15d8edca9944fe8ff86ad74d5624
 MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154
diff --git a/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch b/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch
new file mode 100644
index 000000000000..e5f10b7a0126
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/src/include/robin_hood.h b/src/include/robin_hood.h
+index b4e0fbc..b83eaef 100644
+--- a/src/include/robin_hood.h
++++ b/src/include/robin_hood.h
+@@ -39,6 +39,7 @@
+ #define ROBIN_HOOD_VERSION_PATCH 5  // for backwards-compatible bug fixes
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+ #include <functional>
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-r2.ebuild
index 6eadea18b048..a6b31ac34f70 100644
--- 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-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,8 @@ HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}/${PN}-include-cstdint.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DRH_STANDALONE_PROJECT=OFF
diff --git a/dev-cpp/robin-map/Manifest b/dev-cpp/robin-map/Manifest
index 58a0d671a2c6..4b15da010cfd 100644
--- a/dev-cpp/robin-map/Manifest
+++ b/dev-cpp/robin-map/Manifest
@@ -1,4 +1,6 @@
 DIST robin-map-0.6.3.tar.gz 64506 BLAKE2B 46a2b5b47346016695db0c49f73cfbf8530b7db0a31527030eb00f3b6f0695325ab6fe16de1e60d6b1d0793818bdd1e31e50117f2e2e4c50154f65b38ac66d84 SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b
+DIST robin-map-1.3.0.tar.gz 70562 BLAKE2B be6ee47ea06edd2485c16e02eecf8db28c7d18c2eb933450df54e0bab8c7ded79954a295a65a8990b641896186efef391a9f9f0f5b236ba96154bfa6cac45e14 SHA512 862cb98d771d1acb692e27d1cc8a4f2cda0883b66af7b38b63ea702ed2d4fc4d49e5700ca4d5f5148fee132f36e111c4839d4f8c52c96a9c60f3937d941b2320
 EBUILD robin-map-0.6.3.ebuild 509 BLAKE2B 5dadc9271c94156fc401511e0e52d791d6e52ac463ebf8b7b6e3141e2ea09dd8379b36bcca378b899e353b48a8a6234fbe67176cc1f6ddc162dc37b73f0dbc30 SHA512 9a4a9ec944384b25dec8ad9c086b80939a18ca79bb7b7a8cfa2bfa6d9718f5b5460124ce86bcab59c753203f52cd57d9c95ce149f095a3b77f4cb9e438fe402a
-EBUILD robin-map-9999.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a
+EBUILD robin-map-1.3.0.ebuild 790 BLAKE2B 82ff36c09525d7b0683161c02803a8a523652dc6a7a1d120a628828d094b02c9c69271fa114efba2063787285950328472ca182e18809ea87e2d337c10c7e3f5 SHA512 de2a6c084e908e38f300076740133191fe0cf1db1b358777607beb732c943264ff2a3c399430c69373eb70ac97ad54176ae9bd954604d407ebb1b636dc014e46
+EBUILD robin-map-9999.ebuild 792 BLAKE2B 9ee7616fe76d34570d1bdaf02d23b7e3b9ec292e5b72268582236b66500baf859ac8e6d4f70a859dfbbdb28be53eabd94e6904372a70b462b15c17dd8dd00ec8 SHA512 e68b25b99abb5f98e4eddc791e1f6d21f5e66e733e25bf72968f36b472ab6446a526a79c4f702c2d7b1ee08184f6faaed7213432a2a8683d300147fed507eefb
 MISC metadata.xml 345 BLAKE2B 5cc37d0c8e9121615d9a64f9c0a2d401f10a37e82a17627c2b0284b7ec557d689b6f37475cc7f948a06e56cb94c96faa8d50082298ffc06dd2109b0519d3473f SHA512 e7aa93500c38f156256e9f3e2b62a1c98c0016fc70b930f69287737438931ef8cf09a92e5f828d5ae2fd140c94af50e3aa0345b2f0d9499764f0f6f37438ebcf
diff --git a/dev-cpp/robin-map/robin-map-1.3.0.ebuild b/dev-cpp/robin-map/robin-map-1.3.0.ebuild
new file mode 100644
index 000000000000..df97543a2226
--- /dev/null
+++ b/dev-cpp/robin-map/robin-map-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ fast hash map and hash set using robin hood hashing"
+HOMEPAGE="https://github.com/Tessil/robin-map"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
+else
+	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-libs/boost )
+"
+
+src_test() {
+	cd tests || die
+	sed -i \
+		-e '/Boost_USE_STATIC_LIBS/d' \
+		-e 's/-Werror//' \
+		CMakeLists.txt || die
+	cmake -S "${S}/tests" -B . -GNinja || die
+	eninja
+	./tsl_robin_map_tests || die
+}
diff --git a/dev-cpp/robin-map/robin-map-9999.ebuild b/dev-cpp/robin-map/robin-map-9999.ebuild
index 99255a6ea187..5ebd0b902e42 100644
--- a/dev-cpp/robin-map/robin-map-9999.ebuild
+++ b/dev-cpp/robin-map/robin-map-9999.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -13,8 +13,25 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-libs/boost )
+"
+
+src_test() {
+	cd tests || die
+	sed -i \
+		-e '/Boost_USE_STATIC_LIBS/d' \
+		-e 's/-Werror//' \
+		CMakeLists.txt || die
+	cmake -S "${S}/tests" -B . -GNinja || die
+	eninja
+	./tsl_robin_map_tests || die
+}
diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index 59216791adbe..b02b3d8f07bb 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -3,6 +3,8 @@ AUX sol2-3.3.0-catch-depend.patch 376 BLAKE2B 7db0a0697e42a6045319636157f31ecf47
 AUX sol2-3.3.0-cmake-dir.patch 1065 BLAKE2B 906ea8df35dfb8908bf114ac9fc6fbcfae9de6e3168a3d8eff437248ed071cb58a4d6c6a28430a5d4a9e4cf01080a13a62c30f37120339eabf0da2d58aabc9a2 SHA512 10a850a5376838217686ce748d6d99b85d1859c0d8a8bb7fc0d24f5158c3456d8774ad739eb881d58e7396199df8873877e4bc9a1143b3a4b9c568906b86c293
 AUX sol2-3.3.0-dont-install-tests.patch 289 BLAKE2B fc82c80a6b5fcc651b43308d1604414249ee462c406554b9b61aece253983c76cce1ee691d404e6486bbd566e521953ce076206053e2bf4bee9ee7f2944434d2 SHA512 bd43744581315bab42b603a3b1e163a86f36936bc444eb1c67504a710323978b53d00bb5b9fb8865e4d5831c80f713a52cc4bd4e02c2dd054840dd47153461c6
 AUX sol2-3.3.0-werror.patch 854 BLAKE2B 4ba8febe3e225a904501a61d0bf7bb5a8539b1c8dca65e67ce5b335116851549ab31321126eecc3b8b9c9439491fd8c097430b15fce17c42a8ddc73f50a4fd0d SHA512 00b267ab451cfa9210db5a3ce5de67b33c58438a46be8178cce4dcf1ffd31ca2e5bde0015ccb72e2e641b7a0a59996d88154acc765b6eb3891bb092bec0bf46b
+AUX sol2-3.3.1-fix-emplace.patch 660 BLAKE2B b36439910c10c2bb3c86d5911c3aaf20906e411d7fddc40ad2c201c685cf8feea4c49e4e5835396c4d6d1447ea672b55e2f55e7291e74d0eb7f4add9bab7e91f SHA512 3563d2d272bb5d281c4d9875b5ec0cc94548adc0b3ca58f648a20e26e0d180fbb0b35e21d3b6a0ca51808b4744aff4796ef599c6cd17bcc44697e20ff951fb61
 DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd
+EBUILD sol2-3.3.1-r1.ebuild 1404 BLAKE2B f4b7ca3ba02f29728b5ecf0ddcaec5722d07a185ce780812456b3ba0a9a69ed92062622ddf9245ff2b8f834a9f5a2597f89fd6d24bcdc342ecd3ee9b5d77c39f SHA512 69792db4cce41f83202a82dfe1b938ae6fcc5d82a2c42a6dcab9488396c03b3f7aa46f0b641541ed0eeefcda069922b146575165d411f53e2a1366058d6ddb6f
 EBUILD sol2-3.3.1.ebuild 1360 BLAKE2B a0a619ce293f9c658142ba6cac3a28da9359ca658391be51ac7049a8e65e81a2a805654426601bc9503c389efa2e00a11163e66a382d8bb9017baf6ecdef332d SHA512 de9b08a6c6c557f2acc702b3aea402a9c094f441e79ffa8f13a1f05cfbb844c3420b901e17a98d23480047956d65d7435fd7548fa765736138a61510bbb7ee3c
 MISC metadata.xml 594 BLAKE2B 911a1123a653118d9c19c3ff1a42a979a696d034500eda29a18c72e6f89bcc2f7c4d28977c76a40f61b79649c3f4aa63439cda96311e2cdd2bc9495ad1a85db1 SHA512 5c8252373ee8bdefe9b2863df048616beec0d00dcf1cd7845302721f78158db48729d9ab412dbcf4bed49130518acd2071ca3e5880488a882117ec5728e26b9a
diff --git a/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch b/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch
new file mode 100644
index 000000000000..5d926a700979
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch
@@ -0,0 +1,18 @@
+https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
+
+From: =?UTF-8?q?=E2=80=9CPaulo?= <paulo@ubook.com>
+Date: Sat, 25 May 2024 01:52:59 -0300
+Subject: [PATCH] fix emplace
+
+--- a/include/sol/optional_implementation.hpp
++++ b/include/sol/optional_implementation.hpp
+@@ -2191,7 +2191,8 @@ namespace sol {
+ 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+ 
+ 			*this = nullopt;
+-			this->construct(std::forward<Args>(args)...);
++			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
++			return **this;
+ 		}
+ 
+ 		/// Swaps this optional with the other.
diff --git a/dev-cpp/sol2/sol2-3.3.1-r1.ebuild b/dev-cpp/sol2/sol2-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..04c86b3588ee
--- /dev/null
+++ b/dev-cpp/sol2/sol2-3.3.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake lua
+
+DESCRIPTION="Header-only C++ <-> Lua API wrapper"
+HOMEPAGE="https://github.com/ThePhD/sol2"
+SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	${LUA_DEPS}
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/sol2-3.3.0-werror.patch
+	"${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch
+	"${FILESDIR}"/sol2-3.3.0-catch-depend.patch
+	"${FILESDIR}"/sol2-3.3.0-cmake-dir.patch
+	"${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch
+	"${FILESDIR}"/sol2-3.3.1-fix-emplace.patch
+)
+
+src_configure() {
+	sol2_configure_wrapper() {
+		local mycmakeargs=(
+			-DSOL2_BUILD_LUA=no
+			-DSOL2_TESTS=$(usex test)
+			-DSOL2_LUA_VERSION="${ELUA}"
+		)
+		cmake_src_configure
+	}
+	lua_foreach_impl sol2_configure_wrapper
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	sol2_test_wrapper() {
+		if [[ ${ELUA} == luajit ]]; then
+			einfo "Skipping test due to https://github.com/ThePhD/sol2/issues/1221"
+		else
+			cmake_src_test
+		fi
+	}
+	lua_foreach_impl sol2_test_wrapper
+}
+
+src_install() {
+	lua_foreach_impl cmake_src_install
+}
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 a56823dd32f8..fce031c56a25 100644
--- a/dev-cpp/taskflow/Manifest
+++ b/dev-cpp/taskflow/Manifest
@@ -4,8 +4,10 @@ AUX taskflow-9999-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a28
 DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
 DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d
 DIST taskflow-3.6.0.tar.gz 66335249 BLAKE2B bcdc6d721e32b7c40f65ed5bd115d2c0083663e8b51c0e4460baa5f62e576382a45e8da735119b577d8a6ae7a64c72431654471a3b8335997fdf4f9191ad64af SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8
-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-9999.ebuild 1018 BLAKE2B 07a6537fa522fdd836f9b31ad5511aa93b1bb1d5631c6f07a9724c37b79e05a5fb42da3ac96ae01de94abf989fa15b8f43537571e4d0e70a8ed545e6e0f52282 SHA512 8b14aba4c334384deafdeb59643a07798f36d5bfa2a762e765c584f6c3ecbea15de16bcf81d46a884a27c240fd2b3915fe507825eed02e14ff785e68924ab243
+DIST taskflow-3.7.0.tar.gz 66383509 BLAKE2B 92a9d56f0101d507b7f924ce9038d6d43a5f39c9270582f910644ad281ea2cee3f8fa39f3ee4e748f90d013d57a3bc2f24842e328ab345bc580d1a9a5de4f308 SHA512 2faecc9eaf9e7f24253a5aedbb4ef6164ba8b5181b7f2c65d8646c21300f28278d7817e928eeab7e85ec2b9644508a8665bab1a7482ec85a7f6de18cecb32d6f
+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
new file mode 100644
index 000000000000..596e01e98f87
--- /dev/null
+++ b/dev-cpp/taskflow/taskflow-3.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://taskflow.github.io"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/taskflow/${PN}.git"
+	inherit git-r3
+	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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/taskflow-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/doctest )"
+
+HTML_DOCS=( docs/. )
+
+PATCHES=(
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: enable CUDA via USE flag
+	local mycmakeargs=(
+		-DTF_BUILD_CUDA=OFF
+		-DTF_BUILD_EXAMPLES=$(usex examples)
+		-DTF_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
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 f41f489c2adf..67f6f46cb2a8 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,29 +1,16 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
 AUX tbb-2020.3-gcc13.patch 1384 BLAKE2B 8d4288d8c4597247930949d053bcbc4f6b91f3693a6b2e54b67b2ca6f0c2d4797428654eca0afa3b09d0cd2eff005d553d637cefa962017b80a7af8e0efde49f SHA512 101781458837345c0efc1c3cd7c8d1d517628df190a73a9b8d9de55cb150807cd8c548bdd33ee11a837b07bb6f3b705f4bc4ef5a57a944fe9baa6c34958b1164
-AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
-AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545
-AUX tbb-2021.5.0-flags-stripping.patch 1078 BLAKE2B 32b5463980ae8841ce551caffb91d5bb20a70af4d93d6c0d9e45bd235f3948599c42fa779eb4c53a6994275d827c0074dab8cb2e66313989a1ffe067e48b12c3 SHA512 22460e212ea506bfd13765eb9557d21cb19d4fd9f42e195ed36f12aabd6e9b4c24a218a5bcb55894f45ce0f118de89287751913d386931bd9cda3a389bc04345
-AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
-AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723
-AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d
-AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d782abd1c21e602a8555a696833c7c919f2e6996f8a2fd1e61fb6d3ccdf00f0ce5ee9b78ad53770a06f632cb6029bb74029 SHA512 de952018c2b82634f02f38754d0cb92d31229b9546a135ac54d43b53ad2d0a74ba3bd02946e856c29455438e539a0cf5bc3fb4eae35aa0774baa1faf723e8b61
+AUX tbb-2021.13.0-test-atomics.patch 1391 BLAKE2B 96d18091c1df00c2ae4dbbc341a727559a3137e940a2c90efb8bd218f63b0376451b58ed1c0f5ef8a3711c48c82d7fff83eb07443a92736a6e50d942d8071f5c SHA512 0d155b182ef85437dfa16021b5cee12fa6534318a4890c08cb107826f0ebb327385dd540a094399ce53e91211fed16983a359eeabb01d04dc7d2445cf49c638e
 AUX tbb-2021.7.0-pthread-eagain.patch 4515 BLAKE2B d5a2d3d5dc0a4607227f03200901985fa823a6be2817c34e58e166e639f1f294a2ab65407140a8b4423e30d217fa3c04a4493dd3e4849d77877473002006870c SHA512 bfbac70acc603796f93c7712017700fa1de99cd1aa984f8015863f66ca6caaa03e5c4705dfc42c1af7592bc5b05b7ba9b48df7e5686d27f4ce67c53b954775cf
 AUX tbb-2021.8.0-gcc-13.patch 735 BLAKE2B d67ab028669cae808058d68c74ec4ef7477641afc025e9c5e3ce59912571330c2e3cc85b7fd25db2a7a084a1f05a82794ccd48c3f5f72a1c0893535de250f038 SHA512 ad9547149a68ab0ab78c28413d85b2496fcaf9d94b0ec48b4d723374092230ab4ed1b6d32cd05a63d8046036ed8f2c68cd91f38585e4dab6839e81383580a8d6
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
-DIST tbb-2021.10.0.tar.gz 2598088 BLAKE2B ba8352474b97c3d98b534cbfd8f61af165352967529f19226dbae17f17d20a8b5dfd7a3b29bab85431620cea1ee1c5990ec7311cc9b1b865d6aa1800540dd6d0 SHA512 d71cf317e7f78948c1ea20977cfcfba1eff72cb20c457c87e624cb3aaa3215a1c24eeeec11ed6ed99cf118c577d956234202458bb5e0215c9c317099d9c3b732
-DIST tbb-2021.11.0.tar.gz 2613493 BLAKE2B 2b56042c8126709b6f36c1118685b28ddf2ff39b6563aae168d6bb8106d234757ff125a39da37f907a7da62f2f2ad64e4db01ca028d20c1e74def4ba2e92c1a6 SHA512 4779141b7602f2fa3a509fdd346824ba270a3a568df3649ce8cb51264d233df5cec5e5cb67b91319dd11d3d5e054697b4ed345e07216107985ddb6e1e7ef94e5
 DIST tbb-2021.12.0.tar.gz 2617255 BLAKE2B 3e1db8b1972a7225c5355def66ae40006e6e0f0f97e2efff45dd361f724e348a2f0476bc14b59f89f5361cac6fa36a4973602467bc7fbb2b8b139a4ff4dd58de SHA512 64022bcb61cf7b2030a1bcc11168445ef9f0d69b70290233a7febb71cc7a12cc2282dddc045f84e30893efe276342f02fd78d176706268eeaefe9aac7446d4e9
-DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
+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.8.0.tar.gz 2575336 BLAKE2B 2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2 SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
 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.10.0.ebuild 1373 BLAKE2B 55884f50fce48432b098ac6ac8b4f1111db584dcb0fd8b97a47c432a031d401a64aa0e47a9e530f51d79fc366a1445d0b489f74b3f7b4a8a45fcaadf3a74c4d7 SHA512 0371109aeeb690b5325abd9a8fb62b6246da916807ba11b3bcd916659f35ccfd95f7f596aaaf7e6f7d588e87a915a06d5a164f0033e547e6fcfccf5b47aedce1
-EBUILD tbb-2021.11.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14
-EBUILD tbb-2021.12.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14
-EBUILD tbb-2021.5.0-r1.ebuild 1618 BLAKE2B f382a29be9b11a662e9f90b501c589da661a90ff0078a2f77a53f56f310748a74905f6ac5ef2ef9eda4b1ab44c02820ff2fbff1868cc6c30ee9e70e42672cbc5 SHA512 198135a64c94e5665cf172dd4c0dc07b9155bf070451c6aaa56ffeaf37c5bd1512bae15591c122f8ef73855c3189b816561ba27bb90831dd33b0e6c583174fdd
-EBUILD tbb-2021.7.0-r1.ebuild 1092 BLAKE2B 449710ffde68b12225ac8bccd749f54abda65e6764339cdc56b855e2fceb084362971302d1f9bbc6c8742cbdccb430d02b9fe0babfa46a3d5f3c246c679efe8d SHA512 a4af6752b60e17c22215f2455643e3ebc3440dadc058196f0482fdde08bbf95184ad1fdf9fb3f6409287d6406c3b4803fd30c0a1b349fffdc9bf10a4db14ed52
-EBUILD tbb-2021.7.0.ebuild 1112 BLAKE2B fd19a921be35faeb73ab5bf64a124e02055da4b52b9fbdc4f23eb1131042260d562016fff0a91e3ef9dc53a864ca5d6ebd33b2b2cc5b677bd600eebf740dd70d SHA512 e9d46e652ca21812fcbfb9e2d37967167c72bb45c5d246c10977fb2b80c129ce24525647abf34a491f797a673e349b600badb6783a327301bede83c0b5173cb0
-EBUILD tbb-2021.8.0.ebuild 1424 BLAKE2B 1600ce57224eaf970b53fbca75fceca6746571765df9c7a652f4e1b463b3f05d2c8dc010020c4d397e9af0398638ed2b07e5fefa72436a21b8ec07623f567ce6 SHA512 71c1c13df0b806bfda979ff617eebe81c62355b8a1f8d9094f3c48f333a7a616bbad80b658788cefe19c46ed205476b597b76e6186eba173533e79234dd68a77
-EBUILD tbb-2021.9.0.ebuild 1368 BLAKE2B 893d9b7b964e0bd1d2715170765c0045ac4d019a69f8a9318c07888545dc9d86276bc77d33470a4c295883d4fbb78fa518e03f56fb67d2578761d57fe75d3af2 SHA512 dc9419acda9ba55cf4f7369d337dfe2aaa3dcff3e640d23175dc2bd38679c1e376f2771e94f8c93210c1c1fc9e123fd3f9e8a0b028799f3fdaa1a42e1be49cdd
+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/files/tbb-2021.13.0-test-atomics.patch b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch
new file mode 100644
index 000000000000..7cc8216153d0
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch
@@ -0,0 +1,38 @@
+From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001
+From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Date: Fri, 9 Dec 2022 12:36:11 +0100
+Subject: [PATCH] Add cmake check for libatomic requirement when building with
+ gcc (#980)
+
+Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+---
+ cmake/compilers/GNU.cmake | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
+index cd76acfe1e..59f4e6934f 100644
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -44,6 +44,22 @@ if (NOT MINGW)
+     set(TBB_COMMON_LINK_LIBS dl)
+ endif()
+ 
++# Check whether code with full atomics can be built without libatomic
++# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
++include(CheckCXXSourceCompiles)
++check_cxx_source_compiles("#include <atomic>
++int main() {
++  std::atomic<uint8_t> w1;
++  std::atomic<uint16_t> w2;
++  std::atomic<uint32_t> w4;
++  std::atomic<uint64_t> w8;
++  return ++w1 + ++w2 + ++w4 + ++w8;
++}" TBB_BUILDS_WITHOUT_LIBATOMIC)
++
++if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC)
++   set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic)
++endif()
++
+ # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
+ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+     tbb_remove_compile_flag(-Werror)
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
deleted file mode 100644
index 1c9705576004..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/608
-
-From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
-From: Ivan Kochin <kochin.ivan@intel.com>
-Date: Wed, 27 Oct 2021 17:23:32 +0300
-Subject: [PATCH] Use native CMake way to detect the IPO support (#608)
-
-* Use native CMake way to detect the IPO support
-
-Signed-off-by: Kochin Ivan <kochin.ivan@intel.com>
----
- CMakeLists.txt               | 17 +++++++++++++++++
- cmake/README.md              |  1 +
- cmake/compilers/Clang.cmake  |  8 ++------
- cmake/compilers/GNU.cmake    |  8 +++-----
- cmake/compilers/MSVC.cmake   |  1 +
- cmake/utils.cmake            | 13 +++++++++++++
- src/tbb/CMakeLists.txt       |  5 ++---
- src/tbbbind/CMakeLists.txt   |  6 +++---
- src/tbbmalloc/CMakeLists.txt |  5 ++---
- 9 files changed, 44 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13b1dbc2c..4dbdadb97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,6 +103,7 @@ option(TBBMALLOC_BUILD "Enable tbbmalloc build" ON)
- option(TBB_CPF "Enable preview features of the library" OFF)
- option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package instead of build from sources" OFF)
- option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" OFF)
-+option(TBB_ENABLE_IPO "Enable Interprocedural Optimization (IPO) during the compilation" ON)
- 
- if (NOT DEFINED BUILD_SHARED_LIBS)
-     set(BUILD_SHARED_LIBS ON)
-@@ -181,6 +182,22 @@ foreach(FILE_WITH_EXTRA_TARGETS ${FILES_WITH_EXTRA_TARGETS})
-     include(${FILE_WITH_EXTRA_TARGETS})
- endforeach()
- 
-+# - Enabling LTO on Android causes the NDK bug.
-+#   NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
-+# - For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
-+if (TBB_ENABLE_IPO AND BUILD_SHARED_LIBS AND NOT ANDROID_PLATFORM AND NOT TBB_SANITIZE MATCHES "thread")
-+    if (NOT CMAKE_VERSION VERSION_LESS 3.9)
-+        cmake_policy(SET CMP0069 NEW)
-+        include(CheckIPOSupported)
-+        check_ipo_supported(RESULT TBB_IPO_PROPERTY)
-+    else()
-+        set(TBB_IPO_FLAGS TRUE)
-+    endif()
-+    if (TBB_IPO_PROPERTY OR TBB_IPO_FLAGS)
-+        message(STATUS "IPO enabled")
-+    endif()
-+endif()
-+
- set(TBB_COMPILER_SETTINGS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers/${CMAKE_CXX_COMPILER_ID}.cmake)
- if (EXISTS ${TBB_COMPILER_SETTINGS_FILE})
-     include(${TBB_COMPILER_SETTINGS_FILE})
-diff --git a/cmake/README.md b/cmake/README.md
-index ec56e423c..ed1631de3 100644
---- a/cmake/README.md
-+++ b/cmake/README.md
-@@ -16,6 +16,7 @@ TBB_CPF:BOOL - Enable preview features of the library (OFF by default)
- TBB_INSTALL_VARS:BOOL - Enable auto-generated vars installation(packages generated by `cpack` and `make install` will also include the vars script)(OFF by default)
- TBB_VALGRIND_MEMCHECK:BOOL - Enable scan for memory leaks using Valgrind (OFF by default)
- TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - Disable HWLOC automatic search by pkg-config tool (OFF by default)
-+TBB_ENABLE_IPO - Enable Interprocedural Optimization (IPO) during the compilation (ON by default)
- ```
- 
- ## Configure, build and test
-diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
-index 183341fcc..69aa51932 100644
---- a/cmake/compilers/Clang.cmake
-+++ b/cmake/compilers/Clang.cmake
-@@ -58,12 +58,8 @@ if (MINGW)
-     list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
- endif()
- 
--# Enabling LTO on Android causes the NDK bug.
--# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
--if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS)
--    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--endif()
-+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
- 
- # TBB malloc settings
- set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
-diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
-index fa14c869e..a9cfa8927 100644
---- a/cmake/compilers/GNU.cmake
-+++ b/cmake/compilers/GNU.cmake
-@@ -63,11 +63,9 @@ if (MINGW)
-     list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
- endif()
- 
--# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
--if (NOT TBB_SANITIZE MATCHES "thread")
--    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--endif()
-+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+
- 
- # TBB malloc settings
- set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
-diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake
-index 3447418cc..5767235a0 100644
---- a/cmake/compilers/MSVC.cmake
-+++ b/cmake/compilers/MSVC.cmake
-@@ -77,6 +77,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
-     endif()
-     set(TBB_OPENMP_NO_LINK_FLAG TRUE)
-     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
- else()
-     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/GL>)
-     set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-LTCG> $<$<NOT:$<CONFIG:Debug>>:-INCREMENTAL:NO>)
-diff --git a/cmake/utils.cmake b/cmake/utils.cmake
-index 06d3a9aee..f74abfcf9 100644
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -44,3 +44,16 @@ macro(tbb_install_target target)
-                 COMPONENT devel)
-     endif()
- endmacro()
-+
-+macro(tbb_handle_ipo target)
-+    if (TBB_IPO_PROPERTY)
-+        set_target_properties(${target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
-+    elseif (TBB_IPO_FLAGS)
-+        target_compile_options(${target} PRIVATE ${TBB_IPO_COMPILE_FLAGS})
-+        if (COMMAND target_link_options)
-+            target_link_options(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
-+        else()
-+            target_link_libraries(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
-+        endif()
-+    endif()
-+endmacro()
-diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt
-index 80fdcdcde..021392d89 100644
---- a/src/tbb/CMakeLists.txt
-+++ b/src/tbb/CMakeLists.txt
-@@ -79,7 +79,6 @@ target_compile_options(tbb
-     ${TBB_WARNING_SUPPRESS}
-     ${TBB_LIB_COMPILE_FLAGS}
-     ${TBB_COMMON_COMPILE_FLAGS}
--    ${TBB_IPO_COMPILE_FLAGS}
- )
- 
- # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
-@@ -89,6 +88,8 @@ set_target_properties(tbb PROPERTIES
-     SOVERSION ${TBB_BINARY_VERSION}
- )
- 
-+tbb_handle_ipo(tbb)
-+
- if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
-     set_target_properties(tbb PROPERTIES
-         LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def
-@@ -103,14 +104,12 @@ if (COMMAND target_link_options)
-         PRIVATE
-         ${TBB_LIB_LINK_FLAGS}
-         ${TBB_COMMON_LINK_FLAGS}
--        ${TBB_IPO_LINK_FLAGS}
-     )
- else()
-     target_link_libraries(tbb
-         PRIVATE
-         ${TBB_LIB_LINK_FLAGS}
-         ${TBB_COMMON_LINK_FLAGS}
--        ${TBB_IPO_LINK_FLAGS}
-     )
- endif()
- 
-diff --git a/src/tbbbind/CMakeLists.txt b/src/tbbbind/CMakeLists.txt
-index 99b7ccaac..3233ec718 100644
---- a/src/tbbbind/CMakeLists.txt
-+++ b/src/tbbbind/CMakeLists.txt
-@@ -46,7 +46,6 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
-         ${TBB_WARNING_LEVEL}
-         ${TBB_LIB_COMPILE_FLAGS}
-         ${TBB_COMMON_COMPILE_FLAGS}
--        ${TBB_IPO_COMPILE_FLAGS}
-     )
- 
-     # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
-@@ -55,6 +54,9 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
-         VERSION ${TBBBIND_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
-         SOVERSION ${TBBBIND_BINARY_VERSION}
-     )
-+
-+    tbb_handle_ipo(${TBBBIND_NAME})
-+
-     if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
-         set_target_properties(${TBBBIND_NAME} PROPERTIES
-             LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def
-@@ -69,14 +71,12 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
-             PRIVATE
-             ${TBB_LIB_LINK_FLAGS}
-             ${TBB_COMMON_LINK_FLAGS}
--            ${TBB_IPO_LINK_FLAGS}
-         )
-     else()
-         target_link_libraries(${TBBBIND_NAME}
-             PRIVATE
-             ${TBB_LIB_LINK_FLAGS}
-             ${TBB_COMMON_LINK_FLAGS}
--            ${TBB_IPO_LINK_FLAGS}
-         )
-     endif()
- 
-diff --git a/src/tbbmalloc/CMakeLists.txt b/src/tbbmalloc/CMakeLists.txt
-index f77bc8f10..5a851851f 100644
---- a/src/tbbmalloc/CMakeLists.txt
-+++ b/src/tbbmalloc/CMakeLists.txt
-@@ -59,7 +59,6 @@ target_compile_options(tbbmalloc
-     ${TBB_LIB_COMPILE_FLAGS}
-     ${TBBMALLOC_LIB_COMPILE_FLAGS}
-     ${TBB_COMMON_COMPILE_FLAGS}
--    ${TBB_IPO_COMPILE_FLAGS}
- )
- 
- enable_language(C)
-@@ -72,6 +71,8 @@ set_target_properties(tbbmalloc PROPERTIES
-     LINKER_LANGUAGE C
- )
- 
-+tbb_handle_ipo(tbbmalloc)
-+
- if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
-     set_target_properties(tbbmalloc PROPERTIES
-         LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def
-@@ -88,14 +89,12 @@ if (COMMAND target_link_options)
-         PRIVATE
-         ${TBB_LIB_LINK_FLAGS}
-         ${TBB_COMMON_LINK_FLAGS}
--        ${TBB_IPO_LINK_FLAGS}
-     )
- else()
-     target_link_libraries(tbbmalloc
-         PRIVATE
-         ${TBB_LIB_LINK_FLAGS}
-         ${TBB_COMMON_LINK_FLAGS}
--        ${TBB_IPO_LINK_FLAGS}
-     )
- endif()
- 
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
deleted file mode 100644
index 091cad5821e7..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/oneapi-src/oneTBB/issues/186
-https://github.com/oneapi-src/oneTBB/pull/550
-https://bugs.gentoo.org/827883
-
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Thu, 7 Oct 2021 14:16:16 +0800
-Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550)
-
-Upstream-Status: Merged in commit later than 2021.5.0
-
---- a/src/tbb/tools_api/ittnotify_config.h
-+++ b/src/tbb/tools_api/ittnotify_config.h
-@@ -147,6 +147,10 @@
- #  define ITT_ARCH_IA32E 2
- #endif /* ITT_ARCH_IA32E */
- 
-+#ifndef ITT_ARCH_IA64
-+#  define ITT_ARCH_IA64 3
-+#endif /* ITT_ARCH_IA64 */
-+
- #ifndef ITT_ARCH_ARM
- #  define ITT_ARCH_ARM  4
- #endif /* ITT_ARCH_ARM */
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
deleted file mode 100644
index 4252ea446423..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/716
-
-From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
-From: Christoph Erhardt <github@sicherha.de>
-Date: Wed, 5 Jan 2022 15:13:32 +0100
-Subject: [PATCH] Fix overeager stripping of compile flag
-
-The existing regex strips all occurrences of the given string from
-`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
-flag. For instance, `-Werror=format-security` gets truncated to
-`=format-security`.
-
-The new regex makes sure that only whole words get replaced.
-
-Signed-off-by: Christoph Erhardt <github@sicherha.de>
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
-     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
-     unset(_tbb_compile_options)
-     if (CMAKE_CXX_FLAGS)
--        string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+        string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-     endif()
- endmacro()
- 
-
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
deleted file mode 100644
index 014a3863f452..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38
-https://bugs.gentoo.org/830698
-
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Dec 2021 08:08:07 -0800
-Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684)
-
-Exclude non-glibc linux systems along with android
-Fixes
-src/tbb/dynamic_link.cpp:417:29: error: use
- of undeclared identifier 'RTLD_DEEPBIND'                                                                                    |             flags = flags | RTLD_DEEPBIND;
-|                             ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/tbb/dynamic_link.cpp
-+++ b/src/tbb/dynamic_link.cpp
-@@ -413,7 +413,7 @@ namespace r1 {
-         int flags = RTLD_NOW;
-         if (local_binding) {
-             flags = flags | RTLD_LOCAL;
--#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
-+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
-             flags = flags | RTLD_DEEPBIND;
- #endif
-         } else {
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
deleted file mode 100644
index e46c16f42f59..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
-https://github.com/oneapi-src/oneTBB/pull/203
-https://bugs.gentoo.org/828704
-
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 7 Apr 2021 11:14:13 +0800
-Subject: [PATCH] mallinfo() is glibc specific API mark it so
-
-Helps compiling with musl
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---- a/src/tbbmalloc_proxy/proxy.cpp
-+++ b/src/tbbmalloc_proxy/proxy.cpp
-@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/
-     return 1;
- }
- 
-+#ifdef __GLIBC__
- struct mallinfo mallinfo() __THROW
- {
-     struct mallinfo m;
-@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
- 
-     return m;
- }
-+#endif
- 
- #if __ANDROID__
- // Android doesn't have malloc_usable_size, provide it to be compatible
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
deleted file mode 100644
index 111bbf123d9a..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/832700
-https://github.com/oneapi-src/oneTBB/commit/6a15b64093c51ddc00bdf4a6b49d4bbec1574a12
-
-From: Rui Ueyama <rui314@gmail.com>
-Date: Fri, 4 Feb 2022 19:32:11 +0900
-Subject: [PATCH] Make tbb compile with musl libc (#748)
-
-TBB resumable tasks are implemented using getcontext() and setcontext()
-on Unix-like systems. These functions are deprecated in the recent
-versions of POSIX and may not exist. musl libc does not provide these
-functions.
-
-There's unfortunately no way to detect musl (musl intentionally do not
-define macros like `__MUSL__`), so __TBB_RESUMABLE_TASKS is defined if
-`__GLIBC__`. glibc-compatible libc's such as uClibc defines `__GLIBC__`,
-so it should work as a catch-all condition.
-
-Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu>
---- a/include/oneapi/tbb/detail/_config.h
-+++ b/include/oneapi/tbb/detail/_config.h
-@@ -268,7 +268,7 @@
-     #define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT
- #endif
- 
--#define __TBB_RESUMABLE_TASKS                           (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__)
-+#define __TBB_RESUMABLE_TASKS                           (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__))
- 
- /* This macro marks incomplete code or comments describing ideas which are considered for the future.
-  * See also for plain comment with TODO and FIXME marks for small improvement opportunities.
-
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
deleted file mode 100644
index 83f119a9acd3..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/609
-https://github.com/oneapi-src/oneTBB/issues/370
-https://bugs.gentoo.org/842762
-
-From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
-From: Ilya Isaev <ilya.isaev@intel.com>
-Date: Fri, 8 Oct 2021 10:18:16 +0300
-Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
-
-Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
---- a/cmake/compilers/Clang.cmake
-+++ b/cmake/compilers/Clang.cmake
-@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
- endif()
- 
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
-     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
- endif()
- 
---- a/cmake/compilers/GNU.cmake
-+++ b/cmake/compilers/GNU.cmake
-@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
- endif()
- 
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
-     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
- endif()
- 
---- a/cmake/compilers/MSVC.cmake
-+++ b/cmake/compilers/MSVC.cmake
-@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
- endif()
- 
- if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
--    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
-         set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
-     endif()
-     set(TBB_OPENMP_NO_LINK_FLAG TRUE)
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.11.0.ebuild b/dev-cpp/tbb/tbb-2021.11.0.ebuild
deleted file mode 100644
index 3ac69c080835..000000000000
--- a/dev-cpp/tbb/tbb-2021.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
-)
-
-src_prepare() {
-	# Has an #error to force compilation as C but links with C++ library, dies
-	# with GLIBCXX_ASSERTIONS as a result.
-	sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild
index 3ac69c080835..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 )"
 
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
 )
 
 src_prepare() {
diff --git a/dev-cpp/tbb/tbb-2021.10.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
index 3d0e05e45514..c4ce0e2090fb 100644
--- a/dev-cpp/tbb/tbb-2021.10.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 )"
 
@@ -24,12 +24,10 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
 )
 
 src_prepare() {
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
 	# Has an #error to force compilation as C but links with C++ library, dies
 	# with GLIBCXX_ASSERTIONS as a result.
 	sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
@@ -38,6 +36,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
deleted file mode 100644
index adb066b4c2d9..000000000000
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	# should be in.. 2022?
-	"${FILESDIR}"/${PN}-2021.4.0-lto.patch
-	"${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
-	# bug 827883
-	"${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch
-	# need to verify this is in master
-	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
-	# musl again, should be in.. 2022?
-	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
-	# should be in.. 2022?
-	"${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
-
-	"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
-)
-
-src_configure() {
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
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.7.0.ebuild b/dev-cpp/tbb/tbb-2021.7.0.ebuild
deleted file mode 100644
index 972e90e1702f..000000000000
--- a/dev-cpp/tbb/tbb-2021.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# bug #872287
-	filter-flags -D_GLIBCXX_ASSERTIONS
-	append-cppflags -U_GLIBCXX_ASSERTIONS
-
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.8.0.ebuild b/dev-cpp/tbb/tbb-2021.8.0.ebuild
deleted file mode 100644
index 9b77bc83b8e5..000000000000
--- a/dev-cpp/tbb/tbb-2021.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2021.7.0-pthread-eagain.patch
-	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
-)
-
-src_prepare() {
-	# Has an #error to force compilation as C but links with C++ library, dies
-	# with GLIBCXX_ASSERTIONS as a result.
-	sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Workaround for bug #912210
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 2a0013ba8bb3..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 ~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 )"
 
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
 )
 
 src_prepare() {
diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest
new file mode 100644
index 000000000000..3b5277d9cae7
--- /dev/null
+++ b/dev-cpp/toml11/Manifest
@@ -0,0 +1,3 @@
+DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b
+EBUILD toml11-4.2.0.ebuild 542 BLAKE2B b7b00264619b8276f461a8d0f721b60254133978bbdff02e9a0a66ef79c6fe4afd19497cc76d4e1647ed947243e28b772bb699c7786c4ad3770964c2722cecea SHA512 fcac5125de929e6538d95d10ef1b8a56b69acda1f9b9c1117febb548e0c497b6278174da603993aed338203b37de457e86d9b300c8aa8c62c191f0411f9a7e61
+MISC metadata.xml 402 BLAKE2B 3036a6fb020f076c47ad30c901b5f8a5e36af312190df2e8ae84cd374731b9711fb48b3d8f7f3463edd7b50ae99b6e4dc78d4e60dfa3b3ccc56cf4c806082063 SHA512 e438104524445b0a27547730396437403a2885403c5611fad81e438282517195b44f81040540162c7ee0ace9758f99c19feb0772ab2d8ad0cd6f853aaf64e6de
diff --git a/dev-cpp/toml11/metadata.xml b/dev-cpp/toml11/metadata.xml
new file mode 100644
index 000000000000..b6d01e802127
--- /dev/null
+++ b/dev-cpp/toml11/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ToruNiina/toml11</remote-id>
+    <bugs-to>https://github.com/ToruNiina/toml11/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild
new file mode 100644
index 000000000000..29e92d2f1353
--- /dev/null
+++ b/dev-cpp/toml11/toml11-4.2.0.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="TOML for Modern C++"
+HOMEPAGE="https://toruniina.github.io/toml11/
+	https://github.com/ToruNiina/toml11/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ToruNiina/${PN}.git"
+else
+	SRC_URI="https://github.com/ToruNiina/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( README.md README_ja.md )
diff --git a/dev-cpp/tomlplusplus/Manifest b/dev-cpp/tomlplusplus/Manifest
index aafb0cbb1f17..8976ff0c4e28 100644
--- a/dev-cpp/tomlplusplus/Manifest
+++ b/dev-cpp/tomlplusplus/Manifest
@@ -1,3 +1,3 @@
 DIST tomlplusplus-3.4.0.gh.tar.gz 1294731 BLAKE2B 9495ccd78707ced11744eab7c1c0bf0c0c28e283d186195bb48d1059bae7eb1a874bc964b0fc45210fd73ffd7485ecf3e1159da227d0e1c8ff249e79c08eecf0 SHA512 c227fc8147c9459b29ad24002aaf6ab2c42fac22ea04c1c52b283a0172581ccd4527b33c1931e0ef0d1db6b6a53f9e9882c6d4231c7f3494cf070d0220741aa5
-EBUILD tomlplusplus-3.4.0.ebuild 817 BLAKE2B 26456b69f130f519ae0807911a871708e530a27983819bfd4ef2d056d69705a6738ef7103a856d3686d3700f27d700ee27699aa70143dded449722ec783dd924 SHA512 5b3e9740ac298f7625235381b408d6ae44c510373bb51e9c9cd6484660cd9aa5d348a8ac0f717345bd9703943df99bbe34ce33840b2b8afeadb9ca819b29c3fa
+EBUILD tomlplusplus-3.4.0.ebuild 849 BLAKE2B 3225200dbee1846bd5c5495d3e9ac327917805276ffba10119fb9ec708e78d9655570beb9b6242e446988cddb9d66ddb732adc6b597a76eb114c0ffff4b69377 SHA512 f650d5a49c4362377230f688b279fef764ad34f9fb7638dce4b60bca6c4426766535a49aeae4d0de5767bf4c681c29b0d6a9d64cc2539c77f80052dbd05640e0
 MISC metadata.xml 472 BLAKE2B 0b7b57b4dab3fe1f942c50c85a29550ded25998479db8e0b3a4502eca56e572047ede8085242c276fc5cce8e59a8991aa8866f695a761987aee8eb02b4d64783 SHA512 e5ded89974456e4731779fd95a11a380b32dda742e0355296f40b87062cfc960faac563bb4a7cb9f97dac2ad0744193d96383c9b3ea8688776444f9021d93055
diff --git a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
index 9c8941ea61d9..4ac6f2dfc7a2 100644
--- a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
+++ b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
@@ -14,11 +14,13 @@ SRC_URI="https://github.com/marzer/tomlplusplus/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="dev-build/cmake"
+
 src_configure() {
 	local emesonargs=(
 		-Dbuild_lib=true
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 9a91f31e42a9..ba73dc4c6884 100644
--- a/dev-cpp/valijson/Manifest
+++ b/dev-cpp/valijson/Manifest
@@ -1,4 +1,5 @@
-AUX 1.0-fix-macro-typos.patch 2966 BLAKE2B 5f8307c6a71cd4066a6f68af78e3f35294490688c65fdee7dd3a7d0394de0210a13a784255bba761e408870d9d76691bd6f298e9ecb7c0e7f3b816f71a805742 SHA512 6da572cb86237758708d171452eb8ba88e7f2cda1baecfaf8dd2f674b04de0cdd2d57c9041f517ff472714ff2ad66e66aa4e432931f09bfb00349c1c48b8e6da
-DIST valijson-1.0.tar.gz 721078 BLAKE2B 74f4a061266a6ee8fba9d93b4e1df20dc828d85169f865bdb60ba9f5217ee422324a09788b02b4ddd18a92d906c64863a5bd7c1250f8bdb62fd9f00f3d73c7e7 SHA512 a206954b11e92cbebbebf094e6f0925a270ebd6bec49cbdb7adda5a4cec93587a5a61ebbce105846c3950cf5df74bfdd5f5bb1ffbf73315f45c7a6cda2b77db9
-EBUILD valijson-1.0.ebuild 577 BLAKE2B 7773d8d58ee2a589e36bac21710cf611c64dddf0d7a5ad8baae774de35e70662f4ddee675d3649f4fa6d7139901ba9065b6799e20bcf61b241451b04d292c51c SHA512 7bf65b7b19b584dc9637a5c4d048a3c9e96e3980c1f7829e3d726fa70de0e8eb75969d4196bb54d04013f35905589a28d80d361008189aa1fcd9312852238a6b
+DIST valijson-1.0.2.tar.gz 723131 BLAKE2B ada64202d1c82f4e24c8fb3935a070ee40a24e8b75712fd4392f19c93c363d293db788cd1481ed3a857721fcd6f87e2d91c3b9779863fb6e2421ba4ee4f1d1f7 SHA512 c1141e533d6a791a01883c5b7ab9501eebc39057a850d784670a4bcf99bff3fee4c3120107128dcaa9db0505adf2ae794700620c02163b3e636f0b635031df80
+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.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.2.ebuild
index bc4327b63333..9ee0f307cdba 100644
--- a/dev-cpp/valijson/valijson-1.0.ebuild
+++ b/dev-cpp/valijson/valijson-1.0.2.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
@@ -14,10 +14,6 @@ SLOT="0"
 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/valijson/valijson-1.0.3.ebuild b/dev-cpp/valijson/valijson-1.0.3.ebuild
new file mode 100644
index 000000000000..b0c20539683e
--- /dev/null
+++ b/dev-cpp/valijson/valijson-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++ library for JSON Schema validation"
+HOMEPAGE="https://github.com/tristanpenman/valijson"
+SRC_URI="https://github.com/tristanpenman/valijson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+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 21d48dbecda6..edc262e1e4a0 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -1,8 +1,12 @@
 AUX xsimd-11.1.0-c++17.patch 1429 BLAKE2B 23be29fdd74ed37632bd1fba0ffdedf08af48f14985494f5befac4afb34622bb44e294e954d9d4e57a07ee6e9d988a48a93dd1b66a6f6206b79bd7c0cb600cc8 SHA512 41a474a6d768aec39e6760d4ff60017a5e3d5c4349bf244d3de1464bd9b06022d6cadcd4f91cc17a6630f38f1b0fe0e3aa4fa5a6810b8c57d649f5a8da28c217
 AUX xsimd-11.1.0-no-march.patch 3720 BLAKE2B 21adb3c35d8161db849c90363781642fa9c1051686e6dba00e55396adc905d1276540c663d34ab7bd124daa3fe6e367c5c41c17d7e0f31d55b82b1488fbdee0f SHA512 567f535a2a0dcdb02f05b53beba48e9704ef40d63df9531014257e0773a8df09854245ec5d22e6b7cffdf7541e8f48e55e2ea8faa513ca93f952aa177757bb3a
 AUX xsimd-12.1.1-no-march.patch 3739 BLAKE2B 44fb2ddfb55b8109e3b92a1479647ecbaf0f16fe949bc70c2f12fcfbd1cb0d87bfdf43d0fc2ac835bde8dbe843527d6426692a2fd0b504b6cfdcee824ae5d262 SHA512 82d5d1834af23f94ef0421c328e8f0b84c4c3b05acbd3c05bc9ea9c56c4078e827b8dcecf5f726deb35de9b3693c63effd5b7085c07a3b964f25a577d53c6da2
+AUX xsimd-13.0.0-detection-simd-with-mitigations.patch 5810 BLAKE2B a9a2bf8211e60c4e370c6c845cb06a1b17c7666778e907ba3215c9309a82e70efba2462cfb77298f15dd2366b0354c5830c99a3d08cfd619981b5e9c5179726b SHA512 b01b33722aa0a45f74d4df9810ea442ec37932aeb188c5c40e63f15533667b82b0ad5a0c2c737e18ad327e70c44bf13669f46dcc57fcde305dd94f0d24421e9f
+AUX xsimd-13.0.0-sve-rvv.patch 3244 BLAKE2B 50681c648f98caf5efa5c916618be090435f1e35ecc1877e4c933e31d2e869c25cc36b6c8d885ec0749753b07b903125b17dbfd55e95e5f5e1a3e01363942463 SHA512 36f4dfee1103155b1dc9159293690df937fd554d0ce401834193e59283f65beb366f9a48f5fc25bb367a11c0c2b7a57b7e225d1a9cd74de9f1a143e919c0b052
 DIST xsimd-11.1.0.tar.gz 219350 BLAKE2B 2bbbc4f7dbe489a407fe798b146c008aba44664efc943c2e1507d5c6e7da2a03ed91abf0d872e5abf9bd94be3e76bef276ec5b47d4e356b42a7b4c680bd6f3d9 SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3
 DIST xsimd-12.1.1.tar.gz 253141 BLAKE2B 29efbb045d8ade8737d702a73f3d0a912111dd4fbc84485c0e54c8b06d73edbb4b85f4b51e24da9bed0dea010b0cce9d99b57e20e8b94d3daf90d46031548eb9 SHA512 8e45a8e9b28358d5f20f713ea19a8c366edc62790c27984149f283dfe808d78a549c8ec465e8b3677d7e30b2cb80093908de364bbb9dc80683f5fdfb843131e1
+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-r1.ebuild 1564 BLAKE2B 2f3eed364ae5a83412d8fee2f640005c365f0f742568deb80511cee41893361551aa982b724c8f83126125441136b3c817cf6e0f51d8705e32428137ae1103b6 SHA512 fdc268954d0aae16030fb9536beacc88b3c6096266afb06c9bdb2dd0d3ef51a63747acf9c6a982539b18ba77c367475174b847d257a9c002935311ddbdddcf42
 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885
diff --git a/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch b/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch
new file mode 100644
index 000000000000..6aab22cd8416
--- /dev/null
+++ b/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch
@@ -0,0 +1,148 @@
+https://mail.kde.org/pipermail/distributions/2024-July/001511.html
+https://github.com/xtensor-stack/xsimd/commit/96edf0340492fa9c080f5182b38358ca85baef5e
+
+From 96edf0340492fa9c080f5182b38358ca85baef5e Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Tue, 28 May 2024 22:21:08 +0200
+Subject: [PATCH] Fix detection of SSE/AVX/AVX512 when they are explicitly 
+ disabled by OS
+
+Some CPU vulnerability mitigations may disable AVX functionality
+on the hardware level via the XCR0 register. We should check that
+manually to verify that OS actually allows us to use this feature.
+
+See https://bugs.kde.org/show_bug.cgi?id=484622
+
+Fix #1025
+---
+ include/xsimd/config/xsimd_cpuid.hpp | 91 ++++++++++++++++++++++------
+ 1 file changed, 72 insertions(+), 19 deletions(-)
+
+diff --git a/include/xsimd/config/xsimd_cpuid.hpp b/include/xsimd/config/xsimd_cpuid.hpp
+index f22089bac..6dda3be09 100644
+--- a/include/xsimd/config/xsimd_cpuid.hpp
++++ b/include/xsimd/config/xsimd_cpuid.hpp
+@@ -114,6 +114,35 @@ namespace xsimd
+ #endif
+ 
+ #elif defined(__x86_64__) || defined(__i386__) || defined(_M_AMD64) || defined(_M_IX86)
++
++                auto get_xcr0_low = []() noexcept
++                {
++                    uint32_t xcr0;
++
++#if defined(_MSC_VER) && _MSC_VER >= 1400
++
++                    xcr0 = (uint32_t)_xgetbv(0);
++
++#elif defined(__GNUC__)
++
++                    __asm__(
++                        "xorl %%ecx, %%ecx\n"
++                        "xgetbv\n"
++                        : "=a"(xcr0)
++                        :
++#if defined(__i386__)
++                        : "ecx", "edx"
++#else
++                        : "rcx", "rdx"
++#endif
++                    );
++
++#else /* _MSC_VER < 1400 */
++#error "_MSC_VER < 1400 is not supported"
++#endif /* _MSC_VER && _MSC_VER >= 1400 */
++                    return xcr0;
++                };
++
+                 auto get_cpuid = [](int reg[4], int level, int count = 0) noexcept
+                 {
+ 
+@@ -148,19 +177,43 @@ namespace xsimd
+ 
+                 get_cpuid(regs1, 0x1);
+ 
+-                sse2 = regs1[3] >> 26 & 1;
+-                sse3 = regs1[2] >> 0 & 1;
+-                ssse3 = regs1[2] >> 9 & 1;
+-                sse4_1 = regs1[2] >> 19 & 1;
+-                sse4_2 = regs1[2] >> 20 & 1;
+-                fma3_sse42 = regs1[2] >> 12 & 1;
++                // OS can explicitly disable the usage of SSE/AVX extensions
++                // by setting an appropriate flag in CR0 register
++                //
++                // https://docs.kernel.org/admin-guide/hw-vuln/gather_data_sampling.html
++
++                unsigned sse_state_os_enabled = 1;
++                unsigned avx_state_os_enabled = 1;
++                unsigned avx512_state_os_enabled = 1;
++
++                // OSXSAVE: A value of 1 indicates that the OS has set CR4.OSXSAVE[bit
++                // 18] to enable XSETBV/XGETBV instructions to access XCR0 and
++                // to support processor extended state management using
++                // XSAVE/XRSTOR.
++                bool osxsave = regs1[2] >> 27 & 1;
++                if (osxsave)
++                {
++
++                    uint32_t xcr0 = get_xcr0_low();
++
++                    sse_state_os_enabled = xcr0 >> 1 & 1;
++                    avx_state_os_enabled = xcr0 >> 2 & sse_state_os_enabled;
++                    avx512_state_os_enabled = xcr0 >> 6 & avx_state_os_enabled;
++                }
++
++                sse2 = regs1[3] >> 26 & sse_state_os_enabled;
++                sse3 = regs1[2] >> 0 & sse_state_os_enabled;
++                ssse3 = regs1[2] >> 9 & sse_state_os_enabled;
++                sse4_1 = regs1[2] >> 19 & sse_state_os_enabled;
++                sse4_2 = regs1[2] >> 20 & sse_state_os_enabled;
++                fma3_sse42 = regs1[2] >> 12 & sse_state_os_enabled;
+ 
+-                avx = regs1[2] >> 28 & 1;
++                avx = regs1[2] >> 28 & avx_state_os_enabled;
+                 fma3_avx = avx && fma3_sse42;
+ 
+                 int regs8[4];
+                 get_cpuid(regs8, 0x80000001);
+-                fma4 = regs8[2] >> 16 & 1;
++                fma4 = regs8[2] >> 16 & avx_state_os_enabled;
+ 
+                 // sse4a = regs[2] >> 6 & 1;
+ 
+@@ -168,23 +221,23 @@ namespace xsimd
+ 
+                 int regs7[4];
+                 get_cpuid(regs7, 0x7);
+-                avx2 = regs7[1] >> 5 & 1;
++                avx2 = regs7[1] >> 5 & avx_state_os_enabled;
+ 
+                 int regs7a[4];
+                 get_cpuid(regs7a, 0x7, 0x1);
+-                avxvnni = regs7a[0] >> 4 & 1;
++                avxvnni = regs7a[0] >> 4 & avx_state_os_enabled;
+ 
+                 fma3_avx2 = avx2 && fma3_sse42;
+ 
+-                avx512f = regs7[1] >> 16 & 1;
+-                avx512cd = regs7[1] >> 28 & 1;
+-                avx512dq = regs7[1] >> 17 & 1;
+-                avx512bw = regs7[1] >> 30 & 1;
+-                avx512er = regs7[1] >> 27 & 1;
+-                avx512pf = regs7[1] >> 26 & 1;
+-                avx512ifma = regs7[1] >> 21 & 1;
+-                avx512vbmi = regs7[2] >> 1 & 1;
+-                avx512vnni_bw = regs7[2] >> 11 & 1;
++                avx512f = regs7[1] >> 16 & avx512_state_os_enabled;
++                avx512cd = regs7[1] >> 28 & avx512_state_os_enabled;
++                avx512dq = regs7[1] >> 17 & avx512_state_os_enabled;
++                avx512bw = regs7[1] >> 30 & avx512_state_os_enabled;
++                avx512er = regs7[1] >> 27 & avx512_state_os_enabled;
++                avx512pf = regs7[1] >> 26 & avx512_state_os_enabled;
++                avx512ifma = regs7[1] >> 21 & avx512_state_os_enabled;
++                avx512vbmi = regs7[2] >> 1 & avx512_state_os_enabled;
++                avx512vnni_bw = regs7[2] >> 11 & avx512_state_os_enabled;
+                 avx512vnni_vbmi = avx512vbmi && avx512vnni_bw;
+ #endif
+             }
+
diff --git a/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch b/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch
new file mode 100644
index 000000000000..38ea56d1baa2
--- /dev/null
+++ b/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch
@@ -0,0 +1,88 @@
+https://mail.kde.org/pipermail/distributions/2024-July/001511.html
+https://github.com/xtensor-stack/xsimd/commit/80a59235e3ffa51659aaa06f002bfd088b77023c
+
+From 80a59235e3ffa51659aaa06f002bfd088b77023c Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Fri, 14 Jun 2024 10:19:55 +0200
+Subject: [PATCH] Fix xsimd::available_architectures().has() for sve and rvv
+ archs
+
+Ideally the patch CPU detection code should also check if the length
+of SVE and RVV is actually supported by the current CPU implementation
+(i.e. ZCR_Elx.LEN register for SVE and something else for RVV), but
+I don't have such CPUs/emulators handy, so I cannot add such checks.
+
+Given that xsimd::available_architectures().has() is a new feature
+of XSIMD13 and the length check has never been present in XSIMD, this
+bug is not a regression at least.
+
+The patch also adds a unittest that reproduces the error the patch fixes
+---
+ include/xsimd/config/xsimd_cpuid.hpp | 12 ++++++++++--
+ test/test_arch.cpp                   | 15 +++++++++++++++
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/include/xsimd/config/xsimd_cpuid.hpp b/include/xsimd/config/xsimd_cpuid.hpp
+index 6dda3be09..8021fceb8 100644
+--- a/include/xsimd/config/xsimd_cpuid.hpp
++++ b/include/xsimd/config/xsimd_cpuid.hpp
+@@ -42,6 +42,10 @@ namespace xsimd
+ #define ARCH_FIELD_EX(arch, field_name) \
+     unsigned field_name;                \
+     XSIMD_INLINE bool has(::xsimd::arch) const { return this->field_name; }
++
++#define ARCH_FIELD_EX_REUSE(arch, field_name) \
++    XSIMD_INLINE bool has(::xsimd::arch) const { return this->field_name; }
++
+ #define ARCH_FIELD(name) ARCH_FIELD_EX(name, name)
+ 
+             ARCH_FIELD(sse2)
+@@ -72,8 +76,12 @@ namespace xsimd
+             ARCH_FIELD(neon)
+             ARCH_FIELD(neon64)
+             ARCH_FIELD_EX(i8mm<::xsimd::neon64>, i8mm_neon64)
+-            ARCH_FIELD(sve)
+-            ARCH_FIELD(rvv)
++            ARCH_FIELD_EX(detail::sve<512>, sve)
++            ARCH_FIELD_EX_REUSE(detail::sve<256>, sve)
++            ARCH_FIELD_EX_REUSE(detail::sve<128>, sve)
++            ARCH_FIELD_EX(detail::rvv<512>, rvv)
++            ARCH_FIELD_EX_REUSE(detail::rvv<256>, rvv)
++            ARCH_FIELD_EX_REUSE(detail::rvv<128>, rvv)
+             ARCH_FIELD(wasm)
+ 
+ #undef ARCH_FIELD
+diff --git a/test/test_arch.cpp b/test/test_arch.cpp
+index b42073358..f1f50d546 100644
+--- a/test/test_arch.cpp
++++ b/test/test_arch.cpp
+@@ -38,6 +38,16 @@ struct check_supported
+     }
+ };
+ 
++struct check_cpu_has_intruction_set
++{
++    template <class Arch>
++    void operator()(Arch arch) const
++    {
++        static_assert(std::is_same<decltype(xsimd::available_architectures().has(arch)), bool>::value,
++                      "cannot test instruction set availability on CPU");
++    }
++};
++
+ struct check_available
+ {
+     template <class Arch>
+@@ -71,6 +81,11 @@ TEST_CASE("[multi arch support]")
+         xsimd::supported_architectures::for_each(check_supported {});
+     }
+ 
++    SUBCASE("xsimd::available_architectures::has")
++    {
++        xsimd::all_architectures::for_each(check_cpu_has_intruction_set {});
++    }
++
+     SUBCASE("xsimd::default_arch::name")
+     {
+         constexpr char const* name = xsimd::default_arch::name();
+
diff --git a/dev-cpp/xsimd/xsimd-13.0.0-r1.ebuild b/dev-cpp/xsimd/xsimd-13.0.0-r1.ebuild
new file mode 100644
index 000000000000..167d9662c0cd
--- /dev/null
+++ b/dev-cpp/xsimd/xsimd-13.0.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake python-any-r1
+
+DESCRIPTION="C++ wrappers for SIMD intrinsics"
+HOMEPAGE="https://github.com/xtensor-stack/xsimd"
+SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		$(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 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.1.0-c++17.patch
+	"${FILESDIR}"/${PN}-12.1.1-no-march.patch
+	"${FILESDIR}"/${PN}-13.0.0-sve-rvv.patch
+	"${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' \
+		test/CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && emake -C docs html
+}
+
+src_install() {
+	cmake_src_install
+	if use doc; then
+		dodoc -r docs/build/html
+	fi
+}
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index d87a307a3d62..ac5c6276e45e 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -3,8 +3,9 @@ AUX yaml-cpp-0.7.0-gtest.patch 1081 BLAKE2B 7fe415662ce9eb205f6f1c42df9885ae5817
 AUX yaml-cpp-0.7.0-install-paths.patch 1062 BLAKE2B c76f9f34e7f20954a2f2f0582f5d124ec22af2c91dccc19b4c7891b19d14bc2aff7d61f93b20a606c58397c70f9db2f35f10c6645869253a5bedd50d9e65eaa1 SHA512 9d14416fdb8111027324ffeae3856590348f9497444ecae7a2091d3211e17fe61fdd66932b98c119cf54551c551aa8f6a698a2c5a97cb559cf6e3a54f25e07cb
 AUX yaml-cpp-0.8.0-gcc13.patch 2242 BLAKE2B 8b5b99e86a578310dd020237a82150dd0ae47dc009cff2f423ec6248c77635384c6e4ff0620a446858ec12223ea3148a006a76fd9c5a02c28cf29c0969b19dfd SHA512 429ca92104b6203695970e7bc79ed452c0dd6a02b98beb2e640a89184d10f1daedf10a5f7697942036317225c52a054c0916bfe1c54635b34b83721f72a31f6d
 AUX yaml-cpp-0.8.0-gtest.patch 954 BLAKE2B 916365624688a62d2fa1f5dcbe62e65c872439efd8172a9898457797ce857003c31d8de082fe87ee9a47027f4021bc87ded88e7d4e40ed87e2da2a2333cc6d62 SHA512 781451e4477c22f059bb22b59b253bc2c2d4c0668bb00b44867d79a6d0e87f95abcfa11d35bcbf0e7aacc94b9185dfbef814018d7a58df00d93cd13ca0df8edc
+AUX yaml-cpp-0.8.0-include-cstdint.patch 1090 BLAKE2B 0415488b047454dfbbf962b6e1f135c277e7c4b1cce30b76045c611d3cee9dcf6f701c8ff290ff3943442dd1d3c7ec8d5547328a91dbced7d93530d4dcb9703f SHA512 1e376b6ba5b4f5673271bb0790768ca8512efe44d821940c7bc58539d08f118bc30ebaa64a137bf7ba77987f6c5596706dcf99a9b4a58199aa0e4f7aa2969b52
 DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
 DIST yaml-cpp-0.8.0.gh.tar.gz 1017151 BLAKE2B 5fd3eaec06bc04215afd2aa14ae8cd35f829f700f104931a51dbd8bb22e4e87f5cd5f2f975d3a2f464226d7165d3d106aa17bc7eab8a812c2545d2212011cf11 SHA512 aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e
 EBUILD yaml-cpp-0.7.0-r2.ebuild 857 BLAKE2B 63735ee4c253e6b04cf7c2c9b0725cf4aad80564eca30ca2e80360e8fa4d1263d95af7260cfa49c182d1109b13dd1ef5e754d1e6967f6414d9745ecf683b71b9 SHA512 7308409215a0e874fe4d2a2a6b8a8ccbfba8b4617a3852d50d40ca70cd2394fde8c1b8e1224136018aa043aecf3dbb6bc515e1ac90517c448c904a6315944249
-EBUILD yaml-cpp-0.8.0.ebuild 834 BLAKE2B 79015081abc63012a566c0a9b312d1cf0730f446b1ccd91c46af38f39fbfab8fc966d6ebe7f105acd572afa4cf79dc6f34cdcf7f67e7568a228395115bc16ec6 SHA512 a3b1e11b3ce2dd532a8951fa00b6991d069fbbe02df23b71d9c4dc8b82b20616901fdcc92a52d50ffb99536a59c957e924a197e391948212df9ee137c95c5ef1
+EBUILD yaml-cpp-0.8.0.ebuild 886 BLAKE2B 3201a330fa6b5de80fbc96216b38ff4f52a38ba64ca652d0c002a750c8f343d6b518d19b8f621a56c5d8a95378ebb78306050a7da5072030110d7c52feb66755 SHA512 f9f2ae48d5fc6f5a2338a1582999e7db9c9cb1a2cb22880db1b5f845e1ca36e29a17353732f0fa64057d773e211a53215097d905be947998209066033d422e74
 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch
new file mode 100644
index 000000000000..d017b43fa440
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch
@@ -0,0 +1,33 @@
+https://github.com/jbeder/yaml-cpp/pull/1310
+
+From: Christopher Fore <csfore@posteo.net>
+Date: Wed, 14 Aug 2024 21:02:32 -0400
+Subject: [PATCH] emitterutils: Explicitly include <cstdint>
+
+GCC 15 will no longer include it by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope
+  221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) {
+      |           ^~~~~~~~
+src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header '<cstdint>';
+this is probably fixable by adding '#include <cstdint>'
+   12 | #include "yaml-cpp/null.h"
+  +++ |+#include <cstdint>
+   13 | #include "yaml-cpp/ostream_wrapper.h"
+
+Tests pass.
+
+Closes: #1307
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937412
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+--- a/src/emitterutils.cpp
++++ b/src/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
index dc3a8a58c33c..5691f9d3a803 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.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
@@ -22,6 +22,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/yaml-cpp-0.8.0-gtest.patch"
 	"${FILESDIR}/yaml-cpp-0.8.0-gcc13.patch"
+	"${FILESDIR}/yaml-cpp-0.8.0-include-cstdint.patch"
 )
 
 src_configure() {