gentoo resync : 30.09.2020

14 files changed, 45 insertions, 75 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 18c8887ff5c4..12d5cf2c110c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index eb10cf874eb3..0e6d7602dcfe 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -19,5 +19,5 @@ EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158
 EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
 EBUILD bcprov-1.52-r3.ebuild 1325 BLAKE2B 5617350d06e52736b19b1ccc87aafc4bbfa5b02a3c06fe7dc4ed33f46dd8fa7a6d85e8f3546be83e14790d8068439c3e0f923e6f95cac1839e077dd004a45777 SHA512 cff73472e90c3bdb219a926fb65bc49685c42def85dbb5fa5d936f82a7dc3916f82c2f27e401cf94bbd32773b9d451c14c0392e49b433251bd631e81b4718c98
 EBUILD bcprov-1.54.ebuild 1332 BLAKE2B b7575fc50709ff5c4250b07b8e72ed008d426236746e8a037ae75693a4496d4a519152878090b922c18aae8ac68056edb47788f49f9e8f7f2bc7cddd1f43f8d6 SHA512 f38d0fa76c72147986c206a1363c8e90f65a7a7efa85a07b91e569dbea4cd55a4702fb9e2323ef95b2423d9c8809073a4233fb5999ed0688994c686d5415a376
-EBUILD bcprov-1.66.ebuild 1343 BLAKE2B f3a219a442e18fd399243fb2a6b6d2ea60795805c01aa97cd1d061d06dcf7039c2347a93fc9f0b5aabc6172c7c063aa805d063d35a34d5fa99719a12ba1383de SHA512 2cfcb9b3cbe7863b2f788ab8323ddc8a72d39373c6406c2fb233e45240a3ad6517913128de2455152d4627603c937fe48a6b91a8ef508426968f4c0cb7bcbfc0
+EBUILD bcprov-1.66.ebuild 1341 BLAKE2B b6e8fa6fe16ee1905aec54602c325f5f4b484be63b9e8e5e6f79827a1aa5121ed2d369b49506dc7d4091000e0c6753391934f634b026aac9c04e7152b7efa486 SHA512 64556678ad3ead8a9b139672db2fe31d934084e48680298212a77dba9e816e88408b1932098dddfc6407bb8f648f411d141687485c72d924bca3bee7adebaac0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
index 4ef9b5431d1f..2dad26804214 100644
--- a/dev-java/bcprov/bcprov-1.66.ebuild
+++ b/dev-java/bcprov/bcprov-1.66.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.66"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index bad85a2701f8..78c1eb728817 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,12 +2,12 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
 DIST apache-maven-3.6.2-bin.tar.gz 9142315 BLAKE2B f8b4ad4148a508b076cdb9f5ca322860157d6c3517c1ac7bd7d369066cc1567681761e1b638ea74f20461f8c111ff488e1478399a2ebfd406e91a10ace582d86 SHA512 d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
+DIST apache-maven-3.6.3-bin.tar.gz 9506321 BLAKE2B 45892ef05cc1e4578c05a794376fdda730a800070389a1be213cf58c8f8df87be5e22cb2e8fdcf718eed344eff3e133dc72a252b0bbb7dcaf4e0e184539f7b0d SHA512 c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
 EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
 EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
 EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
 EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
-EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
-EBUILD maven-bin-3.6.2.ebuild 1236 BLAKE2B c2cd29540a34f506fcc8013cf59f343aaa953e2f1132a9c8324520a7320bd3e0979c3fcff2779f11e5cfbb05abae0f9ab142225fb4eee6c07dc40f09b0abcfee SHA512 09022fa6db8aac2186ef8b39bb105c7bfc265105d7a4b436fc0b0e780863dbd8b6457f4508cca3bfeb4faafb6cc19a8b10ab4269ddd4d8c115db19df062faf51
+EBUILD maven-bin-3.6.2.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661
+EBUILD maven-bin-3.6.3.ebuild 1524 BLAKE2B 98e733774ff50a1994bfdff4e00b519a3dbcca1a6b0e6d8d43d90667cfb23d4c3f226f4c66205a683b572a947d17c162fe9a9a5ddef0cbd2cc72e502025da807 SHA512 b9c54d1c00454a8a78acb7e80b473502a5672174b440eb93617ec8ca0c7a57f7093d6083034e5534a135b8a57d46c994da481ee540383f565b73e26f8fbd3fb3
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
index 622589dbd25c..e6cf194b7619 100644
--- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,11 @@ S="${WORKDIR}/${MY_P}"
 MAVEN="${PN}-${SLOT}"
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
 # TODO:
 # We should use jars from packages, instead of what is bundled.
 src_install() {
@@ -48,6 +53,9 @@ src_install() {
 	# See bug #342901.
 	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
 	doenvd "${T}/25${MAVEN}"
+
+	# remove broken useless files (bug #734906 and #704618)
+	rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files"
 }
 
 pkg_postinst() {
diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
index 46ef90466cd5..80d5384a1aee 100644
--- a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit java-pkg-2
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8
@@ -30,6 +30,11 @@ S="${WORKDIR}/${MY_P}"
 MAVEN="${PN}-${SLOT}"
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
 # TODO:
 # We should use jars from packages, instead of what is bundled.
 src_install() {
@@ -48,6 +53,9 @@ src_install() {
 	# See bug #342901.
 	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
 	doenvd "${T}/25${MAVEN}"
+
+	# remove broken useless files (bug #734906 and #704618)
+	rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files"
 }
 
 pkg_postinst() {
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 25a64a8e0a99..dd145904dc62 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -17,6 +17,6 @@ DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d
 DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418
 DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
 DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
-EBUILD openjdk-11.0.8_p10.ebuild 7652 BLAKE2B 9ab04d8e05b7ab65029db969bcfb828db8cb09e93e7e11076cd24f5e4907cc576be0242e1278e801648f26b58d7eeb9d87adc830cf615a433eaa2a72d1388f0e SHA512 2a4b8bbfac4ef720b3a5b29d0a8d5cf8ec09987722df791fecb45b1ca96837ff225bd6605b47073f819a53bb8cec7e2c701e464bc3ffb5dfeec93ae3e3f454c0
-EBUILD openjdk-8.265_p01.ebuild 7152 BLAKE2B 6f607268ae92dccc6fd174d120773548e3ba1299895ca037b27ff0940b190c21630b1c129a9a634d134c4e80fee81807e28b65135a5d6118e1147dc652217a9d SHA512 4fd5f162d7a7693eed69e3fb36d8f8c9be312f85f779f61ae2e80a97161c7166e90e070505605579c3d8d21e818f47eb4adeffe469914f4fa1ef105ae34ecb5f
+EBUILD openjdk-11.0.8_p10.ebuild 7665 BLAKE2B 087fead2616959a22311b7749a05ac3f03b3bcce437bc2717440e1ce128258df7cd31fcc94c5a6087270b50ec52b8e7a9039d2788f0eaafed579dc1d437d7514 SHA512 0efd99c0557f17e643e6bf209212fa5541a7a28ae48a006238c50a5fdf376215ae4e530473cb528d5f6694c32448fbe3b26d4bd0ae615efc8bb9e148c0464858
+EBUILD openjdk-8.265_p01.ebuild 7165 BLAKE2B 8d7318c14d51eb2e3ba3bd6f0d0074142c5afe47e8b7a24f13f37119d6ba50102531c16860acae7e95238ddbe1102b1467c7f41cdb34b26b2b8450632d445701 SHA512 0a92e089258ee125225c6baed40cc0e132a193912491a25d5c1f8c22f62b3f26aa5e0a0056b226d65ae933c4eeac18d60db254d4489c9e758831313446fc79b1
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
index 403654841b0e..bce9c577d492 100644
--- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -88,7 +88,7 @@ openjdk_check_requirements() {
 pkg_pretend() {
 	openjdk_check_requirements
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index 038f2db6b3c0..93129b459fd5 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -107,7 +107,7 @@ openjdk_check_requirements() {
 pkg_pretend() {
 	openjdk_check_requirements
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
 	fi
 }
 
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 37509418908b..3a5afcbb6860 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,10 @@
-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
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-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-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-3.12.4.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-3.13.0.ebuild 1407 BLAKE2B 9beab81a4efe605df1e064a6f0aba18593ecca121d3c430e6fb362f86af8f4fe11285edb25e579aa8b5a4566ce3697763a8547c2ba40c7ef5f8d697ca7748ff7 SHA512 6320ebc0a8abde69c8063a510b2f2448419f0912988fcbdf0a991b76b59b8a1607bab9f1e5881face94a40ed7d2795ce6c5b4e9b9c18e34db1fe6a111115a202
-EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B 618eaa7131820759feb68c280eaf968dce8caf6ee527acb0f2be9fed4d6641340dfd4663ed8e3f4dfec479d74fd0da80d421466a5aea5bc7f8b9608988d40f55 SHA512 b6d704eb44be00dd49d7c9fd7da33db993803ccd691f262ef9467794a4e55958a2b5ada5fa0e52a6727b58f6f4143763c1af865c115d3da43d099066984ab0e0
+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
 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
deleted file mode 100644
index 1389952ec4be..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/21"
-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() {
-	"${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.12.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
index 09a8150fe7e7..469fb243d1a3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-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}
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
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 00495e65a87c..e26dfe9374b2 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index fe8374195d67..8f4365200b10 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }