1 |
commit: f150ada68010398c87923dbcb148ddcaf85ca183 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Mon Jan 10 10:00:00 2022 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 29 15:18:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f150ada6 |
7 |
|
8 |
dev-libs/protobuf: Delete old version (3.16.0). |
9 |
|
10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
12 |
|
13 |
dev-libs/protobuf/Manifest | 1 - |
14 |
.../protobuf-3.15.0-disable_no-warning-test.patch | 19 --- |
15 |
.../files/protobuf-3.16.0-system_libraries.patch | 121 ----------------- |
16 |
dev-libs/protobuf/protobuf-3.16.0.ebuild | 143 --------------------- |
17 |
4 files changed, 284 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest |
20 |
index a486c4d26a37..018b2ea1f9bf 100644 |
21 |
--- a/dev-libs/protobuf/Manifest |
22 |
+++ b/dev-libs/protobuf/Manifest |
23 |
@@ -1,4 +1,3 @@ |
24 |
-DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5 |
25 |
DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36 |
26 |
DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8 |
27 |
DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98 |
28 |
|
29 |
diff --git a/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch |
30 |
deleted file mode 100644 |
31 |
index 031b1b222a9e..000000000000 |
32 |
--- a/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch |
33 |
+++ /dev/null |
34 |
@@ -1,19 +0,0 @@ |
35 |
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. |
36 |
- |
37 |
---- /src/Makefile.am |
38 |
-+++ /src/Makefile.am |
39 |
-@@ -709,7 +709,7 @@ |
40 |
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
41 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
42 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
43 |
-- no-warning-test $(GZCHECKPROGRAMS) |
44 |
-+ $(GZCHECKPROGRAMS) |
45 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
46 |
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
47 |
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
48 |
-@@ -896,4 +896,4 @@ |
49 |
- |
50 |
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |
51 |
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ |
52 |
-- protobuf-lite-arena-test no-warning-test |
53 |
-+ protobuf-lite-arena-test |
54 |
|
55 |
diff --git a/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch |
56 |
deleted file mode 100644 |
57 |
index 5b6f4101e9ca..000000000000 |
58 |
--- a/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch |
59 |
+++ /dev/null |
60 |
@@ -1,121 +0,0 @@ |
61 |
---- /Makefile.am |
62 |
-+++ /Makefile.am |
63 |
-@@ -11,28 +11,10 @@ |
64 |
- # Always include third_party directories in distributions. |
65 |
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest |
66 |
- |
67 |
--# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS |
68 |
--# because then "make check" would also build and run all of gmock's own tests, |
69 |
--# which takes a lot of time and is generally not useful to us. Also, we don't |
70 |
--# want "make install" to recurse into gmock since we don't want to overwrite |
71 |
--# the installed version of gmock if there is one. |
72 |
- check-local: |
73 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
74 |
-- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
75 |
-- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
76 |
- |
77 |
--# We would like to clean gmock when "make clean" is invoked. But we have to |
78 |
--# be careful because clean-local is also invoked during "make distclean", but |
79 |
--# "make distclean" already recurses into gmock because it's listed among the |
80 |
--# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to |
81 |
--# cd to the directory again and "make clean" it will fail. So, check that the |
82 |
--# Makefile exists before recursing. |
83 |
- clean-local: |
84 |
-- @if test -e third_party/googletest/Makefile; then \ |
85 |
-- echo "Making clean in googletest"; \ |
86 |
-- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
87 |
-- fi; \ |
88 |
-- if test -e conformance/Makefile; then \ |
89 |
-+ @if test -e conformance/Makefile; then \ |
90 |
- echo "Making clean in conformance"; \ |
91 |
- cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
92 |
- fi; \ |
93 |
---- /configure.ac |
94 |
-+++ /configure.ac |
95 |
-@@ -236,12 +236,5 @@ |
96 |
- fi |
97 |
- AC_SUBST([LIBLOG_LIBS]) |
98 |
- |
99 |
--# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
100 |
--# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
101 |
--# too. |
102 |
--export CFLAGS |
103 |
--export CXXFLAGS |
104 |
--AC_CONFIG_SUBDIRS([third_party/googletest]) |
105 |
-- |
106 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
107 |
- AC_OUTPUT |
108 |
---- /src/Makefile.am |
109 |
-+++ /src/Makefile.am |
110 |
-@@ -703,19 +703,11 @@ |
111 |
- google/protobuf/testing/file.cc \ |
112 |
- google/protobuf/testing/file.h |
113 |
- |
114 |
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest |
115 |
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock |
116 |
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest |
117 |
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
118 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
119 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
120 |
- $(GZCHECKPROGRAMS) |
121 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
122 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
123 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
124 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
125 |
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ |
126 |
-- -I$(GOOGLEMOCK_SRC_DIR)/include |
127 |
-+ -lgtest -lgmock -lgmock_main |
128 |
- # Disable optimization for tests unless the user explicitly asked for it, |
129 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
130 |
- # See configure.ac for more info. |
131 |
-@@ -807,12 +799,8 @@ |
132 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
133 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
134 |
- libprotoc.la \ |
135 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
136 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
137 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
138 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
139 |
-- -I$(GOOGLETEST_SRC_DIR)/include \ |
140 |
-- -DPROTOBUF_TEST_NO_DESCRIPTORS |
141 |
-+ -lgtest -lgmock -lgmock_main |
142 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS |
143 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
144 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
145 |
- google/protobuf/compiler/cpp/cpp_unittest.cc \ |
146 |
-@@ -833,11 +821,7 @@ |
147 |
- # full runtime and we want to make sure this test builds without full |
148 |
- # runtime. |
149 |
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
150 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
151 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
152 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
153 |
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ |
154 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
155 |
-+ -lgtest -lgmock -lgmock_main |
156 |
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
157 |
- protobuf_lite_test_SOURCES = \ |
158 |
- google/protobuf/lite_unittest.cc \ |
159 |
-@@ -849,11 +833,7 @@ |
160 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
161 |
- # memory leaks (don't know why). |
162 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
163 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
164 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
165 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
166 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
167 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
168 |
-+ -lgtest -lgmock -lgmock_main |
169 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
170 |
- protobuf_lite_arena_test_SOURCES = \ |
171 |
- google/protobuf/lite_arena_unittest.cc \ |
172 |
-@@ -863,8 +843,7 @@ |
173 |
- |
174 |
- # Test plugin binary. |
175 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
176 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la |
177 |
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include |
178 |
-+ -lgtest |
179 |
- test_plugin_SOURCES = \ |
180 |
- google/protobuf/compiler/mock_code_generator.cc \ |
181 |
- google/protobuf/testing/file.cc \ |
182 |
|
183 |
diff --git a/dev-libs/protobuf/protobuf-3.16.0.ebuild b/dev-libs/protobuf/protobuf-3.16.0.ebuild |
184 |
deleted file mode 100644 |
185 |
index 404c91cdd4aa..000000000000 |
186 |
--- a/dev-libs/protobuf/protobuf-3.16.0.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,143 +0,0 @@ |
189 |
-# Copyright 2008-2022 Gentoo Authors |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI="7" |
193 |
- |
194 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
195 |
- |
196 |
-if [[ "${PV}" == "9999" ]]; then |
197 |
- inherit git-r3 |
198 |
- |
199 |
- EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" |
200 |
- EGIT_SUBMODULES=() |
201 |
-fi |
202 |
- |
203 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
204 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
205 |
-if [[ "${PV}" == "9999" ]]; then |
206 |
- SRC_URI="" |
207 |
-else |
208 |
- SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
209 |
-fi |
210 |
- |
211 |
-LICENSE="BSD" |
212 |
-SLOT="0/27" |
213 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
214 |
-IUSE="emacs examples static-libs test zlib" |
215 |
-RESTRICT="!test? ( test )" |
216 |
- |
217 |
-BDEPEND="emacs? ( app-editors/emacs:* )" |
218 |
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) |
219 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
220 |
-RDEPEND="emacs? ( app-editors/emacs:* ) |
221 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
222 |
- |
223 |
-PATCHES=( |
224 |
- "${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch" |
225 |
- "${FILESDIR}/${PN}-3.16.0-system_libraries.patch" |
226 |
- "${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch" |
227 |
-) |
228 |
- |
229 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
230 |
- |
231 |
-src_prepare() { |
232 |
- default |
233 |
- |
234 |
- # https://github.com/protocolbuffers/protobuf/issues/7413 |
235 |
- sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die |
236 |
- |
237 |
- # https://github.com/protocolbuffers/protobuf/issues/8082 |
238 |
- sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die |
239 |
- |
240 |
- # https://github.com/protocolbuffers/protobuf/issues/8459 |
241 |
- sed \ |
242 |
- -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ |
243 |
- -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ |
244 |
- -i src/google/protobuf/arena_unittest.cc || die |
245 |
- |
246 |
- # https://github.com/protocolbuffers/protobuf/issues/8460 |
247 |
- sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die |
248 |
- |
249 |
- # https://github.com/protocolbuffers/protobuf/issues/9392 |
250 |
- sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die |
251 |
- |
252 |
- eautoreconf |
253 |
-} |
254 |
- |
255 |
-src_configure() { |
256 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
257 |
- |
258 |
- if tc-ld-is-gold; then |
259 |
- # https://sourceware.org/bugzilla/show_bug.cgi?id=24527 |
260 |
- tc-ld-disable-gold |
261 |
- fi |
262 |
- |
263 |
- multilib-minimal_src_configure |
264 |
-} |
265 |
- |
266 |
-multilib_src_configure() { |
267 |
- local options=( |
268 |
- $(use_enable static-libs static) |
269 |
- $(use_with zlib) |
270 |
- ) |
271 |
- |
272 |
- if tc-is-cross-compiler; then |
273 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
274 |
- mkdir -p "${WORKDIR}/build" || die |
275 |
- pushd "${WORKDIR}/build" > /dev/null || die |
276 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
277 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
278 |
- popd > /dev/null || die |
279 |
- fi |
280 |
- |
281 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
282 |
-} |
283 |
- |
284 |
-src_compile() { |
285 |
- multilib-minimal_src_compile |
286 |
- |
287 |
- if use emacs; then |
288 |
- elisp-compile editors/protobuf-mode.el |
289 |
- fi |
290 |
-} |
291 |
- |
292 |
-multilib_src_compile() { |
293 |
- if tc-is-cross-compiler; then |
294 |
- emake -C "${WORKDIR}/build/src" protoc |
295 |
- fi |
296 |
- |
297 |
- default |
298 |
-} |
299 |
- |
300 |
-multilib_src_test() { |
301 |
- emake check |
302 |
-} |
303 |
- |
304 |
-multilib_src_install_all() { |
305 |
- find "${ED}" -name "*.la" -delete || die |
306 |
- |
307 |
- insinto /usr/share/vim/vimfiles/syntax |
308 |
- doins editors/proto.vim |
309 |
- insinto /usr/share/vim/vimfiles/ftdetect |
310 |
- doins "${FILESDIR}/proto.vim" |
311 |
- |
312 |
- if use emacs; then |
313 |
- elisp-install ${PN} editors/protobuf-mode.el* |
314 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
315 |
- fi |
316 |
- |
317 |
- if use examples; then |
318 |
- DOCS+=(examples) |
319 |
- docompress -x /usr/share/doc/${PF}/examples |
320 |
- fi |
321 |
- |
322 |
- einstalldocs |
323 |
-} |
324 |
- |
325 |
-pkg_postinst() { |
326 |
- use emacs && elisp-site-regen |
327 |
-} |
328 |
- |
329 |
-pkg_postrm() { |
330 |
- use emacs && elisp-site-regen |
331 |
-} |