From 1688e3c5fea6bdae45edd230ca607ea99cae50e0 Mon Sep 17 00:00:00 2001 From: Marshall Brewer Date: Sat, 2 Jul 2016 17:59:59 +0200 Subject: dev-java/protobuf-java: version bump 3.0.0_beta3_p1 changed subslot to 0/10b3 to correspond with protobuf Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/1816 Signed-off-by: Yixun Lan --- dev-java/protobuf-java/Manifest | 2 +- .../protobuf-java/protobuf-java-3.0.0_beta3.ebuild | 67 --------------------- .../protobuf-java-3.0.0_beta3_p1.ebuild | 68 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 68 deletions(-) delete mode 100644 dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild (limited to 'dev-java/protobuf-java') diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 2e9b0964e70b..464268ad7144 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1 +1 @@ -DIST protobuf-3.0.0_beta3.tar.gz 3654440 SHA256 d8d11564ff4085e7095cf5601fdc094946e6dbb0085863829668eb3a50b1ae0d SHA512 b8e0e73ab03d18b6715d875aff8552a603d46feaa5b7b4fb225ba841ff917381bdecf5083202ec1753fd1e82a8d0281937fba6d0f0928261a68c035f509360fd WHIRLPOOL dbc8896a0b1bb92a5e0a586c6952c7b32b2c0cfce03ed5c2f39634d038977f50fbc3b2e9297944316f73d258d21b6766a4fae8f86b65e096f92ed93b0bf1615e +DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild deleted file mode 100644 index abaadaa93633..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-pkg-simple - -MY_PV=${PV/_beta/-beta-} - -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" -SLOT="0/10" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="nano" - -# Protobuf is only a build-time dep, but depend 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-3" -RDEPEND=">=virtual/jre-1.7 - !/dev/null || die - einfo "Compiling Java library ..." - /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 - /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 -} 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 new file mode 100644 index 000000000000..e8a1e75d4b61 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit eutils 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="Apache-2.0" +SLOT="0/10b3" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="nano" + +# Protobuf is only a build-time dep, but depend 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-3" +RDEPEND=">=virtual/jre-1.7 + !/dev/null || die + einfo "Compiling Java library ..." + /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 + /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 +} -- cgit v1.2.3