commit:     37c432115f96b1c5d42c68f122f517bb41686636
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Apr 25 18:17:37 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:12:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c43211

dev-java/protobuf-java: Delete old versions (<3.4.0).

 dev-java/protobuf-java/Manifest                    |  4 --
 .../protobuf-java-3.0.0_beta3_p1.ebuild            | 67 ---------------------
 dev-java/protobuf-java/protobuf-java-3.0.2.ebuild  | 68 ----------------------
 dev-java/protobuf-java/protobuf-java-3.1.0.ebuild  | 68 ----------------------
 dev-java/protobuf-java/protobuf-java-3.3.0.ebuild  | 68 ----------------------
 5 files changed, 275 deletions(-)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 60c0da17d4a..aa6d99043ce 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,7 +1,3 @@
-DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 
44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2
 SHA512 
bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
-DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 
542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf
 SHA512 
28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2
-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
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

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
deleted file mode 100644
index 60546051199..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="BSD"
-SLOT="0/10b3"
-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 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-libs/protobuf-3[java(-)]"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-src_prepare() {
-       epatch_user
-       java-pkg-2_src_prepare
-}
-
-src_compile() {
-       pushd "${S}/java" >/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.2.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
deleted file mode 100644
index f774a37f4ff..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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/10"
-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-3"
-
-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
-}

diff --git a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
deleted file mode 100644
index 567e5a22658..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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/11"
-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-3"
-
-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
-}

diff --git a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
deleted file mode 100644
index 31b8a5d0896..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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
-}

Reply via email to