8 files changed, 33 insertions, 262 deletions
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 097b73069809..4ed4a519f6aa 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,3 +1,4 @@
 DIST rapidfuzz-cpp-3.2.0.gh.tar.gz 311140 BLAKE2B 334626f70a94d81168f24f64c2cf1fb0062581478cbc9b7506cf289c1f4a4007a0129918eb588584c4bf6ec33580ca7e85fe91725f9ddc8cd54f4e874551b381 SHA512 cf306fc4a6c0b6fc1a1c3b0b235aa54588bd87a5d07f96c1bc9711a08159ca71580b5958e66e8b4358d34e522041934903079aabe6e5a450cece7d6db6edcbe0
 DIST rapidfuzz-cpp-3.3.0.gh.tar.gz 314124 BLAKE2B 6a8d10dbd627adce2c00e02394265ec6001f5f16ee11a8948972f42e85f5ae2f2ebc50a11338659f29dd826f6988577bc4bcbd1e69e3b54545263e7c715db970 SHA512 acc61e294e3aa60f6076e0795622d0cff095bf3f141954587a7934f63a85f3ea08ba8af1accea445d3a990f9214ebd50f8f12a4d0ada88f1cc4b620c374ce153
 DIST rapidfuzz-cpp-3.3.1.gh.tar.gz 314391 BLAKE2B 27a8f0eed9a26a3d3342f9efc3ca5e9f6bbdec8bebdf99cf2ebb14659b68106e588fe7d2e6e3ce5f0caaae7070d83915c210111889d1a2315780c2dd32419b6f SHA512 c4b34d45b11f71db0cb5ce781b5fe9e81dde7809e9b17aa37138a862afca2b8a15631bf289e592f1fb9f012450c871b2b967353a6f0996783fa59b8ac6521e74
