gentoo resync : 18.08.2019

4 files changed, 57 insertions, 9 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 94a2d4023f2f..df79bdd0644e 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,8 +1,10 @@
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
+DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
 EBUILD protobuf-java-3.7.1.ebuild 1446 BLAKE2B 0354f61083a5747a713621fcee7a59a938ff03c008260dadd8aec7b928f81758fbe348f4eeb406069ebedfaa2979d98edaede22c1b738d0ce24c25c944a795c6 SHA512 63de3822738f831d43399cfbecb0cadf341dc605c4016abddb7444d6f93b7580102fb9bb95e55c6eaa1c6b4e4cb6217227a69fe5a927c1ee0e5ce3496a34bf15
-EBUILD protobuf-java-3.8.0.ebuild 1449 BLAKE2B 6a418e784c7052ebec2d6bd981160ad5a980c0149469390e2a0308b28c9d3e4f6c3a0369335e2655bc1f2b34ea8606234275af456697016e242993cdc5b156e5 SHA512 3f464829e4ded44e8fda593d8cb28380a9fc4d30eeee924e4c9193b207591640d4c68fbfcff55ec6c3e5d1d5a1cd6e9a7a853298f79a4b7e02f31546d914f2f7
+EBUILD protobuf-java-3.8.0.ebuild 1383 BLAKE2B d073629546fa85b36f0403ec1a716b9d286e5b7ba6e2f837aef10a9f90c13014bce56abc23ba910e8f8a90659865c79d3eeec0da49dc8f70f561f22d544b79f2 SHA512 474a86f44b1cc6effade6f6899c802b2c3c61fc269d194fff7c8f4214abe442c5f027115efb03b37d7b67a68b5c61d26b71c406f1c52e637e67cde8a6d1257ec
+EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
 EBUILD protobuf-java-9999.ebuild 1369 BLAKE2B 7a4c1b79b8a6517d03b5bcdfbca494c5c7d416de235cdb26833b6245ff7cbdf2a1b34dcaeb905619b6cc4d5436d681545ca682038dd801d17f9c1766775f8665 SHA512 4913eba9d7bfc2c182101bc9340d3c6d73c913d17abe8fe8358439ffe529ad1a8c2557fab6679cc2b4a4711635b387d1b8657504ce03123ad8b39ebaabea78dc
-MISC metadata.xml 652 BLAKE2B 7c402c1ed247fad130bc21514855634041718335e7b43285560165d5b9d30649a760a124d50c57e940a19fa524c2bf5bfb85a7761d17b6f14c050edb53e100e5 SHA512 bb608da39ddc541c7cfc3a0db10da20db6f5f88da9b4a966d9b30c7a1bfc9390773cd9400c24c2be15d62e0a0e890df8a4259adfca4baac36cc6d4047b352e54
+MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index fbdd6bacc234..f8086ae85526 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -9,10 +9,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<slots>
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
index 4e6cb44f488b..ccd6c80447d3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
 EAPI="6"
 JAVA_PKG_IUSE="doc source"
 
@@ -25,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
new file mode 100644
index 000000000000..e22dbfb5178a
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
@@ -0,0 +1,52 @@
+# 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
+}