12 files changed, 21 insertions, 738 deletions
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 740a8c91715c..9fa403401fa5 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1,2 @@
-DIST benchmark-1.8.3.tar.gz 250206 BLAKE2B 14b4af17184a88378314d11623b73c27368999fcff6e50986407a08739fdf388cdcbd140471b629cd2a9948f81073796f8a6c38d015be8413b7e4d4759715f97 SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c
 DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
 DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
deleted file mode 100644
index 8e3db7fe1c4a..000000000000
--- a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )
-	test? ( >=dev-cpp/gtest-1.11.0 )"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_WERROR=OFF
-		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
deleted file mode 100644
index 1c2516c38e37..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1753
-
-From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:38:11 -0500
-Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture
-
-As documented, the real cycle counter is unsafe to use here, because it
-is a 32-bit integer which wraps every ~4s.  Use gettimeofday instead,
-which has a limitation of a low-precision real-time-clock (~1ms), but no
-wrapping.  Passes test suite.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/cycleclock.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index 931bba146..eff563e7f 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-   uint64_t pcycle;
-   asm volatile("%0 = C15:14" : "=r"(pcycle));
-   return static_cast<double>(pcycle);
-+#elif defined(__alpha__)
-+  // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit
-+  // integer and thus wraps every ~4s, making using it for tick counts
-+  // unreliable beyond this time range.  The real-time clock is low-precision,
-+  // roughtly ~1ms, but it is the only option that can reasonable count
-+  // indefinitely.
-+  struct timeval tv;
-+  gettimeofday(&tv, nullptr);
-+  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
- #else
-   // The soft failover to a generic implementation is automatic only for ARM.
-   // For other platforms the developer is expected to make an attempt to create
-
-From b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:46:06 -0500
-Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha
-
-And also, bail out if unable to parse /proc/cpuinfo.  This will
-preemptively alert users on platforms that need custom code for parsing
-/proc/cpuinfo.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 04d64dc5b..786bb1b41 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -513,7 +513,11 @@ int GetNumCPUs() {
-     std::cerr << "failed to open /proc/cpuinfo\n";
-     return -1;
-   }
-+#if defined(__alpha__)
-+  const std::string Key = "cpus detected";
-+#else
-   const std::string Key = "processor";
-+#endif
-   std::string ln;
-   while (std::getline(f, ln)) {
-     if (ln.empty()) continue;
-
-From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:49:24 -0500
-Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- test/user_counters_tabular_test.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc
-index 3e8fb1bf0..ffd3c0992 100644
---- a/test/user_counters_tabular_test.cc
-+++ b/test/user_counters_tabular_test.cc
-@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header,"
- 
- void BM_Counters_Tabular(benchmark::State& state) {
-   for (auto _ : state) {
-+    // This test requires a non-zero CPU time to avoid divide-by-zero
-+    auto iterations = state.iterations();
-+    benchmark::DoNotOptimize(iterations);
-   }
-   namespace bm = benchmark;
-   state.counters.insert({
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
deleted file mode 100644
index 6744d3cf212f..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1756
-
-From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 13 Feb 2024 20:23:20 -0500
-Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure
-
-Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs
-never returns fewer than one CPU.  There is no reasonable way to
-continue if we are unable to identify the number of CPUs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 786bb1b41..daeb98b02 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -474,12 +474,11 @@ std::string GetSystemName() {
- #endif  // Catch-all POSIX block.
- }
- 
--int GetNumCPUs() {
-+int GetNumCPUsImpl() {
- #ifdef BENCHMARK_HAS_SYSCTL
-   int num_cpu = -1;
-   if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu;
--  fprintf(stderr, "Err: %s\n", strerror(errno));
--  std::exit(EXIT_FAILURE);
-+  PrintErrorAndDie("Err: ", strerror(errno));
- #elif defined(BENCHMARK_OS_WINDOWS)
-   SYSTEM_INFO sysinfo;
-   // Use memset as opposed to = {} to avoid GCC missing initializer false
-@@ -493,8 +492,8 @@ int GetNumCPUs() {
-   // Returns -1 in case of a failure.
-   long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
-   if (num_cpu < 0) {
--    fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
--            strerror(errno));
-+    PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
-+                     strerror(errno));
-   }
-   return (int)num_cpu;
- #elif defined(BENCHMARK_OS_QNX)
-@@ -510,8 +509,7 @@ int GetNumCPUs() {
-   int max_id = -1;
-   std::ifstream f("/proc/cpuinfo");
-   if (!f.is_open()) {
--    std::cerr << "failed to open /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to open /proc/cpuinfo");
-   }
- #if defined(__alpha__)
-   const std::string Key = "cpus detected";
-@@ -540,12 +538,10 @@ int GetNumCPUs() {
-     }
-   }
-   if (f.bad()) {
--    std::cerr << "Failure reading /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failure reading /proc/cpuinfo");
-   }
-   if (!f.eof()) {
--    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
-   }
-   f.close();
- 
-@@ -559,6 +555,16 @@ int GetNumCPUs() {
-   BENCHMARK_UNREACHABLE();
- }
- 
-+int GetNumCPUs() {
-+  const int num_cpus = GetNumCPUsImpl();
-+  if (num_cpus < 1) {
-+    PrintErrorAndDie(
-+        "Unable to extract number of CPUs.  If your platform uses "
-+        "/proc/cpuinfo, custom support may need to be added.");
-+  }
-+  return num_cpus;
-+}
-+
- class ThreadAffinityGuard final {
-  public:
-   ThreadAffinityGuard() : reset_affinity(SetAffinity()) {
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
deleted file mode 100644
index 62e741687f9c..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/916278
-https://salsa.debian.org/science-team/benchmark/-/blob/master/debian/patches/0007-fix-32bit-test.patch?ref_type=heads
-
-Description: Fix 32bit-test
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2023-10-17
-
---- benchmark-1.8.3.orig/test/statistics_gtest.cc
-+++ benchmark-1.8.3/test/statistics_gtest.cc
-@@ -28,8 +28,8 @@ TEST(StatisticsTest, StdDev) {
- TEST(StatisticsTest, CV) {
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({101, 101, 101, 101}), 0.0);
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({1, 2, 3}), 1. / 2.);
--  EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
--                   0.32888184094918121);
-+  EXPECT_NEAR(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
-+                   0.32888184094918121, 1e-7);
- }
- 
- }  // end namespace
diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest
index 8cb697cfc137..855ca4eeb29f 100644
--- a/dev-cpp/toml11/Manifest
+++ b/dev-cpp/toml11/Manifest
@@ -1,3 +1 @@
-DIST toml-0.5.0.tar.gz 1609475 BLAKE2B ed9c2fd5f885411c9a607b84a0c484c8ad3d26c16cdf31b5800be74c928b15faaa1cad53c913d5f43c74bce260ed10f74a1b81d72679eca291a9de503414fdda SHA512 5a84a2704ee0bffefcf27ef15a45689ca3d76350842e16c2c847500c4420a22254e78804f3b26005fec17263a4717bd01127a53e56335fe2a3c828cc02e75d37
-DIST toml11-3.8.1.tar.gz 135565 BLAKE2B 96cf39e097e8fc587faab980f993c36f720ca6185938accd4200277380a189fd8604d04f3a24fe06a6cc4708e23e5271d930135d2be9b6fb37b56ad1a845f1c1 SHA512 74a70abe413e21b94284242c281645c49f08b930c62f5479e6698cee45a99b56511d0a8888f1f6f2af3fc245bb0dfd5048a0b810b474ca1066211e25a1ce33bb
 DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b
diff --git a/dev-cpp/toml11/files/toml11-3.8.1-werror.patch b/dev-cpp/toml11/files/toml11-3.8.1-werror.patch
deleted file mode 100644
index 0d1e905f645c..000000000000
--- a/dev-cpp/toml11/files/toml11-3.8.1-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Unset -Werror from the builds
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -156,9 +156,6 @@ endif()
- if(COMPILER_SUPPORTS_WPEDANTIC)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
- endif()
--if(COMPILER_SUPPORTS_WERROR)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
- if(COMPILER_SUPPORTS_WSHADOW)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
- endif()
diff --git a/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch b/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch
deleted file mode 100644
index fce2e9876c7e..000000000000
--- a/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch
+++ /dev/null
@@ -1,410 +0,0 @@
-unbundle doctest
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -43,15 +43,16 @@ set(TOML11_TEST_NAMES
- 
- if(BUILD_TESTING)
-     add_library(toml11_test_utility STATIC utility.cpp)
-+    find_package(doctest REQUIRED)
-     target_include_directories(toml11_test_utility
--        PRIVATE ${PROJECT_SOURCE_DIR}/tests/extlib/doctest/doctest/
-+        PRIVATE ${DOCTEST_INCLUDE_DIR}
-         )
-     target_link_libraries(toml11_test_utility PUBLIC toml11)
- 
-     foreach(TEST_NAME ${TOML11_TEST_NAMES})
-         add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
-         target_include_directories(${TEST_NAME}
--            PRIVATE ${PROJECT_SOURCE_DIR}/tests/extlib/doctest/doctest/
-+            PRIVATE ${DOCTEST_INCLUDE_DIR}
-             )
-         target_link_libraries(${TEST_NAME} PUBLIC toml11 toml11_test_utility)
-         if(MSVC)
---- a/tests/test_comments.cpp
-+++ b/tests/test_comments.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_datetime.cpp
-+++ b/tests/test_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/datetime.hpp>
- 
---- a/tests/test_error_message.cpp
-+++ b/tests/test_error_message.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_find.cpp
-+++ b/tests/test_find.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_find_or.cpp
-+++ b/tests/test_find_or.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_format_floating.cpp
-+++ b/tests/test_format_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_format_integer.cpp
-+++ b/tests/test_format_integer.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_format_table.cpp
-+++ b/tests/test_format_table.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_get.cpp
-+++ b/tests/test_get.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_get_or.cpp
-+++ b/tests/test_get_or.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_literal.cpp
-+++ b/tests/test_literal.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <iostream>
- 
---- a/tests/test_location.cpp
-+++ b/tests/test_location.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/location.hpp>
- 
---- a/tests/test_parse_array.cpp
-+++ b/tests/test_parse_array.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing an array")
- {
---- a/tests/test_parse_boolean.cpp
-+++ b/tests/test_parse_boolean.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_datetime.cpp
-+++ b/tests/test_parse_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_floating.cpp
-+++ b/tests/test_parse_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_inline_table.cpp
-+++ b/tests/test_parse_inline_table.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing an inline table v1.0")
- {
---- a/tests/test_parse_integer.cpp
-+++ b/tests/test_parse_integer.cpp
-@@ -1,6 +1,6 @@
- 
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_null.cpp
-+++ b/tests/test_parse_null.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_string.cpp
-+++ b/tests/test_parse_string.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- #include <iostream>
---- a/tests/test_parse_table.cpp
-+++ b/tests/test_parse_table.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing a table")
- {
---- a/tests/test_parse_table_keys.cpp
-+++ b/tests/test_parse_table_keys.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing table keys")
- {
---- a/tests/test_result.cpp
-+++ b/tests/test_result.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/result.hpp>
- 
---- a/tests/test_scanner.cpp
-+++ b/tests/test_scanner.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_serialize.cpp
-+++ b/tests/test_serialize.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_spec.cpp
-+++ b/tests/test_spec.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/spec.hpp>
- 
---- a/tests/test_storage.cpp
-+++ b/tests/test_storage.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/storage.hpp>
- 
---- a/tests/test_syntax_boolean.cpp
-+++ b/tests/test_syntax_boolean.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_comment.cpp
-+++ b/tests/test_syntax_comment.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_datetime.cpp
-+++ b/tests/test_syntax_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_floating.cpp
-+++ b/tests/test_syntax_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_integer.cpp
-+++ b/tests/test_syntax_integer.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_key.cpp
-+++ b/tests/test_syntax_key.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_string.cpp
-+++ b/tests/test_syntax_string.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_traits.cpp
-+++ b/tests/test_traits.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/types.hpp>
- 
---- a/tests/test_types.cpp
-+++ b/tests/test_types.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/types.hpp>
- 
---- a/tests/test_user_defined_conversion.cpp
-+++ b/tests/test_user_defined_conversion.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- #include "utility.hpp"
---- a/tests/test_utility.cpp
-+++ b/tests/test_utility.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/utility.hpp>
- 
---- a/tests/test_value.cpp
-+++ b/tests/test_value.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_visit.cpp
-+++ b/tests/test_visit.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/comments.hpp>
- #include <toml11/types.hpp>
---- a/tests/utility.cpp
-+++ b/tests/utility.cpp
-@@ -1,4 +1,4 @@
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/utility.hpp
-+++ b/tests/utility.hpp
-@@ -9,7 +9,7 @@
- #include <toml11/serializer.hpp>
- #include <toml11/value.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <ostream>
- #include <string>
diff --git a/dev-cpp/toml11/files/toml11-4.1.0-werror.patch b/dev-cpp/toml11/files/toml11-4.1.0-werror.patch
deleted file mode 100644
index df06c2acb418..000000000000
--- a/dev-cpp/toml11/files/toml11-4.1.0-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-unset Werror
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,6 @@ include(CheckCXXCompilerFlag)
- check_cxx_compiler_flag("-Wall"                 TOML11_COMPILER_SUPPORTS_WALL)
- check_cxx_compiler_flag("-Wextra"               TOML11_COMPILER_SUPPORTS_WEXTRA)
- check_cxx_compiler_flag("-Wpedantic"            TOML11_COMPILER_SUPPORTS_WPEDANTIC)
--check_cxx_compiler_flag("-Werror"               TOML11_COMPILER_SUPPORTS_WERROR)
- check_cxx_compiler_flag("-Wsign-conversion"     TOML11_COMPILER_SUPPORTS_WSIGN_CONVERSION)
- check_cxx_compiler_flag("-Wconversion"          TOML11_COMPILER_SUPPORTS_WCONVERSION)
- check_cxx_compiler_flag("-Wduplicated-cond"     TOML11_COMPILER_SUPPORTS_WDUPLICATED_COND)
diff --git a/dev-cpp/toml11/metadata.xml b/dev-cpp/toml11/metadata.xml
index c0f74ac187e2..ecd6134f7692 100644
--- a/dev-cpp/toml11/metadata.xml
+++ b/dev-cpp/toml11/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>pastalian46@gmail.com</email>
-  <name>Takuya Wakazono</name>
+  <email>xgqt@gentoo.org</email>
+  <name>Maciej Barć</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/ToruNiina/toml11/issues/</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/toml11/toml11-3.8.1.ebuild b/dev-cpp/toml11/toml11-3.8.1.ebuild
deleted file mode 100644
index 728c5aea1372..000000000000
--- a/dev-cpp/toml11/toml11-3.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-SPEC_V=0.5.0
-
-DESCRIPTION="TOML for Modern C++"
-HOMEPAGE="https://github.com/ToruNiina/toml11"
-SRC_URI="
-	https://github.com/ToruNiina/toml11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/toml-lang/toml/archive/refs/tags/v0.5.0.tar.gz -> toml-${SPEC_V}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-PATCHES=( "${FILESDIR}/${P}-werror.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=11
-		-DTOML11_LANGSPEC_SOURCE_DIR="${WORKDIR}/toml-${SPEC_V}"
-		-Dtoml11_BUILD_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild
index 09fbf2898ebd..da9ac1e07435 100644
--- a/dev-cpp/toml11/toml11-4.2.0.ebuild
+++ b/dev-cpp/toml11/toml11-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,27 +6,21 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="TOML for Modern C++"
-HOMEPAGE="https://github.com/ToruNiina/toml11"
-SRC_URI="https://github.com/ToruNiina/toml11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://toruniina.github.io/toml11/
+	https://github.com/ToruNiina/toml11/"
 
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ToruNiina/${PN}.git"
+else
+	SRC_URI="https://github.com/ToruNiina/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 
-DEPEND="test? ( dev-cpp/doctest )"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-PATCHES=(
-	# unbundle doctest
-	"${FILESDIR}/${PN}-4.1.0-system-doctest.patch"
-	# unset Werror
-	"${FILESDIR}/${PN}-4.1.0-werror.patch"
-)
+LICENSE="MIT"
+SLOT="0"
 
-src_configure() {
-	local mycmakeargs=(
-		-DTOML11_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
+DOCS=( README.md README_ja.md )