summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Brewer <tomboy64@sina.cn>2016-06-03 19:50:19 +0200
committerPatrice Clement <monsieurp@gentoo.org>2016-06-23 15:25:21 +0000
commit1cc0ab7fcb734b4a06f7255f03804b6d646a8da7 (patch)
tree186bcaffe4018511c6bbfa238add7ea73d1f8c01
parentdev-libs/protobuf: version bump 3.0.0_beta3 (diff)
downloadgentoo-1cc0ab7fcb734b4a06f7255f03804b6d646a8da7.tar.gz
gentoo-1cc0ab7fcb734b4a06f7255f03804b6d646a8da7.tar.bz2
gentoo-1cc0ab7fcb734b4a06f7255f03804b6d646a8da7.zip
dev-java/protobuf-java: version bump 3.0.0_beta3
Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1603 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
-rw-r--r--dev-java/protobuf-java/Manifest2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.0.0_beta2.ebuild)20
2 files changed, 11 insertions, 11 deletions
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index ba9743b769c..2e9b0964e70 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1 +1 @@
-DIST protobuf-3.0.0_beta2.tar.gz 3333054 SHA256 be224d07ce87f12e362cff3df02851107bf92a4e4604349b1d7a4b1f0c3bfd86 SHA512 3a9329603226dabeaae7c28eb7463fb4403383e7774d53742e9e38a0426f5ef370803c68e4d4bc0d37585618fb340befe4f812731db0984b12032c3d931cdca7 WHIRLPOOL 0e77105c24d71c0269f4375ebfaef38175d762e1a90cdd81f594c13bbece9f390ada9291f722e8e0227952a1f5cd94976037f069b86703c7a3a37a9277cb66f8
+DIST protobuf-3.0.0_beta3.tar.gz 3654440 SHA256 d8d11564ff4085e7095cf5601fdc094946e6dbb0085863829668eb3a50b1ae0d SHA512 b8e0e73ab03d18b6715d875aff8552a603d46feaa5b7b4fb225ba841ff917381bdecf5083202ec1753fd1e82a8d0281937fba6d0f0928261a68c035f509360fd WHIRLPOOL dbc8896a0b1bb92a5e0a586c6952c7b32b2c0cfce03ed5c2f39634d038977f50fbc3b2e9297944316f73d258d21b6766a4fae8f86b65e096f92ed93b0bf1615e
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild
index b747b75a48e..abaadaa9363 100644
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=6
+EAPI=5
JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-pkg-simple
+inherit eutils java-pkg-2 java-pkg-simple
-MY_PV=${PV/_beta2/-beta-2}
+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/"
@@ -21,22 +21,22 @@ 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.5
+DEPEND=">=virtual/jdk-1.7
>=dev-libs/protobuf-3"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.7
!<dev-libs/protobuf-3[java(-)]"
S="${WORKDIR}/protobuf-${MY_PV}"
src_prepare() {
- eapply_user
+ epatch_user
java-pkg-2_src_prepare
}
src_compile() {
pushd "${S}/java" >/dev/null || die
einfo "Compiling Java library ..."
- /usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/src/main/java"
+ /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
@@ -45,7 +45,7 @@ src_compile() {
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/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
@@ -54,7 +54,7 @@ src_compile() {
src_install() {
JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/src/main/java"
+ 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"