commit: f5988bfcb1ebdf0bbf6eb598f834aa1758ee981d Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Wed Dec 14 22:48:23 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue May 9 17:18:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5988bfc
dev-libs/protobuf: version bump to 3.3.0 - Fix test phase in protobuf-3.x - Fix test in protobuf-2.6.1-protoc-cmdline.patch - Add compatibility patch for musl libc and FreeBSD - Change license from Apache-2.0 to BSD - Remove vim-syntax USE flag Bug: https://bugs.gentoo.org/544420 Bug: https://bugs.gentoo.org/602182 Bug: https://bugs.gentoo.org/611180 dev-libs/protobuf/Manifest | 1 + .../files/protobuf-2.6.1-protoc-cmdline.patch | 4 +- .../files/protobuf-3.0.2-disable-local-gmock.patch | 101 ++++++++++++++++++ .../files/protobuf-3.3.0-disable-local-gmock.patch | 115 +++++++++++++++++++++ dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 2 +- dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 2 +- dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild | 2 +- dev-libs/protobuf/protobuf-3.0.2.ebuild | 4 +- dev-libs/protobuf/protobuf-3.1.0.ebuild | 4 +- ...protobuf-3.1.0.ebuild => protobuf-3.3.0.ebuild} | 28 +++-- 10 files changed, 239 insertions(+), 24 deletions(-) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 8baf7ec6c51..32cafc294f0 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -3,3 +3,4 @@ DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f5 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8 DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68 +DIST protobuf-3.3.0.tar.gz 4336596 SHA256 94c414775f275d876e5e0e4a276527d155ab2d0da45eed6b7734301c330be36e SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 WHIRLPOOL 4c18120ad784234ebb5308c0f3a2f3814d77f2fc906407f48285f3ba8f84af8e15defa4e7edf2d2e77cf22316df338b3f5bc0c6ca11c7a4fb951105c3aa7d7d4 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 index 60151e8f6b2..894f2ffd095 100644 --- a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch +++ b/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch @@ -242,10 +242,10 @@ index 2b26f3b..78ff2cf 100644 + cmd += "google/protobuf/unittest.proto "; + cmd += "--encode=protobuf_unittest.TestAllTypes "; + cmd += "--protobuf_in=" + TestSourceDir() + -+ "/google/protobuf/testdata/text_format_unittest_data.txt "; ++ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; + cmd += "--protobuf_out=" + out_file; + EXPECT_TRUE(Run(cmd)); -+ ExpectBinaryFilesMatch(out_file, "google/protobuf/testdata/golden_message"); ++ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); +} + } // anonymous namespace 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 new file mode 100644 index 00000000000..a2dda8aafac --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch @@ -0,0 +1,101 @@ +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 new file mode 100644 index 00000000000..25dc7bd074b --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch @@ -0,0 +1,115 @@ +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/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild index f13799b4c14..5c13a2976ed 100644 --- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct HOMEPAGE="https://code.google.com/p/protobuf/"; SRC_URI="https://protobuf.googlecode.com/files/${P}.tar.bz2"; -LICENSE="Apache-2.0" +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" diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild index 600cb16edb5..8d93c1be7e4 100644 --- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild +++ b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct 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="Apache-2.0" +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" diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild index e7de4715d51..c61f89d74ab 100644 --- a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild +++ b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct 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" +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" diff --git a/dev-libs/protobuf/protobuf-3.0.2.ebuild b/dev-libs/protobuf/protobuf-3.0.2.ebuild index 686c45c6427..e24d24c5801 100644 --- a/dev-libs/protobuf/protobuf-3.0.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.0.2.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct 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" +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" @@ -37,7 +37,7 @@ 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.0_beta2-disable-local-gmock.patch" + "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild index fafdd32458f..8523f110e2f 100644 --- a/dev-libs/protobuf/protobuf-3.1.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.1.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct 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" +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" @@ -36,7 +36,7 @@ DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) PATCHES=( "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" + "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.3.0.ebuild similarity index 83% copy from dev-libs/protobuf/protobuf-3.1.0.ebuild copy to dev-libs/protobuf/protobuf-3.3.0.ebuild index fafdd32458f..1d10857bd15 100644 --- a/dev-libs/protobuf/protobuf-3.1.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) +PYTHON_COMPAT=( python2_7 python3_{4,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! @@ -15,18 +15,18 @@ DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding struct 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/11" +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 vim-syntax zlib" +IUSE="emacs examples java python static-libs test zlib" + REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" +DEPEND=" emacs? ( virtual/emacs ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} + 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 ) @@ -36,7 +36,7 @@ DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) PATCHES=( "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" + "${FILESDIR}/${PN}-3.3.0-disable-local-gmock.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -81,12 +81,10 @@ multilib_src_test() { } 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 + 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*
