Diff protobuf-3.15.8 with a protobuf-9999

/usr/portage/dev-libs/protobuf/protobuf-9999.ebuild 2021-06-06 20:09:00.000000000 +0300
21 21
fi
22 22

  
23 23
LICENSE="BSD"
24
SLOT="0/26"
25
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
24
SLOT="0/28"
25
KEYWORDS=""
26 26
IUSE="emacs examples static-libs test zlib"
27 27
RESTRICT="!test? ( test )"
28 28

  
......
33 33
	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
34 34

  
35 35
PATCHES=(
36
	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
37
	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
38
	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
36
	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
37
	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
38
	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
39 39
)
40 40

  
41 41
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
42 42

  
43 43
src_prepare() {
44 44
	default
45

  
46
	# https://github.com/protocolbuffers/protobuf/issues/7413
47
	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
48

  
49
	# https://github.com/protocolbuffers/protobuf/issues/8082
50
	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
51

  
52
	# https://github.com/protocolbuffers/protobuf/issues/8459
53
	sed \
54
		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
55
		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
56
		-i src/google/protobuf/arena_unittest.cc || die
57

  
58
	# https://github.com/protocolbuffers/protobuf/issues/8460
59
	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
60

  
61 45
	eautoreconf
62 46
}
63 47

  
64 48
src_configure() {
65 49
	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
66

  
67
	if tc-ld-is-gold; then
68
		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
69
		tc-ld-disable-gold
70
	fi
71

  
72 50
	multilib-minimal_src_configure
73 51
}
74 52

  
Thank you!