gentoo resync : 09.03.2018

3 files changed, 108 insertions, 2 deletions

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f7ac66847aca..3df35b8402dd 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,6 +19,7 @@ DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f6
 DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
+DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD protobuf-2.5.0-r2.ebuild 3191 BLAKE2B ae6634f1e962709035137c70e529eaba18f4f221a4719b0c57a0151b7ceaec82690cbb66b384bfadef72baa86d99bb0f189140df035570f420eb9cf5db2d0c8c SHA512 7993e3f842f0b378c92d719507684b17e4dc4a58ec240cd114f54a7bac67f1e08c8dd36d750bc4181c61d664eb1c8f69bc32a9836bb29dbdedc82faf349e1ce8
 EBUILD protobuf-2.6.1-r3.ebuild 4027 BLAKE2B 0d3947311800c913a84e03b2b6f46ad3d180a49d385c6780f7e1678afc6dc80ed18160fbe666dfea07848132d37b434a73857ee98f379d30786166b8a4665922 SHA512 4b962beeb1ab36101de1d3a7452ae727b0d01fbcfea996c47d3ecd9d2cf8561420a7500f6a1a15c8fb9a00484dd1b566c26dee1649c5da7c03b9d68c0caa65b3
 EBUILD protobuf-3.0.0_beta3_p1.ebuild 2975 BLAKE2B 4ac95a7690767a5e32325b16afcb0666fa0ab850cda645a8bc4070cd27b20223ed49d8e32d825e63c45399e947461a1037e1e267ba70f31647d0d59fd8579e17 SHA512 ddcf129fbc3d6fcc1979acc9db0efb263c0b258f7d8e44f83e72b1c66ba1d0a36fdd8c1f4958d39f19801ddd8838896378d36ad365caf44a3bc78d256e3f14eb
@@ -26,5 +27,6 @@ EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69
 EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2623 BLAKE2B a1b41b1b845aa6f9472e9790c3c0828711e0dee4a0e509baa6e573306648c1c51f14a1aaec21c329d586c956f8b939884c62cfcd530596e8f2c0a076f83cbf9f SHA512 663b52da356157b3eae71a33e895ad5fe5d8608e0d861762619703da3833e902718af8280fd465ccd4e410d86a7602676913605e7718519b25bf9454dc18f912
+EBUILD protobuf-3.5.1.1.ebuild 2622 BLAKE2B dc2dd62b6445ac8aa8ee8f7f893fcc89b6e373b43326a68213a8cdc2742e48153b93a0d3da37843f55bd88097034d7f088d8acdf391618aebf246bc5f661dc1f SHA512 96e1cb07c2c33fba3b87463e66c15076c89b8d4dbda4ac17b2ea6c166e75ae05b48d822c8ae8c3dbd6fc646380f414852e39954225e2e9a82197bce460c38aa9
+EBUILD protobuf-3.5.2.ebuild 2496 BLAKE2B 6c8faf0aafd933999fad4425ab3b157cac7d5c65d2d0a82c7b088a4ff13b45cf07015a3919bbe14313a173203939ecd4734b531c1497f20feabfaed912c6fccc SHA512 11d77223cdd950ebd6b24487d74d194df4c49289579c36f47ce995823667dfe5bbc50f1e24e9b0fb0d215edb52483246cb2723f340c8cb4832357290a4402bc5
 MISC metadata.xml 844 BLAKE2B 27a0d9277394c9dcc9a50956182bbc6f5282d805b59d8a3f1c7680cdd37616caa1f40b50cf0dcb04218d28b8e592d630da5395f7a232713b08a099a7fd9dfa0b SHA512 a9d9c398843fa2017bd16d530735824eab963119d8508570ede4523d2ea7143431bb72c964fd6be17189a0422e3747ff1208a33e8fe9f74de37e8ef204ba188c
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index 47519c697c1a..abdb879ab372 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
new file mode 100644
index 000000000000..a6b279e38cb1
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.5.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+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 static-libs test zlib"
+
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	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() {
+	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
+}