1 |
commit: 8c0dbd4ca54671e2bacedc4a686567eb862bc032 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Apr 18 18:53:35 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 19 16:39:06 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c0dbd4c |
7 |
|
8 |
dev-libs/protobuf: Delete old versions (<3.6.1.3). |
9 |
|
10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
dev-libs/protobuf/Manifest | 6 - |
14 |
.../protobuf-3.4.0-disable_no-warning-test.patch | 19 -- |
15 |
.../protobuf-3.4.0-protoc_input_output_files.patch | 233 --------------------- |
16 |
.../files/protobuf-3.4.0-system_libraries.patch | 117 ----------- |
17 |
.../files/protobuf-3.5.0-atomic_operations.patch | 21 -- |
18 |
dev-libs/protobuf/protobuf-3.5.1.1.ebuild | 106 ---------- |
19 |
dev-libs/protobuf/protobuf-3.5.2.ebuild | 104 --------- |
20 |
dev-libs/protobuf/protobuf-3.6.0.1.ebuild | 105 ---------- |
21 |
dev-libs/protobuf/protobuf-3.6.1.1.ebuild | 108 ---------- |
22 |
dev-libs/protobuf/protobuf-3.6.1.2.ebuild | 108 ---------- |
23 |
dev-libs/protobuf/protobuf-3.6.1.ebuild | 106 ---------- |
24 |
11 files changed, 1033 deletions(-) |
25 |
|
26 |
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest |
27 |
index 587e2bfbd47..ac2f8a09268 100644 |
28 |
--- a/dev-libs/protobuf/Manifest |
29 |
+++ b/dev-libs/protobuf/Manifest |
30 |
@@ -1,7 +1 @@ |
31 |
-DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496 |
32 |
-DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 |
33 |
-DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4 |
34 |
-DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88 |
35 |
-DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c |
36 |
DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e |
37 |
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 |
38 |
|
39 |
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch |
40 |
deleted file mode 100644 |
41 |
index 373dc7935a8..00000000000 |
42 |
--- a/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch |
43 |
+++ /dev/null |
44 |
@@ -1,19 +0,0 @@ |
45 |
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. |
46 |
- |
47 |
---- /src/Makefile.am |
48 |
-+++ /src/Makefile.am |
49 |
-@@ -750,7 +750,7 @@ |
50 |
- |
51 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
52 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
53 |
-- no-warning-test $(GZCHECKPROGRAMS) |
54 |
-+ $(GZCHECKPROGRAMS) |
55 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
56 |
- ../gmock/gtest/lib/libgtest.la \ |
57 |
- ../gmock/lib/libgmock.la \ |
58 |
-@@ -931,4 +931,4 @@ |
59 |
- |
60 |
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |
61 |
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ |
62 |
-- protobuf-lite-arena-test no-warning-test |
63 |
-+ protobuf-lite-arena-test |
64 |
|
65 |
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch |
66 |
deleted file mode 100644 |
67 |
index 75c4dc28ee4..00000000000 |
68 |
--- a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch |
69 |
+++ /dev/null |
70 |
@@ -1,233 +0,0 @@ |
71 |
-https://github.com/protocolbuffers/protobuf/pull/235 |
72 |
- |
73 |
---- /src/google/protobuf/compiler/command_line_interface.cc |
74 |
-+++ /src/google/protobuf/compiler/command_line_interface.cc |
75 |
-@@ -942,6 +942,28 @@ |
76 |
- } |
77 |
- |
78 |
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { |
79 |
-+ bool success = false; |
80 |
-+ int in_fd = STDIN_FILENO; |
81 |
-+ int out_fd = STDOUT_FILENO; |
82 |
-+ |
83 |
-+ if (!protobuf_in_path_.empty()) { |
84 |
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); |
85 |
-+ if (in_fd == -1) { |
86 |
-+ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl; |
87 |
-+ return 1; |
88 |
-+ } |
89 |
-+ } |
90 |
-+ if (!protobuf_out_path_.empty()) { |
91 |
-+ out_fd = open(protobuf_out_path_.c_str(), |
92 |
-+ O_WRONLY | O_CREAT | O_TRUNC, |
93 |
-+ 0644); |
94 |
-+ if (out_fd == -1) { |
95 |
-+ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl; |
96 |
-+ close(in_fd); |
97 |
-+ return 1; |
98 |
-+ } |
99 |
-+ } |
100 |
-+ |
101 |
- if (codec_type_.empty()) { |
102 |
- // HACK: Define an EmptyMessage type to use for decoding. |
103 |
- DescriptorPool pool; |
104 |
-@@ -950,13 +972,20 @@ |
105 |
- file.add_message_type()->set_name("EmptyMessage"); |
106 |
- GOOGLE_CHECK(pool.BuildFile(file) != NULL); |
107 |
- codec_type_ = "EmptyMessage"; |
108 |
-- if (!EncodeOrDecode(&pool)) { |
109 |
-- return 1; |
110 |
-- } |
111 |
-+ success = EncodeOrDecode(&pool, in_fd, out_fd); |
112 |
- } else { |
113 |
-- if (!EncodeOrDecode(descriptor_pool.get())) { |
114 |
-- return 1; |
115 |
-- } |
116 |
-+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd); |
117 |
-+ } |
118 |
-+ |
119 |
-+ if (in_fd != STDIN_FILENO) { |
120 |
-+ close(in_fd); |
121 |
-+ } |
122 |
-+ if (out_fd != STDOUT_FILENO) { |
123 |
-+ close(out_fd); |
124 |
-+ } |
125 |
-+ |
126 |
-+ if (!success) { |
127 |
-+ return 1; |
128 |
- } |
129 |
- } |
130 |
- |
131 |
-@@ -994,6 +1023,11 @@ |
132 |
- for (int i = 0; i < proto_path_.size(); i++) { |
133 |
- source_tree->MapPath(proto_path_[i].first, proto_path_[i].second); |
134 |
- } |
135 |
-+ if (mode_ == MODE_COMPILE && |
136 |
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { |
137 |
-+ std::cerr << "--protobuf_in and --protobuf_out are only valid with " |
138 |
-+ << "decode operations. Ignoring."; |
139 |
-+ } |
140 |
- |
141 |
- // Map input files to virtual paths if possible. |
142 |
- if (!MakeInputsBeProtoPathRelative(source_tree)) { |
143 |
-@@ -1561,6 +1595,12 @@ |
144 |
- |
145 |
- codec_type_ = value; |
146 |
- |
147 |
-+ } else if (name == "--protobuf_in") { |
148 |
-+ protobuf_in_path_ = value; |
149 |
-+ |
150 |
-+ } else if (name == "--protobuf_out") { |
151 |
-+ protobuf_out_path_ = value; |
152 |
-+ |
153 |
- } else if (name == "--error_format") { |
154 |
- if (value == "gcc") { |
155 |
- error_format_ = ERROR_FORMAT_GCC; |
156 |
-@@ -1684,18 +1724,29 @@ |
157 |
- " --version Show version info and exit.\n" |
158 |
- " -h, --help Show this text and exit.\n" |
159 |
- " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" |
160 |
--" from standard input and write it in binary\n" |
161 |
--" to standard output. The message type must\n" |
162 |
--" be defined in PROTO_FILES or their imports.\n" |
163 |
--" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" |
164 |
--" standard input and write it in text format\n" |
165 |
--" to standard output. The message type must\n" |
166 |
-+" an write it in binary. The message type must\n" |
167 |
- " be defined in PROTO_FILES or their imports.\n" |
168 |
--" --decode_raw Read an arbitrary protocol message from\n" |
169 |
--" standard input and write the raw tag/value\n" |
170 |
--" pairs in text format to standard output. No\n" |
171 |
-+" The input/output protobuf files are specified\n" |
172 |
-+" using the --protobuf_in and --protobuf_out\n" |
173 |
-+" command line flags.\n" |
174 |
-+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" |
175 |
-+" write it in text format. The message type\n" |
176 |
-+" must be defined in PROTO_FILES or their\n" |
177 |
-+" imports. The input/output protobuf files are\n" |
178 |
-+" specified using the --protobuf_in and \n" |
179 |
-+" --protobuf_out command line flags.\n" |
180 |
-+" --decode_raw Read an arbitrary protocol message and write\n" |
181 |
-+" the raw tag/value pairs in text format. No\n" |
182 |
- " PROTO_FILES should be given when using this\n" |
183 |
--" flag.\n" |
184 |
-+" flag. The input/output protobuf files are\n" |
185 |
-+" specified using the --protobuf_in and \n" |
186 |
-+" --protobuf_out command line flags.\n" |
187 |
-+" --protobuf_in Absolute path to the protobuf file to read to\n" |
188 |
-+" encode/decode. If omitted, file will be read\n" |
189 |
-+" from STDIN.\n" |
190 |
-+" --protobuf_out Absolute path to the protobuf file to write to\n" |
191 |
-+" after encode/decode operation. If omitted,\n" |
192 |
-+" output is written to STDOUT.\n" |
193 |
- " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" |
194 |
- " each containing a FileDescriptorSet (a\n" |
195 |
- " protocol buffer defined in descriptor.proto).\n" |
196 |
-@@ -1957,7 +2008,9 @@ |
197 |
- return true; |
198 |
- } |
199 |
- |
200 |
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { |
201 |
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, |
202 |
-+ int in_fd, |
203 |
-+ int out_fd) { |
204 |
- // Look up the type. |
205 |
- const Descriptor* type = pool->FindMessageTypeByName(codec_type_); |
206 |
- if (type == NULL) { |
207 |
-@@ -1969,15 +2022,15 @@ |
208 |
- google::protobuf::scoped_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); |
209 |
- |
210 |
- if (mode_ == MODE_ENCODE) { |
211 |
-- SetFdToTextMode(STDIN_FILENO); |
212 |
-- SetFdToBinaryMode(STDOUT_FILENO); |
213 |
-+ SetFdToTextMode(in_fd); |
214 |
-+ SetFdToBinaryMode(out_fd); |
215 |
- } else { |
216 |
-- SetFdToBinaryMode(STDIN_FILENO); |
217 |
-- SetFdToTextMode(STDOUT_FILENO); |
218 |
-+ SetFdToBinaryMode(in_fd); |
219 |
-+ SetFdToTextMode(out_fd); |
220 |
- } |
221 |
- |
222 |
-- io::FileInputStream in(STDIN_FILENO); |
223 |
-- io::FileOutputStream out(STDOUT_FILENO); |
224 |
-+ io::FileInputStream in(in_fd); |
225 |
-+ io::FileOutputStream out(out_fd); |
226 |
- |
227 |
- if (mode_ == MODE_ENCODE) { |
228 |
- // Input is text. |
229 |
---- /src/google/protobuf/compiler/command_line_interface.h |
230 |
-+++ /src/google/protobuf/compiler/command_line_interface.h |
231 |
-@@ -269,7 +269,9 @@ |
232 |
- GeneratorContext* generator_context, string* error); |
233 |
- |
234 |
- // Implements --encode and --decode. |
235 |
-- bool EncodeOrDecode(const DescriptorPool* pool); |
236 |
-+ bool EncodeOrDecode(const DescriptorPool* pool, |
237 |
-+ int in_fd, |
238 |
-+ int out_fd); |
239 |
- |
240 |
- // Implements the --descriptor_set_out option. |
241 |
- bool WriteDescriptorSet( |
242 |
-@@ -402,6 +404,13 @@ |
243 |
- // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. |
244 |
- std::vector<string> descriptor_set_in_names_; |
245 |
- |
246 |
-+ // When using --encode / --decode / --decode_raw absolute path to the output |
247 |
-+ // file. (Empty string indicates write to STDOUT). |
248 |
-+ string protobuf_out_path_; |
249 |
-+ // When using --encode / --decode / --decode_raw, absolute path to the input |
250 |
-+ // file. (Empty string indicates read from STDIN). |
251 |
-+ string protobuf_in_path_; |
252 |
-+ |
253 |
- // If --descriptor_set_out was given, this is the filename to which the |
254 |
- // FileDescriptorSet should be written. Otherwise, empty. |
255 |
- string descriptor_set_out_name_; |
256 |
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc |
257 |
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc |
258 |
-@@ -95,7 +95,7 @@ |
259 |
- virtual void SetUp(); |
260 |
- virtual void TearDown(); |
261 |
- |
262 |
-- // Runs the CommandLineInterface with the given command line. The |
263 |
-+ // Run the CommandLineInterface with the given command line. The |
264 |
- // command is automatically split on spaces, and the string "$tmpdir" |
265 |
- // is replaced with TestTempDir(). |
266 |
- void Run(const string& command); |
267 |
-@@ -2308,6 +2308,17 @@ |
268 |
- EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); |
269 |
- } |
270 |
- |
271 |
-+ void ExpectBinaryFilesMatch(const string &expected_file, |
272 |
-+ const string &actual_file) { |
273 |
-+ string expected_output, actual_output; |
274 |
-+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); |
275 |
-+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); |
276 |
-+ |
277 |
-+ // Don't use EXPECT_EQ because we don't want to print raw binary data to |
278 |
-+ // stdout on failure. |
279 |
-+ EXPECT_TRUE(expected_output == actual_output); |
280 |
-+ } |
281 |
-+ |
282 |
- private: |
283 |
- void WriteUnittestProtoDescriptorSet() { |
284 |
- unittest_proto_descriptor_set_filename_ = |
285 |
-@@ -2398,6 +2409,18 @@ |
286 |
- "google/protobuf/no_such_file.proto: No such file or directory\n"); |
287 |
- } |
288 |
- |
289 |
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) { |
290 |
-+ string out_file = TestTempDir() + "/golden_message_out.pbf"; |
291 |
-+ string cmd = ""; |
292 |
-+ cmd += "google/protobuf/unittest.proto "; |
293 |
-+ cmd += "--encode=protobuf_unittest.TestAllTypes "; |
294 |
-+ cmd += "--protobuf_in=" + TestSourceDir() + |
295 |
-+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; |
296 |
-+ cmd += "--protobuf_out=" + out_file; |
297 |
-+ EXPECT_TRUE(Run(cmd)); |
298 |
-+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); |
299 |
-+} |
300 |
-+ |
301 |
- INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource, |
302 |
- EncodeDecodeTest, |
303 |
- testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); |
304 |
|
305 |
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch |
306 |
deleted file mode 100644 |
307 |
index 424ad5ff58c..00000000000 |
308 |
--- a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch |
309 |
+++ /dev/null |
310 |
@@ -1,117 +0,0 @@ |
311 |
---- /Makefile.am |
312 |
-+++ /Makefile.am |
313 |
-@@ -8,31 +8,12 @@ |
314 |
- # the right time. |
315 |
- SUBDIRS = . src |
316 |
- |
317 |
--# Always include gmock in distributions. |
318 |
--DIST_SUBDIRS = $(subdirs) src conformance benchmarks |
319 |
-+DIST_SUBDIRS = src conformance benchmarks |
320 |
- |
321 |
--# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS |
322 |
--# because then "make check" would also build and run all of gmock's own tests, |
323 |
--# which takes a lot of time and is generally not useful to us. Also, we don't |
324 |
--# want "make install" to recurse into gmock since we don't want to overwrite |
325 |
--# the installed version of gmock if there is one. |
326 |
- check-local: |
327 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
328 |
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
329 |
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
330 |
- |
331 |
--# We would like to clean gmock when "make clean" is invoked. But we have to |
332 |
--# be careful because clean-local is also invoked during "make distclean", but |
333 |
--# "make distclean" already recurses into gmock because it's listed among the |
334 |
--# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to |
335 |
--# cd to the directory again and "make clean" it will fail. So, check that the |
336 |
--# Makefile exists before recursing. |
337 |
- clean-local: |
338 |
-- @if test -e gmock/Makefile; then \ |
339 |
-- echo "Making clean in gmock"; \ |
340 |
-- cd gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
341 |
-- fi; \ |
342 |
-- if test -e conformance/Makefile; then \ |
343 |
-+ @if test -e conformance/Makefile; then \ |
344 |
- echo "Making clean in conformance"; \ |
345 |
- cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
346 |
- fi; \ |
347 |
---- /configure.ac |
348 |
-+++ /configure.ac |
349 |
-@@ -200,12 +200,5 @@ |
350 |
- |
351 |
- AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) |
352 |
- |
353 |
--# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
354 |
--# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
355 |
--# too. |
356 |
--export CFLAGS |
357 |
--export CXXFLAGS |
358 |
--AC_CONFIG_SUBDIRS([gmock]) |
359 |
-- |
360 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
361 |
- AC_OUTPUT |
362 |
---- /src/Makefile.am |
363 |
-+++ /src/Makefile.am |
364 |
-@@ -752,11 +752,7 @@ |
365 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
366 |
- no-warning-test $(GZCHECKPROGRAMS) |
367 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
368 |
-- ../gmock/gtest/lib/libgtest.la \ |
369 |
-- ../gmock/lib/libgmock.la \ |
370 |
-- ../gmock/lib/libgmock_main.la |
371 |
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ |
372 |
-- -I$(srcdir)/../gmock/include |
373 |
-+ -lgtest -lgmock -lgmock_main |
374 |
- # Disable optimization for tests unless the user explicitly asked for it, |
375 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
376 |
- # See configure.ac for more info. |
377 |
-@@ -843,12 +839,8 @@ |
378 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
379 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
380 |
- libprotoc.la \ |
381 |
-- ../gmock/gtest/lib/libgtest.la \ |
382 |
-- ../gmock/lib/libgmock.la \ |
383 |
-- ../gmock/lib/libgmock_main.la |
384 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
385 |
-- -I$(srcdir)/../gmock/gtest/include \ |
386 |
-- -DPROTOBUF_TEST_NO_DESCRIPTORS |
387 |
-+ -lgtest -lgmock -lgmock_main |
388 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS |
389 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
390 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
391 |
- google/protobuf/compiler/cpp/cpp_unittest.cc \ |
392 |
-@@ -868,11 +860,7 @@ |
393 |
- # full runtime and we want to make sure this test builds without full |
394 |
- # runtime. |
395 |
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
396 |
-- ../gmock/gtest/lib/libgtest.la \ |
397 |
-- ../gmock/lib/libgmock.la \ |
398 |
-- ../gmock/lib/libgmock_main.la |
399 |
--protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ |
400 |
-- -I$(srcdir)/../gmock/gtest/include |
401 |
-+ -lgtest -lgmock -lgmock_main |
402 |
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
403 |
- protobuf_lite_test_SOURCES = \ |
404 |
- google/protobuf/lite_unittest.cc \ |
405 |
-@@ -883,11 +871,7 @@ |
406 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
407 |
- # memory leaks (don't know why). |
408 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
409 |
-- ../gmock/gtest/lib/libgtest.la \ |
410 |
-- ../gmock/lib/libgmock.la \ |
411 |
-- ../gmock/lib/libgmock_main.la |
412 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ |
413 |
-- -I$(srcdir)/../gmock/gtest/include |
414 |
-+ -lgtest -lgmock -lgmock_main |
415 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
416 |
- protobuf_lite_arena_test_SOURCES = \ |
417 |
- google/protobuf/lite_arena_unittest.cc \ |
418 |
-@@ -896,8 +880,7 @@ |
419 |
- |
420 |
- # Test plugin binary. |
421 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
422 |
-- ../gmock/gtest/lib/libgtest.la |
423 |
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include |
424 |
-+ -lgtest |
425 |
- test_plugin_SOURCES = \ |
426 |
- google/protobuf/compiler/mock_code_generator.cc \ |
427 |
- google/protobuf/testing/file.cc \ |
428 |
|
429 |
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch |
430 |
deleted file mode 100644 |
431 |
index 9582431d41f..00000000000 |
432 |
--- a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch |
433 |
+++ /dev/null |
434 |
@@ -1,21 +0,0 @@ |
435 |
-https://github.com/protocolbuffers/protobuf/issues/3937 |
436 |
-https://github.com/protocolbuffers/protobuf/pull/3955 |
437 |
-https://github.com/protocolbuffers/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac |
438 |
- |
439 |
---- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h |
440 |
-+++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h |
441 |
-@@ -146,6 +146,14 @@ |
442 |
- return __atomic_load_n(ptr, __ATOMIC_RELAXED); |
443 |
- } |
444 |
- |
445 |
-+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, |
446 |
-+ Atomic64 old_value, |
447 |
-+ Atomic64 new_value) { |
448 |
-+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false, |
449 |
-+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); |
450 |
-+ return old_value; |
451 |
-+} |
452 |
-+ |
453 |
- #endif // defined(__LP64__) |
454 |
- |
455 |
- } // namespace internal |
456 |
|
457 |
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild |
458 |
deleted file mode 100644 |
459 |
index b64b56a4da1..00000000000 |
460 |
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild |
461 |
+++ /dev/null |
462 |
@@ -1,106 +0,0 @@ |
463 |
-# Copyright 1999-2018 Gentoo Authors |
464 |
-# Distributed under the terms of the GNU General Public License v2 |
465 |
- |
466 |
-EAPI="6" |
467 |
- |
468 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
469 |
- |
470 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
471 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
472 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
473 |
- |
474 |
-LICENSE="BSD" |
475 |
-SLOT="0/15" |
476 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
477 |
-IUSE="emacs examples static-libs test zlib" |
478 |
- |
479 |
-RDEPEND="emacs? ( virtual/emacs ) |
480 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
481 |
-DEPEND="${RDEPEND} |
482 |
- test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
483 |
- |
484 |
-PATCHES=( |
485 |
- "${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch" |
486 |
- "${FILESDIR}/${PN}-3.4.0-system_libraries.patch" |
487 |
- "${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch" |
488 |
- "${FILESDIR}/${PN}-3.5.0-atomic_operations.patch" |
489 |
-) |
490 |
- |
491 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
492 |
- |
493 |
-src_prepare() { |
494 |
- default |
495 |
- eautoreconf |
496 |
-} |
497 |
- |
498 |
-src_configure() { |
499 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
500 |
- multilib-minimal_src_configure |
501 |
-} |
502 |
- |
503 |
-multilib_src_configure() { |
504 |
- local myeconfargs=( |
505 |
- $(use_enable static-libs static) |
506 |
- $(use_with zlib) |
507 |
- ) |
508 |
- |
509 |
- if tc-is-cross-compiler; then |
510 |
- # The build system wants `protoc` when building, so we need a copy that |
511 |
- # runs on the host. This is more hermetic than relying on the version |
512 |
- # installed in the host being the exact same version. |
513 |
- mkdir -p "${WORKDIR}/build" || die |
514 |
- pushd "${WORKDIR}/build" > /dev/null || die |
515 |
- ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}" |
516 |
- myeconfargs+=(--with-protoc="${PWD}"/src/protoc) |
517 |
- popd > /dev/null || die |
518 |
- fi |
519 |
- |
520 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
521 |
-} |
522 |
- |
523 |
-src_compile() { |
524 |
- multilib-minimal_src_compile |
525 |
- |
526 |
- if use emacs; then |
527 |
- elisp-compile editors/protobuf-mode.el |
528 |
- fi |
529 |
-} |
530 |
- |
531 |
-multilib_src_compile() { |
532 |
- if tc-is-cross-compiler; then |
533 |
- emake -C "${WORKDIR}/build/src" protoc |
534 |
- fi |
535 |
- |
536 |
- default |
537 |
-} |
538 |
- |
539 |
-multilib_src_test() { |
540 |
- emake check |
541 |
-} |
542 |
- |
543 |
-multilib_src_install_all() { |
544 |
- insinto /usr/share/vim/vimfiles/syntax |
545 |
- doins editors/proto.vim |
546 |
- insinto /usr/share/vim/vimfiles/ftdetect |
547 |
- doins "${FILESDIR}/proto.vim" |
548 |
- |
549 |
- if use emacs; then |
550 |
- elisp-install ${PN} editors/protobuf-mode.el* |
551 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
552 |
- fi |
553 |
- |
554 |
- if use examples; then |
555 |
- DOCS+=(examples) |
556 |
- docompress -x /usr/share/doc/${PF}/examples |
557 |
- fi |
558 |
- |
559 |
- einstalldocs |
560 |
-} |
561 |
- |
562 |
-pkg_postinst() { |
563 |
- use emacs && elisp-site-regen |
564 |
-} |
565 |
- |
566 |
-pkg_postrm() { |
567 |
- use emacs && elisp-site-regen |
568 |
-} |
569 |
|
570 |
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild |
571 |
deleted file mode 100644 |
572 |
index 0ed30529f28..00000000000 |
573 |
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild |
574 |
+++ /dev/null |
575 |
@@ -1,104 +0,0 @@ |
576 |
-# Copyright 1999-2018 Gentoo Authors |
577 |
-# Distributed under the terms of the GNU General Public License v2 |
578 |
- |
579 |
-EAPI="6" |
580 |
- |
581 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
582 |
- |
583 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
584 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
585 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
586 |
- |
587 |
-LICENSE="BSD" |
588 |
-SLOT="0/15" |
589 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
590 |
-IUSE="emacs examples static-libs test zlib" |
591 |
- |
592 |
-RDEPEND="emacs? ( virtual/emacs ) |
593 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
594 |
-DEPEND="${RDEPEND} |
595 |
- test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
596 |
- |
597 |
-PATCHES=( |
598 |
- "${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch" |
599 |
- "${FILESDIR}/${PN}-3.4.0-system_libraries.patch" |
600 |
- "${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch" |
601 |
- "${FILESDIR}/${PN}-3.5.0-atomic_operations.patch" |
602 |
-) |
603 |
- |
604 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
605 |
- |
606 |
-src_prepare() { |
607 |
- default |
608 |
- eautoreconf |
609 |
-} |
610 |
- |
611 |
-src_configure() { |
612 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
613 |
- multilib-minimal_src_configure |
614 |
-} |
615 |
- |
616 |
-multilib_src_configure() { |
617 |
- local options=( |
618 |
- $(use_enable static-libs static) |
619 |
- $(use_with zlib) |
620 |
- ) |
621 |
- |
622 |
- if tc-is-cross-compiler; then |
623 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
624 |
- mkdir -p "${WORKDIR}/build" || die |
625 |
- pushd "${WORKDIR}/build" > /dev/null || die |
626 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
627 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
628 |
- popd > /dev/null || die |
629 |
- fi |
630 |
- |
631 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
632 |
-} |
633 |
- |
634 |
-src_compile() { |
635 |
- multilib-minimal_src_compile |
636 |
- |
637 |
- if use emacs; then |
638 |
- elisp-compile editors/protobuf-mode.el |
639 |
- fi |
640 |
-} |
641 |
- |
642 |
-multilib_src_compile() { |
643 |
- if tc-is-cross-compiler; then |
644 |
- emake -C "${WORKDIR}/build/src" protoc |
645 |
- fi |
646 |
- |
647 |
- default |
648 |
-} |
649 |
- |
650 |
-multilib_src_test() { |
651 |
- emake check |
652 |
-} |
653 |
- |
654 |
-multilib_src_install_all() { |
655 |
- insinto /usr/share/vim/vimfiles/syntax |
656 |
- doins editors/proto.vim |
657 |
- insinto /usr/share/vim/vimfiles/ftdetect |
658 |
- doins "${FILESDIR}/proto.vim" |
659 |
- |
660 |
- if use emacs; then |
661 |
- elisp-install ${PN} editors/protobuf-mode.el* |
662 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
663 |
- fi |
664 |
- |
665 |
- if use examples; then |
666 |
- DOCS+=(examples) |
667 |
- docompress -x /usr/share/doc/${PF}/examples |
668 |
- fi |
669 |
- |
670 |
- einstalldocs |
671 |
-} |
672 |
- |
673 |
-pkg_postinst() { |
674 |
- use emacs && elisp-site-regen |
675 |
-} |
676 |
- |
677 |
-pkg_postrm() { |
678 |
- use emacs && elisp-site-regen |
679 |
-} |
680 |
|
681 |
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild |
682 |
deleted file mode 100644 |
683 |
index fc490f98194..00000000000 |
684 |
--- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild |
685 |
+++ /dev/null |
686 |
@@ -1,105 +0,0 @@ |
687 |
-# Copyright 1999-2018 Gentoo Authors |
688 |
-# Distributed under the terms of the GNU General Public License v2 |
689 |
- |
690 |
-EAPI="6" |
691 |
- |
692 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
693 |
- |
694 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
695 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
696 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
697 |
- |
698 |
-LICENSE="BSD" |
699 |
-SLOT="0/16" |
700 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
701 |
-IUSE="emacs examples static-libs test zlib" |
702 |
- |
703 |
-RDEPEND="emacs? ( virtual/emacs ) |
704 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
705 |
-DEPEND="${RDEPEND} |
706 |
- test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
707 |
- |
708 |
-PATCHES=( |
709 |
- "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" |
710 |
- "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" |
711 |
- "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" |
712 |
-) |
713 |
- |
714 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
715 |
- |
716 |
-src_prepare() { |
717 |
- default |
718 |
- eautoreconf |
719 |
-} |
720 |
- |
721 |
-src_configure() { |
722 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
723 |
- multilib-minimal_src_configure |
724 |
-} |
725 |
- |
726 |
-multilib_src_configure() { |
727 |
- local options=( |
728 |
- $(use_enable static-libs static) |
729 |
- $(use_with zlib) |
730 |
- ) |
731 |
- |
732 |
- if tc-is-cross-compiler; then |
733 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
734 |
- mkdir -p "${WORKDIR}/build" || die |
735 |
- pushd "${WORKDIR}/build" > /dev/null || die |
736 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
737 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
738 |
- popd > /dev/null || die |
739 |
- fi |
740 |
- |
741 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
742 |
-} |
743 |
- |
744 |
-src_compile() { |
745 |
- multilib-minimal_src_compile |
746 |
- |
747 |
- if use emacs; then |
748 |
- elisp-compile editors/protobuf-mode.el |
749 |
- fi |
750 |
-} |
751 |
- |
752 |
-multilib_src_compile() { |
753 |
- if tc-is-cross-compiler; then |
754 |
- emake -C "${WORKDIR}/build/src" protoc |
755 |
- fi |
756 |
- |
757 |
- default |
758 |
-} |
759 |
- |
760 |
-multilib_src_test() { |
761 |
- emake check |
762 |
-} |
763 |
- |
764 |
-multilib_src_install_all() { |
765 |
- find "${D}" -name "*.la" -delete || die |
766 |
- |
767 |
- insinto /usr/share/vim/vimfiles/syntax |
768 |
- doins editors/proto.vim |
769 |
- insinto /usr/share/vim/vimfiles/ftdetect |
770 |
- doins "${FILESDIR}/proto.vim" |
771 |
- |
772 |
- if use emacs; then |
773 |
- elisp-install ${PN} editors/protobuf-mode.el* |
774 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
775 |
- fi |
776 |
- |
777 |
- if use examples; then |
778 |
- DOCS+=(examples) |
779 |
- docompress -x /usr/share/doc/${PF}/examples |
780 |
- fi |
781 |
- |
782 |
- einstalldocs |
783 |
-} |
784 |
- |
785 |
-pkg_postinst() { |
786 |
- use emacs && elisp-site-regen |
787 |
-} |
788 |
- |
789 |
-pkg_postrm() { |
790 |
- use emacs && elisp-site-regen |
791 |
-} |
792 |
|
793 |
diff --git a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.1.ebuild |
794 |
deleted file mode 100644 |
795 |
index 1d00ee9032f..00000000000 |
796 |
--- a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild |
797 |
+++ /dev/null |
798 |
@@ -1,108 +0,0 @@ |
799 |
-# Copyright 2008-2018 Gentoo Authors |
800 |
-# Distributed under the terms of the GNU General Public License v2 |
801 |
- |
802 |
-EAPI="7" |
803 |
- |
804 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
805 |
- |
806 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
807 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
808 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
809 |
- |
810 |
-LICENSE="BSD" |
811 |
-SLOT="0/17" |
812 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
813 |
-IUSE="emacs examples static-libs test zlib" |
814 |
-RESTRICT="!test? ( test )" |
815 |
- |
816 |
-BDEPEND="emacs? ( virtual/emacs )" |
817 |
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) |
818 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
819 |
-RDEPEND="emacs? ( virtual/emacs ) |
820 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
821 |
- |
822 |
-PATCHES=( |
823 |
- "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" |
824 |
- "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" |
825 |
- "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" |
826 |
- "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" |
827 |
-) |
828 |
- |
829 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
830 |
- |
831 |
-src_prepare() { |
832 |
- default |
833 |
- eautoreconf |
834 |
-} |
835 |
- |
836 |
-src_configure() { |
837 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
838 |
- multilib-minimal_src_configure |
839 |
-} |
840 |
- |
841 |
-multilib_src_configure() { |
842 |
- local options=( |
843 |
- $(use_enable static-libs static) |
844 |
- $(use_with zlib) |
845 |
- ) |
846 |
- |
847 |
- if tc-is-cross-compiler; then |
848 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
849 |
- mkdir -p "${WORKDIR}/build" || die |
850 |
- pushd "${WORKDIR}/build" > /dev/null || die |
851 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
852 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
853 |
- popd > /dev/null || die |
854 |
- fi |
855 |
- |
856 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
857 |
-} |
858 |
- |
859 |
-src_compile() { |
860 |
- multilib-minimal_src_compile |
861 |
- |
862 |
- if use emacs; then |
863 |
- elisp-compile editors/protobuf-mode.el |
864 |
- fi |
865 |
-} |
866 |
- |
867 |
-multilib_src_compile() { |
868 |
- if tc-is-cross-compiler; then |
869 |
- emake -C "${WORKDIR}/build/src" protoc |
870 |
- fi |
871 |
- |
872 |
- default |
873 |
-} |
874 |
- |
875 |
-multilib_src_test() { |
876 |
- emake check |
877 |
-} |
878 |
- |
879 |
-multilib_src_install_all() { |
880 |
- find "${D}" -name "*.la" -delete || die |
881 |
- |
882 |
- insinto /usr/share/vim/vimfiles/syntax |
883 |
- doins editors/proto.vim |
884 |
- insinto /usr/share/vim/vimfiles/ftdetect |
885 |
- doins "${FILESDIR}/proto.vim" |
886 |
- |
887 |
- if use emacs; then |
888 |
- elisp-install ${PN} editors/protobuf-mode.el* |
889 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
890 |
- fi |
891 |
- |
892 |
- if use examples; then |
893 |
- DOCS+=(examples) |
894 |
- docompress -x /usr/share/doc/${PF}/examples |
895 |
- fi |
896 |
- |
897 |
- einstalldocs |
898 |
-} |
899 |
- |
900 |
-pkg_postinst() { |
901 |
- use emacs && elisp-site-regen |
902 |
-} |
903 |
- |
904 |
-pkg_postrm() { |
905 |
- use emacs && elisp-site-regen |
906 |
-} |
907 |
|
908 |
diff --git a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild b/dev-libs/protobuf/protobuf-3.6.1.2.ebuild |
909 |
deleted file mode 100644 |
910 |
index 1d00ee9032f..00000000000 |
911 |
--- a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild |
912 |
+++ /dev/null |
913 |
@@ -1,108 +0,0 @@ |
914 |
-# Copyright 2008-2018 Gentoo Authors |
915 |
-# Distributed under the terms of the GNU General Public License v2 |
916 |
- |
917 |
-EAPI="7" |
918 |
- |
919 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
920 |
- |
921 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
922 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
923 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
924 |
- |
925 |
-LICENSE="BSD" |
926 |
-SLOT="0/17" |
927 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
928 |
-IUSE="emacs examples static-libs test zlib" |
929 |
-RESTRICT="!test? ( test )" |
930 |
- |
931 |
-BDEPEND="emacs? ( virtual/emacs )" |
932 |
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) |
933 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
934 |
-RDEPEND="emacs? ( virtual/emacs ) |
935 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
936 |
- |
937 |
-PATCHES=( |
938 |
- "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" |
939 |
- "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" |
940 |
- "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" |
941 |
- "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" |
942 |
-) |
943 |
- |
944 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
945 |
- |
946 |
-src_prepare() { |
947 |
- default |
948 |
- eautoreconf |
949 |
-} |
950 |
- |
951 |
-src_configure() { |
952 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
953 |
- multilib-minimal_src_configure |
954 |
-} |
955 |
- |
956 |
-multilib_src_configure() { |
957 |
- local options=( |
958 |
- $(use_enable static-libs static) |
959 |
- $(use_with zlib) |
960 |
- ) |
961 |
- |
962 |
- if tc-is-cross-compiler; then |
963 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
964 |
- mkdir -p "${WORKDIR}/build" || die |
965 |
- pushd "${WORKDIR}/build" > /dev/null || die |
966 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
967 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
968 |
- popd > /dev/null || die |
969 |
- fi |
970 |
- |
971 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
972 |
-} |
973 |
- |
974 |
-src_compile() { |
975 |
- multilib-minimal_src_compile |
976 |
- |
977 |
- if use emacs; then |
978 |
- elisp-compile editors/protobuf-mode.el |
979 |
- fi |
980 |
-} |
981 |
- |
982 |
-multilib_src_compile() { |
983 |
- if tc-is-cross-compiler; then |
984 |
- emake -C "${WORKDIR}/build/src" protoc |
985 |
- fi |
986 |
- |
987 |
- default |
988 |
-} |
989 |
- |
990 |
-multilib_src_test() { |
991 |
- emake check |
992 |
-} |
993 |
- |
994 |
-multilib_src_install_all() { |
995 |
- find "${D}" -name "*.la" -delete || die |
996 |
- |
997 |
- insinto /usr/share/vim/vimfiles/syntax |
998 |
- doins editors/proto.vim |
999 |
- insinto /usr/share/vim/vimfiles/ftdetect |
1000 |
- doins "${FILESDIR}/proto.vim" |
1001 |
- |
1002 |
- if use emacs; then |
1003 |
- elisp-install ${PN} editors/protobuf-mode.el* |
1004 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1005 |
- fi |
1006 |
- |
1007 |
- if use examples; then |
1008 |
- DOCS+=(examples) |
1009 |
- docompress -x /usr/share/doc/${PF}/examples |
1010 |
- fi |
1011 |
- |
1012 |
- einstalldocs |
1013 |
-} |
1014 |
- |
1015 |
-pkg_postinst() { |
1016 |
- use emacs && elisp-site-regen |
1017 |
-} |
1018 |
- |
1019 |
-pkg_postrm() { |
1020 |
- use emacs && elisp-site-regen |
1021 |
-} |
1022 |
|
1023 |
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild |
1024 |
deleted file mode 100644 |
1025 |
index c8c5f7d7e2f..00000000000 |
1026 |
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild |
1027 |
+++ /dev/null |
1028 |
@@ -1,106 +0,0 @@ |
1029 |
-# Copyright 1999-2018 Gentoo Authors |
1030 |
-# Distributed under the terms of the GNU General Public License v2 |
1031 |
- |
1032 |
-EAPI="6" |
1033 |
- |
1034 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
1035 |
- |
1036 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
1037 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
1038 |
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
1039 |
- |
1040 |
-LICENSE="BSD" |
1041 |
-SLOT="0/17" |
1042 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
1043 |
-IUSE="emacs examples static-libs test zlib" |
1044 |
- |
1045 |
-RDEPEND="emacs? ( virtual/emacs ) |
1046 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
1047 |
-DEPEND="${RDEPEND} |
1048 |
- test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
1049 |
- |
1050 |
-PATCHES=( |
1051 |
- "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" |
1052 |
- "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" |
1053 |
- "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" |
1054 |
- "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" |
1055 |
-) |
1056 |
- |
1057 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
1058 |
- |
1059 |
-src_prepare() { |
1060 |
- default |
1061 |
- eautoreconf |
1062 |
-} |
1063 |
- |
1064 |
-src_configure() { |
1065 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
1066 |
- multilib-minimal_src_configure |
1067 |
-} |
1068 |
- |
1069 |
-multilib_src_configure() { |
1070 |
- local options=( |
1071 |
- $(use_enable static-libs static) |
1072 |
- $(use_with zlib) |
1073 |
- ) |
1074 |
- |
1075 |
- if tc-is-cross-compiler; then |
1076 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
1077 |
- mkdir -p "${WORKDIR}/build" || die |
1078 |
- pushd "${WORKDIR}/build" > /dev/null || die |
1079 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
1080 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
1081 |
- popd > /dev/null || die |
1082 |
- fi |
1083 |
- |
1084 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
1085 |
-} |
1086 |
- |
1087 |
-src_compile() { |
1088 |
- multilib-minimal_src_compile |
1089 |
- |
1090 |
- if use emacs; then |
1091 |
- elisp-compile editors/protobuf-mode.el |
1092 |
- fi |
1093 |
-} |
1094 |
- |
1095 |
-multilib_src_compile() { |
1096 |
- if tc-is-cross-compiler; then |
1097 |
- emake -C "${WORKDIR}/build/src" protoc |
1098 |
- fi |
1099 |
- |
1100 |
- default |
1101 |
-} |
1102 |
- |
1103 |
-multilib_src_test() { |
1104 |
- emake check |
1105 |
-} |
1106 |
- |
1107 |
-multilib_src_install_all() { |
1108 |
- find "${D}" -name "*.la" -delete || die |
1109 |
- |
1110 |
- insinto /usr/share/vim/vimfiles/syntax |
1111 |
- doins editors/proto.vim |
1112 |
- insinto /usr/share/vim/vimfiles/ftdetect |
1113 |
- doins "${FILESDIR}/proto.vim" |
1114 |
- |
1115 |
- if use emacs; then |
1116 |
- elisp-install ${PN} editors/protobuf-mode.el* |
1117 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
1118 |
- fi |
1119 |
- |
1120 |
- if use examples; then |
1121 |
- DOCS+=(examples) |
1122 |
- docompress -x /usr/share/doc/${PF}/examples |
1123 |
- fi |
1124 |
- |
1125 |
- einstalldocs |
1126 |
-} |
1127 |
- |
1128 |
-pkg_postinst() { |
1129 |
- use emacs && elisp-site-regen |
1130 |
-} |
1131 |
- |
1132 |
-pkg_postrm() { |
1133 |
- use emacs && elisp-site-regen |
1134 |
-} |