diff options
author | Ultrabug <ultrabug@gentoo.org> | 2018-11-05 13:28:51 +0100 |
---|---|---|
committer | Ultrabug <ultrabug@gentoo.org> | 2018-11-05 13:28:51 +0100 |
commit | 2e37e0428f4f0d6939245dfcf020952efa26797c (patch) | |
tree | 697bcb08f20fe7e409189b1c81dc94c00495a3c1 /dev-db/mongodb | |
parent | xfce-extra/xfce4-screensaver: Drop old (diff) | |
download | gentoo-2e37e0428f4f0d6939245dfcf020952efa26797c.tar.gz gentoo-2e37e0428f4f0d6939245dfcf020952efa26797c.tar.bz2 gentoo-2e37e0428f4f0d6939245dfcf020952efa26797c.zip |
dev-db/mongodb: obsolete ebuilds and files clean up
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r-- | dev-db/mongodb/Manifest | 2 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch | 36 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch | 83 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 49 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch | 283 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch | 84 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb.confd-r2 | 12 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb.initd-r2 | 26 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.confd-r2 | 12 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.initd-r2 | 26 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-3.2.17.ebuild | 197 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-4.0.2.ebuild | 163 |
12 files changed, 0 insertions, 973 deletions
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index b7d6a5f9d122..9c140f291e96 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 1db5d7695c72..000000000000 --- 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 9de319bda9dd..000000000000 --- 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 8b29bd4a2a4f..000000000000 --- 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 6067850ad0b2..000000000000 --- 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 41c9bd2ba85c..000000000000 --- 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 dddb67e9301d..000000000000 --- 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 27b9f2a43872..000000000000 --- 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 0dc2a189ff67..000000000000 --- 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 2e7db669a5e0..000000000000 --- 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 bda8f3b4e588..000000000000 --- 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 98aa398f9f47..000000000000 --- 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" -} |