13 files changed, 26 insertions, 328 deletions
diff --git a/dev-cpp/cctz/Manifest b/dev-cpp/cctz/Manifest
index 28ac5e20a36e..e6a6ac653cc8 100644
--- a/dev-cpp/cctz/Manifest
+++ b/dev-cpp/cctz/Manifest
@@ -1,2 +1 @@
-DIST cctz-2.4.tar.gz 222831 BLAKE2B c232b27cbfe5e45b6e1c51dd13c9a35c4a2e84b5d3e65ba6b4afb7683cac967a3b409382664a55d58ac67e53a1cf3dec9d97ecd59c5e2180c0eae4f71462fe33 SHA512 6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e
 DIST cctz-2.5.tar.gz 224961 BLAKE2B dc5e51dbcb9a6c3d497d3c89385ca6e6eedba9eaa00b378a9d1a488e7efb40d19afc38769893d8a56ea1a5198236a260045e2c19c5014b86e10566bd4dcfb12e SHA512 e3eba96482b7745b145ecfd9b3b96b09d9120bde952dfdb66d625e642a463b87c74205b1813e3c4bd9b408410bb26fb095d034ca56a4953005bf0c988ccc741e
diff --git a/dev-cpp/cctz/cctz-2.4-r1.ebuild b/dev-cpp/cctz/cctz-2.4-r1.ebuild
deleted file mode 100644
index 67e9edecfc88..000000000000
--- a/dev-cpp/cctz/cctz-2.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for dealing with time zones and time conversion"
-HOMEPAGE="https://github.com/google/cctz"
-SRC_URI="https://github.com/google/cctz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-cmake4.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_BENCHMARK=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/cctz/cctz-2.4.ebuild b/dev-cpp/cctz/cctz-2.4.ebuild
deleted file mode 100644
index 2a2a1f041c09..000000000000
--- a/dev-cpp/cctz/cctz-2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for dealing with time zones and time conversion"
-HOMEPAGE="https://github.com/google/cctz"
-SRC_URI="https://github.com/google/cctz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_BENCHMARK=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/cctz/files/cctz-2.4-cmake4.patch b/dev-cpp/cctz/files/cctz-2.4-cmake4.patch
deleted file mode 100644
index 4c6ba8de6cc0..000000000000
--- a/dev-cpp/cctz/files/cctz-2.4-cmake4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/951679
-https://github.com/google/cctz/commit/f62d7b7
-
-From f62d7b778289959fa117c13ce190387690400611 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
-Date: Mon, 8 Jul 2024 16:07:59 +0200
-Subject: [PATCH] [cmake] Require CMake 3.16 (#292)
-
-Follow Google's OSS policy.
-Remove other code specific for CMake < 3.16
----
- CMakeLists.txt | 28 +++++++---------------------
- 1 file changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0f2c58..0bf696b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,8 +1,6 @@
--cmake_minimum_required(VERSION 2.8.12)
--
--if (POLICY CMP0025)
--  cmake_policy(SET CMP0025 NEW)
--endif()
-+# https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
-+# As of 2024-07-01, CMake 3.16 is the minimum supported version.
-+cmake_minimum_required(VERSION 3.16)
- 
- project(cctz)
- 
-@@ -51,20 +49,12 @@ if (BUILD_TESTING)
-   )
- endif()
- 
--# Starting from CMake >= 3.1, if a specific standard is required,
-+# If a specific standard is required,
- # it can be set from the command line with:
--#     cmake -DCMAKE_CXX_STANDARD=[11|14|17]
-+#     cmake -DCMAKE_CXX_STANDARD=[11|14|17|20|23]
- function(cctz_target_set_cxx_standard target)
-   set(cxx_standard 11)
--  if (CMAKE_VERSION VERSION_LESS "3.1")
--    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
--      target_compile_options(${target} PRIVATE -std=c++${cxx_standard})
--    endif()
--  elseif (CMAKE_VERSION VERSION_LESS "3.8")
--    set_property(TARGET ${target} PROPERTY CXX_STANDARD ${cxx_standard})
--  else()
--    target_compile_features(${target} PUBLIC cxx_std_${cxx_standard})
--  endif()
-+  target_compile_features(${target} PUBLIC cxx_std_${cxx_standard})
- endfunction()
- 
- if(APPLE)
-@@ -191,10 +181,6 @@ install(FILES cmake/${PROJECT_NAME}-config.cmake
-   DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
-   )
- 
--if (CMAKE_VERSION VERSION_LESS "3.8")
--  set(quiet_on_empty "")
--else()
--  set(quiet_on_empty QUIET_ON_EMPTY)
--endif()
-+set(quiet_on_empty QUIET_ON_EMPTY)
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES ${quiet_on_empty})
diff --git a/dev-cpp/expected/Manifest b/dev-cpp/expected/Manifest
index c82b091da8eb..2fa1da16b57e 100644
--- a/dev-cpp/expected/Manifest
+++ b/dev-cpp/expected/Manifest
@@ -1 +1,2 @@
 DIST expected-1.1.0.tar.gz 23747 BLAKE2B dd2431ad240d0209aecc52d62dd40bc88fc34691c59386c4fd5f862b52a17f1d659e5feca018e1d57b900e2ee1093a25eb27b39da86d3af8429d4d2542f56ac6 SHA512 ce970c31582869af9d0b3349f386db207dd4881db0bdfd3744331b0a62fe2886dde598a75882fb00254afa3549fb9d4c2bd1ff7682744891d403edfd4ff73492
