gentoo resync : 05.12.2021

3 files changed, 15 insertions, 16 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 1cd05743be00..f45f95435d82 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,14 +1,14 @@
-DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
 DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
-EBUILD protobuf-java-3.15.8.ebuild 1498 BLAKE2B e3e42bc2d5a80adfd042dfc39b3e864517aef340432098c12859a9af83c2da2d66fc7439837efde9623343dfdb05c8870e2dd05c86db6682f963b7aed69e00c5 SHA512 a1552b542ba396f983ecda47dcc4ab368a9e523c8759edaf4da5c481e1639718a2646e4332d99fe4a7b545c8d5feb23a6bb6f535d0be8eeec152adf6f8ce4065
+DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 EBUILD protobuf-java-3.16.0.ebuild 1454 BLAKE2B 72947e022e40f1584a085c0b04a4d14f7cbc5481efb650ef6554287aef504d0de7ebc39fd4c6696f75f8d621e2f960c4cd823cc385320e6d31bac51705249612 SHA512 634b18db5449411fed2546618bcd702cd5a8283f0ae00906655784c16de0fc56b39da567daf471833073635be31b152d0ff3149dbe4a18edb86c8c2660bd763e
 EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
-EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B 3ed9ebe10fa9926d513e6f9367c6054cea58b33f007cc4250d251376c2a69b0e9aa305dfa88c7db109ce3262d0563d345ba4bdda98e004cf2ffdb699bf81eca9 SHA512 b8df11ef1583f01bb9633e67e5c6aa9b89782a0e42a15c94d5d826926887b45a068b8ef563ba08ded7c14ae1ddafc6f36dab761d607fcbb7122195b41d2edf67
+EBUILD protobuf-java-3.19.1.ebuild 1447 BLAKE2B 2988457aac2d90f55d39efbb976cc7af1d26277f9b810d06786d16660d4eb2412640fdcf595230eab986e35f372c6a559c13db4bb8cf2851cbaab7dd306446f9 SHA512 cebc604c66d76148bf206b3003fa99404a8116a62dad57aeee2fab451897238d75a3e3c47f127216a813af3a8e2e64785c41c437da0a3e342bac0c65361ec9de
+EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
 MISC metadata.xml 550 BLAKE2B 199a2367980d49f3b97fac6fe86fc231d294c3088532a260c8dc7b099cb22f996e016b37f942e8e8db491beab5ad4b04628daccb4061c2b02d0f0f809488f4a1 SHA512 72bb0afbf02d603eb8b50d7bf483dfe9f45f857163856fb7407e88ff509008d9745bd8e5e9f7376720c8c6d5179405e2e7359efb0e5caf2ce3d5e4795b684163
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
index 6c648819d2d6..6ae6dca3c0b1 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.protobuf:protobuf-java:3.15.8"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -22,18 +21,18 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 fi
+S="${WORKDIR}/protobuf-${PV}/java"
 
 LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/protobuf-${PV}/java"
+SLOT="0/30"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.8:*
+"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 11d9796bf900..db1925f3a2ba 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/28"
+SLOT="0/30"
 KEYWORDS=""
 IUSE=""