parlay

yet another gentoo overlay
git clone https://git.parazyd.org/parlay
Log | Files | Refs | README

commit 227120280cf9db01ab0cd37a977ccf0476007bac
parent ccf35f7d9a702323602fffe7c4fd2098133a5d7a
Author: parazyd <parazyd@dyne.org>
Date:   Thu, 17 Nov 2016 00:13:16 +0100

dev-libs/protobuf: Add 3.0.0 with musl fix

Diffstat:
Adev-libs/protobuf/Manifest | 1+
Adev-libs/protobuf/files/70protobuf-gentoo.el | 3+++
Adev-libs/protobuf/files/proto.vim | 1+
Adev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch | 28++++++++++++++++++++++++++++
Adev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 14++++++++++++++
Adev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15+++++++++++++++
Adev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch | 256+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch | 89+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adev-libs/protobuf/files/protobuf-3.0.0_musl-fix.patch | 24++++++++++++++++++++++++
Adev-libs/protobuf/protobuf-3.0.0_beta3_p1-r99.ebuild | 102+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10 files changed, 533 insertions(+), 0 deletions(-)

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest @@ -0,0 +1 @@ +DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b diff --git a/dev-libs/protobuf/files/70protobuf-gentoo.el b/dev-libs/protobuf/files/70protobuf-gentoo.el @@ -0,0 +1,3 @@ +(add-to-list 'load-path "@SITELISP@") +(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) +(autoload 'protobuf-mode "protobuf-mode" "Google protobuf mode." t) diff --git a/dev-libs/protobuf/files/proto.vim b/dev-libs/protobuf/files/proto.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile *.proto set filetype=proto 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 @@ -0,0 +1,28 @@ +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 @@ -0,0 +1,14 @@ +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 @@ -0,0 +1,15 @@ +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 @@ -0,0 +1,256 @@ +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.txt "; ++ cmd += "--protobuf_out=" + out_file; ++ EXPECT_TRUE(Run(cmd)); ++ ExpectBinaryFilesMatch(out_file, "google/protobuf/testdata/golden_message"); ++} ++ + } // 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 @@ -0,0 +1,89 @@ +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.0_musl-fix.patch b/dev-libs/protobuf/files/protobuf-3.0.0_musl-fix.patch @@ -0,0 +1,24 @@ +seems like both musl libc and android has byteswap.h + +diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h +index 376be5f..21223f4 100644 +--- a/src/google/protobuf/stubs/port.h ++++ b/src/google/protobuf/stubs/port.h +@@ -87,7 +87,7 @@ + #include <stdlib.h> // NOLINT(build/include) + #elif defined(__APPLE__) + #include <libkern/OSByteOrder.h> +-#elif defined(__GLIBC__) || defined(__CYGWIN__) ++#elif defined(__linux__) || defined(__CYGWIN__) + #include <byteswap.h> // IWYU pragma: export + #endif + +@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { + #define bswap_32(x) OSSwapInt32(x) + #define bswap_64(x) OSSwapInt64(x) + +-#elif !defined(__GLIBC__) && !defined(__CYGWIN__) ++#elif !defined(__linux__) && !defined(__CYGWIN__) + + static inline uint16 bswap_16(uint16 x) { + return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1-r99.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1-r99.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="Apache-2.0" +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" + +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}] )" +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" + "${FILESDIR}/${PN}-3.0.0_musl-fix.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 +}