gentoo resync : 09.03.2018

2 files changed, 62 insertions, 0 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 973f7d13b0af..8c0056d20edb 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -4,10 +4,12 @@ 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-java-3.0.0_beta3_p1.ebuild 2137 BLAKE2B dc8edf716225da54804ab5da414ab70a1526bdef0a3e24d4f4c93443c8bcdebc0eb6be87a54114e22d0084176a5291822614431377f008d0472682a413e41792 SHA512 dab6d0ae27b18777a305d0921757acb92727d17fce7d8c17eeff1cc09298f85f3fa6f39bb51bd6a531b462060fecf20d691e417ec33cd181f0bbda665baf8e3b
 EBUILD protobuf-java-3.0.2.ebuild 2150 BLAKE2B 0cd4177700cbe9a7850bffb6dc6c4c224e2d210659a58127313b284ab21c982cddbc9d4ba3ed0d3bf504f8ca6afdeba9288651029b1ef39e0519f469a62ecdf0 SHA512 a8b0ad7f72a64e9fe13ff7a8b64f04660f16865c35f6af6c58f81c1b2b13aa5388135685e6a506dc1c0a5edc8c6a8ec6968735d1c8710f3ad6acb8cb2c95286b
 EBUILD protobuf-java-3.1.0.ebuild 2147 BLAKE2B 51dd234d7873b295094ab1910a66d6be1db1b64e67680ad3abaca224d4b87eb5043afd4f080d06a7a7fe4dec15f2a46f81d6d26ab547bb83e342bc012ecca840 SHA512 fdec0f920fd80526440ea4909b8fcea86fec0d56f4ca8f5773d3d8747b49e747f7836c1714036a9815402af9f19f46581ed8332266baf93e8e9cef87258a4b87
 EBUILD protobuf-java-3.3.0.ebuild 2153 BLAKE2B 0d7fdf2a46cbfc78402339259d879952f92f6ade17667197040970b35d4f9b3e5f3d49c17d7d8d7d5a7c1a5006ba2f23774f815b86a6e8fb9abebff68246381b SHA512 1895a3f22215ce2cf3c57fcdc94375f3e18801499ff51ca1374ff2af15b821e8207b3c50267b4f9748aca5ddb85106c087e692120a2bec3e7c315f5ae942ddb2
 EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
 EBUILD protobuf-java-3.5.1.1.ebuild 2092 BLAKE2B 72ed6c43d73d741cf2fc0e4d7ce218564aa1bc65f12734d0db229679bb11181256b56e2c1b1ac02a9e22d3cdc5b1104fe390705a04490f8e546a61b5019e18c7 SHA512 8273d8c4f41efedc8cf2b585a3886430dc6190b62c52c4d213923c2e16f40ebb07f9d2e05f3008bc48b1067443fb7508b0ac0a4f2596ad389a72c01c86bf2612
+EBUILD protobuf-java-3.5.2.ebuild 1813 BLAKE2B d46d3e2830806281fd67d804e13c2d88a090733270383f7c1e449b2b66f4ff012e15f0c62fa36a3ce32cd254f7b65f8f7a6849c8265e12fda2f6a9c5bd157c52 SHA512 c8f393561a64baa471ebabab77f8300837f548d9a2c03cd616a596f746fd0061599a9cedd642855f697f3b3e812b3cf789a76c03b875a900016f9fa6bcf77771
 MISC metadata.xml 873 BLAKE2B 129c7af2f68633ca3b98b5c5db45b94a808ec5d260b764f0e6d095409fb77f071f69e57b0dfc79cbd31752529916b2708ec8c7d676cf1e46aef4df794a77d6f5 SHA512 e6f903fb9a0e025d5c28bd51667d959d0ae9542c0325f6e845933231a976717ade53e665ca5eedf28b53b9aecd767bdfc040dfdb5f6dccd76c6e67a7c917a8eb
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
new file mode 100644
index 000000000000..d6b0900c590a
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	einfo "Compiling Java library..."
+	pushd java > /dev/null || die
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+	popd > /dev/null || die
+
+	if use nano; then
+		einfo "Compiling Java Nano library..."
+		pushd javanano > /dev/null || die
+		"${EPREFIX}/usr/bin/protoc" --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH_EXTRA="../java/core/src/main/java" JAVA_JAR_FILENAME="protobuf-nano.jar" java-pkg-simple_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	local JAVA_SRC_DIR="java/core/src/main/java"
+	local JAVA_JAR_FILENAME="java/protobuf.jar"
+	if use nano; then
+		JAVA_SRC_DIR+=" javanano/src/main/java"
+		JAVA_JAR_FILENAME+=" javanano/protobuf-nano.jar"
+	fi
+
+	mv java/target . || die
+	if use nano; then
+		cp -r javanano/target . || die
+	fi
+
+	java-pkg-simple_src_install
+}