gentoo auto-resync : 10:11:2022 - 15:28:02

12 files changed, 340 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 84a20ee78a8c..e7cea2ae72cb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 891a2787e2da..1893a3b22008 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,6 @@
+AUX byte-buddy-1.12.18-not-java20.patch 2497 BLAKE2B e63fa330e65aa9038a0f0f9e732c39114c62df845a6d481300b0fa8cc1a03e5fe9e057838ab945d9de50f0c2b22db14f0f3fdba95073f793e5c6f627e0e9bbe1 SHA512 c856eda61f8ee64245185431f6a0646fda16a5a8d632710e94abdffb7cebaca8e630f52d4027b81154dec7905290d7730c85a2452960ee485df3296c8d305174
 DIST byte-buddy-1.12.14.tar.gz 1857258 BLAKE2B 6957246f6689d1bdfdc6277ad752e03df0ae47c62b0afded77c94cdd41e00cc736517d0e4e5d5f8c59be519262a03864cde9bffa4ae53e5a7daeed84a519967f SHA512 5035be16fbdf2f7e8e2c93b87ee5f9adc927a19fd3b7d9fcd262906d8d21532cef8111084c3d6d0b75e101df0bfee19bf9177bc6a7d4b18cf0f26146fba4f147
+DIST byte-buddy-1.12.18.tar.gz 1924438 BLAKE2B 278ac97d60e62c7d44142a01da94113b29b483bff532f08fca7e345f383a4ddf83cb8c4d0544bce1879bb26909d048a76562cd816c4e9cb06695127ed849f08c SHA512 637e041f97981b85cd13ffecb0de47206b5c99d8b98561561414d8a599f5d53a6e047ba3ad9bc88ca030125221df3ebe49d6eff18a4093f4027d8cbf34a483b0
 EBUILD byte-buddy-1.12.14.ebuild 6733 BLAKE2B ce062dbe393a761d43e64cc4cf41edea638a3eaf31ff6151cc2c6a9ac2737e878f0718b41486d5766286b824ba7d8092aa112bd5f373e5b87f8a0cec2baf2b19 SHA512 5568d986f73bf6ff41b538a7816cca17f3bdc7128656f0601655dfb259ff88255a3961880cf2a005050e4d831238e657e9c8a6fd934e59ee9dd7fc0ab0cfcc1a
+EBUILD byte-buddy-1.12.18.ebuild 5311 BLAKE2B 1193b4a051c525da8493e6716ffe35999dced484690ddafc838f51b9cb9493bf628adc785736aba273a3b55335e45ceeef9f2b171da2375dad4d1bc1513d4a65 SHA512 5af73cd8105cb3514b23d511e8522d33c1502df8b088ad1d40f9c406d5093c9c7bb821127c5b6fbf74adec03188bb79c8353c464044f3a7385e89c40c1abfb79
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
new file mode 100644
index 000000000000..847b00aff70c
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
@@ -0,0 +1,175 @@
+# 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/raphw/byte-buddy/archive/byte-buddy-1.12.18.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.18.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.18"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/asm:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/byte-buddy-1.12.18-not-java20.patch"
+)
+
+S="${WORKDIR}/byte-buddy-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jsr305
+	jna-4
+"
+
+src_prepare() {
+	default
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy-agent/pom.xml#L142-L176
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	# adjustment for recent mockito versions
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:g' \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
+		|| die
+
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy/pom.xml#L159-L195
+	local exports="$( \
+		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
+		byte-buddy/pom.xml \
+		| sed -e 's:^:exports :' -e 's:,:;:' \
+		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+		)" || die
+	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy {
+			requires static java.instrument;
+			requires static java.management;
+			requires static jdk.unsupported;
+			requires static net.bytebuddy.agent;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			${exports}
+		}
+	EOF
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+	einfo "Compiling byte-buddy.jar"
+	JAVA_JAR_FILENAME="byte-buddy.jar"
+	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="byte-buddy/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		rm byte-buddy-agent/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testIgnoreExistingField()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
+
+	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	einfo "Testing byte-buddy-agent"
+	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy"
+	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+	JAVA_TEST_EXCLUDES=(
+		# all tests in this class fail, https://bugs.gentoo.org/863386
+		net.bytebuddy.build.CachedReturnPluginTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy/src/main/java/*"
+	fi
+}
diff --git a/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch b/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
new file mode 100644
index 000000000000..73b9bccdab3e
--- /dev/null
+++ b/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
@@ -0,0 +1,52 @@
+# We don't have JAVA_V20
+--- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
++++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
+@@ -140,11 +140,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+      */
+     public static final ClassFileVersion JAVA_V19 = new ClassFileVersion(Opcodes.V19);
+ 
+-    /**
+-     * The class file version of Java 20.
+-     */
+-    public static final ClassFileVersion JAVA_V20 = new ClassFileVersion(Opcodes.V20);
+-
+     /**
+      * A version locator for the executing JVM.
+      */
+@@ -235,8 +230,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+             return JAVA_V18;
+         } else if (javaVersionString.equals("1.19") || javaVersionString.equals("19")) {
+             return JAVA_V19;
+-        } else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) {
+-            return JAVA_V20;
+         } else {
+             if (OpenedClassReader.EXPERIMENTAL) {
+                 try {
+@@ -300,8 +293,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+                 return JAVA_V18;
+             case 19:
+                 return JAVA_V19;
+-            case 20:
+-                return JAVA_V20;
+             default:
+                 if (OpenedClassReader.EXPERIMENTAL && javaVersion > 0) {
+                     return new ClassFileVersion(BASE_VERSION + javaVersion);
+@@ -317,7 +308,7 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+      * @return The latest officially supported Java version.
+      */
+     public static ClassFileVersion latest() {
+-        return ClassFileVersion.JAVA_V20;
++        return ClassFileVersion.JAVA_V19;
+     }
+ 
+     /**
+--- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
++++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
+@@ -77,7 +77,6 @@ public class ClassFileVersionKnownVersionsTest {
+                 {17, 17, Arrays.asList("1.17", "17"), Opcodes.V17, (short) 61, (short) 0, true, true, true},
+                 {18, 18, Arrays.asList("1.18", "18"), Opcodes.V18, (short) 62, (short) 0, true, true, true},
+                 {19, 19, Arrays.asList("1.19", "19"), Opcodes.V19, (short) 63, (short) 0, true, true, true},
+-                {20, 20, Arrays.asList("1.20", "20"), Opcodes.V20, (short) 64, (short) 0, true, true, true}
+         });
+     }
+ 
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 20cefb7edc2c..d01ff8f89ef3 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,3 +1,5 @@
 DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
+DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
 EBUILD javassist-3.29.1.ebuild 2072 BLAKE2B 61ba2d0d93672979234c09fe36e610fd0c58015516458367d7995bbe0a985068d4216effdc01d8363105716513bf448e56f0432435f26cdd8a3b185390dbeda5 SHA512 fd4911cafbbe4e528a2610e72bf438cfc592a9d0f0f164d1547c80863522b624d54991ffe5cd2077dca6c71dda66a2c9f3f4f74ddb7288d7e430785514022de1
+EBUILD javassist-3.29.2.ebuild 2501 BLAKE2B 9003680b6c6e24eb15b7eb3539afab8828d5a1a07a0b282e4235f516ff86f2d7a955dcdeade85b3cf52726b95a3f027c5f650946d6a9ca78109aed4821dba1f7 SHA512 5412bebc4e4d4686d80d9f9d330fcb4b6fdd6bb1c69468a698a50ef84df1963a99c972409894b383ac39b4207b36b97c63037553f6adf8a4b7f7d45f5e32b80d
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
new file mode 100644
index 000000000000..5c7d808762a4
--- /dev/null
+++ b/dev-java/javassist/javassist-3.29.2.ebuild
@@ -0,0 +1,79 @@
+# 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/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.29.2-GA"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A class library for editing bytecodes in Java."
+HOMEPAGE="https://www.javassist.org"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*
+	test? ( dev-java/hamcrest-library:1.3 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( Changes.md README.md )
+HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
+JAVA_MAIN_CLASS="javassist.CtClass"
+JAVA_NEEDS_TOOLS=1
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	default
+	java-pkg_clean javassist.jar
+	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
+
+	# Tests run: 432,  Failures: 6
+	# https://bugs.gentoo.org/856364
+	# Cannot solve those test failures.
+	# replacing test... with notTest... for those tests
+	sed \
+		-e '/public void/s:testInsertAt:notTestInsertAt:' \
+		-e '/public void/s:testInsertLocal:notTestInsertLocal:' \
+		-e '/public void/s:testNewArray:notTestNewArray:' \
+		-e '/public void/s:testURL:notTestURL:' \
+		-i src/test/javassist/JvstTest2.java || die
+
+	sed \
+		-e '/public void/s:testMethodParameters:notTestMethodParameters:' \
+		-i src/test/javassist/JvstTest4.java || die
+
+	sed \
+		-e '/public void/s:testLocalVarAttribute:notTestLocalVarAttribute:' \
+		-i src/test/javassist/bytecode/BytecodeTest.java || die
+}
+
+src_test() {
+	default
+	einfo "Testing"
+	JAVA_PKG_WANT_SOURCE=11
+	JAVA_PKG_WANT_TARGET=11
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxws-api/Manifest b/dev-java/jaxws-api/Manifest
index 24e5fde2aa8e..96fcc5871172 100644
--- a/dev-java/jaxws-api/Manifest
+++ b/dev-java/jaxws-api/Manifest
@@ -1,3 +1,3 @@
 DIST jaxws-api-2.3.3.tar.gz 173806 BLAKE2B 416294f78f4fdb00e8ac6a285b0820d5e7c5938b700d9efffdbac76dd37c4940bb6f4a88a1bce9f3da8ef156e56ea1f858bcba041763f0397c5f7a8b08297b2a SHA512 7663dd7a9169dbe9b7d869e318add1b3a41ea5246500afb4f1d1374f4b89a71de6a68af413b8037374c4e6fb4fa4acb8524d197eebdef6bceeee8339818905b7
-EBUILD jaxws-api-2.3.3.ebuild 823 BLAKE2B f6aea4f7fde8a698a798dcb301757e4cf41b8737bc4e1161ed1fce63caa23f2f7bffb2bebbf97ac34cf0530477974ee45619e0a0c6a7485411ebf04373e52dcb SHA512 5986ede62398421252fd9f7be3127925e0f435345b092e349b0b0231399a2d68a77389728bbe5c95929f5dcfec87349f5d129fbe8c7227388ec0fce981bc41aa
+EBUILD jaxws-api-2.3.3.ebuild 834 BLAKE2B 65a4c81b5d640544912f01bcb6c21bf319165bb49a3855ae1f739cb22b875dccdf0c26045a9933fa15f6732992ed604f62a7fe89a933892f79c170ae4c0b1040 SHA512 ec36e11c36943c0bd7991dd8a0112b01753624462b6f4772ea551e346c54a369ce8c9510649fa191ce1ade209169a24ae0d677a56e1f70d7cbe8f58c9fde6cae
 MISC metadata.xml 370 BLAKE2B e86939098ed46b852efc0f844950e57b7a400e08033714fb630d4e4a8464a760b473ff58ad80fb8e729b43c2dc004505f4e944c793c81f0d0d63e4d92b978f31 SHA512 3692c24526b7343fcdaa55968be2fe74eb0e323cb0a9a5bb999dfa66d71818da5c4984057510900656a87aa63cda74822da0110b0053a111ef797868672e2305
diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
index 60b9e7e63676..5705c7a8f2f5 100644
--- a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
+++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD" # "BSD-3 Clause"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index f3991b9fed7f..d637420174de 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -3,6 +3,6 @@ DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223
 DIST jmock-2.12.0.tar.gz 111963 BLAKE2B d4b8c8c4ca68ed8dae3b4906e3163fa5e8e8ea8f4b993386d7fa605e0188dd43462550ae4833ab9dbfe68c24e15cf6d19a6f444ca57f666fdfe8b29734fd32f7 SHA512 b1ba12981e7379f5b07a29749c7640906c02f72f52158921d0ac02abf69c9c8c2dc753f4462ff0afa5807852a06f59a6da9ed9357ae7dc0303b0377a0e3da854
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
 EBUILD jmock-1.2.0-r2.ebuild 961 BLAKE2B 66253c0e57e4a2d44378f457e41a613fe8ea76c6c7f8760178ed706bc9b29ff2be3392d52997da22b3cdcef3d845ea4e606a639a9660ba64dc45a91edff9811c SHA512 37f94cfa6c76d6eb5a5053959c68a0e38e9acf6d1f8ada58f022fb79cd84d4c11a7e91acf09950dd86978395ccfad536b28efaf8f9ab923501edf3549ccd8c39
-EBUILD jmock-2.12.0.ebuild 2627 BLAKE2B 2d4b0eac9cd42a5e75800eae5bf6f260d09d3086849ba8c12f3866bf19dad60c7f3c240eb9e719a9226dd3a6e28579dc6d1ba0b2d7450693b595fc15917986f4 SHA512 10537329cb5b42d9708e3eb738dbc9fcffaa2b37c222601838d5f0b6313bdc237989b8a33a12dc8a3a60cade64d745c60a909daf781ee62e68241e2ca55fea07
+EBUILD jmock-2.12.0.ebuild 2624 BLAKE2B 5ada29c6bcee045669e4e2be0649354a5ffd82426ea1bcd3b9dce7414f2be777ae0ec7a4c45267197f05d9b84b926a1bf039a11359cac5fc45a3dcc0c70f20f6 SHA512 4abb6d0886be9c8f3df531f6ce3bfb0606c6d85b56dc980f371c21caef3cffd9b7737731f9f0cdd0bd72ade5f3bbf91d4e7ad173df40f2e6edca97d22a63a608
 EBUILD jmock-2.6.1-r1.ebuild 825 BLAKE2B 5e066e2552eceb12ce383abf78f52573636db5c22ef94c2769fdeb48493d5256d68d5183313faa5fc9ef01b91415df0747c2f2ab4479342a949f83467f80dab7 SHA512 52e29c763963f8afce59474aeb77a06aa67695d4cbfb12b08e064813f216445a402b520b497305d7554f00386973c3313a6b00b926d991bf481a7fd15d620c18
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild
index ebbf40d09c68..d426c13de2eb 100644
--- a/dev-java/jmock/jmock-2.12.0.ebuild
+++ b/dev-java/jmock/jmock-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index 6a3f0e2aafc7..0c49e98ab1f2 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,3 +1,5 @@
+DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
 DIST lzma1900.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
 EBUILD lzma-19.00.ebuild 530 BLAKE2B 62247d6619732917c5def4e3f4b09fd33627e4bad2b182aa73a61ebb9323f6a2c56cfd524d9727c00039d2700b6ffabaa52cfa55d6c4b203832255528c1b8c65 SHA512 59a25996592341650e323fe6c123d8bbee6ba16d0c725bfc444010cb3d255f0a3fc669a114fc739fbdb99900d5465000196a939d654dd658bf839e93887c89f6
+EBUILD lzma-22.01.ebuild 548 BLAKE2B 5330f3b8c37d409650704014dc107b62e6719c1758090a6681ab4a967eca3333645bd0106382eeb1c0c99931cf09dea4c8455104a32ec504908c414f4915e92e SHA512 4e393981064908c881ba3b914eb82071a96f4e45031e835b0e9946231caa610b166253e291c6ab2b904564615996e9bbba8b853b2d681f63bd1940afcf4a046e
 MISC metadata.xml 432 BLAKE2B 998874250825748d38aff4d525a9aaceab9cf55299f8fc3960fb0bfedeafc82fee0a9c2570d262678e5fb7949400673fe10b4d9f43a5a02aa1d02907f2d7a57a SHA512 0bfa574b8bea1f0e6f0f29331fdc6caa379729ff27e603af6bf20a895dcdfd233830dd35d2a14c032abd5c5d8feae101747aa344a9e2d08ec1eb3d98daa36939
diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild
new file mode 100644
index 000000000000..fcb02d0d2be1
--- /dev/null
+++ b/dev-java/lzma/lzma-22.01.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-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 unpacker
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="https://7-zip.org/"
+SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+S="${WORKDIR}/Java"
+
+JAVA_SRC_DIR="SevenZip"