* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2022-05-14 21:50 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-05-14 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 5e5b47da8f273d33e6925688c794be2332ab5142
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:49:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:49:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5b47da
dev-db/mongodb: fix build with Boost 1.79 (for Mongo 4.4.10)
Closes: https://bugs.gentoo.org/843290
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mongodb/files/mongodb-4.4.10-boost-1.79.patch | 84 ++++++++++++++++++++++
dev-db/mongodb/mongodb-4.4.10-r1.ebuild | 5 ++
2 files changed, 89 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch
new file mode 100644
index 000000000000..df7dbc001b05
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch
@@ -0,0 +1,84 @@
+diff --git a/src/mongo/db/auth/security_key_test.cpp b/src/mongo/db/auth/security_key_test.cpp
+index fc1787b5..70b977c1 100644
+--- a/src/mongo/db/auth/security_key_test.cpp
++++ b/src/mongo/db/auth/security_key_test.cpp
+@@ -30,6 +30,7 @@
+ #include "mongo/platform/basic.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+
+ #include "mongo/base/string_data.h"
+ #include "mongo/db/auth/authorization_manager.h"
+diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp
+index 22b76a6a..ec5bcece 100644
+--- a/src/mongo/db/storage/storage_repair_observer.cpp
++++ b/src/mongo/db/storage/storage_repair_observer.cpp
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #endif
+
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/db/dbhelpers.h"
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+index 01bb7806..78c15609 100644
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/storage/kv/kv_engine_test_harness.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <memory>
+
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+index 58e85385..0f8a5148 100644
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+@@ -36,6 +36,7 @@
+ #include <limits>
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/base/simple_string_data_comparator.h"
+diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
+index 8cd7f035..cd672eb5 100644
+--- a/src/mongo/shell/shell_utils_extended.cpp
++++ b/src/mongo/shell/shell_utils_extended.cpp
+@@ -37,6 +37,7 @@
+ #endif
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <fstream>
+
+ #include "mongo/bson/bson_validate.h"
+diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
+index de4b84bc..b01fa7a2 100644
+--- a/src/mongo/util/processinfo_linux.cpp
++++ b/src/mongo/util/processinfo_linux.cpp
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <malloc.h>
+ #include <pcrecpp.h>
++#include <fstream>
+ #include <sched.h>
+ #include <stdio.h>
+ #include <sys/mman.h>
+diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
+index 4667a261..73a36015 100644
+--- a/src/mongo/util/stacktrace_threads.cpp
++++ b/src/mongo/util/stacktrace_threads.cpp
+@@ -36,6 +36,7 @@
+ #include <array>
+ #include <atomic>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <cctype>
+ #include <cstdint>
+ #include <cstdlib>
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
index a110d8e1be17..aa4c846908a2 100644
--- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.1-boost.patch"
"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+ "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
)
S="${WORKDIR}/${MY_P}"
@@ -121,6 +122,10 @@ src_configure() {
use lto && scons_opts+=( --lto=on )
use ssl && scons_opts+=( --ssl )
+ # Needed to avoid forcing FORTIFY_SOURCE
+ # Gentoo's toolchain applies these anyway
+ scons_opts+=( --runtime-hardening=off )
+
# respect mongoDB upstream's basic recommendations
# see bug #536688 and #526114
if ! use debug; then
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2025-05-06 19:32 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2025-05-06 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 8ee176dbe6fb61293b3b0ac57d859261e0ca902e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 6 19:27:34 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 6 19:32:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee176db
dev-db/mongodb: move all patches to devspae
Wanted to do this after because the patches are a mess and having
some history for them is good.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mongodb/Manifest | 4 +
| 16 --
dev-db/mongodb/files/mongodb-4.4.1-boost.patch | 21 --
.../mongodb/files/mongodb-4.4.10-boost-1.81.patch | 317 ---------------------
.../files/mongodb-4.4.29-no-enterprise.patch | 24 --
.../files/mongodb-5.0.16-arm64-assert.patch | 16 --
.../mongodb/files/mongodb-5.0.2-boost-1.79.patch | 71 -----
dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch | 47 ---
.../mongodb/files/mongodb-5.0.2-no-compass.patch | 12 -
.../files/mongodb-5.0.2-skip-no-exceptions.patch | 13 -
.../files/mongodb-5.0.2-skip-reqs-check.patch | 24 --
| 16 --
.../mongodb/files/mongodb-5.0.26-boost-1.85.patch | 130 ---------
...db-5.0.26-mozjs-remove-unused-constructor.patch | 25 --
dev-db/mongodb/files/mongodb-5.0.26-scons.patch | 27 --
dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch | 12 -
dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch | 13 -
| 11 -
.../mongodb/files/mongodb-5.0.5-no-force-lld.patch | 49 ----
.../mongodb/files/mongodb-6.0.0-boost-1.79.patch | 81 ------
dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch | 12 -
.../files/mongodb-6.0.2-sconstruct-changes.patch | 110 -------
.../mongodb/files/mongodb-6.0.21-boost-1.85.patch | 182 ------------
dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch | 24 --
.../mongodb/files/mongodb-6.0.22-boost-1.85.patch | 286 -------------------
dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch | 12 -
.../mongodb/files/mongodb-7.0.1-sconstruct.patch | 132 ---------
.../mongodb/files/mongodb-7.0.18-boost-1.85.patch | 204 -------------
.../mongodb/files/mongodb-7.0.2-sconstruct.patch | 253 ----------------
dev-db/mongodb/files/mongodb-8.0.4-scons.patch | 40 ---
.../files/mongodb-8.0.6-fixes-for-boost-1.85.patch | 267 -----------------
...odb-8.0.6-mozjs-remove-unused-constructor.patch | 28 --
.../files/mongodb-8.0.6-skip-reqs-check.patch | 24 --
.../mongodb/files/mongodb-8.0.6-use-tenacity.patch | 37 ---
dev-db/mongodb/mongodb-5.0.30.ebuild | 51 ++--
dev-db/mongodb/mongodb-6.0.22.ebuild | 35 +--
dev-db/mongodb/mongodb-7.0.18.ebuild | 31 +-
dev-db/mongodb/mongodb-8.0.8.ebuild | 33 +--
38 files changed, 81 insertions(+), 2609 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 56cbacb4d034..f59978fe978c 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,8 @@
+DIST mongodb-5.0.30-patches.tar.xz 9652 BLAKE2B d0780026c4b2dd4e0968e3699eeeed4c4db14bce93bf6bce8141f9d6a3b3b4579b4496494b2e0ebdb00ac1e316a55723625b64bac9ebf032d4ae6dc7e1691fd7 SHA512 8d1032b99f1cf0087f1562c53fbed33815a2becd8641ab9373c8a474e23f1bb148b712cbebac1da4038ec9e4e3a5249fb9bdfe864ca626d4b9fc221bd91b7dd6
DIST mongodb-5.0.30.gh.tar.gz 57312372 BLAKE2B 72b026115cf3c8b1b81857bc5bffcd5b72bae4b581a7ada598bc7bbe594f264f581212159788113c5709ab751dd8a57943a3cc9b78f0d31aeb50375fa1da2c28 SHA512 97642da12cf199fa3f17825b1eb20e4d9bc1f65c8950f54b36347af11b6964cdd2007d11b01147d0c253077ef14121de52517c1739b433b49a9cbbe2596d9d05
+DIST mongodb-6.0.22-patches.tar.xz 8820 BLAKE2B 973e58d0a09d8fb160beefd46b425b0f5dd7ad531f9ccec433fd201517035613c171cddaf5d3cf2883f57d4728438572062cc5c8b9166e15d8e5701efcd8b84c SHA512 fa8f18d259e829df07ec26ab570de9b3968b9b02ed195b47d7a2bfc832f2b7e74a5aaf58e54cfe6d01ea7e3d76efdad2e1efca0da4af0b0d3f50944dfd1fd4e0
DIST mongodb-6.0.22.gh.tar.gz 87688277 BLAKE2B 1ff5206cb996763ca051129572eb9bf6f8cff0ceeae7f86c4472e49a7d2210de602beead53d3aba7d8ee3b168a50a2505b8cfc91cd22968dd39a42ba13432e73 SHA512 4a3258b22d31ee81d5932d82dc5d19aec0b3648593d57cedd21b74c46bf4bfea833a519f4e90c1f2f860aa46781297dd16b7324145713e36eee81d41e684c420
+DIST mongodb-7.0.18-patches.tar.xz 9036 BLAKE2B d52032a7bd82a5bffd3536a14d346750b9c093387dd5cb2cf618e32410ccc22e3c5e89a4947d948c16dc8fa4c34388b7ffcc3321723dfa2b2730db763acc2f69 SHA512 5e6e5b29a2c500e6be7fb3e9b83a5f88fde0182e070af15e4d04dede82a6cea8957e1fc0ea329f0cd8a51565de9e51c7ae1d0e7f2ca021e5391cabb337752d40
DIST mongodb-7.0.18.gh.tar.gz 87225100 BLAKE2B 7ede32f4c6b6968ee8d797ce71457133020a3e4a039cd0db914e344e5042a0b871deb5741f86098b2e82b9ff619a511a754a06a29dcbb9527a3b7a7edf52b3ac SHA512 599767db66e95d8dd0bd0e6d51fd70129ea6df1e18a0cdaa52bc6cbe301c982684ff5aab446c50cb825573051e372d8f791aeab7df58e2a4d855e6073f2b46d5
+DIST mongodb-8.0.8-patches.tar.xz 8076 BLAKE2B 860c76266f7db7de846c7a791c8a0eb680b0587f6600e6d71bcaae666dda12073fb3613bfe768aa042b54081287b271cb91f4f8c4d5c9232ce7f318ffcff08bb SHA512 c9d96fd16d7790ec459ac839be4aa0076d48e936abdd80e910d1ebc6010652c43291f69e379dd4322f76276c8bb2072c52977e7f30a36d92efbda1161f9a5a13
DIST mongodb-8.0.8.gh.tar.gz 94643838 BLAKE2B c559af9f3b2d1a3ad7139cd9476114bd6c990a1269f4dedf3010118c5e182689703c731ca04fba0bcce91c4f05c521fbbf0556c8b76af27fa10298f0258b5921 SHA512 28fb8455ae4290f9f704e69fcc78c939751ed95a4cbff6f6af55786a10606c1431f9c450b343486bc7b21177b0a3dab04fe088a76a9b8740a207e2cd770cd5eb
diff --git a/dev-db/mongodb/files/extrapatch-sconstruct.patch b/dev-db/mongodb/files/extrapatch-sconstruct.patch
deleted file mode 100644
index 21c09bc5c9a1..000000000000
--- a/dev-db/mongodb/files/extrapatch-sconstruct.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
- # setting it for both C and C++ by setting both of CFLAGS and
- # CXXFLAGS.
-
-+ arm_march_flag = "armv8-a"
-+ if get_option('use-hardware-crc32') == "on":
-+ arm_march_flag += "+crc"
-+
- default_targeting_flags_for_architecture = {
-- "aarch64": {"-march=": "armv8.2-a", "-mtune=": "generic"},
-+ "aarch64": {"-march=": arm_march_flag, "-mtune=": "generic"},
- "i386": {"-march=": "nocona", "-mtune=": "generic"},
- "ppc64le": {"-mcpu=": "power8", "-mtune=": "power8", "-mcmodel=": "medium"},
- "s390x": {"-march=": "z196", "-mtune=": "zEC12"},
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-boost.patch b/dev-db/mongodb/files/mongodb-4.4.1-boost.patch
deleted file mode 100644
index d14f6fe3052f..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.1-boost.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
- "BOOST_LOG_NO_SHORTHAND_NAMES",
- "BOOST_LOG_USE_NATIVE_SYSLOG",
- "BOOST_LOG_WITHOUT_THREAD_ATTR",
-+ "BOOST_LOG_DYN_LINK",
- "ABSL_FORCE_ALIGNED_ACCESS",
- ]
- )
-
-- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-- conf.env.AppendUnique(
-- CPPDEFINES=[
-- "BOOST_LOG_DYN_LINK",
-- ]
-- )
--
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
- myenv.ConfError("can't find boost headers")
diff --git a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch
deleted file mode 100644
index 331f0c5b922a..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-https://bugs.gentoo.org/887037
-
-Workaround https://github.com/boostorg/container/commit/99091420ae553b27345e04279fd19fe24fb684c1
-in Boost 1.81.
-
-Upstream s2 (as in real upstream, not MongoDB) has deviated substantially
-from the version vendored.
---- a/src/third_party/s2/base/stl_decl_msvc.h
-+++ b/src/third_party/s2/base/stl_decl_msvc.h
-@@ -118,8 +118,8 @@ namespace msvchash {
- class hash_multimap;
- } // end namespace msvchash
-
--using msvchash::hash_set;
--using msvchash::hash_map;
-+using msvchash::hash_set = my_hash_set;
-+using msvchash::hash_map = my_hash_map;
- using msvchash::hash;
- using msvchash::hash_multimap;
- using msvchash::hash_multiset;
---- a/src/third_party/s2/base/stl_decl_osx.h
-+++ b/src/third_party/s2/base/stl_decl_osx.h
-@@ -68,8 +68,8 @@ using std::string;
-
- using namespace std;
- using __gnu_cxx::hash;
--using __gnu_cxx::hash_set;
--using __gnu_cxx::hash_map;
-+using __gnu_cxx::hash_set = my_hash_set;
-+using __gnu_cxx::hash_map = my_hash_map;
- using __gnu_cxx::select1st;
-
- /* On Linux (and gdrive on OSX), this comes from places like
---- a/src/third_party/s2/hash.h
-+++ b/src/third_party/s2/hash.h
-@@ -2,10 +2,10 @@
- #define THIRD_PARTY_S2_HASH_H_
-
- #include <unordered_map>
--#define hash_map std::unordered_map
-+#define my_hash_map std::unordered_map
-
- #include <unordered_set>
--#define hash_set std::unordered_set
-+#define my_hash_set std::unordered_set
-
- #define HASH_NAMESPACE_START namespace std {
- #define HASH_NAMESPACE_END }
---- a/src/third_party/s2/s2_test.cc
-+++ b/src/third_party/s2/s2_test.cc
-@@ -10,7 +10,7 @@ using std::reverse;
-
- #include <hash_set>
- #include <hash_map>
--using __gnu_cxx::hash_set;
-+using __gnu_cxx::hash_set = my_hash_map;
-
- #include "s2.h"
- #include "base/logging.h"
-@@ -709,8 +709,8 @@ TEST(S2, Frames) {
- #if 0
- TEST(S2, S2PointHashSpreads) {
- int kTestPoints = 1 << 16;
-- hash_set<size_t> set;
-- hash_set<S2Point> points;
-+ my_hash_set<size_t> set;
-+ my_hash_set<S2Point> points;
- hash<S2Point> hasher;
- S2Point base = S2Point(1, 1, 1);
- for (int i = 0; i < kTestPoints; ++i) {
-@@ -733,7 +733,7 @@ TEST(S2, S2PointHashCollapsesZero) {
- double minus_zero = -zero;
- EXPECT_NE(*reinterpret_cast<uint64 const*>(&zero),
- *reinterpret_cast<uint64 const*>(&minus_zero));
-- hash_map<S2Point, int> map;
-+ my_hash_map<S2Point, int> map;
- S2Point zero_pt(zero, zero, zero);
- S2Point minus_zero_pt(minus_zero, minus_zero, minus_zero);
-
---- a/src/third_party/s2/s2cellid_test.cc
-+++ b/src/third_party/s2/s2cellid_test.cc
-@@ -10,7 +10,7 @@ using std::reverse;
-
- #include <cstdio>
- #include <hash_map>
--using __gnu_cxx::hash_map;
-+using __gnu_cxx::hash_map = my_hash_map;
-
- #include <sstream>
- #include <vector>
-@@ -170,7 +170,7 @@ TEST(S2CellId, Tokens) {
- static const int kMaxExpandLevel = 3;
-
- static void ExpandCell(S2CellId const& parent, vector<S2CellId>* cells,
-- hash_map<S2CellId, S2CellId>* parent_map) {
-+ my_hash_map<S2CellId, S2CellId>* parent_map) {
- cells->push_back(parent);
- if (parent.level() == kMaxExpandLevel) return;
- int i, j, orientation;
-@@ -194,7 +194,7 @@ static void ExpandCell(S2CellId const& parent, vector<S2CellId>* cells,
-
- TEST(S2CellId, Containment) {
- // Test contains() and intersects().
-- hash_map<S2CellId, S2CellId> parent_map;
-+ my_hash_map<S2CellId, S2CellId> parent_map;
- vector<S2CellId> cells;
- for (int face = 0; face < 6; ++face) {
- ExpandCell(S2CellId::FromFacePosLevel(face, 0, 0), &cells, &parent_map);
---- a/src/third_party/s2/s2loop.cc
-+++ b/src/third_party/s2/s2loop.cc
-@@ -120,7 +120,7 @@ bool S2Loop::IsValid(string* err) const {
- }
- }
- // Loops are not allowed to have any duplicate vertices.
-- hash_map<S2Point, int> vmap;
-+ my_hash_map<S2Point, int> vmap;
- for (int i = 0; i < num_vertices(); ++i) {
- if (!vmap.insert(make_pair(vertex(i), i)).second) {
- VLOG(2) << "Duplicate vertices: " << vmap[vertex(i)] << " and " << i;
---- a/src/third_party/s2/s2polygon.cc
-+++ b/src/third_party/s2/s2polygon.cc
-@@ -117,7 +117,7 @@ HASH_NAMESPACE_END
- bool S2Polygon::IsValid(const vector<S2Loop*>& loops, string* err) {
- // If a loop contains an edge AB, then no other loop may contain AB or BA.
- if (loops.size() > 1) {
-- hash_map<S2PointPair, pair<int, int> > edges;
-+ my_hash_map<S2PointPair, pair<int, int> > edges;
- for (size_t i = 0; i < loops.size(); ++i) {
- S2Loop* lp = loops[i];
- for (int j = 0; j < lp->num_vertices(); ++j) {
---- a/src/third_party/s2/s2polygonbuilder.cc
-+++ b/src/third_party/s2/s2polygonbuilder.cc
-@@ -175,7 +175,7 @@ S2Loop* S2PolygonBuilder::AssembleLoop(S2Point const& v0, S2Point const& v1,
- // This ensures that only CCW loops are constructed when possible.
-
- vector<S2Point> path; // The path so far.
-- hash_map<S2Point, int> index; // Maps a vertex to its index in "path".
-+ my_hash_map<S2Point, int> index; // Maps a vertex to its index in "path".
- path.push_back(v0);
- path.push_back(v1);
- index[v1] = 1;
-@@ -361,7 +361,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) {
-
- // First, we build the set of all the distinct vertices in the input.
- // We need to include the source and destination of every edge.
-- hash_set<S2Point> vertices;
-+ my_hash_set<S2Point> vertices;
- for (EdgeSet::const_iterator i = edges_->begin(); i != edges_->end(); ++i) {
- vertices.insert(i->first);
- VertexSet const& vset = i->second;
-@@ -370,7 +370,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) {
- }
-
- // Build a spatial index containing all the distinct vertices.
-- for (hash_set<S2Point>::const_iterator i = vertices.begin();
-+ for (my_hash_set<S2Point>::const_iterator i = vertices.begin();
- i != vertices.end(); ++i) {
- index->Insert(*i);
- }
-@@ -378,7 +378,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) {
- // Next, we loop through all the vertices and attempt to grow a maximial
- // mergeable group starting from each vertex.
- vector<S2Point> frontier, mergeable;
-- for (hash_set<S2Point>::const_iterator vstart = vertices.begin();
-+ for (my_hash_set<S2Point>::const_iterator vstart = vertices.begin();
- vstart != vertices.end(); ++vstart) {
- // Skip any vertices that have already been merged with another vertex.
- if (merge_map->find(*vstart) != merge_map->end()) continue;
---- a/src/third_party/s2/s2polygonbuilder.h
-+++ b/src/third_party/s2/s2polygonbuilder.h
-@@ -262,7 +262,7 @@ class S2PolygonBuilder {
- // current position to a new position, and also returns a spatial index
- // containing all of the vertices that do not need to be moved.
- class PointIndex;
-- typedef hash_map<S2Point, S2Point> MergeMap;
-+ typedef my_hash_map<S2Point, S2Point> MergeMap;
- void BuildMergeMap(PointIndex* index, MergeMap* merge_map);
-
- // Moves a set of vertices from old to new positions.
-@@ -282,7 +282,7 @@ class S2PolygonBuilder {
- // once. We could have also used a multiset<pair<S2Point, S2Point> >,
- // but this representation is a bit more convenient.
- typedef multiset<S2Point> VertexSet;
-- typedef hash_map<S2Point, VertexSet> EdgeSet;
-+ typedef my_hash_map<S2Point, VertexSet> EdgeSet;
- scoped_ptr<EdgeSet> edges_;
-
- // Unique collection of the starting (first) vertex of all edges,
---- a/src/third_party/s2/s2regioncoverer.cc
-+++ b/src/third_party/s2/s2regioncoverer.cc
-@@ -321,7 +321,7 @@ void S2RegionCoverer::GetInteriorCellUnion(S2Region const& region,
-
- void S2RegionCoverer::FloodFill(
- S2Region const& region, S2CellId const& start, vector<S2CellId>* output) {
-- hash_set<S2CellId> all;
-+ my_hash_set<S2CellId> all;
- vector<S2CellId> frontier;
- output->clear();
- all.insert(start);
---- a/src/third_party/s2/s2regioncoverer_test.cc
-+++ b/src/third_party/s2/s2regioncoverer_test.cc
-@@ -11,7 +11,7 @@ using std::swap;
- using std::reverse;
-
- #include <hash_map>
--using __gnu_cxx::hash_map;
-+using __gnu_cxx::hash_map = my_hash_map;
-
- #include <queue>
- using std::priority_queue;
-@@ -65,7 +65,7 @@ static void CheckCovering(S2RegionCoverer const& coverer,
- vector<S2CellId> const& covering,
- bool interior) {
- // Keep track of how many cells have the same coverer.min_level() ancestor.
-- hash_map<S2CellId, int> min_level_cells;
-+ my_hash_map<S2CellId, int> min_level_cells;
- for (int i = 0; i < covering.size(); ++i) {
- int level = covering[i].level();
- EXPECT_GE(level, coverer.min_level());
-@@ -76,7 +76,7 @@ static void CheckCovering(S2RegionCoverer const& coverer,
- if (covering.size() > coverer.max_cells()) {
- // If the covering has more than the requested number of cells, then check
- // that the cell count cannot be reduced by using the parent of some cell.
-- for (hash_map<S2CellId, int>::const_iterator i = min_level_cells.begin();
-+ for (my_hash_map<S2CellId, int>::const_iterator i = min_level_cells.begin();
- i != min_level_cells.end(); ++i) {
- EXPECT_EQ(i->second, 1);
- }
---- a/src/third_party/s2/strings/split.cc
-+++ b/src/third_party/s2/strings/split.cc
-@@ -156,7 +156,7 @@ struct simple_insert_iterator {
- // SplitStringToIterator{Using|AllowEmpty}().
- template <typename T>
- struct simple_hash_map_iterator {
-- typedef hash_map<T, T> hashmap;
-+ typedef my_hash_map<T, T> hashmap;
- hashmap* t;
- bool even;
- typename hashmap::iterator curr;
-@@ -246,8 +246,8 @@ void SplitStringAllowEmpty(const string& full, const char* delim,
- }
-
- void SplitStringToHashsetAllowEmpty(const string& full, const char* delim,
-- hash_set<string>* result) {
-- simple_insert_iterator<hash_set<string> > it(result);
-+ my_hash_set<string>* result) {
-+ simple_insert_iterator<my_hash_set<string> > it(result);
- SplitStringToIteratorAllowEmpty(full, delim, 0, it);
- }
-
-@@ -258,7 +258,7 @@ void SplitStringToSetAllowEmpty(const string& full, const char* delim,
- }
-
- void SplitStringToHashmapAllowEmpty(const string& full, const char* delim,
-- hash_map<string, string>* result) {
-+ my_hash_map<string, string>* result) {
- simple_hash_map_iterator<string> it(result);
- SplitStringToIteratorAllowEmpty(full, delim, 0, it);
- }
-@@ -352,8 +352,8 @@ void SplitStringUsing(const string& full,
- }
-
- void SplitStringToHashsetUsing(const string& full, const char* delim,
-- hash_set<string>* result) {
-- simple_insert_iterator<hash_set<string> > it(result);
-+ my_hash_set<string>* result) {
-+ simple_insert_iterator<my_hash_set<string> > it(result);
- SplitStringToIteratorUsing(full, delim, it);
- }
-
-@@ -364,7 +364,7 @@ void SplitStringToSetUsing(const string& full, const char* delim,
- }
-
- void SplitStringToHashmapUsing(const string& full, const char* delim,
-- hash_map<string, string>* result) {
-+ my_hash_map<string, string>* result) {
- simple_hash_map_iterator<string> it(result);
- SplitStringToIteratorUsing(full, delim, it);
- }
---- a/src/third_party/s2/strings/split.h
-+++ b/src/third_party/s2/strings/split.h
-@@ -41,7 +41,7 @@ using namespace std;
- void SplitStringAllowEmpty(const string& full, const char* delim,
- vector<string>* res);
- void SplitStringToHashsetAllowEmpty(const string& full, const char* delim,
-- hash_set<string>* res);
-+ my_hash_set<string>* res);
- void SplitStringToSetAllowEmpty(const string& full, const char* delim,
- set<string>* res);
- // The even-positioned (0-based) components become the keys for the
-@@ -50,7 +50,7 @@ void SplitStringToSetAllowEmpty(const string& full, const char* delim,
- // if the key was already present in the hash table, or will be the
- // empty string if the key is a newly inserted key.
- void SplitStringToHashmapAllowEmpty(const string& full, const char* delim,
-- hash_map<string, string>* result);
-+ my_hash_map<string, string>* result);
-
- // ----------------------------------------------------------------------
- // SplitStringUsing()
-@@ -66,7 +66,7 @@ void SplitStringToHashmapAllowEmpty(const string& full, const char* delim,
- void SplitStringUsing(const string& full, const char* delim,
- vector<string>* res);
- void SplitStringToHashsetUsing(const string& full, const char* delim,
-- hash_set<string>* res);
-+ my_hash_set<string>* res);
- void SplitStringToSetUsing(const string& full, const char* delim,
- set<string>* res);
- // The even-positioned (0-based) components become the keys for the
-@@ -75,7 +75,7 @@ void SplitStringToSetUsing(const string& full, const char* delim,
- // if the key was already present in the hash table, or will be the
- // empty string if the key is a newly inserted key.
- void SplitStringToHashmapUsing(const string& full, const char* delim,
-- hash_map<string, string>* result);
-+ my_hash_map<string, string>* result);
-
- // ----------------------------------------------------------------------
- // SplitOneIntToken()
diff --git a/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch b/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch
deleted file mode 100644
index bbcbe34fe6f3..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- buildscripts/moduleconfig.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py
-index b4d0bba0490..03541fab940 100644
---- a/buildscripts/moduleconfig.py
-+++ b/buildscripts/moduleconfig.py
-@@ -27,7 +27,6 @@ MongoDB SConscript files do.
- __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules',
- 'register_module_test') # pylint: disable=undefined-all-variable
-
--import imp
- import inspect
- import os
-
-@@ -71,8 +70,6 @@ def discover_modules(module_root, allowed_modules):
- print("adding module: %s" % (name))
- fp = open(build_py, "r")
- try:
-- module = imp.load_module("module_" + name, fp, build_py,
-- (".py", "r", imp.PY_SOURCE))
- if getattr(module, "name", None) is None:
- module.name = name
- found_modules.append(module)
diff --git a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch
deleted file mode 100644
index 6a6b9f14afe0..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The upstream patch for this is far too big to backport, so for now, just drop
-the assert given it's somewhat harmless compared to not being able to build at all.
-
-https://jira.mongodb.org/browse/SERVER-65664
-https://bugs.gentoo.org/855128
---- a/src/mongo/db/stats/counters.h
-+++ b/src/mongo/db/stats/counters.h
-@@ -221,8 +221,6 @@ private:
- AtomicWord<long long> requests{0};
- };
- CacheAligned<Together> _together{};
-- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size,
-- "cache line spill");
-
- CacheAligned<AtomicWord<long long>> _logicalBytesOut{0};
-
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
deleted file mode 100644
index de4c11ea2844..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://bugs.gentoo.org/844235
---- a/src/mongo/db/auth/security_key_test.cpp
-+++ b/src/mongo/db/auth/security_key_test.cpp
-@@ -30,6 +30,7 @@
- #include "mongo/platform/basic.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-
- #include "mongo/base/string_data.h"
- #include "mongo/db/auth/authorization_manager.h"
---- a/src/mongo/db/storage/storage_repair_observer.cpp
-+++ b/src/mongo/db/storage/storage_repair_observer.cpp
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #endif
-
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/db/dbhelpers.h"
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-@@ -34,6 +34,7 @@
- #include "mongo/db/storage/kv/kv_engine_test_harness.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
- #include <memory>
-
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-@@ -36,6 +36,7 @@
- #include <limits>
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
- #include <pcrecpp.h>
-
---- a/src/mongo/shell/shell_utils_extended.cpp
-+++ b/src/mongo/shell/shell_utils_extended.cpp
-@@ -37,6 +37,7 @@
- #endif
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <fmt/format.h>
- #include <fstream>
-
---- a/src/mongo/util/stacktrace_threads.cpp
-+++ b/src/mongo/util/stacktrace_threads.cpp
-@@ -36,6 +36,7 @@
- #include <array>
- #include <atomic>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <cstdint>
- #include <cstdlib>
- #include <dirent.h>
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -36,6 +36,7 @@
- #include <iostream>
- #include <malloc.h>
- #include <pcrecpp.h>
-+#include <fstream>
- #include <sched.h>
- #include <stdio.h>
- #include <sys/mman.h>
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
deleted file mode 100644
index f66e52f1c9ed..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-wrt PATH:
-"""
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-"""
---- a/SConstruct
-+++ b/SConstruct
-@@ -2366,7 +2366,6 @@ if env.TargetOSIs('posix'):
-
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
-- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
- "-Wall",
- "-Wsign-compare",
- "-Wno-unknown-pragmas",
-@@ -2422,6 +2421,8 @@ if env.TargetOSIs('posix'):
-
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # On OS X, clang doesn't want the pthread flag at link time, or it
- # issues warnings which make it impossible for us to declare link
-@@ -2473,8 +2474,8 @@ if env.TargetOSIs('posix'):
- ],
- )
-
-- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ #make scons colorgcc, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch b/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch
deleted file mode 100644
index 777251577298..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript
-index 5bd89fe9..489e70ac 100644
---- a/src/mongo/installer/SConscript
-+++ b/src/mongo/installer/SConscript
-@@ -7,7 +7,6 @@ env = env.Clone()
-
- env.SConscript(
- dirs=[
-- 'compass',
- 'msi',
- ],
- exports=[
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch
deleted file mode 100644
index ae69befcea82..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 613110b7..4987e24e 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2958,7 +2958,7 @@ def doConfigure(myenv):
-
- # This warning was added in clang-5 and incorrectly flags our implementation of
- # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804
-- AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
-+ #AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
-
- # Enable sized deallocation support.
- AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation')
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch
deleted file mode 100644
index 823d481c208f..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/buildscripts/scons.py b/buildscripts/scons.py
-index 534fca32..c38f64df 100755
---- a/buildscripts/scons.py
-+++ b/buildscripts/scons.py
-@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons')
- sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
-
- # pylint: disable=C0413
--from mongo.pip_requirements import verify_requirements, MissingRequirements
-+#from mongo.pip_requirements import verify_requirements, MissingRequirements
-
--try:
-- verify_requirements('etc/pip/compile-requirements.txt')
--except MissingRequirements as ex:
-- print(ex)
-- sys.exit(1)
-+#try:
-+# verify_requirements('etc/pip/compile-requirements.txt')
-+#except MissingRequirements as ex:
-+# print(ex)
-+# sys.exit(1)
-
- try:
- import SCons.Script
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
deleted file mode 100644
index b3e3aab0c901..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-@@ -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);
-
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
deleted file mode 100644
index 23bd6f75ffaa..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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>
---- 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/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch b/dev-db/mongodb/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch
deleted file mode 100644
index 0b5058c88155..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://phabricator.services.mozilla.com/D209108
-https://github.com/mozilla/gecko-dev/commit/33cdc6655b0de44cb7a431216dcbb0d5a552aec6
-
-clang 19 will report error if w/o this patch:
-
- src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h:124:33: error: reference to non-static member function must be called
-
-diff --git a/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h b/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
-index 25b977e..379a509 100644
---- a/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
-+++ b/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
-@@ -120,13 +120,6 @@ class ExclusiveData
- release();
- }
-
-- ExclusiveData(ExclusiveData&& rhs)
-- : lock_(mozilla::Move(rhs.lock))
-- {
-- MOZ_ASSERT(&rhs != this, "self-move disallowed!");
-- new (mozilla::KnownNotNull, value_.addr()) T(mozilla::Move(*rhs.value_.addr()));
-- }
--
- ExclusiveData& operator=(ExclusiveData&& rhs) {
- this->~ExclusiveData();
- new (mozilla::KnownNotNull, this) ExclusiveData(mozilla::Move(rhs));
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-scons.patch b/dev-db/mongodb/files/mongodb-5.0.26-scons.patch
deleted file mode 100644
index 2bb9c527ab2d..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.26-scons.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-diff --git a/SConstruct b/SConstruct
-index 3d831c9..f07feeb 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1201,7 +1201,7 @@ envDict = dict(BUILD_ROOT=buildDir,
- if get_option('build-tools') == 'next':
- SCons.Tool.DefaultToolpath.insert(0, os.path.abspath('site_scons/site_tools/next'))
-
--env = Environment(variables=env_vars, **envDict)
-+env = Environment(variables=env_vars, ENV={'PATH': os.environ['PATH']}, **envDict)
- del envDict
-
- if get_option('cache-signature-mode') == 'validate':
diff --git a/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch b/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch
deleted file mode 100644
index a99b79b2d929..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/768339
-
---- a/src/mongo/db/exec/plan_stats.h
-+++ b/src/mongo/db/exec/plan_stats.h
-@@ -33,6 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
-+#include <optional>
-
- #include "mongo/db/index/multikey_paths.h"
- #include "mongo/db/jsobj.h"
diff --git a/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch b/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch
deleted file mode 100644
index e2234734abcd..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9
-diff --git a/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h b/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
-index e67529ecb6e..d777480d604 100644
---- a/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
-+++ b/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
-@@ -17,6 +17,7 @@
-
- #include <cassert>
- #include <cstddef>
-+#include <cstdint>
- #include <memory>
- #include <new>
- #include <tuple>
diff --git a/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch b/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch
deleted file mode 100644
index af83692d16d2..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/889020
---- a/src/mongo/util/boost_assert_shim.cpp
-+++ b/src/mongo/util/boost_assert_shim.cpp
-@@ -31,6 +31,7 @@
-
- #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG)
-
-+#include <exception>
- #include <boost/assert.hpp>
-
- namespace mongo {
diff --git a/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch b/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch
deleted file mode 100644
index 6ce92778b6bd..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Don't automagically force lld > gold > bfd. Leave it up to the user.
-
-In particular, avoids issues with LTO enabled (via the flag/scons option)
-where using GCC as compiler, as lld can't do LTO with GCC.
-
-https://bugs.gentoo.org/769986
---- a/SConstruct
-+++ b/SConstruct
-@@ -2824,40 +2824,6 @@ def doConfigure(myenv):
- def AddToSHLINKFLAGSIfSupported(env, flag):
- return AddFlagIfSupported(env, 'C', '.c', flag, True, SHLINKFLAGS=[flag])
-
-- if myenv.ToolchainIs('gcc', 'clang'):
-- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-- # because it is much faster. Don't use it if the user has already configured another linker
-- # selection manually.
-- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
-- myenv.FatalError(f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
--
-- linker_ld = get_option('linker')
-- if linker_ld == 'auto':
-- # lld has problems with separate debug info on some platforms. See:
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- #
-- # lld also apparently has problems with symbol resolution
-- # in some esoteric configurations that apply for us when
-- # using --link-model=dynamic mode, so disable lld there
-- # too. See:
-- # - https://bugs.llvm.org/show_bug.cgi?id=46676
-- #
-- # We should revisit all of these issues the next time we upgrade our clang minimum.
-- if get_option('separate-debug') == 'off' and get_option('link-model') != 'dynamic':
-- if not AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=lld'):
-- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
-- else:
-- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
-- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
-- # BFD is not supported due to issues with it causing warnings from some of
-- # the third party libraries that mongodb is linked with:
-- # https://jira.mongodb.org/browse/SERVER-49465
-- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
-- else:
-- if not AddToLINKFLAGSIfSupported(myenv, f'-fuse-ld={linker_ld}'):
-- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
--
- detectCompiler = Configure(myenv, help=False, custom_tests = {
- 'CheckForCXXLink': CheckForCXXLink,
- })
diff --git a/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch b/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch
deleted file mode 100644
index 78dd84c50df1..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/844235
---- a/src/mongo/db/auth/security_key_test.cpp
-+++ b/src/mongo/db/auth/security_key_test.cpp
-@@ -30,6 +30,7 @@
- #include "mongo/platform/basic.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-
- #include "mongo/base/string_data.h"
- #include "mongo/db/auth/authorization_manager.h"
---- a/src/mongo/db/storage/storage_repair_observer.cpp
-+++ b/src/mongo/db/storage/storage_repair_observer.cpp
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #endif
-
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/db/dbhelpers.h"
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-@@ -34,6 +34,7 @@
- #include "mongo/db/storage/kv/kv_engine_test_harness.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
- #include <memory>
-
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-@@ -48,6 +48,7 @@
- #include "mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/system/error_code.hpp>
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-@@ -36,6 +36,7 @@
- #include <limits>
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/base/simple_string_data_comparator.h"
---- a/src/mongo/shell/shell_utils_extended.cpp
-+++ b/src/mongo/shell/shell_utils_extended.cpp
-@@ -37,6 +37,7 @@
- #endif
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <fmt/format.h>
- #include <fstream>
-
---- a/src/mongo/util/stacktrace_threads.cpp
-+++ b/src/mongo/util/stacktrace_threads.cpp
-@@ -36,6 +36,7 @@
- #include <array>
- #include <atomic>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <cstdint>
- #include <cstdlib>
- #include <dirent.h>
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -36,6 +36,7 @@
- #include <iostream>
- #include <malloc.h>
- #include <pcrecpp.h>
-+#include <fstream>
- #include <sched.h>
- #include <stdio.h>
- #include <sys/mman.h>
diff --git a/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch b/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch
deleted file mode 100644
index ba71fd8d3e62..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mongo/db/repl/tenant_file_cloner.h b/src/mongo/db/repl/tenant_file_cloner.h
-index def0952..0625e46 100644
---- a/src/mongo/db/repl/tenant_file_cloner.h
-+++ b/src/mongo/db/repl/tenant_file_cloner.h
-@@ -32,6 +32,7 @@
- #include <boost/filesystem.hpp>
- #include <memory>
- #include <vector>
-+#include <fstream>
-
- #include "mongo/db/repl/base_cloner.h"
- #include "mongo/db/repl/task_runner.h"
diff --git a/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch b/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
deleted file mode 100644
index 8874ad210057..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-wrt PATH:
-"""
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-"""
-diff --git a/SConstruct b/SConstruct
-index 8367691..9061849 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2441,7 +2441,6 @@ if env.TargetOSIs('posix'):
-
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
-- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
- "-Wall",
- "-Wsign-compare",
- "-Wno-unknown-pragmas",
-@@ -2497,6 +2496,8 @@ if env.TargetOSIs('posix'):
-
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # On OS X, clang doesn't want the pthread flag at link time, or it
- # issues warnings which make it impossible for us to declare link
-@@ -2549,7 +2550,7 @@ if env.TargetOSIs('posix'):
- )
-
- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ for key in ('HOME', 'TERM', 'PATH'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
-@@ -2968,43 +2969,6 @@ def doConfigure(myenv):
- myenv.AddMethod(
- functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
-
-- if myenv.ToolchainIs('gcc', 'clang'):
-- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-- # because it is much faster. Don't use it if the user has already configured another linker
-- # selection manually.
-- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
-- myenv.FatalError(f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
--
-- linker_ld = get_option('linker')
-- if linker_ld == 'auto':
-- # lld has problems with separate debug info on some platforms. See:
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- #
-- # lld also apparently has problems with symbol resolution
-- # in some esoteric configurations that apply for us when
-- # using --link-model=dynamic mode, so disable lld there
-- # too. See:
-- # - https://bugs.llvm.org/show_bug.cgi?id=46676
-- #
-- # We should revisit all of these issues the next time we upgrade our clang minimum.
-- if get_option('separate-debug') == 'off' and get_option('link-model') != 'dynamic':
-- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
-- myenv.AddToLINKFLAGSIfSupported('-fuse-ld=gold')
-- else:
-- myenv.AddToLINKFLAGSIfSupported('-fuse-ld=gold')
-- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
-- # BFD is not supported due to issues with it causing warnings from some of
-- # the third party libraries that mongodb is linked with:
-- # https://jira.mongodb.org/browse/SERVER-49465
-- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
-- else:
-- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
-- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
--
-- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
-- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
--
- detectCompiler = Configure(myenv, help=False, custom_tests = {
- 'CheckForCXXLink': CheckForCXXLink,
- })
-@@ -4344,17 +4308,11 @@ def doConfigure(myenv):
- "BOOST_LOG_NO_SHORTHAND_NAMES",
- "BOOST_LOG_USE_NATIVE_SYSLOG",
- "BOOST_LOG_WITHOUT_THREAD_ATTR",
-+ "BOOST_LOG_DYN_LINK",
- "ABSL_FORCE_ALIGNED_ACCESS",
- ]
- )
-
-- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-- conf.env.AppendUnique(
-- CPPDEFINES=[
-- "BOOST_LOG_DYN_LINK",
-- ]
-- )
--
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
- myenv.ConfError("can't find boost headers")
diff --git a/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch
deleted file mode 100644
index 1c923e1fe698..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From dbca1c7f472301ab93ee74bc3f40fba019428dea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Mon, 14 Apr 2025 09:50:42 +0200
-Subject: [PATCH] fix for boost 1.85
-
----
- src/mongo/db/initialize_server_global_state.cpp | 4 ++--
- src/mongo/db/startup_warnings_mongod.cpp | 1 +
- src/mongo/db/storage/backup_block.cpp | 5 ++++-
- .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
- src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
- src/mongo/scripting/engine.cpp | 2 +-
- src/mongo/shell/shell_utils_launcher.cpp | 12 ++++++------
- src/mongo/shell/shell_utils_launcher.h | 2 +-
- 10 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
-index 4dc953ff8ce..2e9e22bfd61 100644
---- 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>
-@@ -307,7 +307,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
- << "\" 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);
-diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
-index fb4969106af..f19aa6b32c4 100644
---- 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>
-diff --git a/src/mongo/db/storage/backup_block.cpp b/src/mongo/db/storage/backup_block.cpp
-index 9b8dc29f209..10fd6632fc3 100644
---- a/src/mongo/db/storage/backup_block.cpp
-+++ b/src/mongo/db/storage/backup_block.cpp
-@@ -30,6 +30,9 @@
- #include "mongo/db/storage/backup_block.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
- #include <set>
-
- #include "mongo/base/string_data.h"
-@@ -59,7 +62,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
-
- // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
- // on windows, no-op on unix).
-- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
-+ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
- }
-
- } // namespace details
-diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-index 0d67885718a..035b07c2eac 100644
---- 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
-index 07b21b448e1..87c7cd56cd1 100644
---- a/src/mongo/db/storage/storage_engine_metadata.cpp
-+++ b/src/mongo/db/storage/storage_engine_metadata.cpp
-@@ -220,7 +220,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
-index 49e920bdf69..d198de51788 100644
---- a/src/mongo/scripting/engine.cpp
-+++ b/src/mongo/scripting/engine.cpp
-@@ -34,7 +34,7 @@
- #include "mongo/scripting/engine.h"
-
- #include <algorithm>
--#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem.hpp>
-
- #include "mongo/base/string_data.h"
- #include "mongo/client/dbclient_base.h"
-diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
-index 0f6b6f2cf42..cf18b896c36 100644
---- a/src/mongo/shell/shell_utils_launcher.cpp
-+++ b/src/mongo/shell/shell_utils_launcher.cpp
-@@ -1000,26 +1000,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
- 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;
-diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
-index 14a6ce06390..960f78a71e8 100644
---- 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/files/mongodb-6.0.21-cstdint.patch b/dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch
deleted file mode 100644
index f71c3e9cb055..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f7eb64bcdf8cc9c6af8761d96173243c416bcdbe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Mon, 14 Apr 2025 19:13:44 +0200
-Subject: [PATCH] ctype.h add cstdint
-
----
- src/mongo/util/ctype.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
-index a3880e281a8..78ee57e3d0c 100644
---- a/src/mongo/util/ctype.h
-+++ b/src/mongo/util/ctype.h
-@@ -67,6 +67,7 @@
- #pragma once
-
- #include <array>
-+#include <cstdint>
-
- namespace mongo::ctype {
- namespace detail {
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch
deleted file mode 100644
index 13312376de94..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From e534a7e65efabd21e22b9243795e3cd06268f49a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Wed, 30 Apr 2025 00:25:10 +0200
-Subject: [PATCH] fix boost
-
----
- src/mongo/db/initialize_server_global_state.cpp | 4 ++--
- src/mongo/db/repl/tenant_file_cloner.h | 1 +
- src/mongo/db/startup_warnings_mongod.cpp | 1 +
- src/mongo/db/storage/backup_block.cpp | 5 ++++-
- .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
- src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
- .../db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 2 +-
- src/mongo/scripting/engine.cpp | 2 +-
- src/mongo/shell/shell_utils_extended.cpp | 9 +++++++++
- src/mongo/shell/shell_utils_launcher.cpp | 12 ++++++------
- src/mongo/shell/shell_utils_launcher.h | 2 +-
- src/mongo/util/ctype.h | 1 +
- src/mongo/util/processinfo_linux.cpp | 1 +
- src/mongo/util/stacktrace_threads.cpp | 10 +++++++---
- 14 files changed, 39 insertions(+), 19 deletions(-)
-
-diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
-index 4dc953ff8ce..2e9e22bfd61 100644
---- 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>
-@@ -307,7 +307,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
- << "\" 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);
-diff --git a/src/mongo/db/repl/tenant_file_cloner.h b/src/mongo/db/repl/tenant_file_cloner.h
-index def09528953..0625e4687f7 100644
---- a/src/mongo/db/repl/tenant_file_cloner.h
-+++ b/src/mongo/db/repl/tenant_file_cloner.h
-@@ -32,6 +32,7 @@
- #include <boost/filesystem.hpp>
- #include <memory>
- #include <vector>
-+#include <fstream>
-
- #include "mongo/db/repl/base_cloner.h"
- #include "mongo/db/repl/task_runner.h"
-diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
-index fb4969106af..f19aa6b32c4 100644
---- 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>
-diff --git a/src/mongo/db/storage/backup_block.cpp b/src/mongo/db/storage/backup_block.cpp
-index 9b8dc29f209..10fd6632fc3 100644
---- a/src/mongo/db/storage/backup_block.cpp
-+++ b/src/mongo/db/storage/backup_block.cpp
-@@ -30,6 +30,9 @@
- #include "mongo/db/storage/backup_block.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
- #include <set>
-
- #include "mongo/base/string_data.h"
-@@ -59,7 +62,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
-
- // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
- // on windows, no-op on unix).
-- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
-+ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
- }
-
- } // namespace details
-diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-index 0d67885718a..035b07c2eac 100644
---- 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
-index 07b21b448e1..87c7cd56cd1 100644
---- a/src/mongo/db/storage/storage_engine_metadata.cpp
-+++ b/src/mongo/db/storage/storage_engine_metadata.cpp
-@@ -220,7 +220,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-index 0de1c43284f..1f400f32612 100644
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-@@ -1279,7 +1279,7 @@ WiredTigerKVEngine::beginNonBlockingBackup(OperationContext* opCtx,
-
- // Create ongoingBackup.lock file to signal recovery that it should delete WiredTiger.backup if
- // we have an unclean shutdown with the cursor still open.
-- { boost::filesystem::ofstream ongoingBackup(getOngoingBackupPath()); }
-+ { boost::filesystem::std::ofstream ongoingBackup(getOngoingBackupPath()); }
-
- // Oplog truncation thread won't remove oplog since the checkpoint pinned by the backup cursor.
- stdx::lock_guard<Latch> lock(_oplogPinnedByBackupMutex);
-diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
-index 49e920bdf69..d198de51788 100644
---- a/src/mongo/scripting/engine.cpp
-+++ b/src/mongo/scripting/engine.cpp
-@@ -34,7 +34,7 @@
- #include "mongo/scripting/engine.h"
-
- #include <algorithm>
--#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem.hpp>
-
- #include "mongo/base/string_data.h"
- #include "mongo/client/dbclient_base.h"
-diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
-index 6cd6dc6ed0d..29b886d6acf 100644
---- a/src/mongo/shell/shell_utils_extended.cpp
-+++ b/src/mongo/shell/shell_utils_extended.cpp
-@@ -37,6 +37,15 @@
- #endif
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/directory.hpp>
-+#include <boost/filesystem/exception.hpp>
-+#include <boost/filesystem/file_status.hpp>
-+#include <boost/filesystem/fstream.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
-+#include <boost/iterator/iterator_facade.hpp>
-+#include <boost/move/utility_core.hpp>
-+
- #include <fmt/format.h>
- #include <fstream>
-
-diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
-index 0f6b6f2cf42..cf18b896c36 100644
---- a/src/mongo/shell/shell_utils_launcher.cpp
-+++ b/src/mongo/shell/shell_utils_launcher.cpp
-@@ -1000,26 +1000,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
- 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;
-diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
-index 14a6ce06390..960f78a71e8 100644
---- 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/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
-index a3880e281a8..78ee57e3d0c 100644
---- a/src/mongo/util/ctype.h
-+++ b/src/mongo/util/ctype.h
-@@ -67,6 +67,7 @@
- #pragma once
-
- #include <array>
-+#include <cstdint>
-
- namespace mongo::ctype {
- namespace detail {
-diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
-index 7793011e901..ff3c940bab0 100644
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -36,6 +36,7 @@
- #include <iostream>
- #include <malloc.h>
- #include <pcrecpp.h>
-+#include <fstream>
- #include <sched.h>
- #include <stdio.h>
- #include <sys/mman.h>
-diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
-index 51581c4dc9b..99c30f153b0 100644
---- a/src/mongo/util/stacktrace_threads.cpp
-+++ b/src/mongo/util/stacktrace_threads.cpp
-@@ -35,7 +35,11 @@
-
- #include <array>
- #include <atomic>
--#include <boost/filesystem.hpp>
-+#include <boost/filesystem/directory.hpp>
-+#include <boost/filesystem/fstream.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
-+#include <boost/iterator/iterator_facade.hpp>
- #include <cstdint>
- #include <cstdlib>
- #include <dirent.h>
-@@ -243,8 +247,8 @@ bool tidExists(int tid) {
- std::string readThreadName(int tid) {
- std::string threadName;
- try {
-- boost::filesystem::ifstream in(taskDir() / std::to_string(tid) / "comm");
-- std::getline(in, threadName);
-+ boost::filesystem::ifstream in(taskDir() / boost::filesystem::path(std::to_string(tid)) / "comm");
-+ std::getline(in, threadName);
- } catch (...) {
- }
- return threadName;
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch b/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch
deleted file mode 100644
index 5473997e56c9..000000000000
--- a/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
-index a3880e2..78ee57e 100644
---- a/src/mongo/util/ctype.h
-+++ b/src/mongo/util/ctype.h
-@@ -67,6 +67,7 @@
- #pragma once
-
- #include <array>
-+#include <cstdint>
-
- namespace mongo::ctype {
- namespace detail {
diff --git a/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch b/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch
deleted file mode 100644
index 4edcecb40406..000000000000
--- a/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-wrt PATH:
-"""
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-"""
-diff --git a/SConstruct b/SConstruct
-index 2ebeb0e..44ce93a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -23,7 +23,6 @@ from pkg_resources import parse_version
-
- import SCons
- import SCons.Script
--from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
- from site_scons.mongo import build_profiles
-
- # This must be first, even before EnsureSConsVersion, if
-@@ -1657,13 +1656,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption
-
- # The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
- # We should only register this function after env, env_vars and the parser have been properly initialized.
--SConsToolingMetrics.register_metrics(
-- utc_starttime=datetime.utcnow(),
-- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-- env_vars=env_vars,
-- env=env,
-- parser=_parser,
--)
-
- if get_option('build-metrics'):
- env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
-@@ -3034,7 +3026,6 @@ if env.TargetOSIs('posix'):
- env.Append(
- CCFLAGS=[
- "-fasynchronous-unwind-tables",
-- "-g2" if not env.TargetOSIs('emscripten') else "-g",
- "-Wall",
- "-Wsign-compare",
- "-Wno-unknown-pragmas",
-@@ -3101,6 +3092,8 @@ if env.TargetOSIs('posix'):
-
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- env.Append(CXXFLAGS=["-Woverloaded-virtual"])
-+ env.Append(CXXFLAGS=os.environ['CXXFLAGS'])
-+ env.Append(LINKFLAGS=os.environ['LDFLAGS'])
-
- # On OS X, clang doesn't want the pthread flag at link time, or it
- # issues warnings which make it impossible for us to declare link
-@@ -3151,7 +3144,7 @@ if env.TargetOSIs('posix'):
- ], )
-
- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ for key in ('HOME', 'TERM', 'PATH'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
-@@ -3553,33 +3546,6 @@ def doConfigure(myenv):
- myenv.AddMethod(
- functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
-
-- if myenv.ToolchainIs('gcc', 'clang'):
-- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-- # because it is much faster. Don't use it if the user has already configured another linker
-- # selection manually.
-- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
-- myenv.FatalError(
-- f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
--
-- linker_ld = get_option('linker')
-- if linker_ld == 'auto':
-- if not env.TargetOSIs('darwin', 'macOS'):
-- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
-- myenv.FatalError(
-- f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'."
-- )
-- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
-- # BFD is not supported due to issues with it causing warnings from some of
-- # the third party libraries that mongodb is linked with:
-- # https://jira.mongodb.org/browse/SERVER-49465
-- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
-- else:
-- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
-- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
--
-- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
-- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
--
- detectCompiler = Configure(
- myenv,
- help=False,
-@@ -5119,17 +5085,13 @@ def doConfigure(myenv):
- "BOOST_LOG_NO_SHORTHAND_NAMES",
- "BOOST_LOG_USE_NATIVE_SYSLOG",
- "BOOST_LOG_WITHOUT_THREAD_ATTR",
-+ "BOOST_LOG_DYN_LINK",
- "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS",
- "BOOST_SYSTEM_NO_DEPRECATED",
- "BOOST_THREAD_USES_DATETIME",
- ("BOOST_THREAD_VERSION", "5"),
- ])
-
-- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-- conf.env.AppendUnique(CPPDEFINES=[
-- "BOOST_LOG_DYN_LINK",
-- ])
--
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"):
- myenv.ConfError("can't find boost headers")
-@@ -5326,6 +5288,9 @@ def doConfigure(myenv):
-
- mongoc_mode = get_option('use-system-mongo-c')
- conf.env['MONGO_HAVE_LIBMONGOC'] = False
-+ conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags')
-+ conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0'
-+
- if mongoc_mode != 'off':
- if conf.CheckLibWithHeader(
- ["mongoc-1.0"],
diff --git a/dev-db/mongodb/files/mongodb-7.0.18-boost-1.85.patch b/dev-db/mongodb/files/mongodb-7.0.18-boost-1.85.patch
deleted file mode 100644
index ab9c56c2a83a..000000000000
--- a/dev-db/mongodb/files/mongodb-7.0.18-boost-1.85.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 50d52404a69171052a9a55259ba7cd1ec9ce6a18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Sat, 26 Apr 2025 12:07:21 +0200
-Subject: [PATCH] fix for boost 1.85
-
----
- src/mongo/db/initialize_server_global_state.cpp | 4 ++--
- src/mongo/db/startup_warnings_mongod.cpp | 1 +
- src/mongo/db/storage/backup_block.cpp | 5 ++++-
- .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
- src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
- src/mongo/scripting/engine.cpp | 1 +
- src/mongo/shell/shell_utils_launcher.cpp | 13 +++++++------
- src/mongo/shell/shell_utils_launcher.h | 2 +-
- src/mongo/unittest/golden_test_base.cpp | 2 +-
- 9 files changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
-index 02a30aac334..e774cc4019a 100644
---- a/src/mongo/db/initialize_server_global_state.cpp
-+++ b/src/mongo/db/initialize_server_global_state.cpp
-@@ -33,7 +33,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>
-@@ -310,7 +310,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
- << "\" 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);
-diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
-index af81012ad41..c334e4b386c 100644
---- a/src/mongo/db/startup_warnings_mongod.cpp
-+++ b/src/mongo/db/startup_warnings_mongod.cpp
-@@ -33,6 +33,7 @@
- #include "mongo/db/startup_warnings_mongod.h"
-
- #include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/exception.hpp>
- #include <fstream>
-
- #ifdef __linux__
-diff --git a/src/mongo/db/storage/backup_block.cpp b/src/mongo/db/storage/backup_block.cpp
-index 9b8dc29f209..10fd6632fc3 100644
---- a/src/mongo/db/storage/backup_block.cpp
-+++ b/src/mongo/db/storage/backup_block.cpp
-@@ -30,6 +30,9 @@
- #include "mongo/db/storage/backup_block.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
- #include <set>
-
- #include "mongo/base/string_data.h"
-@@ -59,7 +62,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
-
- // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
- // on windows, no-op on unix).
-- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
-+ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
- }
-
- } // namespace details
-diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-index 41fefe73cdf..e8d1d0c08ed 100644
---- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-+++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-@@ -57,7 +57,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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",
-@@ -66,7 +66,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
-index 4008ac80d9b..fe2abacbfca 100644
---- a/src/mongo/db/storage/storage_engine_metadata.cpp
-+++ b/src/mongo/db/storage/storage_engine_metadata.cpp
-@@ -222,7 +222,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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",
-@@ -231,7 +231,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
-index 7faf89e5ae8..c5e21a62c4d 100644
---- a/src/mongo/scripting/engine.cpp
-+++ b/src/mongo/scripting/engine.cpp
-@@ -34,6 +34,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"
-diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
-index 30a04df5a89..1ff93db38be 100644
---- a/src/mongo/shell/shell_utils_launcher.cpp
-+++ b/src/mongo/shell/shell_utils_launcher.cpp
-@@ -36,6 +36,7 @@
- #include <boost/iostreams/stream_buffer.hpp>
- #include <boost/iostreams/tee.hpp>
- #include <csignal>
-+#include <boost/filesystem.hpp>
- #include <fcntl.h>
- #include <fmt/format.h>
- #include <fstream>
-@@ -316,26 +317,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
- 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;
-diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
-index 65337f061b3..b92d1126c5d 100644
---- 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/src/mongo/unittest/golden_test_base.cpp b/src/mongo/unittest/golden_test_base.cpp
-index 1544fd3a37b..14f96d0ec75 100644
---- a/src/mongo/unittest/golden_test_base.cpp
-+++ b/src/mongo/unittest/golden_test_base.cpp
-@@ -95,7 +95,7 @@ GoldenTestEnvironment::GoldenTestEnvironment() : _goldenDataRoot(".") {
- fs::path outputRoot;
- if (opts.outputRootPattern) {
- fs::path pattern(*opts.outputRootPattern);
-- outputRoot = pattern.parent_path() / fs::unique_path(pattern.leaf());
-+ outputRoot = pattern.parent_path() / fs::unique_path(pattern.filename());
- } else {
- outputRoot = fs::temp_directory_path() / fs::unique_path("out-%%%%-%%%%-%%%%-%%%%");
- }
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch b/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch
deleted file mode 100644
index 01f9b232a2ed..000000000000
--- a/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-wrt PATH:
-"""
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-"""
-diff --git a/SConstruct2 b/SConstruct
-index e9aa2ca..5814f4a 100644
---- a/SConstruct2
-+++ b/SConstruct
-@@ -25,7 +25,7 @@ from pkg_resources import parse_version
-
- import SCons
- import SCons.Script
--from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
-+#from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
- from site_scons.mongo import build_profiles
-
- # This must be first, even before EnsureSConsVersion, if
-@@ -1724,13 +1724,13 @@ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption
-
- # The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
- # We should only register this function after env, env_vars and the parser have been properly initialized.
--SConsToolingMetrics.register_metrics(
-- utc_starttime=datetime.utcnow(),
-- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-- env_vars=env_vars,
-- env=env,
-- parser=_parser,
--)
-+#SConsToolingMetrics.register_metrics(
-+# utc_starttime=datetime.utcnow(),
-+# artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-+# env_vars=env_vars,
-+# env=env,
-+# parser=_parser,
-+#)
-
- if get_option('build-metrics'):
- env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
-@@ -3132,7 +3132,7 @@ if env.TargetOSIs('posix'):
- env.Append(
- CCFLAGS=[
- "-fasynchronous-unwind-tables",
-- "-g2" if not env.TargetOSIs('emscripten') else "-g",
-+# "-g2" if not env.TargetOSIs('emscripten') else "-g",
- "-Wall",
- "-Wsign-compare",
- "-Wno-unknown-pragmas",
-@@ -3200,6 +3200,8 @@ if env.TargetOSIs('posix'):
-
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- env.Append(CXXFLAGS=["-Woverloaded-virtual"])
-+ env.Append(CXXFLAGS=os.environ['CXXFLAGS'])
-+ env.Append(LINKFLAGS=os.environ['LDFLAGS'])
-
- # On OS X, clang doesn't want the pthread flag at link time, or it
- # issues warnings which make it impossible for us to declare link
-@@ -3250,7 +3252,7 @@ if env.TargetOSIs('posix'):
- ], )
-
- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ for key in ('HOME', 'TERM', 'PATH'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
-@@ -3644,35 +3646,35 @@ def doConfigure(myenv):
- myenv.AddMethod(
- functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
-
-- if myenv.ToolchainIs('gcc', 'clang'):
-- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-- # because it is much faster. Don't use it if the user has already configured another linker
-- # selection manually.
-- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
-- myenv.FatalError(
-- f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
--
-- linker_ld = get_option('linker')
--
-- if linker_ld == "bfd" and env.get("BAZEL_BUILD_ENABLED"):
-- myenv.FatalError(f"The linker 'bfd' is not supported with BAZEL_BUILD_ENABLED.")
-- elif linker_ld == 'auto':
-- if not env.TargetOSIs('darwin', 'macOS'):
-- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
-- myenv.FatalError(
-- f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'."
-- )
-- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
-- # BFD is not supported due to issues with it causing warnings from some of
-- # the third party libraries that mongodb is linked with:
-- # https://jira.mongodb.org/browse/SERVER-49465
-- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
-- else:
-- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
-- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
--
-- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
-- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
-+# if myenv.ToolchainIs('gcc', 'clang'):
-+# # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-+# # because it is much faster. Don't use it if the user has already configured another linker
-+# # selection manually.
-+# if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
-+# myenv.FatalError(
-+# f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
-+#
-+# linker_ld = get_option('linker')
-+#
-+# if linker_ld == "bfd" and env.get("BAZEL_BUILD_ENABLED"):
-+# myenv.FatalError(f"The linker 'bfd' is not supported with BAZEL_BUILD_ENABLED.")
-+# elif linker_ld == 'auto':
-+# if not env.TargetOSIs('darwin', 'macOS'):
-+# if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
-+# myenv.FatalError(
-+# f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'."
-+# )
-+# elif link_model.startswith("dynamic") and linker_ld == 'bfd':
-+# # BFD is not supported due to issues with it causing warnings from some of
-+# # the third party libraries that mongodb is linked with:
-+# # https://jira.mongodb.org/browse/SERVER-49465
-+# myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
-+# else:
-+# if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
-+# myenv.FatalError(f"Linker {linker_ld} could not be configured.")
-+#
-+# if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
-+# myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
-
- detectCompiler = Configure(
- myenv,
-@@ -4765,42 +4767,42 @@ def doConfigure(myenv):
- if optBuild == "off" and myenv.ToolchainIs('clang') and env.TargetOSIs('darwin'):
- myenv.AddToLINKFLAGSIfSupported("-Wl,-no_deduplicate")
-
-- # Apply any link time optimization settings as selected by the 'lto' option.
-- if has_option('lto'):
-- if myenv.ToolchainIs('msvc'):
-- # Note that this is actually more aggressive than LTO, it is whole program
-- # optimization due to /GL. However, this is historically what we have done for
-- # windows, so we are keeping it.
-- #
-- # /GL implies /LTCG, so no need to say it in CCFLAGS, but we do need /LTCG on the
-- # link flags.
-- myenv.Append(CCFLAGS=['/GL'])
-- myenv.Append(LINKFLAGS=['/LTCG'])
-- myenv.Append(ARFLAGS=['/LTCG'])
-- elif myenv.ToolchainIs('gcc', 'clang'):
-- # For GCC and clang, the flag is -flto, and we need to pass it both on the compile
-- # and link lines.
-- if not myenv.AddToCCFLAGSIfSupported('-flto') or \
-- not myenv.AddToLINKFLAGSIfSupported('-flto'):
-- myenv.ConfError("Link time optimization requested, "
-- "but selected compiler does not honor -flto")
--
-- if myenv.TargetOSIs('darwin'):
-- myenv.AddToLINKFLAGSIfSupported('-Wl,-object_path_lto,${TARGET}.lto')
-- else:
-- # According to intel benchmarks -fno-plt increases perf
-- # See PM-2215
-- if linker_ld != "gold":
-- myenv.ConfError("lto compilation currently only works with the --linker=gold")
-- if link_model != "object":
-- myenv.ConfError(
-- "lto compilation currently only works with the --link-model=object")
-- if not myenv.AddToCCFLAGSIfSupported('-fno-plt') or \
-- not myenv.AddToLINKFLAGSIfSupported('-fno-plt'):
-- myenv.ConfError("-fno-plt is not supported by the compiler")
--
-- else:
-- myenv.ConfError("Don't know how to enable --lto on current toolchain")
-+# # Apply any link time optimization settings as selected by the 'lto' option.
-+# if has_option('lto'):
-+# if myenv.ToolchainIs('msvc'):
-+# # Note that this is actually more aggressive than LTO, it is whole program
-+# # optimization due to /GL. However, this is historically what we have done for
-+# # windows, so we are keeping it.
-+# #
-+# # /GL implies /LTCG, so no need to say it in CCFLAGS, but we do need /LTCG on the
-+# # link flags.
-+# myenv.Append(CCFLAGS=['/GL'])
-+# myenv.Append(LINKFLAGS=['/LTCG'])
-+# myenv.Append(ARFLAGS=['/LTCG'])
-+# elif myenv.ToolchainIs('gcc', 'clang'):
-+# # For GCC and clang, the flag is -flto, and we need to pass it both on the compile
-+# # and link lines.
-+# if not myenv.AddToCCFLAGSIfSupported('-flto') or \
-+# not myenv.AddToLINKFLAGSIfSupported('-flto'):
-+# myenv.ConfError("Link time optimization requested, "
-+# "but selected compiler does not honor -flto")
-+#
-+# if myenv.TargetOSIs('darwin'):
-+# myenv.AddToLINKFLAGSIfSupported('-Wl,-object_path_lto,${TARGET}.lto')
-+# else:
-+# # According to intel benchmarks -fno-plt increases perf
-+# # See PM-2215
-+# if linker_ld != "gold":
-+# myenv.ConfError("lto compilation currently only works with the --linker=gold")
-+# if link_model != "object":
-+# myenv.ConfError(
-+# "lto compilation currently only works with the --link-model=object")
-+# if not myenv.AddToCCFLAGSIfSupported('-fno-plt') or \
-+# not myenv.AddToLINKFLAGSIfSupported('-fno-plt'):
-+# myenv.ConfError("-fno-plt is not supported by the compiler")
-+#
-+# else:
-+# myenv.ConfError("Don't know how to enable --lto on current toolchain")
-
- if get_option('runtime-hardening') == "on" and optBuild != "off":
- # Older glibc doesn't work well with _FORTIFY_SOURCE=2. Selecting 2.11 as the minimum was an
-@@ -5263,16 +5265,17 @@ def doConfigure(myenv):
- "BOOST_LOG_NO_SHORTHAND_NAMES",
- "BOOST_LOG_USE_NATIVE_SYSLOG",
- "BOOST_LOG_WITHOUT_THREAD_ATTR",
-+ "BOOST_LOG_DYN_LINK",
- "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS",
- "BOOST_SYSTEM_NO_DEPRECATED",
- "BOOST_THREAD_USES_DATETIME",
- ("BOOST_THREAD_VERSION", "5"),
- ])
-
-- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-- conf.env.AppendUnique(CPPDEFINES=[
-- "BOOST_LOG_DYN_LINK",
-- ])
-+# if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-+# conf.env.AppendUnique(CPPDEFINES=[
-+# "BOOST_LOG_DYN_LINK",
-+# ])
-
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"):
-@@ -5473,6 +5476,8 @@ def doConfigure(myenv):
-
- mongoc_mode = get_option('use-system-mongo-c')
- conf.env['MONGO_HAVE_LIBMONGOC'] = False
-+ # conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags')
-+ # conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0'
- if mongoc_mode != 'off':
- if conf.CheckLibWithHeader(
- ["mongoc-1.0"],
diff --git a/dev-db/mongodb/files/mongodb-8.0.4-scons.patch b/dev-db/mongodb/files/mongodb-8.0.4-scons.patch
deleted file mode 100644
index 3536cdf907aa..000000000000
--- a/dev-db/mongodb/files/mongodb-8.0.4-scons.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bc8f2b53c1b99943e49f7bd42ee4d0e1bd8d4562 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Mon, 28 Apr 2025 13:46:34 +0200
-Subject: [PATCH] add PATH backup for scons
-
-https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
-
-> we intentionally do not ingest the environment PATH as this makes build
-> reproducibility and hermiticity much harder. Instead, you should set the
-> absolute paths to the tools you want to use on the command line, instead of
-> relying on the PATH.
-
-Gentoo bug https://bugs.gentoo.org/829340
-
-In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
-whatever), not in /usr/bin, and if upstream strip PATH and construct it
-themselves, they surely won't contain this location.
-
-So we add PATH backup for scons.
-
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index e9aa2ca0b16..2f04bc9b8f6 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1718,7 +1718,7 @@ envDict = dict(
- if get_option('build-tools') == 'next':
- SCons.Tool.DefaultToolpath.insert(0, os.path.abspath('site_scons/site_tools/next'))
-
--env = Environment(variables=env_vars, **envDict)
-+env = Environment(variables=env_vars, ENV={'PATH': os.environ['PATH']}, **envDict)
- del envDict
- env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption')
-
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-8.0.6-fixes-for-boost-1.85.patch b/dev-db/mongodb/files/mongodb-8.0.6-fixes-for-boost-1.85.patch
deleted file mode 100644
index ed4eff891b76..000000000000
--- a/dev-db/mongodb/files/mongodb-8.0.6-fixes-for-boost-1.85.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-From 9a65b01b0d86c48af4e8b40c6142ae501dc11141 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Thu, 17 Apr 2025 17:49:59 +0200
-Subject: [PATCH] fixes for boost 1.85
-
----
- src/mongo/client/sdam/sdam_json_test_runner.cpp | 2 +-
- .../sdam/server_selection_json_test_runner.cpp | 2 +-
- src/mongo/db/initialize_server_global_state.cpp | 2 +-
- src/mongo/db/startup_warnings_mongod.cpp | 3 ++-
- .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
- src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
- .../db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 3 ++-
- src/mongo/shell/shell_utils_launcher.cpp | 12 ++++++------
- src/mongo/shell/shell_utils_launcher.h | 2 +-
- src/mongo/unittest/golden_test.cpp | 2 +-
- src/mongo/unittest/golden_test.h | 2 +-
- src/mongo/unittest/golden_test_base.cpp | 4 ++--
- src/mongo/unittest/golden_test_test.cpp | 2 +-
- src/mongo/util/options_parser/options_parser.cpp | 2 +-
- 14 files changed, 24 insertions(+), 22 deletions(-)
-
-diff --git a/src/mongo/client/sdam/sdam_json_test_runner.cpp b/src/mongo/client/sdam/sdam_json_test_runner.cpp
-index b10f7a25971..e29907a089f 100644
---- a/src/mongo/client/sdam/sdam_json_test_runner.cpp
-+++ b/src/mongo/client/sdam/sdam_json_test_runner.cpp
-@@ -41,7 +41,7 @@
- #include <absl/container/node_hash_set.h>
- #include <boost/filesystem/directory.hpp>
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/iterator/iterator_facade.hpp>
- #include <boost/move/utility_core.hpp>
-
-diff --git a/src/mongo/client/sdam/server_selection_json_test_runner.cpp b/src/mongo/client/sdam/server_selection_json_test_runner.cpp
-index 5b916ff7ce7..d20909fce74 100644
---- a/src/mongo/client/sdam/server_selection_json_test_runner.cpp
-+++ b/src/mongo/client/sdam/server_selection_json_test_runner.cpp
-@@ -29,7 +29,7 @@
-
- #include <boost/filesystem/directory.hpp>
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/iterator/iterator_facade.hpp>
- #include <boost/move/utility_core.hpp>
- #include <boost/none.hpp>
-diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
-index 2e03433fabb..64481d9e227 100644
---- a/src/mongo/db/initialize_server_global_state.cpp
-+++ b/src/mongo/db/initialize_server_global_state.cpp
-@@ -332,7 +332,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
- << "\" 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);
-diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
-index a7fcc3e632b..6bf12381704 100644
---- a/src/mongo/db/startup_warnings_mongod.cpp
-+++ b/src/mongo/db/startup_warnings_mongod.cpp
-@@ -28,7 +28,8 @@
- */
-
- #include "mongo/db/startup_warnings_mongod.h"
--
-+#include <boost/filesystem.hpp>
-+#include <boost/filesystem/operations.hpp>
- #include <fmt/format.h>
- #include <fstream>
- #include <ios>
-diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-index 5116a72bc0e..39182f0e6a0 100644
---- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-+++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
-@@ -72,7 +72,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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,
- "flushMyDirectory couldn't find parent dir for file",
- "file"_attr = file.generic_string());
-@@ -80,7 +80,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
-index 690e34d2630..6ecfb48de5b 100644
---- a/src/mongo/db/storage/storage_engine_metadata.cpp
-+++ b/src/mongo/db/storage/storage_engine_metadata.cpp
-@@ -232,7 +232,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- // 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,
- "flushMyDirectory couldn't find parent dir for file",
- "file"_attr = file.generic_string());
-@@ -240,7 +240,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
- }
-
-
-- 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());
-
-diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-index ff6c81e38db..632a142ef28 100644
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
-@@ -69,6 +69,7 @@
- #include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
-+#include <boost/system/error_code.hpp>
- #include <boost/none.hpp>
- #include <boost/none_t.hpp>
- #include <boost/optional.hpp>
-@@ -182,7 +183,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
-
- // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
- // on windows, no-op on unix).
-- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
-+ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
- }
-
- bool WiredTigerFileVersion::shouldDowngrade(bool hasRecoveryTimestamp) {
-diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
-index ae5175a2a6d..b89fa59ac0d 100644
---- a/src/mongo/shell/shell_utils_launcher.cpp
-+++ b/src/mongo/shell/shell_utils_launcher.cpp
-@@ -331,26 +331,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
- 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;
-diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
-index 65337f061b3..fc15c8c0d85 100644
---- 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/operations.hpp>
- #include <map>
- #include <sstream>
- #include <string>
-diff --git a/src/mongo/unittest/golden_test.cpp b/src/mongo/unittest/golden_test.cpp
-index e01961b6060..be8f70148cf 100644
---- a/src/mongo/unittest/golden_test.cpp
-+++ b/src/mongo/unittest/golden_test.cpp
-@@ -33,7 +33,7 @@
- #include <iostream>
-
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/optional/optional.hpp>
-
- #include "mongo/base/init.h" // IWYU pragma: keep
-diff --git a/src/mongo/unittest/golden_test.h b/src/mongo/unittest/golden_test.h
-index 4c83503a9d3..75390265c75 100644
---- a/src/mongo/unittest/golden_test.h
-+++ b/src/mongo/unittest/golden_test.h
-@@ -30,7 +30,7 @@
- #pragma once
-
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/optional/optional.hpp>
- #include <functional>
- #include <string>
-diff --git a/src/mongo/unittest/golden_test_base.cpp b/src/mongo/unittest/golden_test_base.cpp
-index 1d6c4331c32..a000658b099 100644
---- a/src/mongo/unittest/golden_test_base.cpp
-+++ b/src/mongo/unittest/golden_test_base.cpp
-@@ -31,7 +31,7 @@
- #include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/function/function_base.hpp>
- #include <boost/move/utility_core.hpp>
- #include <boost/none.hpp>
-@@ -116,7 +116,7 @@ GoldenTestEnvironment::GoldenTestEnvironment() : _goldenDataRoot(".") {
- fs::path outputRoot;
- if (opts.outputRootPattern) {
- fs::path pattern(*opts.outputRootPattern);
-- outputRoot = pattern.parent_path() / fs::unique_path(pattern.leaf());
-+ outputRoot = pattern.parent_path() / fs::unique_path(pattern.filename());
- } else {
- outputRoot = fs::temp_directory_path() / fs::unique_path("out-%%%%-%%%%-%%%%-%%%%");
- }
-diff --git a/src/mongo/unittest/golden_test_test.cpp b/src/mongo/unittest/golden_test_test.cpp
-index 874d73bf52a..fb64834cfc7 100644
---- a/src/mongo/unittest/golden_test_test.cpp
-+++ b/src/mongo/unittest/golden_test_test.cpp
-@@ -32,7 +32,7 @@
- #include <string>
-
- #include <boost/filesystem/path.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <fmt/format.h>
-
- #include "mongo/base/string_data.h"
-diff --git a/src/mongo/util/options_parser/options_parser.cpp b/src/mongo/util/options_parser/options_parser.cpp
-index 46255631358..100b4c7c2bb 100644
---- a/src/mongo/util/options_parser/options_parser.cpp
-+++ b/src/mongo/util/options_parser/options_parser.cpp
-@@ -35,7 +35,7 @@
- #include <boost/any/bad_any_cast.hpp>
- #include <boost/core/typeinfo.hpp>
- #include <boost/filesystem/operations.hpp>
--#include <boost/filesystem/path_traits.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/iostreams/categories.hpp>
- #include <boost/iostreams/device/file_descriptor.hpp>
- #include <boost/iostreams/imbue.hpp>
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-8.0.6-mozjs-remove-unused-constructor.patch b/dev-db/mongodb/files/mongodb-8.0.6-mozjs-remove-unused-constructor.patch
deleted file mode 100644
index 60f231d9ae48..000000000000
--- a/dev-db/mongodb/files/mongodb-8.0.6-mozjs-remove-unused-constructor.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 67320f150c65ece68118d1c9ecfd1c0a1f69ba6f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Mon, 28 Apr 2025 14:16:08 +0200
-Subject: [PATCH] remove unused constructor
-
----
- .../mozjs/extract/js/src/threading/ExclusiveData.h | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h b/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
-index 38e89f10a1d..2d8ca831bf7 100644
---- a/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
-+++ b/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
-@@ -109,11 +109,6 @@ class ExclusiveData {
- explicit ExclusiveData(const MutexId& id, Args&&... args)
- : lock_(id), value_(std::forward<Args>(args)...) {}
-
-- ExclusiveData(ExclusiveData&& rhs)
-- : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) {
-- MOZ_ASSERT(&rhs != this, "self-move disallowed!");
-- }
--
- ExclusiveData& operator=(ExclusiveData&& rhs) {
- this->~ExclusiveData();
- new (mozilla::KnownNotNull, this) ExclusiveData(std::move(rhs));
---
-2.49.0
-
diff --git a/dev-db/mongodb/files/mongodb-8.0.6-skip-reqs-check.patch b/dev-db/mongodb/files/mongodb-8.0.6-skip-reqs-check.patch
deleted file mode 100644
index 395abeffe1cf..000000000000
--- a/dev-db/mongodb/files/mongodb-8.0.6-skip-reqs-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/buildscripts/scons2.py b/buildscripts/scons.py
-index b1ddc85..b2e61e9 100755
---- a/buildscripts/scons2.py
-+++ b/buildscripts/scons.py
-@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons')
- sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
-
- # pylint: disable=C0413
--from mongo.pip_requirements import verify_requirements, MissingRequirements
-+#from mongo.pip_requirements import verify_requirements, MissingRequirements
-
--try:
-- verify_requirements()
--except MissingRequirements as ex:
-- print(ex)
-- sys.exit(1)
-+#try:
-+# verify_requirements()
-+#except MissingRequirements as ex:
-+# print(ex)
-+# sys.exit(1)
-
- try:
- import SCons.Script
diff --git a/dev-db/mongodb/files/mongodb-8.0.6-use-tenacity.patch b/dev-db/mongodb/files/mongodb-8.0.6-use-tenacity.patch
deleted file mode 100644
index 1cad9842a533..000000000000
--- a/dev-db/mongodb/files/mongodb-8.0.6-use-tenacity.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4903458dd8933b0754da3b00109a042a5ccf23a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
-Date: Tue, 29 Apr 2025 18:52:54 +0200
-Subject: [PATCH] replace retry by tenacity
-
-the retry decorator is used in site_scons/site_tools/integrate_bazel.py
-which is part of the retry package not available in Gentoo.
-Replace it by tenacity which is well included in Gentoo.
----
- site_scons/site_tools/integrate_bazel.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/site_scons/site_tools/integrate_bazel.py b/site_scons/site_tools/integrate_bazel.py
-index b9e2143f23c..995df696d10 100644
---- a/site_scons/site_tools/integrate_bazel.py
-+++ b/site_scons/site_tools/integrate_bazel.py
-@@ -16,7 +16,7 @@ import threading
- from typing import List, Dict, Set, Tuple, Any
- import urllib.request
- import requests
--from retry import retry
-+from tenacity import retry, stop_after_attempt, wait_fixed
- import sys
-
- import SCons
-@@ -477,7 +477,7 @@ def generate_bazel_info_for_ninja(env: SCons.Environment.Environment) -> None:
- env["NINJA_BAZEL_INPUTS"] = ninja_bazel_ins
-
-
--@retry(tries=5, delay=3)
-+@retry(stop=stop_after_attempt(3), wait=wait_fixed(0.1))
- def download_path_with_retry(*args, **kwargs):
- urllib.request.urlretrieve(*args, **kwargs)
-
---
-2.49.0
-
diff --git a/dev-db/mongodb/mongodb-5.0.30.ebuild b/dev-db/mongodb/mongodb-5.0.30.ebuild
index 914c615f32cb..fc62ad3a7e7c 100644
--- a/dev-db/mongodb/mongodb-5.0.30.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.30.ebuild
@@ -18,6 +18,7 @@ MY_P=mongo-${MY_PV}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="https://www.mongodb.com"
SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.0.30-patches.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 SSPL-1"
@@ -63,23 +64,23 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-5.0.30-gcc-11.patch"
- "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
- "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${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"
- "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
- "${FILESDIR}/${PN}-5.0.30-gcc-15.patch"
- "${FILESDIR}/${PN}-5.0.26-scons.patch"
- "${FILESDIR}/${PN}-5.0.26-mozjs-remove-unused-constructor.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-4.4.1-boost.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.30-gcc-11.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.2-fix-scons.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.2-no-compass.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.2-skip-reqs-check.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.2-boost-1.79.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.5-no-force-lld.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-4.4.10-boost-1.81.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.5-boost-1.81-extra.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.16-arm64-assert.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-4.4.29-no-enterprise.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-boost-1.85.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-boost-1.85-extra.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.30-gcc-15.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-scons.patch"
+ "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-mozjs-remove-unused-constructor.patch"
)
python_check_deps() {
@@ -185,19 +186,19 @@ src_install() {
doman debian/mongo*.1
dodoc README docs/building.md
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
+ newinitd "${WORKDIR}/mongodb-5.0.30-patches/${PN}.initd-r3" ${PN}
+ newconfd "${WORKDIR}/mongodb-5.0.30-patches/${PN}.confd-r3" ${PN}
+ newinitd "${WORKDIR}/mongodb-5.0.30-patches/mongos.initd-r3" mongos
+ newconfd "${WORKDIR}/mongodb-5.0.30-patches/mongos.confd-r3" mongos
insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+ newins "${WORKDIR}/mongodb-5.0.30-patches/${PN}.conf-r3" ${PN}.conf
+ newins "${WORKDIR}/mongodb-5.0.30-patches/mongos.conf-r2" mongos.conf
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ systemd_newunit "${WORKDIR}/mongodb-5.0.30-patches/${PN}.service-r1" "${PN}.service"
insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ newins "${WORKDIR}/mongodb-5.0.30-patches/${PN}.logrotate" ${PN}
# see bug #526114
pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
diff --git a/dev-db/mongodb/mongodb-6.0.22.ebuild b/dev-db/mongodb/mongodb-6.0.22.ebuild
index 32cef59900d6..c7168e0883ff 100644
--- a/dev-db/mongodb/mongodb-6.0.22.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.22.ebuild
@@ -18,6 +18,7 @@ MY_P=mongo-${MY_PV}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="https://www.mongodb.com"
SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.22-patches.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 SSPL-1"
@@ -63,15 +64,15 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/mongodb-4.4.29-no-enterprise.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${FILESDIR}/mongodb-6.0.0-boost-1.79.patch"
- "${FILESDIR}/mongodb-6.0.0-gcc12.patch"
- "${FILESDIR}/mongodb-6.0.7-gcc-13.patch"
- "${FILESDIR}/mongodb-6.0.21-boost-1.85.patch"
- "${FILESDIR}/mongodb-6.0.2-sconstruct-changes.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-4.4.29-no-enterprise.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/${PN}-5.0.2-no-compass.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/${PN}-5.0.2-skip-reqs-check.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/${PN}-4.4.10-boost-1.81.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.0-boost-1.79.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.0-gcc12.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.7-gcc-13.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.21-boost-1.85.patch"
+ "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.2-sconstruct-changes.patch"
)
python_check_deps() {
@@ -176,19 +177,19 @@ src_install() {
doman debian/mongo*.1
dodoc docs/building.md
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
+ newinitd "${WORKDIR}/mongodb-6.0.22-patches/${PN}.initd-r3" ${PN}
+ newconfd "${WORKDIR}/mongodb-6.0.22-patches/${PN}.confd-r3" ${PN}
+ newinitd "${WORKDIR}/mongodb-6.0.22-patches/mongos.initd-r3" mongos
+ newconfd "${WORKDIR}/mongodb-6.0.22-patches/mongos.confd-r3" mongos
insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+ newins "${WORKDIR}/mongodb-6.0.22-patches/${PN}.conf-r3" ${PN}.conf
+ newins "${WORKDIR}/mongodb-6.0.22-patches/mongos.conf-r2" mongos.conf
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ systemd_newunit "${WORKDIR}/mongodb-6.0.22-patches/${PN}.service-r1" "${PN}.service"
insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ newins "${WORKDIR}/mongodb-6.0.22-patches/${PN}.logrotate" ${PN}
# see bug #526114
pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
diff --git a/dev-db/mongodb/mongodb-7.0.18.ebuild b/dev-db/mongodb/mongodb-7.0.18.ebuild
index 32c42f584768..92cb29ec8b06 100644
--- a/dev-db/mongodb/mongodb-7.0.18.ebuild
+++ b/dev-db/mongodb/mongodb-7.0.18.ebuild
@@ -18,6 +18,7 @@ MY_P=mongo-${MY_PV}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="https://www.mongodb.com"
SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.0.18-patches.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 SSPL-1"
@@ -66,13 +67,13 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/mongodb-4.4.29-no-enterprise.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${FILESDIR}/${PN}-7.0.1-sconstruct.patch"
- "${FILESDIR}/extrapatch-sconstruct.patch"
- "${FILESDIR}/mongodb-7.0.18-boost-1.85.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/mongodb-4.4.29-no-enterprise.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/${PN}-5.0.2-no-compass.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/${PN}-5.0.2-skip-reqs-check.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/${PN}-4.4.10-boost-1.81.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/${PN}-7.0.1-sconstruct.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/extrapatch-sconstruct.patch"
+ "${WORKDIR}/mongodb-7.0.18-patches/mongodb-7.0.18-boost-1.85.patch"
)
python_check_deps() {
@@ -178,19 +179,19 @@ src_install() {
doman debian/mongo*.1
dodoc docs/building.md
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
+ newinitd "${WORKDIR}/mongodb-7.0.18-patches/${PN}.initd-r3" ${PN}
+ newconfd "${WORKDIR}/mongodb-7.0.18-patches/${PN}.confd-r3" ${PN}
+ newinitd "${WORKDIR}/mongodb-7.0.18-patches/mongos.initd-r3" mongos
+ newconfd "${WORKDIR}/mongodb-7.0.18-patches/mongos.confd-r3" mongos
insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+ newins "${WORKDIR}/mongodb-7.0.18-patches/${PN}.conf-r3" ${PN}.conf
+ newins "${WORKDIR}/mongodb-7.0.18-patches/mongos.conf-r2" mongos.conf
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ systemd_newunit "${WORKDIR}/mongodb-7.0.18-patches/${PN}.service-r1" "${PN}.service"
insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ newins "${WORKDIR}/mongodb-7.0.18-patches/${PN}.logrotate" ${PN}
# see bug #526114
pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
diff --git a/dev-db/mongodb/mongodb-8.0.8.ebuild b/dev-db/mongodb/mongodb-8.0.8.ebuild
index 408631e0c502..75ba4c99788d 100644
--- a/dev-db/mongodb/mongodb-8.0.8.ebuild
+++ b/dev-db/mongodb/mongodb-8.0.8.ebuild
@@ -18,6 +18,7 @@ MY_P=mongo-${MY_PV}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="https://www.mongodb.com"
SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-8.0.8-patches.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 SSPL-1"
@@ -68,14 +69,14 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/mongodb-4.4.29-no-enterprise.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-7.0.2-sconstruct.patch"
- "${FILESDIR}/${PN}-8.0.6-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-8.0.6-fixes-for-boost-1.85.patch"
- "${FILESDIR}/${PN}-8.0.4-scons.patch"
- "${FILESDIR}/${PN}-8.0.6-mozjs-remove-unused-constructor.patch"
- "${FILESDIR}/${PN}-8.0.6-use-tenacity.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/mongodb-4.4.29-no-enterprise.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-5.0.2-no-compass.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-7.0.2-sconstruct.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-8.0.6-skip-reqs-check.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-8.0.6-fixes-for-boost-1.85.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-8.0.4-scons.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-8.0.6-mozjs-remove-unused-constructor.patch"
+ "${WORKDIR}/mongodb-8.0.8-patches/${PN}-8.0.6-use-tenacity.patch"
)
python_check_deps() {
@@ -184,19 +185,19 @@ src_install() {
doman debian/mongo*.1
dodoc docs/building.md
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
+ newinitd "${WORKDIR}/mongodb-8.0.8-patches/${PN}.initd-r3" ${PN}
+ newconfd "${WORKDIR}/mongodb-8.0.8-patches/${PN}.confd-r3" ${PN}
+ newinitd "${WORKDIR}/mongodb-8.0.8-patches/mongos.initd-r3" mongos
+ newconfd "${WORKDIR}/mongodb-8.0.8-patches/mongos.confd-r3" mongos
insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+ newins "${WORKDIR}/mongodb-8.0.8-patches/${PN}.conf-r3" ${PN}.conf
+ newins "${WORKDIR}/mongodb-8.0.8-patches/mongos.conf-r2" mongos.conf
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ systemd_newunit "${WORKDIR}/mongodb-8.0.8-patches/${PN}.service-r1" "${PN}.service"
insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ newins "${WORKDIR}/mongodb-8.0.8-patches/${PN}.logrotate" ${PN}
# see bug #526114
pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2025-05-06 19:20 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2025-05-06 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 228a8c8a4347097e136ac25145e09a659827054b
Author: François Valenduc <francoisvalenduc <AT> gmail <DOT> com>
AuthorDate: Fri May 2 11:12:35 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 6 19:10:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228a8c8a
dev-db/mongodb: add 6.0.22
Bug: https://bugs.gentoo.org/882515
Signed-off-by: François Valenduc <francoisvalenduc <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41580
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mongodb/Manifest | 1 +
.../mongodb/files/mongodb-6.0.0-boost-1.79.patch | 81 ++++++
dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch | 12 +
.../files/mongodb-6.0.2-sconstruct-changes.patch | 93 +++++++
.../mongodb/files/mongodb-6.0.21-boost-1.85.patch | 182 +++++++++++++
dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch | 24 ++
.../mongodb/files/mongodb-6.0.22-boost-1.85.patch | 286 +++++++++++++++++++++
dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch | 12 +
dev-db/mongodb/mongodb-6.0.22.ebuild | 204 +++++++++++++++
9 files changed, 895 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 9c3d50fe7432..c0321b0ab545 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1 +1,2 @@
DIST mongodb-5.0.30.gh.tar.gz 57312372 BLAKE2B 72b026115cf3c8b1b81857bc5bffcd5b72bae4b581a7ada598bc7bbe594f264f581212159788113c5709ab751dd8a57943a3cc9b78f0d31aeb50375fa1da2c28 SHA512 97642da12cf199fa3f17825b1eb20e4d9bc1f65c8950f54b36347af11b6964cdd2007d11b01147d0c253077ef14121de52517c1739b433b49a9cbbe2596d9d05
+DIST mongodb-6.0.22.gh.tar.gz 87688277 BLAKE2B 1ff5206cb996763ca051129572eb9bf6f8cff0ceeae7f86c4472e49a7d2210de602beead53d3aba7d8ee3b168a50a2505b8cfc91cd22968dd39a42ba13432e73 SHA512 4a3258b22d31ee81d5932d82dc5d19aec0b3648593d57cedd21b74c46bf4bfea833a519f4e90c1f2f860aa46781297dd16b7324145713e36eee81d41e684c420
diff --git a/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch b/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch
new file mode 100644
index 000000000000..78dd84c50df1
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.0-boost-1.79.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/844235
+--- a/src/mongo/db/auth/security_key_test.cpp
++++ b/src/mongo/db/auth/security_key_test.cpp
+@@ -30,6 +30,7 @@
+ #include "mongo/platform/basic.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+
+ #include "mongo/base/string_data.h"
+ #include "mongo/db/auth/authorization_manager.h"
+--- a/src/mongo/db/storage/storage_repair_observer.cpp
++++ b/src/mongo/db/storage/storage_repair_observer.cpp
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #endif
+
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/db/dbhelpers.h"
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/storage/kv/kv_engine_test_harness.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <memory>
+
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+@@ -48,6 +48,7 @@
+ #include "mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/system/error_code.hpp>
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+@@ -36,6 +36,7 @@
+ #include <limits>
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/base/simple_string_data_comparator.h"
+--- a/src/mongo/shell/shell_utils_extended.cpp
++++ b/src/mongo/shell/shell_utils_extended.cpp
+@@ -37,6 +37,7 @@
+ #endif
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <fmt/format.h>
+ #include <fstream>
+
+--- a/src/mongo/util/stacktrace_threads.cpp
++++ b/src/mongo/util/stacktrace_threads.cpp
+@@ -36,6 +36,7 @@
+ #include <array>
+ #include <atomic>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <cstdint>
+ #include <cstdlib>
+ #include <dirent.h>
+--- a/src/mongo/util/processinfo_linux.cpp
++++ b/src/mongo/util/processinfo_linux.cpp
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <malloc.h>
+ #include <pcrecpp.h>
++#include <fstream>
+ #include <sched.h>
+ #include <stdio.h>
+ #include <sys/mman.h>
diff --git a/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch b/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch
new file mode 100644
index 000000000000..ba71fd8d3e62
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.0-gcc12.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mongo/db/repl/tenant_file_cloner.h b/src/mongo/db/repl/tenant_file_cloner.h
+index def0952..0625e46 100644
+--- a/src/mongo/db/repl/tenant_file_cloner.h
++++ b/src/mongo/db/repl/tenant_file_cloner.h
+@@ -32,6 +32,7 @@
+ #include <boost/filesystem.hpp>
+ #include <memory>
+ #include <vector>
++#include <fstream>
+
+ #include "mongo/db/repl/base_cloner.h"
+ #include "mongo/db/repl/task_runner.h"
diff --git a/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch b/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
new file mode 100644
index 000000000000..26d2b486ac68
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
@@ -0,0 +1,93 @@
+diff --git a/SConstruct b/SConstruct
+index 8367691..9061849 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2441,7 +2441,6 @@ if env.TargetOSIs('posix'):
+
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
+- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
+ "-Wall",
+ "-Wsign-compare",
+ "-Wno-unknown-pragmas",
+@@ -2497,6 +2496,8 @@ if env.TargetOSIs('posix'):
+
+ # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+ env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # On OS X, clang doesn't want the pthread flag at link time, or it
+ # issues warnings which make it impossible for us to declare link
+@@ -2549,7 +2550,7 @@ if env.TargetOSIs('posix'):
+ )
+
+ #make scons colorgcc friendly
+- for key in ('HOME', 'TERM'):
++ for key in ('HOME', 'TERM', 'PATH'):
+ try:
+ env['ENV'][key] = os.environ[key]
+ except KeyError:
+@@ -2968,43 +2969,6 @@ def doConfigure(myenv):
+ myenv.AddMethod(
+ functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
+
+- if myenv.ToolchainIs('gcc', 'clang'):
+- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
+- # because it is much faster. Don't use it if the user has already configured another linker
+- # selection manually.
+- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
+- myenv.FatalError(f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
+-
+- linker_ld = get_option('linker')
+- if linker_ld == 'auto':
+- # lld has problems with separate debug info on some platforms. See:
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- #
+- # lld also apparently has problems with symbol resolution
+- # in some esoteric configurations that apply for us when
+- # using --link-model=dynamic mode, so disable lld there
+- # too. See:
+- # - https://bugs.llvm.org/show_bug.cgi?id=46676
+- #
+- # We should revisit all of these issues the next time we upgrade our clang minimum.
+- if get_option('separate-debug') == 'off' and get_option('link-model') != 'dynamic':
+- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
+- myenv.AddToLINKFLAGSIfSupported('-fuse-ld=gold')
+- else:
+- myenv.AddToLINKFLAGSIfSupported('-fuse-ld=gold')
+- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
+- # BFD is not supported due to issues with it causing warnings from some of
+- # the third party libraries that mongodb is linked with:
+- # https://jira.mongodb.org/browse/SERVER-49465
+- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
+- else:
+- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
+- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
+-
+- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
+- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
+-
+ detectCompiler = Configure(myenv, help=False, custom_tests = {
+ 'CheckForCXXLink': CheckForCXXLink,
+ })
+@@ -4344,17 +4308,11 @@ def doConfigure(myenv):
+ "BOOST_LOG_NO_SHORTHAND_NAMES",
+ "BOOST_LOG_USE_NATIVE_SYSLOG",
+ "BOOST_LOG_WITHOUT_THREAD_ATTR",
++ "BOOST_LOG_DYN_LINK",
+ "ABSL_FORCE_ALIGNED_ACCESS",
+ ]
+ )
+
+- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
+- conf.env.AppendUnique(
+- CPPDEFINES=[
+- "BOOST_LOG_DYN_LINK",
+- ]
+- )
+-
+ if use_system_version_of_library("boost"):
+ if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
+ myenv.ConfError("can't find boost headers")
diff --git a/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch
new file mode 100644
index 000000000000..1c923e1fe698
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.21-boost-1.85.patch
@@ -0,0 +1,182 @@
+From dbca1c7f472301ab93ee74bc3f40fba019428dea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
+Date: Mon, 14 Apr 2025 09:50:42 +0200
+Subject: [PATCH] fix for boost 1.85
+
+---
+ src/mongo/db/initialize_server_global_state.cpp | 4 ++--
+ src/mongo/db/startup_warnings_mongod.cpp | 1 +
+ src/mongo/db/storage/backup_block.cpp | 5 ++++-
+ .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
+ src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
+ src/mongo/scripting/engine.cpp | 2 +-
+ src/mongo/shell/shell_utils_launcher.cpp | 12 ++++++------
+ src/mongo/shell/shell_utils_launcher.h | 2 +-
+ 10 files changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
+index 4dc953ff8ce..2e9e22bfd61 100644
+--- 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>
+@@ -307,7 +307,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
+ << "\" 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);
+diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
+index fb4969106af..f19aa6b32c4 100644
+--- 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>
+diff --git a/src/mongo/db/storage/backup_block.cpp b/src/mongo/db/storage/backup_block.cpp
+index 9b8dc29f209..10fd6632fc3 100644
+--- a/src/mongo/db/storage/backup_block.cpp
++++ b/src/mongo/db/storage/backup_block.cpp
+@@ -30,6 +30,9 @@
+ #include "mongo/db/storage/backup_block.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
++#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/path.hpp>
+ #include <set>
+
+ #include "mongo/base/string_data.h"
+@@ -59,7 +62,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
+
+ // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
+ // on windows, no-op on unix).
+- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
++ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
+ }
+
+ } // namespace details
+diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
+index 0d67885718a..035b07c2eac 100644
+--- 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ }
+
+
+- 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());
+
+diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
+index 07b21b448e1..87c7cd56cd1 100644
+--- a/src/mongo/db/storage/storage_engine_metadata.cpp
++++ b/src/mongo/db/storage/storage_engine_metadata.cpp
+@@ -220,7 +220,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ }
+
+
+- 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());
+
+diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
+index 49e920bdf69..d198de51788 100644
+--- a/src/mongo/scripting/engine.cpp
++++ b/src/mongo/scripting/engine.cpp
+@@ -34,7 +34,7 @@
+ #include "mongo/scripting/engine.h"
+
+ #include <algorithm>
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+
+ #include "mongo/base/string_data.h"
+ #include "mongo/client/dbclient_base.h"
+diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
+index 0f6b6f2cf42..cf18b896c36 100644
+--- a/src/mongo/shell/shell_utils_launcher.cpp
++++ b/src/mongo/shell/shell_utils_launcher.cpp
+@@ -1000,26 +1000,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
+ 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;
+diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
+index 14a6ce06390..960f78a71e8 100644
+--- 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/files/mongodb-6.0.21-cstdint.patch b/dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch
new file mode 100644
index 000000000000..f71c3e9cb055
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.21-cstdint.patch
@@ -0,0 +1,24 @@
+From f7eb64bcdf8cc9c6af8761d96173243c416bcdbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
+Date: Mon, 14 Apr 2025 19:13:44 +0200
+Subject: [PATCH] ctype.h add cstdint
+
+---
+ src/mongo/util/ctype.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
+index a3880e281a8..78ee57e3d0c 100644
+--- a/src/mongo/util/ctype.h
++++ b/src/mongo/util/ctype.h
+@@ -67,6 +67,7 @@
+ #pragma once
+
+ #include <array>
++#include <cstdint>
+
+ namespace mongo::ctype {
+ namespace detail {
+--
+2.49.0
+
diff --git a/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch
new file mode 100644
index 000000000000..13312376de94
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.22-boost-1.85.patch
@@ -0,0 +1,286 @@
+From e534a7e65efabd21e22b9243795e3cd06268f49a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
+Date: Wed, 30 Apr 2025 00:25:10 +0200
+Subject: [PATCH] fix boost
+
+---
+ src/mongo/db/initialize_server_global_state.cpp | 4 ++--
+ src/mongo/db/repl/tenant_file_cloner.h | 1 +
+ src/mongo/db/startup_warnings_mongod.cpp | 1 +
+ src/mongo/db/storage/backup_block.cpp | 5 ++++-
+ .../db/storage/storage_engine_lock_file_posix.cpp | 4 ++--
+ src/mongo/db/storage/storage_engine_metadata.cpp | 4 ++--
+ .../db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 2 +-
+ src/mongo/scripting/engine.cpp | 2 +-
+ src/mongo/shell/shell_utils_extended.cpp | 9 +++++++++
+ src/mongo/shell/shell_utils_launcher.cpp | 12 ++++++------
+ src/mongo/shell/shell_utils_launcher.h | 2 +-
+ src/mongo/util/ctype.h | 1 +
+ src/mongo/util/processinfo_linux.cpp | 1 +
+ src/mongo/util/stacktrace_threads.cpp | 10 +++++++---
+ 14 files changed, 39 insertions(+), 19 deletions(-)
+
+diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
+index 4dc953ff8ce..2e9e22bfd61 100644
+--- 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>
+@@ -307,7 +307,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
+ << "\" 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);
+diff --git a/src/mongo/db/repl/tenant_file_cloner.h b/src/mongo/db/repl/tenant_file_cloner.h
+index def09528953..0625e4687f7 100644
+--- a/src/mongo/db/repl/tenant_file_cloner.h
++++ b/src/mongo/db/repl/tenant_file_cloner.h
+@@ -32,6 +32,7 @@
+ #include <boost/filesystem.hpp>
+ #include <memory>
+ #include <vector>
++#include <fstream>
+
+ #include "mongo/db/repl/base_cloner.h"
+ #include "mongo/db/repl/task_runner.h"
+diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
+index fb4969106af..f19aa6b32c4 100644
+--- 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>
+diff --git a/src/mongo/db/storage/backup_block.cpp b/src/mongo/db/storage/backup_block.cpp
+index 9b8dc29f209..10fd6632fc3 100644
+--- a/src/mongo/db/storage/backup_block.cpp
++++ b/src/mongo/db/storage/backup_block.cpp
+@@ -30,6 +30,9 @@
+ #include "mongo/db/storage/backup_block.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
++#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/path.hpp>
+ #include <set>
+
+ #include "mongo/base/string_data.h"
+@@ -59,7 +62,7 @@ std::string extractIdentFromPath(const boost::filesystem::path& dbpath,
+
+ // Remove the file extension and convert to generic form (i.e. replace "\" with "/"
+ // on windows, no-op on unix).
+- return boost::filesystem::change_extension(identWithExtension, "").generic_string();
++ return boost::filesystem::path(identWithExtension).replace_extension("").generic_string();
+ }
+
+ } // namespace details
+diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
+index 0d67885718a..035b07c2eac 100644
+--- 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ }
+
+
+- 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());
+
+diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
+index 07b21b448e1..87c7cd56cd1 100644
+--- a/src/mongo/db/storage/storage_engine_metadata.cpp
++++ b/src/mongo/db/storage/storage_engine_metadata.cpp
+@@ -220,7 +220,7 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ // 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 @@ void flushMyDirectory(const boost::filesystem::path& file) {
+ }
+
+
+- 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());
+
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+index 0de1c43284f..1f400f32612 100644
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+@@ -1279,7 +1279,7 @@ WiredTigerKVEngine::beginNonBlockingBackup(OperationContext* opCtx,
+
+ // Create ongoingBackup.lock file to signal recovery that it should delete WiredTiger.backup if
+ // we have an unclean shutdown with the cursor still open.
+- { boost::filesystem::ofstream ongoingBackup(getOngoingBackupPath()); }
++ { boost::filesystem::std::ofstream ongoingBackup(getOngoingBackupPath()); }
+
+ // Oplog truncation thread won't remove oplog since the checkpoint pinned by the backup cursor.
+ stdx::lock_guard<Latch> lock(_oplogPinnedByBackupMutex);
+diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
+index 49e920bdf69..d198de51788 100644
+--- a/src/mongo/scripting/engine.cpp
++++ b/src/mongo/scripting/engine.cpp
+@@ -34,7 +34,7 @@
+ #include "mongo/scripting/engine.h"
+
+ #include <algorithm>
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+
+ #include "mongo/base/string_data.h"
+ #include "mongo/client/dbclient_base.h"
+diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
+index 6cd6dc6ed0d..29b886d6acf 100644
+--- a/src/mongo/shell/shell_utils_extended.cpp
++++ b/src/mongo/shell/shell_utils_extended.cpp
+@@ -37,6 +37,15 @@
+ #endif
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/directory.hpp>
++#include <boost/filesystem/exception.hpp>
++#include <boost/filesystem/file_status.hpp>
++#include <boost/filesystem/fstream.hpp>
++#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/path.hpp>
++#include <boost/iterator/iterator_facade.hpp>
++#include <boost/move/utility_core.hpp>
++
+ #include <fmt/format.h>
+ #include <fstream>
+
+diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
+index 0f6b6f2cf42..cf18b896c36 100644
+--- a/src/mongo/shell/shell_utils_launcher.cpp
++++ b/src/mongo/shell/shell_utils_launcher.cpp
+@@ -1000,26 +1000,26 @@ void copyDir(const boost::filesystem::path& from, const boost::filesystem::path&
+ 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;
+diff --git a/src/mongo/shell/shell_utils_launcher.h b/src/mongo/shell/shell_utils_launcher.h
+index 14a6ce06390..960f78a71e8 100644
+--- 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/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
+index a3880e281a8..78ee57e3d0c 100644
+--- a/src/mongo/util/ctype.h
++++ b/src/mongo/util/ctype.h
+@@ -67,6 +67,7 @@
+ #pragma once
+
+ #include <array>
++#include <cstdint>
+
+ namespace mongo::ctype {
+ namespace detail {
+diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
+index 7793011e901..ff3c940bab0 100644
+--- a/src/mongo/util/processinfo_linux.cpp
++++ b/src/mongo/util/processinfo_linux.cpp
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <malloc.h>
+ #include <pcrecpp.h>
++#include <fstream>
+ #include <sched.h>
+ #include <stdio.h>
+ #include <sys/mman.h>
+diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
+index 51581c4dc9b..99c30f153b0 100644
+--- a/src/mongo/util/stacktrace_threads.cpp
++++ b/src/mongo/util/stacktrace_threads.cpp
+@@ -35,7 +35,11 @@
+
+ #include <array>
+ #include <atomic>
+-#include <boost/filesystem.hpp>
++#include <boost/filesystem/directory.hpp>
++#include <boost/filesystem/fstream.hpp>
++#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/path.hpp>
++#include <boost/iterator/iterator_facade.hpp>
+ #include <cstdint>
+ #include <cstdlib>
+ #include <dirent.h>
+@@ -243,8 +247,8 @@ bool tidExists(int tid) {
+ std::string readThreadName(int tid) {
+ std::string threadName;
+ try {
+- boost::filesystem::ifstream in(taskDir() / std::to_string(tid) / "comm");
+- std::getline(in, threadName);
++ boost::filesystem::ifstream in(taskDir() / boost::filesystem::path(std::to_string(tid)) / "comm");
++ std::getline(in, threadName);
+ } catch (...) {
+ }
+ return threadName;
+--
+2.49.0
+
diff --git a/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch b/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch
new file mode 100644
index 000000000000..5473997e56c9
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.7-gcc-13.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mongo/util/ctype.h b/src/mongo/util/ctype.h
+index a3880e2..78ee57e 100644
+--- a/src/mongo/util/ctype.h
++++ b/src/mongo/util/ctype.h
+@@ -67,6 +67,7 @@
+ #pragma once
+
+ #include <array>
++#include <cstdint>
+
+ namespace mongo::ctype {
+ namespace detail {
diff --git a/dev-db/mongodb/mongodb-6.0.22.ebuild b/dev-db/mongodb/mongodb-6.0.22.ebuild
new file mode 100644
index 000000000000..32cef59900d6
--- /dev/null
+++ b/dev-db/mongodb/mongodb-6.0.22.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eapi9-ver flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_PV=r${PV/_rc/-rc}
+MY_P=mongo-${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.7:=
+ app-arch/zstd:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ dev-libs/boost:=[nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ dev-libs/snowball-stemmer:=
+ net-misc/curl
+ >=sys-libs/zlib-1.2.12:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-debug/valgrind )"
+BDEPEND="
+ $(python_gen_any_dep '
+ >=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+"
+PDEPEND="
+ mongosh? ( app-admin/mongosh-bin )
+ tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+ "${FILESDIR}/mongodb-4.4.29-no-enterprise.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+ "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
+ "${FILESDIR}/mongodb-6.0.0-boost-1.79.patch"
+ "${FILESDIR}/mongodb-6.0.0-gcc12.patch"
+ "${FILESDIR}/mongodb-6.0.7-gcc-13.patch"
+ "${FILESDIR}/mongodb-6.0.21-boost-1.85.patch"
+ "${FILESDIR}/mongodb-6.0.2-sconstruct-changes.patch"
+)
+
+python_check_deps() {
+ python_has_version -b ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ # Bug 809692 + 890294
+ if use amd64 && ! use cpu_flags_x86_avx; then
+ ewarn "MongoDB 5.0 requires use of the AVX instruction set."
+ ewarn "This ebuild will use --experimental-optimization=-sandybridge which"
+ ewarn "will result in an experimental build of MongoDB as per upstream."
+ ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/"
+ fi
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_replacing -lt 4.4; then
+ ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.4-series. Then upgrade to 5.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost,snappy-*,yaml-cpp} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag
+ scons_opts=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ CCFLAGS="${CXXFLAGS}"
+
+ VERBOSE=1
+ VARIANT_DIR=gentoo
+ MONGO_VERSION="${PV}"
+ MONGO_GIT_HASH="966efda23d779a86c76c34e1b13e561d68f2bb37"
+
+ --disable-warnings-as-errors
+ --force-jobs # Reapply #906897, fix #935274
+ --jobs="$(makeopts_jobs)"
+ --use-system-boost
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use amd64 && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+
+ scons_opts+=( --ssl=$(usex ssl on off) )
+
+ # Needed to avoid forcing FORTIFY_SOURCE
+ # Gentoo's toolchain applies these anyway
+ scons_opts+=( --runtime-hardening=off )
+
+ # gold is an option here but we don't really do that anymore
+ if tc-ld-is-lld; then
+ scons_opts+=( --linker=lld )
+ else
+ scons_opts+=( --linker=bfd )
+ fi
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-devcore || die
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2024-12-12 4:57 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-12-12 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 356a577a8b297ffb97e1cc8c61a67e14cd5014b3
Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Wed Dec 11 12:08:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 04:56:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356a577a
dev-db/mongodb: fix build error w/ clang 19
Backport from upstream commit 33cdc6655b0de44cb7a431216dcbb0d5a552aec6
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39677
Signed-off-by: Sam James <sam <AT> gentoo.org>
...db-5.0.26-mozjs-remove-unused-constructor.patch | 25 ++++++++++++++++++++++
dev-db/mongodb/mongodb-5.0.26.ebuild | 1 +
dev-db/mongodb/mongodb-5.0.30.ebuild | 2 ++
3 files changed, 28 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch b/dev-db/mongodb/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch
new file mode 100644
index 000000000000..0b5058c88155
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.26-mozjs-remove-unused-constructor.patch
@@ -0,0 +1,25 @@
+https://phabricator.services.mozilla.com/D209108
+https://github.com/mozilla/gecko-dev/commit/33cdc6655b0de44cb7a431216dcbb0d5a552aec6
+
+clang 19 will report error if w/o this patch:
+
+ src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h:124:33: error: reference to non-static member function must be called
+
+diff --git a/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h b/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
+index 25b977e..379a509 100644
+--- a/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
++++ b/src/third_party/mozjs-60/extract/js/src/threading/ExclusiveData.h
+@@ -120,13 +120,6 @@ class ExclusiveData
+ release();
+ }
+
+- ExclusiveData(ExclusiveData&& rhs)
+- : lock_(mozilla::Move(rhs.lock))
+- {
+- MOZ_ASSERT(&rhs != this, "self-move disallowed!");
+- new (mozilla::KnownNotNull, value_.addr()) T(mozilla::Move(*rhs.value_.addr()));
+- }
+-
+ ExclusiveData& operator=(ExclusiveData&& rhs) {
+ this->~ExclusiveData();
+ new (mozilla::KnownNotNull, this) ExclusiveData(mozilla::Move(rhs));
diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild
index 63bff8b4aa91..63e325490e65 100644
--- a/dev-db/mongodb/mongodb-5.0.26.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.26.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
"${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
"${FILESDIR}/${PN}-5.0.26-scons.patch"
+ "${FILESDIR}/${PN}-5.0.26-mozjs-remove-unused-constructor.patch"
)
python_check_deps() {
diff --git a/dev-db/mongodb/mongodb-5.0.30.ebuild b/dev-db/mongodb/mongodb-5.0.30.ebuild
index 0305a184fa0f..a361c0984bfd 100644
--- a/dev-db/mongodb/mongodb-5.0.30.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.30.ebuild
@@ -78,6 +78,8 @@ PATCHES=(
"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
"${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
"${FILESDIR}/${PN}-5.0.30-gcc-15.patch"
+ "${FILESDIR}/${PN}-5.0.26-scons.patch"
+ "${FILESDIR}/${PN}-5.0.26-mozjs-remove-unused-constructor.patch"
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2024-07-15 4:22 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-07-15 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 3ba9ce43db49ab50b10e0d1b1d9b2d83f7cec90e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 04:09:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 04:09:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba9ce43
dev-db/mongodb: backport boost-1.85 fix to 4.4.x
Thanks to Gary.
Closes: https://bugs.gentoo.org/932251
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mongodb/files/mongodb-4.4.29-boost-1.85.patch | 146 +++++++++++++++++++++
dev-db/mongodb/mongodb-4.4.29.ebuild | 1 +
2 files changed, 147 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch b/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch
new file mode 100644
index 000000000000..92831264b4e3
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch
@@ -0,0 +1,146 @@
+https://bugs.gentoo.org/932251#c7
+--- a/src/mongo/db/initialize_server_global_state.cpp 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/db/initialize_server_global_state.cpp 2024-06-05 01:07:27.035053336 -0700
+@@ -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>
+@@ -346,7 +346,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 + "." + terseCurrentTime(false);
+ boost::system::error_code ec;
+ boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
+
+
+--- a/src/mongo/db/startup_warnings_mongod.cpp 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/db/startup_warnings_mongod.cpp 2024-06-05 01:09:36.740158960 -0700
+@@ -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 2024-06-05 00:46:38.374648451 -0700
++++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:47:33.178731500 -0700
+@@ -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 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/db/storage/storage_engine_metadata.cpp 2024-06-05 01:26:46.904273382 -0700
+@@ -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/shell/shell_utils_launcher.cpp 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/shell/shell_utils_launcher.cpp 2024-06-05 01:29:45.140048809 -0700
+@@ -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 <cctype>
+ #include <fcntl.h>
+ #include <fmt/format.h>
+@@ -907,26 +908,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/scripting/engine.cpp 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/scripting/engine.cpp 2024-06-05 00:59:57.488909335 -0700
+@@ -34,6 +34,7 @@
+ #include "mongo/scripting/engine.h"
+
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <cctype>
+
+ #include "mongo/client/dbclient_base.h"
+
+
+--- a/src/mongo/shell/shell_utils_launcher.h 2024-02-13 00:46:45.000000000 -0800
++++ b/src/mongo/shell/shell_utils_launcher.h 2024-06-05 01:04:44.286162623 -0700
+@@ -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-4.4.29.ebuild b/dev-db/mongodb/mongodb-4.4.29.ebuild
index 830acd956f53..7c004e0b2b0a 100644
--- a/dev-db/mongodb/mongodb-4.4.29.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.29.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
"${FILESDIR}/${P}-no-enterprise.patch"
+ "${FILESDIR}/${PN}-4.4.29-boost-1.85.patch"
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2024-05-30 6:46 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2024-05-30 6:46 UTC (permalink / raw
To: gentoo-commits
commit: 6f7385468e9c387af5c97075d9e2ede8cf582c7a
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 06:46:17 2024 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu May 30 06:46:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f738546
dev-db/mongodb: drop 4.4.20, 5.0.16-r1
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/Manifest | 2 -
dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch | 25 ---
dev-db/mongodb/mongodb-4.4.20.ebuild | 186 ----------------------
dev-db/mongodb/mongodb-5.0.16-r1.ebuild | 197 ------------------------
4 files changed, 410 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d432e2c66186..0d19b4137668 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,2 @@
DIST mongodb-4.4.29.gh.tar.gz 51651007 BLAKE2B 9e9bd08ce87659fcf788964ec1bff80baef5bb9c2f5bd4968588511d289b9baf9fc68812f72ee89f90fb557dcc8d2ecbb3f607ca8e31c2212ec9633c0b99da37 SHA512 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335
DIST mongodb-5.0.26.gh.tar.gz 57252091 BLAKE2B a4663a4dbac90118b56646816b178680a6bd99be6abb582fdfdb662c8ddf14eb9db18ed97260a37b2d04bf11715e6cfaa34bb12c4f4b08426e3afa90908f0b3c SHA512 efd56649006bb61070a2f255e8d843e4ddab33562ec9454afe55848dcc3ce8ee90431f70c9362b14e52c4a49a162ea3075a869a6fd71f63efdd5f4358703fea4
-DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
-DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
diff --git a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch b/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch
deleted file mode 100644
index 00b82aca94fc..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://cgit.openembedded.org/meta-openembedded-contrib/commit/?id=856c21b061e000640829e158b9bb9e978a974386
-
-From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 29 Jan 2023 17:15:30 -0800
-Subject: [PATCH] free_mon: Include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it
-for uintXX_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/mongo/db/free_mon/free_mon_options.h
-+++ b/src/mongo/db/free_mon/free_mon_options.h
-@@ -29,6 +29,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-
diff --git a/dev-db/mongodb/mongodb-4.4.20.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild
deleted file mode 100644
index 12cef7fbaaa0..000000000000
--- a/dev-db/mongodb/mongodb-4.4.20.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-IUSE="debug kerberos ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=[nls]
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-debug/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
- >=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
- "${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
- "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
- python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
- fi
-
- python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
- ewarn "To upgrade from a version earlier than the 4.2-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.2-series. Then upgrade to 4.4 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use ssl && scons_opts+=( --ssl )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- ewarn "Tests may hang with FEATURES=usersandbox"
- "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
- dobin build/install/bin/{mongo,mongod,mongos}
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
deleted file mode 100644
index 239cdc96c99c..000000000000
--- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-CPU_FLAGS="cpu_flags_x86_avx"
-IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}"
-
-# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
-# resmoke needs python packages not yet present in Gentoo
-RESTRICT="test"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=[nls]
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-debug/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- >=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="
- mongosh? ( app-admin/mongosh-bin )
- tools? ( >=app-admin/mongo-tools-100 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
- "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
- "${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
- "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- # Bug 809692 + 890294
- if use amd64 && ! use cpu_flags_x86_avx; then
- ewarn "MongoDB 5.0 requires use of the AVX instruction set."
- ewarn "This ebuild will use --experimental-optimization=-sandybridge which"
- ewarn "will result in an experimental build of MongoDB as per upstream."
- ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/"
- fi
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
- ewarn "To upgrade from a version earlier than the 4.4-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.4-series. Then upgrade to 5.0 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --force-jobs
- --jobs="$(makeopts_jobs)"
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294
-
- scons_opts+=( --ssl=$(usex ssl on off) )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
-}
-
-src_install() {
- dobin build/install/bin/{mongo,mongod,mongos}
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2024-05-28 1:45 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-05-28 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 4f2c752ff3afb0952991e09cb7fb4947b57df06f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 01:38:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 01:38:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2c752f
dev-db/mongodb: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/932251
Thanks-to: Jura <me <AT> slie.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mongodb/files/mongodb-5.0.26-boost-1.85.patch | 139 +++++++++++++++++++++
dev-db/mongodb/mongodb-5.0.26.ebuild | 1 +
2 files changed, 140 insertions(+)
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..28ab71b3da37 100644
--- a/dev-db/mongodb/mongodb-5.0.26.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.26.ebuild
@@ -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() {
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2023-05-23 13:32 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2023-05-23 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 20580b5f864c79f89e85244d6312887cbcd9442b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 13:24:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 13:25:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20580b5f
dev-db/mongodb: fix build w/ arm64+gcc-12
Closes: https://bugs.gentoo.org/855128
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch | 16 ++++++++++++++++
dev-db/mongodb/mongodb-5.0.16-r1.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch
new file mode 100644
index 000000000000..6a6b9f14afe0
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch
@@ -0,0 +1,16 @@
+The upstream patch for this is far too big to backport, so for now, just drop
+the assert given it's somewhat harmless compared to not being able to build at all.
+
+https://jira.mongodb.org/browse/SERVER-65664
+https://bugs.gentoo.org/855128
+--- a/src/mongo/db/stats/counters.h
++++ b/src/mongo/db/stats/counters.h
+@@ -221,8 +221,6 @@ private:
+ AtomicWord<long long> requests{0};
+ };
+ CacheAligned<Together> _together{};
+- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size,
+- "cache line spill");
+
+ CacheAligned<AtomicWord<long long>> _logicalBytesOut{0};
+
diff --git a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
index a0fc28ebe45c..95e24df12a4f 100644
--- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
+ "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2023-05-16 7:53 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2023-05-16 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 373884b1a0e0752b796de79c3afd02545bc68240
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 07:52:45 2023 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue May 16 07:53:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373884b1
dev-db/mongodb: drop 4.4.10-r1, 5.0.5-r2
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/Manifest | 2 -
.../mongodb/files/mongodb-5.0.2-glibc-2.34.patch | 16 --
dev-db/mongodb/files/mongodb.service | 10 --
dev-db/mongodb/mongodb-4.4.10-r1.ebuild | 187 --------------------
dev-db/mongodb/mongodb-5.0.5-r2.ebuild | 194 ---------------------
5 files changed, 409 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index aaa2d2a28079..259768739a73 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,2 @@
-DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
-DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
deleted file mode 100644
index b9c5241be374..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h
-index 7b15bb56..4d8f73ad 100644
---- a/src/mongo/stdx/thread.h
-+++ b/src/mongo/stdx/thread.h
-@@ -105,10 +105,7 @@ private:
- // . N Y : 4,344 | 13,048 | 7,352
- // . Y Y : 4,424 | 13,672 | 8,392
- // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt )
-- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10;
--
-- static constexpr std::size_t kStackSize =
-- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ});
-+ static constexpr std::size_t kStackSize = std::size_t{64} << 10;
- std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize);
-
- #else // !MONGO_HAS_SIGALTSTACK
diff --git a/dev-db/mongodb/files/mongodb.service b/dev-db/mongodb/files/mongodb.service
deleted file mode 100644
index 78d551183838..000000000000
--- a/dev-db/mongodb/files/mongodb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=High-performance, schema-free document-oriented database
-After=network.target
-
-[Service]
-User=mongodb
-ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
deleted file mode 100644
index 22874d9fd185..000000000000
--- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=[nls]
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
- >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
- "${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
- "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
- python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
- fi
-
- python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
- ewarn "To upgrade from a version earlier than the 4.2-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.2-series. Then upgrade to 4.4 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- ewarn "Tests may hang with FEATURES=usersandbox"
- "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
- dobin build/install/bin/{mongo,mongod,mongos}
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
deleted file mode 100644
index 33dcd7a556ab..000000000000
--- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-CPU_FLAGS="cpu_flags_x86_avx"
-IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
-
-# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
-# resmoke needs python packages not yet present in Gentoo
-RESTRICT="test"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=[nls]
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="
- mongosh? ( app-admin/mongosh-bin )
- tools? ( >=app-admin/mongo-tools-100 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
- "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
- "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
- "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
- "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
- "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
- "${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- # Bug 809692
- if use amd64 && ! use cpu_flags_x86_avx; then
- eerror "MongoDB 5.0 requires use of the AVX instruction set"
- eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
- die "MongoDB requires AVX"
- fi
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
- ewarn "To upgrade from a version earlier than the 4.4-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.4-series. Then upgrade to 5.0 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --jobs="$(makeopts_jobs)"
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
-
- scons_opts+=( --ssl=$(usex ssl on off) )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
-}
-
-src_install() {
- dobin build/install/bin/{mongo,mongod,mongos}
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2022-12-30 20:22 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-12-30 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 9eb857b35fcd0c1f67a45ec33a35782e71c09d57
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 20:22:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 20:22:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb857b3
dev-db/mongodb: drop 4.2.17-r2, 4.2.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mongodb/Manifest | 2 -
dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch | 30 ----
.../mongodb/files/mongodb-4.2.15-no-compass.patch | 45 -----
.../mongodb/files/mongodb-4.2.17-boost-1.79.patch | 41 -----
dev-db/mongodb/mongodb-4.2.17-r2.ebuild | 184 ---------------------
dev-db/mongodb/mongodb-4.2.23.ebuild | 183 --------------------
6 files changed, 485 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b2ee764c3abe..b78b40d9e568 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,3 @@
-DIST mongodb-src-r4.2.17.tar.gz 62216350 BLAKE2B 48169685a25fe00b5a1985bce1e65e13d1dc9c0a56ece6b9c735d8cd212d9c0c5e2912d593bdda351cceda49c8ed7962db42ca37814f88e0bf927066a2d8241b SHA512 ad5448aa6ea232746fdbc7107bd642e827fb7b9182c075f204722e7f625cbc83e7b0a199d2feb56bf27a8851bb38f9740abf0b38c022ddc92e676e7a2d81aef6
-DIST mongodb-src-r4.2.23.tar.gz 62276834 BLAKE2B bb3dfee47ece9a5cc43e10a322b7191709d32bcfcb9659b08a6412d60a83eaf2d8bc4b5784e99d8fc95be643498212d512a11dc93052f02086456a2d2e565da3 SHA512 5c0b341b0700af9f3682e63912569dd4063d8cff85c35f9e19d5882291f62bb1a56f85666278fe38f1bd7f06a46b8423c5e90969be5bb595281d883256c8def4
DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
diff --git a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch
deleted file mode 100644
index 3c929df6f964..000000000000
--- a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/SConstruct 2019-08-21 09:25:00.980260318 +0200
-+++ b/SConstruct 2019-08-21 09:27:53.653601283 +0200
-@@ -1858,7 +1858,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
-- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1870,6 +1869,8 @@
- env.Append( CCFLAGS=["-Werror"] )
-
- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- if env.ToolchainIs('clang'):
- env.Append( CXXFLAGS=['-Werror=unused-result'] )
-
-@@ -1890,8 +1891,8 @@
-
- env.Append( LIBS=[] )
-
-- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ #make scons colorgcc, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
diff --git a/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch b/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch
deleted file mode 100644
index de2eda82f213..000000000000
--- a/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 0379fcb0..1aabddba 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -808,32 +808,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
- for target in env["DIST_BINARIES"]:
- installBinary(env, "db/modules/" + target)
-
--compass_script = "install_compass"
--if env.TargetOSIs('windows'):
-- # On windows the .in needs to be explicitly added to the file.
-- compass_script = "Install-Compass.ps1"
--
--compass_installer = f"#/src/mongo/installer/compass/{compass_script}"
--
--distBinaries.append(compass_installer)
--
--if not hygienic:
-- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
--else:
-- compass_script_installer = env.AutoInstall(
-- 'bin',
-- source=[
-- compass_installer,
-- ],
-- INSTALL_ALIAS=[
-- 'tools',
-- ],
-- )
--
--if env.TargetOSIs('posix'):
-- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
-- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- # "dist" target is valid only when --use-new-tools is specified
- # Attempts to build release artifacts without tools must fail
- if has_option("use-new-tools"):
-@@ -851,7 +825,6 @@ if has_option("use-new-tools"):
- '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
- '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
- '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
-- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
- '${TEMPFILE(SOURCES[1:])}'
- ],
- ),
diff --git a/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch b/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch
deleted file mode 100644
index b86efa142f5c..000000000000
--- a/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/844235
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -51,6 +51,7 @@
- #endif
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/none.hpp>
- #include <boost/optional.hpp>
- #include <fmt/format.h>
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-@@ -36,6 +36,7 @@
- #include <limits>
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/base/simple_string_data_comparator.h"
---- a/src/mongo/shell/shell_utils_extended.cpp
-+++ b/src/mongo/shell/shell_utils_extended.cpp
-@@ -37,6 +37,7 @@
- #endif
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <fstream>
-
- #include "mongo/scripting/engine.h"
---- a/src/mongo/db/storage/storage_repair_observer.cpp
-+++ b/src/mongo/db/storage/storage_repair_observer.cpp
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #endif
-
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/db/dbhelpers.h"
diff --git a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild b/dev-db/mongodb/mongodb-4.2.17-r2.ebuild
deleted file mode 100644
index a0cb6465d289..000000000000
--- a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
- >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-4.2.15-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
- "${FILESDIR}/${PN}-4.2.17-boost-1.79.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
- python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
- fi
-
- python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
- ewarn "To upgrade from a version earlier than the 4.0-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.0-series. Then upgrade to 4.2 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- ewarn "Tests may hang with FEATURES=usersandbox"
- "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.2.23.ebuild b/dev-db/mongodb/mongodb-4.2.23.ebuild
deleted file mode 100644
index a56c83d47041..000000000000
--- a/dev-db/mongodb/mongodb-4.2.23.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
- >=dev-cpp/yaml-cpp-0.6.2:=
- dev-libs/boost:=
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
- dev-libs/snowball-stemmer:=
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- >=dev-libs/openssl-1.0.1g:0=
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-BDEPEND="
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
- >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-4.2.15-no-compass.patch"
- "${FILESDIR}/${PN}-4.2.17-boost-1.79.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
- python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
- fi
-
- python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
- ewarn "To upgrade from a version earlier than the 4.0-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.0-series. Then upgrade to 4.2 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # Needed to avoid forcing FORTIFY_SOURCE
- # Gentoo's toolchain applies these anyway
- scons_opts+=( --runtime-hardening=off )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- ewarn "Tests may hang with FEATURES=usersandbox"
- "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2022-06-18 17:17 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-06-18 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 79a3c0438c8f3885fb8d5840263b36c8ebd80f4f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 17:17:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 17:17:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a3c043
dev-db/mongodb: don't force LLD
See patch for details.
Closes: https://bugs.gentoo.org/769986
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/mongodb-4.4.10-no-force-lld.patch | 29 +++++++++++++
.../mongodb/files/mongodb-5.0.5-no-force-lld.patch | 49 ++++++++++++++++++++++
dev-db/mongodb/mongodb-4.4.10-r1.ebuild | 1 +
dev-db/mongodb/mongodb-5.0.5-r2.ebuild | 1 +
4 files changed, 80 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch b/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch
new file mode 100644
index 000000000000..471f3e226820
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch
@@ -0,0 +1,29 @@
+Don't automagically force lld > gold > bfd. Leave it up to the user.
+
+In particular, avoids issues with LTO enabled (via the flag/scons option)
+where using GCC as compiler, as lld can't do LTO with GCC.
+
+https://bugs.gentoo.org/769986
+--- a/SConstruct
++++ b/SConstruct
+@@ -3109,20 +3109,6 @@ def doConfigure(myenv):
+ myenv.Append( CCFLAGS=["/Zc:inline"])
+
+ if myenv.ToolchainIs('gcc', 'clang'):
+- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
+- # because it is much faster. Don't use it if the user has already configured another linker
+- # selection manually.
+- if not any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
+-
+- # lld has problems with separate debug info on some platforms. See:
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- if get_option('separate-debug') == 'off':
+- if not AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=lld'):
+- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
+- else:
+- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
+-
+ # Usually, --gdb-index is too expensive in big static binaries, but for dynamic
+ # builds it works well.
+ if link_model.startswith("dynamic"):
diff --git a/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch b/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch
new file mode 100644
index 000000000000..6ce92778b6bd
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.5-no-force-lld.patch
@@ -0,0 +1,49 @@
+Don't automagically force lld > gold > bfd. Leave it up to the user.
+
+In particular, avoids issues with LTO enabled (via the flag/scons option)
+where using GCC as compiler, as lld can't do LTO with GCC.
+
+https://bugs.gentoo.org/769986
+--- a/SConstruct
++++ b/SConstruct
+@@ -2824,40 +2824,6 @@ def doConfigure(myenv):
+ def AddToSHLINKFLAGSIfSupported(env, flag):
+ return AddFlagIfSupported(env, 'C', '.c', flag, True, SHLINKFLAGS=[flag])
+
+- if myenv.ToolchainIs('gcc', 'clang'):
+- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
+- # because it is much faster. Don't use it if the user has already configured another linker
+- # selection manually.
+- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
+- myenv.FatalError(f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
+-
+- linker_ld = get_option('linker')
+- if linker_ld == 'auto':
+- # lld has problems with separate debug info on some platforms. See:
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
+- #
+- # lld also apparently has problems with symbol resolution
+- # in some esoteric configurations that apply for us when
+- # using --link-model=dynamic mode, so disable lld there
+- # too. See:
+- # - https://bugs.llvm.org/show_bug.cgi?id=46676
+- #
+- # We should revisit all of these issues the next time we upgrade our clang minimum.
+- if get_option('separate-debug') == 'off' and get_option('link-model') != 'dynamic':
+- if not AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=lld'):
+- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
+- else:
+- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
+- elif link_model.startswith("dynamic") and linker_ld == 'bfd':
+- # BFD is not supported due to issues with it causing warnings from some of
+- # the third party libraries that mongodb is linked with:
+- # https://jira.mongodb.org/browse/SERVER-49465
+- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
+- else:
+- if not AddToLINKFLAGSIfSupported(myenv, f'-fuse-ld={linker_ld}'):
+- myenv.FatalError(f"Linker {linker_ld} could not be configured.")
+-
+ detectCompiler = Configure(myenv, help=False, custom_tests = {
+ 'CheckForCXXLink': CheckForCXXLink,
+ })
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
index 19e02103e966..8cd7e5807418 100644
--- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
+ "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
index 9e993f26b1d4..6c89b11fff96 100644
--- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
"${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
+ "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2022-05-14 21:27 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-05-14 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 7cb835b1e4e2e4bd5e279c16ece133a0225dedc6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:27:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:27:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb835b1
dev-db/mongodb: fix build with Boost 1.79; fix automagic SSL usage
Bug: https://bugs.gentoo.org/843290
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mongodb/files/mongodb-5.0.2-boost-1.79.patch | 71 ++++++++
dev-db/mongodb/mongodb-5.0.5-r2.ebuild | 188 +++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
new file mode 100644
index 000000000000..39c76bacf426
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
@@ -0,0 +1,71 @@
+https://bugs.gentoo.org/844235
+--- a/src/mongo/db/auth/security_key_test.cpp
++++ b/src/mongo/db/auth/security_key_test.cpp
+@@ -30,6 +30,7 @@
+ #include "mongo/platform/basic.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+
+ #include "mongo/base/string_data.h"
+ #include "mongo/db/auth/authorization_manager.h"
+--- a/src/mongo/db/storage/storage_repair_observer.cpp
++++ b/src/mongo/db/storage/storage_repair_observer.cpp
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #endif
+
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/db/dbhelpers.h"
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/storage/kv/kv_engine_test_harness.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <memory>
+
+--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+@@ -36,6 +36,7 @@
+ #include <limits>
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+
+ #include "mongo/base/simple_string_data_comparator.h"
+--- a/src/mongo/shell/shell_utils_extended.cpp
++++ b/src/mongo/shell/shell_utils_extended.cpp
+@@ -37,6 +37,7 @@
+ #endif
+
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <fmt/format.h>
+ #include <fstream>
+
+--- a/src/mongo/util/stacktrace_threads.cpp
++++ b/src/mongo/util/stacktrace_threads.cpp
+@@ -36,6 +36,7 @@
+ #include <array>
+ #include <atomic>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <cstdint>
+ #include <cstdlib>
+ #include <dirent.h>
+--- a/src/mongo/util/processinfo_linux.cpp
++++ b/src/mongo/util/processinfo_linux.cpp
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <malloc.h>
+ #include <pcrecpp.h>
++#include <fstream>
+ #include <sched.h>
+ #include <stdio.h>
+ #include <sys/mman.h>
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
new file mode 100644
index 000000000000..9e993f26b1d4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="
+ mongosh? ( app-admin/mongosh-bin )
+ tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+ "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ # Bug 809692
+ if use amd64 && ! use cpu_flags_x86_avx; then
+ eerror "MongoDB 5.0 requires use of the AVX instruction set"
+ eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+ die "MongoDB requires AVX"
+ fi
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+ ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.4-series. Then upgrade to 5.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --jobs="$(makeopts_jobs)"
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+
+ scons_opts+=( --ssl=$(usex ssl on off) )
+
+ # Needed to avoid forcing FORTIFY_SOURCE
+ # Gentoo's toolchain applies these anyway
+ scons_opts+=( --runtime-hardening=off )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2021-08-19 16:38 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2021-08-19 16:38 UTC (permalink / raw
To: gentoo-commits
commit: ef6465a69dd5dd5c444a91ea0bf5b793e24b101e
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Aug 6 10:18:09 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 16:38:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6465a6
dev-db/mongodb: bump to 4.4.8
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/Manifest | 1 +
.../mongodb/files/mongodb-4.4.8-no-compass.patch | 43 +++++
dev-db/mongodb/mongodb-4.4.8.ebuild | 176 +++++++++++++++++++++
3 files changed, 220 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index a06a609dbd7..543106b91b7 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -4,3 +4,4 @@ DIST mongodb-src-r4.2.15.tar.gz 62187847 BLAKE2B eb9cbf52b5aeb95d3c6c6bd14da9731
DIST mongodb-src-r4.4.1.tar.gz 49644743 BLAKE2B 7d84998c69b9b55164ebab04b49c38a4113a0f58d431612389ec37eb044fba1adf9284e9d4454bd40bb7a071fd042308a5cd350129d6d52480412cf6b868ec2b SHA512 16aa66995ea8cfe0cc47b96c1c5643a28ab47fc9f27bd93404cf572944ab30492df7c9255553f918b353cd7157a6ccde9ac6f58bfba322fb52c2d7409c6fb9b0
DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1f5682cb3cac0aa7a02e3c1ee3084669ea647d1e574e8a76a3b6b2f34aa4ef693c8d1f3fa025ec3072eff7b7c408b94e5 SHA512 bbf59ed97a8718576c469c696d5331c122f63528dad950fd415b00269c2fa5e6949b372c575e2504c2a58b145bae485172b25000000481662e6543bc3127252a
DIST mongodb-src-r4.4.4.tar.gz 49942905 BLAKE2B 8aa9813e87e216899b3c609b413ce6915d6ddf30faea3c0ecda2a14476fc6b08024614fa7b20e1703b5908759459e88e5e302539c27525c2359233743aa7dcda SHA512 a999528a8a6bf4bf0b8ff8f5169b1aadb3c4dab9c7d936c59d66f238b864fad6e8fb6a1b9ec27f395fca95152ee020f96a8c1cf8960a48de3ce5141f8dda7d88
+DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
diff --git a/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch b/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch
new file mode 100644
index 00000000000..0755705ed55
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch
@@ -0,0 +1,43 @@
+diff --git a/src/mongo/SConscript b/src/mongo/SConscript
+index 62fbfc02..5be336f7 100644
+--- a/src/mongo/SConscript
++++ b/src/mongo/SConscript
+@@ -841,30 +841,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
+ for target in env["DIST_BINARIES"]:
+ installBinary(env, "db/modules/" + target)
+
+-compass_script = "install_compass"
+-if env.TargetOSIs('windows'):
+- compass_script = "Install-Compass.ps1"
+-
+-compass_installer = f"$BUILD_DIR/mongo/installer/compass/{compass_script}"
+-
+-distBinaries.append(compass_installer)
+-
+-if not hygienic:
+- compass_script_installer = env.Install("$DESTDIR/bin", compass_installer)
+-else:
+- compass_script_installer = env.AutoInstall(
+- target='$PREFIX_BINDIR',
+- source=[
+- compass_installer,
+- ],
+- AIB_COMPONENT='dist',
+- AIB_ROLE='runtime',
+- )
+-
+-if env.TargetOSIs('posix'):
+- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
+- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
+-
+ if not hygienic:
+ server_archive = env.Command(
+ target='#/${SERVER_ARCHIVE}',
+@@ -878,7 +854,6 @@ if not hygienic:
+ '--transform $BUILD_DIR/mongo/stripped/db/modules/enterprise=$SERVER_DIST_BASENAME/bin',
+ '--transform $BUILD_DIR/mongo/stripped=$SERVER_DIST_BASENAME/bin',
+ '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
+- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
+ '${TEMPFILE(SOURCES[1:])}'
+ ],
+ ),
diff --git a/dev-db/mongodb/mongodb-4.4.8.ebuild b/dev-db/mongodb/mongodb-4.4.8.ebuild
new file mode 100644
index 00000000000..64dd932d7a1
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.8.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+ ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.2-series. Then upgrade to 4.4 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2019-09-21 21:22 David Seifert
0 siblings, 0 replies; 27+ messages in thread
From: David Seifert @ 2019-09-21 21:22 UTC (permalink / raw
To: gentoo-commits
commit: d32a1753b39623696eff690223cda79078c8a967
Author: Jouni Kosonen <jouni.kosonen <AT> tukesoft <DOT> com>
AuthorDate: Sat Sep 21 21:22:14 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 21:22:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32a1753
dev-db/mongodb: Fix building against boost 1.71
Closes: https://bugs.gentoo.org/694530
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch | 12 ++++++++++++
dev-db/mongodb/mongodb-4.0.12.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch b/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
new file mode 100644
index 00000000000..b65f9123677
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
@@ -0,0 +1,12 @@
+--- a/src/mongo/util/heap_profiler.cpp
++++ b/src/mongo/util/heap_profiler.cpp
+@@ -49,6 +49,9 @@
+ #include <dlfcn.h>
+ #include <execinfo.h>
+
++// for abi::__cxa_demangle
++#include <cxxabi.h>
++
+ //
+ // Sampling heap profiler
+ //
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index 1e60cc747ff..d549bea6ba8 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -54,6 +54,7 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+ "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2019-08-21 7:21 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2019-08-21 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 191e8a56e7f08a9c41b26e620ef3ac3c62acb836
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:21:27 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:21:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191e8a56
dev-db/mongodb: remove obsolete patch
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch | 13 -------------
dev-db/mongodb/mongodb-3.6.13.ebuild | 1 -
dev-db/mongodb/mongodb-3.6.8.ebuild | 1 -
dev-db/mongodb/mongodb-4.0.10.ebuild | 1 -
dev-db/mongodb/mongodb-4.0.12.ebuild | 1 -
5 files changed, 17 deletions(-)
diff --git a/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch b/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
deleted file mode 100644
index 1d908e73f43..00000000000
--- a/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index df92e41659..2c387d5a24 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2831,8 +2831,6 @@ def doConfigure(myenv):
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
- myenv.ConfError("can't find boost headers")
-- if not conf.CheckBoostMinVersion():
-- myenv.ConfError("system's version of boost is too old. version 1.49 or better required")
-
- # Note that on Windows with using-system-boost builds, the following
- # FindSysLibDep calls do nothing useful (but nothing problematic either)
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 079b57dc336..4fb9536e58f 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
)
diff --git a/dev-db/mongodb/mongodb-3.6.8.ebuild b/dev-db/mongodb/mongodb-3.6.8.ebuild
index 72abd68bc8a..3f1b10dc84f 100644
--- a/dev-db/mongodb/mongodb-3.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.8.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
)
diff --git a/dev-db/mongodb/mongodb-4.0.10.ebuild b/dev-db/mongodb/mongodb-4.0.10.ebuild
index 8a9dd647e46..ad10fd71e28 100644
--- a/dev-db/mongodb/mongodb-4.0.10.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.10.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
)
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index 516f202bc7f..1e60cc747ff 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
)
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2019-08-09 7:28 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2019-08-09 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 3004e2571a7b08d15e41e149e15fd50f818b78df
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 07:15:47 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 07:28:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3004e257
dev-db/mongodb: drop soon to EOL 3.4
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/Manifest | 1 -
dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch | 35 -----
.../files/mongodb-3.4.6-sysmacros-include.patch | 38 -----
dev-db/mongodb/mongodb-3.4.16.ebuild | 160 ---------------------
4 files changed, 234 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c161dde8b45..4d77bdc425a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,3 @@
-DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
DIST mongodb-src-r3.6.11.tar.gz 40581959 BLAKE2B 86244472ce8cff5180d8833a3415dd8a43fb5c76545034822989d5be90f45ed0ef1d43cb726be1e53241255491a7a516e6f90b1c1218ad10cf4ead4557311088 SHA512 e74af9f2f40ab0e2c20b135db3f0ce17825cfe5da912ff8edb2902226abb662a6cf87038ea57df73b06b4961ba71aa78fffd542153eb30c4ea2729d642b1091d
DIST mongodb-src-r3.6.12.tar.gz 40847074 BLAKE2B 45cc0ec4858fa4c17fb86449e6feaf11df32fd55f8a642031ce9be967127d608842cdc64e0a335af67ab3942a233d905b0778782e54dfe4c5d2ad58b828745ca SHA512 173112a05234e06ef4b6c26a092b285b4d12618b3f131fc2b73bd152c11ec42db11cb003566efefce0c98df87a520d0515a3bb1982ffdb27827cd032b1bb3f68
DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
diff --git a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
deleted file mode 100644
index 2dd751fad81..00000000000
--- a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct 2016-12-27 11:10:06.801949538 +0100
-+++ b/SConstruct 2016-12-27 11:12:40.426407713 +0100
-@@ -1557,7 +1557,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1568,8 +1567,9 @@
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
-- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -1579,10 +1579,10 @@
- env.Append( LINKFLAGS=["-Wl,-z,now"] )
- env.Append( LINKFLAGS=["-rdynamic"] )
-
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
-
-- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ #make scons colorgcc, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
diff --git a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
deleted file mode 100644
index 868ba73e442..00000000000
--- a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e245cac2b3c18015dee8caddd449532785d15c2b Mon Sep 17 00:00:00 2001
-From: Jason Carey <jcarey@argv.me>
-Date: Mon, 26 Jun 2017 11:09:10 -0400
-Subject: [PATCH] SERVER-29855 Pull major/minor from sys/sysmacros.h
-
-Per newer versions of glibc:
-
-----
-error: In the GNU C Library, "major" is defined
- by <sys/sysmacros.h>. For historical compatibility, it is
- currently defined by <sys/types.h> as well, but we plan to
- remove this soon. To use "major", include <sys/sysmacros.h>
- directly. If you did not intend to use a system-defined macro
- "major", you should undefine it after including <sys/types.h>. [-Werror]
- string path = str::stream() << "/sys/dev/block/" << major(dev) << ':' << minor(dev)
-----
-
-Including <sys/sysmacros.h> appears to be the correct solution to quiet
-the warning
----
- src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-index 5a784b25dc7..c43e148d3f4 100644
---- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-@@ -36,6 +36,10 @@
- #include <boost/filesystem/path.hpp>
- #include <fstream>
-
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include "mongo/db/mongod_options.h"
- #include "mongo/db/storage/mmap_v1/data_file_sync.h"
- #include "mongo/db/storage/mmap_v1/dur.h"
diff --git a/dev-db/mongodb/mongodb-3.4.16.ebuild b/dev-db/mongodb/mongodb-3.4.16.ebuild
deleted file mode 100644
index fb7263b16bf..00000000000
--- a/dev-db/mongodb/mongodb-3.4.16.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.3.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eapi7-ver eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.8:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/scons
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )
- test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
- "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.2; then
- ewarn "To upgrade from a version earlier than the 3.2-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.2-series. Then upgrade to 3.4 series."
- fi
- fi
-}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- # this one test fails
- rm jstests/core/jsHeapLimit.js || die
-
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" ${PN/db/s}
- newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" ${PN/db/s}.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2018-11-05 12:33 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2018-11-05 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 2e37e0428f4f0d6939245dfcf020952efa26797c
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 12:28:51 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 12:28:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e37e042
dev-db/mongodb: obsolete ebuilds and files clean up
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
dev-db/mongodb/Manifest | 2 -
.../mongodb/files/mongodb-3.0.14-fix-scons.patch | 36 ---
.../files/mongodb-3.0.14-fix-std-string.patch | 83 ------
dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 49 ----
...6-Replace-string-with-explicit-std-string.patch | 283 ---------------------
.../mongodb/files/mongodb-3.2.4-boost-1.60.patch | 84 ------
dev-db/mongodb/files/mongodb.confd-r2 | 12 -
dev-db/mongodb/files/mongodb.initd-r2 | 26 --
dev-db/mongodb/files/mongos.confd-r2 | 12 -
dev-db/mongodb/files/mongos.initd-r2 | 26 --
dev-db/mongodb/mongodb-3.2.17.ebuild | 197 --------------
dev-db/mongodb/mongodb-4.0.2.ebuild | 163 ------------
12 files changed, 973 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b7d6a5f9d12..9c140f291e9 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,4 @@
-DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
-DIST mongodb-src-r4.0.2.tar.gz 49328232 BLAKE2B 0e56392de5b8cd59c49c38469ed427c52dbd91cd64b3c97da6809c0f849198f836896b8ef24a06e7ff84a65a7986b76df2ca4ffeafe76d8afe0e031ad25ecf5a SHA512 171422ee028ebc279bb2cf20c78a3ce89a6cc15abf0955ac20a6c67f1aae577bf99ca4363fc428dba6ae0250b97f95d2fc51ca7f4a4505e8c38c9a11ca249800
DIST mongodb-src-r4.0.3.tar.gz 49435646 BLAKE2B 1663823d48ec6d93b30b4d68a09bab164291530fd4966fcdd07ffbaceaf25d9fc5c7480d0d794fdd374fa3a2d11f19d87556cf0c47198a13f9d8fb5ccf7f0343 SHA512 c77a01d8d16322514f42030c46a0aa9cedb90f186375222eeb31648060265006b5e929bdde6ca8e7ecd71018f7c19f5bade463d98db0f053d586ffc8adc99550
diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch
deleted file mode 100644
index 1db5d7695c7..00000000000
--- a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/SConstruct b/SConstruct
---- a/SConstruct
-+++ b/SConstruct
-@@ -1008,7 +1008,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fPIC",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1016,13 +1015,13 @@
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux or darwin:
-- env.Append( CCFLAGS=["-pipe"] )
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -1039,7 +1038,7 @@
- if not darwin:
- env.Append( LINKFLAGS=["-rdynamic"] )
-
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
-
- #make scons colorgcc friendly
- for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch
deleted file mode 100644
index 9de319bda9d..00000000000
--- a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/src/mongo/shell/bench.cpp 2017-09-20 19:12:20.893056990 +0200
-+++ b/src/mongo/shell/bench.cpp 2017-09-20 19:14:08.165060566 +0200
-@@ -52,6 +52,9 @@
- #include "mongo/util/time_support.h"
- #include "mongo/util/version.h"
-
-+#include <string>
-+using namespace std;
-+
- // ---------------------------------
- // ---- benchmarking system --------
- // ---------------------------------
---- a/src/mongo/db/dbwebserver.cpp 2017-09-20 19:24:50.042081961 +0200
-+++ b/src/mongo/db/dbwebserver.cpp 2017-09-20 19:26:20.240084968 +0200
-@@ -58,6 +58,8 @@
- #include "mongo/util/ramlog.h"
- #include "mongo/util/version.h"
-
-+#include <string>
-+using namespace std;
-
- namespace mongo {
-
---- a/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:27:59.009088260 +0200
-+++ b/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:28:31.082089329 +0200
-@@ -39,6 +39,9 @@
- #include "mongo/db/jsobj.h"
- #include "mongo/db/matcher/path.h"
-
-+#include <string>
-+using namespace std;
-+
- namespace mongo {
-
- Status LeafMatchExpression::initPath(const StringData& path) {
---- a/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:30:04.569092445 +0200
-+++ b/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:31:19.145094931 +0200
-@@ -70,6 +70,9 @@
- #include "mongo/util/exit.h"
- #include "mongo/util/log.h"
-
-+#include <string>
-+using namespace std;
-+
- using boost::scoped_ptr;
- using std::auto_ptr;
- using std::cout;
---- a/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:32:55.368098138 +0200
-+++ b/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:33:57.128100197 +0200
-@@ -39,6 +39,9 @@
- #include "mongo/util/hex.h"
- #include "mongo/util/log.h"
-
-+#include <string>
-+using namespace std;
-+
- namespace mongo {
-
- using boost::shared_ptr;
---- a/src/mongo/s/config.cpp 2017-09-20 19:42:45.614117812 +0200
-+++ b/src/mongo/s/config.cpp 2017-09-20 19:43:28.278119234 +0200
-@@ -60,6 +60,9 @@
- #include "mongo/util/net/message.h"
- #include "mongo/util/stringutils.h"
-
-+#include <string>
-+using namespace std;
-+
- namespace mongo {
-
- using boost::scoped_ptr;
---- a/src/mongo/s/grid.cpp 2017-09-20 19:51:07.684134547 +0200
-+++ b/src/mongo/s/grid.cpp 2017-09-20 19:51:43.436135739 +0200
-@@ -55,6 +55,9 @@
- #include "mongo/util/startup_test.h"
- #include "mongo/util/stringutils.h"
-
-+#include <string>
-+using namespace std;
-+
- namespace mongo {
-
- using std::endl;
diff --git a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
deleted file mode 100644
index 8b29bd4a2a4..00000000000
--- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 1 Jan 2016 10:27:35 +0100
-Subject: [PATCH] Fix build for Gentoo
-
----
- SConstruct | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 64c8387..fa9ab8b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'):
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fPIC",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'):
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'):
- env.Append( SHLINKFLAGS=["-Wl,-z,now"] )
- env.Append( LINKFLAGS=["-rdynamic"] )
-
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
-
-- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ #make scons colorgcc, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
---
-2.6.4
-
diff --git a/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch b/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch
deleted file mode 100644
index 6067850ad0b..00000000000
--- a/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp
---- mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp 2017-07-14 22:36:01.000000000 +0200
-+++ mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp 2017-08-01 15:43:55.860712772 +0200
-@@ -69,6 +69,7 @@
- using std::map;
- using std::stringstream;
- using std::vector;
-+using std::string;
-
- using namespace html;
-
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/matcher/expression_leaf.cpp mongodb-src-r3.2.16/src/mongo/db/matcher/expression_leaf.cpp
---- mongodb-src-r3.2.16_orig/src/mongo/db/matcher/expression_leaf.cpp 2017-07-14 22:36:01.000000000 +0200
-+++ mongodb-src-r3.2.16/src/mongo/db/matcher/expression_leaf.cpp 2017-08-01 15:46:17.070708001 +0200
-@@ -200,7 +200,7 @@
- }
-
- void ComparisonMatchExpression::toBSON(BSONObjBuilder* out) const {
-- string opString = "";
-+ std::string opString = "";
- switch (matchType()) {
- case LT:
- opString = "$lt";
-@@ -880,7 +880,7 @@
- }
-
- void BitTestMatchExpression::toBSON(BSONObjBuilder* out) const {
-- string opString = "";
-+ std::string opString = "";
-
- switch (matchType()) {
- case BITS_ALL_SET:
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/repl/master_slave.cpp mongodb-src-r3.2.16/src/mongo/db/repl/master_slave.cpp
---- mongodb-src-r3.2.16_orig/src/mongo/db/repl/master_slave.cpp 2017-07-14 22:36:01.000000000 +0200
-+++ mongodb-src-r3.2.16/src/mongo/db/repl/master_slave.cpp 2017-08-01 15:54:45.140690837 +0200
-@@ -161,7 +161,7 @@
-
- BSONObjBuilder dbsNextPassBuilder;
- int n = 0;
-- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
-+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
- n++;
- dbsNextPassBuilder.appendBool(*i, 1);
- }
-@@ -170,7 +170,7 @@
-
- BSONObjBuilder incompleteCloneDbsBuilder;
- n = 0;
-- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
-+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
- n++;
- incompleteCloneDbsBuilder.appendBool(*i, 1);
- }
-@@ -181,7 +181,7 @@
- }
-
- void ReplSource::ensureMe(OperationContext* txn) {
-- string myname = getHostName();
-+ std::string myname = getHostName();
-
- // local.me is an identifier for a server for getLastError w:2+
- bool exists = Helpers::getSingleton(txn, "local.me", _me);
-@@ -373,10 +373,10 @@
- }
-
- virtual bool run(OperationContext* txn,
-- const string& ns,
-+ const std::string& ns,
- BSONObj& cmdObj,
- int options,
-- string& errmsg,
-+ std::string& errmsg,
- BSONObjBuilder& result) {
- HandshakeArgs handshake;
- Status status = handshake.initialize(cmdObj);
-@@ -393,7 +393,7 @@
- } handshakeCmd;
-
- bool replHandshake(DBClientConnection* conn, const OID& myRID) {
-- string myname = getHostName();
-+ std::string myname = getHostName();
-
- BSONObjBuilder cmd;
- cmd.append("handshake", myRID);
-@@ -445,7 +445,7 @@
- BSONElement e = i.next();
- if (e.eoo())
- break;
-- string name = e.embeddedObject().getField("name").valuestr();
-+ std::string name = e.embeddedObject().getField("name").valuestr();
- if (!e.embeddedObject().getBoolField("empty")) {
- if (name != "local") {
- if (only.empty() || only == name) {
-@@ -459,7 +459,7 @@
- save(txn);
- }
-
--void ReplSource::resyncDrop(OperationContext* txn, const string& db) {
-+void ReplSource::resyncDrop(OperationContext* txn, const std::string& db) {
- log() << "resync: dropping database " << db;
- OldClientContext ctx(txn, db);
- dropDatabase(txn, ctx.db());
-@@ -502,13 +502,13 @@
-
- static DatabaseIgnorer ___databaseIgnorer;
-
--void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) {
-+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) {
- if (futureOplogTime > _ignores[db]) {
- _ignores[db] = futureOplogTime;
- }
- }
-
--bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) {
-+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) {
- if (_ignores[db].isNull()) {
- return false;
- }
-@@ -598,7 +598,7 @@
-
- // The database is present on the master and no conflicting databases
- // are present on the master. Drop any local conflicts.
-- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
-+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
- ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime);
- incompleteCloneDbs.erase(*i);
- addDbNextPass.erase(*i);
-@@ -793,10 +793,10 @@
- }
-
- void ReplSource::syncToTailOfRemoteLog() {
-- string _ns = ns();
-+ std::string _ns = ns();
- BSONObjBuilder b;
- if (!only.empty()) {
-- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
-+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
- }
- BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1)));
- if (!last.isEmpty()) {
-@@ -844,7 +844,7 @@
- */
- int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
- int okResultCode = 1;
-- string ns = string("local.oplog.$") + sourceName();
-+ std::string ns = std::string("local.oplog.$") + sourceName();
- LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n';
-
- bool tailing = true;
-@@ -864,7 +864,7 @@
- BSONElement e = i.next();
- if (e.eoo())
- break;
-- string name = e.embeddedObject().getField("name").valuestr();
-+ std::string name = e.embeddedObject().getField("name").valuestr();
- if (!e.embeddedObject().getBoolField("empty")) {
- if (name != "local") {
- if (only.empty() || only == name) {
-@@ -888,7 +888,7 @@
- if (!only.empty()) {
- // note we may here skip a LOT of data table scanning, a lot of work for the master.
- // maybe append "\\." here?
-- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
-+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
- }
- BSONObj queryObj = query.done();
- // e.g. queryObj = { ts: { $gte: syncedTo } }
-@@ -907,7 +907,7 @@
-
- // show any deferred database creates from a previous pass
- {
-- set<string>::iterator i = addDbNextPass.begin();
-+ set<std::string>::iterator i = addDbNextPass.begin();
- if (i != addDbNextPass.end()) {
- BSONObjBuilder b;
- b.append("ns", *i + '.');
-@@ -938,7 +938,7 @@
- BSONObj op = oplogReader.next();
- BSONElement ts = op.getField("ts");
- if (ts.type() != Date && ts.type() != bsonTimestamp) {
-- string err = op.getStringField("$err");
-+ std::string err = op.getStringField("$err");
- if (!err.empty()) {
- // 13051 is "tailable cursor requested on non capped collection"
- if (op.getIntField("code") == 13051) {
-@@ -1106,7 +1106,7 @@
-
- // FIXME Handle cases where this db isn't on default port, or default port is spec'd in
- // hostName.
-- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) &&
-+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) &&
- serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) {
- log() << "can't sync from self (localhost). sources configuration may be wrong." << endl;
- sleepsecs(5);
-@@ -1251,7 +1251,7 @@
- if (s) {
- stringstream ss;
- ss << "sleep " << s << " sec before next pass";
-- string msg = ss.str();
-+ std::string msg = ss.str();
- if (!serverGlobalParams.quiet)
- log() << msg << endl;
- ReplInfo r(msg.c_str());
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp mongodb-src-r3.2.16/src/mongo/shell/bench.cpp
---- mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp 2017-07-14 22:36:01.000000000 +0200
-+++ mongodb-src-r3.2.16/src/mongo/shell/bench.cpp 2017-08-01 16:20:20.864638957 +0200
-@@ -674,7 +674,7 @@
- invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess);
-
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg);
- }
-@@ -920,7 +920,7 @@
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE" +
-+ throw DBException((std::string) "From benchRun GLE" +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -987,7 +987,7 @@
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE" +
-+ throw DBException((std::string) "From benchRun GLE" +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -1035,7 +1035,7 @@
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE " +
-+ throw DBException((std::string) "From benchRun GLE " +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -1136,7 +1136,7 @@
- try {
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- if (!_config->username.empty()) {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg);
- }
-@@ -1168,7 +1168,7 @@
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- // Must authenticate to admin db in order to run serverStatus command
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(16704,
- str::stream()
-@@ -1204,7 +1204,7 @@
- {
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- // this can only fail if admin access was revoked since start of run
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(16705,
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/util/net/miniwebserver.cpp mongodb-src-r3.2.16/src/mongo/util/net/miniwebserver.cpp
---- mongodb-src-r3.2.16_orig/src/mongo/util/net/miniwebserver.cpp 2017-07-14 22:36:01.000000000 +0200
-+++ mongodb-src-r3.2.16/src/mongo/util/net/miniwebserver.cpp 2017-08-01 16:01:01.832678112 +0200
-@@ -45,8 +45,9 @@
- using std::endl;
- using std::stringstream;
- using std::vector;
-+using std::string;
-
--MiniWebServer::MiniWebServer(const string& name, const string& ip, int port)
-+MiniWebServer::MiniWebServer(const std::string& name, const std::string& ip, int port)
- : Listener(name, ip, port, false) {}
-
- string MiniWebServer::parseURL(const char* buf) {
diff --git a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch b/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch
deleted file mode 100644
index 41c9bd2ba85..00000000000
--- a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Fix issues caused by boost::none changes.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=578846
-Adapted from: https://github.com/mongodb/mongo/commit/92c3f80f384d2825efeabd0d26aa534c0deb6988
-
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp
-@@ -47,7 +47,7 @@
- if (_referenceDoc.isEmpty()) {
- FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics);
- _reset(sample, date);
-- return {boost::none_t()};
-+ return {boost::none};
- }
-
- _metrics.resize(0);
-@@ -107,7 +107,7 @@
- }
-
- // The buffer is not full, inform the caller
-- return {boost::none_t()};
-+ return {boost::none};
- }
-
- StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() {
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp
-@@ -122,7 +122,7 @@
- TestTie() : _compressor(&_config) {}
-
- ~TestTie() {
-- validate(boost::none_t());
-+ validate(boost::none);
- }
-
- StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>>
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp
-@@ -205,7 +205,7 @@
-
- Status FTDCFileWriter::close() {
- if (_archiveStream.is_open()) {
-- Status s = flush(boost::none_t(), Date_t());
-+ Status s = flush(boost::none, Date_t());
-
- _archiveStream.close();
-
---- mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp
-+++ mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp
-@@ -175,7 +175,7 @@
- return true;
- }
-
-- unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
-+ unsigned long const res=WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
- if(res==detail::win32::timeout)
- {
- for(;;)
-@@ -328,7 +328,7 @@
- {
- return true;
- }
-- unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
-+ unsigned long const wait_res=WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
- if(wait_res==detail::win32::timeout)
- {
- for(;;)
-@@ -421,7 +421,7 @@
- return;
- }
-
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite));
- }
- }
-
-@@ -502,7 +502,7 @@
- {
- if(!last_reader)
- {
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite));
- }
- break;
- }
diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2
deleted file mode 100644
index dddb67e9301..00000000000
--- a/dev-db/mongodb/files/mongodb.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your mongodb instance,
-# see the /etc/mongodb.conf file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/mongodb.conf)
-# - user : the user used to run your mongodb instance (default : mongodb)
-# - group : the group used to run your mongodb instance (default : mongodb)
-# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2
deleted file mode 100644
index 27b9f2a4387..00000000000
--- a/dev-db/mongodb/files/mongodb.initd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/${SVCNAME}.conf}
-run_dir=${run_dir:-/run/mongodb}
-
-command="/usr/bin/mongod"
-command_args="--config ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-mongodb}
-group=${group:-mongodb}
-start_stop_daemon_args="--user ${user} --group ${group}"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- if [ ! -f ${config_file} ]; then
- eerror "Missing configuration file ${config_file}"
- return 1
- fi
-}
diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2
deleted file mode 100644
index 0dc2a189ff6..00000000000
--- a/dev-db/mongodb/files/mongos.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your mongos instance,
-# see the /etc/mongos.conf file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/mongos.conf)
-# - user : the user used to run your mongodb instance (default : mongodb)
-# - group : the group used to run your mongodb instance (default : mongodb)
-# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2
deleted file mode 100644
index 2e7db669a5e..00000000000
--- a/dev-db/mongodb/files/mongos.initd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/${SVCNAME}.conf}
-run_dir=${run_dir:-/run/mongodb}
-
-command="/usr/bin/mongos"
-command_args="--config ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-mongodb}
-group=${group:-mongodb}
-start_stop_daemon_args="--user ${user} --group ${group}"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- if [ ! -f ${config_file} ]; then
- eerror "Missing configuration file ${config_file}"
- return 1
- fi
-}
diff --git a/dev-db/mongodb/mongodb-3.2.17.ebuild b/dev-db/mongodb/mongodb-3.2.17.ebuild
deleted file mode 100644
index bda8f3b4e58..00000000000
--- a/dev-db/mongodb/mongodb-3.2.17.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.3.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.2
- >=dev-cpp/yaml-cpp-0.5.1
- >=dev-libs/boost-1.57:=[threads(+)]
- >=dev-libs/libpcre-8.39[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.8:=
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- =dev-lang/python-2*
- <dev-util/scons-3
- >=sys-devel/gcc-4.8.2:*
- sys-libs/ncurses
- sys-libs/readline
- debug? ( dev-util/valgrind )
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- test? (
- dev-python/pymongo
- dev-python/pyyaml
- )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.2.0-fix-scons.patch"
- "${FILESDIR}/${PN}-3.2.4-boost-1.60.patch"
- "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
- "${FILESDIR}/${PN}-3.2.16-Replace-string-with-explicit-std-string.patch"
- "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
- if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
- ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be"
- ewarn "running a 3.0-series release. Please update to the latest 3.0"
- ewarn "release before continuing if wish to keep your data."
- fi
-}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- # Maintainer notes
- #
- # --use-system-tcmalloc is strongly NOT recommended:
- # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
-
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- # wiredtiger not supported on 32bit platforms #572166
- use x86 && scons_opts+=( --wiredtiger=off )
-
- if use debug; then
- scons_opts+=( --dbg=on )
- fi
-
- if use prefix; then
- scons_opts+=(
- --cpppath="${EPREFIX}/usr/include"
- --libpath="${EPREFIX}/usr/$(get_libdir)"
- )
- fi
-
- if use kerberos; then
- scons_opts+=( --use-sasl-client )
- fi
-
- if use ssl; then
- scons_opts+=( --ssl )
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_compile() {
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
- escons "${scons_opts[@]}" core tools
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- local x
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners mongodb:mongodb "${x}"
- fperms 0750 "${x}"
- done
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
- newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
- # wrt bug #461466
- if [[ "$(get_libdir)" == "lib64" ]]; then
- rmdir "${ED}"/usr/lib/ &>/dev/null
- fi
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 3.0 ${v}; then
- ewarn "!! IMPORTANT !!"
- ewarn " "
- ewarn "${PN} configuration files have changed !"
- ewarn " "
- ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
- ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
- ewarn " "
- ewarn "Make sure you also follow the upgrading process :"
- ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
- ewarn " "
- ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
- ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
- ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
- ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
- break
- fi
- done
-
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.org/manual/release-notes/3.2/"
- ewarn " https://docs.mongodb.org/master/release-notes/3.2-upgrade/"
- ewarn
- ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine."
-}
diff --git a/dev-db/mongodb/mongodb-4.0.2.ebuild b/dev-db/mongodb/mongodb-4.0.2.ebuild
deleted file mode 100644
index 98aa398f9f4..00000000000
--- a/dev-db/mongodb/mongodb-4.0.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )
- test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
- )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
- ewarn "To upgrade from a version earlier than the 3.6-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.6-series. Then upgrade to 4.0 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
- fi
- fi
-}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2018-06-28 12:45 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2018-06-28 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 2888da4e56bdd70a6fbbca59c8c1176edf1e3799
Author: Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Thu Jun 28 10:44:16 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 12:45:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2888da4e
dev-db/mongodb: bump to 4.0.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-db/mongodb/Manifest | 1 +
.../mongodb/files/mongodb-4.0.0-no-compass.patch | 57 +++++++
dev-db/mongodb/mongodb-4.0.0.ebuild | 170 +++++++++++++++++++++
3 files changed, 228 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d9824f06bd3..4fc4f86c8f1 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -9,3 +9,4 @@ DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a64
DIST mongodb-src-r3.6.3.tar.gz 40093607 BLAKE2B bb21bf0487661eec6140ade22526617b26b2499bd36e138d955d14a4b13a0685ec7308bccfc11ef17c785cd8a71c5b6cd9d154d461b8973410b03952b93953ec SHA512 94aa9955f99d5f6bbbe65dc3755583952525398308ca7cb9224b91d1fa403de5bb3abb63a651583815cbecaff58966b5cfe7334a36ef6583f73d8c213410ddbc
DIST mongodb-src-r3.6.4.tar.gz 40159916 BLAKE2B d3878d4e6bbf331de672768b2c92a4d71f758232170432d757f7e61849e6e1ef3b190e6a089101c9ea23c4ce23087c684c86fc6ea0f32f6fe052ce322d47e438 SHA512 02c2a697af9fdcbb16d19792be17d987e18c684418a63ed4750471c7ec22eb2eabf84e93cb1d298f67898b7e23687f668bb333c50ffc4e1b8adf8859f856ad95
DIST mongodb-src-r3.6.5.tar.gz 40310152 BLAKE2B 72110ae47b17ec8b1f60636a5ef8491b076e1cc019513fd872ea38b3bb8393efff4bddc7b795b3da711f258d21be9fa23e24d396a9429349c51ce05fff180a53 SHA512 6ecb3140ee4a7929fabe62d698f23e87cb5030cf31abefe7f82374f407fb87dc05f712089998f96bc40e23698836a86e7f3590892bde9d2d6f2c4bcc15cc3ebf
+DIST mongodb-src-r4.0.0.tar.gz 49138467 BLAKE2B 616e267c737729103de544d82db60489e7a32c5f9847ffd2d643a9025c18aa867718216f5de9f18a93fb2a7930c3dbe9ec3850eef09dbec084570328a99f2865 SHA512 11d00cdde606cfea268471cffccedb6d003e421aeffda2303aff4d4126c386aaec50a1de733d7a1d5fb6605403cf9f2218dae50374c7b5e8625fa80317804589
diff --git a/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch b/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch
new file mode 100644
index 00000000000..35e9c172e9e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch
@@ -0,0 +1,57 @@
+diff --git a/src/mongo/SConscript b/src/mongo/SConscript
+index c8f925b7..0e4f99ad 100644
+--- a/src/mongo/SConscript
++++ b/src/mongo/SConscript
+@@ -671,44 +671,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
+ for target in env["DIST_BINARIES"]:
+ installBinary(env, "db/modules/" + target)
+
+-# Set the download url to the right place
+-compass_type = 'compass-community'
+-if 'enterprise' in env['MONGO_MODULES']:
+- compass_type = 'compass'
+-
+-compass_script = "install_compass"
+-if env.TargetOSIs('windows'):
+- # On windows the .in needs to be explicitly added to the file.
+- compass_script = "Install-Compass.ps1.in"
+-
+-compass_python_interpreter = '/usr/bin/env python2'
+-if env.TargetOSIs('darwin'):
+- compass_python_interpreter = '/usr/bin/env python'
+-
+-compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
+- SUBST_DICT=[
+- ('@compass_type@', compass_type),
+- ('@python_interpreter@', compass_python_interpreter),
+- ])
+-distBinaries.append(compass_installer)
+-
+-if not hygienic:
+- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
+-else:
+- compass_script_installer = env.AutoInstall(
+- 'bin',
+- source=[
+- compass_installer,
+- ],
+- INSTALL_ALIAS=[
+- 'tools',
+- ],
+- )
+-
+-if env.TargetOSIs('posix'):
+- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
+- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
+-
+ # "dist" target is valid only when --use-new-tools is specified
+ # Attempts to build release artifacts without tools must fail
+ if has_option("use-new-tools"):
+@@ -726,7 +688,6 @@ if has_option("use-new-tools"):
+ '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
+ '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
+ '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
+- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
+ '${TEMPFILE(SOURCES[1:])}'
+ ],
+ ),
diff --git a/dev-db/mongodb/mongodb-4.0.0.ebuild b/dev-db/mongodb/mongodb-4.0.0.ebuild
new file mode 100644
index 00000000000..2b90de08741
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
+ <dev-util/scons-3
+ sys-libs/ncurses
+ sys-libs/readline
+ debug? ( dev-util/valgrind )
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ test? (
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.6 ]]; then
+ ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.6-series. Then upgrade to 4.0 series."
+ elif [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ fperms 0750 "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2018-01-11 11:34 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2018-01-11 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 9ef71bd8c965fe26ba310494a615fb8835be12a4
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Jan 9 10:30:26 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 11:34:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef71bd8
dev-db/mongodb: reintroduce scons fixes
Closes: https://bugs.gentoo.org/643984
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6804
dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch | 32 ++++++++++++++++++++++
...ongodb-3.6.1.ebuild => mongodb-3.6.1-r1.ebuild} | 1 +
2 files changed, 33 insertions(+)
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
new file mode 100644
index 00000000000..d7bfb35b00d
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
@@ -0,0 +1,32 @@
+diff --git a/SConstruct b/SConstruct
+index fe7975b..92659a7 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'):
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'):
+ env.Append( CCFLAGS=["-Werror"] )
+
+ env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ if env.ToolchainIs('clang'):
+ env.Append( CXXFLAGS=['-Werror=unused-result'] )
+
+@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'):
+
+ env.Append( LIBS=[] )
+
+- #make scons colorgcc friendly
+- for key in ('HOME', 'TERM'):
++ #make scons colorgcc, distcc, ccache friendly
++ for key in ('HOME', 'PATH', 'TERM'):
+ try:
+ env['ENV'][key] = os.environ[key]
+ except KeyError:
diff --git a/dev-db/mongodb/mongodb-3.6.1.ebuild b/dev-db/mongodb/mongodb-3.6.1-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.1.ebuild
rename to dev-db/mongodb/mongodb-3.6.1-r1.ebuild
index 363620ef050..8291fe7fc50 100644
--- a/dev-db/mongodb/mongodb-3.6.1.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.1-r1.ebuild
@@ -52,6 +52,7 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
)
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2017-09-22 9:28 Patrice Clement
0 siblings, 0 replies; 27+ messages in thread
From: Patrice Clement @ 2017-09-22 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 090527c1edee962b4e90fc3ca0ec9c6ed0322fbb
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Sep 22 07:51:01 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 09:28:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090527c1
dev-db/mongodb: fix building with newer glibc/pcre.
Gentoo-Bug: https://bugs.gentoo.org/631688
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5764
.../mongodb/files/mongodb-3.0.14-fix-scons.patch | 36 ++++++++++
.../files/mongodb-3.0.14-fix-std-string.patch | 83 ++++++++++++++++++++++
dev-db/mongodb/mongodb-3.0.14.ebuild | 63 +++++++++-------
dev-db/mongodb/mongodb-3.0.15.ebuild | 63 +++++++++-------
4 files changed, 197 insertions(+), 48 deletions(-)
diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch
new file mode 100644
index 00000000000..1db5d7695c7
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch
@@ -0,0 +1,36 @@
+diff --git a/SConstruct b/SConstruct
+--- a/SConstruct
++++ b/SConstruct
+@@ -1008,7 +1008,6 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fPIC",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1016,13 +1015,13 @@
+ "-Winvalid-pch"] )
+ # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+ if linux or darwin:
+- env.Append( CCFLAGS=["-pipe"] )
+ if not has_option("disable-warnings-as-errors"):
+ env.Append( CCFLAGS=["-Werror"] )
+
+ env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+ # startup.
+@@ -1039,7 +1038,7 @@
+ if not darwin:
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch
new file mode 100644
index 00000000000..9de319bda9d
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch
@@ -0,0 +1,83 @@
+--- a/src/mongo/shell/bench.cpp 2017-09-20 19:12:20.893056990 +0200
++++ b/src/mongo/shell/bench.cpp 2017-09-20 19:14:08.165060566 +0200
+@@ -52,6 +52,9 @@
+ #include "mongo/util/time_support.h"
+ #include "mongo/util/version.h"
+
++#include <string>
++using namespace std;
++
+ // ---------------------------------
+ // ---- benchmarking system --------
+ // ---------------------------------
+--- a/src/mongo/db/dbwebserver.cpp 2017-09-20 19:24:50.042081961 +0200
++++ b/src/mongo/db/dbwebserver.cpp 2017-09-20 19:26:20.240084968 +0200
+@@ -58,6 +58,8 @@
+ #include "mongo/util/ramlog.h"
+ #include "mongo/util/version.h"
+
++#include <string>
++using namespace std;
+
+ namespace mongo {
+
+--- a/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:27:59.009088260 +0200
++++ b/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:28:31.082089329 +0200
+@@ -39,6 +39,9 @@
+ #include "mongo/db/jsobj.h"
+ #include "mongo/db/matcher/path.h"
+
++#include <string>
++using namespace std;
++
+ namespace mongo {
+
+ Status LeafMatchExpression::initPath(const StringData& path) {
+--- a/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:30:04.569092445 +0200
++++ b/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:31:19.145094931 +0200
+@@ -70,6 +70,9 @@
+ #include "mongo/util/exit.h"
+ #include "mongo/util/log.h"
+
++#include <string>
++using namespace std;
++
+ using boost::scoped_ptr;
+ using std::auto_ptr;
+ using std::cout;
+--- a/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:32:55.368098138 +0200
++++ b/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:33:57.128100197 +0200
+@@ -39,6 +39,9 @@
+ #include "mongo/util/hex.h"
+ #include "mongo/util/log.h"
+
++#include <string>
++using namespace std;
++
+ namespace mongo {
+
+ using boost::shared_ptr;
+--- a/src/mongo/s/config.cpp 2017-09-20 19:42:45.614117812 +0200
++++ b/src/mongo/s/config.cpp 2017-09-20 19:43:28.278119234 +0200
+@@ -60,6 +60,9 @@
+ #include "mongo/util/net/message.h"
+ #include "mongo/util/stringutils.h"
+
++#include <string>
++using namespace std;
++
+ namespace mongo {
+
+ using boost::scoped_ptr;
+--- a/src/mongo/s/grid.cpp 2017-09-20 19:51:07.684134547 +0200
++++ b/src/mongo/s/grid.cpp 2017-09-20 19:51:43.436135739 +0200
+@@ -55,6 +55,9 @@
+ #include "mongo/util/startup_test.h"
+ #include "mongo/util/stringutils.h"
+
++#include <string>
++using namespace std;
++
+ namespace mongo {
+
+ using std::endl;
diff --git a/dev-db/mongodb/mongodb-3.0.14.ebuild b/dev-db/mongodb/mongodb-3.0.14.ebuild
index 8b12daab3c2..97c48d9a1d0 100644
--- a/dev-db/mongodb/mongodb-3.0.14.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.14.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SCONS_MIN_VERSION="2.3.0"
CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -30,7 +30,7 @@ RDEPEND="app-arch/snappy
mms-agent? ( app-admin/mms-agent )
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:= )
+ libressl? ( dev-libs/libressl:0= )
)"
DEPEND="${RDEPEND}
>=sys-devel/gcc-4.8.2:*
@@ -39,6 +39,12 @@ DEPEND="${RDEPEND}
kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.14-fix-scons.patch"
+ "${FILESDIR}/${PN}-3.0.14-fix-std-string.patch"
+ "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+)
+
S=${WORKDIR}/${MY_P}
pkg_setup() {
@@ -53,36 +59,36 @@ pkg_setup() {
# --c++11 is required by scons instead of auto detection:
# https://jira.mongodb.org/browse/SERVER-19661
- scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
- scons_opts+=" --disable-warnings-as-errors"
- scons_opts+=" --use-system-boost"
- scons_opts+=" --use-system-pcre"
- scons_opts+=" --use-system-snappy"
- scons_opts+=" --use-system-stemmer"
- scons_opts+=" --use-system-yaml"
+ scons_opts=(
+ --variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ )
if use debug; then
- scons_opts+=" --dbg=on"
+ scons_opts+=( --dbg=on )
fi
if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ scons_opts+=(
+ --cpppath="${EPREFIX}/usr/include )"
+ --libpath="${EPREFIX}/usr/$(get_libdir)"
+ )
fi
if use kerberos; then
- scons_opts+=" --use-sasl-client"
+ scons_opts+=( --use-sasl-client )
fi
if use ssl; then
- scons_opts+=" --ssl"
+ scons_opts+=( --ssl )
fi
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
-}
-
src_compile() {
# respect mongoDB upstream's basic recommendations
# see bug #536688 and #526114
@@ -90,12 +96,13 @@ src_compile() {
filter-flags '-m*'
filter-flags '-O?'
fi
- escons ${scons_opts} core tools
+ escons "${scons_opts[@]}" core tools || die
}
src_install() {
- escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr || die
+ local x
for x in /var/{lib,log}/${PN}; do
keepdir "${x}"
fowners mongodb:mongodb "${x}"
@@ -130,9 +137,17 @@ pkg_preinst() {
}
src_test() {
- escons ${scons_opts} dbtest
- "${S}"/dbtest --dbpath=unittest || die "dbtest failed"
- escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
+ escons "${scons_opts[@]}" unittests || die
+
+ # tests fail
+ sed -i '/\/util\/options_parser\/options_parser_test/d' build/unittests.txt || die
+ sed -i '/\/mongo\/server_options_test/d' build/unittests.txt || die
+
+ local x
+ while read x; do
+ einfo "Running test $x"
+ ./$x || die
+ done < build/unittests.txt
}
pkg_postinst() {
diff --git a/dev-db/mongodb/mongodb-3.0.15.ebuild b/dev-db/mongodb/mongodb-3.0.15.ebuild
index cbb0ca36d68..848080d0799 100644
--- a/dev-db/mongodb/mongodb-3.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.15.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SCONS_MIN_VERSION="2.3.0"
CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -30,7 +30,7 @@ RDEPEND="app-arch/snappy
mms-agent? ( app-admin/mms-agent )
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:= )
+ libressl? ( dev-libs/libressl:0= )
)"
DEPEND="${RDEPEND}
>=sys-devel/gcc-4.8.2:*
@@ -39,6 +39,12 @@ DEPEND="${RDEPEND}
kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.14-fix-scons.patch"
+ "${FILESDIR}/${PN}-3.0.14-fix-std-string.patch"
+ "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+)
+
S=${WORKDIR}/${MY_P}
pkg_setup() {
@@ -53,36 +59,36 @@ pkg_setup() {
# --c++11 is required by scons instead of auto detection:
# https://jira.mongodb.org/browse/SERVER-19661
- scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
- scons_opts+=" --disable-warnings-as-errors"
- scons_opts+=" --use-system-boost"
- scons_opts+=" --use-system-pcre"
- scons_opts+=" --use-system-snappy"
- scons_opts+=" --use-system-stemmer"
- scons_opts+=" --use-system-yaml"
+ scons_opts=(
+ --variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ )
if use debug; then
- scons_opts+=" --dbg=on"
+ scons_opts+=( --dbg=on )
fi
if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ scons_opts+=(
+ --cpppath="${EPREFIX}/usr/include )"
+ --libpath="${EPREFIX}/usr/$(get_libdir)"
+ )
fi
if use kerberos; then
- scons_opts+=" --use-sasl-client"
+ scons_opts+=( --use-sasl-client )
fi
if use ssl; then
- scons_opts+=" --ssl"
+ scons_opts+=( --ssl )
fi
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
-}
-
src_compile() {
# respect mongoDB upstream's basic recommendations
# see bug #536688 and #526114
@@ -90,12 +96,13 @@ src_compile() {
filter-flags '-m*'
filter-flags '-O?'
fi
- escons ${scons_opts} core tools
+ escons "${scons_opts[@]}" core tools || die
}
src_install() {
- escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr || die
+ local x
for x in /var/{lib,log}/${PN}; do
keepdir "${x}"
fowners mongodb:mongodb "${x}"
@@ -130,9 +137,17 @@ pkg_preinst() {
}
src_test() {
- escons ${scons_opts} dbtest
- "${S}"/dbtest --dbpath=unittest || die "dbtest failed"
- escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
+ escons "${scons_opts[@]}" unittests || die
+
+ # tests fail
+ sed -i '/\/util\/options_parser\/options_parser_test/d' build/unittests.txt || die
+ sed -i '/\/mongo\/server_options_test/d' build/unittests.txt || die
+
+ local x
+ while read x; do
+ einfo "Running test $x"
+ ./$x || die
+ done < build/unittests.txt
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2017-09-21 19:50 Patrice Clement
0 siblings, 0 replies; 27+ messages in thread
From: Patrice Clement @ 2017-09-21 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 85ff1fbcf12527d575e1bf4e5ec914e9a2e93c7c
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Sep 5 16:05:26 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 19:49:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ff1fbc
dev-db/mongodb: version bump to 3.4.7.
Gentoo-Bug: https://bugs.gentoo.org/630566
Package-Manager: Portage-2.3.8, Repoman-2.3.2
dev-db/mongodb/Manifest | 1 +
.../files/mongodb-3.4.7-no-boost-check.patch | 13 ++
dev-db/mongodb/mongodb-3.4.7.ebuild | 189 +++++++++++++++++++++
3 files changed, 203 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 62772666eca..8358ff600c8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -8,3 +8,4 @@ DIST mongodb-src-r3.2.16.tar.gz 29293555 SHA256 7a8b1b16f3fa545af16f48aeef1f918f
DIST mongodb-src-r3.4.3.tar.gz 39832718 SHA256 889d49312ed072130936cfa3281123a0e89228c04f3f8e992a0b92669b28d767 SHA512 e2fb5fc2f02e9dbca6c30d2e2aaf1569180ca15198226cdad46f47f44905293afe77763fe2e5c9add0b5bcbd62b7ce7905fb183068c0738cdeeae8d39f848cef WHIRLPOOL ba6fa864249cc80e5f65feaed685980b874b46bcf975142e15fa0eda3e474cc85388920e152474dc5527a30d215c309db6d471c716e6bbe374193ff6016ba22e
DIST mongodb-src-r3.4.4.tar.gz 39867133 SHA256 09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6 SHA512 dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940 WHIRLPOOL 5ad9f80c7f0f597982a32f95365df961fcd80ffa7c04183f9cb4952a52262a27ab09fee4d0115405c5197b6d3848ede56c9a4e5012ec1c358ea8c752164405c2
DIST mongodb-src-r3.4.6.tar.gz 39922209 SHA256 8170360f6dfede9c19c131f3d76831e952b3f1494925aa7e2a3a2f95b58ad901 SHA512 68da2f385a5e1d636f1699b13818e125af2b7f13c6ff74d5f6dc8f9e04025f9baaa23acfd386118d90ac0eb8b9b7dfbf5b00f1db580a1ea1fe2309361f46eae4 WHIRLPOOL 71b9f42a192b41c797763a02eb8b318488edbd7ffaa149497d3dea5c446c43ff078d24e48971ce4644d54767bcb848e1acaca3e17be9e8c50bbdd349e0d05fab
+DIST mongodb-src-r3.4.7.tar.gz 39936247 SHA256 9272e7663c7915e09ad2609e28c58437d760d54a9552c711ea735cd8e1784ec0 SHA512 30f4d0dbd487d148531d7073881cd55db3fef3dcfd199e260e1a51858c5a2c28dfe904d1273b89b27b2fbcde23c3a301a3fa24766489ad6eb2daa25da31d3182 WHIRLPOOL 0ecaa271f9fbe634404aca2d13b0bb0ef47847656fc2825f5ff220655bc213df96170ec6009efc033c5e0a50baf7afd400c240dcaecdaf03fc356138121dd928
diff --git a/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch b/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
new file mode 100644
index 00000000000..1d908e73f43
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index df92e41659..2c387d5a24 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2831,8 +2831,6 @@ def doConfigure(myenv):
+ if use_system_version_of_library("boost"):
+ if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
+ myenv.ConfError("can't find boost headers")
+- if not conf.CheckBoostMinVersion():
+- myenv.ConfError("system's version of boost is too old. version 1.49 or better required")
+
+ # Note that on Windows with using-system-boost builds, the following
+ # FindSysLibDep calls do nothing useful (but nothing problematic either)
diff --git a/dev-db/mongodb/mongodb-3.4.7.ebuild b/dev-db/mongodb/mongodb-3.4.7.ebuild
new file mode 100644
index 00000000000..2aef3eaf125
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.4.7.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3
+ >=dev-libs/boost-1.60[threads(+)]
+ >=dev-libs/libpcre-8.39[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.8
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-5.3.0:*
+ sys-libs/ncurses
+ sys-libs/readline
+ debug? ( dev-util/valgrind )
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ test? (
+ dev-python/pymongo
+ dev-python/pyyaml
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+ "${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch"
+ "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+ "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "To upgrade from a version earlier than the 3.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.2-series. Then upgrade to 3.4 series."
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ # Maintainer notes
+ #
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ # wiredtiger not supported on 32bit platforms #572166
+ use x86 && scons_opts+=( --wiredtiger=off )
+
+ if use debug; then
+ scons_opts+=( --dbg=on )
+ fi
+
+ if use prefix; then
+ scons_opts+=(
+ --cpppath="${EPREFIX}/usr/include"
+ --libpath="${EPREFIX}/usr/$(get_libdir)"
+ )
+ fi
+
+ if use kerberos; then
+ scons_opts+=( --use-sasl-client )
+ fi
+
+ if use ssl; then
+ scons_opts+=( --ssl )
+ fi
+}
+
+src_compile() {
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+ escons "${scons_opts[@]}" core tools
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ # this one test fails
+ rm jstests/core/repl_write_threads_start_param.js || die
+
+ ./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
+}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 3.0 ${v}; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+ ewarn " "
+ ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+ ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+ ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+ break
+ fi
+ done
+
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.org/manual/release-notes/3.4/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/3.4/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2017-09-05 8:17 David Seifert
0 siblings, 0 replies; 27+ messages in thread
From: David Seifert @ 2017-09-05 8:17 UTC (permalink / raw
To: gentoo-commits
commit: faee40dcab8c8344b772f0d414aa95b2579494d5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 08:15:17 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 08:15:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faee40dc
dev-db/mongodb: Add missing sys/sysmacros.h include
Closes: https://bugs.gentoo.org/show_bug.cgi?id=629906
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../files/mongodb-3.4.6-sysmacros-include.patch | 38 ++++++++++++++++++++++
dev-db/mongodb/mongodb-3.4.6.ebuild | 13 ++++----
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
new file mode 100644
index 00000000000..868ba73e442
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
@@ -0,0 +1,38 @@
+From e245cac2b3c18015dee8caddd449532785d15c2b Mon Sep 17 00:00:00 2001
+From: Jason Carey <jcarey@argv.me>
+Date: Mon, 26 Jun 2017 11:09:10 -0400
+Subject: [PATCH] SERVER-29855 Pull major/minor from sys/sysmacros.h
+
+Per newer versions of glibc:
+
+----
+error: In the GNU C Library, "major" is defined
+ by <sys/sysmacros.h>. For historical compatibility, it is
+ currently defined by <sys/types.h> as well, but we plan to
+ remove this soon. To use "major", include <sys/sysmacros.h>
+ directly. If you did not intend to use a system-defined macro
+ "major", you should undefine it after including <sys/types.h>. [-Werror]
+ string path = str::stream() << "/sys/dev/block/" << major(dev) << ':' << minor(dev)
+----
+
+Including <sys/sysmacros.h> appears to be the correct solution to quiet
+the warning
+---
+ src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
+index 5a784b25dc7..c43e148d3f4 100644
+--- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
++++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
+@@ -36,6 +36,10 @@
+ #include <boost/filesystem/path.hpp>
+ #include <fstream>
+
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
++
+ #include "mongo/db/mongod_options.h"
+ #include "mongo/db/storage/mmap_v1/data_file_sync.h"
+ #include "mongo/db/storage/mmap_v1/dur.h"
diff --git a/dev-db/mongodb/mongodb-3.4.6.ebuild b/dev-db/mongodb/mongodb-3.4.6.ebuild
index 18751f0bf10..5900f1f4fac 100644
--- a/dev-db/mongodb/mongodb-3.4.6.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.6.ebuild
@@ -100,12 +100,13 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
- epatch "${FILESDIR}/${P}-no-boost-check.patch"
- epatch "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch"
- if has_version ">=dev-libs/boost-1.62"; then
- epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
- fi
+ epatch \
+ "${FILESDIR}/${PN}-3.4.0-fix-scons.patch" \
+ "${FILESDIR}/${P}-no-boost-check.patch" \
+ "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch" \
+ "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch" \
+ "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+
epatch_user
}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2017-07-26 22:17 Zac Medico
0 siblings, 0 replies; 27+ messages in thread
From: Zac Medico @ 2017-07-26 22:17 UTC (permalink / raw
To: gentoo-commits
commit: b1c029b6c31036b2b0e360052092b2a6e5464118
Author: Steven Green <steven <AT> greenius <DOT> co <DOT> uk>
AuthorDate: Wed Jul 26 22:02:14 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 22:17:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c029b6
dev-db/mongodb: patch 3.4.4 for bug 625148
Package-Manager: Portage-2.3.6, Repoman-2.3.2
...4-Replace-string-with-explicit-std-string.patch | 302 +++++++++++++++++++++
dev-db/mongodb/mongodb-3.4.4.ebuild | 3 +-
2 files changed, 304 insertions(+), 1 deletion(-)
diff --git a/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch b/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch
new file mode 100644
index 00000000000..da33d47df7f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch
@@ -0,0 +1,302 @@
+From 9df9837299ab952d4d30db2427beef667e608f79 Mon Sep 17 00:00:00 2001
+From: Steven Green <steven@greenius.co.uk>
+Date: Mon, 17 Jul 2017 13:05:44 +0100
+Subject: [PATCH] SERVER-30166 Replace string with explicit std::string.
+ Enables compulation when using --use-system-pcre which presusably used to do
+ 'using std::string' in an earlier version of pcre
+
+ https://github.com/mongodb/mongo/pull/1166
+
+---
+ src/mongo/db/dbwebserver.cpp | 1 +
+ src/mongo/db/matcher/expression_leaf.cpp | 4 ++--
+ src/mongo/db/repl/master_slave.cpp | 40 ++++++++++++++++----------------
+ src/mongo/shell/bench.cpp | 14 +++++------
+ src/mongo/util/net/miniwebserver.cpp | 1 +
+ 5 files changed, 31 insertions(+), 29 deletions(-)
+
+diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
+index b202e0500b9..02556135240 100644
+--- a/src/mongo/db/dbwebserver.cpp
++++ b/src/mongo/db/dbwebserver.cpp
+@@ -67,6 +67,7 @@ namespace mongo {
+ using std::map;
+ using std::stringstream;
+ using std::vector;
++using std::string;
+
+ using namespace html;
+
+diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp
+index d562bff141e..b96a36d543f 100644
+--- a/src/mongo/db/matcher/expression_leaf.cpp
++++ b/src/mongo/db/matcher/expression_leaf.cpp
+@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con
+ }
+
+ void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
+- string opString = "";
++ std::string opString = "";
+ switch (matchType()) {
+ case LT:
+ opString = "$lt";
+@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const
+ }
+
+ void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
+- string opString = "";
++ std::string opString = "";
+
+ switch (matchType()) {
+ case BITS_ALL_SET:
+diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
+index 05faad12599..042350465c6 100644
+--- a/src/mongo/db/repl/master_slave.cpp
++++ b/src/mongo/db/repl/master_slave.cpp
+@@ -168,7 +168,7 @@ BSONObj ReplSource::jsobj() {
+
+ BSONObjBuilder dbsNextPassBuilder;
+ int n = 0;
+- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
++ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
+ n++;
+ dbsNextPassBuilder.appendBool(*i, 1);
+ }
+@@ -177,7 +177,7 @@ BSONObj ReplSource::jsobj() {
+
+ BSONObjBuilder incompleteCloneDbsBuilder;
+ n = 0;
+- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
++ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
+ n++;
+ incompleteCloneDbsBuilder.appendBool(*i, 1);
+ }
+@@ -188,7 +188,7 @@ BSONObj ReplSource::jsobj() {
+ }
+
+ void ReplSource::ensureMe(OperationContext* txn) {
+- string myname = getHostName();
++ std::string myname = getHostName();
+
+ // local.me is an identifier for a server for getLastError w:2+
+ bool exists = Helpers::getSingleton(txn, "local.me", _me);
+@@ -378,10 +378,10 @@ class HandshakeCmd : public Command {
+ }
+
+ virtual bool run(OperationContext* txn,
+- const string& ns,
++ const std::string& ns,
+ BSONObj& cmdObj,
+ int options,
+- string& errmsg,
++ std::string& errmsg,
+ BSONObjBuilder& result) {
+ HandshakeArgs handshake;
+ Status status = handshake.initialize(cmdObj);
+@@ -398,7 +398,7 @@ class HandshakeCmd : public Command {
+ } handshakeCmd;
+
+ bool replHandshake(DBClientConnection* conn, const OID& myRID) {
+- string myname = getHostName();
++ std::string myname = getHostName();
+
+ BSONObjBuilder cmd;
+ cmd.append("handshake", myRID);
+@@ -450,7 +450,7 @@ void ReplSource::forceResync(OperationContext* txn, const char* requester) {
+ BSONElement e = i.next();
+ if (e.eoo())
+ break;
+- string name = e.embeddedObject().getField("name").valuestr();
++ std::string name = e.embeddedObject().getField("name").valuestr();
+ if (!e.embeddedObject().getBoolField("empty")) {
+ if (name != "local") {
+ if (only.empty() || only == name) {
+@@ -481,7 +481,7 @@ Status ReplSource::_updateIfDoneWithInitialSync() {
+ return Status::OK();
+ }
+
+-void ReplSource::resyncDrop(OperationContext* txn, const string& dbName) {
++void ReplSource::resyncDrop(OperationContext* txn, const std::string& dbName) {
+ log() << "resync: dropping database " << dbName;
+ invariant(txn->lockState()->isW());
+
+@@ -531,13 +531,13 @@ void ReplSource::resync(OperationContext* txn, const std::string& dbName) {
+
+ static DatabaseIgnorer ___databaseIgnorer;
+
+-void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) {
++void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) {
+ if (futureOplogTime > _ignores[db]) {
+ _ignores[db] = futureOplogTime;
+ }
+ }
+
+-bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) {
++bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) {
+ if (_ignores[db].isNull()) {
+ return false;
+ }
+@@ -627,7 +627,7 @@ bool ReplSource::handleDuplicateDbName(OperationContext* txn,
+
+ // The database is present on the master and no conflicting databases
+ // are present on the master. Drop any local conflicts.
+- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
++ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
+ ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime);
+ incompleteCloneDbs.erase(*i);
+ addDbNextPass.erase(*i);
+@@ -826,10 +826,10 @@ void ReplSource::_sync_pullOpLog_applyOperation(OperationContext* txn,
+ }
+
+ void ReplSource::syncToTailOfRemoteLog() {
+- string _ns = ns();
++ std::string _ns = ns();
+ BSONObjBuilder b;
+ if (!only.empty()) {
+- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
++ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
+ }
+ BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1)));
+ if (!last.isEmpty()) {
+@@ -877,7 +877,7 @@ class ReplApplyBatchSize
+ */
+ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
+ int okResultCode = restartSyncAfterSleep;
+- string ns = string("local.oplog.$") + sourceName();
++ std::string ns = std::string("local.oplog.$") + sourceName();
+ LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n';
+
+ bool tailing = true;
+@@ -897,7 +897,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
+ BSONElement e = i.next();
+ if (e.eoo())
+ break;
+- string name = e.embeddedObject().getField("name").valuestr();
++ std::string name = e.embeddedObject().getField("name").valuestr();
+ if (!e.embeddedObject().getBoolField("empty")) {
+ if (name != "local") {
+ if (only.empty() || only == name) {
+@@ -921,7 +921,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
+ if (!only.empty()) {
+ // note we may here skip a LOT of data table scanning, a lot of work for the master.
+ // maybe append "\\." here?
+- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
++ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
+ }
+ BSONObj queryObj = query.done();
+ // e.g. queryObj = { ts: { $gte: syncedTo } }
+@@ -940,7 +940,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
+
+ // show any deferred database creates from a previous pass
+ {
+- set<string>::iterator i = addDbNextPass.begin();
++ set<std::string>::iterator i = addDbNextPass.begin();
+ if (i != addDbNextPass.end()) {
+ BSONObjBuilder b;
+ b.append("ns", *i + '.');
+@@ -984,7 +984,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
+ BSONObj op = oplogReader.nextSafe();
+ BSONElement ts = op.getField("ts");
+ if (ts.type() != Date && ts.type() != bsonTimestamp) {
+- string err = op.getStringField("$err");
++ std::string err = op.getStringField("$err");
+ if (!err.empty()) {
+ // 13051 is "tailable cursor requested on non capped collection"
+ if (op.getIntField("code") == 13051) {
+@@ -1152,7 +1152,7 @@ int ReplSource::sync(OperationContext* txn, int& nApplied) {
+
+ // FIXME Handle cases where this db isn't on default port, or default port is spec'd in
+ // hostName.
+- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) &&
++ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) &&
+ serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) {
+ log() << "can't sync from self (localhost). sources configuration may be wrong." << endl;
+ sleepsecs(5);
+@@ -1297,7 +1297,7 @@ static void replMain(OperationContext* txn) {
+ if (s) {
+ stringstream ss;
+ ss << "sleep " << s << " sec before next pass";
+- string msg = ss.str();
++ std::string msg = ss.str();
+ if (!serverGlobalParams.quiet)
+ log() << msg << endl;
+ ReplInfo r(msg.c_str());
+diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
+index 040002f5c6e..338477ebe56 100644
+--- a/src/mongo/shell/bench.cpp
++++ b/src/mongo/shell/bench.cpp
+@@ -674,7 +674,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
+ invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess);
+
+ if (_config->username != "") {
+- string errmsg;
++ std::string errmsg;
+ if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
+ uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg);
+ }
+@@ -918,7 +918,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
+
+ if (!result["err"].eoo() && result["err"].type() == String &&
+ (_config->throwGLE || op.throwGLE))
+- throw DBException((string) "From benchRun GLE" +
++ throw DBException((std::string) "From benchRun GLE" +
+ causedBy(result["err"].String()),
+ result["code"].eoo() ? 0 : result["code"].Int());
+ }
+@@ -984,7 +984,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
+
+ if (!result["err"].eoo() && result["err"].type() == String &&
+ (_config->throwGLE || op.throwGLE))
+- throw DBException((string) "From benchRun GLE" +
++ throw DBException((std::string) "From benchRun GLE" +
+ causedBy(result["err"].String()),
+ result["code"].eoo() ? 0 : result["code"].Int());
+ }
+@@ -1031,7 +1031,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
+
+ if (!result["err"].eoo() && result["err"].type() == String &&
+ (_config->throwGLE || op.throwGLE))
+- throw DBException((string) "From benchRun GLE " +
++ throw DBException((std::string) "From benchRun GLE " +
+ causedBy(result["err"].String()),
+ result["code"].eoo() ? 0 : result["code"].Int());
+ }
+@@ -1133,7 +1133,7 @@ void BenchRunWorker::run() {
+ try {
+ std::unique_ptr<DBClientBase> conn(_config->createConnection());
+ if (!_config->username.empty()) {
+- string errmsg;
++ std::string errmsg;
+ if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
+ uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg);
+ }
+@@ -1165,7 +1165,7 @@ void BenchRunner::start() {
+ std::unique_ptr<DBClientBase> conn(_config->createConnection());
+ // Must authenticate to admin db in order to run serverStatus command
+ if (_config->username != "") {
+- string errmsg;
++ std::string errmsg;
+ if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
+ uasserted(
+ 16704,
+@@ -1201,7 +1201,7 @@ void BenchRunner::stop() {
+ {
+ std::unique_ptr<DBClientBase> conn(_config->createConnection());
+ if (_config->username != "") {
+- string errmsg;
++ std::string errmsg;
+ // this can only fail if admin access was revoked since start of run
+ if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
+ uasserted(
+diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
+index 5f4165d42f4..7a7d0714934 100644
+--- a/src/mongo/util/net/miniwebserver.cpp
++++ b/src/mongo/util/net/miniwebserver.cpp
+@@ -47,6 +47,7 @@ namespace mongo {
+ using std::shared_ptr;
+ using std::stringstream;
+ using std::vector;
++using std::string;
+
+ MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx)
+ : Listener(name, ip, port, ctx, false, false) {}
diff --git a/dev-db/mongodb/mongodb-3.4.4.ebuild b/dev-db/mongodb/mongodb-3.4.4.ebuild
index 25b6b977c05..ddb22087d4a 100644
--- a/dev-db/mongodb/mongodb-3.4.4.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.4.ebuild
@@ -101,7 +101,8 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-3.4.0-fix-scons.patch" \
+ "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch"
if has_version ">=dev-libs/boost-1.62"; then
epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
fi
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2017-01-11 7:43 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2017-01-11 7:43 UTC (permalink / raw
To: gentoo-commits
commit: e6e8be3a23eda3522082446e3a37da67fd0eb983
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 07:39:43 2017 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 07:40:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e8be3a
dev-db/mongodb: version bump fixes #602434
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-db/mongodb/Manifest | 1 +
dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch | 35 ++++
dev-db/mongodb/mongodb-3.4.1.ebuild | 190 +++++++++++++++++++++
3 files changed, 226 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 205aa4f..522606a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -3,3 +3,4 @@ DIST mongodb-src-r2.6.12.tar.gz 16462842 SHA256 2dd51eabcfcd133573be74c0131c85b6
DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
DIST mongodb-src-r3.0.14.tar.gz 28093922 SHA256 ebbb758ca7ee53e8d25e2410bb7ef61640829566d094cde2487b55e73d0fd880 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152 WHIRLPOOL 7fc02969c52954f0fd9b90ace9efd3677a9d6b8d3618b5dedb470343a3ba71789d451cc30a95742b2b9e61b21ffe0f1a23e239e388a497a327f2cc8ed1ed6aef
DIST mongodb-src-r3.2.11.tar.gz 29113706 SHA256 625eb28fd47b2af63b30343a064de7f42e5265f4c642874ec766ba3643fd80d7 SHA512 8cb63f878d573e2fb2bace57a10d036aebe0cc06e46a3cd5480fb4a8bcd51ac5219c729b5ea85213e0c905906a93780080332fa01dbcd29e01358f5e9051824c WHIRLPOOL fca825400e9ab16e53dfbbd400a9bd87b9a866d56b2a5839ece25b8dbfe55074fa04d40f47c337f67cb3bd3e547b99b4349eeb15a87a9b9659ea0f1a0cc2c526
+DIST mongodb-src-r3.4.1.tar.gz 40161375 SHA256 54f475e553827733fb351ee4b03b470297f0d08e0434fbf7e6661705124da97b SHA512 48400f00ed84922b1e734ad915c376a567af2cd32e9cdcc40819fdfbc0a5c2444e4f325b1a541fc21cf87f4d95f9bdcc64bd59eab9d25e75b28732978feda031 WHIRLPOOL 1dce39c7b36b2c1d3760c7c560c1fefde9ea6d780ef1ef8b5db38f3ed8f0aff9a4ae51ab26381d9330c5b3ad3182ed998ae8e2a0ecc85e9347714ffa853d7734
diff --git a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
new file mode 100644
index 00000000..2dd751f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
@@ -0,0 +1,35 @@
+--- a/SConstruct 2016-12-27 11:10:06.801949538 +0100
++++ b/SConstruct 2016-12-27 11:12:40.426407713 +0100
+@@ -1557,7 +1557,6 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1568,8 +1567,9 @@
+ if not has_option("disable-warnings-as-errors"):
+ env.Append( CCFLAGS=["-Werror"] )
+
+- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
+ env.Append( LINKFLAGS=["-pthread"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+ # startup.
+@@ -1579,10 +1579,10 @@
+ env.Append( LINKFLAGS=["-Wl,-z,now"] )
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
+
+- #make scons colorgcc friendly
+- for key in ('HOME', 'TERM'):
++ #make scons colorgcc, distcc, ccache friendly
++ for key in ('HOME', 'PATH', 'TERM'):
+ try:
+ env['ENV'][key] = os.environ[key]
+ except KeyError:
diff --git a/dev-db/mongodb/mongodb-3.4.1.ebuild b/dev-db/mongodb/mongodb-3.4.1.ebuild
new file mode 100644
index 00000000..39b27b8
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.4.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3
+ >=dev-libs/boost-1.60[threads(+)]
+ >=dev-libs/libpcre-8.39[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.8
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8.2:*
+ sys-libs/ncurses
+ sys-libs/readline
+ debug? ( dev-util/valgrind )
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ test? (
+ dev-python/pymongo
+ dev-python/pyyaml
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "To upgrade from a version earlier than the 3.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.2-series. Then upgrade to 3.4 series."
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ # Maintainer notes
+ #
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ # wiredtiger not supported on 32bit platforms #572166
+ use x86 && scons_opts+=( --wiredtiger=off )
+
+ if use debug; then
+ scons_opts+=( --dbg=on )
+ fi
+
+ if use prefix; then
+ scons_opts+=(
+ --cpppath="${EPREFIX}/usr/include"
+ --libpath="${EPREFIX}/usr/$(get_libdir)"
+ )
+ fi
+
+ if use kerberos; then
+ scons_opts+=( --use-sasl-client )
+ fi
+
+ if use ssl; then
+ scons_opts+=( --ssl )
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+ if has_version ">=dev-libs/boost-1.62"; then
+ epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+ fi
+ epatch_user
+}
+
+src_compile() {
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+ escons "${scons_opts[@]}" core tools
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ # this one test fails
+ rm jstests/core/repl_write_threads_start_param.js
+
+ ./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
+}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 3.0 ${v}; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+ ewarn " "
+ ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+ ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+ ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+ break
+ fi
+ done
+
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.org/manual/release-notes/3.4/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/3.4/#upgrade-procedures"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2016-01-03 12:27 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2016-01-03 12:27 UTC (permalink / raw
To: gentoo-commits
commit: 28a3f51f40f5252ce059ef182b3dd4cf516cfd77
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 14:07:02 2015 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 12:26:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a3f51f
dev-db/mongodb: drop 2.4 series after bumping mongochem deps
Package-Manager: portage-2.2.25
dev-db/mongodb/Manifest | 2 -
.../mongodb/files/mongodb-2.2-r1-fix-boost.patch | 13 --
dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch | 33 -----
.../mongodb/files/mongodb-2.4.11-fix-scons.patch | 23 ----
dev-db/mongodb/files/mongodb.confd | 14 --
dev-db/mongodb/files/mongodb.initd-r1 | 40 ------
dev-db/mongodb/metadata.xml | 3 -
dev-db/mongodb/mongodb-2.4.13.ebuild | 150 ---------------------
dev-db/mongodb/mongodb-2.4.14.ebuild | 150 ---------------------
9 files changed, 428 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index ebaaf21..52cf81d 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,4 @@
DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
-DIST mongodb-src-r2.4.13.tar.gz 14183056 SHA256 9ad8a3b58457c35b6dd020ca2364ee605e30b839f5475449a229fdcd4115866c SHA512 26256410593f2072e8a8728fbb2665bb98d4c73f3601136e8306d1d6b421421827f66e4073515fea7dfbc0a27f5615cd30f8a85e5980ea3dd46f2f06366946cb WHIRLPOOL 6e64a8ba466da74342f7eabd41b8eb86a3d1cd99c5665e54872642230ec0ed86216c0e533b08d21e0c6b6c20b7d7887a34aad0679ba32523dd3ca0e464190348
-DIST mongodb-src-r2.4.14.tar.gz 15120808 SHA256 f5ed949cf7c9669267e6f426f3dc30bf6c0e2d68ba7df9e29f16799e8212e7ce SHA512 6811f27a57a2df07f59215f544948708cd5846237c24df6eb14bf09384db4136d964587d82008ff2b0a4dea94d6869fc1dcf2ccd07e5f285da5012a0a091a74f WHIRLPOOL c89b2f4f1a77523f895b3fa21ec82813a4859391c82e3934952b25ab8602c30ac13b9e6b2a00082bbe7bace32edacdb3270e46ac0f3a8c0ab10ea48b5911e019
DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ffe30e2b57a1a5f2a40f0018bad3b8d12f SHA512 43b8c5e1ffde2c7f4bead392a95fdb34169419b8296acf04a17894379647c09bbec91be88037ab447da399f03a2c7c54c9d7613df0baa6e9e48e1267327ca937 WHIRLPOOL 083c897f83992c64a89e595058b7695671ca7e9339be2a54d14cf8a200d5063f4a33c320c02e45f5d3bd6367b5acf67a80677c92abba9a92a647d7310a2e6316
DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
deleted file mode 100644
index b6c9a1e..0000000
--- a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mongodb-src-r2.2.0/SConstruct.old 2012-10-09 12:41:25.000000000 -0400
-+++ mongodb-src-r2.2.0/SConstruct 2012-10-09 12:41:41.000000000 -0400
-@@ -171,8 +171,8 @@
- add_option( "extrapathdyn", "comma separated list of add'l paths (--extrapath /opt/foo/,/foo) dynamic linking" , 1 , True )
- add_option( "extralib", "comma separated list of libraries (--extralib js_static,readline" , 1 , True )
-
--add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
--add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
-+add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , False , "boostCompiler" )
-+add_option( "boost-version", "boost version for linking(1_38)" , 1 , False , "boostVersion" )
-
- add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
-
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
deleted file mode 100644
index 553967e..0000000
--- a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/mongo/client/sasl_client_session.cpp 2014-10-15 00:40:29.000000000 +0400
-+++ b/src/mongo/client/sasl_client_session.cpp 2015-02-07 18:56:02.287762467 +0300
-@@ -29,17 +29,26 @@
- * doesn't initialize the library for us.
- */
-
-- void* saslOurMalloc(unsigned long sz) {
-+// Version 2.1.26 is the first version to use size_t in the allocator signatures
-+#if (SASL_VERSION_FULL >= ((2 << 16) | (1 << 8) | 26))
-+ typedef size_t SaslAllocSize;
-+#else
-+ typedef unsigned long SaslAllocSize;
-+#endif
-+
-+ typedef int(*SaslCallbackFn)();
-+
-+ void* saslOurMalloc(SaslAllocSize sz) {
- return ourmalloc(sz);
- }
-
-- void* saslOurCalloc(unsigned long count, unsigned long size) {
-+ void* saslOurCalloc(SaslAllocSize count, SaslAllocSize size) {
- void* ptr = calloc(count, size);
-- if (!ptr) printStackAndExit(0);
-+ if (!ptr) abort();
- return ptr;
- }
-
-- void* saslOurRealloc(void* ptr, unsigned long sz) {
-+ void* saslOurRealloc(void* ptr, SaslAllocSize sz) {
- return ourrealloc(ptr, sz);
- }
-
diff --git a/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
deleted file mode 100644
index 5050fe7..0000000
--- a/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- b/SConstruct 2014-09-01 19:12:24.289585592 +0200
-+++ a/SConstruct 2014-09-01 19:14:12.550312261 +0200
-@@ -704,7 +704,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fPIC",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -719,9 +718,10 @@
- env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
-
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
-
- #make scons colorgcc friendly
- for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
deleted file mode 100644
index 4f76c5a..0000000
--- a/dev-db/mongodb/files/mongodb.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mongodb essentials
-MONGODB_EXEC="/usr/bin/mongod"
-MONGODB_RUN="/var/run/mongodb"
-MONGODB_DATA="/var/lib/mongodb"
-MONGODB_USER="mongodb"
-
-# Listen to specified IP, comment this to listen to all
-MONGODB_IP="127.0.0.1"
-
-# Listen to specified port
-MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-MONGODB_OPTIONS="--journal"
diff --git a/dev-db/mongodb/files/mongodb.initd-r1 b/dev-db/mongodb/files/mongodb.initd-r1
deleted file mode 100644
index f52cca2..0000000
--- a/dev-db/mongodb/files/mongodb.initd-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- use net
-}
-
-start() {
- checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
-
- # Listen to MONGODB_IP if configured
- [ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
-
- # Baselayout-1 user should use --chuid instead of --user
- local USEROPT="--user"
- if [ ! -f /etc/init.d/sysfs ]; then
- USEROPT="--chuid"
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --background --start --make-pidfile \
- --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
- ${USEROPT} ${MONGODB_USER:-mongodb} \
- --exec ${MONGODB_EXEC:-/usr/bin/mongod} \
- -- \
- --port ${MONGODB_PORT:-27017} \
- --dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
- --unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
- --logappend --logpath /var/log/mongodb/${SVCNAME}.log \
- ${MONGODB_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
- eend $?
-}
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 384484c..d8ed9c9 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -21,9 +21,6 @@
</longdescription>
<use>
<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
- <flag name="sharedclient">build client shared library libmongoclient.so</flag>
- <flag name="spidermonkey">Use embedded SpiderMonkey engine
- (<pkg>dev-lang/spidermonkey</pkg>) instead of v8</flag>
<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...)
from <pkg>app-admin/mongo-tools</pkg></flag>
</use>
diff --git a/dev-db/mongodb/mongodb-2.4.13.ebuild b/dev-db/mongodb/mongodb-2.4.13.ebuild
deleted file mode 100644
index 271b973..0000000
--- a/dev-db/mongodb/mongodb-2.4.13.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
- mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
- >=dev-libs/boost-1.50[threads(+)]
- dev-libs/libpcre[cxx]
- dev-util/google-perftools[-minimal]
- net-libs/libpcap
- app-arch/snappy
- ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
- sys-libs/readline
- sys-libs/ncurses
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- scons_opts=" --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
- scons_opts+=" --use-system-tcmalloc"
- scons_opts+=" --use-system-pcre"
- scons_opts+=" --use-system-snappy"
- scons_opts+=" --use-system-boost"
-
- if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
- fi
-
- if use kerberos; then
- scons_opts+=" --use-sasl-client"
- fi
-
- if use sharedclient; then
- scons_opts+=" --sharedclient"
- fi
-
- if use spidermonkey; then
- scons_opts+=" --usesm"
- else
- scons_opts+=" --usev8"
- fi
-
- if use ssl; then
- scons_opts+=" --ssl"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
- epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
- epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
- epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
-
- # bug #462606
- sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
- # bug #482576
- sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
- escons ${scons_opts} all
-}
-
-src_install() {
- escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
- use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
- if ! use spidermonkey; then
- pax-mark m "${ED}"/usr/bin/{mongo,mongod}
- fi
-
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners mongodb:mongodb "${x}"
- done
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
- newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
- systemd_dounit "${FILESDIR}"/${PN}.service
- insinto /etc
- doins "${FILESDIR}"/${PN}.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- if use mms-agent; then
- local MY_PN="mms-agent"
- local MY_D="/opt/${MY_PN}"
- insinto ${MY_D}
- doins "${WORKDIR}/${MY_PN}/"*
- fowners -R mongodb:mongodb ${MY_D}
- newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
- fi
-}
-
-pkg_preinst() {
- # wrt bug #461466
- if [[ "$(get_libdir)" == "lib64" ]]; then
- rmdir "${ED}"/usr/lib/ &>/dev/null
- fi
-}
-
-src_test() {
- escons ${scons_opts} test
- "${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
- ewarn "You just upgraded from a previous version of mongodb !"
- ewarn "Make sure you run 'mongod --upgrade' before using this version."
- fi
- elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
- if use mms-agent; then
- elog "You have to configure MMS Agent yourself :"
- elog "Edit the settings.py file in the /opt/mms-agent/ folder."
- fi
-}
diff --git a/dev-db/mongodb/mongodb-2.4.14.ebuild b/dev-db/mongodb/mongodb-2.4.14.ebuild
deleted file mode 100644
index feb3aa8..0000000
--- a/dev-db/mongodb/mongodb-2.4.14.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
- mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
- >=dev-libs/boost-1.50[threads(+)]
- dev-libs/libpcre[cxx]
- dev-util/google-perftools[-minimal]
- net-libs/libpcap
- app-arch/snappy
- ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
- sys-libs/readline
- sys-libs/ncurses
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- scons_opts=" --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
- scons_opts+=" --use-system-tcmalloc"
- scons_opts+=" --use-system-pcre"
- scons_opts+=" --use-system-snappy"
- scons_opts+=" --use-system-boost"
-
- if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
- fi
-
- if use kerberos; then
- scons_opts+=" --use-sasl-client"
- fi
-
- if use sharedclient; then
- scons_opts+=" --sharedclient"
- fi
-
- if use spidermonkey; then
- scons_opts+=" --usesm"
- else
- scons_opts+=" --usev8"
- fi
-
- if use ssl; then
- scons_opts+=" --ssl"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
- epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
- epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
- epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
-
- # bug #462606
- sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
- # bug #482576
- sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
- escons ${scons_opts} all
-}
-
-src_install() {
- escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
- use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
- if ! use spidermonkey; then
- pax-mark m "${ED}"/usr/bin/{mongo,mongod}
- fi
-
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners mongodb:mongodb "${x}"
- done
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
- newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
- systemd_dounit "${FILESDIR}"/${PN}.service
- insinto /etc
- doins "${FILESDIR}"/${PN}.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- if use mms-agent; then
- local MY_PN="mms-agent"
- local MY_D="/opt/${MY_PN}"
- insinto ${MY_D}
- doins "${WORKDIR}/${MY_PN}/"*
- fowners -R mongodb:mongodb ${MY_D}
- newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
- fi
-}
-
-pkg_preinst() {
- # wrt bug #461466
- if [[ "$(get_libdir)" == "lib64" ]]; then
- rmdir "${ED}"/usr/lib/ &>/dev/null
- fi
-}
-
-src_test() {
- escons ${scons_opts} test
- "${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
- ewarn "You just upgraded from a previous version of mongodb !"
- ewarn "Make sure you run 'mongod --upgrade' before using this version."
- fi
- elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
- if use mms-agent; then
- elog "You have to configure MMS Agent yourself :"
- elog "Edit the settings.py file in the /opt/mms-agent/ folder."
- fi
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2016-01-01 10:36 Michał Górny
0 siblings, 0 replies; 27+ messages in thread
From: Michał Górny @ 2016-01-01 10:36 UTC (permalink / raw
To: gentoo-commits
commit: ea24e4c1ad373d820f4c1022eda7b6bffc2679a7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 10:35:49 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 10:35:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea24e4c1
dev-db/mongodb: [QA] Revert "drop 2.4 series"
Revert the removal of last ebuilds satisfying
dev-db/mongodb[sharedclient] as required by sci-chemistry/mongochem.
dev-db/mongodb/Manifest | 2 +
.../mongodb/files/mongodb-2.2-r1-fix-boost.patch | 13 ++
dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch | 33 +++++
.../mongodb/files/mongodb-2.4.11-fix-scons.patch | 23 ++++
dev-db/mongodb/files/mongodb.confd | 14 ++
dev-db/mongodb/files/mongodb.initd-r1 | 40 ++++++
dev-db/mongodb/metadata.xml | 3 +
dev-db/mongodb/mongodb-2.4.13.ebuild | 150 +++++++++++++++++++++
dev-db/mongodb/mongodb-2.4.14.ebuild | 150 +++++++++++++++++++++
9 files changed, 428 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 52cf81d..ebaaf21 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,6 @@
DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
+DIST mongodb-src-r2.4.13.tar.gz 14183056 SHA256 9ad8a3b58457c35b6dd020ca2364ee605e30b839f5475449a229fdcd4115866c SHA512 26256410593f2072e8a8728fbb2665bb98d4c73f3601136e8306d1d6b421421827f66e4073515fea7dfbc0a27f5615cd30f8a85e5980ea3dd46f2f06366946cb WHIRLPOOL 6e64a8ba466da74342f7eabd41b8eb86a3d1cd99c5665e54872642230ec0ed86216c0e533b08d21e0c6b6c20b7d7887a34aad0679ba32523dd3ca0e464190348
+DIST mongodb-src-r2.4.14.tar.gz 15120808 SHA256 f5ed949cf7c9669267e6f426f3dc30bf6c0e2d68ba7df9e29f16799e8212e7ce SHA512 6811f27a57a2df07f59215f544948708cd5846237c24df6eb14bf09384db4136d964587d82008ff2b0a4dea94d6869fc1dcf2ccd07e5f285da5012a0a091a74f WHIRLPOOL c89b2f4f1a77523f895b3fa21ec82813a4859391c82e3934952b25ab8602c30ac13b9e6b2a00082bbe7bace32edacdb3270e46ac0f3a8c0ab10ea48b5911e019
DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ffe30e2b57a1a5f2a40f0018bad3b8d12f SHA512 43b8c5e1ffde2c7f4bead392a95fdb34169419b8296acf04a17894379647c09bbec91be88037ab447da399f03a2c7c54c9d7613df0baa6e9e48e1267327ca937 WHIRLPOOL 083c897f83992c64a89e595058b7695671ca7e9339be2a54d14cf8a200d5063f4a33c320c02e45f5d3bd6367b5acf67a80677c92abba9a92a647d7310a2e6316
DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
new file mode 100644
index 0000000..b6c9a1e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
@@ -0,0 +1,13 @@
+--- mongodb-src-r2.2.0/SConstruct.old 2012-10-09 12:41:25.000000000 -0400
++++ mongodb-src-r2.2.0/SConstruct 2012-10-09 12:41:41.000000000 -0400
+@@ -171,8 +171,8 @@
+ add_option( "extrapathdyn", "comma separated list of add'l paths (--extrapath /opt/foo/,/foo) dynamic linking" , 1 , True )
+ add_option( "extralib", "comma separated list of libraries (--extralib js_static,readline" , 1 , True )
+
+-add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
+-add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
++add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , False , "boostCompiler" )
++add_option( "boost-version", "boost version for linking(1_38)" , 1 , False , "boostVersion" )
+
+ add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
+
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
new file mode 100644
index 0000000..553967e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
@@ -0,0 +1,33 @@
+--- a/src/mongo/client/sasl_client_session.cpp 2014-10-15 00:40:29.000000000 +0400
++++ b/src/mongo/client/sasl_client_session.cpp 2015-02-07 18:56:02.287762467 +0300
+@@ -29,17 +29,26 @@
+ * doesn't initialize the library for us.
+ */
+
+- void* saslOurMalloc(unsigned long sz) {
++// Version 2.1.26 is the first version to use size_t in the allocator signatures
++#if (SASL_VERSION_FULL >= ((2 << 16) | (1 << 8) | 26))
++ typedef size_t SaslAllocSize;
++#else
++ typedef unsigned long SaslAllocSize;
++#endif
++
++ typedef int(*SaslCallbackFn)();
++
++ void* saslOurMalloc(SaslAllocSize sz) {
+ return ourmalloc(sz);
+ }
+
+- void* saslOurCalloc(unsigned long count, unsigned long size) {
++ void* saslOurCalloc(SaslAllocSize count, SaslAllocSize size) {
+ void* ptr = calloc(count, size);
+- if (!ptr) printStackAndExit(0);
++ if (!ptr) abort();
+ return ptr;
+ }
+
+- void* saslOurRealloc(void* ptr, unsigned long sz) {
++ void* saslOurRealloc(void* ptr, SaslAllocSize sz) {
+ return ourrealloc(ptr, sz);
+ }
+
diff --git a/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
new file mode 100644
index 0000000..5050fe7
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
@@ -0,0 +1,23 @@
+--- b/SConstruct 2014-09-01 19:12:24.289585592 +0200
++++ a/SConstruct 2014-09-01 19:14:12.550312261 +0200
+@@ -704,7 +704,6 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fPIC",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -719,9 +718,10 @@
+ env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
+
+ env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
new file mode 100644
index 0000000..4f76c5a
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -0,0 +1,14 @@
+# Mongodb essentials
+MONGODB_EXEC="/usr/bin/mongod"
+MONGODB_RUN="/var/run/mongodb"
+MONGODB_DATA="/var/lib/mongodb"
+MONGODB_USER="mongodb"
+
+# Listen to specified IP, comment this to listen to all
+MONGODB_IP="127.0.0.1"
+
+# Listen to specified port
+MONGODB_PORT="27017"
+
+# Set extra options here, such as disabling the admin web server
+MONGODB_OPTIONS="--journal"
diff --git a/dev-db/mongodb/files/mongodb.initd-r1 b/dev-db/mongodb/files/mongodb.initd-r1
new file mode 100644
index 0000000..f52cca2
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd-r1
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use net
+}
+
+start() {
+ checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
+
+ # Listen to MONGODB_IP if configured
+ [ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
+
+ # Baselayout-1 user should use --chuid instead of --user
+ local USEROPT="--user"
+ if [ ! -f /etc/init.d/sysfs ]; then
+ USEROPT="--chuid"
+ fi
+
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --background --start --make-pidfile \
+ --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+ ${USEROPT} ${MONGODB_USER:-mongodb} \
+ --exec ${MONGODB_EXEC:-/usr/bin/mongod} \
+ -- \
+ --port ${MONGODB_PORT:-27017} \
+ --dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
+ --unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
+ --logappend --logpath /var/log/mongodb/${SVCNAME}.log \
+ ${MONGODB_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
+ eend $?
+}
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index d8ed9c9..384484c 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -21,6 +21,9 @@
</longdescription>
<use>
<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
+ <flag name="sharedclient">build client shared library libmongoclient.so</flag>
+ <flag name="spidermonkey">Use embedded SpiderMonkey engine
+ (<pkg>dev-lang/spidermonkey</pkg>) instead of v8</flag>
<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...)
from <pkg>app-admin/mongo-tools</pkg></flag>
</use>
diff --git a/dev-db/mongodb/mongodb-2.4.13.ebuild b/dev-db/mongodb/mongodb-2.4.13.ebuild
new file mode 100644
index 0000000..271b973
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.4.13.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
+ mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+ >=dev-libs/boost-1.50[threads(+)]
+ dev-libs/libpcre[cxx]
+ dev-util/google-perftools[-minimal]
+ net-libs/libpcap
+ app-arch/snappy
+ ssl? ( >=dev-libs/openssl-1.0.1c )"
+DEPEND="${RDEPEND}
+ sys-libs/readline
+ sys-libs/ncurses
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ scons_opts=" --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+ scons_opts+=" --use-system-tcmalloc"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-boost"
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use sharedclient; then
+ scons_opts+=" --sharedclient"
+ fi
+
+ if use spidermonkey; then
+ scons_opts+=" --usesm"
+ else
+ scons_opts+=" --usev8"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
+ epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+ epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
+ epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
+
+ # bug #462606
+ sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+ # bug #482576
+ sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
+}
+
+src_compile() {
+ escons ${scons_opts} all
+}
+
+src_install() {
+ escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+ use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+ if ! use spidermonkey; then
+ pax-mark m "${ED}"/usr/bin/{mongo,mongod}
+ fi
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ insinto /etc
+ doins "${FILESDIR}"/${PN}.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ if use mms-agent; then
+ local MY_PN="mms-agent"
+ local MY_D="/opt/${MY_PN}"
+ insinto ${MY_D}
+ doins "${WORKDIR}/${MY_PN}/"*
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ escons ${scons_opts} test
+ "${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
+ ewarn "You just upgraded from a previous version of mongodb !"
+ ewarn "Make sure you run 'mongod --upgrade' before using this version."
+ fi
+ elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
+ if use mms-agent; then
+ elog "You have to configure MMS Agent yourself :"
+ elog "Edit the settings.py file in the /opt/mms-agent/ folder."
+ fi
+}
diff --git a/dev-db/mongodb/mongodb-2.4.14.ebuild b/dev-db/mongodb/mongodb-2.4.14.ebuild
new file mode 100644
index 0000000..feb3aa8
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.4.14.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
+ mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+ >=dev-libs/boost-1.50[threads(+)]
+ dev-libs/libpcre[cxx]
+ dev-util/google-perftools[-minimal]
+ net-libs/libpcap
+ app-arch/snappy
+ ssl? ( >=dev-libs/openssl-1.0.1c )"
+DEPEND="${RDEPEND}
+ sys-libs/readline
+ sys-libs/ncurses
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ scons_opts=" --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+ scons_opts+=" --use-system-tcmalloc"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-boost"
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use sharedclient; then
+ scons_opts+=" --sharedclient"
+ fi
+
+ if use spidermonkey; then
+ scons_opts+=" --usesm"
+ else
+ scons_opts+=" --usev8"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
+ epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+ epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
+ epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
+
+ # bug #462606
+ sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+ # bug #482576
+ sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
+}
+
+src_compile() {
+ escons ${scons_opts} all
+}
+
+src_install() {
+ escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+ use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+ if ! use spidermonkey; then
+ pax-mark m "${ED}"/usr/bin/{mongo,mongod}
+ fi
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ insinto /etc
+ doins "${FILESDIR}"/${PN}.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ if use mms-agent; then
+ local MY_PN="mms-agent"
+ local MY_D="/opt/${MY_PN}"
+ insinto ${MY_D}
+ doins "${WORKDIR}/${MY_PN}/"*
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ escons ${scons_opts} test
+ "${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
+ ewarn "You just upgraded from a previous version of mongodb !"
+ ewarn "Make sure you run 'mongod --upgrade' before using this version."
+ fi
+ elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
+ if use mms-agent; then
+ elog "You have to configure MMS Agent yourself :"
+ elog "Edit the settings.py file in the /opt/mms-agent/ folder."
+ fi
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/
@ 2015-12-27 16:59 Alexys Jacob
0 siblings, 0 replies; 27+ messages in thread
From: Alexys Jacob @ 2015-12-27 16:59 UTC (permalink / raw
To: gentoo-commits
commit: bc8b63573cd8ed98205502464d7340438ed4cf4c
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 16:59:13 2015 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 16:59:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8b6357
dev-db/mongodb: version bump fix #568322 thx to Tomáš Mózes and Bob Cochran
Package-Manager: portage-2.2.25
dev-db/mongodb/Manifest | 1 +
dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 30 ++++
dev-db/mongodb/mongodb-3.2.0.ebuild | 174 +++++++++++++++++++++
3 files changed, 205 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d1d69ed..ebaaf21 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -7,3 +7,4 @@ DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba
DIST mongodb-src-r3.0.6.tar.gz 26241944 SHA256 609f6bd416ed11898b49406332b8ff301de239ba72df0bdbf1603233229c822d SHA512 1990e9011ae586e30aef28be58f9fc6d8b7f45b787dbde9785c82eff6fb0a70ea45152e450c032a898e6464bbb9b1683082f2a072ba874f7532e167330658175 WHIRLPOOL 4090cfb5912f81e6329d3c3680009037f22cd406611f78dc0ddd6fc9a63ee5261c7751fe83c60add2d5917f57b2a3c2796c48abb6f633157a8811d0571793a35
DIST mongodb-src-r3.0.7.tar.gz 26261343 SHA256 2d25bae7c3bfb3c0e168fcad526dc212da72faaeae6d1573db631cacb172a7e7 SHA512 183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b WHIRLPOOL 986d962e76122142ca810eb7fe13ef66c88c7e354f066292836fc1207fa64c8bbb7fc49d1392db503c8a594d2593e2a19d831d7367462fcfa43eea38768e6323
DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
+DIST mongodb-src-r3.2.0.tar.gz 26440220 SHA256 c6dd1d1670b86cbf02a531ddf7a7cda8f138d8733acce33766f174bd1e5ab2ee SHA512 4b321b582f5ec2613b869b003a02494c8a9e3b772b1f13898417b1e831c204468309a0e1785acd3b85c8a663cae91e55e44f53f8b74bd3a516b1e1471f606882 WHIRLPOOL c10639597303c122376d7387a4d5c9bdf6c44d9971f476fab72c85e78206ed256270d1a5e01e53aef4979127fdd03b3e5fbefa50ebf7639fa172723d6eee9737
diff --git a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
new file mode 100644
index 0000000..1eb79d1
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
@@ -0,0 +1,30 @@
+--- a/SConstruct 2015-12-02 20:01:34.000000000 +0100
++++ b/SConstruct 2015-12-27 17:06:45.563739544 +0100
+@@ -1371,7 +1371,6 @@
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+ "-fPIC",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1382,8 +1381,9 @@
+ if not has_option("disable-warnings-as-errors"):
+ env.Append( CCFLAGS=["-Werror"] )
+
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+ # startup.
+@@ -1398,7 +1398,7 @@
+ env.Append( SHLINKFLAGS=["-Wl,-z,now"] )
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/mongodb-3.2.0.ebuild b/dev-db/mongodb/mongodb-3.2.0.ebuild
new file mode 100644
index 0000000..ab7952d
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.2.0.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.2
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.57[threads(+)]
+ >=dev-libs/libpcre-8.37[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.8
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8.2:*
+ sys-libs/ncurses
+ sys-libs/readline
+ debug? ( dev-util/valgrind )
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ test? (
+ dev-python/pymongo
+ dev-python/pyyaml
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be"
+ ewarn "running a 3.0-series release. Please update to the latest 3.0"
+ ewarn "release before continuing if wish to keep your data."
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ # Maintainer notes
+ #
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+ scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+ scons_opts+=" --disable-warnings-as-errors"
+ scons_opts+=" --use-system-boost"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-stemmer"
+ scons_opts+=" --use-system-yaml"
+ scons_opts+=" --use-system-zlib"
+
+ if use debug; then
+ scons_opts+=" --dbg=on"
+ fi
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.2.0-fix-scons.patch"
+}
+
+src_compile() {
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+ escons ${scons_opts} core tools
+}
+
+src_install() {
+ escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ # this one test fails
+ rm jstests/core/repl_write_threads_start_param.js
+
+ ./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+ ewarn " "
+ ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+ ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+ ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+ fi
+
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.org/manual/release-notes/3.2/"
+ ewarn " https://docs.mongodb.org/master/release-notes/3.2-upgrade/"
+ ewarn
+ ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine."
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread
end of thread, other threads:[~2025-05-06 19:32 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-14 21:50 [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-05-06 19:32 Sam James
2025-05-06 19:20 Sam James
2024-12-12 4:57 Sam James
2024-07-15 4:22 Sam James
2024-05-30 6:46 Alexys Jacob
2024-05-28 1:45 Sam James
2023-05-23 13:32 Sam James
2023-05-16 7:53 Alexys Jacob
2022-12-30 20:22 Sam James
2022-06-18 17:17 Sam James
2022-05-14 21:27 Sam James
2021-08-19 16:38 Alexys Jacob
2019-09-21 21:22 David Seifert
2019-08-21 7:21 Alexys Jacob
2019-08-09 7:28 Alexys Jacob
2018-11-05 12:33 Alexys Jacob
2018-06-28 12:45 Alexys Jacob
2018-01-11 11:34 Alexys Jacob
2017-09-22 9:28 Patrice Clement
2017-09-21 19:50 Patrice Clement
2017-09-05 8:17 David Seifert
2017-07-26 22:17 Zac Medico
2017-01-11 7:43 Alexys Jacob
2016-01-03 12:27 Alexys Jacob
2016-01-01 10:36 Michał Górny
2015-12-27 16:59 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox