gentoo resync : 13.11.2021

2 files changed, 139 insertions, 0 deletions

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index d01c44cc3ef8..a7a60af44ab3 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,11 +13,13 @@ DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101b
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 EBUILD protobuf-3.15.8.ebuild 3749 BLAKE2B 12ba8cd774d1ff1961c54253cffd729f30f37da02e3d103646b966e261d819b4b85fff402eb3a917bdd41153ab07883d416eb288b20801aa89d9a41c3ce85ed7 SHA512 1dc4105d31dec058a611c6c1d05060854e904fd5018e75d1718aeed3a719d22746e94b7a1fefcf6ebe894fec4211f17729ed8a55289a43647aa22cd7b16720c1
 EBUILD protobuf-3.16.0.ebuild 3756 BLAKE2B df0ebf61c08a5dbb4fdeace2bfd04d1fa9929cb20878802142044aa13d417a59b61f7a81246ef7595fff417d17590ce43e14ee3c2b513aedf92d79d3a9be7015 SHA512 d3d3fc384d2fd1d0bfcf155c5fd1a5140057d39c6350362cea4d19cd77154a49d0b9efd4265dd6983299493ba4b7c4ba471bbf2bf170085e6a2abcb74aec25be
 EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.3.ebuild 3756 BLAKE2B e6c40342fa60a698262bec36941c120f32db5eb67d751cb9f3b28ff066a88f4f4bc78220d6881d486bcd665f6418edb474fea727675fcc47c2e6de3cfa5bc8e5 SHA512 56856012f7a731f0a3338070c7c04107e6088fc8f20ce15fd7736ff07e8980073e85f99f78f67b414410a9d8788ca7d939e66ce1ec3e4a39af86fb07947a8029
+EBUILD protobuf-3.19.1.ebuild 3713 BLAKE2B ee6effc25e72192a28a3c49532b8567f21fe0fa3f9f8605a24c99fe8994d96429192ff7ffd974aea18d7235a32e5462ad1587dc3605b44eccaf167f0cc517535 SHA512 4b2f0a9722e93bc004e200918dd948971313c187c7818e915b7f7a0da9386a1956234cdabb936d87838212f25322eea165808fd26b15b57833789f5ee2f2486e
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 194e9d88477eb97f57cb544d733c61661bcd2fbcdb9cd1c1353ba1b9fd1c22de8e3ea291cd5f9bfbdac939afa316c6ca2888a2fc790d5f1113a2c416d9f3a3ed SHA512 c55a151753fe1b845d5566999064640fb3ccea13c222b37e4563eeaa8c09788ee74bb89407f4d68d17288d40ae0fd5761ad556989e8d2803c9317c7626ad24e4
 MISC metadata.xml 623 BLAKE2B 0073d736a4b20a2bb9d49c48e0191843286c8c09553a8b662e64494b0674fd8d1b411a7fdbb85e088783cac04af5ab590f9e7ee99027197f37270588a005caca SHA512 a242b229d34554e31aed2638e2febade4e1c3df86c2bfad87fa42d0be307a10a90d94e92dfbebed6ff6a50b3724b7a9a274e967a81bda8a6ae4b3eddb4c23a71
diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
new file mode 100644
index 000000000000..40c652ccb9b2
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+
+LICENSE="BSD"
+SLOT="0/30"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	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*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}