summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
commit957235cf19a691360c720f7913672adda4258ed0 (patch)
tree812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-java
parent62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
gentoo resync : 07.10.2018
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin94853 -> 94849 bytes
-rw-r--r--dev-java/protobuf-java/Manifest12
-rw-r--r--dev-java/protobuf-java/metadata.xml2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.4.1.ebuild66
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild6
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.5.2.ebuild6
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild6
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.6.1.ebuild6
8 files changed, 18 insertions, 86 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9b0721e7a541..59facf37cecb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6f5af2646231..4832adcb2eee 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,11 +1,9 @@
-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
DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-java-3.4.1.ebuild 2083 BLAKE2B 0d8ddca861124a5d2869398b7c955338931baba25b478695deb569b224bde7d4b92d8e53a4871b78ef57e4f3d352ba7f03107008799a1e3a21109b49a35763b7 SHA512 2de4bb6979c348fa30528b0bf9c99dae2952d43c3b4485afed0068dbcf9803ab59a21f89b0a0f5bc8d3b6a0024ac85a856e97ea2e00cda93985705746cc9fb7f
-EBUILD protobuf-java-3.5.1.1.ebuild 2080 BLAKE2B 0e51dd999d692bfa8a663821c5e1d6bccb031e350e4da42208a99114c7154dca30aae4076e57db0b25761d0c1233c0e71904c6be171cefc19892a68856f2502b SHA512 8f203866faa74f44e8e6209d787f34c84fb0dc8847bdda30bbec0171a5b8133eff54ce3609bc41cc972a5a1848a36fa3fa53561836da3744db66b6d517ac9013
-EBUILD protobuf-java-3.5.2.ebuild 1799 BLAKE2B 9823ead3f3d611217a070907bae7d62a0e10b68a617c39af629ef48c1f83f840cf48588b21d6eca40e229f9e42ff05e2686ca973f4bdbd51a856612adae6a144 SHA512 c8df2c790f1584389c9d5a24d73c7ee0211e6c5b99d189fbfe483465bfdcd8a7e902c4025ace00bf59f7326fcec6f4c70b4c004f6bf656a6b260e24d61300a05
-EBUILD protobuf-java-3.6.0.1.ebuild 1097 BLAKE2B 2daec7aa9712be1a166a5281821adb1c29437824c28d6f79574c6ee7005c7e0576b0b39a86a661beedb3144b411309226ac052ada72c172613ced1480cf4bd7e SHA512 2deda95ada705bd49c281e839138c474c5183b67d12c9197da3772e3346d7d2637ab861a4000d0362b5e112c8728c9ac9251ffda031ee32e9dcaacf904267cc2
-EBUILD protobuf-java-3.6.1.ebuild 1097 BLAKE2B 03a214f5716dacf251b0b2827c26ed5c37f75d12e202d01a8f75fb26774245d36aa59ee36ca40a5ebc3be0af60a7406d3e0161ea3eb51e3062dfe85b657f0af3 SHA512 dd535ed4039aa48be10cc427005a3eca8d54434c33242c4e6bfd8e8f56a6310aa58980731cb0727b08909919bf38cfab776aeedf5454305a2ccfcd0fb0a65e2a
-MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
+EBUILD protobuf-java-3.5.1.1.ebuild 2095 BLAKE2B 9cb63175cfb02d00fa2e9273aba56bc3fe640d5a485af2746dde34505d6ec9317617dc41e7da0f7dba3f728673a9a846363f61889bb4c4fb46916852623435a5 SHA512 1cc3f361b4cb240b80cd3a5b43b7e3f8d95b08152b33e09aeb7a96a07683d621384468730cdbf1b99f24dd6937aef3745fe3678e0b57ba9f314b6a21fa2139ec
+EBUILD protobuf-java-3.5.2.ebuild 1814 BLAKE2B fd690cc2a8ecbf5d568ea3d20cd5c494dc97f75c3f61b3c506e2e39168bb5e138e0ffce2f1d3ae846e13c535372dc4638d32b356664849248d3b2e948dce5c4d SHA512 df61e203370b90295a3b48eea64c80fa53e9cabf51730e2c49db2520017833961560d7895f80060f08807089d3df54220c74df852807fa1d07efdca3b84991d4
+EBUILD protobuf-java-3.6.0.1.ebuild 1112 BLAKE2B ed95623a91d20e3c8e2ecbb69c8c52421441c0eed3a3f36bcf84486b98cc67cccab53da1f83f3299b071cd0332f59461af952d29be82dd9f65d58fb68ab47ef7 SHA512 2746cfa9ac7a844aac943cf6ea5e0b09b5544f0be8a2ef46bdd9d46a3e8261892d0cd153e668bffd5b7babe31601ec3338c81f79de3788353f48921ae2890f2b
+EBUILD protobuf-java-3.6.1.ebuild 1112 BLAKE2B f8ff861b086b130132f712a85066b9c3b05f9ed8673bd8e8787a598cc9bd78818b586255f0cddec1a5b2d1cf846d84ab35a5a78ce4fc6e940ed757e397579b91 SHA512 39aa4611274b54b2875eb8d8ff196c80362cbeb484bdfc4b0c058a179dba7451a7c6938aa01c4f187b018b3f3c3b3f49ace697c6960bcd99df04018b2651dd24
+MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 8ed30cca824b..0697e5cc44b2 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -20,6 +20,6 @@
<subslots>Soname version number of Protobuf</subslots>
</slots>
<upstream>
- <remote-id type="github">google/protobuf</remote-id>
+ <remote-id type="github">protocolbuffers/protobuf</remote-id>
</upstream>
</pkgmetadata>
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 e5e3a7c4b5d7..000000000000
--- 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
-}
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
index d734039adfee..c0a6932d5146 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,8 +7,8 @@ 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"
+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"
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
index 77039bfd60d9..c60c8f9317b3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,8 +7,8 @@ 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"
+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"
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
index a2440356fbdb..5c4309e854e0 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,8 +7,8 @@ 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"
+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"
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
index d46192fa1762..798a81f93df2 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,8 +7,8 @@ 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"
+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"