gentoo auto-resync : 28:12:2022 - 20:13:25

15 files changed, 440 insertions, 0 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c149cfb5156c..724793895502 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 308293215c90..3978c5e7bb3a 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,5 @@
+DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405
 DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
+EBUILD error-prone-annotations-2.16.ebuild 965 BLAKE2B c3ba8197c52135e59ce668f7515be2753ac162f4157a28863a1c7902227191af4400af7dd03a5c3012f6937c99af8c26c3b16f5d381b847974d308102e897e05 SHA512 0e02e709aad2a50d6df3576681864233cff1a95c9e5ba998aa87558340d67d5c430607af0a52cddccd6d901cc80a969f69ec4a0cc63528135f9b810acf854893
 EBUILD error-prone-annotations-2.7.1.ebuild 928 BLAKE2B f49580ddc370cb985d8be8d33dd141324776ac6cd60ba6883711c9908703927f3a0f4afab60207c5f93490373c1f84959ea46c6a93fc7bee8eee131a0edec566 SHA512 54a0b82ed79a85dff80670fc45b54eafacdb480e774f1ee4652b0c03da22df7c07cc61a6bdbbc8413ce0d1bc6e1235a4038160e54cce496649aae9edc712c2da
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
new file mode 100644
index 000000000000..b12f83e9e5fd
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/error-prone/archive/v2.16.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.16.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="https://errorprone.info"
+SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/error-prone-${PV}/annotations"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 9bd5c8b445af..bfbd38e29f7b 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +1,5 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 EBUILD guava-testlib-30.1.1.ebuild 1986 BLAKE2B 5b61182607c6996a2e8aee2e42aecdd7599f31b3fb48eddb081a90309ca80d7545ca3e97adbc06524a112567559192d00bd875ba388238973411af666fa833af SHA512 db0d1758354bb210d6460be7ab17c9aa306d05509ed5416d0318d6c5e70727c9090818c6624a35a6c16c12b2119227c5e14f9b5e8ae526dba5c2676a44699718
+EBUILD guava-testlib-31.1.ebuild 1650 BLAKE2B 4376ab15bc06b8e7b987aa06af24cca66a1c748fa84ee76ee798096a68733a5d2402112bce20d7a13025ed109ef7b00644730984bb846ea0f84f02b22fb09e54 SHA512 9ebc4e74cc50aa8c88d962196b796d6ec1d3ed61d28a91827e2c482906e054af2d4f3133774a622cc6527af9570e87a4505ed514bbca16977f67260e3029a91f
 MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-31.1.ebuild b/dev-java/guava-testlib/guava-testlib-31.1.ebuild
new file mode 100644
index 000000000000..4b42897f23a3
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-31.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib/pom.xml --download-uri https://github.com/google/guava/archive/v31.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-31.1.ebuild
+
+EAPI=8
+
+# No tests because "error: package com.google.common.truth does not exist"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava-testlib:31.1-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0
+# com.google.guava:guava:31.1-jre -> >=dev-java/guava-31.1:0
+# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+	~dev-java/guava-${PV}:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/guava-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index f71ed9d64328..305874858c6d 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,5 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 EBUILD guava-30.1.1.ebuild 1820 BLAKE2B 120c69dac6a1b6e2452f15173645d4b1b43b04411bf5979a67e17cf241e53dd98e27b88151f6ada7f4bea5018d66c57603d99338d2ac6d07ba799d8b925ebf87 SHA512 4c4760e49e08fc5dd474e1ca9763b1d8a63f094d0bbc47a1c0356f9bbb7a20d75f1fb75d945b3d3a970da1434dc7c88440adf28b78f2c94f567295140bea4704
+EBUILD guava-31.1.ebuild 1665 BLAKE2B 3eb4f8dd2d392d094abbdd5d99f9d1b6c87b0ded1e5598ad9acb1412a8801cd21893e974d238d1011a9dcbd59ed5ea0d1b1f4078fc30952166c78b78c943c69e SHA512 6e16efa891fa77361940af5a1ed6b82a235ad36bc66709e5c48e1c6ea65fdc3704fe073a1a008cc38f824bebc90d03d8d4792ddda507c0c17394a3492ee8da69
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-31.1.ebuild b/dev-java/guava/guava-31.1.ebuild
new file mode 100644
index 000000000000..9ac8599ce3d2
--- /dev/null
+++ b/dev-java/guava/guava-31.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/guava/archive/refs/tags/v31.1.tar.gz --slot 0 --keywords "amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-31.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0
+# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
+# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
+# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
+# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+	>=dev-java/checker-framework-qual-3.14.0:0
+	>=dev-java/error-prone-annotations-2.16:0
+	>=dev-java/failureaccess-30.1.1:0
+	>=dev-java/j2objc-annotations-2.8:0
+	>=dev-java/jsr305-3.0.2:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 7d61d6ced566..6571ea4ff4a1 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,3 +1,5 @@
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
+DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f
 EBUILD jctools-core-3.3.0.ebuild 2253 BLAKE2B 260724ac01c2202cfe685bb232a5533b5dd611b5e57d7c9e47fb06b35c8e66c1026622c0ee14c62e09535219c90225f990215e6b573e0113721c9f9c64a54210 SHA512 68a3b914db018eee7354adc21aab9502c533d5ae6e2b00347127ce97dc3a5639fb810a3d889d0100e5065c23af3be807143ccea974d940586b0362d5f3280b2b
+EBUILD jctools-core-4.0.1.ebuild 2303 BLAKE2B 262873fe82c14c15f3e0769a96fc76c3c98703c68392d62405c4b0a7d2ac6aeb00d2870fdada700fc728a1188add4158d7a331d618d80322388746f86ae32348 SHA512 4aac7d0acc859459f6cf942f0dc1fa7e6310171f5ac3e3766fd26839ea161f41f639af0aa5b8fd707043e6f6521c9873495c26a1f06c4f13724e2fdffc6487a0
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-4.0.1.ebuild b/dev-java/jctools-core/jctools-core-4.0.1.ebuild
new file mode 100644
index 000000000000..63903c525b85
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-4.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-4.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:4.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava-testlib:0
+		dev-java/hamcrest-library:1.3
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+	# org.jetbrains.kotlinx.lincheck is not yet packaged
+	rm -r src/test/java/org/jctools/maps/linearizability_test || die
+	# These tests would fail and are not run by "mvn test".
+	# "org.jctools.queues.MpqSanityTest"
+	# "org.jctools.queues.QueueSanityTest"
+	# "org.jctools.queues.ScQueueRemoveTest"
+	# "org.jctools.util.TestUtil"
+	# Test timeout on arm64, https://bugs.gentoo.org/863977
+	# "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked"
+	# "org.jctools.queues.MpqSanityTestMpscLinked"
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -name "*Test*.java" \
+			-o -name "nbsi_tester.java" \
+			-o -name "nbhs_tester.java" \)\
+			! -name "MpqSanityTest.java" \
+			! -name "QueueSanityTest.java" \
+			! -name "ScQueueRemoveTest.java" \
+			! -name "TestUtil.java" \
+			! -name "AtomicMpqSanityTestMpscLinked.java" \
+			! -name "MpqSanityTestMpscLinked.java" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+	# OK (7226 tests)
+}
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index f18d7eea4c2b..a689389b379f 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,3 +1,5 @@
 DIST woodstox-core-6.3.1.tar.gz 6029586 BLAKE2B 04fcd7fd958cd3efa8a1e864786b88a1f8c3f0d6d6faecb5eb91a7cf755da4cef2664c0583702bf21dde741632638242131f0d46acb8f1b91bd00bf4c9a7af5b SHA512 fee1d8dc33aa2e3617b451fab285dbc91154738765eb9d93e8c1809a70f09ccb2f1cf2b70f57f836323d0a80bd5caeae0f5a4c5e2cee609c2a9d30106bf42acb