+DIST expected-1.3.1.tar.gz 24480 BLAKE2B 2c45c199a4f447b24b37b833d3af18c7b753849a0fa4599861bc1cbd3c87bcc9b534e3958de4b7f144e5c30544fcfcf738fa01d6df37edbe211ea8fe2084c8bd SHA512 764e11097fe6ff18499e0941288fbd1cac91fe68009e077ef803742d48dd38efa8cc57cd6207e7d384f577a11bcb9bff43d3d853ade20340af36fccaaa5d47ed
diff --git a/dev-cpp/expected/expected-1.3.1.ebuild b/dev-cpp/expected/expected-1.3.1.ebuild
new file mode 100644
index 000000000000..b8134cdb4248
--- /dev/null
+++ b/dev-cpp/expected/expected-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Single header implementation of std::expected with functional-style extensions"
+HOMEPAGE="https://github.com/TartanLlama/expected"
+
+SRC_URI="https://github.com/TartanLlama/expected/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DEXPECTED_BUILD_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
deleted file mode 100644
index b2ffd55a091c..000000000000
--- a/dev-cpp/range-v3/range-v3-0.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges"
-HOMEPAGE="https://github.com/ericniebler/range-v3"
-SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/0.12.0-fix-any-1.patch"
-	"${FILESDIR}/0.12.0-fix-any-2.patch"
-)
-
-src_prepare() {
-	# header-only libraries go to arch-independent dirs
-	sed -i -e 's@CMAKE_INSTALL_LIBDIR@CMAKE_INSTALL_DATADIR@g' CMakeLists.txt || die
-	rm include/module.modulemap || die # https://bugs.gentoo.org/755740
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-		-DRANGES_NATIVE=OFF
-		-DRANGES_DEBUG_INFO=OFF
-		-DRANGES_NATIVE=OFF
-		-DRANGES_ENABLE_WERROR=OFF
-		-DRANGES_VERBOSE_BUILD=ON
-		-DRANGE_V3_EXAMPLES=OFF
-		-DRANGE_V3_PERF=OFF
-		-DRANGE_V3_DOCS=OFF
-		-DRANGE_V3_HEADER_CHECKS="$(usex test ON OFF)"
-		-DRANGE_V3_TESTS=$(usex test ON OFF)
-		#TODO: clang support + -DRANGES_MODULES=yes
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index 998600ce8981..c28ffabc1c2d 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1,2 +1 @@
-DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd
 DIST sol2-3.5.0.tar.gz 8461779 BLAKE2B a86fe9313457d097bc078407d5e00e08ba9f6f9b898779a0c50891b3313db5a4a3fb22c660f79e8d419a4f020ff8d914e10144f2fbb2ede27b695ad697f4c8ff SHA512 5a6ec7e16dae05ad6abea02842f62db8f64935eda438d67b2c264cbee80cee6d82200bd060387c6df837fe9f212dbe22b2772af34df1ce8bd43296dd9429558d
diff --git a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
deleted file mode 100644
index 9b9c9f101769..000000000000
--- a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use the lua version selected by lua eclass
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -188,7 +188,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES))
- 
- 	string(TOLOWER ${SOL2_LUA_VERSION} NORMALIZED_LUA_VERSION)
- 	# Find way to get Lua: build if requested, or attempt to build if no matching version is found
--	if (SOL2_BUILD_LUA)
-+	if (TRUE)
-+		find_package(PkgConfig REQUIRED)
-+		pkg_check_modules(LUA REQUIRED lua IMPORTED_TARGET)
-+		set(LUA_LIBRARIES PkgConfig::LUA)
-+	elseif (SOL2_BUILD_LUA)
- 		find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION})
- 	elseif (NOT SOL2_LUA_VERSION)
- 		find_package(LuaBuild REQUIRED)
diff --git a/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch b/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch
deleted file mode 100644
index 8f53144ad37c..000000000000
--- a/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -23,12 +23,7 @@
- # # # # sol2 tests
- 
- # # Dependencies
--FetchContent_Declare(
--	catch2
--	GIT_REPOSITORY https://github.com/catchorg/Catch2.git
--	GIT_TAG devel
--)
--FetchContent_MakeAvailable(catch2)
-+find_package(Catch2 REQUIRED)
- 
- function(sol2_add_test_properties target-name)
- 	target_link_libraries(${target-name}
diff --git a/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch b/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch
deleted file mode 100644
index 6782b05abf78..000000000000
--- a/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Install to share, it's header-only
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,7 +105,7 @@ target_include_directories(sol2 ${sol2-system-include}
- configure_package_config_file(
- 	cmake/sol2-config.cmake.in
- 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
--	INSTALL_DESTINATION lib/cmake/sol2
-+	INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/sol2
- 	NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
- write_basic_package_version_file(
-@@ -121,7 +121,7 @@ if(SOL2_ENABLE_INSTALL)
- 
- 	install(EXPORT sol2
- 		FILE sol2-targets.cmake
--		DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
-+		DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
- 
- 	install(DIRECTORY include/sol
- 		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-@@ -129,7 +129,7 @@ if(SOL2_ENABLE_INSTALL)
- 	install(FILES
- 		"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
- 		"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config-version.cmake"
--		DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
-+		DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
- endif()
- 
- # # # sol2 Library - Single header target
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
deleted file mode 100644
index 5d926a700979..000000000000
--- a/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 04c86b3588ee..000000000000
--- a/dev-cpp/sol2/sol2-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
-}