gentoo auto-resync : 05:09:2022 - 04:23:36

8 files changed, 74 insertions, 19 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 69f486e827d3..a1fde60b896d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index fb3adf51b6d3..ee6fe1336366 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
-EBUILD jakarta-servlet-api-4.0.4.ebuild 927 BLAKE2B 8022535954bb467e0cd1e0baaa897320aafb8ad24e3929635a31ce9f0757863e698d9da0cc47fb46e3e78267dd9378e4083f26c5e2b980b7fbfd72f54e956d39 SHA512 270c4e04bf2166e817f1464a7e90a8f6c275f2058176dd3c922e2bc6789369bcc6a5b3c0d22b93ea682583ab11f9aeb471148ebe53111fb8581a1db8277bf770
+EBUILD jakarta-servlet-api-4.0.4.ebuild 934 BLAKE2B 1d6817f3f37a874b38895c0fa30abefdffa34d0405ffa4943f89f7884f1837ba1c35d9cf080a9e5d7c26124c1e6e62a3ec3ca6cf1d99b94b11a4a63c8e0ac68b SHA512 68b69e97b713745480ee703f24aee2d0b1e1e5505aaa0271f1e6c7538c076789a20ab9bd8fd1f89e6db8131a705e8bee3eeca0e85a0fe1a6304762827f55bd95
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
index c3a5a44be505..5debc2369cba 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index df008f37c6cb..97e41e7fb237 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,5 +1,5 @@
 AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11-r1.ebuild 3474 BLAKE2B 3cd56c40553f2fbaebb653b03ed6cad465667f78685eef4ad5c34cbb7b7b2ce679dd18fdb157af65100da2971e886f25cf12f5872b960fbc03f3280fee328310 SHA512 f4a9e7f335d70483c592ae5a5c370f377ae96f300c7605617d91ae7ddbfa0ef2a95b2ee7de41f4f2f17edfa3c2d523a62eb682cb59fa035bb195ae5e17e7dd20
+EBUILD logback-core-1.2.11-r1.ebuild 3481 BLAKE2B 8264024829aa34aa5ee066b7131d2ffc705396982d98988dc1b8aed532b2c73633d6901cc102aaffeafc97eea9ed8720d8230d9e4555c68ce07ec81326e2d047 SHA512 ca3ec00a4ced4fb84aef763d318aa11ff92eee71a1dbf35d1cb756586b9ea5a76f8dbe660e830f6b7dab088ee47ed59201754bb569a552f601c77cd7353789ac
 EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
index 5be7d55efb75..37cc37e0f7e5 100644
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 07a8b600145a..fd3f0cd0bb6f 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,6 @@
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
 EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
-EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
+EBUILD protobuf-java-3.20.1.ebuild 1430 BLAKE2B 8625de036d5ed22f587b922cd69620ce7e8dd1a0a30e77bc2154937156c2d1686c2ba27efaa1d55fc68720c420f16b14ba3520175791cefe99a754425d496a0a SHA512 e78e00cb7584d7d909b64feea2dc430819f63558ed124b86cdc2e518106a0e288638db14919286947fb86db15bbc47668398ca0081245a61e8294d56c5963d85
+EBUILD protobuf-java-9999.ebuild 1365 BLAKE2B 6d6876bc2cd65b0e17e4dfdf4de0fe4cde077a3f040ea1318511ff6da9915331a3f0686b132fe893aeda8d31c0f8031f338efef43c9f6e7e92d7ce75c1c8dc5a SHA512 f7c9ac0f8f37fe746aa3a0febd35d176e51600250ef512b2f7f28e17f6225fcd550b9bd708eb5eb5540f841b3e5116d18b011ef6bd75ee1a8e319124157df53c
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-java/protobuf-java/protobuf-java-3.20.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.20.1.ebuild
new file mode 100644
index 000000000000..f0eaf379e6de
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.20.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+	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
+S="${WORKDIR}/protobuf-${PV}/java"
+
+LICENSE="BSD"
+SLOT="0/31"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+COMMON_DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="
+	~dev-libs/protobuf-${PV}
+	${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
+
+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 db1925f3a2ba..43fa605b496c 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -9,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
 	EGIT_SUBMODULES=()
 fi
@@ -20,22 +22,19 @@ 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/30"
+SLOT="0/31"
 KEYWORDS=""
-IUSE=""
 
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
+COMMON_DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="
+	~dev-libs/protobuf-${PV}
+	${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die