gentoo auto-resync : 17:05:2024 - 00:01:35

32 files changed, 541 insertions, 404 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 169d5420eac7..d9f2fe7169ef 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index dea40e53e30d..7dcec8ee8e1b 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -3,6 +3,6 @@ AUX cxxtools-3.0-lld-linking-openssl.patch 323 BLAKE2B 32cd482d39132bb9793383e2a
 AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
 EBUILD cxxtools-3.0-r1.ebuild 716 BLAKE2B 73caa9b56a2796bda7b29abdc4f34ea84bdca1ad04dbf6f1a4b9192ae65e257500caf543a406a70818cc3cfe8329012161ce6e9e43132f89a1bb4e14519b3c65 SHA512 689b9531a324c04d7cd9f153d567eabe00866508c839804cd0d3eb5ed4539d41b2a07de976e1778e9a887d00aa96097dbd51fcdf80930bd50463b9323d7ebcc8
-EBUILD cxxtools-3.0-r2.ebuild 1030 BLAKE2B 76fa7b73c9be51fb27baf553a18f9dc76a67bac2bfefe53013a699c737fdb3d4930eb80d5f1e483a34c67be01d8fe15c353870275157450dfbdcc99b1aeae985 SHA512 dd13baac690db403c4c6eef0d7573d7f716014063682e5190bbb2a81658b04b4f2b8908fc074e894f628e61e4f63b2dee6421051b6e7134c5a4cee4aede3fd26
+EBUILD cxxtools-3.0-r2.ebuild 1029 BLAKE2B 6b1f85d55df750aebd231d63c963d338ee9612d7fca345ac6f690a448d0625def763f235d7a8be6ab6f0ad0844a57366218dc6a6e4b64e4531de5c293b491024 SHA512 ef733bd9b15e29f6e3110fb1fba3b515f14fda836b7b6bd08138f96e76a3f5fa099ef20a9d65da0e55d9ca8d7e5b6b2cac0ea205a611e49d8caf83695f0286f7
 EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
 MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
index bdbcfe76412b..b46ea02fa47a 100644
--- a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index b6e225d38d3a..147a5b8fb559 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.4.src.tar.xz 132054668 BLAKE2B 94bbad3b185fd07cbace4eff79aba80fbdd5e072739250e3927fe1848bcf3f8d355eb1f384e57306707eb702acc7ab01b732590735be7950221607664d04b0a6 SHA512 b1b214ae91f3705d8ea345547ad53f1e5d7d884c1eb6958bc41c14ac4b3e407771ccc2b693686ff103c8232c2c3942731d6db9a9cb4f735e6c6a0674739d0b29
-DIST llvm-project-18.1.4.src.tar.xz.sig 566 BLAKE2B b74fd219d7bcdf197b4e711cfbb25c40e9d8d2c7341de0215d8c31f330f396e9c166ff63513829cdc9cef349f08238f66a4dc949fa97958a7af496abae369eaa SHA512 4f456edf4fb454815acaef6855b1a0991f229810a32e9369af83388e37f0ef8964308e1e93bd6216024cdd67e86caaadc8d5794467857cc6fe561c9fa6ca7386
 DIST llvm-project-18.1.5.src.tar.xz 132061072 BLAKE2B bfdd987d5992a4d94ae8b14792df3be67a8e8fdf1daef9834cdaa2132df1b7ddb72ba0aabbb34b171a73d0f3b2b0f61e7160f0b278a67fd4850e3f501fd21531 SHA512 9e2f1e251b3754a24a0b39676d78c98692887c05c85cf0bee50fd44d9635290019930d4dabd1ff4ba3c9c1067e7e0e09aa1bbcd3d76687f919a1d44ba85eee20
 DIST llvm-project-18.1.5.src.tar.xz.sig 566 BLAKE2B ad935db71ec3b9fc885d696af440764a71fe7cafc5b3ca0b25a2963100d9cb3790392daebcac1341716c95a8da3c6243f5a8667fea1ed18b93fc8baa495414c9 SHA512 3cbca1059d940f3bd7bd72d68f2828039b66304980cc5f43769649e5494fc7d71117bf8aba5cc7f7a2ffca52f60ba30fadf3b28f984fd49ddb14300e30b45237
