4 files changed, 80 insertions, 66 deletions
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