[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

[Mike Gilbert]

commit:     8c40dda594a94d65f131fc3368325ee37ec4e58a
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Oct  2 19:32:24 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 20:07:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c40dda5

dev-java/protobuf-java: Delete old version (3.4.1).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-java/protobuf-java/Manifest                   |  1 -
 dev-java/protobuf-java/protobuf-java-3.4.1.ebuild | 66 -----------------------
 2 files changed, 67 deletions(-)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index f47a971994d..8c43bdcbda4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,3 @@
-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
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4

diff --git a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
deleted file mode 100644
index e5e3a7c4b5d..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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/14"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-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
-}