diff options
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch | 28 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 14 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch | 256 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch | 89 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch | 101 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch | 115 | ||||
| -rw-r--r-- | dev-libs/protobuf/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 132 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 158 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild | 107 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-3.0.2.ebuild | 111 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-3.1.0.ebuild | 110 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-3.3.0.ebuild | 108 |
15 files changed, 0 insertions, 1354 deletions
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index d919674fdff7..aa6d99043ce0 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,9 +1,3 @@ -DIST protobuf-2.5.0.tar.bz2 1866763 BLAKE2B e4cece402bbeaff4400732ee2401f1a80bb0e70728eb41052da26b969b6fa6672b11ca80e28343d03a9df97c72bb8d8e2f890b9b730bad3c23c829aaf36ff701 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee -DIST protobuf-2.6.1.tar.bz2 2021416 BLAKE2B f58178a6081d58fff1582a907dfb9087f07b72e0701f19649b3adc9e1827a0f2670e25c6d177e60a59b965b3622b1eb11590b4b17083ee148c0da7eb07f02e55 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 -DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b -DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 -DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a -DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 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 deleted file mode 100644 index 418622e547f4..000000000000 --- a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixing as-needed issue - -http://bugs.gentoo.org/show_bug.cgi?id=271509 - ---- m4/acx_pthread.m4 -+++ m4/acx_pthread.m4 -@@ -278,7 +278,8 @@ - fi - fi - -- if test x"$done" = xno; then -+ if test x"$done" = xyes; then -+ done="no" - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); ---- gtest/m4/acx_pthread.m4 -+++ gtest/m4/acx_pthread.m4 -@@ -278,7 +278,8 @@ - fi - fi - -- if test x"$done" = xno; then -+ if test x"$done" = xyes; then -+ done="no" - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); 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 deleted file mode 100644 index 77d624938243..000000000000 --- a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix build with emacs-24.4. - -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 - ---- protobuf-2.5.0/editors/protobuf-mode.el -+++ protobuf-2.5.0/editors/protobuf-mode.el -@@ -66,6 +66,7 @@ - (require 'cc-mode) - - (eval-when-compile -+ (require 'cl) - (require 'cc-langs) - (require 'cc-fonts)) - diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch deleted file mode 100644 index 5c8d47831807..000000000000 --- a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch +++ /dev/null @@ -1,15 +0,0 @@ -fix from upstream for building w/x32 - -https://code.google.com/p/protobuf/issues/detail?id=474 - ---- src/google/protobuf/stubs/atomicops.h (revision 491) -+++ src/google/protobuf/stubs/atomicops.h (revision 492) -@@ -66,7 +66,7 @@ typedef int32 Atomic32; - #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT - // We need to be able to go between Atomic64 and AtomicWord implicitly. This - // means Atomic64 and AtomicWord should be the same type on 64-bit. --#if defined(GOOGLE_PROTOBUF_OS_NACL) -+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL) - // NaCl's intptr_t is not actually 64-bits on 64-bit! - // http://code.google.com/p/nativeclient/issues/detail?id=1162 - typedef int64 Atomic64; 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 deleted file mode 100644 index 894f2ffd095f..000000000000 --- a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch +++ /dev/null @@ -1,256 +0,0 @@ -https://github.com/google/protobuf/pull/235 - -From 18f71a50a9000e7558ae48a971fa301d76220ff0 Mon Sep 17 00:00:00 2001 -From: Prathmesh Prabhu <pprabhu@chromium.org> -Date: Tue, 10 Mar 2015 17:04:40 -0400 -Subject: [PATCH] protoc: Add options to redirect input/output to files. - -When using protoc to encode/decode protobufs, the input/output was from -stdin/stdout only. This patch adds command line flags to specify files to read -the protobuf from and and write the encoded/decoded protobuf to. ---- - .../protobuf/compiler/command_line_interface.cc | 99 +++++++++++++++++----- - .../protobuf/compiler/command_line_interface.h | 11 ++- - .../compiler/command_line_interface_unittest.cc | 25 +++++- - 3 files changed, 110 insertions(+), 25 deletions(-) - -diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc -index 567238a..1db85c9 100644 ---- a/src/google/protobuf/compiler/command_line_interface.cc -+++ b/src/google/protobuf/compiler/command_line_interface.cc -@@ -745,6 +745,28 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { - } - - if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { -+ bool success = false; -+ int in_fd = STDIN_FILENO; -+ int out_fd = STDOUT_FILENO; -+ -+ if (!protobuf_in_path_.empty()) { -+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); -+ if (in_fd == -1) { -+ cerr << protobuf_in_path_ << ": error: failed to open file." << endl; -+ return 1; -+ } -+ } -+ if (!protobuf_out_path_.empty()) { -+ out_fd = open(protobuf_out_path_.c_str(), -+ O_WRONLY | O_CREAT | O_TRUNC, -+ 0644); -+ if (out_fd == -1) { -+ cerr << protobuf_out_path_ << ": error: failed to open file." << endl; -+ close(in_fd); -+ return 1; -+ } -+ } -+ - if (codec_type_.empty()) { - // HACK: Define an EmptyMessage type to use for decoding. - DescriptorPool pool; -@@ -753,13 +775,20 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { - file.add_message_type()->set_name("EmptyMessage"); - GOOGLE_CHECK(pool.BuildFile(file) != NULL); - codec_type_ = "EmptyMessage"; -- if (!EncodeOrDecode(&pool)) { -- return 1; -- } -+ success = EncodeOrDecode(&pool, in_fd, out_fd); - } else { -- if (!EncodeOrDecode(importer.pool())) { -- return 1; -- } -+ success = EncodeOrDecode(importer.pool(), in_fd, out_fd); -+ } -+ -+ if (in_fd != STDIN_FILENO) { -+ close(in_fd); -+ } -+ if (out_fd != STDOUT_FILENO) { -+ close(out_fd); -+ } -+ -+ if (!success) { -+ return 1; - } - } - -@@ -873,6 +902,11 @@ CommandLineInterface::ParseArguments(int argc, const char* const argv[]) { - if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE) - return status; - } -+ if (mode_ == MODE_COMPILE && -+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { -+ cerr << "--protobuf_in and --protobuf_out are only valid with " -+ << "decode operations. Ignoring."; -+ } - - // If no --proto_path was given, use the current working directory. - if (proto_path_.empty()) { -@@ -1123,6 +1157,12 @@ CommandLineInterface::InterpretArgument(const string& name, - - codec_type_ = value; - -+ } else if (name == "--protobuf_in") { -+ protobuf_in_path_ = value; -+ -+ } else if (name == "--protobuf_out") { -+ protobuf_out_path_ = value; -+ - } else if (name == "--error_format") { - if (value == "gcc") { - error_format_ = ERROR_FORMAT_GCC; -@@ -1238,18 +1278,29 @@ void CommandLineInterface::PrintHelpText() { - " --version Show version info and exit.\n" - " -h, --help Show this text and exit.\n" - " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" --" from standard input and write it in binary\n" --" to standard output. The message type must\n" --" be defined in PROTO_FILES or their imports.\n" --" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" --" standard input and write it in text format\n" --" to standard output. The message type must\n" -+" an write it in binary. The message type must\n" - " be defined in PROTO_FILES or their imports.\n" --" --decode_raw Read an arbitrary protocol message from\n" --" standard input and write the raw tag/value\n" --" pairs in text format to standard output. No\n" -+" The input/output protobuf files are specified\n" -+" using the --protobuf_in and --protobuf_out\n" -+" command line flags.\n" -+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" -+" write it in text format. The message type\n" -+" must be defined in PROTO_FILES or their\n" -+" imports. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --decode_raw Read an arbitrary protocol message and write\n" -+" the raw tag/value pairs in text format. No\n" - " PROTO_FILES should be given when using this\n" --" flag.\n" -+" flag. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --protobuf_in Absolute path to the protobuf file to read to\n" -+" encode/decode. If omitted, file will be read\n" -+" from STDIN.\n" -+" --protobuf_out Absolute path to the protobuf file to write to\n" -+" after encode/decode operation. If omitted,\n" -+" output is written to STDOUT.\n" - " -oFILE, Writes a FileDescriptorSet (a protocol buffer,\n" - " --descriptor_set_out=FILE defined in descriptor.proto) containing all of\n" - " the input files to FILE.\n" -@@ -1490,7 +1541,9 @@ bool CommandLineInterface::GeneratePluginOutput( - return true; - } - --bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { -+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd) { - // Look up the type. - const Descriptor* type = pool->FindMessageTypeByName(codec_type_); - if (type == NULL) { -@@ -1502,15 +1555,15 @@ bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { - google::protobuf::scoped_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); - - if (mode_ == MODE_ENCODE) { -- SetFdToTextMode(STDIN_FILENO); -- SetFdToBinaryMode(STDOUT_FILENO); -+ SetFdToTextMode(in_fd); -+ SetFdToBinaryMode(out_fd); - } else { -- SetFdToBinaryMode(STDIN_FILENO); -- SetFdToTextMode(STDOUT_FILENO); -+ SetFdToBinaryMode(in_fd); -+ SetFdToTextMode(out_fd); - } - -- io::FileInputStream in(STDIN_FILENO); -- io::FileOutputStream out(STDOUT_FILENO); -+ io::FileInputStream in(in_fd); -+ io::FileOutputStream out(out_fd); - - if (mode_ == MODE_ENCODE) { - // Input is text. -diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h -index 7e611c4..b6fc38a 100644 ---- a/src/google/protobuf/compiler/command_line_interface.h -+++ b/src/google/protobuf/compiler/command_line_interface.h -@@ -244,7 +244,9 @@ class LIBPROTOC_EXPORT CommandLineInterface { - string* error); - - // Implements --encode and --decode. -- bool EncodeOrDecode(const DescriptorPool* pool); -+ bool EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd); - - // Implements the --descriptor_set_out option. - bool WriteDescriptorSet(const vector<const FileDescriptor*> parsed_files); -@@ -357,6 +359,13 @@ class LIBPROTOC_EXPORT CommandLineInterface { - // decoding. (Empty string indicates --decode_raw.) - string codec_type_; - -+ // When using --encode / --decode / --decode_raw absolute path to the output -+ // file. (Empty string indicates write to STDOUT). -+ string protobuf_out_path_; -+ // When using --encode / --decode / --decode_raw, absolute path to the input -+ // file. (Empty string indicates read from STDIN). -+ string protobuf_in_path_; -+ - // If --descriptor_set_out was given, this is the filename to which the - // FileDescriptorSet should be written. Otherwise, empty. - string descriptor_set_name_; -diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc -index 2b26f3b..78ff2cf 100644 ---- a/src/google/protobuf/compiler/command_line_interface_unittest.cc -+++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc -@@ -94,7 +94,7 @@ class CommandLineInterfaceTest : public testing::Test { - virtual void SetUp(); - virtual void TearDown(); - -- // Runs the CommandLineInterface with the given command line. The -+ // Run the CommandLineInterface with the given command line. The - // command is automatically split on spaces, and the string "$tmpdir" - // is replaced with TestTempDir(). - void Run(const string& command); -@@ -1680,6 +1680,17 @@ class EncodeDecodeTest : public testing::Test { - EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); - } - -+ void ExpectBinaryFilesMatch(const string &expected_file, -+ const string &actual_file) { -+ string expected_output, actual_output; -+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); -+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); -+ -+ // Don't use EXPECT_EQ because we don't want to print raw binary data to -+ // stdout on failure. -+ EXPECT_TRUE(expected_output == actual_output); -+ } -+ - private: - int duped_stdin_; - string captured_stdout_; -@@ -1745,6 +1756,18 @@ TEST_F(EncodeDecodeTest, ProtoParseError) { - "google/protobuf/no_such_file.proto: File not found.\n"); - } - -+TEST_F(EncodeDecodeTest, RedirectInputOutput) { -+ string out_file = TestTempDir() + "/golden_message_out.pbf"; -+ string cmd = ""; -+ cmd += "google/protobuf/unittest.proto "; -+ cmd += "--encode=protobuf_unittest.TestAllTypes "; -+ cmd += "--protobuf_in=" + TestSourceDir() + -+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; -+ cmd += "--protobuf_out=" + out_file; -+ EXPECT_TRUE(Run(cmd)); -+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); -+} -+ - } // anonymous namespace - - } // namespace compiler --- -2.3.1 - 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 deleted file mode 100644 index 341d1128aa1a..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2015-12-30 22:21:46.000000000 +0100 -+++ b/configure.ac 2016-04-16 17:46:54.858904639 +0200 -@@ -176,9 +176,9 @@ - # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, - # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock - # too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -+#export CFLAGS -+#export CXXFLAGS -+#AC_CONFIG_SUBDIRS([gmock]) - - AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT -diff -Naur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/Makefile.am 2016-04-16 17:46:25.355751203 +0200 -@@ -17,9 +17,10 @@ - # want "make install" to recurse into gmock since we don't want to overwrite - # the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -+ @echo "Making of gmock disabled" -+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - - # We would like to clean gmock when "make clean" is invoked. But we have to - # be careful because clean-local is also invoked during "make distclean", but -diff -Naur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/src/Makefile.am 2016-04-16 17:47:07.026967535 +0200 -@@ -669,11 +669,8 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_test_CPPFLAGS = -I/usr/include - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -753,11 +750,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ -@@ -788,11 +782,8 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -801,8 +792,8 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -+test_plugin_CPPFLAGS = -I/usr/include - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ 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 deleted file mode 100644 index a2dda8aafac1..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -Naur protobuf-3.0.2.orig/Makefile.am protobuf-3.0.2/Makefile.am ---- protobuf-3.0.2.orig/Makefile.am 2016-09-06 15:40:51.000000000 -0700 -+++ protobuf-3.0.2/Makefile.am 2016-12-14 14:44:50.516520874 -0800 -@@ -17,9 +17,10 @@ - # want "make install" to recurse into gmock since we don't want to overwrite - # the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -+ @echo "Making of gmock disabled" -+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - - # We would like to clean gmock when "make clean" is invoked. But we have to - # be careful because clean-local is also invoked during "make distclean", but -diff -Naur protobuf-3.0.2.orig/configure.ac protobuf-3.0.2/configure.ac ---- protobuf-3.0.2.orig/configure.ac 2016-09-06 15:40:51.000000000 -0700 -+++ protobuf-3.0.2/configure.ac 2016-12-14 14:44:50.516520874 -0800 -@@ -181,9 +181,9 @@ - # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, - # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock - # too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -+#export CFLAGS -+#export CXXFLAGS -+#AC_CONFIG_SUBDIRS([gmock]) - - AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT -diff -Naur protobuf-3.0.2.orig/src/Makefile.am protobuf-3.0.2/src/Makefile.am ---- protobuf-3.0.2.orig/src/Makefile.am 2016-09-06 15:40:51.000000000 -0700 -+++ protobuf-3.0.2/src/Makefile.am 2016-12-14 14:44:50.517520885 -0800 -@@ -688,11 +688,8 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - no-warning-test $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_test_CPPFLAGS = -I/usr/include - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -775,11 +772,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ -@@ -810,11 +804,8 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -823,8 +814,8 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -+test_plugin_CPPFLAGS = -I/usr/include - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ -@@ -853,9 +844,8 @@ - echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc - - no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/gtest/lib/libgtest_main.la --no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -lgtest_main -+no_warning_test_CPPFLAGS = -I/usr/include - no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ - -Wall -Werror - nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) 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 deleted file mode 100644 index 25dc7bd074bf..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Naur protobuf-3.3.0.orig/Makefile.am protobuf-3.3.0/Makefile.am ---- protobuf-3.3.0.orig/Makefile.am 2017-05-01 20:04:35.448840428 -0700 -+++ protobuf-3.3.0/Makefile.am 2017-05-01 20:04:48.855978898 -0700 -@@ -17,9 +17,10 @@ - # want "make install" to recurse into gmock since we don't want to overwrite - # the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -+ @echo "Making of gmock disabled" -+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - - # We would like to clean gmock when "make clean" is invoked. But we have to - # be careful because clean-local is also invoked during "make distclean", but -diff -Naur protobuf-3.3.0.orig/configure.ac protobuf-3.3.0/configure.ac ---- protobuf-3.3.0.orig/configure.ac 2017-05-01 20:04:35.497840933 -0700 -+++ protobuf-3.3.0/configure.ac 2017-05-01 20:04:48.856978908 -0700 -@@ -203,9 +203,9 @@ - # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, - # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock - # too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -+#export CFLAGS -+#export CXXFLAGS -+#AC_CONFIG_SUBDIRS([gmock]) - - AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT -diff -Naur protobuf-3.3.0.orig/src/Makefile.am protobuf-3.3.0/src/Makefile.am ---- protobuf-3.3.0.orig/src/Makefile.am 2017-05-01 20:04:35.549841471 -0700 -+++ protobuf-3.3.0/src/Makefile.am 2017-05-01 20:06:46.307191948 -0700 -@@ -748,11 +748,8 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - no-warning-test $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_test_CPPFLAGS = -I/usr/include - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -837,11 +834,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ -@@ -862,11 +856,8 @@ - # full runtime and we want to make sure this test builds without full - # runtime. - protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_test_CPPFLAGS = -I/usr/include - protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_test_SOURCES = \ - google/protobuf/lite_unittest.cc \ -@@ -877,11 +868,8 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -890,8 +878,8 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -+test_plugin_CPPFLAGS = -I/usr/include - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ -@@ -920,9 +908,8 @@ - echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc - - no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/gtest/lib/libgtest_main.la --no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -lgtest_main -+no_warning_test_CPPFLAGS = -I/usr/include - no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ - -Wall -Werror - nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml index 27b704401617..6aeca898035f 100644 --- a/dev-libs/protobuf/metadata.xml +++ b/dev-libs/protobuf/metadata.xml @@ -12,10 +12,6 @@ <slots> <subslots>Soname version number</subslots> </slots> - <use> - <flag name="java">Builds the Java implementation. This is not needed for Java support in protoc.</flag> - <flag name="python">Builds the Python implementation. This is not needed for Python support in protoc.</flag> - </use> <upstream> <remote-id type="github">google/protobuf</remote-id> </upstream> diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild deleted file mode 100644 index 5c13a2976edf..000000000000 --- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -JAVA_PKG_IUSE="source" -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://code.google.com/p/protobuf/" -SRC_URI="https://protobuf.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/8" # subslot = soname major version -KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs vim-syntax" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND="emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${CDEPEND} - java? ( >=virtual/jdk-1.5 ) - python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.5 )" - -src_prepare() { - append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI - - epatch "${FILESDIR}"/${P}-x32.patch - - # breaks Darwin, bug #472514 - [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - - # fix build with emacs-24.4 (bug #524100) - epatch "${FILESDIR}"/${P}-emacs-24.4.patch - - autotools-multilib_src_prepare - - if use python; then - cd python && distutils-r1_src_prepare - fi -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - if use python; then - einfo "Compiling Python library ..." - pushd "${S}"/python >/dev/null - PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile - popd >/dev/null - fi - - if use java; then - einfo "Compiling Java library ..." - pushd "${S}" >/dev/null - "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto - mkdir java/build - pushd java/src/main/java >/dev/null - ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" - popd >/dev/null - jar cf ${PN}.jar -C java/build . || die "jar failed" - popd >/dev/null - fi - fi -} - -src_compile() { - autotools-multilib_src_compile - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -src_test() { - autotools-multilib_src_test check - - if use python; then - pushd python >/dev/null - distutils-r1_src_test - popd >/dev/null - fi -} - -src_install() { - autotools-multilib_src_install - - dodoc CHANGES.txt CONTRIBUTORS.txt README.txt - - if use python; then - pushd python >/dev/null - distutils-r1_src_install - popd >/dev/null - fi - - if use java; then - java-pkg_dojar ${PN}.jar - use source && java-pkg_dosrc java/src/main/java/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}"/proto.vim - fi - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el - fi - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild deleted file mode 100644 index 8d93c1be7e41..000000000000 --- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -JAVA_PKG_IUSE="source" -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit autotools-multilib eutils flag-o-matic toolchain-funcs distutils-r1 java-pkg-opt-2 elisp-common - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://code.google.com/p/protobuf/ https://github.com/google/protobuf/" -SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/9" # subslot = soname major version -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs vim-syntax zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND="emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${CDEPEND} - java? ( >=virtual/jdk-1.5 ) - python? ( - dev-python/google-apputils[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.5 )" - -src_prepare() { - append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI - - # breaks Darwin, bug #472514 - [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - - # fix build with emacs-24.4 (bug #524100) - epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch - epatch "${FILESDIR}"/${PN}-2.6.1-protoc-cmdline.patch - - autotools-multilib_src_prepare - - if use python; then - cd python && distutils-r1_src_prepare - fi -} - -src_configure() { - local myeconfargs=( - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null - fi - - autotools-multilib_src_configure -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - if use python; then - einfo "Compiling Python library ..." - pushd "${S}"/python >/dev/null - PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile - popd >/dev/null - fi - - if use java; then - einfo "Compiling Java library ..." - pushd "${S}" >/dev/null - "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto - mkdir java/build - pushd java/src/main/java >/dev/null - ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" - popd >/dev/null - jar cf ${PN}.jar -C java/build . || die "jar failed" - popd >/dev/null - fi - fi -} - -src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - autotools-multilib_src_compile - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -src_test() { - autotools-multilib_src_test check - - if use python; then - pushd python >/dev/null - distutils-r1_src_test - popd >/dev/null - fi -} - -src_install() { - autotools-multilib_src_install - - dodoc CHANGES.txt CONTRIBUTORS.txt README.md - - if use python; then - pushd python >/dev/null - distutils-r1_src_install - popd >/dev/null - fi - - if use java; then - java-pkg_dojar ${PN}.jar - use source && java-pkg_dosrc java/src/main/java/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}"/proto.vim - fi - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el - fi - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild deleted file mode 100644 index c61f89d74ab0..000000000000 --- a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) -inherit python-r1 autotools flag-o-matic toolchain-funcs elisp-common multilib-minimal - -# If you bump this package, also consider bumping the official language bindings! -# At the current time these are java and python. -MY_PV=${PV/_beta/-beta-} -MY_PV=${MY_PV/_p/.} - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" -SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/10b3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs test vim-syntax zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" -# This is provided for backwards compatibility due to (likely incorrect) use in consumers. -PDEPEND="java? ( dev-java/protobuf-java ) - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${PN}-${MY_PV}" -PATCHES=( - "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" - "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" -) - -src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null || die - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null || die - fi - ECONF_SOURCE=${S} econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - default - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -multilib_src_test() { - emake check -} - -src_install() { - multilib-minimal_src_install - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}/proto.vim" - fi - - if use emacs; then - elisp-install "${PN}" editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=( examples ) - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.0.2.ebuild b/dev-libs/protobuf/protobuf-3.0.2.ebuild deleted file mode 100644 index e24d24c58011..000000000000 --- a/dev-libs/protobuf/protobuf-3.0.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) -inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal - -# If you bump this package, also consider bumping the official language bindings! -# At the current time these are java and python. -MY_PV=${PV/_beta/-beta-} -MY_PV=${MY_PV/_p/.} - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" -SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs test vim-syntax zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" -# This is provided for backwards compatibility due to (likely incorrect) use in consumers. -PDEPEND=" - java? ( dev-java/protobuf-java ) - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" - -DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" - "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" -src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null || die - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null || die - fi - ECONF_SOURCE=${S} econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - default - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}/proto.vim" - fi - - if use emacs; then - elisp-install "${PN}" editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=( examples ) - docompress -x /usr/share/doc/"${PF}"/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild deleted file mode 100644 index 22bb288f8b48..000000000000 --- a/dev-libs/protobuf/protobuf-3.1.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) -inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal - -# If you bump this package, also consider bumping the official language bindings! -# At the current time these are java and python. -MY_PV=${PV/_beta/-beta-} -MY_PV=${MY_PV/_p/.} - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" -SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/11" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs test vim-syntax zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" -# This is provided for backwards compatibility due to (likely incorrect) use in consumers. -PDEPEND=" - java? ( dev-java/protobuf-java ) - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" - -DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" -src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null || die - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null || die - fi - ECONF_SOURCE=${S} econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - default - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}/proto.vim" - fi - - if use emacs; then - elisp-install "${PN}" editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=( examples ) - docompress -x /usr/share/doc/"${PF}"/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.3.0.ebuild b/dev-libs/protobuf/protobuf-3.3.0.ebuild deleted file mode 100644 index 86b099daf476..000000000000 --- a/dev-libs/protobuf/protobuf-3.3.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal - -# If you bump this package, also consider bumping the official language bindings! -# At the current time these are java and python. -MY_PV=${PV/_beta/-beta-} -MY_PV=${MY_PV/_p/.} - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" -SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/13" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs test zlib" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - emacs? ( virtual/emacs ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" - -# This is provided for backwards compatibility due to (likely incorrect) use in consumers. -PDEPEND=" - java? ( dev-java/protobuf-java ) - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" - -DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.3.0-disable-local-gmock.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" -src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null || die - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null || die - fi - ECONF_SOURCE=${S} econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - default - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install "${PN}" editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=( examples ) - docompress -x /usr/share/doc/"${PF}"/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} |