gentoo resync : 25.11.2020

4 files changed, 62 insertions, 4 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 3a5afcbb6860..244f12bb7a44 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,9 +2,11 @@ DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
 EBUILD protobuf-java-3.12.4.ebuild 1489 BLAKE2B d614cccadfeb776ad3a0ce67472a15034c89f07102ae766190710b89013ecae6bc7eeb691f37fd08080bbe2a4faeb70b669f822ee06078a680cb0e182a785d47 SHA512 a647dab84ade743212c3a726391023b9e2807017f75727df7225c7249af0a4b8960e9f6af6b3fe74bb4359501e0ed33c253a751dcfb17e6a657ddf0f428221cf
-EBUILD protobuf-java-3.13.0.ebuild 1491 BLAKE2B 89744945affadfedc119a4f3cbb81d052a49ac36637b685ecde9fb624517c983c94e7270d266db29407f1eaa32ea1c423c733176efbfb28f54d0cc41d473b0a0 SHA512 df3c43ad470392787c3a1f014d985101bed023fb47e04b1b1e0caf491a7bb24901f3ab13a400cc5ad3b5eefb87d528fd1b679de8d4a9679850f843fbf7774dc2
-EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 4c53b7d0594d82a3a0e6f2e2420a88855149ea7964bb5e9143e38f6dee438583e1e60a9e8b5c8dd011542512e7f62a4eff213012a9cd7fb3f6db6c3bfd1ffd9f SHA512 ee91c5417bfa9e26df1c83832babb9e0aa51cae7fbef8b1c22aa84cef538442d06c4953ee076a951c5d4843be265545ec1305800a8370aa4016021a690ff5bff
+EBUILD protobuf-java-3.13.0.ebuild 1488 BLAKE2B aaf459f56556a36f440b8d413100220035022d58f4354e1e301012d389a23f10e96cae3b1a48d028e7bd8392bae5057db94509b70c5b14aab191d0420235ae76 SHA512 cf0c8d423649de8dadc62867a40b83bf4b98fb66b65c9c82f956dc9c101d5eced3e2d9dd6020eefffb887d04bf9fd690106ce899e14d5bd96f4159f801d76c7e
+EBUILD protobuf-java-3.14.0.ebuild 1491 BLAKE2B 4215a44b5668a2ae9b96370a6b5ee5b4faa9435f6e64cb166b275813aaf5328b07cf29603832c024e985cf5f0330fca6f796b2f3eee4ff002e2cc0b1cd721d4d SHA512 93e50be3da3a650a971dfbf40da425b3a83aaa8d5307324c08d0af8cc41e0b28fefe3c7305f7cf377bd618d8aea5e77b65f22cb16f9dede641d9aab82e18141e
+EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index e26dfe9374b2..8cca8e54e398 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
new file mode 100644
index 000000000000..3f0a2dec4807
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+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/25"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=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() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${BROOT}/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-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 8f4365200b10..afc573227167 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE=""