-DIST llvm-project-338561657685c1831a53563b1bc36ffc7470239e.tar.gz 209715501 BLAKE2B 49152479d4f2cae430e783784d0cfcc129134f5cc0bf12c72701cd15e59cb3e1be2f61385ba9baa93d1d1193e89374ac8877b909650c163b681d1fcd26732cdc SHA512 d34bbe82e85c5b9d493029ad7b46e802f06f7e7a8a48515d0043c58c3251271f8f3e1e11c47eb91bd3db2477f819d33b43ddebb276eb9601c5ad141e463c9682
-DIST llvm-project-76aa042dde6ba9ba57c680950f5818259ee02690.tar.gz 210235525 BLAKE2B fbbb8e70e0a08bde1fa2277746f692399fa15015b69693f5e8d3297abf02dfb7b36c535880f5c6924c870652dd3106936776d57c34b22234a5419f75b3561bb7 SHA512 9107551ceb2b28aa735006144b3344801ea861d7b49eae4881831af507314fb8da2bf5e8a3a407aeebd2eee01fbfad2ca90269d2331fe43cca5c2cc49dd257b7
 DIST llvm-project-a7ee81e8279e0bf6e05617a4a638e5f2f8e45022.tar.gz 210384692 BLAKE2B 28b85b08a42c173e1c3bf530483112b1629c7e6684a83a016fbe9f132774f7b864d793581873a6529defeabb4479ad9a3d7c025b781b2fa4952c239b6d567b11 SHA512 1d593818347452f96611a62fa3aa22ce4355a4ee5d5dcfcb54a286a1aa980e9531d5fb6cbee3b0ee5943c6d0f4e2ba2245e13262fe7859e5b114f9c5d5cf1417
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f
-EBUILD libclc-18.1.4.ebuild 1299 BLAKE2B e3c065012f92bf55b94af30addaf2198d43828ce026f993eae0692ce9d20ecec9f5de1c4e9d42b1ddcc63fce380a3bbc8cbe1af5f5473a28638702bd516bd848 SHA512 fa756484b88b3b902ab3dc5913a5e2f1f291533b1e2f563f95b5fd5da571c84ad2606fd2a6bd59f5bf8a57839948fe06c49df5dc6da3132cf46caf52d2a5e347
 EBUILD libclc-18.1.5.ebuild 1305 BLAKE2B 22e8374609ba2d88b3cf9979dcd328e533f233afe6f95a6512ccd6e4911dd410eeedb4942c9cf153f965e738f1de16410db5b794b8f19cc45203bec4529864ba SHA512 f891105882023e252dd5f983a64d9c2c1eaa31dbcd27923ed173531a28068b79f2b6cd8844badbb3ddd5f17b569e46e118f2cb2e8f8e096f343f1102db959915
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
-EBUILD libclc-19.0.0_pre20240427.ebuild 1268 BLAKE2B 92a3a9d265bb42357c4ea9fb9d3d2987eb472a5a4d2a7531b2216cb81c09f411477eac675d6970084e8feebcf292928f6ca93575f51def4420ecead684136de4 SHA512 a53ed11ab2052cbd8f26c70c14994ffc347d373f07a820f6c3bf9335c64b72c1ac422998da2eb814e1ed83a9d6a80df75b405d9063c31404099c575c6d56b05c
-EBUILD libclc-19.0.0_pre20240504.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
 EBUILD libclc-19.0.0_pre20240509.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-18.1.4.ebuild b/dev-libs/libclc/libclc-18.1.4.ebuild
deleted file mode 100644
index 1a8008058811..000000000000
--- a/dev-libs/libclc/libclc-18.1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240427.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240427.ebuild
deleted file mode 100644
index 15a69aca7556..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240427.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..17} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240504.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240504.ebuild
deleted file mode 100644
index d57c9ec1fe3a..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240504.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index ae99a8cf45dc..43fca121a66d 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -5,16 +5,10 @@ DIST libfmt-10.2.0.tar.gz 854581 BLAKE2B 8d094b9832f3acaaf6cdbbc3b04c7c92e585cd7
 DIST libfmt-10.2.1.tar.gz 854665 BLAKE2B 7bef719aa99464b5cb608c81ca78e23f3aed81cadfa9ed65246c4983a98f0cadb27983d42929ab4e0b5e264673e38d7658a4f7d5171e624b2431b3c6327071d9 SHA512 27df90c681ec37e55625062a79e3b83589b6d7e94eff37a3b412bb8c1473f757a8adb727603acc9185c3490628269216843b7d7bd5a3cb37f0029da5d1495ffa
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
 EBUILD libfmt-10.0.0-r1.ebuild 756 BLAKE2B 7b9b751d1d24459b2762c9f6ea8b6a2abab08649911e64ea074572cd9644d2eb258436b495566e77b1568c1c9c30f884fb3c09745d1a473f50ec5f4549d79f49 SHA512 75e81ec568882933f0ebc7aea59f25c5331b0ade5f89d926b1e96231d233ed12c5bb0c7e4ed51d5d93863b5f7ddbdd0b5d82285feea70d6c9e9554c80af3d923
