gentoo Easter resync : 12.04.2020

6 files changed, 11 insertions, 119 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index f39136c3ad57..e9498ba92056 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,8 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
-DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
-DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
-DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-java-3.10.1.ebuild 1410 BLAKE2B 1e07e6df3fc2bd9f3dd1e1496325141ef87da72ef74badbfda92bdff9a0bb4a22702d7d6839cc69bd49e82457c26e8ca91c5c62e25c9d9c8a1d473e427d7330b SHA512 bec4d51d62a0b0b7f3f712b87c9fa646420dfc28a093841f35d2a9e9c8f2e2e7b70f0395b18fe196f458eda6e2e86c6ecf00f92e3b0bc13eaff534cd0f87bc7c
-EBUILD protobuf-java-3.11.2.ebuild 1413 BLAKE2B 40aff7435541064e15315fd7cc691e72bfabfb0f45c632bb163332aedaa3f6c4f493be1c9aadd44478958dabf1f41d9139044c1d92796ce83e6de8fd2c05476b SHA512 efc9d95b66aded56576770a104209c319cd836acd3ff5decc5b0d0bc0d7dd93093265eea28f2a9e47ceaff631b2cb6bce662db2fee3236b78774127ec83938a1
-EBUILD protobuf-java-3.8.0.ebuild 1382 BLAKE2B ac6dd81e147854eeca83884b7462af2dbb71fd93c1cb805b59b705b76333c8e9a4d8532742c81930b5bfc6ef0e2d6734888fe45a78b811dd7c156b3d02efa008 SHA512 2eb33c0e82ef03a2c2ff5df6f3168310520f13838308a6ad1407b8c8506199c09305828abdb2c1bfa715fdacdb74fb7116ad6e9aa7de99e444e79d2c297acddf
-EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
-EBUILD protobuf-java-3.9.2.ebuild 1413 BLAKE2B bb9f2aa01559aa681995d29d0046d5430f3e4202b72574c4168526ade346d9379dd9d763fae0e7c35b44184bf2a8d76988bb0844fe94c1d4415d0cf8f6a09ff7 SHA512 23acb84178e4f6169658090de437562da60e88ae3eb3f03eab013c9b6c667e753b3a355c306003429e5059332874f2174302be0993d0aeed970d91008f0d3c8e
+DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
+EBUILD protobuf-java-3.11.2.ebuild 1409 BLAKE2B 79e3280a5cd5ee49ed455c7ecec24277620221795c8339cf70e408d32b279497812ba2208b0505c5a57f928426556eb9b9e4363ab4702311385fbffc524f1f1d SHA512 4b399812255b225eaf288daf36b60a4a7f1bd0f7743a812ed4c8add5ef308e83eb3932ea02685257e0fbfe0caf9252d1c1da51d80f845682f226a276a6b2af34
+EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B fb6b6a03d5c0b542d675ffbfce077e1af4ce209f41571f72fadfd102c885e5619f1efaff550f41140c122745d17e52fd5d6fd525b5b5d08122f83bb9a8f1f632 SHA512 5b82121c95ba38591ffde5fc6567752c8793e517a1e94ecd076c9394a01b9f01669b0853f8a6a391baa9ba08de74088468f2ff0b28f2d8779dbb93978112e451
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
index e24c58d532c4..1389952ec4be 100644
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/21"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
index 2dd111153a0f..d7ecb43e8238 100644
--- a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.9.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
index 0a44500a6100..0d5d98cde220 100644
--- a/dev-java/protobuf-java/protobuf-java-3.9.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,8 +22,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/22"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
deleted file mode 100644
index 5943243e203e..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2008-2019 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
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/19"
-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"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-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.9.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
deleted file mode 100644
index e22dbfb5178a..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2008-2019 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
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/20"
-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"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-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
-}