gentoo auto-resync : 29:05:2024 - 00:07:15

7 files changed, 162 insertions, 3 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a5f1668510d9..6f66f7929088 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 341458f9abaa..6dbe25b4dbf4 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -13,6 +13,7 @@ AUX mongodb-5.0.2-fix-scons.patch 1298 BLAKE2B e2f77fa965328e61c2e5dcdbfce7317a2
 AUX mongodb-5.0.2-no-compass.patch 307 BLAKE2B 7386de453e7349662a1a6ae3f4735ed7519e02ff84444fd38b719d5ba5396fc9000fa83f924e385522e522de8b3330d7b4d7b1c1bcdca51d4fcce0738714b86d SHA512 07fe714a4256c13449e1e764c88d5051773aa9397228085a8d581cde91477dff2c3dc70ba801eb559af76ff19abf205d32c9510606a9bb26cebb33f68822e607
 AUX mongodb-5.0.2-skip-no-exceptions.patch 552 BLAKE2B e499cc0f0885e09b2c18ddb8ac5fb85a2bfa3c9a81d1b877b20f1fc8b1908df26faf330e386d688e6ea163e81e404170454d840539146d7d313b3dc8b7753c2e SHA512 6750b5d8427616b290d285959c0c43a28409349ae7b52153d524590a8a38c26c283acc25b82410853b5c87a4c74927cf5844580778d1ef4378cd1b035844dc97
 AUX mongodb-5.0.2-skip-reqs-check.patch 766 BLAKE2B 907dbab7e19cb159d5f7df36c725415612290889192bd1118fc445ee86d0bc58a03d4ff92d71d7c2c18e6c480fb542d8880980e3ed499ebbeae113a0b4c360d3 SHA512 29d4ff6de3a89c39ed0e3c54aa1e17fc3466ceb69dfbcfc62109ea2666ca98458b7b23ac82e4b5c9be77d5d82c69d5b213670b3a3367b13c3b8cab06cfacf4c2
+AUX mongodb-5.0.26-boost-1.85.patch 5997 BLAKE2B 1ce29e4589889a24c04a6b705ef83fa4ada74c25bae1f394f82225eb9a199d116630f394ab614315801f460756e8061f00c5c2d20086dbcea7d3fb887a4d3a13 SHA512 a4058ac0faf80ac5928969f85171d99718a20df4336a150e7d8e0ec98ce35632a599df2f2b36e0a1a6976da7c331770648ff91687054338b2d89e4b4a38f1c92
 AUX mongodb-5.0.5-boost-1.81-extra.patch 279 BLAKE2B e851be4110cc65533ec35bdc80fccba53cdccd1e88608f72eeb8ac00fd110d2a1e977638ff69b7bd91e4d58b559f558c25f33488b0ed9e5a2a9c7d817ed87736 SHA512 bef7b01b7a543bc938a640e4fe28d3cabe17690b1051566a42327dfbc7a56401125a677823193fe1059a74f4aadb585b5b1eb560f2c137c80c35a9fef0ced63d
 AUX mongodb-5.0.5-no-force-lld.patch 2647 BLAKE2B 7759b2a1172e93ce92f5e528236946a2da691362864053f1fe26c61e7332bbc755daebc501d51a51a679661e29c0158277a8e984ad5500aee934e070543a9ccc SHA512 76c6e9aaf86fb62f3d9b887160971390541be5e9c99172ad281d455436f17fc7b7b74120726505d5307371964930261f5348e54e5240bd8a66296b0d210db0e2
 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