-EBUILD libfmt-10.0.0.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 EBUILD libfmt-10.1.0-r1.ebuild 756 BLAKE2B 7b9b751d1d24459b2762c9f6ea8b6a2abab08649911e64ea074572cd9644d2eb258436b495566e77b1568c1c9c30f884fb3c09745d1a473f50ec5f4549d79f49 SHA512 75e81ec568882933f0ebc7aea59f25c5331b0ade5f89d926b1e96231d233ed12c5bb0c7e4ed51d5d93863b5f7ddbdd0b5d82285feea70d6c9e9554c80af3d923
-EBUILD libfmt-10.1.0.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 EBUILD libfmt-10.1.1-r1.ebuild 756 BLAKE2B 7b9b751d1d24459b2762c9f6ea8b6a2abab08649911e64ea074572cd9644d2eb258436b495566e77b1568c1c9c30f884fb3c09745d1a473f50ec5f4549d79f49 SHA512 75e81ec568882933f0ebc7aea59f25c5331b0ade5f89d926b1e96231d233ed12c5bb0c7e4ed51d5d93863b5f7ddbdd0b5d82285feea70d6c9e9554c80af3d923
-EBUILD libfmt-10.1.1.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 EBUILD libfmt-10.2.0-r1.ebuild 756 BLAKE2B 7b9b751d1d24459b2762c9f6ea8b6a2abab08649911e64ea074572cd9644d2eb258436b495566e77b1568c1c9c30f884fb3c09745d1a473f50ec5f4549d79f49 SHA512 75e81ec568882933f0ebc7aea59f25c5331b0ade5f89d926b1e96231d233ed12c5bb0c7e4ed51d5d93863b5f7ddbdd0b5d82285feea70d6c9e9554c80af3d923
-EBUILD libfmt-10.2.0.ebuild 738 BLAKE2B 91638aae3a2d8032667206b6e906a37414438d997d1dae32553279bc6f69c6dfa0c5b3d82796c51f7891d9bca82f93eb23d27a49d4594d9e25f83216fedd43d9 SHA512 3e6ccc4da3fee1f4dbafa0ef4e6af7b322360d0f6130d915071dc2f645911d0d1d1422b7b8d82287c0a8fc23d1101500c35fa906d42ff493714443bcaabaf35c
-EBUILD libfmt-10.2.1-r1.ebuild 769 BLAKE2B 33d06bb4ce493aa5743e1e04a9364c2468a1e2fb922c515ab76e0d6658ec16b7b44dec78ae32285c51cac519b8e955989e854792a91681f04b446584e258ef82 SHA512 ec50d02a06454874192ca5c3b1f047e263a08370c7a4f65753e517d0459f4e7a29a199221dea1468dac806ecb1005bd393ebcfae43093b142f1c9a6ce82f5d1d
 EBUILD libfmt-10.2.1-r2.ebuild 787 BLAKE2B 2af8fae57e10abe207cb1dd31f80d995ff54cf89147220d327a0df3cd8d801eef479e767b9711b2a819e666995e2c932fea1af2d50168e62b3fd2e1f24130bdd SHA512 70bc875129a415f915103903181b57150cac24de0f268afba1f418b2c9d1c754f660db29ba43b0c0044292439d1777892f161f9c28cb97b552e2e5a42936dc17
-EBUILD libfmt-10.2.1.ebuild 738 BLAKE2B 91638aae3a2d8032667206b6e906a37414438d997d1dae32553279bc6f69c6dfa0c5b3d82796c51f7891d9bca82f93eb23d27a49d4594d9e25f83216fedd43d9 SHA512 3e6ccc4da3fee1f4dbafa0ef4e6af7b322360d0f6130d915071dc2f645911d0d1d1422b7b8d82287c0a8fc23d1101500c35fa906d42ff493714443bcaabaf35c
 EBUILD libfmt-9.1.0-r1.ebuild 756 BLAKE2B bbc29568319423300d62d5392e77e5578954699e90e7deb71807381ba4e542243b3c3c368b9b84052a0863788f9b22c0ec90ca2f0065474711a08f3b3d3d5142 SHA512 d1a283e3dd86d3fda19039b17663e640b65b41f235829849a78a57d62b738515a223d059172e648875465ea174d9014b7a3e68b1fc5ad01ebde5ea829a1726f5
 EBUILD libfmt-9.1.0-r2.ebuild 782 BLAKE2B e5432c3c94bd3236dc76dd96d24444766312d97acf8c88ff1ffd12884bb719ead65c70776bb0f86cc5ac2c184c35cec7d3de922d715ff0821126ae9b6218ab38 SHA512 09a7b236763f4f6aecac0dde0bafbbed0c8a4f7bd383e60d3a98d51cd709966b8a5b53cb190499ab96da68da06c113bd53d58a573c478186eca2218ea4fe0eb6
 EBUILD libfmt-9999.ebuild 787 BLAKE2B 2af8fae57e10abe207cb1dd31f80d995ff54cf89147220d327a0df3cd8d801eef479e767b9711b2a819e666995e2c932fea1af2d50168e62b3fd2e1f24130bdd SHA512 70bc875129a415f915103903181b57150cac24de0f268afba1f418b2c9d1c754f660db29ba43b0c0044292439d1777892f161f9c28cb97b552e2e5a42936dc17
diff --git a/dev-libs/libfmt/libfmt-10.0.0.ebuild b/dev-libs/libfmt/libfmt-10.0.0.ebuild
deleted file mode 100644
index 90083087d20e..000000000000
--- a/dev-libs/libfmt/libfmt-10.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-10.1.0.ebuild b/dev-libs/libfmt/libfmt-10.1.0.ebuild
deleted file mode 100644
index 90083087d20e..000000000000
--- a/dev-libs/libfmt/libfmt-10.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-10.1.1.ebuild b/dev-libs/libfmt/libfmt-10.1.1.ebuild
deleted file mode 100644
index 90083087d20e..000000000000
--- a/dev-libs/libfmt/libfmt-10.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-10.2.0.ebuild b/dev-libs/libfmt/libfmt-10.2.0.ebuild
deleted file mode 100644
index 0914ef073c62..000000000000
--- a/dev-libs/libfmt/libfmt-10.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-10.2.1-r1.ebuild b/dev-libs/libfmt/libfmt-10.2.1-r1.ebuild
deleted file mode 100644
index 2dbd37cc402c..000000000000
--- a/dev-libs/libfmt/libfmt-10.2.1-r1.ebuild
+++ /dev/null
@@ -1,33 +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="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	append-lfs-flags
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-10.2.1.ebuild b/dev-libs/libfmt/libfmt-10.2.1.ebuild
deleted file mode 100644
index 0914ef073c62..000000000000
--- a/dev-libs/libfmt/libfmt-10.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4b5798a23ee4..f8848ea33fd6 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3 SHA512 825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012
 DIST libgit2-1.8.0.tar.gz 7590126 BLAKE2B f3cc5259a5804bb1e319633269a8c488d7195683e39c178fbe5dc43278736bf15f706c1ca8f72b519ef647033ed11426ea40ceb0dd3ffddae3a35839493d6c54 SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144
