gentoo resync : 10.01.2018

3 files changed, 68 insertions, 0 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c5122c04253f..072004acf205 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index ee852c7ad9ce..7a6233c32b69 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -3,9 +3,11 @@ DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c
 DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
 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
 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 2094 BLAKE2B 58eb9f337ed72da262022d6dd355b25c2b80f929d298d04a19aaffd7809316a9877d64059a121dbf089b09f72880c44bad83bf0a1ead0bcc1f13f4f247862e47 SHA512 eaf689739387102fc9aeed2a5a72bcce3c65181b55a088972c6f11dabcce1357e2d5c7c61e9e350b664b894973e7418cd434cca00710f45bb98d15559b27da2f
 MISC metadata.xml 755 BLAKE2B c3d064a14c826e53ec4646734899d9f2d0b432c8a72c18f89760cd9fba4736512537f87198af1e51fab110afe74e09fa0062a5dd640e74282222c4e4a13f4964 SHA512 499f0c3c8c1a10a50277519ac7cbba5c849ebdcffaaf2dc9a7dcb9bd34f48b98fcbe7409727764471857bb5f6039b9cedde6a9e7ba0950b9898cdd3be06faab4
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
new file mode 100644
index 000000000000..0db08537169d
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 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"
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# But probably same subslot is sufficient.
+DEPEND=">=virtual/jdk-1.7
+	~dev-libs/protobuf-${PV}"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="${S}/java/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 "${S}/javanano" >/dev/null || die
+		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="${S}/javanano/src/main/java"
+		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
+		JAVA_JAR_FILENAME="protobuf-nano.jar"
+		java-pkg-simple_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	if use nano; then
+		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
+		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
+	fi
+	mv "${S}/java/target" . || die
+	if use nano; then
+		cp -Rvf "${S}/javanano/target" . || die
+	fi
+	java-pkg-simple_src_install
+}