1 |
commit: b2c7ba6148506cd4af825034f56162527a1e12ed |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Wed Apr 25 18:15:29 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 15:12:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c7ba61 |
7 |
|
8 |
dev-libs/protobuf: Delete old versions (<3.4.0). |
9 |
|
10 |
dev-libs/protobuf/Manifest | 6 - |
11 |
.../protobuf/files/protobuf-2.3.0-asneeded-2.patch | 28 --- |
12 |
.../protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 14 -- |
13 |
dev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15 -- |
14 |
.../files/protobuf-2.6.1-protoc-cmdline.patch | 256 --------------------- |
15 |
.../protobuf-3.0.0_beta2-disable-local-gmock.patch | 89 ------- |
16 |
.../files/protobuf-3.0.2-disable-local-gmock.patch | 101 -------- |
17 |
.../files/protobuf-3.3.0-disable-local-gmock.patch | 115 --------- |
18 |
dev-libs/protobuf/metadata.xml | 4 - |
19 |
dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 132 ----------- |
20 |
dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 158 ------------- |
21 |
dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild | 107 --------- |
22 |
dev-libs/protobuf/protobuf-3.0.2.ebuild | 111 --------- |
23 |
dev-libs/protobuf/protobuf-3.1.0.ebuild | 110 --------- |
24 |
dev-libs/protobuf/protobuf-3.3.0.ebuild | 108 --------- |
25 |
15 files changed, 1354 deletions(-) |
26 |
|
27 |
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest |
28 |
index d919674fdff..aa6d99043ce 100644 |
29 |
--- a/dev-libs/protobuf/Manifest |
30 |
+++ b/dev-libs/protobuf/Manifest |
31 |
@@ -1,9 +1,3 @@ |
32 |
-DIST protobuf-2.5.0.tar.bz2 1866763 BLAKE2B e4cece402bbeaff4400732ee2401f1a80bb0e70728eb41052da26b969b6fa6672b11ca80e28343d03a9df97c72bb8d8e2f890b9b730bad3c23c829aaf36ff701 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee |
33 |
-DIST protobuf-2.6.1.tar.bz2 2021416 BLAKE2B f58178a6081d58fff1582a907dfb9087f07b72e0701f19649b3adc9e1827a0f2670e25c6d177e60a59b965b3622b1eb11590b4b17083ee148c0da7eb07f02e55 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 |
34 |
-DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b |
35 |
-DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 |
36 |
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a |
37 |
-DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 |
38 |
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 |
39 |
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496 |
40 |
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 |
41 |
|
42 |
diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch |
43 |
deleted file mode 100644 |
44 |
index 418622e547f..00000000000 |
45 |
--- a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch |
46 |
+++ /dev/null |
47 |
@@ -1,28 +0,0 @@ |
48 |
-Fixing as-needed issue |
49 |
- |
50 |
-http://bugs.gentoo.org/show_bug.cgi?id=271509 |
51 |
- |
52 |
---- m4/acx_pthread.m4 |
53 |
-+++ m4/acx_pthread.m4 |
54 |
-@@ -278,7 +278,8 @@ |
55 |
- fi |
56 |
- fi |
57 |
- |
58 |
-- if test x"$done" = xno; then |
59 |
-+ if test x"$done" = xyes; then |
60 |
-+ done="no" |
61 |
- AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) |
62 |
- AC_TRY_LINK([#include <pthread.h>], |
63 |
- [pthread_t th; pthread_join(th, 0); |
64 |
---- gtest/m4/acx_pthread.m4 |
65 |
-+++ gtest/m4/acx_pthread.m4 |
66 |
-@@ -278,7 +278,8 @@ |
67 |
- fi |
68 |
- fi |
69 |
- |
70 |
-- if test x"$done" = xno; then |
71 |
-+ if test x"$done" = xyes; then |
72 |
-+ done="no" |
73 |
- AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) |
74 |
- AC_TRY_LINK([#include <pthread.h>], |
75 |
- [pthread_t th; pthread_join(th, 0); |
76 |
|
77 |
diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch |
78 |
deleted file mode 100644 |
79 |
index 77d62493824..00000000000 |
80 |
--- a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch |
81 |
+++ /dev/null |
82 |
@@ -1,14 +0,0 @@ |
83 |
-Fix build with emacs-24.4. |
84 |
- |
85 |
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 |
86 |
- |
87 |
---- protobuf-2.5.0/editors/protobuf-mode.el |
88 |
-+++ protobuf-2.5.0/editors/protobuf-mode.el |
89 |
-@@ -66,6 +66,7 @@ |
90 |
- (require 'cc-mode) |
91 |
- |
92 |
- (eval-when-compile |
93 |
-+ (require 'cl) |
94 |
- (require 'cc-langs) |
95 |
- (require 'cc-fonts)) |
96 |
- |
97 |
|
98 |
diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch |
99 |
deleted file mode 100644 |
100 |
index 5c8d4783180..00000000000 |
101 |
--- a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch |
102 |
+++ /dev/null |
103 |
@@ -1,15 +0,0 @@ |
104 |
-fix from upstream for building w/x32 |
105 |
- |
106 |
-https://code.google.com/p/protobuf/issues/detail?id=474 |
107 |
- |
108 |
---- src/google/protobuf/stubs/atomicops.h (revision 491) |
109 |
-+++ src/google/protobuf/stubs/atomicops.h (revision 492) |
110 |
-@@ -66,7 +66,7 @@ typedef int32 Atomic32; |
111 |
- #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT |
112 |
- // We need to be able to go between Atomic64 and AtomicWord implicitly. This |
113 |
- // means Atomic64 and AtomicWord should be the same type on 64-bit. |
114 |
--#if defined(GOOGLE_PROTOBUF_OS_NACL) |
115 |
-+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL) |
116 |
- // NaCl's intptr_t is not actually 64-bits on 64-bit! |
117 |
- // http://code.google.com/p/nativeclient/issues/detail?id=1162 |
118 |
- typedef int64 Atomic64; |
119 |
|
120 |
diff --git a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch b/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch |
121 |
deleted file mode 100644 |
122 |
index 894f2ffd095..00000000000 |
123 |
--- a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch |
124 |
+++ /dev/null |
125 |
@@ -1,256 +0,0 @@ |
126 |
-https://github.com/google/protobuf/pull/235 |
127 |
- |
128 |
-From 18f71a50a9000e7558ae48a971fa301d76220ff0 Mon Sep 17 00:00:00 2001 |
129 |
-From: Prathmesh Prabhu <pprabhu@××××××××.org> |
130 |
-Date: Tue, 10 Mar 2015 17:04:40 -0400 |
131 |
-Subject: [PATCH] protoc: Add options to redirect input/output to files. |
132 |
- |
133 |
-When using protoc to encode/decode protobufs, the input/output was from |
134 |
-stdin/stdout only. This patch adds command line flags to specify files to read |
135 |
-the protobuf from and and write the encoded/decoded protobuf to. |
136 |
---- |
137 |
- .../protobuf/compiler/command_line_interface.cc | 99 +++++++++++++++++----- |
138 |
- .../protobuf/compiler/command_line_interface.h | 11 ++- |
139 |
- .../compiler/command_line_interface_unittest.cc | 25 +++++- |
140 |
- 3 files changed, 110 insertions(+), 25 deletions(-) |
141 |
- |
142 |
-diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc |
143 |
-index 567238a..1db85c9 100644 |
144 |
---- a/src/google/protobuf/compiler/command_line_interface.cc |
145 |
-+++ b/src/google/protobuf/compiler/command_line_interface.cc |
146 |
-@@ -745,6 +745,28 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { |
147 |
- } |
148 |
- |
149 |
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { |
150 |
-+ bool success = false; |
151 |
-+ int in_fd = STDIN_FILENO; |
152 |
-+ int out_fd = STDOUT_FILENO; |
153 |
-+ |
154 |
-+ if (!protobuf_in_path_.empty()) { |
155 |
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); |
156 |
-+ if (in_fd == -1) { |
157 |
-+ cerr << protobuf_in_path_ << ": error: failed to open file." << endl; |
158 |
-+ return 1; |
159 |
-+ } |
160 |
-+ } |
161 |
-+ if (!protobuf_out_path_.empty()) { |
162 |
-+ out_fd = open(protobuf_out_path_.c_str(), |
163 |
-+ O_WRONLY | O_CREAT | O_TRUNC, |
164 |
-+ 0644); |
165 |
-+ if (out_fd == -1) { |
166 |
-+ cerr << protobuf_out_path_ << ": error: failed to open file." << endl; |
167 |
-+ close(in_fd); |
168 |
-+ return 1; |
169 |
-+ } |
170 |
-+ } |
171 |
-+ |
172 |
- if (codec_type_.empty()) { |
173 |
- // HACK: Define an EmptyMessage type to use for decoding. |
174 |
- DescriptorPool pool; |
175 |
-@@ -753,13 +775,20 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { |
176 |
- file.add_message_type()->set_name("EmptyMessage"); |
177 |
- GOOGLE_CHECK(pool.BuildFile(file) != NULL); |
178 |
- codec_type_ = "EmptyMessage"; |
179 |
-- if (!EncodeOrDecode(&pool)) { |
180 |
-- return 1; |
181 |
-- } |
182 |
-+ success = EncodeOrDecode(&pool, in_fd, out_fd); |
183 |
- } else { |
184 |
-- if (!EncodeOrDecode(importer.pool())) { |
185 |
-- return 1; |
186 |
-- } |
187 |
-+ success = EncodeOrDecode(importer.pool(), in_fd, out_fd); |
188 |
-+ } |
189 |
-+ |
190 |
-+ if (in_fd != STDIN_FILENO) { |
191 |
-+ close(in_fd); |
192 |
-+ } |
193 |
-+ if (out_fd != STDOUT_FILENO) { |
194 |
-+ close(out_fd); |
195 |
-+ } |
196 |
-+ |
197 |
-+ if (!success) { |
198 |
-+ return 1; |
199 |
- } |
200 |
- } |
201 |
- |
202 |
-@@ -873,6 +902,11 @@ CommandLineInterface::ParseArguments(int argc, const char* const argv[]) { |
203 |
- if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE) |
204 |
- return status; |
205 |
- } |
206 |
-+ if (mode_ == MODE_COMPILE && |
207 |
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { |
208 |
-+ cerr << "--protobuf_in and --protobuf_out are only valid with " |
209 |
-+ << "decode operations. Ignoring."; |
210 |
-+ } |
211 |
- |
212 |
- // If no --proto_path was given, use the current working directory. |
213 |
- if (proto_path_.empty()) { |
214 |
-@@ -1123,6 +1157,12 @@ CommandLineInterface::InterpretArgument(const string& name, |
215 |
- |
216 |
- codec_type_ = value; |
217 |
- |
218 |
-+ } else if (name == "--protobuf_in") { |
219 |
-+ protobuf_in_path_ = value; |
220 |
-+ |
221 |
-+ } else if (name == "--protobuf_out") { |
222 |
-+ protobuf_out_path_ = value; |
223 |
-+ |
224 |
- } else if (name == "--error_format") { |
225 |
- if (value == "gcc") { |
226 |
- error_format_ = ERROR_FORMAT_GCC; |
227 |
-@@ -1238,18 +1278,29 @@ void CommandLineInterface::PrintHelpText() { |
228 |
- " --version Show version info and exit.\n" |
229 |
- " -h, --help Show this text and exit.\n" |
230 |
- " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" |
231 |
--" from standard input and write it in binary\n" |
232 |
--" to standard output. The message type must\n" |
233 |
--" be defined in PROTO_FILES or their imports.\n" |
234 |
--" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" |
235 |
--" standard input and write it in text format\n" |
236 |
--" to standard output. The message type must\n" |
237 |
-+" an write it in binary. The message type must\n" |
238 |
- " be defined in PROTO_FILES or their imports.\n" |
239 |
--" --decode_raw Read an arbitrary protocol message from\n" |
240 |
--" standard input and write the raw tag/value\n" |
241 |
--" pairs in text format to standard output. No\n" |
242 |
-+" The input/output protobuf files are specified\n" |
243 |
-+" using the --protobuf_in and --protobuf_out\n" |
244 |
-+" command line flags.\n" |
245 |
-+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" |
246 |
-+" write it in text format. The message type\n" |
247 |
-+" must be defined in PROTO_FILES or their\n" |
248 |
-+" imports. The input/output protobuf files are\n" |
249 |
-+" specified using the --protobuf_in and \n" |
250 |
-+" --protobuf_out command line flags.\n" |
251 |
-+" --decode_raw Read an arbitrary protocol message and write\n" |
252 |
-+" the raw tag/value pairs in text format. No\n" |
253 |
- " PROTO_FILES should be given when using this\n" |
254 |
--" flag.\n" |
255 |
-+" flag. The input/output protobuf files are\n" |
256 |
-+" specified using the --protobuf_in and \n" |
257 |
-+" --protobuf_out command line flags.\n" |
258 |
-+" --protobuf_in Absolute path to the protobuf file to read to\n" |
259 |
-+" encode/decode. If omitted, file will be read\n" |
260 |
-+" from STDIN.\n" |
261 |
-+" --protobuf_out Absolute path to the protobuf file to write to\n" |
262 |
-+" after encode/decode operation. If omitted,\n" |
263 |
-+" output is written to STDOUT.\n" |
264 |
- " -oFILE, Writes a FileDescriptorSet (a protocol buffer,\n" |
265 |
- " --descriptor_set_out=FILE defined in descriptor.proto) containing all of\n" |
266 |
- " the input files to FILE.\n" |
267 |
-@@ -1490,7 +1541,9 @@ bool CommandLineInterface::GeneratePluginOutput( |
268 |
- return true; |
269 |
- } |
270 |
- |
271 |
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { |
272 |
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, |
273 |
-+ int in_fd, |
274 |
-+ int out_fd) { |
275 |
- // Look up the type. |
276 |
- const Descriptor* type = pool->FindMessageTypeByName(codec_type_); |
277 |
- if (type == NULL) { |
278 |
-@@ -1502,15 +1555,15 @@ bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { |
279 |
- google::protobuf::scoped_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); |
280 |
- |
281 |
- if (mode_ == MODE_ENCODE) { |
282 |
-- SetFdToTextMode(STDIN_FILENO); |
283 |
-- SetFdToBinaryMode(STDOUT_FILENO); |
284 |
-+ SetFdToTextMode(in_fd); |
285 |
-+ SetFdToBinaryMode(out_fd); |
286 |
- } else { |
287 |
-- SetFdToBinaryMode(STDIN_FILENO); |
288 |
-- SetFdToTextMode(STDOUT_FILENO); |
289 |
-+ SetFdToBinaryMode(in_fd); |
290 |
-+ SetFdToTextMode(out_fd); |
291 |
- } |
292 |
- |
293 |
-- io::FileInputStream in(STDIN_FILENO); |
294 |
-- io::FileOutputStream out(STDOUT_FILENO); |
295 |
-+ io::FileInputStream in(in_fd); |
296 |
-+ io::FileOutputStream out(out_fd); |
297 |
- |
298 |
- if (mode_ == MODE_ENCODE) { |
299 |
- // Input is text. |
300 |
-diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h |
301 |
-index 7e611c4..b6fc38a 100644 |
302 |
---- a/src/google/protobuf/compiler/command_line_interface.h |
303 |
-+++ b/src/google/protobuf/compiler/command_line_interface.h |
304 |
-@@ -244,7 +244,9 @@ class LIBPROTOC_EXPORT CommandLineInterface { |
305 |
- string* error); |
306 |
- |
307 |
- // Implements --encode and --decode. |
308 |
-- bool EncodeOrDecode(const DescriptorPool* pool); |
309 |
-+ bool EncodeOrDecode(const DescriptorPool* pool, |
310 |
-+ int in_fd, |
311 |
-+ int out_fd); |
312 |
- |
313 |
- // Implements the --descriptor_set_out option. |
314 |
- bool WriteDescriptorSet(const vector<const FileDescriptor*> parsed_files); |
315 |
-@@ -357,6 +359,13 @@ class LIBPROTOC_EXPORT CommandLineInterface { |
316 |
- // decoding. (Empty string indicates --decode_raw.) |
317 |
- string codec_type_; |
318 |
- |
319 |
-+ // When using --encode / --decode / --decode_raw absolute path to the output |
320 |
-+ // file. (Empty string indicates write to STDOUT). |
321 |
-+ string protobuf_out_path_; |
322 |
-+ // When using --encode / --decode / --decode_raw, absolute path to the input |
323 |
-+ // file. (Empty string indicates read from STDIN). |
324 |
-+ string protobuf_in_path_; |
325 |
-+ |
326 |
- // If --descriptor_set_out was given, this is the filename to which the |
327 |
- // FileDescriptorSet should be written. Otherwise, empty. |
328 |
- string descriptor_set_name_; |
329 |
-diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc |
330 |
-index 2b26f3b..78ff2cf 100644 |
331 |
---- a/src/google/protobuf/compiler/command_line_interface_unittest.cc |
332 |
-+++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc |
333 |
-@@ -94,7 +94,7 @@ class CommandLineInterfaceTest : public testing::Test { |
334 |
- virtual void SetUp(); |
335 |
- virtual void TearDown(); |
336 |
- |
337 |
-- // Runs the CommandLineInterface with the given command line. The |
338 |
-+ // Run the CommandLineInterface with the given command line. The |
339 |
- // command is automatically split on spaces, and the string "$tmpdir" |
340 |
- // is replaced with TestTempDir(). |
341 |
- void Run(const string& command); |
342 |
-@@ -1680,6 +1680,17 @@ class EncodeDecodeTest : public testing::Test { |
343 |
- EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); |
344 |
- } |
345 |
- |
346 |
-+ void ExpectBinaryFilesMatch(const string &expected_file, |
347 |
-+ const string &actual_file) { |
348 |
-+ string expected_output, actual_output; |
349 |
-+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); |
350 |
-+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); |
351 |
-+ |
352 |
-+ // Don't use EXPECT_EQ because we don't want to print raw binary data to |
353 |
-+ // stdout on failure. |
354 |
-+ EXPECT_TRUE(expected_output == actual_output); |
355 |
-+ } |
356 |
-+ |
357 |
- private: |
358 |
- int duped_stdin_; |
359 |
- string captured_stdout_; |
360 |
-@@ -1745,6 +1756,18 @@ TEST_F(EncodeDecodeTest, ProtoParseError) { |
361 |
- "google/protobuf/no_such_file.proto: File not found.\n"); |
362 |
- } |
363 |
- |
364 |
-+TEST_F(EncodeDecodeTest, RedirectInputOutput) { |
365 |
-+ string out_file = TestTempDir() + "/golden_message_out.pbf"; |
366 |
-+ string cmd = ""; |
367 |
-+ cmd += "google/protobuf/unittest.proto "; |
368 |
-+ cmd += "--encode=protobuf_unittest.TestAllTypes "; |
369 |
-+ cmd += "--protobuf_in=" + TestSourceDir() + |
370 |
-+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; |
371 |
-+ cmd += "--protobuf_out=" + out_file; |
372 |
-+ EXPECT_TRUE(Run(cmd)); |
373 |
-+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); |
374 |
-+} |
375 |
-+ |
376 |
- } // anonymous namespace |
377 |
- |
378 |
- } // namespace compiler |
379 |
--- |
380 |
-2.3.1 |
381 |
- |
382 |
|
383 |
diff --git a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch |
384 |
deleted file mode 100644 |
385 |
index 341d1128aa1..00000000000 |
386 |
--- a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch |
387 |
+++ /dev/null |
388 |
@@ -1,89 +0,0 @@ |
389 |
-diff -Naur a/configure.ac b/configure.ac |
390 |
---- a/configure.ac 2015-12-30 22:21:46.000000000 +0100 |
391 |
-+++ b/configure.ac 2016-04-16 17:46:54.858904639 +0200 |
392 |
-@@ -176,9 +176,9 @@ |
393 |
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
394 |
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
395 |
- # too. |
396 |
--export CFLAGS |
397 |
--export CXXFLAGS |
398 |
--AC_CONFIG_SUBDIRS([gmock]) |
399 |
-+#export CFLAGS |
400 |
-+#export CXXFLAGS |
401 |
-+#AC_CONFIG_SUBDIRS([gmock]) |
402 |
- |
403 |
- AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
404 |
- AC_OUTPUT |
405 |
-diff -Naur a/Makefile.am b/Makefile.am |
406 |
---- a/Makefile.am 2015-12-30 22:21:46.000000000 +0100 |
407 |
-+++ b/Makefile.am 2016-04-16 17:46:25.355751203 +0200 |
408 |
-@@ -17,9 +17,10 @@ |
409 |
- # want "make install" to recurse into gmock since we don't want to overwrite |
410 |
- # the installed version of gmock if there is one. |
411 |
- check-local: |
412 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
413 |
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
414 |
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
415 |
-+ @echo "Making of gmock disabled" |
416 |
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
417 |
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
418 |
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
419 |
- |
420 |
- # We would like to clean gmock when "make clean" is invoked. But we have to |
421 |
- # be careful because clean-local is also invoked during "make distclean", but |
422 |
-diff -Naur a/src/Makefile.am b/src/Makefile.am |
423 |
---- a/src/Makefile.am 2015-12-30 22:21:46.000000000 +0100 |
424 |
-+++ b/src/Makefile.am 2016-04-16 17:47:07.026967535 +0200 |
425 |
-@@ -669,11 +669,8 @@ |
426 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
427 |
- $(GZCHECKPROGRAMS) |
428 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
429 |
-- ../gmock/gtest/lib/libgtest.la \ |
430 |
-- ../gmock/lib/libgmock.la \ |
431 |
-- ../gmock/lib/libgmock_main.la |
432 |
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ |
433 |
-- -I$(srcdir)/../gmock/include |
434 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
435 |
-+protobuf_test_CPPFLAGS = -I/usr/include |
436 |
- # Disable optimization for tests unless the user explicitly asked for it, |
437 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
438 |
- # See configure.ac for more info. |
439 |
-@@ -753,11 +750,8 @@ |
440 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
441 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
442 |
- libprotoc.la \ |
443 |
-- ../gmock/gtest/lib/libgtest.la \ |
444 |
-- ../gmock/lib/libgmock.la \ |
445 |
-- ../gmock/lib/libgmock_main.la |
446 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
447 |
-- -I$(srcdir)/../gmock/gtest/include \ |
448 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
449 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ |
450 |
- -DPROTOBUF_TEST_NO_DESCRIPTORS |
451 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
452 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
453 |
-@@ -788,11 +782,8 @@ |
454 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
455 |
- # memory leaks (don't know why). |
456 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
457 |
-- ../gmock/gtest/lib/libgtest.la \ |
458 |
-- ../gmock/lib/libgmock.la \ |
459 |
-- ../gmock/lib/libgmock_main.la |
460 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
461 |
-- -I$(srcdir)/../gmock/gtest/include |
462 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
463 |
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include |
464 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
465 |
- protobuf_lite_arena_test_SOURCES = \ |
466 |
- google/protobuf/lite_arena_unittest.cc \ |
467 |
-@@ -801,8 +792,8 @@ |
468 |
- |
469 |
- # Test plugin binary. |
470 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
471 |
-- ../gmock/gtest/lib/libgtest.la |
472 |
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
473 |
-+ -L/usr/lib -lgtest |
474 |
-+test_plugin_CPPFLAGS = -I/usr/include |
475 |
- test_plugin_SOURCES = \ |
476 |
- google/protobuf/compiler/mock_code_generator.cc \ |
477 |
- google/protobuf/testing/file.cc \ |
478 |
|
479 |
diff --git a/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch |
480 |
deleted file mode 100644 |
481 |
index a2dda8aafac..00000000000 |
482 |
--- a/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch |
483 |
+++ /dev/null |
484 |
@@ -1,101 +0,0 @@ |
485 |
-diff -Naur protobuf-3.0.2.orig/Makefile.am protobuf-3.0.2/Makefile.am |
486 |
---- protobuf-3.0.2.orig/Makefile.am 2016-09-06 15:40:51.000000000 -0700 |
487 |
-+++ protobuf-3.0.2/Makefile.am 2016-12-14 14:44:50.516520874 -0800 |
488 |
-@@ -17,9 +17,10 @@ |
489 |
- # want "make install" to recurse into gmock since we don't want to overwrite |
490 |
- # the installed version of gmock if there is one. |
491 |
- check-local: |
492 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
493 |
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
494 |
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
495 |
-+ @echo "Making of gmock disabled" |
496 |
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
497 |
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
498 |
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
499 |
- |
500 |
- # We would like to clean gmock when "make clean" is invoked. But we have to |
501 |
- # be careful because clean-local is also invoked during "make distclean", but |
502 |
-diff -Naur protobuf-3.0.2.orig/configure.ac protobuf-3.0.2/configure.ac |
503 |
---- protobuf-3.0.2.orig/configure.ac 2016-09-06 15:40:51.000000000 -0700 |
504 |
-+++ protobuf-3.0.2/configure.ac 2016-12-14 14:44:50.516520874 -0800 |
505 |
-@@ -181,9 +181,9 @@ |
506 |
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
507 |
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
508 |
- # too. |
509 |
--export CFLAGS |
510 |
--export CXXFLAGS |
511 |
--AC_CONFIG_SUBDIRS([gmock]) |
512 |
-+#export CFLAGS |
513 |
-+#export CXXFLAGS |
514 |
-+#AC_CONFIG_SUBDIRS([gmock]) |
515 |
- |
516 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
517 |
- AC_OUTPUT |
518 |
-diff -Naur protobuf-3.0.2.orig/src/Makefile.am protobuf-3.0.2/src/Makefile.am |
519 |
---- protobuf-3.0.2.orig/src/Makefile.am 2016-09-06 15:40:51.000000000 -0700 |
520 |
-+++ protobuf-3.0.2/src/Makefile.am 2016-12-14 14:44:50.517520885 -0800 |
521 |
-@@ -688,11 +688,8 @@ |
522 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
523 |
- no-warning-test $(GZCHECKPROGRAMS) |
524 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
525 |
-- ../gmock/gtest/lib/libgtest.la \ |
526 |
-- ../gmock/lib/libgmock.la \ |
527 |
-- ../gmock/lib/libgmock_main.la |
528 |
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ |
529 |
-- -I$(srcdir)/../gmock/include |
530 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
531 |
-+protobuf_test_CPPFLAGS = -I/usr/include |
532 |
- # Disable optimization for tests unless the user explicitly asked for it, |
533 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
534 |
- # See configure.ac for more info. |
535 |
-@@ -775,11 +772,8 @@ |
536 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
537 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
538 |
- libprotoc.la \ |
539 |
-- ../gmock/gtest/lib/libgtest.la \ |
540 |
-- ../gmock/lib/libgmock.la \ |
541 |
-- ../gmock/lib/libgmock_main.la |
542 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
543 |
-- -I$(srcdir)/../gmock/gtest/include \ |
544 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
545 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ |
546 |
- -DPROTOBUF_TEST_NO_DESCRIPTORS |
547 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
548 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
549 |
-@@ -810,11 +804,8 @@ |
550 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
551 |
- # memory leaks (don't know why). |
552 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
553 |
-- ../gmock/gtest/lib/libgtest.la \ |
554 |
-- ../gmock/lib/libgmock.la \ |
555 |
-- ../gmock/lib/libgmock_main.la |
556 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
557 |
-- -I$(srcdir)/../gmock/gtest/include |
558 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
559 |
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include |
560 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
561 |
- protobuf_lite_arena_test_SOURCES = \ |
562 |
- google/protobuf/lite_arena_unittest.cc \ |
563 |
-@@ -823,8 +814,8 @@ |
564 |
- |
565 |
- # Test plugin binary. |
566 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
567 |
-- ../gmock/gtest/lib/libgtest.la |
568 |
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
569 |
-+ -L/usr/lib -lgtest |
570 |
-+test_plugin_CPPFLAGS = -I/usr/include |
571 |
- test_plugin_SOURCES = \ |
572 |
- google/protobuf/compiler/mock_code_generator.cc \ |
573 |
- google/protobuf/testing/file.cc \ |
574 |
-@@ -853,9 +844,8 @@ |
575 |
- echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc |
576 |
- |
577 |
- no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
578 |
-- ../gmock/gtest/lib/libgtest.la \ |
579 |
-- ../gmock/gtest/lib/libgtest_main.la |
580 |
--no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
581 |
-+ -L/usr/lib -lgtest -lgtest_main |
582 |
-+no_warning_test_CPPFLAGS = -I/usr/include |
583 |
- no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ |
584 |
- -Wall -Werror |
585 |
- nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) |
586 |
|
587 |
diff --git a/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch |
588 |
deleted file mode 100644 |
589 |
index 25dc7bd074b..00000000000 |
590 |
--- a/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch |
591 |
+++ /dev/null |
592 |
@@ -1,115 +0,0 @@ |
593 |
-diff -Naur protobuf-3.3.0.orig/Makefile.am protobuf-3.3.0/Makefile.am |
594 |
---- protobuf-3.3.0.orig/Makefile.am 2017-05-01 20:04:35.448840428 -0700 |
595 |
-+++ protobuf-3.3.0/Makefile.am 2017-05-01 20:04:48.855978898 -0700 |
596 |
-@@ -17,9 +17,10 @@ |
597 |
- # want "make install" to recurse into gmock since we don't want to overwrite |
598 |
- # the installed version of gmock if there is one. |
599 |
- check-local: |
600 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
601 |
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
602 |
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
603 |
-+ @echo "Making of gmock disabled" |
604 |
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
605 |
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
606 |
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
607 |
- |
608 |
- # We would like to clean gmock when "make clean" is invoked. But we have to |
609 |
- # be careful because clean-local is also invoked during "make distclean", but |
610 |
-diff -Naur protobuf-3.3.0.orig/configure.ac protobuf-3.3.0/configure.ac |
611 |
---- protobuf-3.3.0.orig/configure.ac 2017-05-01 20:04:35.497840933 -0700 |
612 |
-+++ protobuf-3.3.0/configure.ac 2017-05-01 20:04:48.856978908 -0700 |
613 |
-@@ -203,9 +203,9 @@ |
614 |
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
615 |
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
616 |
- # too. |
617 |
--export CFLAGS |
618 |
--export CXXFLAGS |
619 |
--AC_CONFIG_SUBDIRS([gmock]) |
620 |
-+#export CFLAGS |
621 |
-+#export CXXFLAGS |
622 |
-+#AC_CONFIG_SUBDIRS([gmock]) |
623 |
- |
624 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
625 |
- AC_OUTPUT |
626 |
-diff -Naur protobuf-3.3.0.orig/src/Makefile.am protobuf-3.3.0/src/Makefile.am |
627 |
---- protobuf-3.3.0.orig/src/Makefile.am 2017-05-01 20:04:35.549841471 -0700 |
628 |
-+++ protobuf-3.3.0/src/Makefile.am 2017-05-01 20:06:46.307191948 -0700 |
629 |
-@@ -748,11 +748,8 @@ |
630 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
631 |
- no-warning-test $(GZCHECKPROGRAMS) |
632 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
633 |
-- ../gmock/gtest/lib/libgtest.la \ |
634 |
-- ../gmock/lib/libgmock.la \ |
635 |
-- ../gmock/lib/libgmock_main.la |
636 |
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ |
637 |
-- -I$(srcdir)/../gmock/include |
638 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
639 |
-+protobuf_test_CPPFLAGS = -I/usr/include |
640 |
- # Disable optimization for tests unless the user explicitly asked for it, |
641 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
642 |
- # See configure.ac for more info. |
643 |
-@@ -837,11 +834,8 @@ |
644 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
645 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
646 |
- libprotoc.la \ |
647 |
-- ../gmock/gtest/lib/libgtest.la \ |
648 |
-- ../gmock/lib/libgmock.la \ |
649 |
-- ../gmock/lib/libgmock_main.la |
650 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
651 |
-- -I$(srcdir)/../gmock/gtest/include \ |
652 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
653 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ |
654 |
- -DPROTOBUF_TEST_NO_DESCRIPTORS |
655 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
656 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
657 |
-@@ -862,11 +856,8 @@ |
658 |
- # full runtime and we want to make sure this test builds without full |
659 |
- # runtime. |
660 |
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
661 |
-- ../gmock/gtest/lib/libgtest.la \ |
662 |
-- ../gmock/lib/libgmock.la \ |
663 |
-- ../gmock/lib/libgmock_main.la |
664 |
--protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ |
665 |
-- -I$(srcdir)/../gmock/gtest/include |
666 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
667 |
-+protobuf_lite_test_CPPFLAGS = -I/usr/include |
668 |
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
669 |
- protobuf_lite_test_SOURCES = \ |
670 |
- google/protobuf/lite_unittest.cc \ |
671 |
-@@ -877,11 +868,8 @@ |
672 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
673 |
- # memory leaks (don't know why). |
674 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
675 |
-- ../gmock/gtest/lib/libgtest.la \ |
676 |
-- ../gmock/lib/libgmock.la \ |
677 |
-- ../gmock/lib/libgmock_main.la |
678 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
679 |
-- -I$(srcdir)/../gmock/gtest/include |
680 |
-+ -L/usr/lib -lgmock -lgmock_main -lgtest |
681 |
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include |
682 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
683 |
- protobuf_lite_arena_test_SOURCES = \ |
684 |
- google/protobuf/lite_arena_unittest.cc \ |
685 |
-@@ -890,8 +878,8 @@ |
686 |
- |
687 |
- # Test plugin binary. |
688 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
689 |
-- ../gmock/gtest/lib/libgtest.la |
690 |
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
691 |
-+ -L/usr/lib -lgtest |
692 |
-+test_plugin_CPPFLAGS = -I/usr/include |
693 |
- test_plugin_SOURCES = \ |
694 |
- google/protobuf/compiler/mock_code_generator.cc \ |
695 |
- google/protobuf/testing/file.cc \ |
696 |
-@@ -920,9 +908,8 @@ |
697 |
- echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc |
698 |
- |
699 |
- no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
700 |
-- ../gmock/gtest/lib/libgtest.la \ |
701 |
-- ../gmock/gtest/lib/libgtest_main.la |
702 |
--no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
703 |
-+ -L/usr/lib -lgtest -lgtest_main |
704 |
-+no_warning_test_CPPFLAGS = -I/usr/include |
705 |
- no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ |
706 |
- -Wall -Werror |
707 |
- nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) |
708 |
|
709 |
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml |
710 |
index 27b70440161..6aeca898035 100644 |
711 |
--- a/dev-libs/protobuf/metadata.xml |
712 |
+++ b/dev-libs/protobuf/metadata.xml |
713 |
@@ -12,10 +12,6 @@ |
714 |
<slots> |
715 |
<subslots>Soname version number</subslots> |
716 |
</slots> |
717 |
- <use> |
718 |
- <flag name="java">Builds the Java implementation. This is not needed for Java support in protoc.</flag> |
719 |
- <flag name="python">Builds the Python implementation. This is not needed for Python support in protoc.</flag> |
720 |
- </use> |
721 |
<upstream> |
722 |
<remote-id type="github">google/protobuf</remote-id> |
723 |
</upstream> |
724 |
|
725 |
diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild |
726 |
deleted file mode 100644 |
727 |
index 5c13a2976ed..00000000000 |
728 |
--- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild |
729 |
+++ /dev/null |
730 |
@@ -1,132 +0,0 @@ |
731 |
-# Copyright 1999-2017 Gentoo Foundation |
732 |
-# Distributed under the terms of the GNU General Public License v2 |
733 |
- |
734 |
-EAPI=5 |
735 |
-AUTOTOOLS_AUTORECONF=1 |
736 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
737 |
-JAVA_PKG_IUSE="source" |
738 |
-PYTHON_COMPAT=( python2_7 ) |
739 |
-DISTUTILS_OPTIONAL=1 |
740 |
- |
741 |
-inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common |
742 |
- |
743 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
744 |
-HOMEPAGE="https://code.google.com/p/protobuf/" |
745 |
-SRC_URI="https://protobuf.googlecode.com/files/${P}.tar.bz2" |
746 |
- |
747 |
-LICENSE="BSD" |
748 |
-SLOT="0/8" # subslot = soname major version |
749 |
-KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
750 |
-IUSE="emacs examples java python static-libs vim-syntax" |
751 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
752 |
- |
753 |
-CDEPEND="emacs? ( virtual/emacs ) |
754 |
- python? ( ${PYTHON_DEPS} )" |
755 |
-DEPEND="${CDEPEND} |
756 |
- java? ( >=virtual/jdk-1.5 ) |
757 |
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" |
758 |
-RDEPEND="${CDEPEND} |
759 |
- java? ( >=virtual/jre-1.5 )" |
760 |
- |
761 |
-src_prepare() { |
762 |
- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI |
763 |
- |
764 |
- epatch "${FILESDIR}"/${P}-x32.patch |
765 |
- |
766 |
- # breaks Darwin, bug #472514 |
767 |
- [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch |
768 |
- |
769 |
- # fix build with emacs-24.4 (bug #524100) |
770 |
- epatch "${FILESDIR}"/${P}-emacs-24.4.patch |
771 |
- |
772 |
- autotools-multilib_src_prepare |
773 |
- |
774 |
- if use python; then |
775 |
- cd python && distutils-r1_src_prepare |
776 |
- fi |
777 |
-} |
778 |
- |
779 |
-multilib_src_compile() { |
780 |
- default |
781 |
- |
782 |
- if multilib_is_native_abi; then |
783 |
- if use python; then |
784 |
- einfo "Compiling Python library ..." |
785 |
- pushd "${S}"/python >/dev/null |
786 |
- PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile |
787 |
- popd >/dev/null |
788 |
- fi |
789 |
- |
790 |
- if use java; then |
791 |
- einfo "Compiling Java library ..." |
792 |
- pushd "${S}" >/dev/null |
793 |
- "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto |
794 |
- mkdir java/build |
795 |
- pushd java/src/main/java >/dev/null |
796 |
- ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" |
797 |
- popd >/dev/null |
798 |
- jar cf ${PN}.jar -C java/build . || die "jar failed" |
799 |
- popd >/dev/null |
800 |
- fi |
801 |
- fi |
802 |
-} |
803 |
- |
804 |
-src_compile() { |
805 |
- autotools-multilib_src_compile |
806 |
- |
807 |
- if use emacs; then |
808 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
809 |
- fi |
810 |
-} |
811 |
- |
812 |
-src_test() { |
813 |
- autotools-multilib_src_test check |
814 |
- |
815 |
- if use python; then |
816 |
- pushd python >/dev/null |
817 |
- distutils-r1_src_test |
818 |
- popd >/dev/null |
819 |
- fi |
820 |
-} |
821 |
- |
822 |
-src_install() { |
823 |
- autotools-multilib_src_install |
824 |
- |
825 |
- dodoc CHANGES.txt CONTRIBUTORS.txt README.txt |
826 |
- |
827 |
- if use python; then |
828 |
- pushd python >/dev/null |
829 |
- distutils-r1_src_install |
830 |
- popd >/dev/null |
831 |
- fi |
832 |
- |
833 |
- if use java; then |
834 |
- java-pkg_dojar ${PN}.jar |
835 |
- use source && java-pkg_dosrc java/src/main/java/* |
836 |
- fi |
837 |
- |
838 |
- if use vim-syntax; then |
839 |
- insinto /usr/share/vim/vimfiles/syntax |
840 |
- doins editors/proto.vim |
841 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
842 |
- doins "${FILESDIR}"/proto.vim |
843 |
- fi |
844 |
- |
845 |
- if use emacs; then |
846 |
- elisp-install ${PN} editors/protobuf-mode.el* |
847 |
- elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el |
848 |
- fi |
849 |
- |
850 |
- if use examples; then |
851 |
- dodoc -r examples |
852 |
- docompress -x /usr/share/doc/${PF}/examples |
853 |
- fi |
854 |
-} |
855 |
- |
856 |
-pkg_postinst() { |
857 |
- use emacs && elisp-site-regen |
858 |
-} |
859 |
- |
860 |
-pkg_postrm() { |
861 |
- use emacs && elisp-site-regen |
862 |
-} |
863 |
|
864 |
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild |
865 |
deleted file mode 100644 |
866 |
index 8d93c1be7e4..00000000000 |
867 |
--- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild |
868 |
+++ /dev/null |
869 |
@@ -1,158 +0,0 @@ |
870 |
-# Copyright 1999-2017 Gentoo Foundation |
871 |
-# Distributed under the terms of the GNU General Public License v2 |
872 |
- |
873 |
-EAPI=5 |
874 |
-AUTOTOOLS_AUTORECONF=1 |
875 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
876 |
-JAVA_PKG_IUSE="source" |
877 |
-PYTHON_COMPAT=( python2_7 ) |
878 |
-DISTUTILS_OPTIONAL=1 |
879 |
- |
880 |
-inherit autotools-multilib eutils flag-o-matic toolchain-funcs distutils-r1 java-pkg-opt-2 elisp-common |
881 |
- |
882 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
883 |
-HOMEPAGE="https://code.google.com/p/protobuf/ https://github.com/google/protobuf/" |
884 |
-SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2" |
885 |
- |
886 |
-LICENSE="BSD" |
887 |
-SLOT="0/9" # subslot = soname major version |
888 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
889 |
-IUSE="emacs examples java python static-libs vim-syntax zlib" |
890 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
891 |
- |
892 |
-CDEPEND="emacs? ( virtual/emacs ) |
893 |
- python? ( ${PYTHON_DEPS} ) |
894 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
895 |
-DEPEND="${CDEPEND} |
896 |
- java? ( >=virtual/jdk-1.5 ) |
897 |
- python? ( |
898 |
- dev-python/google-apputils[${PYTHON_USEDEP}] |
899 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
900 |
- )" |
901 |
-RDEPEND="${CDEPEND} |
902 |
- java? ( >=virtual/jre-1.5 )" |
903 |
- |
904 |
-src_prepare() { |
905 |
- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI |
906 |
- |
907 |
- # breaks Darwin, bug #472514 |
908 |
- [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch |
909 |
- |
910 |
- # fix build with emacs-24.4 (bug #524100) |
911 |
- epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch |
912 |
- epatch "${FILESDIR}"/${PN}-2.6.1-protoc-cmdline.patch |
913 |
- |
914 |
- autotools-multilib_src_prepare |
915 |
- |
916 |
- if use python; then |
917 |
- cd python && distutils-r1_src_prepare |
918 |
- fi |
919 |
-} |
920 |
- |
921 |
-src_configure() { |
922 |
- local myeconfargs=( |
923 |
- $(use_with zlib) |
924 |
- ) |
925 |
- |
926 |
- if tc-is-cross-compiler; then |
927 |
- # The build system wants `protoc` when building, so we need a copy that |
928 |
- # runs on the host. This is more hermetic than relying on the version |
929 |
- # installed in the host being the exact same version. |
930 |
- mkdir -p "${WORKDIR}"/build || die |
931 |
- pushd "${WORKDIR}"/build >/dev/null |
932 |
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" |
933 |
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) |
934 |
- popd >/dev/null |
935 |
- fi |
936 |
- |
937 |
- autotools-multilib_src_configure |
938 |
-} |
939 |
- |
940 |
-multilib_src_compile() { |
941 |
- default |
942 |
- |
943 |
- if multilib_is_native_abi; then |
944 |
- if use python; then |
945 |
- einfo "Compiling Python library ..." |
946 |
- pushd "${S}"/python >/dev/null |
947 |
- PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile |
948 |
- popd >/dev/null |
949 |
- fi |
950 |
- |
951 |
- if use java; then |
952 |
- einfo "Compiling Java library ..." |
953 |
- pushd "${S}" >/dev/null |
954 |
- "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto |
955 |
- mkdir java/build |
956 |
- pushd java/src/main/java >/dev/null |
957 |
- ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" |
958 |
- popd >/dev/null |
959 |
- jar cf ${PN}.jar -C java/build . || die "jar failed" |
960 |
- popd >/dev/null |
961 |
- fi |
962 |
- fi |
963 |
-} |
964 |
- |
965 |
-src_compile() { |
966 |
- if tc-is-cross-compiler; then |
967 |
- emake -C "${WORKDIR}"/build/src protoc |
968 |
- fi |
969 |
- |
970 |
- autotools-multilib_src_compile |
971 |
- |
972 |
- if use emacs; then |
973 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
974 |
- fi |
975 |
-} |
976 |
- |
977 |
-src_test() { |
978 |
- autotools-multilib_src_test check |
979 |
- |
980 |
- if use python; then |
981 |
- pushd python >/dev/null |
982 |
- distutils-r1_src_test |
983 |
- popd >/dev/null |
984 |
- fi |
985 |
-} |
986 |
- |
987 |
-src_install() { |
988 |
- autotools-multilib_src_install |
989 |
- |
990 |
- dodoc CHANGES.txt CONTRIBUTORS.txt README.md |
991 |
- |
992 |
- if use python; then |
993 |
- pushd python >/dev/null |
994 |
- distutils-r1_src_install |
995 |
- popd >/dev/null |
996 |
- fi |
997 |
- |
998 |
- if use java; then |
999 |
- java-pkg_dojar ${PN}.jar |
1000 |
- use source && java-pkg_dosrc java/src/main/java/* |
1001 |
- fi |
1002 |
- |
1003 |
- if use vim-syntax; then |
1004 |
- insinto /usr/share/vim/vimfiles/syntax |
1005 |
- doins editors/proto.vim |
1006 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
1007 |
- doins "${FILESDIR}"/proto.vim |
1008 |
- fi |
1009 |
- |
1010 |
- if use emacs; then |
1011 |
- elisp-install ${PN} editors/protobuf-mode.el* |
1012 |
- elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el |
1013 |
- fi |
1014 |
- |
1015 |
- if use examples; then |
1016 |
- dodoc -r examples |
1017 |
- docompress -x /usr/share/doc/${PF}/examples |
1018 |
- fi |
1019 |
-} |
1020 |
- |
1021 |
-pkg_postinst() { |
1022 |
- use emacs && elisp-site-regen |
1023 |
-} |
1024 |
- |
1025 |
-pkg_postrm() { |
1026 |
- use emacs && elisp-site-regen |
1027 |
-} |
1028 |
|
1029 |
diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild |
1030 |
deleted file mode 100644 |
1031 |
index c61f89d74ab..00000000000 |
1032 |
--- a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild |
1033 |
+++ /dev/null |
1034 |
@@ -1,107 +0,0 @@ |
1035 |
-# Copyright 1999-2017 Gentoo Foundation |
1036 |
-# Distributed under the terms of the GNU General Public License v2 |
1037 |
- |
1038 |
-EAPI=6 |
1039 |
- |
1040 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
1041 |
-inherit python-r1 autotools flag-o-matic toolchain-funcs elisp-common multilib-minimal |
1042 |
- |
1043 |
-# If you bump this package, also consider bumping the official language bindings! |
1044 |
-# At the current time these are java and python. |
1045 |
-MY_PV=${PV/_beta/-beta-} |
1046 |
-MY_PV=${MY_PV/_p/.} |
1047 |
- |
1048 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
1049 |
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" |
1050 |
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
1051 |
- |
1052 |
-LICENSE="BSD" |
1053 |
-SLOT="0/10b3" |
1054 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
1055 |
-IUSE="emacs examples java python static-libs test vim-syntax zlib" |
1056 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
1057 |
- |
1058 |
-RDEPEND=" |
1059 |
- emacs? ( virtual/emacs ) |
1060 |
- python? ( ${PYTHON_DEPS} ) |
1061 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
1062 |
-DEPEND="${RDEPEND} |
1063 |
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" |
1064 |
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers. |
1065 |
-PDEPEND="java? ( dev-java/protobuf-java ) |
1066 |
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" |
1067 |
- |
1068 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
1069 |
-PATCHES=( |
1070 |
- "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" |
1071 |
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" |
1072 |
- "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" |
1073 |
-) |
1074 |
- |
1075 |
-src_prepare() { |
1076 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
1077 |
- default |
1078 |
- eautoreconf |
1079 |
-} |
1080 |
- |
1081 |
-multilib_src_configure() { |
1082 |
- local myeconfargs=( |
1083 |
- $(use_enable static-libs static) |
1084 |
- $(use_with zlib) |
1085 |
- ) |
1086 |
- if tc-is-cross-compiler; then |
1087 |
- # The build system wants `protoc` when building, so we need a copy that |
1088 |
- # runs on the host. This is more hermetic than relying on the version |
1089 |
- # installed in the host being the exact same version. |
1090 |
- mkdir -p "${WORKDIR}"/build || die |
1091 |
- pushd "${WORKDIR}"/build >/dev/null || die |
1092 |
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" |
1093 |
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) |
1094 |
- popd >/dev/null || die |
1095 |
- fi |
1096 |
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}" |
1097 |
-} |
1098 |
- |
1099 |
-multilib_src_compile() { |
1100 |
- if tc-is-cross-compiler; then |
1101 |
- emake -C "${WORKDIR}"/build/src protoc |
1102 |
- fi |
1103 |
- |
1104 |
- default |
1105 |
- |
1106 |
- if use emacs; then |
1107 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
1108 |
- fi |
1109 |
-} |
1110 |
- |
1111 |
-multilib_src_test() { |
1112 |
- emake check |
1113 |
-} |
1114 |
- |
1115 |
-src_install() { |
1116 |
- multilib-minimal_src_install |
1117 |
- |
1118 |
- if use vim-syntax; then |
1119 |
- insinto /usr/share/vim/vimfiles/syntax |
1120 |
- doins editors/proto.vim |
1121 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
1122 |
- doins "${FILESDIR}/proto.vim" |
1123 |
- fi |
1124 |
- |
1125 |
- if use emacs; then |
1126 |
- elisp-install "${PN}" editors/protobuf-mode.el* |
1127 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1128 |
- fi |
1129 |
- |
1130 |
- if use examples; then |
1131 |
- DOCS+=( examples ) |
1132 |
- fi |
1133 |
-} |
1134 |
- |
1135 |
-pkg_postinst() { |
1136 |
- use emacs && elisp-site-regen |
1137 |
-} |
1138 |
- |
1139 |
-pkg_postrm() { |
1140 |
- use emacs && elisp-site-regen |
1141 |
-} |
1142 |
|
1143 |
diff --git a/dev-libs/protobuf/protobuf-3.0.2.ebuild b/dev-libs/protobuf/protobuf-3.0.2.ebuild |
1144 |
deleted file mode 100644 |
1145 |
index e24d24c5801..00000000000 |
1146 |
--- a/dev-libs/protobuf/protobuf-3.0.2.ebuild |
1147 |
+++ /dev/null |
1148 |
@@ -1,111 +0,0 @@ |
1149 |
-# Copyright 1999-2017 Gentoo Foundation |
1150 |
-# Distributed under the terms of the GNU General Public License v2 |
1151 |
- |
1152 |
-EAPI=6 |
1153 |
- |
1154 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
1155 |
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal |
1156 |
- |
1157 |
-# If you bump this package, also consider bumping the official language bindings! |
1158 |
-# At the current time these are java and python. |
1159 |
-MY_PV=${PV/_beta/-beta-} |
1160 |
-MY_PV=${MY_PV/_p/.} |
1161 |
- |
1162 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
1163 |
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" |
1164 |
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
1165 |
- |
1166 |
-LICENSE="BSD" |
1167 |
-SLOT="0/10" |
1168 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
1169 |
-IUSE="emacs examples java python static-libs test vim-syntax zlib" |
1170 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
1171 |
- |
1172 |
-RDEPEND=" |
1173 |
- emacs? ( virtual/emacs ) |
1174 |
- python? ( ${PYTHON_DEPS} ) |
1175 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
1176 |
-DEPEND="${RDEPEND} |
1177 |
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" |
1178 |
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers. |
1179 |
-PDEPEND=" |
1180 |
- java? ( dev-java/protobuf-java ) |
1181 |
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" |
1182 |
- |
1183 |
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) |
1184 |
- |
1185 |
-PATCHES=( |
1186 |
- "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" |
1187 |
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" |
1188 |
- "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" |
1189 |
-) |
1190 |
- |
1191 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
1192 |
-src_prepare() { |
1193 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
1194 |
- default |
1195 |
- eautoreconf |
1196 |
-} |
1197 |
- |
1198 |
-multilib_src_configure() { |
1199 |
- local myeconfargs=( |
1200 |
- $(use_enable static-libs static) |
1201 |
- $(use_with zlib) |
1202 |
- ) |
1203 |
- if tc-is-cross-compiler; then |
1204 |
- # The build system wants `protoc` when building, so we need a copy that |
1205 |
- # runs on the host. This is more hermetic than relying on the version |
1206 |
- # installed in the host being the exact same version. |
1207 |
- mkdir -p "${WORKDIR}"/build || die |
1208 |
- pushd "${WORKDIR}"/build >/dev/null || die |
1209 |
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" |
1210 |
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) |
1211 |
- popd >/dev/null || die |
1212 |
- fi |
1213 |
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}" |
1214 |
-} |
1215 |
- |
1216 |
-multilib_src_compile() { |
1217 |
- if tc-is-cross-compiler; then |
1218 |
- emake -C "${WORKDIR}"/build/src protoc |
1219 |
- fi |
1220 |
- |
1221 |
- default |
1222 |
- |
1223 |
- if use emacs; then |
1224 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
1225 |
- fi |
1226 |
-} |
1227 |
- |
1228 |
-multilib_src_test() { |
1229 |
- emake check |
1230 |
-} |
1231 |
- |
1232 |
-multilib_src_install_all() { |
1233 |
- if use vim-syntax; then |
1234 |
- insinto /usr/share/vim/vimfiles/syntax |
1235 |
- doins editors/proto.vim |
1236 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
1237 |
- doins "${FILESDIR}/proto.vim" |
1238 |
- fi |
1239 |
- |
1240 |
- if use emacs; then |
1241 |
- elisp-install "${PN}" editors/protobuf-mode.el* |
1242 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1243 |
- fi |
1244 |
- |
1245 |
- if use examples; then |
1246 |
- DOCS+=( examples ) |
1247 |
- docompress -x /usr/share/doc/"${PF}"/examples |
1248 |
- fi |
1249 |
- |
1250 |
- einstalldocs |
1251 |
-} |
1252 |
- |
1253 |
-pkg_postinst() { |
1254 |
- use emacs && elisp-site-regen |
1255 |
-} |
1256 |
- |
1257 |
-pkg_postrm() { |
1258 |
- use emacs && elisp-site-regen |
1259 |
-} |
1260 |
|
1261 |
diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild |
1262 |
deleted file mode 100644 |
1263 |
index 22bb288f8b4..00000000000 |
1264 |
--- a/dev-libs/protobuf/protobuf-3.1.0.ebuild |
1265 |
+++ /dev/null |
1266 |
@@ -1,110 +0,0 @@ |
1267 |
-# Copyright 1999-2017 Gentoo Foundation |
1268 |
-# Distributed under the terms of the GNU General Public License v2 |
1269 |
- |
1270 |
-EAPI=6 |
1271 |
- |
1272 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
1273 |
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal |
1274 |
- |
1275 |
-# If you bump this package, also consider bumping the official language bindings! |
1276 |
-# At the current time these are java and python. |
1277 |
-MY_PV=${PV/_beta/-beta-} |
1278 |
-MY_PV=${MY_PV/_p/.} |
1279 |
- |
1280 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
1281 |
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" |
1282 |
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
1283 |
- |
1284 |
-LICENSE="BSD" |
1285 |
-SLOT="0/11" |
1286 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
1287 |
-IUSE="emacs examples java python static-libs test vim-syntax zlib" |
1288 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
1289 |
- |
1290 |
-RDEPEND=" |
1291 |
- emacs? ( virtual/emacs ) |
1292 |
- python? ( ${PYTHON_DEPS} ) |
1293 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
1294 |
-DEPEND="${RDEPEND} |
1295 |
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" |
1296 |
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers. |
1297 |
-PDEPEND=" |
1298 |
- java? ( dev-java/protobuf-java ) |
1299 |
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" |
1300 |
- |
1301 |
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) |
1302 |
- |
1303 |
-PATCHES=( |
1304 |
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" |
1305 |
- "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" |
1306 |
-) |
1307 |
- |
1308 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
1309 |
-src_prepare() { |
1310 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
1311 |
- default |
1312 |
- eautoreconf |
1313 |
-} |
1314 |
- |
1315 |
-multilib_src_configure() { |
1316 |
- local myeconfargs=( |
1317 |
- $(use_enable static-libs static) |
1318 |
- $(use_with zlib) |
1319 |
- ) |
1320 |
- if tc-is-cross-compiler; then |
1321 |
- # The build system wants `protoc` when building, so we need a copy that |
1322 |
- # runs on the host. This is more hermetic than relying on the version |
1323 |
- # installed in the host being the exact same version. |
1324 |
- mkdir -p "${WORKDIR}"/build || die |
1325 |
- pushd "${WORKDIR}"/build >/dev/null || die |
1326 |
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" |
1327 |
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) |
1328 |
- popd >/dev/null || die |
1329 |
- fi |
1330 |
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}" |
1331 |
-} |
1332 |
- |
1333 |
-multilib_src_compile() { |
1334 |
- if tc-is-cross-compiler; then |
1335 |
- emake -C "${WORKDIR}"/build/src protoc |
1336 |
- fi |
1337 |
- |
1338 |
- default |
1339 |
- |
1340 |
- if use emacs; then |
1341 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
1342 |
- fi |
1343 |
-} |
1344 |
- |
1345 |
-multilib_src_test() { |
1346 |
- emake check |
1347 |
-} |
1348 |
- |
1349 |
-multilib_src_install_all() { |
1350 |
- if use vim-syntax; then |
1351 |
- insinto /usr/share/vim/vimfiles/syntax |
1352 |
- doins editors/proto.vim |
1353 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
1354 |
- doins "${FILESDIR}/proto.vim" |
1355 |
- fi |
1356 |
- |
1357 |
- if use emacs; then |
1358 |
- elisp-install "${PN}" editors/protobuf-mode.el* |
1359 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1360 |
- fi |
1361 |
- |
1362 |
- if use examples; then |
1363 |
- DOCS+=( examples ) |
1364 |
- docompress -x /usr/share/doc/"${PF}"/examples |
1365 |
- fi |
1366 |
- |
1367 |
- einstalldocs |
1368 |
-} |
1369 |
- |
1370 |
-pkg_postinst() { |
1371 |
- use emacs && elisp-site-regen |
1372 |
-} |
1373 |
- |
1374 |
-pkg_postrm() { |
1375 |
- use emacs && elisp-site-regen |
1376 |
-} |
1377 |
|
1378 |
diff --git a/dev-libs/protobuf/protobuf-3.3.0.ebuild b/dev-libs/protobuf/protobuf-3.3.0.ebuild |
1379 |
deleted file mode 100644 |
1380 |
index 86b099daf47..00000000000 |
1381 |
--- a/dev-libs/protobuf/protobuf-3.3.0.ebuild |
1382 |
+++ /dev/null |
1383 |
@@ -1,108 +0,0 @@ |
1384 |
-# Copyright 1999-2017 Gentoo Foundation |
1385 |
-# Distributed under the terms of the GNU General Public License v2 |
1386 |
- |
1387 |
-EAPI=6 |
1388 |
- |
1389 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
1390 |
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal |
1391 |
- |
1392 |
-# If you bump this package, also consider bumping the official language bindings! |
1393 |
-# At the current time these are java and python. |
1394 |
-MY_PV=${PV/_beta/-beta-} |
1395 |
-MY_PV=${MY_PV/_p/.} |
1396 |
- |
1397 |
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" |
1398 |
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" |
1399 |
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
1400 |
- |
1401 |
-LICENSE="BSD" |
1402 |
-SLOT="0/13" |
1403 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
1404 |
-IUSE="emacs examples java python static-libs test zlib" |
1405 |
- |
1406 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
1407 |
- |
1408 |
-DEPEND=" |
1409 |
- emacs? ( virtual/emacs ) |
1410 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
1411 |
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" |
1412 |
- |
1413 |
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers. |
1414 |
-PDEPEND=" |
1415 |
- java? ( dev-java/protobuf-java ) |
1416 |
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" |
1417 |
- |
1418 |
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) |
1419 |
- |
1420 |
-PATCHES=( |
1421 |
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" |
1422 |
- "${FILESDIR}/${PN}-3.3.0-disable-local-gmock.patch" |
1423 |
-) |
1424 |
- |
1425 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
1426 |
-src_prepare() { |
1427 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
1428 |
- default |
1429 |
- eautoreconf |
1430 |
-} |
1431 |
- |
1432 |
-multilib_src_configure() { |
1433 |
- local myeconfargs=( |
1434 |
- $(use_enable static-libs static) |
1435 |
- $(use_with zlib) |
1436 |
- ) |
1437 |
- if tc-is-cross-compiler; then |
1438 |
- # The build system wants `protoc` when building, so we need a copy that |
1439 |
- # runs on the host. This is more hermetic than relying on the version |
1440 |
- # installed in the host being the exact same version. |
1441 |
- mkdir -p "${WORKDIR}"/build || die |
1442 |
- pushd "${WORKDIR}"/build >/dev/null || die |
1443 |
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" |
1444 |
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) |
1445 |
- popd >/dev/null || die |
1446 |
- fi |
1447 |
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}" |
1448 |
-} |
1449 |
- |
1450 |
-multilib_src_compile() { |
1451 |
- if tc-is-cross-compiler; then |
1452 |
- emake -C "${WORKDIR}"/build/src protoc |
1453 |
- fi |
1454 |
- |
1455 |
- default |
1456 |
- |
1457 |
- if use emacs; then |
1458 |
- elisp-compile "${S}"/editors/protobuf-mode.el |
1459 |
- fi |
1460 |
-} |
1461 |
- |
1462 |
-multilib_src_test() { |
1463 |
- emake check |
1464 |
-} |
1465 |
- |
1466 |
-multilib_src_install_all() { |
1467 |
- insinto /usr/share/vim/vimfiles/syntax |
1468 |
- doins editors/proto.vim |
1469 |
- insinto /usr/share/vim/vimfiles/ftdetect |
1470 |
- doins "${FILESDIR}/proto.vim" |
1471 |
- |
1472 |
- if use emacs; then |
1473 |
- elisp-install "${PN}" editors/protobuf-mode.el* |
1474 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1475 |
- fi |
1476 |
- |
1477 |
- if use examples; then |
1478 |
- DOCS+=( examples ) |
1479 |
- docompress -x /usr/share/doc/"${PF}"/examples |
1480 |
- fi |
1481 |
- |
1482 |
- einstalldocs |
1483 |
-} |
1484 |
- |
1485 |
-pkg_postinst() { |
1486 |
- use emacs && elisp-site-regen |
1487 |
-} |
1488 |
- |
1489 |
-pkg_postrm() { |
1490 |
- use emacs && elisp-site-regen |
1491 |
-} |