gentoo auto-resync : 21:05:2024 - 00:05:35

3 files changed, 191 insertions, 1 deletions

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index b543c88c5532..332622108793 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,8 +4,9 @@ AUX boost-1.81.0-disable_icu_rpath.patch 577 BLAKE2B 0e8634a6a4594232238d03ed329
 AUX boost-1.83.0-math-gcc14.patch 936 BLAKE2B 8cf731affa3684692b773ed4941240616a681f4af207fda746351920de12c198aae4a04872632f5ec630d57d2cb8ff7761502df929383977fc528f61678a4c3b SHA512 2d33a19a698e62cc5e2110a1f0e28782abc58cc8ed39fd2dcd9860c664239a51a819aa4c676563a79070b43a72ea898221ae23056c3e176f4a3a2c12bf07bdfc
 AUX boost-1.84.0-signals2-patch1.patch 5250 BLAKE2B 6e620d8e9fe1dbd4b2dbf7aec8c1cc4bdd36935027e1648a3e51f3c11e31ebe13d8100dcdcc40009a4c356e87f0df01ad1ca38327b8926b5de230d81c322f4a8 SHA512 8ab253eb562587b7d796bc559934a1044b475698986f71d2a3c80d19758fd53eea213356a43dcb87861e198dfb0178f86ab7bbfc54d4e6e44092c1502dfec595
 AUX boost-1.84.0-signals2-patch2.patch 783 BLAKE2B 76e989e7df011ecce99e5747ca73997f001d0e76e3453fe952f03b9b8adbcc1f5adbda2935c2a2761eef783e0317d56d36ab3bf63e11875466afa28507a09518 SHA512 4dc438ac7b19edb9640599add2859bd3dfdb58fa53e846c292e1c550e5737daa256d46e14d97ba8dc1e6ea01b0ad0d3075320211d4aba0a48048f0158004378f
+AUX boost-1.85.0-bcp-filesystem.patch 7299 BLAKE2B d2792ee52008955a6f4d233c0a130fe698df7d1e060e9a25a2c058fd7a1ba4c8f6b7a92af773183fa73b0511d7f85f5473d5f9cea1cd71ec08f2db92fa7bd09d SHA512 501f71fa1451af7699689c3befc477e6612612f11a3c33d350d680ce8c511ba9e6765e05aefa9608fe98eca0413a43755cf61fea1a4cd2d03ea0962f7884b452
 DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497
 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0
 EBUILD boost-1.84.0-r3.ebuild 11406 BLAKE2B d0534d67b863800cf37d7e848c69e8b360554dffa8b009959b5b91c85ff69c73e671ac94c07f1e03ae2d52b4ccf6d577526e7402d4f0c95ea93e9e2578444382 SHA512 415ad4e0844fa377fbdfaff5100c44889f30080507a4aa747c866d79bf7aed8b96224c1608cc896c24fe89b6d8c6ba3003adf7789dfb06567465a03254e46ca9
-EBUILD boost-1.85.0.ebuild 11208 BLAKE2B 6ff0a0524300dbbfe9c11f53f8032279d74505fc0f4dae291694e48bffd7f4e69462539729b988c55987600b82d32ba8f675587510c3823c817b1c4b19d8b5df SHA512 2036aec856a546c6a8ca666e2beca3bd574bee8e4db4404a85817fc3969edbc2a63b4572f47fed1c4502c12c10cda639d3542daf924b9eb88e58986a106dbf96
+EBUILD boost-1.85.0.ebuild 11257 BLAKE2B 18f618fc025c4185cb3044a9b9ae7e1a6792aa33523fca975f0a2967aebd8846a40f36b2d8a83dc2bd2d9d0d9694cda546675b494327fd78f5720211adccc840 SHA512 b101dc7141418951015a5617b16cd11a4d5e75b8fb829e9a94e11eb4a259c97b075ba367a8172756c038b543bf5d4983e63f02e858a9f2d16cad5e82017dc850
 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839
diff --git a/dev-libs/boost/boost-1.85.0.ebuild b/dev-libs/boost/boost-1.85.0.ebuild
index 3a6700ea176b..30577a1da191 100644
--- a/dev-libs/boost/boost-1.85.0.ebuild
+++ b/dev-libs/boost/boost-1.85.0.ebuild
@@ -50,6 +50,7 @@ BDEPEND=">=dev-build/b2-5.0.0"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
 	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
+	"${FILESDIR}"/${PN}-1.85.0-bcp-filesystem.patch
 )
 
 create_user-config.jam() {
diff --git a/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch b/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch
new file mode 100644
index 000000000000..23d94040341d
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch
@@ -0,0 +1,188 @@
+https://bugs.gentoo.org/932240
+https://github.com/boostorg/bcp/commit/cd21e9b4a749a77c24facf2da44f01e032c40842
+
+From cd21e9b4a749a77c24facf2da44f01e032c40842 Mon Sep 17 00:00:00 2001
+From: Andrey Semashev <andrey.semashev@gmail.com>
+Date: Sun, 24 Mar 2024 14:49:18 +0300
+Subject: [PATCH] Remove usage of deprecated and removed Boost.Filesystem APIs.
+
+---
+ add_dependent_lib.cpp |  5 +++--
+ add_path.cpp          | 30 +++++++++++++++---------------
+ bcp_imp.hpp           |  1 +
+ copy_path.cpp         |  8 ++++----
+ file_types.cpp        |  2 +-
+ 5 files changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/tools/bcp/add_dependent_lib.cpp b/tools/bcp/add_dependent_lib.cpp
+index 4852914..521b70d 100644
+--- a/tools/bcp/add_dependent_lib.cpp
++++ b/tools/bcp/add_dependent_lib.cpp
+@@ -15,6 +15,7 @@
+ #include "bcp_imp.hpp"
+ #include "fileview.hpp"
+ #include <boost/regex.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <iostream>
+@@ -43,12 +44,12 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st
+    //
+    // Don't add files created by build system:
+    //
+-   if((p.leaf() == "bin") || (p.leaf() == "bin-stage"))
++   if((p.filename() == "bin") || (p.filename() == "bin-stage"))
+       return; 
+    //
+    // Don't add version control directories:
+    //
+-   if((p.leaf() == "CVS") || (p.leaf() == ".svn"))
++   if((p.filename() == "CVS") || (p.filename() == ".svn"))
+       return; 
+    //
+    // don't add directories not under version control:
+diff --git a/tools/bcp/add_path.cpp b/tools/bcp/add_path.cpp
+index 8a1fee3..747bb8c 100644
+--- a/tools/bcp/add_path.cpp
++++ b/tools/bcp/add_path.cpp
+@@ -15,6 +15,7 @@
+ #include "bcp_imp.hpp"
+ #include "fileview.hpp"
+ #include <boost/regex.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <iostream>
+@@ -24,8 +25,7 @@ void bcp_implementation::add_path(const fs::path& p)
+ {
+    if (m_excluded.find(p) != m_excluded.end())
+       return;
+-   fs::path normalized_path = p;
+-    normalized_path.normalize();
++   fs::path normalized_path = p.lexically_normal();
+    if(fs::exists(m_boost_path / normalized_path))
+    {
+       if(fs::is_directory(m_boost_path / normalized_path))
+@@ -45,12 +45,12 @@ void bcp_implementation::add_directory(const fs::path& p)
+    //
+    // Don't add files created by build system:
+    //
+-   if((p.leaf() == "bin") || (p.leaf() == "bin-stage"))
++   if((p.filename() == "bin") || (p.filename() == "bin-stage"))
+       return; 
+    //
+    // Don't add version control directories:
+    //
+-   if((p.leaf() == "CVS") || (p.leaf() == ".svn"))
++   if((p.filename() == "CVS") || (p.filename() == ".svn"))
+       return; 
+    //
+    // don't add directories not under version control:
+@@ -180,7 +180,7 @@ void bcp_implementation::add_file(const fs::path& p)
+          {
+             // only concatonate if it's a relative path
+             // rather than a URL:
+-            fs::path dep(p.branch_path() / s);
++            fs::path dep(p.parent_path() / s);
+             if(!m_dependencies.count(dep)) 
+             {
+                m_dependencies[dep] = p; // set up dependency tree
+@@ -355,13 +355,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile)
+             continue;
+          }
+          include_file = i->str();
+-         fs::path test_file(m_boost_path / p.branch_path() / include_file);
+-         if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
++         fs::path test_file(m_boost_path / p.parent_path() / include_file);
++         if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost"))
+          {
+-            if(!m_dependencies.count(p.branch_path() / include_file)) 
++            if(!m_dependencies.count(p.parent_path() / include_file)) 
+             {
+-               m_dependencies[p.branch_path() / include_file] = p;
+-               add_pending_path(p.branch_path() / include_file);
++               m_dependencies[p.parent_path() / include_file] = p;
++               add_pending_path(p.parent_path() / include_file);
+             }
+          }
+          else if(fs::exists(m_boost_path / include_file))
+@@ -405,13 +405,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile)
+          ++i;
+          continue;
+       }
+-      fs::path test_file(m_boost_path / p.branch_path() / include_file);
+-      if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
++      fs::path test_file(m_boost_path / p.parent_path() / include_file);
++      if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost"))
+       {
+-         if(!m_dependencies.count(p.branch_path() / include_file)) 
++         if(!m_dependencies.count(p.parent_path() / include_file)) 
+          {
+-            m_dependencies[p.branch_path() / include_file] = p;
+-            add_pending_path(p.branch_path() / include_file);
++            m_dependencies[p.parent_path() / include_file] = p;
++            add_pending_path(p.parent_path() / include_file);
+          }
+       }
+       else if(fs::exists(m_boost_path / include_file))
+diff --git a/tools/bcp/bcp_imp.hpp b/tools/bcp/bcp_imp.hpp
+index e515581..51c85ba 100644
+--- a/tools/bcp/bcp_imp.hpp
++++ b/tools/bcp/bcp_imp.hpp
+@@ -14,6 +14,7 @@
+ #include <set>
+ #include <map>
+ #include <queue>
++#include <string>
+ #include <boost/filesystem/path.hpp>
+ 
+ namespace fs = boost::filesystem;
+diff --git a/tools/bcp/copy_path.cpp b/tools/bcp/copy_path.cpp
+index 4143c79..6b7a370 100644
+--- a/tools/bcp/copy_path.cpp
++++ b/tools/bcp/copy_path.cpp
+@@ -49,18 +49,18 @@ void bcp_implementation::copy_path(const fs::path& p)
+    if(fs::exists(m_dest_path / p))
+    {
+       std::cout << "Copying (and overwriting) file: " << p.string() << "\n";
+-     fs::remove(m_dest_path / p);
++      fs::remove(m_dest_path / p);
+    }
+    else
+       std::cout << "Copying file: " << p.string() << "\n";
+    //
+    // create the path to the new file if it doesn't already exist:
+    //
+-   create_path(p.branch_path());
++   create_path(p.parent_path());
+    //
+    // do text based copy if requested:
+    //
+-   if((p.leaf() == "Jamroot") && m_namespace_name.size())
++   if((p.filename() == "Jamroot") && m_namespace_name.size())
+    {
+       static std::vector<char> v1, v2;
+       v1.clear();
+@@ -240,7 +240,7 @@ void bcp_implementation::create_path(const fs::path& p)
+    if(!fs::exists(m_dest_path / p))
+    {
+       // recurse then create the path:
+-      create_path(p.branch_path());
++      create_path(p.parent_path());
+       fs::create_directory(m_dest_path / p);
+    }
+ }
+diff --git a/tools/bcp/file_types.cpp b/tools/bcp/file_types.cpp
+index 297d304..69f6027 100644
+--- a/tools/bcp/file_types.cpp
++++ b/tools/bcp/file_types.cpp
+@@ -52,7 +52,7 @@ bool bcp_implementation::is_binary_file(const fs::path& p)
+       "|"
+       "(Jamfile|makefile|configure)",
+       boost::regex::perl | boost::regex::icase);
+-   return !boost::regex_match(p.leaf().generic_string(), e);
++   return !boost::regex_match(p.filename().generic_string(), e);
+ 
+ }
+ 
+