+DIST woodstox-core-6.4.0.tar.gz 6030457 BLAKE2B 0506a4af84eff8ac11bc6363581f8de737116bd254d0c3b2f68a9ce062325934188c5a05eeff918ae012330d885ba7940f9dc1afb01ee951ff58cdcd1c86b2c7 SHA512 ca8033084c0355c5a321ab51ab6cfee62737b49ab98106fab0abb3ac8950ddd773dc91d864e4e62bdddaca1b7ba98f3639d1a61d8c436892b35193a8c838659f
 EBUILD woodstox-core-6.3.1.ebuild 2850 BLAKE2B 28f9d92896a8af36c2eaa9038374cd8045a0a49e32aaf52cf86b1dfd96c71e60786698df2a080a1c6b8ede412ff917aadbe070be73aaa293cd40b42b26228fa6 SHA512 899f55fbab59ad7472a663bcd8a27565721ad816d153e15a56ff412d64e282ceea28e9255bf88df4f9b8da4baeeea783764f4e51e1d3cf209979e85be7927a08
+EBUILD woodstox-core-6.4.0.ebuild 2854 BLAKE2B 9ec76ad6cdad50838ba66e19d06bd0a8246394e831eed69c5ad9e5f618fc7e87a5b8b6084a75ed5c44f5e5595a68860941afdf604d7cfb84f9a3d56a232692d9 SHA512 8e721bc5ec7ba54b17510efd06ae646ce1117bff07a92b93a8cceb855d3503562827c741b77482efa439ec5d150bdb7dbc29d2613868f49a39dfecad2855a264
 MISC metadata.xml 366 BLAKE2B 2605af42f3dba4c792fde507b196dffd8f474581e64230e570e645754507323897bc100baae9af4851e018badcb06cb74e77725471ff3b6c28d99dd4f6824964 SHA512 9d6e03f3d734515b02329cfd788f581e88b95f3df6fcdb34884d935936034c284af861a595a7e08fad81bae4a27abb09100521d4ed0c94e39c6cff14fbf27769
diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
new file mode 100644
index 000000000000..0e7d55983aa4
--- /dev/null
+++ b/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.4.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
+HOMEPAGE="https://github.com/FasterXML/woodstox"
+SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-2022.7:0
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-2022.7:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+
+CP_DEPEND="
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/stax2-api:0
+	dev-java/xsdlib:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 -> >=dev-java/aqute-bnd-annotation-6.3.1:0
+# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*
+	dev-java/aqute-bnd-annotation:0
+	dev-java/osgi-core:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/woodstox-${P}"
+
+JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# https://github.com/FasterXML/woodstox/blob/woodstox-core-6.3.0/pom.xml#L229-L243
+src_test() {
+	pushd src/test/java > /dev/null || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/Test*.java" \
+			-o -wholename "**/*Test.java" \) \
+			! -wholename "failing/*.java" \
+			! -wholename "**/Abstract*.jav" \
+			! -wholename "**/Base*.java" \
+			)
+	popd > /dev/null
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_prepare() {
+	default
+
+	# src/moditect/module-info.java:33: error: cannot find symbol
+	#    provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory;
+	# https://bugs.gentoo.org/858302
+	sed -e '/com.ctc.wstx.shaded.msv/d' \
+		-e '/org.codehaus.stax2.validation/d' \
+		-i "src/moditect/module-info.java" || die
+}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 13ce0b49fc27..d2e19886ddc8 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1,6 @@
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
+DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
+DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c
 EBUILD xmlgraphics-commons-2.7-r1.ebuild 2095 BLAKE2B 58a8aa16af88bd0cb888efa1e79b21c9601b09e2d6fc408da27062270dddd0ed41c37c6451050bcdc05fbedbe12d89f09cb5142f4dd62cb1aa57e44135ab1126 SHA512 30e5b801298c0bce4e6aed077226fdbc9cd4c558a24046a552b5df2372926c0906a3d3f15a6c4cfe3c98ce797d60042202fe63e19c493b5a8ebfb55583de2ec3
+EBUILD xmlgraphics-commons-2.8.ebuild 2276 BLAKE2B a4f38ef8aeedd72d93fee58f51bcb262d8501237ef7268ac7ff4b79b0c84ae77604542aeaebc6989d9d00c54c71d8bddaf1458ccc10d5ddf827cd83dc13a052f SHA512 f94c54808664b3801067beae9e8ee2f29baa58cd1d728de2d1e2c290bc5965f254e2d07fe203db67c7258976cfcd9a6c600f0cd61b2406774d95a708952fa87d
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
new file mode 100644
index 000000000000..e2a835d17188
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4
+# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:4
+		dev-java/xml-commons-resolver:0
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/${P}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXTRA_ARGS=( -ea )
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
+# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java".
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 11; then
+		JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase"
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 424b56387fb1..e55e7ec2ae20 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,3 +1,5 @@
 DIST zstd-jni-1.5.2.4.tar.gz 9343792 BLAKE2B 8a446b229d49671b3f38d630ecf2c2688210176af95b66c788027de89986ad1f23615582d670f1d7a0b3866572b05c722ad6c71783d208401844287e8149f65c SHA512 bf67fc6573f2b1e45bd4985186814a54fb948a1b7280b5cf2f6d2577626c1f70626a58994291ffb228f097c91d60e3ed52d56ad92830c8f386b96b11fb6cf4a2
+DIST zstd-jni-1.5.2.5.tar.gz 9342510 BLAKE2B 259f3087f06c567f2126dacfb90ecfcc1d20f389ff99ef48a6f8c558441b37b56f29b73ca55aad176116439c4ef47f9ad253116a968f74e527eb13a0fda98f7e SHA512 16f2aeee6005e2da366a849f0972b3ef9245d355ed875e633bf4013d340cc74445604710e7b628aefafa90f74dfaa82a93c741f06f633b8a6c2162e9da304850
 EBUILD zstd-jni-1.5.2.4.ebuild 1693 BLAKE2B c186358196b6c5425eb71ced0d9c594f039c440b73e3e013c3dab89d61d94f478535803312e6180809911dc5b7cf7114ff2446340e666538a5e67b30bd4584d7 SHA512 e5ee8352fcb398a6a6f077c7d70dc3443f62a81f665bb848b33f03fc647528f752bb864444c06da01e0d69008360c84725d3b8d146461166ce97fd84c22dbf35
+EBUILD zstd-jni-1.5.2.5.ebuild 1537 BLAKE2B 4066fc48010c044939f2474c8f0cccd5445a8d8e8ce60c64d539d1be28b463edb454c44218679c4b3edd178ec39266d584f2a2a7d3b21c5be1ea8b33444c7480 SHA512 20f772f07911619b3aca15bcb3555f45038c80045daa06b8f6ae3c55f421baf55637161afa1f8ed0f96031d9c41e5adaae0c29010228bdc5bfded3085e048176
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
new file mode 100644
index 000000000000..c7430c949f87
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.luben:zstd-jni:1.5.2-5"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+HOMEPAGE="https://github.com/luben/zstd-jni"
+SRC_URI="https://github.com/luben/zstd-jni/archive/c$(ver_rs 3 -).tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/zstd-jni-c$(ver_rs 3 -)"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.luben.zstd_jni"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/luben/zstd-jni/blob/c1.5.2-5/build.gradle#L66
+	cat > src/main/java/com/github/luben/zstd/util/ZstdVersion.java <<-EOF || die
+		package com.github.luben.zstd.util;
+
+		public class ZstdVersion
+		{
+			public static final String VERSION = "$(ver_rs 3 -)";
+		}
+	EOF
+
+	mkdir -p  resources/META-INF || die
+	echo "Implementation-Version: $(ver_rs 3 -)" \
+		> resources/META-INF/MANIFEST.MF || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg_doso "${BUILD_DIR}/libzstd-jni-$(ver_rs 3 -).so"
+	java-pkg-simple_src_install
+}