13 files changed, 196 insertions, 73 deletions
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index b154090faa00..0fa4441613e2 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1 +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
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
index 5c20bb79f760..e07371bad483 100644
--- a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/benchmark-1.8.4.ebuild b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
new file mode 100644
index 000000000000..16006f7088f0
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
@@ -0,0 +1,34 @@
+# 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 )"
+
+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/clhpp/Manifest b/dev-cpp/clhpp/Manifest
index 07f4c4777c3d..439e4604bd54 100644
--- a/dev-cpp/clhpp/Manifest
+++ b/dev-cpp/clhpp/Manifest
@@ -1,2 +1,3 @@
 DIST clhpp-2023.04.17.tar.gz 115042 BLAKE2B df0db751eda9fe2f23a5e3ef97f263885a09ca4b341b24c9580522e84a192e9afe526a441d0e3660e8819492945b2ff89bff7c96cd1fd1b3bd6a177042ec759e SHA512 1e37af647a37737240de1622bd772e1f154a07c2d27e020487163c42d0833096c1a2f2f2185b8f6371889c2cad3992f0c7a9d233c36941367da743ee7ee8e486
 DIST clhpp-2023.12.14.tar.gz 123233 BLAKE2B 2b23639ad162921e01033fbacc1c4e57d9c28ce39c55b3564f162e5d6b6d9ed0e80aaefbd62de81157e165f01897e82d0ff4943c8ee620587840f4aece22319b SHA512 a90152d2f9c57d4724ef3ea33e1311914e49659042e916e467a9f16877d348ed62f909fe8423589976669b25241a3b996fbd7ac235a44e35947d1b87d3e3ef2b
+DIST clhpp-2024.05.08.tar.gz 124818 BLAKE2B 57b22e1911d8e21b4f7bef1f39f9910dd80eb50844dc7c18b3c75e311991a37577a0671d9e1b10ff3fb3302568118e3fb69987beec6fbe8fc8da85fcd7addda0 SHA512 6396cd67a2edef6a76695857e3e45f7eeb8cdaa8c729197357c6374ac58b41caa37bbe8c3b7a1724d43d3805f8cd5edd53a8ed833d6415bf072745800b744572
diff --git a/dev-cpp/clhpp/clhpp-2023.04.17.ebuild b/dev-cpp/clhpp/clhpp-2023.04.17.ebuild
index 9c106083d8d2..d52bb6938cc5 100644
--- a/dev-cpp/clhpp/clhpp-2023.04.17.ebuild
+++ b/dev-cpp/clhpp/clhpp-2023.04.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,6 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 LICENSE="Khronos-CLHPP"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
 
 # Tests require CMock (NOT cmocka), which is currently not in Gentoo
 # and has been found to be extremely awkward to package.
@@ -33,7 +32,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS=OFF
 		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/clhpp/clhpp-2023.12.14.ebuild b/dev-cpp/clhpp/clhpp-2023.12.14.ebuild
index a9a4c55d1789..624fd2782101 100644
--- a/dev-cpp/clhpp/clhpp-2023.12.14.ebuild
+++ b/dev-cpp/clhpp/clhpp-2023.12.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,6 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 LICENSE="Khronos-CLHPP"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
 
 # Tests require CMock (NOT cmocka), which is currently not in Gentoo
 # and has been found to be extremely awkward to package.
@@ -33,7 +32,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS=OFF
 		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/clhpp/clhpp-2024.05.08.ebuild b/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
new file mode 100644
index 000000000000..cfd7e4b5e780
--- /dev/null
+++ b/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="OpenCL-CLHPP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Tests require CMock (NOT cmocka), which is currently not in Gentoo
+# and has been found to be extremely awkward to package.
+# Should it ever get packaged, consult git history for how to set things up
+# for the clhpp test suite.
+RESTRICT="test"
+
+RDEPEND="virtual/opencl"
+DEPEND="${RDEPEND}
+	>=dev-util/opencl-headers-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTING=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/scnlib/Manifest b/dev-cpp/scnlib/Manifest
index 970d5182f3ea..91f695300901 100644
--- a/dev-cpp/scnlib/Manifest
+++ b/dev-cpp/scnlib/Manifest
@@ -1 +1,2 @@
 DIST scnlib-2.0.3.tar.gz 520197 BLAKE2B 6e0a88985e8113d85d5c511fe9ec857af12a5d34224fee7a41d8347e1e1e9fe7bb78b15bbdafd9c06006112de747c9c3cd6b101d1076b619e33ac7e745668cc4 SHA512 888f60d5a60b2e348001a56a59e123f496f89b09668f0b05791e878528c1c46930963f22e3b64130c875896ace56dffc0d9310edabb4804abf79cc125dfd5ff4