+DIST rapidfuzz-cpp-3.3.2.gh.tar.gz 314657 BLAKE2B edfc758e9cec932bd704a07c1f05d896b3c6df1f5599c11bf731e01156091cf3702b6266427e58cf656b8903748cebfa5d7801aa202976d635a03af40849d32a SHA512 4befcf9a22e2f478a93fb3e8f6a1b954071c707ee339f2d0a0e0367d24eb35670213b98e48d0d3956f50e4c7554ce326e4dd64470d706afafe4d2252f216ea48
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild
new file mode 100644
index 000000000000..d86bd803fa44
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2025 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-2
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/sol2/sol2-3.3.1.ebuild b/dev-cpp/sol2/sol2-3.3.1.ebuild
deleted file mode 100644
index 585aae692d6f..000000000000
--- a/dev-cpp/sol2/sol2-3.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 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
-)
-
-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/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 13de371c236a..0be9ed4f7b7a 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,2 +1 @@
-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
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
deleted file mode 100644
index 5ad9e46dbcb2..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d5d68286cdd983f99f88b6141a3c34d3bf633d98 Mon Sep 17 00:00:00 2001
-From: Felix Schwitzer <flx107809@gmail.com>
-Date: Fri, 1 Apr 2022 05:26:47 +0200
-Subject: [PATCH] Fix CMake export files (#1077)
-
-After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with
-empty variables.  (see also the discussion in #774).
-
-Rework this file and the call to `configure_package_config_file` according the
-cmake documentation
-(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file)
-to overcome this issue and allow a simple `find_package` after install.
-
-As there was some discussion about the place where to install the
-`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into
-an extra variable to make it easier changing this location in the future.
-
-Also untabify CMakeLists.txt in some places to align with the other code parts in this file.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES
-   PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
-   DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
- 
-+# FIXME(felix2012): A more common place for the cmake export would be
-+# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
-+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+set(EXPORT_TARGETS yaml-cpp)
- configure_package_config_file(
-   "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
-   "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
--  INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+  INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
-+  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
-+unset(EXPORT_TARGETS)
- 
- write_basic_package_version_file(
-   "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-@@ -139,30 +145,31 @@ write_basic_package_version_file(
- configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
- 
- if (YAML_CPP_INSTALL)
--	install(TARGETS yaml-cpp
-+  install(TARGETS yaml-cpp
-     EXPORT yaml-cpp-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-+  install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
--		FILES_MATCHING PATTERN "*.h")
-+                FILES_MATCHING PATTERN "*.h")
-   install(EXPORT yaml-cpp-targets
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
--	install(FILES
--		"${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
--		"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+    DESTINATION "${CONFIG_EXPORT_DIR}")
-+  install(FILES
-+      "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-+      "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-+    DESTINATION "${CONFIG_EXPORT_DIR}")
-   install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
-     DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
- endif()
-+unset(CONFIG_EXPORT_DIR)
- 
- if(YAML_CPP_BUILD_TESTS)
--	add_subdirectory(test)
-+  add_subdirectory(test)
- endif()
- 
- if(YAML_CPP_BUILD_TOOLS)
--	add_subdirectory(util)
-+  add_subdirectory(util)
- endif()
- 
- if (YAML_CPP_CLANG_FORMAT_EXE)
---- a/yaml-cpp-config.cmake.in
-+++ b/yaml-cpp-config.cmake.in
-@@ -3,12 +3,14 @@
- #  YAML_CPP_INCLUDE_DIR - include directory
- #  YAML_CPP_LIBRARIES    - libraries to link against
- 
--# Compute paths
--get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
--set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
-+@PACKAGE_INIT@
-+
-+set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
- 
- # Our library dependencies (contains definitions for IMPORTED targets)
--include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
-+include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
- 
- # These are IMPORTED targets created by yaml-cpp-targets.cmake
- set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
-+
-+check_required_components(@EXPORT_TARGETS@)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
deleted file mode 100644
index bd05fccca373..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 30fbefe6102da12e8d4d132aa4af2e24bfda9bfb Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sat, 17 Sep 2022 12:25:24 +0300
-Subject: [PATCH] Use external gtest dependency
-
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,15 +1,10 @@
- find_package(Threads REQUIRED)
-+find_package(GTest REQUIRED CONFIG)
- 
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- set(BUILD_MOCK ON CACHE BOOL "" FORCE)
- set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
- 
--add_subdirectory(
--  "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
--  "${CMAKE_CURRENT_BINARY_DIR}/prefix")
--
--include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
--
- set(test-new-api-pattern "new-api/*.cpp")
- set(test-source-pattern "*.cpp" "integration/*.cpp" "node/*.cpp")
- if (CMAKE_VERSION VERSION_GREATER 3.11)
-@@ -38,7 +33,7 @@ target_link_libraries(yaml-cpp-tests
-   PRIVATE
-     Threads::Threads
-     yaml-cpp
--    gmock)
-+    GTest::gmock)
- 
- set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
- if (NOT DEFINED CMAKE_CXX_STANDARD)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
deleted file mode 100644
index 622c0d7f148f..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f5b5ba19ece906252cfc90b7cd51035e21c7118 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sat, 17 Sep 2022 12:07:46 +0300
-Subject: [PATCH] Fix pkg-config file install destination
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,7 +129,7 @@ set_target_properties(yaml-cpp PROPERTIES
- 
- # FIXME(felix2012): A more common place for the cmake export would be
- # `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
--set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
- set(EXPORT_TARGETS yaml-cpp)
- configure_package_config_file(
-   "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
-@@ -160,7 +160,7 @@ if (YAML_CPP_INSTALL)
-       "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-     DESTINATION "${CONFIG_EXPORT_DIR}")
-   install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
--    DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- unset(CONFIG_EXPORT_DIR)
- 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
deleted file mode 100644
index 91e20995e963..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz"
-S="${WORKDIR}/yaml-cpp-${P}"
-
-LICENSE="MIT"
-SLOT="0/0.7"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gtest.patch"
-	"${FILESDIR}/${P}-cmake-paths.patch"
-	"${FILESDIR}/${P}-install-paths.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DYAML_BUILD_SHARED_LIBS=ON
-		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
-		-DYAML_CPP_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}