+DIST libgit2-1.8.1.tar.gz 7608949 BLAKE2B 14558400d092dd963becfd3d4966a8d0799811be15fea8c5bc1e91be24f14bb81d33d82b2fb8dd8895e167f634a5d532d62a4609167bcb1d93143275207bbf6d SHA512 7429fbdc46ae44fd359e9260cbe33d9ce9276db810c096f12c43e5d302d01011463cdfd98d604e59780187e020e216e839823a77479dc12f952a37628516af78
 EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a
 EBUILD libgit2-1.8.0-r1.ebuild 1656 BLAKE2B 8eb9f38a0dd8af26dce9150475778d9df8ef7de3daac0a52196e4c8be80a89a286dc01aeaf388fb5fc7a7a5382d39fbcb3d130da84e9e1c0a99f2f41bad4757a SHA512 701f0dc93330e5a0ab9a817008a8d9bf1536a4733b9d3b9b698d758d5a2ebe69be03f25b520fb4c7143e79145cfb88d6795c73f2ca034130546d4e48cf1a7eae
+EBUILD libgit2-1.8.1.ebuild 1663 BLAKE2B 7d9f8673ab71bd1423a5348e03e99668006a0d83cffd8a7c9969c5f7808955f130b164fe34eb3f9a23b69787a10f315f73efbc3c3493916c499549e989e0e794 SHA512 bab44b3e430a8f300b68976ac578aae8be03248eb2fcb051a42ce130d5388505d4cf41e4d2ff4540344419573ffacfdbfac3af9c54136150628d56f5400d1e09
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.8.1.ebuild b/dev-libs/libgit2/libgit2-1.8.1.ebuild
new file mode 100644
index 000000000000..baf3a901a1f5
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.8.1.ebuild
@@ -0,0 +1,75 @@
+# 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 flag-o-matic python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	# https://bugs.gentoo.org/927821
+	append-flags -fno-strict-aliasing
+	filter-lto
+	# https://bugs.gentoo.org/925207
+	append-lfs-flags
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 96e0151aa0c1..4d735c622c49 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,5 +3,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 DIST libical-3.0.17.tar.gz 909125 BLAKE2B 002eba515280c685db49d7f6781048ca4f86a22fb44a740b459fd8ae8f7dd669cb8a623df16e87913a397fc9b242d75c999e7aea26f09254982d77f1c9f87ac2 SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7
 DIST libical-3.0.18.tar.gz 908948 BLAKE2B 0d3a665bce64752bbb1d28afea708643e6f52f19d5e5eae576aac40b720661e5c9593ff1e5ae48ef9a6c1b54259a7848847817ae669bbc8ef6b34bf1c7d90ee6 SHA512 53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5
 EBUILD libical-3.0.17.ebuild 2435 BLAKE2B 1f73b4b43ee2d295b9b37317f7fbe65524e382689ddb84d43dfd319dd4975bdac9662f33a415b07b2af799894b20e22ecb79ded63fa50c234845b9838155d96c SHA512 d45258735ccdb8ce20e341528e578c76885f2f75f0a220da4a83ed0ac88001a840db672fccf9ca7f6cbe4f4ef1e9023e648b6fa9fa8760f722cd2c4918a0e7a4
-EBUILD libical-3.0.18.ebuild 2387 BLAKE2B d546c7ed2035ae14e91a499e662edbaef6b7b090afbd1d1710fb20e3cc301c680bf81925dcb10c552604a6a81daae3f3f2466f6b57272a922e34e9a0ce56e105 SHA512 3c7ae1c5b75e850b5db42db46f06b8cdf5562e45e33f28bc964d12c834f9fa34a24aaa3cab74d19710418ef985b28720c9e85e4e4e6066c50e2832be5956391a
+EBUILD libical-3.0.18.ebuild 2382 BLAKE2B a73d06482fa54a90186deaad6100c75844fd0b44998a91626869078e283281f2cd21c5b65279f0b2fb64584673536d2f9034af41b77de5e780e450687a7ea9db SHA512 a73ca5269e197edd9cb10e5af1f5c975d4da2801f5c5aef33fff0c66f1b772e3622b6f06f598668865f1f1b3174822387be16856de0124b003b91a9d4f04e24b
 MISC metadata.xml 426 BLAKE2B bdc616f3bedfa391b56edde0bd0f350b171c1f9afa2a8a9e0166e71ecf1177946aae064bea9f48fb9933d24cb94fd784a299bd97b12ad7236b3483641a5dd763 SHA512 663bef7814dfd66077f1046094879c0ec1eb0165d616e85c08eb0ff9cecd3557afd31e7d8dda8f1e95aca6955d94818f3253c8b763ff135195d41b1b1e871d5c