@@ -30,5 +31,5 @@ DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634
 EBUILD mongodb-4.4.20.ebuild 5166 BLAKE2B 2cbbe01c324473eb74834b474fc13ee1e38a8e2ed3a1f471afc99d596434db41fd2697e36e87c0077da418f7a36c320221b192063e549f75c2366b1c4db0f4f8 SHA512 e3c9b4383892226232e70ee600f6b2d87c79967e04f290598657dc8618df3bd774601df6e6897d80c6d49ebc5b183cd443d82068da4eb1ede094c522292a0a7a
 EBUILD mongodb-4.4.29.ebuild 5390 BLAKE2B 37c15937cd50a12631c0008adbe5d7f1c45ee2d3d7694b7dd482cbcaa8472f2448cbd3901367be4d210cc90e65f794ece12525125b97ecea60fbf756200178b2 SHA512 fbef97744213d897824d24a55f41a69e8dd50df87525be4ef382b6614d9987ab3c3733a3a897df5ece1bfaaa6eacd94aaaef3f5c15fb174f4a0d678a4e67aca2
 EBUILD mongodb-5.0.16-r1.ebuild 5580 BLAKE2B 5b03069e397d7c557dce111edf565e27a5609b0d634818825e73e2fec5939909d1abefc3b24e0e4b88757c2c9d9af6fbaafa3029f5ad91a96ed4b64bd5c1ccae SHA512 be046025e299a3b3de9592babaacbaca575fa1b67bc046b17a792dece61f6c3bfaa7aed92211f467004fb902c877ae045f7a6fa8bbc563f1281352982a9f2c6e
