Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-db/tokumx/, dev-db/tokumx/files/
Date: Thu, 01 Oct 2020 15:13:20
Message-Id: 1601565176.3ee1284a71e28e0b627d999531c4d801f02c8b69.mgorny@gentoo
1 commit: 3ee1284a71e28e0b627d999531c4d801f02c8b69
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 15:10:44 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 15:12:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee1284a
7
8 dev-db/tokumx: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735278
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-db/tokumx/Manifest | 2 -
14 dev-db/tokumx/files/1.5.0-Werror.diff | 45 ---------
15 dev-db/tokumx/files/1.5.0-boost-57.diff | 11 ---
16 dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch | 22 -----
17 dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch | 102 ---------------------
18 ...okumx-2.0.2-no-delete-null-pointer-checks.patch | 23 -----
19 dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch | 88 ------------------
20 .../files/tokumx-2.0.2-undefined-reference.patch | 15 ---
21 .../tokumx/files/tokumx-disable-bundled-libs.patch | 11 ---
22 dev-db/tokumx/metadata.xml | 11 ---
23 dev-db/tokumx/tokumx-1.5.0-r2.ebuild | 77 ----------------
24 dev-db/tokumx/tokumx-2.0.2-r2.ebuild | 80 ----------------
25 profiles/package.mask | 1 -
26 13 files changed, 488 deletions(-)
27
28 diff --git a/dev-db/tokumx/Manifest b/dev-db/tokumx/Manifest
29 deleted file mode 100644
30 index 01a67acd1ba..00000000000
31 --- a/dev-db/tokumx/Manifest
32 +++ /dev/null
33 @@ -1,2 +0,0 @@
34 -DIST tokumx-enterprise-2.0.2.tar.gz 16756175 BLAKE2B 8caaf9f12db713192ab1eaa31284fd390c1a54ffb9e6c12601b9a8c88a101f51868ba548ae8bcb1cd39ea875b6a937c8b5e4b45792f7da88e454d6a02955fe07 SHA512 8d063abcbe16ce50b5b7f99ae6deec348cf60bb8bb57a3b06e478c03af7ded7501ca6ca15ac63ef07bf3fa0da59a30571b9a799fa5c5a9dcbac741c0a674b1f6
35 -DIST tokumx-git-tag-1.5.0.tar.bz2 13059584 BLAKE2B f662d72c8eb65551c074f11e36dac0fa68f5a0b86fe9654e49160c42511576146e9194c3d3cd607c8fba4272992c35f4268ad3db7032ae9dfb7c9417f954e8c8 SHA512 ba19237db7d3dcbd3ac07b8cc4860549830fa065fa4d26cbae685274524cd5b89f671d5f126ec25bee605c99929ce0436bb2ac32d67efdbb8dd6d7526d3f1c24
36
37 diff --git a/dev-db/tokumx/files/1.5.0-Werror.diff b/dev-db/tokumx/files/1.5.0-Werror.diff
38 deleted file mode 100644
39 index a865fe074f3..00000000000
40 --- a/dev-db/tokumx/files/1.5.0-Werror.diff
41 +++ /dev/null
42 @@ -1,45 +0,0 @@
43 -diff -uNr work.ORIG/mongo/CMakeLists.txt work/mongo/CMakeLists.txt
44 ---- work.ORIG/mongo/CMakeLists.txt 2014-08-01 11:51:20.832614062 +0100
45 -+++ work/mongo/CMakeLists.txt 2014-08-01 11:51:36.898614862 +0100
46 -@@ -71,14 +71,13 @@
47 - endforeach(flag)
48 - endmacro(set_cxxflags_if_supported)
49 -
50 --set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
51 -+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
52 - set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
53 - set_cxxflags_if_supported(
54 - -Wall
55 - -Wsign-compare
56 - -Wno-unknown-pragmas
57 - -Winvalid-pch
58 -- -Werror
59 - -pipe
60 - -Wnon-virtual-dtor
61 - -Woverloaded-virtual
62 -diff -uNr work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
63 ---- work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:20.696614056 +0100
64 -+++ work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:36.898614862 +0100
65 -@@ -174,8 +174,8 @@
66 - endif ()
67 -
68 - ## always want these
69 --set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
70 --set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
71 -+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
72 -+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
73 -
74 - ## need to set -stdlib=libc++ to get real c++11 support on darwin
75 - if (APPLE)
76 -diff -uNr work.ORIG/mongo/src/third_party/ft-index/examples/Makefile work/mongo/src/third_party/ft-index/examples/Makefile
77 ---- work.ORIG/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:20.676614055 +0100
78 -+++ work/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:36.898614862 +0100
79 -@@ -1,7 +1,7 @@
80 - SRCS = $(wildcard *.c)
81 - TARGETS = $(patsubst %.c,%,$(SRCS)) $(patsubst %.c,%-bdb,$(SRCS))
82 - CPPFLAGS = -I../include -D_GNU_SOURCE
83 --CFLAGS = -g -std=c99 -Wall -Wextra -Werror -Wno-missing-field-initializers
84 -+CFLAGS = -g -std=c99 -Wall -Wextra -Wno-missing-field-initializers
85 - ifeq ($(USE_STATIC_LIBS),1)
86 - LIBTOKUDB = tokufractaltree_static
87 - LIBTOKUPORTABILITY = tokuportability_static
88
89 diff --git a/dev-db/tokumx/files/1.5.0-boost-57.diff b/dev-db/tokumx/files/1.5.0-boost-57.diff
90 deleted file mode 100644
91 index e66aec16871..00000000000
92 --- a/dev-db/tokumx/files/1.5.0-boost-57.diff
93 +++ /dev/null
94 @@ -1,11 +0,0 @@
95 -diff -uNr work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h work/mongo/src/mongo/shell/linenoise_utf8.h
96 ---- work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:20:51.880842717 +0100
97 -+++ work/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:21:26.002844416 +0100
98 -@@ -16,6 +16,7 @@
99 - */
100 -
101 - #include <boost/smart_ptr/scoped_array.hpp>
102 -+#include <algorithm>
103 - #include <string.h>
104 -
105 - namespace linenoise_utf8 {
106
107 diff --git a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch b/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
108 deleted file mode 100644
109 index 52b3b9f1206..00000000000
110 --- a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
111 +++ /dev/null
112 @@ -1,22 +0,0 @@
113 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp
114 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp 2016-11-21 11:52:54.883542356 +0000
115 -+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp 2016-11-21 11:53:11.995543208 +0000
116 -@@ -117,6 +117,7 @@
117 - #include "mk_wcwidth.h"
118 - #include <string>
119 - #include <vector>
120 -+#include <algorithm>
121 - #include <boost/smart_ptr/scoped_array.hpp>
122 -
123 - using std::string;
124 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h
125 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:52:54.883542356 +0000
126 -+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:53:31.610544185 +0000
127 -@@ -15,6 +15,7 @@
128 - * limitations under the License.
129 - */
130 -
131 -+#include <algorithm>
132 - #include <boost/smart_ptr/scoped_array.hpp>
133 - #include <string.h>
134 -
135
136 diff --git a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch b/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
137 deleted file mode 100644
138 index 1203d1fc809..00000000000
139 --- a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
140 +++ /dev/null
141 @@ -1,102 +0,0 @@
142 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp
143 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp 2018-07-03 15:57:40.709360944 +0100
144 -+++ tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp 2018-07-03 15:57:48.127361253 +0100
145 -@@ -74,7 +74,7 @@
146 - }
147 -
148 - bool Client::loadInProgress() const {
149 -- return _loadInfo;
150 -+ return bool(_loadInfo);
151 - }
152 -
153 - } // namespace mongo
154 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h
155 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h 2018-07-03 15:57:40.709360944 +0100
156 -+++ tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h 2018-07-03 15:57:48.127361253 +0100
157 -@@ -66,7 +66,7 @@
158 - // which must succeed, by the first invariant.
159 - Collection *getCollection(const StringData &ns);
160 -
161 -- bool allocated() const { return _metadb; }
162 -+ bool allocated() const { return bool(_metadb); }
163 -
164 - void getNamespaces( list<string>& tofill );
165 -
166 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp
167 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp 2018-07-03 15:57:40.703360944 +0100
168 -+++ tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp 2018-07-03 15:58:08.348362094 +0100
169 -@@ -635,7 +635,7 @@
170 - shared_ptr<ExplainRecordingStrategy> ret
171 - ( new SimpleCursorExplainStrategy( ancillaryInfo, _cursor ) );
172 - ret->notePlan( queryPlan.valid() && queryPlan.scanAndOrderRequired,
173 -- queryPlan.keyFieldsOnly );
174 -+ bool(queryPlan.keyFieldsOnly) );
175 - return ret;
176 - }
177 -
178 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp
179 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:40.707360944 +0100
180 -+++ tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:48.128361253 +0100
181 -@@ -106,7 +106,7 @@
182 - bool DocumentSourceSort::coalesce(const intrusive_ptr<DocumentSource> &pNextSource) {
183 - if (!limitSrc) {
184 - limitSrc = dynamic_cast<DocumentSourceLimit*>(pNextSource.get());
185 -- return limitSrc; // false if next is not a $limit
186 -+ return bool(limitSrc); // false if next is not a $limit
187 - }
188 - else {
189 - return limitSrc->coalesce(pNextSource);
190 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp
191 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:40.702360944 +0100
192 -+++ tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:48.128361253 +0100
193 -@@ -370,7 +370,7 @@
194 -
195 - // The query plan must have a matcher. The matcher's constructor performs some aspects
196 - // of query validation that should occur before a cursor is returned.
197 -- fassert( 16449, singlePlan->matcher() );
198 -+ fassert( 16449, bool(singlePlan->matcher()) );
199 -
200 - if ( needMatcher ) {
201 - single->setMatcher( singlePlan->matcher() );
202 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp
203 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:40.707360944 +0100
204 -+++ tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:48.129361253 +0100
205 -@@ -234,7 +234,7 @@
206 - // The query plan must have a matcher. The matcher's constructor performs some aspects
207 - // of query validation that should occur as part of this class's init() if not handled
208 - // already.
209 -- fassert( 16249, queryPlan().matcher() );
210 -+ fassert( 16249, bool(queryPlan().matcher()) );
211 -
212 - // TODO This violates the current Cursor interface abstraction, but for now it's simpler to keep our own set of
213 - // dups rather than avoid poisoning the cursor's dup set with unreturned documents. Deduping documents
214 -@@ -257,7 +257,7 @@
215 - _explainPlanInfo.reset( new ExplainPlanInfo() );
216 - _explainPlanInfo->notePlan( *_c,
217 - queryPlan().scanAndOrderRequired(),
218 -- queryPlan().keyFieldsOnly() );
219 -+ bool(queryPlan().keyFieldsOnly()) );
220 - return _explainPlanInfo;
221 - }
222 -
223 -@@ -1226,7 +1226,7 @@
224 - _explainPlanInfo.reset( new ExplainPlanInfo() );
225 - _explainPlanInfo->notePlan( *_c,
226 - _queryPlan->scanAndOrderRequired(),
227 -- _queryPlan->keyFieldsOnly() );
228 -+ bool(_queryPlan->keyFieldsOnly()) );
229 - shared_ptr<ExplainClauseInfo> clauseInfo( new ExplainClauseInfo() );
230 - clauseInfo->addPlanInfo( _explainPlanInfo );
231 - _mps->addClauseInfo( clauseInfo );
232 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h
233 ---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:40.705360944 +0100
234 -+++ tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:48.129361253 +0100
235 -@@ -35,7 +35,7 @@
236 - * The 'fieldRangeMulti' attribute is required, and its presence indicates the object has
237 - * been configured with a query plan.
238 - */
239 -- bool valid() const { return fieldRangeSetMulti; }
240 -+ bool valid() const { return bool(fieldRangeSetMulti); }
241 -
242 - // A description of the valid values for the fields of a query, in the context of a multikey
243 - // index or in memory sort.
244
245 diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
246 deleted file mode 100644
247 index 551770553d7..00000000000
248 --- a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
249 +++ /dev/null
250 @@ -1,23 +0,0 @@
251 -diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
252 ---- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2018-07-17 16:20:18.712013701 +0100
253 -+++ tokumx-enterprise-2.0.2/CMakeLists.txt 2018-07-17 16:22:06.063018495 +0100
254 -@@ -83,7 +83,7 @@
255 - endmacro(set_cxxflags_if_supported)
256 -
257 - set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
258 --set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
259 -+set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -fno-delete-null-pointer-checks -ggdb")
260 - set_cxxflags_if_supported(
261 - -Wall
262 - -Wsign-compare
263 -diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
264 ---- tokumx-enterprise-2.0.2.ORIG/SConstruct 2018-07-17 16:20:18.712013701 +0100
265 -+++ tokumx-enterprise-2.0.2/SConstruct 2018-07-17 16:22:40.459020031 +0100
266 -@@ -702,6 +702,7 @@
267 - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
268 - env.Append( CCFLAGS=["-fPIC",
269 - "-fno-strict-aliasing",
270 -+ "-fno-delete-null-pointer-checks",
271 - "-ggdb",
272 - "-pthread",
273 - "-Wall",
274
275 diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
276 deleted file mode 100644
277 index 5a0c160e886..00000000000
278 --- a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
279 +++ /dev/null
280 @@ -1,88 +0,0 @@
281 -diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
282 ---- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2016-11-21 11:15:27.517430430 +0000
283 -+++ tokumx-enterprise-2.0.2/CMakeLists.txt 2016-11-21 11:16:27.874433436 +0000
284 -@@ -82,14 +82,13 @@
285 - endforeach(flag)
286 - endmacro(set_cxxflags_if_supported)
287 -
288 --set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
289 -+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
290 - set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
291 - set_cxxflags_if_supported(
292 - -Wall
293 - -Wsign-compare
294 - -Wno-unknown-pragmas
295 - -Winvalid-pch
296 -- -Werror
297 - -pipe
298 - -Wnon-virtual-dtor
299 - -Woverloaded-virtual
300 -diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
301 ---- tokumx-enterprise-2.0.2.ORIG/SConstruct 2016-11-21 11:15:27.517430430 +0000
302 -+++ tokumx-enterprise-2.0.2/SConstruct 2016-11-21 11:16:27.875433436 +0000
303 -@@ -710,7 +710,7 @@
304 - "-Winvalid-pch"] )
305 - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
306 - if linux:
307 -- env.Append( CCFLAGS=["-Werror", "-pipe"] )
308 -+ env.Append( CCFLAGS=["-pipe"] )
309 - if not has_option('clang'):
310 - env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
311 -
312 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt
313 ---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt 2016-11-21 11:15:27.392430424 +0000
314 -+++ tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt 2016-11-21 11:17:22.576436161 +0000
315 -@@ -10,7 +10,7 @@
316 - _FILE_OFFSET_BITS=64
317 - _LARGEFILE64_SOURCE)
318 -
319 --set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
320 -+set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
321 -
322 - set(USE_VALGRIND ON CACHE BOOL "whether to use valgrind headers")
323 - if (USE_VALGRIND)
324 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile
325 ---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile 2016-11-21 11:15:27.393430424 +0000
326 -+++ tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile 2016-11-21 11:17:38.840436971 +0000
327 -@@ -1,4 +1,4 @@
328 - backup.pb.o: backup.pb.h
329 --CXXFLAGS = -W -Wall -Werror -O1
330 -+CXXFLAGS = -W -Wall -O1
331 - backup.pb.cc backup.bp.h: backup.proto
332 - protoc -I=. --cpp_out=. backup.proto
333 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
334 ---- tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:15:27.422430426 +0000
335 -+++ tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:16:54.312434753 +0000
336 -@@ -181,8 +181,8 @@
337 - endif ()
338 -
339 - ## always want these
340 --set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
341 --set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
342 -+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
343 -+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
344 -
345 - ## need to set -stdlib=libc++ to get real c++11 support on darwin
346 - if (APPLE)
347 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt
348 ---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt 2016-11-21 11:15:27.452430427 +0000
349 -+++ tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt 2016-11-21 11:16:27.876433437 +0000
350 -@@ -126,7 +126,6 @@
351 -
352 - set(V8_CXX_FLAGS
353 - -Wall
354 -- -Werror
355 - -W
356 - -Wno-unused-parameter
357 - -Woverloaded-virtual
358 -diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript tokumx-enterprise-2.0.2/src/third_party/v8/SConscript
359 ---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript 2016-11-21 11:15:27.452430427 +0000
360 -+++ tokumx-enterprise-2.0.2/src/third_party/v8/SConscript 2016-11-21 11:16:27.876433437 +0000
361 -@@ -47,7 +47,6 @@
362 - 'gcc': {
363 - 'all': {
364 - 'CCFLAGS': ['-Wall',
365 -- '-Werror',
366 - '-W',
367 - '-Wno-unused-parameter',
368 - '-Woverloaded-virtual',
369
370 diff --git a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch b/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
371 deleted file mode 100644
372 index d56f7745d1e..00000000000
373 --- a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
374 +++ /dev/null
375 @@ -1,15 +0,0 @@
376 -diff -uNr a/src/third_party/backup/CMakeLists.txt b/src/third_party/backup/CMakeLists.txt
377 ---- a/src/third_party/backup/CMakeLists.txt 2018-07-06 20:36:58.242767167 +0200
378 -+++ b/src/third_party/backup/CMakeLists.txt 2018-07-06 20:37:31.575390786 +0200
379 -@@ -1,11 +1,6 @@
380 - cmake_minimum_required(VERSION 2.8.8)
381 - project(HotBackup)
382 -
383 --# No implicit templates, since that's how mysql compiles.
384 --if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
385 -- set(CMAKE_CXX_FLAGS "-fno-implicit-templates ${CMAKE_CXX_FLAGS}")
386 --endif ()
387 --
388 - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
389 - _FILE_OFFSET_BITS=64
390 - _LARGEFILE64_SOURCE)
391
392 diff --git a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
393 deleted file mode 100644
394 index 66d8db3980f..00000000000
395 --- a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
396 +++ /dev/null
397 @@ -1,11 +0,0 @@
398 -diff -auwrN a/src/third_party/ft-index/CMakeLists.txt b/src/third_party/ft-index/CMakeLists.txt
399 ---- a/src/third_party/ft-index/CMakeLists.txt 2014-08-01 04:37:33.000000000 -0400
400 -+++ b/src/third_party/ft-index/CMakeLists.txt 2014-08-01 10:38:28.134869689 -0400
401 -@@ -35,7 +35,6 @@
402 - include(TokuFeatureDetection)
403 - include(TokuSetupCompiler)
404 - include(TokuSetupCTest)
405 --include(TokuThirdParty)
406 -
407 - set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
408 - include(TokuMergeLibs)
409
410 diff --git a/dev-db/tokumx/metadata.xml b/dev-db/tokumx/metadata.xml
411 deleted file mode 100644
412 index aecb193ea79..00000000000
413 --- a/dev-db/tokumx/metadata.xml
414 +++ /dev/null
415 @@ -1,11 +0,0 @@
416 -<?xml version="1.0" encoding="UTF-8"?>
417 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
418 -<pkgmetadata>
419 - <maintainer type="person">
420 - <email>chainsaw@g.o</email>
421 - <name>Tony Vroon</name>
422 - </maintainer>
423 - <use>
424 - <flag name="pax_kernel">Apply patch needed for hardened kernels</flag>
425 - </use>
426 -</pkgmetadata>
427
428 diff --git a/dev-db/tokumx/tokumx-1.5.0-r2.ebuild b/dev-db/tokumx/tokumx-1.5.0-r2.ebuild
429 deleted file mode 100644
430 index ef1062ab869..00000000000
431 --- a/dev-db/tokumx/tokumx-1.5.0-r2.ebuild
432 +++ /dev/null
433 @@ -1,77 +0,0 @@
434 -# Copyright 1999-2017 Gentoo Foundation
435 -# Distributed under the terms of the GNU General Public License v2
436 -
437 -EAPI=6
438 -CMAKE_BUILD_TYPE=Release
439 -PYTHON_COMPAT=( python2_7 )
440 -
441 -inherit python-r1 pax-utils cmake-utils
442 -
443 -MY_P=${PN}-git-tag-${PV}
444 -
445 -DESCRIPTION="An open source, high-performance distribution of MongoDB"
446 -HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
447 -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
448 -
449 -LICENSE="AGPL-3 Apache-2.0"
450 -SLOT="0"
451 -KEYWORDS="~amd64"
452 -IUSE="pax_kernel"
453 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
454 -
455 -RDEPEND="!dev-db/mongodb
456 - ${PYTHON_DEPS}
457 - dev-libs/jemalloc
458 - >=dev-libs/boost-1.50[threads(+)]
459 - >=dev-libs/libpcre-8.30[cxx]
460 - net-libs/libpcap"
461 -DEPEND="${RDEPEND}
462 - sys-libs/ncurses
463 - sys-libs/readline
464 - pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
465 -
466 -S="${WORKDIR}/mongo"
467 -BUILD_DIR="${WORKDIR}/mongo/build"
468 -QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
469 -
470 -src_prepare() {
471 - cd "${WORKDIR}"
472 - epatch "${FILESDIR}/${PV}-Werror.diff"
473 - epatch "${FILESDIR}/${PV}-boost-57.diff"
474 - epatch "${FILESDIR}/${PN}-disable-bundled-libs.patch"
475 - cd "${S}"
476 - cmake-utils_src_prepare
477 -}
478 -
479 -src_configure() {
480 - local mycmakeargs=(
481 - -D TOKU_DEBUG_PARANOID=OFF
482 - -D USE_VALGRIND=OFF
483 - -D USE_BDB=OFF
484 - -D BUILD_TESTING=OFF
485 - -D TOKUMX_DISTNAME=${PV}
486 - -D LIBJEMALLOC="jemalloc"
487 - -D TOKUMX_STRIP_BINARIES=0
488 - -D USE_SYSTEM_PCRE=1
489 - -D USE_SYSTEM_BOOST=1
490 - )
491 - cmake-utils_src_configure
492 -}
493 -
494 -src_install() {
495 - cmake-utils_src_install
496 - pax-mark -m "${D}"/usr/bin/mongo
497 -
498 - # Remove unnecessary files
499 - rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
500 -
501 - # Correctly install this python script
502 - python_foreach_impl python_doscript scripts/tokumxstat.py
503 -
504 - # Clean up documentation installed to /usr
505 - pushd "${D}usr/" || die
506 - rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
507 - popd || die
508 - dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
509 - newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
510 -}
511
512 diff --git a/dev-db/tokumx/tokumx-2.0.2-r2.ebuild b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
513 deleted file mode 100644
514 index b1fbf2a7fdf..00000000000
515 --- a/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
516 +++ /dev/null
517 @@ -1,80 +0,0 @@
518 -# Copyright 1999-2018 Gentoo Foundation
519 -# Distributed under the terms of the GNU General Public License v2
520 -
521 -EAPI=6
522 -CMAKE_BUILD_TYPE=Release
523 -PYTHON_COMPAT=( python2_7 )
524 -
525 -inherit python-r1 cmake-utils pax-utils check-reqs
526 -
527 -MY_P=${PN}-enterprise-${PV}
528 -
529 -DESCRIPTION="An open source, high-performance distribution of MongoDB"
530 -HOMEPAGE="https://www.percona.com/software/mongo-database/percona-tokumx"
531 -SRC_URI="https://www.percona.com/downloads/percona-tokumx/${MY_P}/source/tarball/${MY_P}.tar.gz"
532 -
533 -LICENSE="AGPL-3 Apache-2.0"
534 -SLOT="0"
535 -KEYWORDS="~amd64"
536 -IUSE="pax_kernel"
537 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
538 -
539 -RDEPEND="!app-admin/mongo-tools
540 - !dev-db/mongodb
541 - !dev-libs/mongo-cxx-driver
542 - ${PYTHON_DEPS}
543 - dev-libs/jemalloc
544 - >=dev-libs/boost-1.50[threads(+)]
545 - >=dev-libs/libpcre-8.30[cxx]
546 - net-libs/libpcap"
547 -DEPEND="${RDEPEND}
548 - dev-util/valgrind
549 - sys-libs/ncurses
550 - sys-libs/readline
551 - pax_kernel? ( sys-apps/paxctl sys-apps/elfix )
552 -"
553 -
554 -S="${WORKDIR}/${MY_P}"
555 -QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
556 -CHECKREQS_DISK_BUILD="13G"
557 -
558 -src_prepare() {
559 - eapply "${FILESDIR}/${P}-no-werror.patch"
560 - eapply "${FILESDIR}/${P}-boost-57.patch"
561 - eapply "${FILESDIR}/${P}-gcc-7.patch"
562 - eapply "${FILESDIR}/${P}-undefined-reference.patch"
563 - eapply "${FILESDIR}/${P}-no-delete-null-pointer-checks.patch"
564 - cmake-utils_src_prepare
565 -}
566 -
567 -src_configure() {
568 - local mycmakeargs=(
569 - -DTOKU_DEBUG_PARANOID=OFF
570 - -DUSE_VALGRIND=OFF
571 - -DBUILD_TESTING=OFF
572 - -DTOKUMX_DISTNAME=${PV}
573 - -DLIBJEMALLOC="jemalloc"
574 - -DTOKUMX_STRIP_BINARIES=0
575 - -DUSE_SYSTEM_PCRE=1
576 - -DUSE_SYSTEM_BOOST=1
577 - )
578 - cmake-utils_src_configure
579 -}
580 -
581 -src_install() {
582 - cmake-utils_src_install
583 - pax-mark -m "${D}"/usr/bin/mongo
584 -
585 - # Remove unnecessary files
586 - rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
587 -
588 - # Correctly install this python script
589 - python_foreach_impl python_doscript scripts/tokumxstat.py
590 -
591 - # Clean up documentation installed to /usr
592 - pushd "${D}usr/" || die
593 - rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
594 - popd || die
595 - dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
596 - newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
597 -}
598
599 diff --git a/profiles/package.mask b/profiles/package.mask
600 index 3c6b1e6f0de..39c56161339 100644
601 --- a/profiles/package.mask
602 +++ b/profiles/package.mask
603 @@ -601,7 +601,6 @@ dev-go/siphash
604 # Please do not remove the mask unless you port the package to py3.7+.
605 # Removal in 30 days. Package bugs found blocking tracker bug #694800.
606 dev-cpp/icnc
607 -dev-db/tokumx
608
609 # Piotr Karbowski <slashbeast@g.o> (2020-08-28)
610 # Temporary mask due to multiple reports of segfaults at startup, bug #739056