diff --git a/dev-libs/libical/libical-3.0.18.ebuild b/dev-libs/libical/libical-3.0.18.ebuild
index 09aa9244e951..27e2ef9571ae 100644
--- a/dev-libs/libical/libical-3.0.18.ebuild
+++ b/dev-libs/libical/libical-3.0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index d1061ad4f154..8135bda22130 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,5 @@
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
+DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
 EBUILD libltdl-2.4.7-r1.ebuild 1112 BLAKE2B 8ae2894bbb7e705f052cbdae69a94e76f5783a753cc53d04c9589353f0b89f195403b593b894e5a227985593b4163f42150193835e59e48e85d7c0ccde9fa916 SHA512 3af2d93462b30c0ac3c1db9c6473fca1bd0063be54e6d68810b1559deb7fa814bd9801ad48f996a9c40c101f5168f4585322a50bf0aa5022aa4509537f68a3f8
+EBUILD libltdl-2.5.0.ebuild 1265 BLAKE2B 6af9debd1c57df924462bb6e00e6444e7e651e3b174606deaf56a73eaa903dd9dcea313a92e9abafea8d3172bd5068aa04a50d80a924d6f70798d60cd2e720b8 SHA512 eaa4d407fbe022bbccf9262b5aa3f7ef0470558aea026d5c61795f91e9b2962e0f44a974b035854a1eff5d2086df5ec3f90bfbb36774b0ec857547e758aefe6b
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/dev-libs/libltdl/libltdl-2.5.0.ebuild b/dev-libs/libltdl/libltdl-2.5.0.ebuild
new file mode 100644
index 000000000000..0dc5df4fd2b2
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-build/libtool.
+
+inherit multilib-minimal flag-o-matic
+
+MY_P="libtool-${PV}"
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+if ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}/libltdl
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+# libltdl doesn't have a testsuite.  Don't bother trying.
+RESTRICT="test"
+
+BDEPEND="app-arch/xz-utils"
+
+multilib_src_configure() {
+	# bug #907427
+	filter-lto
+
+	append-lfs-flags
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-ltdl-install \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. # bug #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+}
diff --git a/dev-libs/libpsl-native/Manifest b/dev-libs/libpsl-native/Manifest
index d3800181a0e6..761e1bb1a173 100644
--- a/dev-libs/libpsl-native/Manifest
+++ b/dev-libs/libpsl-native/Manifest
@@ -1,5 +1,5 @@
 AUX libpsl-native-7.3.2-test-cmake.patch 485 BLAKE2B 4da10739abc354866c1343bc7c0d398cf97c21c2010b3dbeb75da9c0807379582f21689bd99f031d886270abe36897fdc6ffad2fbc3105c6b23beeddebbaea16 SHA512 921ddc3303f3c5ba8e320d893d708f337f7a704b8c716d1ba075514eca6cad737b0c97c62308d51e073ab323aec7f0ab098e20665ff65ad35f994ac4ad89aef6
 AUX libpsl-native-7.4.0-cmake.patch 452 BLAKE2B ad61dd846c530794212dd038cf37039e2b37210221a36063dbad3bc04db8887f637b042c9f12d09de309b1f5b73a3a1f1dc118e8b82d0d84278638fa3dc95c92 SHA512 c288f4e74430b1548bee1486e376f94786b57e0d52ed7e4d93b7b24211f774b81147269a8cc95c39e8101798bf54f7d35345298a8ec5dff8e8bd97863d501282
 DIST libpsl-native-7.4.0.tar.gz 288919 BLAKE2B b38b35d3f1ebf2b7deeb90ff78c7c00e2e51f7b115a1622a878e7870de4dae53458a16b325fe7059b6faf7157701f14e179c8cb12648ff5ffd44694ce9a6ead2 SHA512 bfd1c00834bfd2a7fdba0cf5ae3bb82efb959fdc2f538d05bde150b98d417012647115c6893fc53db0b20170ea40be238ef017044a8076798c02578bd14884f9
-EBUILD libpsl-native-7.4.0.ebuild 873 BLAKE2B 36fca549d5ba4342a63944431a600c185f8d4442ee99ba0e0dcfa6579ba903a4003fe2eb7d8410a7cda4ca1cc1c421a10a5124d2cc788a24231630c4ea89135f SHA512 d1955b71f27d9c87316e6e1491a4dbb654c232cf50f32b25ebaa7ab150271c83dbdd7ccc4f6f1ccb4378f4e6445d642e060ad8b3d1afed2da7ec534a1a6e2967
+EBUILD libpsl-native-7.4.0.ebuild 872 BLAKE2B e82f1061259a1d7eaed98f173914c4e4efe77b5342250d403db3987920814cbdb1d49e7f746bcb01cf77a065cb5030a6a8974594769f7a028e81e426cd99e156 SHA512 ff49c2a7fba523f191fe2e1a96eff2c563f99bc8b220bf5b900be18de0fb6efc80e522f66195788f4103e812d39b466e8000c2f3a92562d7d3b4fda7ba5cd2f9
 MISC metadata.xml 439 BLAKE2B 72a823c1e144b3a594c8571200dd935dd46010f59f0380bd9b30131124bd71fd102c7f286c7d26670647e77ff111b9d5c043d5e0637be10950a7527b8302f6e7 SHA512 960e66a6fb960bae6053b1dbd05168c6aed69aff14e6b840d77809b82a80ad1ec3edb5ab329c3a6c5a19a413e97d9f651e3e963aa8385d210d5ec1da9b842c2b
diff --git a/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild b/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild
index 23612295362d..0fb2de0c2006 100644
--- a/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild
+++ b/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild
@@ -21,7 +21,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}/src/${PN}"
 