-EBUILD mongodb-5.0.26.ebuild 5910 BLAKE2B eaaf5af00ac6c39590fcbafd526a4018d02a1f64ae06a3d4c531747e4500265e694c4e71378d9b88a1c1acf85ec2da4b0dfbf5ef67a486f12ed465556fedba2c SHA512 d36085a282627196a9f380a7bf111bb1800841e1bd2c194646dbefaab48df0452b432ef6c158b425c8d10930250120653db704a8eec2e1ce462072988a0ecdfe
+EBUILD mongodb-5.0.26.ebuild 5954 BLAKE2B d105d1ea8b83afcd17be44b0efb8d34747e53dec01dcc8a60f6b318d1860277d20a557a91b5256b62db7ea5ddfbda00de6214e584e1ac930d89d227f18d97d6e SHA512 36a27adbc7779af0bfbbd754275577bc4031d418d7a3af1b89a2f331fff2a9867ef403996a44a799f4b49114bc26aec1177a8f24e95cb6662e98047f885e89b9
 MISC metadata.xml 931 BLAKE2B 7ac7f9f4c2f048262d980577ef99c4a4200b805ea32976309bc68abaa7d0afc6818d1a24351b4850a7855f6f3e73bd0fd8241326c8a81484815342ba85c2e3ea SHA512 86fc063b5759fe7af2dd288897b8bff77e0d64a934abee3a68c0e0fb4454d67f0ced71e092257004885e375f2f17fd50577bacff802882d2dedff8306cfdf3d2
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
new file mode 100644
index 000000000000..71da50fe21eb
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
@@ -0,0 +1,139 @@
+https://bugs.gentoo.org/932251
+https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539
+https://bugs.gentoo.org/932251#c3
+
+--- a/src/mongo/db/initialize_server_global_state.cpp
++++ b/src/mongo/db/initialize_server_global_state.cpp
+@@ -34,7 +34,7 @@
+ #include "mongo/db/initialize_server_global_state.h"
+ #include "mongo/db/initialize_server_global_state_gen.h"
+ 
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+ #include <fmt/format.h>
+ #include <iostream>
+ #include <memory>
+@@ -328,7 +328,7 @@
+                                         << "\" should name a file, not a directory.");
+             }
+ 
+-            if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
++            if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
+                 std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename();
+                 boost::system::error_code ec;
+                 boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
+--- a/src/mongo/db/startup_warnings_mongod.cpp
++++ b/src/mongo/db/startup_warnings_mongod.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/startup_warnings_mongod.h"
+ 
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/exception.hpp>
+ #include <fstream>
+ #ifndef _WIN32
+ #include <sys/resource.h>
+--- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
++++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
+@@ -55,7 +55,7 @@
+     // if called without a fully qualified path it asserts; that makes mongoperf fail.
+     // so make a warning. need a better solution longer term.
+     // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
+-    if (!file.has_branch_path()) {
++    if (!file.has_parent_path()) {
+         LOGV2(22274,
+               "warning flushMyDirectory couldn't find parent dir for file: {file}",
+               "flushMyDirectory couldn't find parent dir for file",
+@@ -64,7 +64,7 @@
+     }
+ 
+ 
+-    boost::filesystem::path dir = file.branch_path();  // parent_path in new boosts
++    boost::filesystem::path dir = file.parent_path();  // parent_path in new boosts
+ 
+     LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
+ 
+--- a/src/mongo/db/storage/storage_engine_metadata.cpp
++++ b/src/mongo/db/storage/storage_engine_metadata.cpp
+@@ -220,7 +220,7 @@
+     // if called without a fully qualified path it asserts; that makes mongoperf fail.
+     // so make a warning. need a better solution longer term.
+     // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
+-    if (!file.has_branch_path()) {
++    if (!file.has_parent_path()) {
+         LOGV2(22283,
+               "warning flushMyDirectory couldn't find parent dir for file: {file}",
+               "flushMyDirectory couldn't find parent dir for file",
+@@ -229,7 +229,7 @@
+     }
+ 
+ 
+-    boost::filesystem::path dir = file.branch_path();  // parent_path in new boosts
++    boost::filesystem::path dir = file.parent_path();  // parent_path in new boosts
+ 
+     LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
+ 
+--- a/src/mongo/scripting/engine.cpp
++++ b/src/mongo/scripting/engine.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <algorithm>
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ 
+ #include "mongo/base/string_data.h"
+ #include "mongo/client/dbclient_base.h"
+--- a/src/mongo/shell/shell_utils_launcher.cpp
++++ b/src/mongo/shell/shell_utils_launcher.cpp
+@@ -39,6 +39,7 @@
+ #include <boost/iostreams/stream.hpp>
+ #include <boost/iostreams/stream_buffer.hpp>
+ #include <boost/iostreams/tee.hpp>
++#include <boost/filesystem.hpp>
+ #include <fcntl.h>
+ #include <fmt/format.h>
+ #include <iostream>
+@@ -947,26 +948,26 @@
+     boost::filesystem::directory_iterator i(from);
+     while (i != end) {
+         boost::filesystem::path p = *i;
+-        if (p.leaf() == "metrics.interim" || p.leaf() == "metrics.interim.temp") {
++        if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") {
+             // Ignore any errors for metrics.interim* files as these may disappear during copy
+             boost::system::error_code ec;
+-            boost::filesystem::copy_file(p, to / p.leaf(), ec);
++            boost::filesystem::copy_file(p, to / p.filename(), ec);
+             if (ec) {
+                 LOGV2_INFO(22814,
+                            "Skipping copying of file from '{from}' to "
+                            "'{to}' due to: {error}",
+                            "Skipping copying of file due to error"
+                            "from"_attr = p.generic_string(),
+-                           "to"_attr = (to / p.leaf()).generic_string(),
++                           "to"_attr = (to / p.filename()).generic_string(),
+                            "error"_attr = ec.message());
+             }
+-        } else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") {
++        } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") {
+             if (boost::filesystem::is_directory(p)) {
+-                boost::filesystem::path newDir = to / p.leaf();
++                boost::filesystem::path newDir = to / p.filename();
+                 boost::filesystem::create_directory(newDir);
+                 copyDir(p, newDir);
+             } else {
+-                boost::filesystem::copy_file(p, to / p.leaf());
++                boost::filesystem::copy_file(p, to / p.filename());
+             }
+         }
+         ++i;
+--- a/src/mongo/shell/shell_utils_launcher.h
++++ b/src/mongo/shell/shell_utils_launcher.h
+@@ -29,7 +29,7 @@
+ 
+ #pragma once
+ 
+-#include <boost/filesystem/convenience.hpp>
++#include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <sstream>
+ #include <string>
+
diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild
index a31c0680250e..e8682cfd4a0e 100644
--- a/dev-db/mongodb/mongodb-5.0.26.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.26.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 -riscv"
+KEYWORDS="amd64 ~arm64 -riscv"
 CPU_FLAGS="cpu_flags_x86_avx"
 IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}"
 
@@ -74,6 +74,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
 	"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
 	"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
+	"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
 )
 
 python_check_deps() {
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 912b7263fa30..258ca51d8fdc 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,5 @@
+AUX sqlitebrowser-3.12.2-str-conflict-fix.patch 392 BLAKE2B 95e4f5fac505e80ed9efcf8288d286ba4c49f719c9321abf1dddd7db72ce233f256398fa464e82899c7ede6f8bec37f72ffd36df1d5bb7a0476778c2d29651ac SHA512 7d721cc1a5d7c9b65a5ef2929cb57bbf34a87bda958c6b9b5f04615cc17f55ab6b047b68ea200bd1cd9068440d6d70d04d1127ab0c86754778b1a6ca7753c811
 DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
-EBUILD sqlitebrowser-3.12.2-r2.ebuild 1479 BLAKE2B 55661f5aba8603bea10b003078982dc0d22cbc7038eb3222b1bc0dd8fe5138d5e974cc532f1636b95c29241089e0764227858a492c3e2fe75fc38eca9bc11fbf SHA512 d239d66fd47c4174ccec551e0c30fff4900c5e9014e20b9d4fd8ff69e91b5c69244f113e427f0191cc690891d766869cb4adf5bb96f96cbc17053abdd6bcd9cc
+EBUILD sqlitebrowser-3.12.2-r2.ebuild 1535 BLAKE2B 3fe27ae93a14ab60a885d606e80098544a4116fa292b6514507d43b278fd8aa959cb9ef7ee8d60780cf0fc66a3cc6ee1afa4c5feac9502b193ad8c969b5694f6 SHA512 cd37dba1e4a630a864c5813af65517bd75baa0e74752f10f6ecc3fea0bc1b9fa53b530d1586aef08fb226275aedc79a17971d73b3e68a9e40122069b39c8ec2a
 EBUILD sqlitebrowser-9999.ebuild 1479 BLAKE2B 55661f5aba8603bea10b003078982dc0d22cbc7038eb3222b1bc0dd8fe5138d5e974cc532f1636b95c29241089e0764227858a492c3e2fe75fc38eca9bc11fbf SHA512 d239d66fd47c4174ccec551e0c30fff4900c5e9014e20b9d4fd8ff69e91b5c69244f113e427f0191cc690891d766869cb4adf5bb96f96cbc17053abdd6bcd9cc
 MISC metadata.xml 1796 BLAKE2B 988ec79d4d043ecbf8802aa3d761868479fc0a398a00035c387aa4b362e2c6c59afbbd04d648d2084aa0d9d35972336cd312c4b596e663e5142ce72671e70a55 SHA512 6b0e05517590c7c56cabc1bfecfafed155be78ccff4d159fd810b3c8e6555559c45fba3ea3bdf0aef73d1c1a1d8fcabc7005c2e7dbb3b6377d14505c819355d7
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
new file mode 100644
index 000000000000..07284ca8ba0c
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
@@ -0,0 +1,13 @@
+--- a/src/version.h
++++ b/src/version.h
+@@ -4,8 +4,8 @@
+ #define MINOR_VERSION 12
+ #define PATCH_VERSION 2
+ 
+-#define str(s) #s
+-#define xstr(s) str(s)
++#define stringize(s) #s
++#define xstr(s) stringize(s)
+ #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION)
+ 
+ // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format.
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
index 47ce7cb6cacc..0b6665b1dd80 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
@@ -46,6 +46,10 @@ RDEPEND="
 	>=dev-qt/qtsvg-5.5:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-str-conflict-fix.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare