dev-java/protobuf-java: version bump to 3.3.0

- Change license from Apache-2.0 to BSD

Closes: https://github.com/gentoo/gentoo/pull/4039

5 files changed, 72 insertions, 3 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index e32919746104..64541e563b41 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,4 @@
 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
 DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8
 DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
+DIST protobuf-3.3.0.tar.gz 4336596 SHA256 94c414775f275d876e5e0e4a276527d155ab2d0da45eed6b7734301c330be36e SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 WHIRLPOOL 4c18120ad784234ebb5308c0f3a2f3814d77f2fc906407f48285f3ba8f84af8e15defa4e7edf2d2e77cf22316df338b3f5bc0c6ca11c7a4fb951105c3aa7d7d4
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
index c8584f5a1e2e..605460511993 100644
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
 HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
 SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="BSD"
 SLOT="0/10b3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
index ccef8e5dbaba..f774a37f4ff3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
 HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
 SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="BSD"
 SLOT="0/10"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
diff --git a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
index 9b1cc5e0e550..073765e94dc8 100644
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
 HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
 SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="BSD"
 SLOT="0/11"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
diff --git a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
new file mode 100644
index 000000000000..31b8a5d0896a
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
@@ -0,0 +1,68 @@
+# 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
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/13"
+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-${MY_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
+}