6 files changed, 55 insertions, 67 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6fb1fc9c6674..a9965e60a924 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index df5a6e8667a5..67f56dd08f20 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,5 +1,7 @@
 DIST rapidfuzz-cpp-3.0.5.gh.tar.gz 309782 BLAKE2B fd7547e5c40696c217c8ea2aa98fb83b98606cde7439a5d51c80b4de30002896d9e95365d3c6ac56c32d8a8432c94ce2050b856a7e850a3f37035c5d0ece795f SHA512 4e0a7e28a54612fb11eb331449aa4fdfde1fbd2bf59b295f9eb68903cd647a639fa04d71aa7a8c88ddb7be6646cd3d0f1f5400eb53644b0ae96590037e74f771
 DIST rapidfuzz-cpp-3.1.1.gh.tar.gz 310477 BLAKE2B 2227b61c56a37854336698e0649e8db6f0c5432f60f4501805cd16add3c6324f203788006d92e0271ec67a74916c5ac5a6290edbc7437ba2014fd25e6a0e415f SHA512 204ee06c1e51b786f0a2efd32a1c2467c3bff2738e8258e6e8fe44b5569afe7c665af1051fdd05dcc98704f3045f5bd2afcba5dba3fc0b34e2facf8944478b48
+DIST rapidfuzz-cpp-3.2.0.gh.tar.gz 311140 BLAKE2B 334626f70a94d81168f24f64c2cf1fb0062581478cbc9b7506cf289c1f4a4007a0129918eb588584c4bf6ec33580ca7e85fe91725f9ddc8cd54f4e874551b381 SHA512 cf306fc4a6c0b6fc1a1c3b0b235aa54588bd87a5d07f96c1bc9711a08159ca71580b5958e66e8b4358d34e522041934903079aabe6e5a450cece7d6db6edcbe0
 EBUILD rapidfuzz-cpp-3.0.5.ebuild 631 BLAKE2B d13241e64eadc1fe3230266944b12050f647f2e00a77656434c1b3790ace3f4648b6a9e53655562beb102685650cb874214bae9d073b537d8c97c7fdfe6caaee SHA512 b481d2c6533dac5f3e824a2a5ff1ea53b3cefdb9f498f72ab0a034c594a2f67bf28fa9d395f3dad58272317df5f6605c46479c773d00af0dabda84edbf2b0e1c
 EBUILD rapidfuzz-cpp-3.1.1.ebuild 631 BLAKE2B d13241e64eadc1fe3230266944b12050f647f2e00a77656434c1b3790ace3f4648b6a9e53655562beb102685650cb874214bae9d073b537d8c97c7fdfe6caaee SHA512 b481d2c6533dac5f3e824a2a5ff1ea53b3cefdb9f498f72ab0a034c594a2f67bf28fa9d395f3dad58272317df5f6605c46479c773d00af0dabda84edbf2b0e1c
+EBUILD rapidfuzz-cpp-3.2.0.ebuild 638 BLAKE2B ba377c1712a0b93600d24af773997a0ccbccc622c2749848507d048f59f9bea74d1fb987aced2543584cd8b67b3b26fcdf8f903911d892144f7fb5bc6386f268 SHA512 977ae16b5bb87dd74fd3f5401592dfccb1198ee06b3da1e6c1ec1e80c11f0e552918453460def8368d8339495c9ee87c0fe586b479ac9565ad06e5bc70358749
 MISC metadata.xml 336 BLAKE2B e425e950b6a0524afb6b996f846fdda73310168d6415a67570ac01a75a2c9335b4f5785bda271a2cf88bf5d7e3708582d958d1fa658d12f36fc5455df9763573 SHA512 868c16a2c2b178fa38e65568aeacf5b96a8d4ebf4521094a0da106194de0acefd017d5f7c827d89a9711c6b80d5603a01d9e15ba9b167c55954f3d653ccc6ed5
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild
new file mode 100644
index 000000000000..b5e48d9aebfb
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index edc262e1e4a0..d78238bafce5 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -3,10 +3,8 @@ AUX xsimd-11.1.0-no-march.patch 3720 BLAKE2B 21adb3c35d8161db849c90363781642fa9c
 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
+DIST xsimd-13.1.0.tar.gz 265436 BLAKE2B 1c15612a280a237c730dce363cef5ca6b65625807cf22d2589fe2d50470e07a0877c12a52f769030dffbfadfa8e7f0d51c7c34fd679c01e14121c3d9c2582792 SHA512 a446aa29364c12785b9fc600341cd21b8fcf3cff6e07f6093b5cd3669a0c26397ccd75f0504c52da7f1843e2844e8b909bebbe1e64f0f2d8355f0ee0eadf1263
 EBUILD xsimd-13.0.0-r1.ebuild 1564 BLAKE2B 2f3eed364ae5a83412d8fee2f640005c365f0f742568deb80511cee41893361551aa982b724c8f83126125441136b3c817cf6e0f51d8705e32428137ae1103b6 SHA512 fdc268954d0aae16030fb9536beacc88b3c6096266afb06c9bdb2dd0d3ef51a63747acf9c6a982539b18ba77c367475174b847d257a9c002935311ddbdddcf42
+EBUILD xsimd-13.1.0.ebuild 1461 BLAKE2B 6d66eab27223a139e33ad8f942e62dab0a8a0900a8d0b560c31510c31a9970199dc098d5712ebda081cbd33fdc5546447ba756da8c27f9730aed82708219804e SHA512 d698567bab0b8c6e2f091bb8903e53d34ee7febf05b26f9567652aaf56aa9e81437f2df8986889b395704fa0ec7a6e860741e17f6184cf9930f675d056024e6c
 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885
diff --git a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild b/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
deleted file mode 100644
index 52951201669e..000000000000
--- a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-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 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-python/breathe
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-	test? ( dev-cpp/doctest )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-c++17.patch
-	"${FILESDIR}"/${PN}-11.1.0-no-march.patch
-)
-
-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/xsimd/xsimd-12.1.1.ebuild b/dev-cpp/xsimd/xsimd-13.1.0.ebuild
index cf1c90d386a1..803e85d60e43 100644
--- a/dev-cpp/xsimd/xsimd-12.1.1.ebuild
+++ b/dev-cpp/xsimd/xsimd-13.1.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake python-any-r1
 
 DESCRIPTION="C++ wrappers for SIMD intrinsics"
 HOMEPAGE="https://github.com/xtensor-stack/xsimd"
@@ -19,17 +20,30 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	doc? (
 		app-text/doxygen
-		dev-python/breathe
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
+		$(python_gen_any_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
 	)
 	test? ( dev-cpp/doctest )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-11.1.0-c++17.patch
-	"${FILESDIR}"/${P}-no-march.patch
+	"${FILESDIR}"/${PN}-12.1.1-no-march.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' \