1 |
commit: 2e37e0428f4f0d6939245dfcf020952efa26797c |
2 |
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 5 12:28:51 2018 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 5 12:28:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e37e042 |
7 |
|
8 |
dev-db/mongodb: obsolete ebuilds and files clean up |
9 |
|
10 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
12 |
|
13 |
dev-db/mongodb/Manifest | 2 - |
14 |
.../mongodb/files/mongodb-3.0.14-fix-scons.patch | 36 --- |
15 |
.../files/mongodb-3.0.14-fix-std-string.patch | 83 ------ |
16 |
dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 49 ---- |
17 |
...6-Replace-string-with-explicit-std-string.patch | 283 --------------------- |
18 |
.../mongodb/files/mongodb-3.2.4-boost-1.60.patch | 84 ------ |
19 |
dev-db/mongodb/files/mongodb.confd-r2 | 12 - |
20 |
dev-db/mongodb/files/mongodb.initd-r2 | 26 -- |
21 |
dev-db/mongodb/files/mongos.confd-r2 | 12 - |
22 |
dev-db/mongodb/files/mongos.initd-r2 | 26 -- |
23 |
dev-db/mongodb/mongodb-3.2.17.ebuild | 197 -------------- |
24 |
dev-db/mongodb/mongodb-4.0.2.ebuild | 163 ------------ |
25 |
12 files changed, 973 deletions(-) |
26 |
|
27 |
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest |
28 |
index b7d6a5f9d12..9c140f291e9 100644 |
29 |
--- a/dev-db/mongodb/Manifest |
30 |
+++ b/dev-db/mongodb/Manifest |
31 |
@@ -1,6 +1,4 @@ |
32 |
-DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512 |
33 |
DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a |
34 |
DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db |
35 |
DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999 |
36 |
-DIST mongodb-src-r4.0.2.tar.gz 49328232 BLAKE2B 0e56392de5b8cd59c49c38469ed427c52dbd91cd64b3c97da6809c0f849198f836896b8ef24a06e7ff84a65a7986b76df2ca4ffeafe76d8afe0e031ad25ecf5a SHA512 171422ee028ebc279bb2cf20c78a3ce89a6cc15abf0955ac20a6c67f1aae577bf99ca4363fc428dba6ae0250b97f95d2fc51ca7f4a4505e8c38c9a11ca249800 |
37 |
DIST mongodb-src-r4.0.3.tar.gz 49435646 BLAKE2B 1663823d48ec6d93b30b4d68a09bab164291530fd4966fcdd07ffbaceaf25d9fc5c7480d0d794fdd374fa3a2d11f19d87556cf0c47198a13f9d8fb5ccf7f0343 SHA512 c77a01d8d16322514f42030c46a0aa9cedb90f186375222eeb31648060265006b5e929bdde6ca8e7ecd71018f7c19f5bade463d98db0f053d586ffc8adc99550 |
38 |
|
39 |
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 |
40 |
deleted file mode 100644 |
41 |
index 1db5d7695c7..00000000000 |
42 |
--- a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch |
43 |
+++ /dev/null |
44 |
@@ -1,36 +0,0 @@ |
45 |
-diff --git a/SConstruct b/SConstruct |
46 |
---- a/SConstruct |
47 |
-+++ b/SConstruct |
48 |
-@@ -1008,7 +1008,6 @@ |
49 |
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. |
50 |
- env.Append( CCFLAGS=["-fPIC", |
51 |
- "-fno-strict-aliasing", |
52 |
-- "-ggdb", |
53 |
- "-pthread", |
54 |
- "-Wall", |
55 |
- "-Wsign-compare", |
56 |
-@@ -1016,13 +1015,13 @@ |
57 |
- "-Winvalid-pch"] ) |
58 |
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet |
59 |
- if linux or darwin: |
60 |
-- env.Append( CCFLAGS=["-pipe"] ) |
61 |
- if not has_option("disable-warnings-as-errors"): |
62 |
- env.Append( CCFLAGS=["-Werror"] ) |
63 |
- |
64 |
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) |
65 |
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) |
66 |
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] ) |
67 |
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) |
68 |
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) |
69 |
- |
70 |
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program |
71 |
- # startup. |
72 |
-@@ -1039,7 +1038,7 @@ |
73 |
- if not darwin: |
74 |
- env.Append( LINKFLAGS=["-rdynamic"] ) |
75 |
- |
76 |
-- env.Append( LIBS=[] ) |
77 |
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) |
78 |
- |
79 |
- #make scons colorgcc friendly |
80 |
- for key in ('HOME', 'TERM'): |
81 |
|
82 |
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 |
83 |
deleted file mode 100644 |
84 |
index 9de319bda9d..00000000000 |
85 |
--- a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch |
86 |
+++ /dev/null |
87 |
@@ -1,83 +0,0 @@ |
88 |
---- a/src/mongo/shell/bench.cpp 2017-09-20 19:12:20.893056990 +0200 |
89 |
-+++ b/src/mongo/shell/bench.cpp 2017-09-20 19:14:08.165060566 +0200 |
90 |
-@@ -52,6 +52,9 @@ |
91 |
- #include "mongo/util/time_support.h" |
92 |
- #include "mongo/util/version.h" |
93 |
- |
94 |
-+#include <string> |
95 |
-+using namespace std; |
96 |
-+ |
97 |
- // --------------------------------- |
98 |
- // ---- benchmarking system -------- |
99 |
- // --------------------------------- |
100 |
---- a/src/mongo/db/dbwebserver.cpp 2017-09-20 19:24:50.042081961 +0200 |
101 |
-+++ b/src/mongo/db/dbwebserver.cpp 2017-09-20 19:26:20.240084968 +0200 |
102 |
-@@ -58,6 +58,8 @@ |
103 |
- #include "mongo/util/ramlog.h" |
104 |
- #include "mongo/util/version.h" |
105 |
- |
106 |
-+#include <string> |
107 |
-+using namespace std; |
108 |
- |
109 |
- namespace mongo { |
110 |
- |
111 |
---- a/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:27:59.009088260 +0200 |
112 |
-+++ b/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:28:31.082089329 +0200 |
113 |
-@@ -39,6 +39,9 @@ |
114 |
- #include "mongo/db/jsobj.h" |
115 |
- #include "mongo/db/matcher/path.h" |
116 |
- |
117 |
-+#include <string> |
118 |
-+using namespace std; |
119 |
-+ |
120 |
- namespace mongo { |
121 |
- |
122 |
- Status LeafMatchExpression::initPath(const StringData& path) { |
123 |
---- a/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:30:04.569092445 +0200 |
124 |
-+++ b/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:31:19.145094931 +0200 |
125 |
-@@ -70,6 +70,9 @@ |
126 |
- #include "mongo/util/exit.h" |
127 |
- #include "mongo/util/log.h" |
128 |
- |
129 |
-+#include <string> |
130 |
-+using namespace std; |
131 |
-+ |
132 |
- using boost::scoped_ptr; |
133 |
- using std::auto_ptr; |
134 |
- using std::cout; |
135 |
---- a/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:32:55.368098138 +0200 |
136 |
-+++ b/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:33:57.128100197 +0200 |
137 |
-@@ -39,6 +39,9 @@ |
138 |
- #include "mongo/util/hex.h" |
139 |
- #include "mongo/util/log.h" |
140 |
- |
141 |
-+#include <string> |
142 |
-+using namespace std; |
143 |
-+ |
144 |
- namespace mongo { |
145 |
- |
146 |
- using boost::shared_ptr; |
147 |
---- a/src/mongo/s/config.cpp 2017-09-20 19:42:45.614117812 +0200 |
148 |
-+++ b/src/mongo/s/config.cpp 2017-09-20 19:43:28.278119234 +0200 |
149 |
-@@ -60,6 +60,9 @@ |
150 |
- #include "mongo/util/net/message.h" |
151 |
- #include "mongo/util/stringutils.h" |
152 |
- |
153 |
-+#include <string> |
154 |
-+using namespace std; |
155 |
-+ |
156 |
- namespace mongo { |
157 |
- |
158 |
- using boost::scoped_ptr; |
159 |
---- a/src/mongo/s/grid.cpp 2017-09-20 19:51:07.684134547 +0200 |
160 |
-+++ b/src/mongo/s/grid.cpp 2017-09-20 19:51:43.436135739 +0200 |
161 |
-@@ -55,6 +55,9 @@ |
162 |
- #include "mongo/util/startup_test.h" |
163 |
- #include "mongo/util/stringutils.h" |
164 |
- |
165 |
-+#include <string> |
166 |
-+using namespace std; |
167 |
-+ |
168 |
- namespace mongo { |
169 |
- |
170 |
- using std::endl; |
171 |
|
172 |
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 |
173 |
deleted file mode 100644 |
174 |
index 8b29bd4a2a4..00000000000 |
175 |
--- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch |
176 |
+++ /dev/null |
177 |
@@ -1,49 +0,0 @@ |
178 |
-From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001 |
179 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
180 |
-Date: Fri, 1 Jan 2016 10:27:35 +0100 |
181 |
-Subject: [PATCH] Fix build for Gentoo |
182 |
- |
183 |
---- |
184 |
- SConstruct | 10 +++++----- |
185 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
186 |
- |
187 |
-diff --git a/SConstruct b/SConstruct |
188 |
-index 64c8387..fa9ab8b 100644 |
189 |
---- a/SConstruct |
190 |
-+++ b/SConstruct |
191 |
-@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'): |
192 |
- env.Append( CCFLAGS=["-fno-omit-frame-pointer", |
193 |
- "-fPIC", |
194 |
- "-fno-strict-aliasing", |
195 |
-- "-ggdb", |
196 |
- "-pthread", |
197 |
- "-Wall", |
198 |
- "-Wsign-compare", |
199 |
-@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'): |
200 |
- if not has_option("disable-warnings-as-errors"): |
201 |
- env.Append( CCFLAGS=["-Werror"] ) |
202 |
- |
203 |
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) |
204 |
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] ) |
205 |
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) |
206 |
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) |
207 |
- |
208 |
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program |
209 |
- # startup. |
210 |
-@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'): |
211 |
- env.Append( SHLINKFLAGS=["-Wl,-z,now"] ) |
212 |
- env.Append( LINKFLAGS=["-rdynamic"] ) |
213 |
- |
214 |
-- env.Append( LIBS=[] ) |
215 |
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) |
216 |
- |
217 |
-- #make scons colorgcc friendly |
218 |
-- for key in ('HOME', 'TERM'): |
219 |
-+ #make scons colorgcc, distcc, ccache friendly |
220 |
-+ for key in ('HOME', 'PATH', 'TERM'): |
221 |
- try: |
222 |
- env['ENV'][key] = os.environ[key] |
223 |
- except KeyError: |
224 |
--- |
225 |
-2.6.4 |
226 |
- |
227 |
|
228 |
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 |
229 |
deleted file mode 100644 |
230 |
index 6067850ad0b..00000000000 |
231 |
--- a/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch |
232 |
+++ /dev/null |
233 |
@@ -1,283 +0,0 @@ |
234 |
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp |
235 |
---- mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp 2017-07-14 22:36:01.000000000 +0200 |
236 |
-+++ mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp 2017-08-01 15:43:55.860712772 +0200 |
237 |
-@@ -69,6 +69,7 @@ |
238 |
- using std::map; |
239 |
- using std::stringstream; |
240 |
- using std::vector; |
241 |
-+using std::string; |
242 |
- |
243 |
- using namespace html; |
244 |
- |
245 |
-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 |
246 |
---- mongodb-src-r3.2.16_orig/src/mongo/db/matcher/expression_leaf.cpp 2017-07-14 22:36:01.000000000 +0200 |
247 |
-+++ mongodb-src-r3.2.16/src/mongo/db/matcher/expression_leaf.cpp 2017-08-01 15:46:17.070708001 +0200 |
248 |
-@@ -200,7 +200,7 @@ |
249 |
- } |
250 |
- |
251 |
- void ComparisonMatchExpression::toBSON(BSONObjBuilder* out) const { |
252 |
-- string opString = ""; |
253 |
-+ std::string opString = ""; |
254 |
- switch (matchType()) { |
255 |
- case LT: |
256 |
- opString = "$lt"; |
257 |
-@@ -880,7 +880,7 @@ |
258 |
- } |
259 |
- |
260 |
- void BitTestMatchExpression::toBSON(BSONObjBuilder* out) const { |
261 |
-- string opString = ""; |
262 |
-+ std::string opString = ""; |
263 |
- |
264 |
- switch (matchType()) { |
265 |
- case BITS_ALL_SET: |
266 |
-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 |
267 |
---- mongodb-src-r3.2.16_orig/src/mongo/db/repl/master_slave.cpp 2017-07-14 22:36:01.000000000 +0200 |
268 |
-+++ mongodb-src-r3.2.16/src/mongo/db/repl/master_slave.cpp 2017-08-01 15:54:45.140690837 +0200 |
269 |
-@@ -161,7 +161,7 @@ |
270 |
- |
271 |
- BSONObjBuilder dbsNextPassBuilder; |
272 |
- int n = 0; |
273 |
-- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { |
274 |
-+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { |
275 |
- n++; |
276 |
- dbsNextPassBuilder.appendBool(*i, 1); |
277 |
- } |
278 |
-@@ -170,7 +170,7 @@ |
279 |
- |
280 |
- BSONObjBuilder incompleteCloneDbsBuilder; |
281 |
- n = 0; |
282 |
-- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { |
283 |
-+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { |
284 |
- n++; |
285 |
- incompleteCloneDbsBuilder.appendBool(*i, 1); |
286 |
- } |
287 |
-@@ -181,7 +181,7 @@ |
288 |
- } |
289 |
- |
290 |
- void ReplSource::ensureMe(OperationContext* txn) { |
291 |
-- string myname = getHostName(); |
292 |
-+ std::string myname = getHostName(); |
293 |
- |
294 |
- // local.me is an identifier for a server for getLastError w:2+ |
295 |
- bool exists = Helpers::getSingleton(txn, "local.me", _me); |
296 |
-@@ -373,10 +373,10 @@ |
297 |
- } |
298 |
- |
299 |
- virtual bool run(OperationContext* txn, |
300 |
-- const string& ns, |
301 |
-+ const std::string& ns, |
302 |
- BSONObj& cmdObj, |
303 |
- int options, |
304 |
-- string& errmsg, |
305 |
-+ std::string& errmsg, |
306 |
- BSONObjBuilder& result) { |
307 |
- HandshakeArgs handshake; |
308 |
- Status status = handshake.initialize(cmdObj); |
309 |
-@@ -393,7 +393,7 @@ |
310 |
- } handshakeCmd; |
311 |
- |
312 |
- bool replHandshake(DBClientConnection* conn, const OID& myRID) { |
313 |
-- string myname = getHostName(); |
314 |
-+ std::string myname = getHostName(); |
315 |
- |
316 |
- BSONObjBuilder cmd; |
317 |
- cmd.append("handshake", myRID); |
318 |
-@@ -445,7 +445,7 @@ |
319 |
- BSONElement e = i.next(); |
320 |
- if (e.eoo()) |
321 |
- break; |
322 |
-- string name = e.embeddedObject().getField("name").valuestr(); |
323 |
-+ std::string name = e.embeddedObject().getField("name").valuestr(); |
324 |
- if (!e.embeddedObject().getBoolField("empty")) { |
325 |
- if (name != "local") { |
326 |
- if (only.empty() || only == name) { |
327 |
-@@ -459,7 +459,7 @@ |
328 |
- save(txn); |
329 |
- } |
330 |
- |
331 |
--void ReplSource::resyncDrop(OperationContext* txn, const string& db) { |
332 |
-+void ReplSource::resyncDrop(OperationContext* txn, const std::string& db) { |
333 |
- log() << "resync: dropping database " << db; |
334 |
- OldClientContext ctx(txn, db); |
335 |
- dropDatabase(txn, ctx.db()); |
336 |
-@@ -502,13 +502,13 @@ |
337 |
- |
338 |
- static DatabaseIgnorer ___databaseIgnorer; |
339 |
- |
340 |
--void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) { |
341 |
-+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) { |
342 |
- if (futureOplogTime > _ignores[db]) { |
343 |
- _ignores[db] = futureOplogTime; |
344 |
- } |
345 |
- } |
346 |
- |
347 |
--bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) { |
348 |
-+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) { |
349 |
- if (_ignores[db].isNull()) { |
350 |
- return false; |
351 |
- } |
352 |
-@@ -598,7 +598,7 @@ |
353 |
- |
354 |
- // The database is present on the master and no conflicting databases |
355 |
- // are present on the master. Drop any local conflicts. |
356 |
-- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { |
357 |
-+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { |
358 |
- ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime); |
359 |
- incompleteCloneDbs.erase(*i); |
360 |
- addDbNextPass.erase(*i); |
361 |
-@@ -793,10 +793,10 @@ |
362 |
- } |
363 |
- |
364 |
- void ReplSource::syncToTailOfRemoteLog() { |
365 |
-- string _ns = ns(); |
366 |
-+ std::string _ns = ns(); |
367 |
- BSONObjBuilder b; |
368 |
- if (!only.empty()) { |
369 |
-- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); |
370 |
-+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); |
371 |
- } |
372 |
- BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1))); |
373 |
- if (!last.isEmpty()) { |
374 |
-@@ -844,7 +844,7 @@ |
375 |
- */ |
376 |
- int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { |
377 |
- int okResultCode = 1; |
378 |
-- string ns = string("local.oplog.$") + sourceName(); |
379 |
-+ std::string ns = std::string("local.oplog.$") + sourceName(); |
380 |
- LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n'; |
381 |
- |
382 |
- bool tailing = true; |
383 |
-@@ -864,7 +864,7 @@ |
384 |
- BSONElement e = i.next(); |
385 |
- if (e.eoo()) |
386 |
- break; |
387 |
-- string name = e.embeddedObject().getField("name").valuestr(); |
388 |
-+ std::string name = e.embeddedObject().getField("name").valuestr(); |
389 |
- if (!e.embeddedObject().getBoolField("empty")) { |
390 |
- if (name != "local") { |
391 |
- if (only.empty() || only == name) { |
392 |
-@@ -888,7 +888,7 @@ |
393 |
- if (!only.empty()) { |
394 |
- // note we may here skip a LOT of data table scanning, a lot of work for the master. |
395 |
- // maybe append "\\." here? |
396 |
-- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); |
397 |
-+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); |
398 |
- } |
399 |
- BSONObj queryObj = query.done(); |
400 |
- // e.g. queryObj = { ts: { $gte: syncedTo } } |
401 |
-@@ -907,7 +907,7 @@ |
402 |
- |
403 |
- // show any deferred database creates from a previous pass |
404 |
- { |
405 |
-- set<string>::iterator i = addDbNextPass.begin(); |
406 |
-+ set<std::string>::iterator i = addDbNextPass.begin(); |
407 |
- if (i != addDbNextPass.end()) { |
408 |
- BSONObjBuilder b; |
409 |
- b.append("ns", *i + '.'); |
410 |
-@@ -938,7 +938,7 @@ |
411 |
- BSONObj op = oplogReader.next(); |
412 |
- BSONElement ts = op.getField("ts"); |
413 |
- if (ts.type() != Date && ts.type() != bsonTimestamp) { |
414 |
-- string err = op.getStringField("$err"); |
415 |
-+ std::string err = op.getStringField("$err"); |
416 |
- if (!err.empty()) { |
417 |
- // 13051 is "tailable cursor requested on non capped collection" |
418 |
- if (op.getIntField("code") == 13051) { |
419 |
-@@ -1106,7 +1106,7 @@ |
420 |
- |
421 |
- // FIXME Handle cases where this db isn't on default port, or default port is spec'd in |
422 |
- // hostName. |
423 |
-- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) && |
424 |
-+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) && |
425 |
- serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) { |
426 |
- log() << "can't sync from self (localhost). sources configuration may be wrong." << endl; |
427 |
- sleepsecs(5); |
428 |
-@@ -1251,7 +1251,7 @@ |
429 |
- if (s) { |
430 |
- stringstream ss; |
431 |
- ss << "sleep " << s << " sec before next pass"; |
432 |
-- string msg = ss.str(); |
433 |
-+ std::string msg = ss.str(); |
434 |
- if (!serverGlobalParams.quiet) |
435 |
- log() << msg << endl; |
436 |
- ReplInfo r(msg.c_str()); |
437 |
-diff -Nru mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp mongodb-src-r3.2.16/src/mongo/shell/bench.cpp |
438 |
---- mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp 2017-07-14 22:36:01.000000000 +0200 |
439 |
-+++ mongodb-src-r3.2.16/src/mongo/shell/bench.cpp 2017-08-01 16:20:20.864638957 +0200 |
440 |
-@@ -674,7 +674,7 @@ |
441 |
- invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess); |
442 |
- |
443 |
- if (_config->username != "") { |
444 |
-- string errmsg; |
445 |
-+ std::string errmsg; |
446 |
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) { |
447 |
- uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg); |
448 |
- } |
449 |
-@@ -920,7 +920,7 @@ |
450 |
- |
451 |
- if (!result["err"].eoo() && result["err"].type() == String && |
452 |
- (_config->throwGLE || op.throwGLE)) |
453 |
-- throw DBException((string) "From benchRun GLE" + |
454 |
-+ throw DBException((std::string) "From benchRun GLE" + |
455 |
- causedBy(result["err"].String()), |
456 |
- result["code"].eoo() ? 0 : result["code"].Int()); |
457 |
- } |
458 |
-@@ -987,7 +987,7 @@ |
459 |
- |
460 |
- if (!result["err"].eoo() && result["err"].type() == String && |
461 |
- (_config->throwGLE || op.throwGLE)) |
462 |
-- throw DBException((string) "From benchRun GLE" + |
463 |
-+ throw DBException((std::string) "From benchRun GLE" + |
464 |
- causedBy(result["err"].String()), |
465 |
- result["code"].eoo() ? 0 : result["code"].Int()); |
466 |
- } |
467 |
-@@ -1035,7 +1035,7 @@ |
468 |
- |
469 |
- if (!result["err"].eoo() && result["err"].type() == String && |
470 |
- (_config->throwGLE || op.throwGLE)) |
471 |
-- throw DBException((string) "From benchRun GLE " + |
472 |
-+ throw DBException((std::string) "From benchRun GLE " + |
473 |
- causedBy(result["err"].String()), |
474 |
- result["code"].eoo() ? 0 : result["code"].Int()); |
475 |
- } |
476 |
-@@ -1136,7 +1136,7 @@ |
477 |
- try { |
478 |
- std::unique_ptr<DBClientBase> conn(_config->createConnection()); |
479 |
- if (!_config->username.empty()) { |
480 |
-- string errmsg; |
481 |
-+ std::string errmsg; |
482 |
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) { |
483 |
- uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg); |
484 |
- } |
485 |
-@@ -1168,7 +1168,7 @@ |
486 |
- std::unique_ptr<DBClientBase> conn(_config->createConnection()); |
487 |
- // Must authenticate to admin db in order to run serverStatus command |
488 |
- if (_config->username != "") { |
489 |
-- string errmsg; |
490 |
-+ std::string errmsg; |
491 |
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) { |
492 |
- uasserted(16704, |
493 |
- str::stream() |
494 |
-@@ -1204,7 +1204,7 @@ |
495 |
- { |
496 |
- std::unique_ptr<DBClientBase> conn(_config->createConnection()); |
497 |
- if (_config->username != "") { |
498 |
-- string errmsg; |
499 |
-+ std::string errmsg; |
500 |
- // this can only fail if admin access was revoked since start of run |
501 |
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) { |
502 |
- uasserted(16705, |
503 |
-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 |
504 |
---- mongodb-src-r3.2.16_orig/src/mongo/util/net/miniwebserver.cpp 2017-07-14 22:36:01.000000000 +0200 |
505 |
-+++ mongodb-src-r3.2.16/src/mongo/util/net/miniwebserver.cpp 2017-08-01 16:01:01.832678112 +0200 |
506 |
-@@ -45,8 +45,9 @@ |
507 |
- using std::endl; |
508 |
- using std::stringstream; |
509 |
- using std::vector; |
510 |
-+using std::string; |
511 |
- |
512 |
--MiniWebServer::MiniWebServer(const string& name, const string& ip, int port) |
513 |
-+MiniWebServer::MiniWebServer(const std::string& name, const std::string& ip, int port) |
514 |
- : Listener(name, ip, port, false) {} |
515 |
- |
516 |
- string MiniWebServer::parseURL(const char* buf) { |
517 |
|
518 |
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 |
519 |
deleted file mode 100644 |
520 |
index 41c9bd2ba85..00000000000 |
521 |
--- a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch |
522 |
+++ /dev/null |
523 |
@@ -1,84 +0,0 @@ |
524 |
-Fix issues caused by boost::none changes. |
525 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=578846 |
526 |
-Adapted from: https://github.com/mongodb/mongo/commit/92c3f80f384d2825efeabd0d26aa534c0deb6988 |
527 |
- |
528 |
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp |
529 |
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp |
530 |
-@@ -47,7 +47,7 @@ |
531 |
- if (_referenceDoc.isEmpty()) { |
532 |
- FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics); |
533 |
- _reset(sample, date); |
534 |
-- return {boost::none_t()}; |
535 |
-+ return {boost::none}; |
536 |
- } |
537 |
- |
538 |
- _metrics.resize(0); |
539 |
-@@ -107,7 +107,7 @@ |
540 |
- } |
541 |
- |
542 |
- // The buffer is not full, inform the caller |
543 |
-- return {boost::none_t()}; |
544 |
-+ return {boost::none}; |
545 |
- } |
546 |
- |
547 |
- StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() { |
548 |
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp |
549 |
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp |
550 |
-@@ -122,7 +122,7 @@ |
551 |
- TestTie() : _compressor(&_config) {} |
552 |
- |
553 |
- ~TestTie() { |
554 |
-- validate(boost::none_t()); |
555 |
-+ validate(boost::none); |
556 |
- } |
557 |
- |
558 |
- StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>> |
559 |
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp |
560 |
-+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp |
561 |
-@@ -205,7 +205,7 @@ |
562 |
- |
563 |
- Status FTDCFileWriter::close() { |
564 |
- if (_archiveStream.is_open()) { |
565 |
-- Status s = flush(boost::none_t(), Date_t()); |
566 |
-+ Status s = flush(boost::none, Date_t()); |
567 |
- |
568 |
- _archiveStream.close(); |
569 |
- |
570 |
---- mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp |
571 |
-+++ mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp |
572 |
-@@ -175,7 +175,7 @@ |
573 |
- return true; |
574 |
- } |
575 |
- |
576 |
-- unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until)); |
577 |
-+ unsigned long const res=WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until)); |
578 |
- if(res==detail::win32::timeout) |
579 |
- { |
580 |
- for(;;) |
581 |
-@@ -328,7 +328,7 @@ |
582 |
- { |
583 |
- return true; |
584 |
- } |
585 |
-- unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until)); |
586 |
-+ unsigned long const wait_res=WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until)); |
587 |
- if(wait_res==detail::win32::timeout) |
588 |
- { |
589 |
- for(;;) |
590 |
-@@ -421,7 +421,7 @@ |
591 |
- return; |
592 |
- } |
593 |
- |
594 |
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite)); |
595 |
-+ BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite)); |
596 |
- } |
597 |
- } |
598 |
- |
599 |
-@@ -502,7 +502,7 @@ |
600 |
- { |
601 |
- if(!last_reader) |
602 |
- { |
603 |
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite)); |
604 |
-+ BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite)); |
605 |
- } |
606 |
- break; |
607 |
- } |
608 |
|
609 |
diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2 |
610 |
deleted file mode 100644 |
611 |
index dddb67e9301..00000000000 |
612 |
--- a/dev-db/mongodb/files/mongodb.confd-r2 |
613 |
+++ /dev/null |
614 |
@@ -1,12 +0,0 @@ |
615 |
-# !! IMPORTANT !! |
616 |
-# |
617 |
-# This file is ONLY used to override some of the init script configuration. |
618 |
-# |
619 |
-# You should NOT use this file to configure your mongodb instance, |
620 |
-# see the /etc/mongodb.conf file instead. |
621 |
-# |
622 |
-# Available init script modifiers : |
623 |
-# - config_file : the configuration file to use (default : /etc/mongodb.conf) |
624 |
-# - user : the user used to run your mongodb instance (default : mongodb) |
625 |
-# - group : the group used to run your mongodb instance (default : mongodb) |
626 |
-# - run_dir : the run directory for your PID files (default : /run/mongodb) |
627 |
|
628 |
diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2 |
629 |
deleted file mode 100644 |
630 |
index 27b9f2a4387..00000000000 |
631 |
--- a/dev-db/mongodb/files/mongodb.initd-r2 |
632 |
+++ /dev/null |
633 |
@@ -1,26 +0,0 @@ |
634 |
-#!/sbin/openrc-run |
635 |
-# Copyright 1999-2014 Gentoo Foundation |
636 |
-# Distributed under the terms of the GNU General Public License v2 |
637 |
- |
638 |
-config_file=${config_file:-/etc/${SVCNAME}.conf} |
639 |
-run_dir=${run_dir:-/run/mongodb} |
640 |
- |
641 |
-command="/usr/bin/mongod" |
642 |
-command_args="--config ${config_file}" |
643 |
-command_background="true" |
644 |
-pidfile=${run_dir}/${SVCNAME}.pid |
645 |
-user=${user:-mongodb} |
646 |
-group=${group:-mongodb} |
647 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
648 |
- |
649 |
-depend() { |
650 |
- use net |
651 |
-} |
652 |
- |
653 |
-start_pre() { |
654 |
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}" |
655 |
- if [ ! -f ${config_file} ]; then |
656 |
- eerror "Missing configuration file ${config_file}" |
657 |
- return 1 |
658 |
- fi |
659 |
-} |
660 |
|
661 |
diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2 |
662 |
deleted file mode 100644 |
663 |
index 0dc2a189ff6..00000000000 |
664 |
--- a/dev-db/mongodb/files/mongos.confd-r2 |
665 |
+++ /dev/null |
666 |
@@ -1,12 +0,0 @@ |
667 |
-# !! IMPORTANT !! |
668 |
-# |
669 |
-# This file is ONLY used to override some of the init script configuration. |
670 |
-# |
671 |
-# You should NOT use this file to configure your mongos instance, |
672 |
-# see the /etc/mongos.conf file instead. |
673 |
-# |
674 |
-# Available init script modifiers : |
675 |
-# - config_file : the configuration file to use (default : /etc/mongos.conf) |
676 |
-# - user : the user used to run your mongodb instance (default : mongodb) |
677 |
-# - group : the group used to run your mongodb instance (default : mongodb) |
678 |
-# - run_dir : the run directory for your PID files (default : /run/mongodb) |
679 |
|
680 |
diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2 |
681 |
deleted file mode 100644 |
682 |
index 2e7db669a5e..00000000000 |
683 |
--- a/dev-db/mongodb/files/mongos.initd-r2 |
684 |
+++ /dev/null |
685 |
@@ -1,26 +0,0 @@ |
686 |
-#!/sbin/openrc-run |
687 |
-# Copyright 1999-2014 Gentoo Foundation |
688 |
-# Distributed under the terms of the GNU General Public License v2 |
689 |
- |
690 |
-config_file=${config_file:-/etc/${SVCNAME}.conf} |
691 |
-run_dir=${run_dir:-/run/mongodb} |
692 |
- |
693 |
-command="/usr/bin/mongos" |
694 |
-command_args="--config ${config_file}" |
695 |
-command_background="true" |
696 |
-pidfile=${run_dir}/${SVCNAME}.pid |
697 |
-user=${user:-mongodb} |
698 |
-group=${group:-mongodb} |
699 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
700 |
- |
701 |
-depend() { |
702 |
- use net |
703 |
-} |
704 |
- |
705 |
-start_pre() { |
706 |
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}" |
707 |
- if [ ! -f ${config_file} ]; then |
708 |
- eerror "Missing configuration file ${config_file}" |
709 |
- return 1 |
710 |
- fi |
711 |
-} |
712 |
|
713 |
diff --git a/dev-db/mongodb/mongodb-3.2.17.ebuild b/dev-db/mongodb/mongodb-3.2.17.ebuild |
714 |
deleted file mode 100644 |
715 |
index bda8f3b4e58..00000000000 |
716 |
--- a/dev-db/mongodb/mongodb-3.2.17.ebuild |
717 |
+++ /dev/null |
718 |
@@ -1,197 +0,0 @@ |
719 |
-# Copyright 1999-2017 Gentoo Foundation |
720 |
-# Distributed under the terms of the GNU General Public License v2 |
721 |
- |
722 |
-EAPI=6 |
723 |
- |
724 |
-PYTHON_COMPAT=( python2_7 ) |
725 |
- |
726 |
-SCONS_MIN_VERSION="2.3.0" |
727 |
-CHECKREQS_DISK_BUILD="2400M" |
728 |
-CHECKREQS_DISK_USR="512M" |
729 |
-CHECKREQS_MEMORY="1024M" |
730 |
- |
731 |
-inherit eutils flag-o-matic multilib multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user versionator check-reqs |
732 |
- |
733 |
-MY_P=${PN}-src-r${PV/_rc/-rc} |
734 |
- |
735 |
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database" |
736 |
-HOMEPAGE="http://www.mongodb.org" |
737 |
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" |
738 |
- |
739 |
-LICENSE="AGPL-3 Apache-2.0" |
740 |
-SLOT="0" |
741 |
-KEYWORDS="amd64 ~x86" |
742 |
-IUSE="debug kerberos libressl mms-agent ssl test +tools" |
743 |
- |
744 |
-RDEPEND=">=app-arch/snappy-1.1.2 |
745 |
- >=dev-cpp/yaml-cpp-0.5.1 |
746 |
- >=dev-libs/boost-1.57:=[threads(+)] |
747 |
- >=dev-libs/libpcre-8.39[cxx] |
748 |
- dev-libs/snowball-stemmer |
749 |
- net-libs/libpcap |
750 |
- >=sys-libs/zlib-1.2.8:= |
751 |
- mms-agent? ( app-admin/mms-agent ) |
752 |
- ssl? ( |
753 |
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) |
754 |
- libressl? ( dev-libs/libressl:0= ) |
755 |
- )" |
756 |
-DEPEND="${RDEPEND} |
757 |
- =dev-lang/python-2* |
758 |
- <dev-util/scons-3 |
759 |
- >=sys-devel/gcc-4.8.2:* |
760 |
- sys-libs/ncurses |
761 |
- sys-libs/readline |
762 |
- debug? ( dev-util/valgrind ) |
763 |
- kerberos? ( dev-libs/cyrus-sasl[kerberos] ) |
764 |
- test? ( |
765 |
- dev-python/pymongo |
766 |
- dev-python/pyyaml |
767 |
- )" |
768 |
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" |
769 |
- |
770 |
-PATCHES=( |
771 |
- "${FILESDIR}/${PN}-3.2.0-fix-scons.patch" |
772 |
- "${FILESDIR}/${PN}-3.2.4-boost-1.60.patch" |
773 |
- "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch" |
774 |
- "${FILESDIR}/${PN}-3.2.16-Replace-string-with-explicit-std-string.patch" |
775 |
- "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch" |
776 |
-) |
777 |
- |
778 |
-S=${WORKDIR}/${MY_P} |
779 |
- |
780 |
-pkg_pretend() { |
781 |
- if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then |
782 |
- ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be" |
783 |
- ewarn "running a 3.0-series release. Please update to the latest 3.0" |
784 |
- ewarn "release before continuing if wish to keep your data." |
785 |
- fi |
786 |
-} |
787 |
- |
788 |
-pkg_setup() { |
789 |
- enewgroup mongodb |
790 |
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb |
791 |
- |
792 |
- # Maintainer notes |
793 |
- # |
794 |
- # --use-system-tcmalloc is strongly NOT recommended: |
795 |
- # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/ |
796 |
- |
797 |
- scons_opts=( |
798 |
- CC="$(tc-getCC)" |
799 |
- CXX="$(tc-getCXX)" |
800 |
- |
801 |
- --disable-warnings-as-errors |
802 |
- --use-system-boost |
803 |
- --use-system-pcre |
804 |
- --use-system-snappy |
805 |
- --use-system-stemmer |
806 |
- --use-system-yaml |
807 |
- --use-system-zlib |
808 |
- ) |
809 |
- |
810 |
- # wiredtiger not supported on 32bit platforms #572166 |
811 |
- use x86 && scons_opts+=( --wiredtiger=off ) |
812 |
- |
813 |
- if use debug; then |
814 |
- scons_opts+=( --dbg=on ) |
815 |
- fi |
816 |
- |
817 |
- if use prefix; then |
818 |
- scons_opts+=( |
819 |
- --cpppath="${EPREFIX}/usr/include" |
820 |
- --libpath="${EPREFIX}/usr/$(get_libdir)" |
821 |
- ) |
822 |
- fi |
823 |
- |
824 |
- if use kerberos; then |
825 |
- scons_opts+=( --use-sasl-client ) |
826 |
- fi |
827 |
- |
828 |
- if use ssl; then |
829 |
- scons_opts+=( --ssl ) |
830 |
- fi |
831 |
- |
832 |
- python-any-r1_pkg_setup |
833 |
-} |
834 |
- |
835 |
-src_compile() { |
836 |
- # respect mongoDB upstream's basic recommendations |
837 |
- # see bug #536688 and #526114 |
838 |
- if ! use debug; then |
839 |
- filter-flags '-m*' |
840 |
- filter-flags '-O?' |
841 |
- fi |
842 |
- escons "${scons_opts[@]}" core tools |
843 |
-} |
844 |
- |
845 |
-src_install() { |
846 |
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr |
847 |
- |
848 |
- local x |
849 |
- for x in /var/{lib,log}/${PN}; do |
850 |
- keepdir "${x}" |
851 |
- fowners mongodb:mongodb "${x}" |
852 |
- fperms 0750 "${x}" |
853 |
- done |
854 |
- |
855 |
- doman debian/mongo*.1 |
856 |
- dodoc README docs/building.md |
857 |
- |
858 |
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} |
859 |
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} |
860 |
- newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s} |
861 |
- newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s} |
862 |
- |
863 |
- insinto /etc |
864 |
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf |
865 |
- newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf |
866 |
- |
867 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
868 |
- |
869 |
- insinto /etc/logrotate.d/ |
870 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
871 |
- |
872 |
- # see bug #526114 |
873 |
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} |
874 |
-} |
875 |
- |
876 |
-pkg_preinst() { |
877 |
- # wrt bug #461466 |
878 |
- if [[ "$(get_libdir)" == "lib64" ]]; then |
879 |
- rmdir "${ED}"/usr/lib/ &>/dev/null |
880 |
- fi |
881 |
-} |
882 |
- |
883 |
-# FEATURES="test -usersandbox" emerge dev-db/mongodb |
884 |
-src_test() { |
885 |
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed" |
886 |
-} |
887 |
- |
888 |
-pkg_postinst() { |
889 |
- local v |
890 |
- for v in ${REPLACING_VERSIONS}; do |
891 |
- if ! version_is_at_least 3.0 ${v}; then |
892 |
- ewarn "!! IMPORTANT !!" |
893 |
- ewarn " " |
894 |
- ewarn "${PN} configuration files have changed !" |
895 |
- ewarn " " |
896 |
- ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf" |
897 |
- ewarn " http://docs.mongodb.org/manual/reference/configuration-options/" |
898 |
- ewarn " " |
899 |
- ewarn "Make sure you also follow the upgrading process :" |
900 |
- ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/" |
901 |
- ewarn " " |
902 |
- ewarn "MongoDB 3.0 introduces the WiredTiger storage engine." |
903 |
- ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it." |
904 |
- ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf" |
905 |
- ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger" |
906 |
- break |
907 |
- fi |
908 |
- done |
909 |
- |
910 |
- ewarn "Make sure to read the release notes and follow the upgrade process:" |
911 |
- ewarn " https://docs.mongodb.org/manual/release-notes/3.2/" |
912 |
- ewarn " https://docs.mongodb.org/master/release-notes/3.2-upgrade/" |
913 |
- ewarn |
914 |
- ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine." |
915 |
-} |
916 |
|
917 |
diff --git a/dev-db/mongodb/mongodb-4.0.2.ebuild b/dev-db/mongodb/mongodb-4.0.2.ebuild |
918 |
deleted file mode 100644 |
919 |
index 98aa398f9f4..00000000000 |
920 |
--- a/dev-db/mongodb/mongodb-4.0.2.ebuild |
921 |
+++ /dev/null |
922 |
@@ -1,163 +0,0 @@ |
923 |
-# Copyright 1999-2018 Gentoo Authors |
924 |
-# Distributed under the terms of the GNU General Public License v2 |
925 |
- |
926 |
-EAPI=6 |
927 |
- |
928 |
-PYTHON_COMPAT=( python2_7 ) |
929 |
- |
930 |
-SCONS_MIN_VERSION="2.5.0" |
931 |
-CHECKREQS_DISK_BUILD="2400M" |
932 |
-CHECKREQS_DISK_USR="512M" |
933 |
-CHECKREQS_MEMORY="1024M" |
934 |
- |
935 |
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user |
936 |
- |
937 |
-MY_P=${PN}-src-r${PV/_rc/-rc} |
938 |
- |
939 |
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database" |
940 |
-HOMEPAGE="https://www.mongodb.com" |
941 |
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" |
942 |
- |
943 |
-LICENSE="AGPL-3 Apache-2.0" |
944 |
-SLOT="0" |
945 |
-KEYWORDS="~amd64" |
946 |
-IUSE="debug kerberos libressl mms-agent ssl test +tools" |
947 |
- |
948 |
-RDEPEND=">=app-arch/snappy-1.1.3 |
949 |
- >=dev-cpp/yaml-cpp-0.5.3:= |
950 |
- >=dev-libs/boost-1.60:=[threads(+)] |
951 |
- >=dev-libs/libpcre-8.41[cxx] |
952 |
- dev-libs/snowball-stemmer |
953 |
- net-libs/libpcap |
954 |
- >=sys-libs/zlib-1.2.11:= |
955 |
- kerberos? ( dev-libs/cyrus-sasl[kerberos] ) |
956 |
- mms-agent? ( app-admin/mms-agent ) |
957 |
- ssl? ( |
958 |
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) |
959 |
- libressl? ( dev-libs/libressl:0= ) |
960 |
- )" |
961 |
-DEPEND="${RDEPEND} |
962 |
- ${PYTHON_DEPS} |
963 |
- dev-python/cheetah[${PYTHON_USEDEP}] |
964 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
965 |
- virtual/python-typing[${PYTHON_USEDEP}] |
966 |
- sys-libs/ncurses:0= |
967 |
- sys-libs/readline:0= |
968 |
- debug? ( dev-util/valgrind ) |
969 |
- test? ( |
970 |
- dev-python/pymongo[${PYTHON_USEDEP}] |
971 |
- )" |
972 |
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" |
973 |
- |
974 |
-PATCHES=( |
975 |
- "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch" |
976 |
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch" |
977 |
- "${FILESDIR}/${PN}-4.0.0-no-compass.patch" |
978 |
-) |
979 |
- |
980 |
-S=${WORKDIR}/${MY_P} |
981 |
- |
982 |
-pkg_pretend() { |
983 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
984 |
- if ver_test "$REPLACING_VERSIONS" -lt 3.6; then |
985 |
- ewarn "To upgrade from a version earlier than the 3.6-series, you must" |
986 |
- ewarn "successively upgrade major releases until you have upgraded" |
987 |
- ewarn "to 3.6-series. Then upgrade to 4.0 series." |
988 |
- else |
989 |
- ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading." |
990 |
- fi |
991 |
- fi |
992 |
-} |
993 |
- |
994 |
-pkg_setup() { |
995 |
- enewgroup mongodb |
996 |
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb |
997 |
- |
998 |
- python-single-r1_pkg_setup |
999 |
-} |
1000 |
- |
1001 |
-src_prepare() { |
1002 |
- default |
1003 |
- |
1004 |
- # remove bundled libs |
1005 |
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die |
1006 |
- |
1007 |
- # remove compass |
1008 |
- rm -r src/mongo/installer/compass || die |
1009 |
-} |
1010 |
- |
1011 |
-src_configure() { |
1012 |
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source |
1013 |
- # --use-system-icu fails tests |
1014 |
- # --use-system-tcmalloc is strongly NOT recommended: |
1015 |
- scons_opts=( |
1016 |
- CC="$(tc-getCC)" |
1017 |
- CXX="$(tc-getCXX)" |
1018 |
- |
1019 |
- --disable-warnings-as-errors |
1020 |
- --use-system-boost |
1021 |
- --use-system-pcre |
1022 |
- --use-system-snappy |
1023 |
- --use-system-stemmer |
1024 |
- --use-system-yaml |
1025 |
- --use-system-zlib |
1026 |
- ) |
1027 |
- |
1028 |
- use debug && scons_opts+=( --dbg=on ) |
1029 |
- use kerberos && scons_opts+=( --use-sasl-client ) |
1030 |
- use ssl && scons_opts+=( --ssl ) |
1031 |
- |
1032 |
- # respect mongoDB upstream's basic recommendations |
1033 |
- # see bug #536688 and #526114 |
1034 |
- if ! use debug; then |
1035 |
- filter-flags '-m*' |
1036 |
- filter-flags '-O?' |
1037 |
- fi |
1038 |
- |
1039 |
- default |
1040 |
-} |
1041 |
- |
1042 |
-src_compile() { |
1043 |
- escons "${scons_opts[@]}" core tools |
1044 |
-} |
1045 |
- |
1046 |
-# FEATURES="test -usersandbox" emerge dev-db/mongodb |
1047 |
-src_test() { |
1048 |
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed" |
1049 |
-} |
1050 |
- |
1051 |
-src_install() { |
1052 |
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr |
1053 |
- |
1054 |
- doman debian/mongo*.1 |
1055 |
- dodoc README docs/building.md |
1056 |
- |
1057 |
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} |
1058 |
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} |
1059 |
- newinitd "${FILESDIR}/mongos.initd-r3" mongos |
1060 |
- newconfd "${FILESDIR}/mongos.confd-r3" mongos |
1061 |
- |
1062 |
- insinto /etc |
1063 |
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf |
1064 |
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf |
1065 |
- |
1066 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1067 |
- |
1068 |
- insinto /etc/logrotate.d/ |
1069 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
1070 |
- |
1071 |
- # see bug #526114 |
1072 |
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} |
1073 |
- |
1074 |
- local x |
1075 |
- for x in /var/{lib,log}/${PN}; do |
1076 |
- diropts -m0750 -o mongodb -g mongodb |
1077 |
- keepdir "${x}" |
1078 |
- done |
1079 |
-} |
1080 |
- |
1081 |
-pkg_postinst() { |
1082 |
- ewarn "Make sure to read the release notes and follow the upgrade process:" |
1083 |
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" |
1084 |
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" |
1085 |
-} |