-	KEYWORDS="amd64 arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 75c2ad1f8431..00a1e4c83997 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,5 +1,5 @@
 DIST libusb-1.0.26.tar.bz2 620534 BLAKE2B 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081 SHA512 fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71
 DIST libusb-1.0.27.tar.bz2 643680 BLAKE2B bec2eb053159ffa719c794d234f8e99b895a4fae336b862a3197b88deb3d307a53ebb98d2aa993a2f390f14264f796b96ac47274c19f56db30440484ee336c8a SHA512 42abbbcf2564f86cc2f05826aeefa6beb03c9f89dc9fe05bdfa351caa3dbd07713ce193daadecf29557604dd3cbc770c8031a78e1ad0a8df3627c3f551d28ff0
 EBUILD libusb-1.0.26.ebuild 1688 BLAKE2B ba7e8e556c48a6ba021c08c3ef22757fc42335e2a9c1f46cae13f92ad88f9ae6b6149097e86fbb5a63ffcb655cbfa81955140607e1835fcb9c474b8d2e809198 SHA512 f91d973f2a81d54c2bd5e030cc4137941b4632cae64d90eeb0e65731fd4fff1b63cd37f76f4dcf6481e04833eb201ca98a19afa166fe777a785eb707aaa2f4d6
-EBUILD libusb-1.0.27-r1.ebuild 1701 BLAKE2B d02ca1f05742369dea979ed45ff8ac63309731fecffaf18d8ae6cf09f295a567fccf7666771767f40def0cee0f134e5ba2f46bdbbcf3c59a3ad65a9accc9a7e6 SHA512 376ee8d718ae9c722b58092967a0c12d98f7e09e128a31931c8bc7a0e326951e2d01848f4965b7e937b7e06d0fbb453848605edae36b721af950d55d0bfc7aed
+EBUILD libusb-1.0.27-r1.ebuild 1697 BLAKE2B a877dccc0a9248c5983c6962e2b25622015a0497b424d059c00122d32fece48b5cb812b9b018f4b9563307df223fdda4416831341d88f4a995b393c3f23f05a4 SHA512 528cbbf58f2f36f8b88904787841a06746f6deefd8c63dc02178a01cbaca502a3fad255d74e469ba6872851aa41cc2e44c746c00b55a95d29e905354090bfb9f
 MISC metadata.xml 393 BLAKE2B 37a3ae443adc5cc8939c5687e5f3c13fef1eb379f7d5ef8506b521c21b94c1b507bfe43f27a6ab679d5af252f221a24a4dbac59449285ea3b82d9c584d419b61 SHA512 91999ff91a8bf8bb0290bb05131747e1cd0381e6daff08a139000fe5d025712c19c56e035fb6ac9471f294ceccc7cf061bbdb443d731b1aaf529233142efbce0
diff --git a/dev-libs/libusb/libusb-1.0.27-r1.ebuild b/dev-libs/libusb/libusb-1.0.27-r1.ebuild
index 93daca66f7b8..ceeda526d11c 100644
--- a/dev-libs/libusb/libusb-1.0.27-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="static-libs? ( !udev )"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 8f7ba9f3470c..72fb5b0671b7 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,12 +1,16 @@
 AUX libxml2-2.11.5-CVE-2023-45322.patch 2030 BLAKE2B 2262b1c532b0b59c4982fdea12946294e58754aaca8b7cf3e1f3fdd912e900735b642362629e63ceb16b469f5a1146387030838ecc7b97d4227ceff089a72a43 SHA512 3e76d8b2608d523f659cbc3f7faf6565a83f8b77dcae0a2c1986c66df25b9baf8a4382d7bde612f7eafb0967e199c84621ec70898481a5b369e6f3818832f9bc
 DIST libxml2-2.11.7.tar.xz 2628860 BLAKE2B 9aa553b09ec20fe01272ceafb59bf76b480f3cfc57084a527d09797dc39987e59635f8f7b1591060ef6a27adfcc07d8c8e8a907ee7ed04da0a108aae1517cd52 SHA512 202b0523d982eb5269dcb4644d8ab2ea31404771069462cdd6c5cd7e6672e0e50371ceb334133bb8f2c0a42f133e8f40c3f582bba5fc71ab168a2b18d4cfd81d
+DIST libxml2-2.11.8.tar.xz 2628212 BLAKE2B 7a9f62b9e6628e71462b0ae2a43947e398c8b948d57280ee5ac64a7cd0a13d39aa4cc55148421f999e5a04e19ca1ae2cb84884f85f3e22559cb45d8a7fca7d45 SHA512 b8c38365172b9f46e2da4dd696f5df4f917d05cc33456079d3d042578543c0f951da207361958ba8699a9f7256889f063737ba80dba8bb9720c8434be1ca723f
 DIST libxml2-2.12.5.tar.xz 2643452 BLAKE2B b63ade8b18d98701e95b79ac2199bfc4ca89c6085c48c3d0970945ae526558ee2137622ee8b4af5391f86e663a3f06a7e1aaad5f57eb639fc9da74704e2280f3 SHA512 da5c5afb95db80342d78d4371d029bf10ce5cd601b24b294272d9996f82357bd5262a15a2b44b0904a14471c8ff0c9fd9c796f164246551f02ee19a8f083f926
 DIST libxml2-2.12.6.tar.xz 2643124 BLAKE2B 677589cf063b109018aafc04a1564242ba1a9d88b2c511f583d4aa511c13aff15254a9d5f6ea2c294902338b0c0207ff59c51298e128981d57f86367ddc1a803 SHA512 19d6901c0f189813e8bd20ffdfbb29d8545ca30154d1f3cc82624d64e4db3cfbe8eef7e8ccc1e195289f1bf94bb50fefcf11a95badb0ddeb845b4e4ea5a819ac
+DIST libxml2-2.12.7.tar.xz 2641980 BLAKE2B 19abc2a7824212b1de3ceb1e8e3bbb39cb5feb31f8f6e1b1701a8255f34aadbbd01631e8011fd1207d2e711372a893034a99cb4aaa779a1df22d49d339dbfc76 SHA512 88b5f3e0a7c6704926e662a46ba0606d901efbcd70a36bd39fe034e29ee42d66d7296358761e04272c9696192a1380bda55852b2a0b14a05a7a083a08e125f5f
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.11.7.ebuild 5310 BLAKE2B 4e8e6c29a9004453eb62f6676f3808231b45c6b616af48b13ac32d14d8893bc836449cfbca1414af3f293e03abacc26454c54be960b61c264e31955946507818 SHA512 babbb1587967ec402f27607e04650183938f7ca16c3d32b5cf68e94c3a98decb3d97dcfc8f2a4b8afc0ac081338df41d1c7eb0fca5675b53593b37beda5686bf
+EBUILD libxml2-2.11.8.ebuild 5318 BLAKE2B 69f5beb4b641f3a2fc4547aa01a081a382771af00616d1fe33519a88cec66b12e5911f7211aa4fdbdf6b92d5b85a307c8d68c6bd7d400d158e161ef7db33c5d0 SHA512 a16a8ac93379ee896a60823b975a42666dd9cfaed58894884f606133fd7fb46770c24f11928aa73fbc2659af5185603be31cee9ce32a6ce829d2d22b7c4977d9
 EBUILD libxml2-2.12.5.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd881a7933dcc29fea023ed850c9d3630611651b0214f59f2b7ddb6dc0759f37f72c34a09e429e8b7284d339051a SHA512 53766010d7b0f9d9bbd35b9c3df96f777c44b2d003cba8a3d17d075c0fc0ddc7347688980ec597c11623156544896fc4e64870dec56b625a1c36eacdc2a40a0c
 EBUILD libxml2-2.12.6.ebuild 5249 BLAKE2B 7ed075e1fb2fcb860e28da0e0d653bccac730180ba61755c76b90db227fdff3194b1504ddfe89a350d72a41b12aaba9854c638412be9e56b5b5949665ee00394 SHA512 a1dbcf241e782a54f04227e61082d6d8706879321ae63bd1f9b3d9e5a0e424e2d58a7ebb7b2c1223bcaebfab5c90f7c7d25ba638a1a12c7d4f5ebb1dce88a82b
+EBUILD libxml2-2.12.7.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
 EBUILD libxml2-9999.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.11.8.ebuild b/dev-libs/libxml2/libxml2-2.11.8.ebuild
new file mode 100644
index 000000000000..efd633ea121b
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.11.8.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit autotools git-r3
+else
+	inherit gnome.org libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libiconv
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-build/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.5-CVE-2023-45322.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.xz
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.12.7.ebuild b/dev-libs/libxml2/libxml2-2.12.7.ebuild
new file mode 100644
index 000000000000..c4d87530a6d4
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.12.7.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit autotools git-r3
+else
+	inherit gnome.org libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libiconv
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-build/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.xz
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index e4a54208a3e6..a5d56a8ed729 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -8,6 +8,6 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1u.tar.gz 9892176 BLAKE2B 5de9cb856e497596ecba008bad6515eefd093849b9c66dd7447031723996f3ba66ac37a323a5f7d01b1d42df4daaceb523372f5897d5c53b935ffab91c566594 SHA512 d00aeb0b4c4676deff06ff95af7ac33dd683b92f972b4a8ae55cf384bb37c7ec30ab83c6c0745daf87cf1743a745fced6a347fd11fed4c548aa0953610ed4919
 DIST openssl-1.1.1u.tar.gz.asc 833 BLAKE2B 7a978a94264a14be04372fea39868e9177e8a0b0f24344267702022e19ee0f52e91ad141d7c54da870f7ec0df9b2e43b80939f1d274dd0b44d36da2670e3a468 SHA512 40245d65ace95b2002bf64bcba184c92fec3420b08d9f61f3a709c4842e9478595105d8adce33a08eb98d351d2a0989ec342b08cdd9104498ea0543b6e592d28
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
-EBUILD openssl-compat-1.0.2u-r2.ebuild 7800 BLAKE2B 71eff3be1ba80c9ebb5683510896c671b0e764714630d116905ecc50805ab7501032e66415bfcab5285e8f38578b02bcd6ad011f2d607f5250821ddf36157911 SHA512 69d1ef562edc7791a9e3a96d94a9c98358846e8970302ccdede0f1d4d84653bd4791aeffd76b671964a66bc1b9a19fbf124c0218281abefed8afdb9c36eaa3bb
+EBUILD openssl-compat-1.0.2u-r2.ebuild 7799 BLAKE2B fd3fc5bec553101edd6db4bfd8f2318930bed3d8a10ef49aea3f9ba567ebcfb7862d360e416dbbfef013fdf8c3cd43ca6060dc6c1899621ce196d2cb8d714f17 SHA512 63533729ca1bba9b0e484b24c6ecaa1c1e51597d7c44e333ea069ae3599d44c5c5ba6810422a21150331829300b1459e584b92dddab9be3d3b94c7a529f49162
 EBUILD openssl-compat-1.1.1u.ebuild 6558 BLAKE2B 7d3de93cd72abaf6a3fa8f3344c4225a37abe1d41c71af60eb0ec6fba278e2a0c8269d9467f4b8b6ca59c2f90f77bfe6e079e565141131e8af74df476760857f SHA512 54ee533f95f970bbb9f9e6e96d0c8232dcbf000b255e450e1f386ca0693a28f90409c3a4d313da53ba31f84de1013e4217d0ae95e14e74bfea35b763c81f3430
 MISC metadata.xml 1125 BLAKE2B fa83594f2e255365c8573b581ac84ded49504a551e1e85c564291d590f82e02f2df8561b96d74e7ea53639b90f8306ab7f67a00fd59107fc08288b14073ee8d3 SHA512 ad3cd7d3bf3998c1f49f6953a0e48ff822a19207b65e29df21fcc9e98b246dfd0793cc7475b7ebb3b96e1e78ddc27cef16f96463e144b19805e3e0e6fb38ef1d
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
index e3f11f7685f4..00f2576c4730 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="1.0.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
 
 RESTRICT="!bindist? ( bindist )
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 02f39e321959..6c3dfc4e3291 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -9,6 +9,6 @@ EBUILD spdlog-1.11.0-r3.ebuild 1066 BLAKE2B 2f9e5013ded134257381f8be7a545677ff19
 EBUILD spdlog-1.11.0-r4.ebuild 1180 BLAKE2B 1553c6ad46a09283746e4b4e4c62f28e50e1f5a8af44fc40b20da9cdd0ddb0ed25095454ca22edb9b6ed2303b14d0bd92ce27401a9731a041af99bcf14e5936a SHA512 490b12a8cc566e7fec04b528dcbeb035a1a5ac62068c11a41fb106ba0125b4ed8a0cc5fe12a13bc74cc4e591505ca4bbef9e292b3d47d2d6de1f3f468f540696
 EBUILD spdlog-1.12.0-r2.ebuild 1106 BLAKE2B 3c56c2e447e6812acbaaed28f1544501a23a60b8a398f4172af6ba03b1564bb2211120eee98353d5b97fe11a2ee28c8b4dfa756171170e55cf89f0ef2a3dbb59 SHA512 fc12e864b6d4d4b159fb61572eadfb7872aab7108621359a277e872268511c5e48bc2cb10feb1b29b1f3c8f8ec3baae4be98cd176b50c513f81f05494b6b5a41
 EBUILD spdlog-1.12.0-r3.ebuild 1190 BLAKE2B 24771d7f021dbdf6fd70ef37c567fb8da71ff62bcb1b3e6c5a1f981deada76453a4d8a1c518948ae44b06acd242bc33397eeaa63495f91b2efd74722276cb1df SHA512 394c5a964278fcdeb199956fb37c1de9d23727d59733f4f35ec603b5759093f41815c24fe33990a77cb0d7ea2fedeea8fe4f7ae48c38bd5a7496bc3cb7d491f4
-EBUILD spdlog-1.13.0-r1.ebuild 1133 BLAKE2B ea20a8dfd157bdfd3a48217e6dfafc37baee8ae3b182048c4dad1121c469ff0ec12e9b79078a369e791bd6079fa5fa5d5377addfa09531df5cec35da847a94d5 SHA512 6891a853c0c558f02c2c8b2d9b8cdcde12143194bae6a9daeeb0d1bec8ec0603f8be8d351685a78319b1c47a3737d61855b70bf5d6e2d4b79ed6accad73da621
-EBUILD spdlog-9999.ebuild 1133 BLAKE2B ea20a8dfd157bdfd3a48217e6dfafc37baee8ae3b182048c4dad1121c469ff0ec12e9b79078a369e791bd6079fa5fa5d5377addfa09531df5cec35da847a94d5 SHA512 6891a853c0c558f02c2c8b2d9b8cdcde12143194bae6a9daeeb0d1bec8ec0603f8be8d351685a78319b1c47a3737d61855b70bf5d6e2d4b79ed6accad73da621
+EBUILD spdlog-1.13.0-r2.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd
+EBUILD spdlog-9999.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/spdlog-1.13.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
index 01917c4d913f..3ece901957d2 100644
--- a/dev-libs/spdlog/spdlog-1.13.0-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
+	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 01917c4d913f..3ece901957d2 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
+	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"