commit: 15e674385895c8a94dcc5e2e67abe8bcc8ae2e7f
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 18 19:02:24 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:39:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e67438
dev-java/protobuf-java: Delete old versions (<3.6.1.3).
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 | 6 --
dev-java/protobuf-java/metadata.xml | 3 -
.../protobuf-java/protobuf-java-3.5.1.1.ebuild | 66 ----------------------
dev-java/protobuf-java/protobuf-java-3.5.2.ebuild | 60 --------------------
.../protobuf-java/protobuf-java-3.6.0.1.ebuild | 37 ------------
.../protobuf-java/protobuf-java-3.6.1.1.ebuild | 37 ------------
.../protobuf-java/protobuf-java-3.6.1.2.ebuild | 37 ------------
dev-java/protobuf-java/protobuf-java-3.6.1.ebuild | 37 ------------
8 files changed, 283 deletions(-)
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 587e2bfbd47..ac2f8a09268 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,7 +1 @@
-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
-DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B
4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f
SHA512
df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
-DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B
be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce
SHA512
557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B
5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963
SHA512
9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B
546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0
SHA512
1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
diff --git a/dev-java/protobuf-java/metadata.xml
b/dev-java/protobuf-java/metadata.xml
index 0697e5cc44b..fbdd6bacc23 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -13,9 +13,6 @@
<email>proxy-ma...@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="nano">Enable code generator and runtime library
designed specifically for resource-constrained systems, like Android</flag>
- </use>
<slots>
<subslots>Soname version number of Protobuf</subslots>
</slots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
deleted file mode 100644
index c0a6932d514..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
deleted file mode 100644
index c60c8f9317b..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos
~x86-macos"
-IUSE="nano"
-
-DEPEND="~dev-libs/protobuf-${PV}
- >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}"
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- einfo "Compiling Java library..."
- pushd java > /dev/null || die
- "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="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 javanano > /dev/null || die
- "${EPREFIX}/usr/bin/protoc" --java_out=src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="src/main/java"
JAVA_GENTOO_CLASSPATH_EXTRA="../java/core/src/main/java"
JAVA_JAR_FILENAME="protobuf-nano.jar" java-pkg-simple_src_compile
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- local JAVA_SRC_DIR="java/core/src/main/java"
- local JAVA_JAR_FILENAME="java/protobuf.jar"
- if use nano; then
- JAVA_SRC_DIR+=" javanano/src/main/java"
- JAVA_JAR_FILENAME+=" javanano/protobuf-nano.jar"
- fi
-
- mv java/target . || die
- if use nano; then
- cp -r javanano/target . || die
- fi
-
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
deleted file mode 100644
index 5c4309e854e..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux
~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
- >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
b/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
deleted file mode 100644
index 21b22d791b7..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2008-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux
~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
- >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
b/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
deleted file mode 100644
index 21b22d791b7..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2008-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux
~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
- >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
deleted file mode 100644
index 54c8396f2ff..00000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf";
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz ->
protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos
~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
- >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src
../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar"
java-pkg-simple_src_install
-}
