gentoo resync : 25.08.2020

3 files changed, 59 insertions, 4 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index edc59395ab55..ebaecdaea6a0 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,8 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
-EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B fb6b6a03d5c0b542d675ffbfce077e1af4ce209f41571f72fadfd102c885e5619f1efaff550f41140c122745d17e52fd5d6fd525b5b5d08122f83bb9a8f1f632 SHA512 5b82121c95ba38591ffde5fc6567752c8793e517a1e94ecd076c9394a01b9f01669b0853f8a6a391baa9ba08de74088468f2ff0b28f2d8779dbb93978112e451
+EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
+EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B e0844dbc8e68248c33131d2738940b29308180e6915e76fd4e2226ae1ff41a58cbd686246286f2da8655d0295e0de995537b831f33cec37155865dca8473463c SHA512 4898ef42ac269dede35e5bef0ccf36fa3801df0cc8c7f4367575ba138b5ff9783a9f2e9086f7c0d1bda2d3d247b6f9ee8c3bcfb1eead59af6a63c2a7cc0a4e29
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
new file mode 100644
index 000000000000..09a8150fe7e7
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
@@ -0,0 +1,53 @@
+# 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/23"
+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() {
+	default
+	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 ffe2c1d9ca17..f4a234c2ae7b 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.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,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/22"
+SLOT="0/23"
 KEYWORDS=""
 IUSE=""
 
@@ -44,7 +44,7 @@ src_prepare() {
 }
 
 src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	"${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
 }