+DIST scnlib-3.0.0.tar.gz 410057 BLAKE2B f5e6336b08063eacfd3c1c53e22559ea808482fba80d190c1c7a40d17e9c31fc776e7b672ca0943781346de99e115e0a3bf60b910f715d90235bef9934465bb4 SHA512 bf768ce47d4717ddbd563f0fa9472ea001d632a42921737d1ac858c63c664fd834247e192f053927f880ce5b6774d47fb684088f5ac5dbc1033a10df22916df1
diff --git a/dev-cpp/scnlib/scnlib-3.0.0.ebuild b/dev-cpp/scnlib/scnlib-3.0.0.ebuild
new file mode 100644
index 000000000000..bcbb76b3741e
--- /dev/null
+++ b/dev-cpp/scnlib/scnlib-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="scanf for modern C++ "
+HOMEPAGE="https://www.scnlib.dev/"
+SRC_URI="https://github.com/eliaskosunen/scnlib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND="
+	dev-cpp/fast_float
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSCN_BENCHMARKS=OFF
+		-DSCN_BENCHMARKS_BINARYSIZE=OFF
+		-DSCN_BENCHMARKS_BUILDTIME=OFF
+		-DSCN_DOCS=OFF
+		-DSCN_EXAMPLES=$(usex test ON OFF)
+		-DSCN_TESTS=$(usex test ON OFF)
+		-DSCN_USE_EXTERNAL_FAST_FLOAT=ON
+		-DSCN_USE_EXTERNAL_GTEST=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/wt/Manifest b/dev-cpp/wt/Manifest
index b571d47b0d76..dc7f45196636 100644
--- a/dev-cpp/wt/Manifest
+++ b/dev-cpp/wt/Manifest
@@ -1,2 +1 @@
-DIST wt-4.10.3.tar.gz 10443169 BLAKE2B f5f6cdb0024001522bfc10b30c0f3b819be643c81a61e66ba548d284749a82b5fda78e10a5c82efd2b1ec0f1bf8ccc29d38dbf0ec0f20eead5be400467440f00 SHA512 cf81f2ec08741aba6c102b5558dccc82623d7073130bbaa9be1168751b3047bd411acf19ac1f20303b722dc5db05b667c7c7cb213fbc6930918b6cff8d1aad6b
 DIST wt-4.10.4.tar.gz 10449928 BLAKE2B 19516d506612590fda1ba626487631397102c5634772e3435a911470d85da42803885368996a59a816400eaf623baad07dccd23c9fe769c6965b27372575aa23 SHA512 f41efec1e77bd76f6f66ffb4ff38c98cfc590debb194682e3c6eb3f7b4366c30f8e2bbc16f4c33faa45f6f49d28812215538d20f4abc6c4dc3a226ae9b10ac71
