From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-libs/protobuf/Manifest | 3 + dev-libs/protobuf/files/70protobuf-gentoo.el | 3 + dev-libs/protobuf/files/proto.vim | 1 + .../protobuf/files/protobuf-2.3.0-asneeded-2.patch | 28 +++ .../protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 14 ++ dev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15 ++ .../files/protobuf-2.6.1-protoc-cmdline.patch | 256 +++++++++++++++++++++ dev-libs/protobuf/metadata.xml | 10 + dev-libs/protobuf/protobuf-2.4.1.ebuild | 126 ++++++++++ dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 132 +++++++++++ dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 158 +++++++++++++ 11 files changed, 746 insertions(+) create mode 100644 dev-libs/protobuf/Manifest create mode 100644 dev-libs/protobuf/files/70protobuf-gentoo.el create mode 100644 dev-libs/protobuf/files/proto.vim create mode 100644 dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch create mode 100644 dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch create mode 100644 dev-libs/protobuf/files/protobuf-2.5.0-x32.patch create mode 100644 dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch create mode 100644 dev-libs/protobuf/metadata.xml create mode 100644 dev-libs/protobuf/protobuf-2.4.1.ebuild create mode 100644 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild create mode 100644 dev-libs/protobuf/protobuf-2.6.1-r3.ebuild (limited to 'dev-libs/protobuf') diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest new file mode 100644 index 000000000000..5cda08f0e35f --- /dev/null +++ b/dev-libs/protobuf/Manifest @@ -0,0 +1,3 @@ +DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e +DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d +DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 WHIRLPOOL b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a diff --git a/dev-libs/protobuf/files/70protobuf-gentoo.el b/dev-libs/protobuf/files/70protobuf-gentoo.el new file mode 100644 index 000000000000..51370527f6f2 --- /dev/null +++ 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 new file mode 100644 index 000000000000..6d26809efee6 --- /dev/null +++ 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 new file mode 100644 index 000000000000..418622e547f4 --- /dev/null +++ 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_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_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 new file mode 100644 index 000000000000..77d624938243 --- /dev/null +++ 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 new file mode 100644 index 000000000000..5c8d47831807 --- /dev/null +++ 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 new file mode 100644 index 000000000000..60151e8f6b2a --- /dev/null +++ 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 +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(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 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/metadata.xml b/dev-libs/protobuf/metadata.xml new file mode 100644 index 000000000000..b890438d0008 --- /dev/null +++ b/dev-libs/protobuf/metadata.xml @@ -0,0 +1,10 @@ + + + + + maintainer-needed@gentoo.org + + + google/protobuf + + diff --git a/dev-libs/protobuf/protobuf-2.4.1.ebuild b/dev-libs/protobuf/protobuf-2.4.1.ebuild new file mode 100644 index 000000000000..e7ea1f3f5c8c --- /dev/null +++ b/dev-libs/protobuf/protobuf-2.4.1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="3" + +JAVA_PKG_IUSE="source" +PYTHON_DEPEND="python? 2" +DISTUTILS_SRC_TEST="setup.py" + +inherit autotools eutils distutils java-pkg-opt-2 elisp-common + +DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" +HOMEPAGE="http://code.google.com/p/protobuf/" +SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" +IUSE="emacs examples java python static-libs vim-syntax" + +DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) + python? ( dev-python/setuptools ) + emacs? ( virtual/emacs )" +RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 ) + emacs? ( virtual/emacs )" + +DISTUTILS_SETUP_FILES=("python|setup.py") +PYTHON_MODNAME="google/protobuf" + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + eautoreconf + + if use python; then + python_convert_shebangs -r 2 . + distutils_src_prepare + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_compile() { + emake || die "emake failed" + + if use python; then + einfo "Compiling Python library ..." + distutils_src_compile + fi + + if use java; then + einfo "Compiling Java library ..." + src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto + mkdir java/build + pushd java/src/main/java + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" + popd + jar cf "${PN}.jar" -C java/build . || die "jar failed" + fi + + if use emacs; then + elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile failed!" + fi +} + +src_test() { + emake check || die "emake check failed" + + if use python; then + distutils_src_test + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt + + use static-libs || rm -rf "${D}"/usr/lib*/*.la + + if use python; then + distutils_src_install + 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* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* || die "doins examples failed" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use emacs && elisp-site-regen + use python && distutils_pkg_postrm +} diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild new file mode 100644 index 000000000000..d4d0b3a121bf --- /dev/null +++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="http://code.google.com/p/protobuf/" +SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2" + +LICENSE="Apache-2.0" +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" + +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 new file mode 100644 index 000000000000..4add84282fed --- /dev/null +++ b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/" +SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="Apache-2.0" +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" + +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 +} -- cgit v1.2.3-65-gdbad