diff --git a/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch b/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch
new file mode 100644
index 000000000000..655c45986570
--- /dev/null
+++ b/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch
@@ -0,0 +1,79 @@
+diff --git a/src/http/Server.C b/src/http/Server.C
+index 1b21529d..946cd1b6 100644
+--- a/src/http/Server.C
++++ b/src/http/Server.C
+@@ -331,7 +331,7 @@ std::vector<asio::ip::address> Server::resolveAddress(asio::ip::tcp::resolver &r
+       LOG_DEBUG_S(&wt_, "Failed to resolve hostname \"" << address << "\" as IPv4: " <<
+                   Wt::AsioWrapper::system_error(errc).what());
+     // Resolve IPv6
+-    query = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http");
++    auto q = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http");
+     for (Wt::AsioWrapper::asio::ip::tcp::resolver::iterator it = resolver.resolve(query, errc);
+          !errc && it != end; ++it) {
+       result.push_back(it->endpoint().address());
+diff --git a/src/web/FileUtils.C b/src/web/FileUtils.C
+index 122e2a94..c6ce732b 100644
+--- a/src/web/FileUtils.C
++++ b/src/web/FileUtils.C
+@@ -6,6 +6,7 @@
+ 
+ #include "web/FileUtils.h"
+ 
++#include <filesystem>
+ #include <boost/filesystem/operations.hpp>
+ 
+ #include "web/WebUtils.h"
+@@ -45,7 +46,7 @@ namespace Wt {
+ 
+     unsigned long long size(const std::string &file)
+     {
+-      return (unsigned long long) boost::filesystem::file_size(file);
++      return (unsigned long long) std::filesystem::file_size(file);
+     }
+ 
+     std::string* fileToString(const std::string& fileName)
+@@ -60,35 +61,35 @@ namespace Wt {
+ 
+     std::chrono::system_clock::time_point lastWriteTime(const std::string &file)
+     {
+-      return std::chrono::system_clock::from_time_t(boost::filesystem::last_write_time(file));
++      return std::chrono::system_clock::time_point{std::chrono::duration_cast<std::chrono::milliseconds>(std::filesystem::last_write_time(file).time_since_epoch())};
+     }
+ 
+     bool exists(const std::string &file)
+     {
+-      boost::filesystem::path path(file);
+-      return boost::filesystem::exists(path);
++      std::filesystem::path path(file);
++      return std::filesystem::exists(path);
+     }
+ 
+     bool isDirectory(const std::string &file)
+     {
+-      boost::filesystem::path path(file);
+-      return boost::filesystem::is_directory(path);
++      std::filesystem::path path(file);
++      return std::filesystem::is_directory(path);
+     }
+ 
+     void listFiles(const std::string &directory,
+                    std::vector<std::string> &files)
+     {
+-      boost::filesystem::path path(directory);
+-      boost::filesystem::directory_iterator end_itr;
++      std::filesystem::path path(directory);
++      std::filesystem::directory_iterator end_itr;
+ 
+-      if (!boost::filesystem::is_directory(path)) {
++      if (!std::filesystem::is_directory(path)) {
+         std::string error
+           = "listFiles: \"" + directory + "\" is not a directory";
+         LOG_ERROR(error);
+         throw WException(error);
+       }
+ 
+-      for (boost::filesystem::directory_iterator i(path); i != end_itr; ++i) {
++      for (std::filesystem::directory_iterator i(path); i != end_itr; ++i) {
+         std::string f = (*i).path().string();
+         files.push_back(f);
+       }
diff --git a/dev-cpp/wt/wt-4.10.3.ebuild b/dev-cpp/wt/wt-4.10.3.ebuild
deleted file mode 100644
index e9d153bce134..000000000000
--- a/dev-cpp/wt/wt-4.10.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Wt, C++ Web Toolkit"
-HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
-SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc firebird mysql pdf postgres ssl"
-
-DEPEND="
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )
-	dev-libs/boost
-	media-libs/libharu
-	media-gfx/graphicsmagick
-	x11-libs/pango
-	sys-libs/zlib
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qtchooser
-		dev-qt/qthelp
-	)
-"
-# for qt6 dev-qt/qttools[qdoc]
-
-PATCHES=( "${FILESDIR}/wt-no-rundir.patch")
-
-src_configure() {
-	# TODO
-	#-DENABLE_QT6=$(usex qt6)
-
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DBUILD_EXAMPLES=OFF
-		-DINSTALL_DOCUMENTATION=$(usex doc)
-		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
-		-DENABLE_SSL=$(usex ssl)
-		-DENABLE_HARU=$(usex pdf)
-		-DENABLE_PANGO=ON
-		-DENABLE_SQLITE=ON
-		-DENABLE_POSTGRES=$(usex postgres)
-		-DENABLE_FIREBIRD=$(usex firebird)
-		-DENABLE_MYSQL=$(usex mysql)
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=ON
-		-DENABLE_SAML=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/wt/wt-4.10.4.ebuild b/dev-cpp/wt/wt-4.10.4.ebuild
index ea38bb582551..27ba7c4f3bdf 100644
--- a/dev-cpp/wt/wt-4.10.4.ebuild
+++ b/dev-cpp/wt/wt-4.10.4.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	opengl? ( virtual/opengl )
 	postgres? ( dev-db/postgresql )
 	ssl? ( dev-libs/openssl )
-	dev-libs/boost
+	<dev-libs/boost-1.85.0:=
 	media-libs/libharu
 	media-gfx/graphicsmagick[jpeg,png]
 	x11-libs/pango