gentoo auto-resync : 22:07:2022 - 20:47:41

48 files changed, 1160 insertions, 42 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2c87ddf2721e..08bce000c17f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index 387771951369..f4d7fd0b07e4 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,3 +1,6 @@
+AUX assertj-core-3.10.0-java11-compatibility.patch 18385 BLAKE2B b746dd9d80a06ff224cd1b01b567fbea915e2dbda3c76aaa365acf888b1f4fd17a4c2aa061ee02f913a86c937f3b8e2e6cfd412f2d61bbdec9812c54a8d66a72 SHA512 b5a5bc70824f0494df4629327e3b19426deaa6e26e2285b643952b75c851776b7de40e97f231040d6720f0e96633df015a7367d8745a2f9ba0f9db8ea6025b1e
 DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
+DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6
 EBUILD assertj-core-2.3.0-r1.ebuild 817 BLAKE2B 185e0e988f59a0c512c762176f83e5fbb5005ae950cdb9fab78ee4e80b222f23b203504f32f60d96648efb06c6ab23516cb30570672d6c7a89bede1037303ed9 SHA512 1c8356ce2314bc8e956092e2e8a0c849d9fb0d29bc24256e461b554ae1b5d18bfeafcbb3265f7b83c6281851df12a28b62f6cf8c86dba796d3eda3171752b9d3
-MISC metadata.xml 640 BLAKE2B 3582da14da36e366b2436a5f49b6c0265705ebc109a01fdfc9380ec5b02a92a7b7257e2f410118e88ff369c78e126ed87a697088e481637211de572cc84758b8 SHA512 975fe87b3997787302e135fb742893e042eef0a75c6ed0de1a61d34ccbbde8d17b9c637b31c2569236864b00ce9579c8818546ac49d4a1b6c1ad393013b83d7c
+EBUILD assertj-core-3.10.0.ebuild 3858 BLAKE2B 11837f5f1a04428a2646ce1c67274d29f023ceca32be692253149bc16c359c8339bf6708c32b03d36b4a8e730e84c3206498b0ee52ca0231b6e162f219ca4d62 SHA512 065f5446ff0c5739d8583d6297ed728ff1f3351a85242b9e20a097c9de1f1bff86ed89e0288ea63ec5a675745ade863cc2b1e349a132d1800d2b8a7c56207e68
+MISC metadata.xml 631 BLAKE2B f2934c7891770eeb763260301acce8af44fc4bcf7b511150b8460fa843f8e1f7afc82602c5282f43b5921424acd6caf2c4d3e0f9dcbd08fdd4954ec0f998db82 SHA512 08016ba465f8b6c87a243bcd0be422b2e0710875c0a8630ce73981615dbe53c8a28cf35fa3c03e11eac6d403c4a82752ca3c271ab939200fa4b96a7b467f48f3
diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
new file mode 100644
index 000000000000..922daf9a8789
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -0,0 +1,109 @@
+# 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/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild assertj-core-3.10.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.assertj:assertj-core:3.10.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Rich and fluent assertions for testing for Java"
+HOMEPAGE="https://assertj.github.io/doc/"
+SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	>=dev-java/byte-buddy-1.12.12:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/hamcrest-core:1.3
+	dev-java/junit:4
+	dev-java/opentest4j:0
+	test? (
+		dev-java/guava:0
+		dev-java/junit-dataprovider:0
+		dev-java/memoryfilesystem:0
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md )
+
+PATCHES=( "${FILESDIR}"/assertj-core-3.10.0-java11-compatibility.patch )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_CLASSPATH_EXTRA="junit-4,hamcrest-core-1.3,opentest4j"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-dataprovider,memoryfilesystem,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# These test classes are not run by "mvn test"
+# FAILURES!!!
+# Tests run: 11514,  Failures: 32
+# Exclusion should leave "OK (11486 tests)" with jdk-11
+# and 14 test failures with jdk-17
+JAVA_TEST_EXCLUDES=(
+	org.assertj.core.internal.BaseArraysTest
+	org.assertj.core.internal.TestDescription
+	org.assertj.core.navigation.BaseNavigableIterableAssert_Test
+	org.assertj.core.navigation.BaseNavigableListAssert_Test
+	org.assertj.core.navigation.GenericNavigableAssert_Test
+	org.assertj.core.api.assumptions.BaseAssumptionsRunnerTest
+	org.assertj.core.api.atomic.referencearray.AtomicReferenceArrayAssert_filtered_baseTest
+	org.assertj.core.api.iterable.IterableAssert_filtered_baseTest
+	org.assertj.core.api.objectarray.ObjectArrayAssert_filtered_baseTest
+	org.assertj.core.api.TestCondition
+	org.assertj.core.api.BaseAssertionsTest
+	org.assertj.core.util.Files_TestCase
+	org.assertj.core.test.EqualsHashCodeContractTestCase
+	org.assertj.core.test.TestClassWithRandomId
+	org.assertj.core.test.TestData
+	org.assertj.core.test.TestFailures
+)
+
+src_prepare() {
+	default
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:' \
+		-i src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleStream_Test.java \
+		-i src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntStream_Test.java \
+		-i src/test/java/org/assertj/core/api/Assertions_assertThat_with_Iterator_Test.java \
+		-i src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongStream_Test.java \
+		-i src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java \
+		-i src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java || die
+}
+
+src_test() {
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.math=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		# Before further test_excluds it should now read "Tests run: 11486,  Failures: 3"
+		# Additional exclusions will leave "OK (11476 tests)"
+		JAVA_TEST_EXCLUDES+=(
+			org.assertj.core.internal.classes.Classes_assertHasMethods_Test
+			org.assertj.core.util.xml.XmlStringPrettyFormatter_prettyFormat_Test
+		)
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch b/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch
new file mode 100644
index 000000000000..3f5210ae8458
--- /dev/null
+++ b/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch
@@ -0,0 +1,456 @@
+From 2e107db2a40c5ef60d4f5370e1e71fa780b67599 Mon Sep 17 00:00:00 2001
+From: Erhard Pointl <epeee@users.noreply.github.com>
+Date: Wed, 23 May 2018 11:45:35 +0200
+Subject: [PATCH] java11 compatibility (#1243)
+
+Fix java11 ea compile errors by adding assertThat method for StringBuilder and StringBuffer to disambiguate method resolution as StringBuilder and StringBuffer implements Comparable in java 11
+---
+ .../java/org/assertj/core/api/Assertions.java | 23 ++++++++++++
+ .../core/api/AssertionsForClassTypes.java     | 24 +++++++++++++
+ .../org/assertj/core/api/Assumptions.java     | 25 +++++++++++++
+ .../org/assertj/core/api/BDDAssertions.java   | 24 +++++++++++++
+ .../api/Java6AbstractBDDSoftAssertions.java   | 24 +++++++++++++
+ .../Java6AbstractStandardSoftAssertions.java  | 24 +++++++++++++
+ .../org/assertj/core/api/Java6Assertions.java | 24 +++++++++++++
+ .../assertj/core/api/Java6BDDAssertions.java  | 24 +++++++++++++
+ .../org/assertj/core/api/WithAssertions.java  | 24 +++++++++++++
+ .../org/assertj/core/api/WithAssumptions.java | 23 ++++++++++++
+ ...ons_assertThat_with_StringBuffer_Test.java | 36 +++++++++++++++++++
+ ...ns_assertThat_with_StringBuilder_Test.java | 36 +++++++++++++++++++
+ 12 files changed, 311 insertions(+)
+ create mode 100644 src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+ create mode 100644 src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+
+diff --git a/src/main/java/org/assertj/core/api/Assertions.java b/src/main/java/org/assertj/core/api/Assertions.java
+index 28c457f4c7..664748dad3 100644
+--- a/src/main/java/org/assertj/core/api/Assertions.java
++++ b/src/main/java/org/assertj/core/api/Assertions.java
+@@ -2565,6 +2565,29 @@ public static <T> T assertThat(final AssertProvider<T> component) {
+     return AssertionsForInterfaceTypes.assertThat(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++    return AssertionsForClassTypes.assertThat(actual);
++  }
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++    return AssertionsForClassTypes.assertThat(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link CharSequenceAssert}from a {@link String}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java b/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
+index fd05593159..fb2e2acfbd 100644
+--- a/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
++++ b/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
+@@ -487,6 +487,30 @@ public static AbstractShortArrayAssert<?> assertThat(short[] actual) {
+     return new ShortArrayAssert(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++    return new CharSequenceAssert(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++    return new CharSequenceAssert(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/Assumptions.java b/src/main/java/org/assertj/core/api/Assumptions.java
+index 9ce773bd44..d26b2453ce 100644
+--- a/src/main/java/org/assertj/core/api/Assumptions.java
++++ b/src/main/java/org/assertj/core/api/Assumptions.java
+@@ -308,6 +308,31 @@ public static AbstractCharArrayAssert<?> assumeThat(char[] actual) {
+     return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assumption for assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(StringBuilder actual) {
++    return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assumption for assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(StringBuffer actual) {
++    return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
++
+   /**
+    * Creates a new instance of <code>{@link ShortAssert}</code> assumption.
+    *
+diff --git a/src/main/java/org/assertj/core/api/BDDAssertions.java b/src/main/java/org/assertj/core/api/BDDAssertions.java
+index c558153faf..03e574a8d2 100644
+--- a/src/main/java/org/assertj/core/api/BDDAssertions.java
++++ b/src/main/java/org/assertj/core/api/BDDAssertions.java
+@@ -800,6 +800,30 @@ public static AbstractShortArrayAssert<?> then(short[] actual) {
+     return assertThat(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuilder actual) {
++    return assertThat(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuffer actual) {
++    return assertThat(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link org.assertj.core.api.StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java b/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
+index bd54285ae1..edb0451067 100644
+--- a/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
+@@ -487,6 +487,30 @@ public CharSequenceAssert then(CharSequence actual) {
+     return proxy(CharSequenceAssert.class, CharSequence.class, actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public CharSequenceAssert then(StringBuilder actual) {
++    return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public CharSequenceAssert then(StringBuffer actual) {
++    return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java b/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
+index ee9d3fb72d..4ff4315635 100644
+--- a/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
+@@ -489,6 +489,30 @@ public CharSequenceAssert assertThat(CharSequence actual) {
+     return proxy(CharSequenceAssert.class, CharSequence.class, actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public CharSequenceAssert assertThat(StringBuilder actual) {
++    return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public CharSequenceAssert assertThat(StringBuffer actual) {
++    return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/Java6Assertions.java b/src/main/java/org/assertj/core/api/Java6Assertions.java
+index e88ccde3c8..10912f41bc 100644
+--- a/src/main/java/org/assertj/core/api/Java6Assertions.java
++++ b/src/main/java/org/assertj/core/api/Java6Assertions.java
+@@ -924,6 +924,30 @@ public static AbstractShortArrayAssert<?> assertThat(short[] actual) {
+     return new CharSequenceAssert(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++    return new CharSequenceAssert(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++    return new CharSequenceAssert(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/Java6BDDAssertions.java b/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
+index 4ffc23475b..009929ebc9 100644
+--- a/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
+@@ -795,6 +795,30 @@ public static AbstractShortArrayAssert<?> then(short[] actual) {
+     return assertThat(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuilder actual) {
++    return assertThat(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuffer actual) {
++    return assertThat(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link org.assertj.core.api.StringAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/WithAssertions.java b/src/main/java/org/assertj/core/api/WithAssertions.java
+index c87854dd89..b71250c1bd 100644
+--- a/src/main/java/org/assertj/core/api/WithAssertions.java
++++ b/src/main/java/org/assertj/core/api/WithAssertions.java
+@@ -564,6 +564,30 @@ default <VALUE> AtomicStampedReferenceAssert<VALUE> assertThat(AtomicStampedRefe
+     return Assertions.assertThat(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  default AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(final StringBuilder actual) {
++    return Assertions.assertThat(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  default AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(final StringBuffer actual) {
++    return Assertions.assertThat(actual);
++  }
++
+   /**
+    * Creates a new instance of <code>{@link ShortArrayAssert}</code>.
+    *
+diff --git a/src/main/java/org/assertj/core/api/WithAssumptions.java b/src/main/java/org/assertj/core/api/WithAssumptions.java
+index 0703fa33dd..56539e36dd 100644
+--- a/src/main/java/org/assertj/core/api/WithAssumptions.java
++++ b/src/main/java/org/assertj/core/api/WithAssumptions.java
+@@ -371,6 +371,29 @@ default <VALUE> AtomicStampedReferenceAssert<VALUE> assumeThat(AtomicStampedRefe
+     return Assumptions.assumeThat(actual);
+   }
+ 
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuilder}.
++   *
++   * @param actual the actual value.
++   * @return the created assumption for assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  default AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(final StringBuilder actual) {
++    return Assumptions.assumeThat(actual);
++  }
++
++  /**
++   * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuffer}.
++   *
++   * @param actual the actual value.
++   * @return the created assumption for assertion object.
++   * @since 3.11.0
++   */
++  @CheckReturnValue
++  default AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(final StringBuffer actual) {
++    return Assumptions.assumeThat(actual);
++  }
+   /**
+    * Creates a new instance of <code>{@link ShortArrayAssert}</code> assumption.
+    *
+diff --git a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+new file mode 100644
+index 0000000000..b3f020f101
+--- /dev/null
++++ b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+@@ -0,0 +1,36 @@
++/*
++ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
++ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations under the License.
++ *
++ * Copyright 2012-2018 the original author or authors.
++ */
++package org.assertj.core.api;
++
++import org.junit.Test;
++
++import static org.assertj.core.api.Assertions.assertThat;
++
++/**
++ * Tests for <code>{@link Assertions#assertThat(StringBuffer)}</code>.
++ */
++public class Assertions_assertThat_with_StringBuffer_Test {
++
++  @Test
++  public void should_create_Assert() {
++    AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(new StringBuffer("Yoda"));
++    assertThat(assertions).isNotNull();
++  }
++
++  @Test
++  public void should_pass_actual() {
++    StringBuffer actual = new StringBuffer("Yoda");
++    AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(actual);
++    assertThat(assertions.actual).isSameAs(actual);
++  }
++}
+diff --git a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+new file mode 100644
+index 0000000000..315d6d4b9f
+--- /dev/null
++++ b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+@@ -0,0 +1,36 @@
++/*
++ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
++ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations under the License.
++ *
++ * Copyright 2012-2018 the original author or authors.
++ */
++package org.assertj.core.api;
++
++import org.junit.Test;
++
++import static org.assertj.core.api.Assertions.assertThat;
++
++/**
++ * Tests for <code>{@link Assertions#assertThat(StringBuilder)}</code>.
++ */
++public class Assertions_assertThat_with_StringBuilder_Test {
++
++  @Test
++  public void should_create_Assert() {
++    AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(new StringBuilder("Yoda"));
++    assertThat(assertions).isNotNull();
++  }
++
++  @Test
++  public void should_pass_actual() {
++    StringBuilder actual = new StringBuilder("Yoda");
++    AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(actual);
++    assertThat(assertions.actual).isSameAs(actual);
++  }
++}
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
index 9c7e00995b1f..a009a741c11e 100644
--- a/dev-java/assertj-core/metadata.xml
+++ b/dev-java/assertj-core/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<longdescription>AssertJ core is a Java library that provides a fluent interface for writing assertions. Its main goal is to improve test code readability and make maintenance of tests easier. AssertJ core provides assertions for JDK standard types can be used with either JUnit or TestNG.</longdescription>
 	<upstream>
-		<remote-id type="github">joel-costigliola/assertj-core</remote-id>
+		<remote-id type="github">assertj/assertj-core</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 6299c3ba969d..40ebca6945aa 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,5 @@
 DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
+DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a
 EBUILD byte-buddy-1.12.10.ebuild 1375 BLAKE2B 3d215a54ae80086b7e1a3f1a523546131c3a24db57106d13ef3d7f010a78e6a316bd01e10619c3b00c5a8fea84cad6cd942bca132b5e5fee9716d4645655fb0f SHA512 8e299b9c4ca17244c695e69ea50e7e40dbe6ef3eae116363c080ca4c3d4cae01411a1af9eb253973be3b50c1d51d78eb33d2ecc5c518a6a93ff21b93ac8c7d22
+EBUILD byte-buddy-1.12.12.ebuild 6645 BLAKE2B 1c791641004695ae56721b0b34d190477fbb08bb0eadb2d5688d495f2f57bcf2ccb1d9ebba6d77a0efcd252bb00ae875f3b3398f047bd678e00c49e63f0360be SHA512 a47a9b13cc084e550255fa6cd5afe34f2c8ce6ad5312419d90fa917596e5ee61e99d4e5c9697b762683e2987a02e19eb99e5de2f44afc069a25a22b353ab6a02
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
new file mode 100644
index 000000000000..6a3353c6c3d1
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
@@ -0,0 +1,176 @@
+# 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.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.12"
+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/${PN}/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:*
+"
+
+S="${WORKDIR}/${PN}-${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.12/byte-buddy-agent/pom.xml#L132-L165
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
+		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
+
+	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
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+# For pkgdiff to compare the content of module-info.class
+#	mkdir -p META-INF/versions/9 || die
+#	cp target/classes/module-info.class META-INF/versions/9/ || die
+#	jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
+
+	einfo "Compiling byte-buddy-dep.jar"
+	JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
+	JAVA_RESOURCE_DIRS="byte-buddy-dep/src/main/resources"
+	JAVA_JAR_FILENAME="byte-buddy-dep.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy-dep/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	# einfo "Setting -Djava.library.path"
+	# This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar,
+	# done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch )
+#	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native )
+	# Otherwise fails with:
+	# Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+
+	einfo "Testing byte-buddy-agent"
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	# Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+	JAVA_TEST_EXCLUDES=( net.bytebuddy.agent.VirtualMachineAttachmentTest )
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy-dep"
+	JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="byte-buddy-dep/src/test/resources"
+
+	# what "mvn test" does with java 17 is:
+	# Tests run: 9836, Failures: 0, Errors: 0, Skipped: 0
+
+	# 1) testTypeVariableTypeAnnotationRuntimeRetention[0](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 2) testTypeVariableTypeAnnotationRuntimeRetention[1](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 3) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 4) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 5) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 6) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 7) testChildSecond(net.bytebuddy.pool.TypePoolDefaultHierarchyTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 8) testNoParameterNameAndModifiers(net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest)
+	# java.lang.AssertionError:
+	# --
+	# 9) testSimpleApplication(net.bytebuddy.description.type.TypeInitializerTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	# --
+	# 10) testRedefinitionChunkedOneFailsResubmit(net.bytebuddy.agent.builder.AgentBuilderDefaultTest)
+	# org.mockito.exceptions.verification.NoInteractionsWanted:
+	JAVA_TEST_EXCLUDES+=(
+		net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest
+		net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest
+		net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest
+		net.bytebuddy.pool.TypePoolDefaultHierarchyTest
+		net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest
+		net.bytebuddy.description.type.TypeInitializerTest
+		net.bytebuddy.agent.builder.AgentBuilderDefaultTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy-dep.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-dep/src/main/java/*"
+	fi
+}
diff --git a/dev-java/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
index cb82f9c1427f..062d2894ccf1 100644
--- a/dev-java/conversant-disruptor/Manifest
+++ b/dev-java/conversant-disruptor/Manifest
@@ -1,5 +1,5 @@
 DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
 DIST conversant-disruptor-1.2.20.tar.gz 171469 BLAKE2B 5c43a5ffad0dacf07605cab6bba2ab1d44f7204d1e24405a4f8f8b09a3edbee79bc5ae4ba28a0a8cb1440db15b6ec0143e3348c0ff42b4256c1267e87d36fefc SHA512 1e483642213a3780d24cd7b801d6d5d274df9bac075f88bdfc8026173d87e4b332e7cb6c174dc804d27670b89dc9abab3a6f93b663dfbbb3ecc4631266351f0f
 EBUILD conversant-disruptor-1.2.19-r1.ebuild 1291 BLAKE2B 2bc5ca4d984836415961f6060911a76e0bf3fb11347d4076726c5f55eab5abdb524b7116f7dca48a4f5d7333b76d9c76a635e769e7c548ba196aa1d2ad18e5e2 SHA512 089076214d1aace12c37068bb9e6ecea208a2642786fffb9ef05f0b26712af564a990d5b168eeaf371b18caeedf93f855c626ca61a172fc7bd9eafe86180ece7
-EBUILD conversant-disruptor-1.2.20.ebuild 1728 BLAKE2B 73115f85ec62257036ba79ad2b1d853adc88ee05e788c31455aead312dc7434a6f8b60d8924f8749ee1652b379fe27e6ed7225df5eec9a1c81999405f82236da SHA512 780957599d3eff1ae70441ef4ab71cfaa02ea2736e9cc6650ae973ffeab8f0fe69c89e12cc8699e9b853a845e755b08a39f2a4ebb464d8233928f495b370a44c
+EBUILD conversant-disruptor-1.2.20.ebuild 1727 BLAKE2B 892f6c4132fc065f05344dabe7d20b65f1903daca4c12ae143fe71b271e81d07dacf104529a6e95075ef397744e6eb9d89a6b2e27b9ffa73c827a615854d5c26 SHA512 7a518af52c3ad156fe1eb7d0c70ecebc348437166aeafb4fd88c2e5e9dc1641a911aa3a88e73d01efb7ab3be3911d84bedfe576784d0f9ef442a4ebd2046397e
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
index bd781a7c57e0..102952cc6818 100644
--- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 385db3937fa4..22e2aa46ee4f 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -3,9 +3,11 @@ DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
 DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
+DIST gradle-bin-7.5.zip 166044548 BLAKE2B 2814ebe54bbe7165e6337be087bf2c841ff308c5d3f6c01e7a4d1dd63c13e723e9c06c395632edb32b7c9f84d174e1c0dd8c6ffee1f35f0b33201e24615b6521 SHA512 48646d59cd89836c33805fe3899587d338b46665f8f9c9d1535aa862b2a331e3045aa77cf4f2523e85b88ca3d2c58e0b4990fc02b84fb79e327817e37d9c6319
 EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.4.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
+EBUILD gradle-bin-7.5.ebuild 1109 BLAKE2B 7cfc0537a256cf0cc1dc7d8c369dac854251ee54064108795eae5720df97d9e9b3fac72fc41fb7443e2d0b85396dcd4563f19b56f1e0663c7dbe1e3447391bde SHA512 3160f5aa339b6e75ca0f74f14275323566a4688c84c6ba761d27ba39e0b497e09a3fe6a8790124d6469833fe5d329dc2a5b62a66e195f2499bb11d6368a218fb
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-7.5.ebuild b/dev-java/gradle-bin/gradle-bin-7.5.ebuild
new file mode 100644
index 000000000000..8dedd9ecd1ef
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index ef4508acf7e6..cfc1c24d1d0c 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,4 +1,4 @@
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
-EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3896 BLAKE2B e1302ea9708b24ddd1d7a37adb4a09c736940dd7be95f74a10a7f9c1442ee505e2398e491919a468097c4c46be9d5c86c09a27de9ac89a7cedf0e41811e54fa0 SHA512 7b2e0e3ccae805a68c9cc2ee88cb8413929e8c6d4ef238533adcef6568fc9bfe2f8b2cd1aa795ba1b9035093ff28f40707cd1dcfac7609ce647fbe76cce41418
+EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3895 BLAKE2B f65738e5c3d146ef7fe7f23069a40b2a35040c939b882f1fda4cd7dcd53137046b6901832f572a2aada4b5c2fbf5a707d476adfae2e32bfafe074a202675a4f2 SHA512 c2396c40b8be39a5d3c9a363d005a8c050fef359bc4efffaae8d7ebed60b1de0ab7ef52cb640b080226bb9ea589bd3da75d5a28a733fe842c95fd830f572edc6
 EBUILD jackson-dataformat-xml-2.13.3.ebuild 3892 BLAKE2B 46afcafa1c09722bd77b5c7bbc33c586deb219c9f35c561efe50067a6fac3e580c3c0c5f6678dd3052b2e3048055fd55e4e062b1b44beacc9a0a05e9cb33f060 SHA512 56f33b35d344dace59ceefbb25a14059f5dfe90723695066b300b0cb1b997a6d86258b3d869238a604a6f1d352aecdbdc9fec6b6b3c742b9e48070f55b44839d
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
index 457511639ea4..75b68cc6b10e 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-annotations-api/Manifest b/dev-java/jakarta-annotations-api/Manifest
new file mode 100644
index 000000000000..a9a7ab7f8eaf
--- /dev/null
+++ b/dev-java/jakarta-annotations-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-annotations-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82
+EBUILD jakarta-annotations-api-2.1.1.ebuild 685 BLAKE2B 4aac4bb3f699dbeed5de28558c13de03781f13af2bf8bf263950b173ab8710f5df340974512d49d6e00b6d1e77b1931b314e168c8d114833178ed5b1cf69e44e SHA512 814e588c9860d3ab69d23e8db52ca01fe59208119c5cce5d87efb6cdaa6a15b044c9d384615baf56f05d77d6edf1cdb6165747bbc24d731d9825e04f2625f502
+MISC metadata.xml 317 BLAKE2B 82d85cb4f96a2b03658bd4192ced1de7af9bb2c4be9acef469f2ddd731e27d9c32b03f603cdff91c8be83a99b0b57a9788b9272705dfd6a35f88aaf3ded7c685 SHA512 71166d7552e7b5e73bafb0bfc35cbaded2fdce8d278ca83e7a394251b9e9ca909d36e50302c0e945343838a3b911fb01cf07b5222a08ff41f8f605d482541075
diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
new file mode 100644
index 000000000000..fd5d5e54e46c
--- /dev/null
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# 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="jakarta.annotation:jakarta.annotation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Annotations API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca"
+SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P/jakarta/common}"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-annotations-api/metadata.xml b/dev-java/jakarta-annotations-api/metadata.xml
new file mode 100644
index 000000000000..9c98d5e873bc
--- /dev/null
+++ b/dev-java/jakarta-annotations-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/common-annotations-api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index c40b9c138786..d1d070e43825 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -4,5 +4,5 @@ AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
 EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
-EBUILD java-service-wrapper-3.5.50.ebuild 2095 BLAKE2B e8fb40273b4db4dd36935d366afa1514ca7de5a44ad4a2105f64ab26bf34c8218758b0d372e67d336b9db4280e22dc14252a089313f439c704b9adeb3132d789 SHA512 f5aac4acfee76373395daf2ea6b343b1ec7f648e2f8e8e5dd13f9319dc9c06456ccfef76219441edf60b39826e6afc15422c25e37ad6b716f080067783e7699b
+EBUILD java-service-wrapper-3.5.50.ebuild 2098 BLAKE2B a7b4fa3013fbc883ebe78ed79265222dd94ade6d3c024519964ff290551a5aefbe29b7c692cdeac8b8018768377b8774be43c2cbaac2e4c68197fb9d9bff6e8b SHA512 08c7a72058a74245eab60e77257d6a58d8a9eceb5db36e15d3125a157489ab8ca01688df77f525fca4494de5dd0192e7d34fedeebdacb93b96b1770c4bf71f67
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index f4dc6ef8ecd2..3473d38a6ae5 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -48,8 +48,9 @@ src_prepare() {
 	java-pkg-2_src_prepare
 
 	# enable tests on all platforms
-	grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make || die
 	if use test; then
+		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
+		assert
 		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
 		assert
 	fi
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 125149fb1794..2b0a46fdf9b5 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -3,5 +3,5 @@ DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72
 DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
 EBUILD jaxb-api-2.3.3-r1.ebuild 1531 BLAKE2B 8c3fe2631bb4c08cec81d96f8ae1a632740eee3e822e5ba16d703f8f792e594834175d2681eeedc28647d5c3f49947fc405bc57b915441203bb113419f31d948 SHA512 90a9f418a8c15a21d88076370bda6b757648fdfbbcd9c1eaf137de7f0d72d0aff7f6b326919f0f14f668e006d28c0a9fc0b60f594b252050f9032f681b1767f6
 EBUILD jaxb-api-3.0.1-r1.ebuild 1116 BLAKE2B 0699bde40ccb4198c76f1df7c6de9be8e4f7d555a66e733c05d5942677cb208598b47aa73f2a3691a3b5c5ef6c19ff5e9e37135eb648f87628b39a6e11ed1138 SHA512 d93aba658f98491ba3d9f8d6a24fc1831848096f93ea5c6500dbac61b431087eedb18c16e943a43bd26846e8bb45e1ae5f7dfcbbdf87b146c869cdcda83e0dc3
-EBUILD jaxb-api-4.0.0.ebuild 1022 BLAKE2B 2aa8ff74a22096e18772d380bf6d76fea9feee4bca84600855de5c2342ca62f2105261ec39ebda7be2da0c4e8177607b1fcf92d46878f7d7d6dd044924bff3e1 SHA512 b6532ee64d244aac60500a0e08c236f900121397438b6e1150beb817b82cefa2e7264844e8c81581ed0b73a967984a06b988d3b3119f6a95af25e2610ad04d49
+EBUILD jaxb-api-4.0.0.ebuild 1021 BLAKE2B 2fe4745460135a204660ef6c106c2b91bcf4a920171a31b6cf985a7aa0895a6818987a5365e44458cbba01fe597a2b59271fa00bffdde7d738c18a73fd8ca7cd SHA512 fdc2f37a02f7d41bb89d1b01f6f04f2e64ad9acf4efdf043f038c45be4aba9f5d670af85bc67e690711020c1ea87ae551c58e3794f7933baaea597a59d11f933
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
index a49e2c851b71..c7f7e03a29e3 100644
--- a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 CP_DEPEND="dev-java/jakarta-activation:2"
 
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 4558e976c860..1948dbd36d46 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -2,6 +2,6 @@ DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf2
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
 DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
 EBUILD jctools-core-2.0.2.ebuild 2134 BLAKE2B 394965b73740c75bf5578c02fdc035efa3e719501fa7452ae6da7e0d51bb11994def69e379623900c315de47a4e8147d1dd5cc6acaccda5b2188c174fb115f9d SHA512 6e5f6f1514a9bdbdff75dba29ca34553dd2d781c134579670195edbc70d702d34411b069ef353d81390dba47f23b81bfc960ca973b9eb75de68ba2ddd8d56695
-EBUILD jctools-core-3.1.0.ebuild 2190 BLAKE2B eedf0a9b0f38250300922f544d150162174e14c7e386b2631f1a30172e4110f5f239827e1deddee2b6b43615927ee71b3aaa3f1e3514c291b3e3ce55a1921857 SHA512 1648d0273bd79bbe45c20748b19e5d6aa9c5178f5c063e2dc07a07e34ba5180237194826b7240abccb3d901c42f2d12f40b25092ad75f1e5282664c6475dd4b2
+EBUILD jctools-core-3.1.0.ebuild 2189 BLAKE2B 523b81298fdca52e82a4643980a287416cf939da59a25782cb123979df983e22a85ae1b06809e9195f18305d4a63f3f27414601529d0972b68319b9239c743f5 SHA512 65b539b69938ca73d4309ec255098ccaa372c67ef7f50695b436e2f99f03314cac094f4e5cd2a150ad56ea844aedbde6ae5fd8fa2f654b63cc11050d6919f989
 EBUILD jctools-core-3.3.0.ebuild 1997 BLAKE2B 02c25bc251787f5b99e4ac4ed460e0875d187a388929ba42a522f491e6948110cb4788b969dd9af94e11679b8368188cc4c7fc3777554764ad0dcb3bead1630d SHA512 020fae13b989f623b512f42a51050279ef056a5d65defcddf7e80edfc47dec5e6e45a1ebfbbf4db6bbaef590b853678f14de6e3233cc42640e3ef928170ef2db
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.1.0.ebuild b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
index 834d6fa686a6..ff8ec57ecef1 100644
--- a/dev-java/jctools-core/jctools-core-3.1.0.ebuild
+++ b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${P
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 2e5802225ca4..d9509ef0470b 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -2,6 +2,6 @@ AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb
 AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6
 DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
-EBUILD jdbc-postgresql-42.4.0.ebuild 2022 BLAKE2B c7586ee5558289d9439b9e1e94aff7fe510fdd288d8ee20b8576499cbdf6e4088d0c982735c28687aa870a819cd81797b384f9aeb443c6328cdce250121f5f64 SHA512 a1b7e9a991ebaab20f91661f874e550dfac7977defaa0d8a626a90b924afdb4a4fa7c9865d6323ae8734f7c247cb6dbf42bcf9e9ee2a47998d94df5a4e8a1fdd
+EBUILD jdbc-postgresql-42.4.0.ebuild 2021 BLAKE2B cf59b8c4f95868d62116d3c7814bc48df392efee137ca93992299afb9c210f3debc93ec125cfae6e04086e0f26531283313dcd9f8ea67100172324674e6dbc73 SHA512 4acd2c7f9a353701a1d67541e19385bc3a98c96290ce5b00a3c8e2ac65300c9fcf14f9ff4c85130dc0b39ca60f31498fa750f85ec8924254fecd8324a1206762
 EBUILD jdbc-postgresql-9.4_p1206-r1.ebuild 3412 BLAKE2B 96f494807dcc52edbe1475d49af9a951873ad01647f44132ae0c370d84b9cd623091a2177ed99d25dec3a78252ea57c1e31b98da68ba6eb9e301cd2e8ea319b7 SHA512 bd1a037439f9e6995fe525a5a5ee6b2f89ff727e1741c92d9798676960aa6777c1d80d0046cac6557291a700c6a10c9de46729b0f878f20af5d55aac19d274e4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
index 9ebc3e1125bf..436bc338da5d 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/junit-dataprovider/Manifest b/dev-java/junit-dataprovider/Manifest
new file mode 100644
index 000000000000..edcbe83c2728
--- /dev/null
+++ b/dev-java/junit-dataprovider/Manifest
@@ -0,0 +1,3 @@
+DIST junit-dataprovider-2.9.tar.gz 192088 BLAKE2B 4b6650bb2488bb2102e433c48f9c19620e4f60cf222fbab0dd5c8486fb0e64a86cdbf445739e2ad26f6d1e68239805cda7dd48802b556f56c53130b8fd348569 SHA512 78b9c02213e43c05e1896ce740cd177ce728ba00607dd90a029d87abcdb9bf899a285e39d6c69ef8e0b7463fe04159d4e80c405f983059a7a5a349f95767cc99
+EBUILD junit-dataprovider-2.9.ebuild 2206 BLAKE2B 0e3669af6c9a738ab8f82ec589310fec1e8d5542734839e95108e5d01ef09e6502a731bc4fc108d6a057e5b02f65eaf11bf15223e2a0dc549623c433700d31b5 SHA512 c15a4a3a4ac40b55bf5407569770793ac25a3025a44e54d455601bac947d8a4bfce453151da8e035c52b76b8224c392f5efe40f09b73627841b8d47fe2680e84
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
new file mode 100644
index 000000000000..8628f1b234d8
--- /dev/null
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.tngtech.junit.dataprovider:junit-dataprovider:2.9"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The common core for a TestNG like dataprovider runner for JUnit"
+HOMEPAGE="https://github.com/TNG/junit-dataprovider"
+SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="dev-java/findbugs-annotations:0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/junit:4
+	test? (
+		dev-java/assertj-core:3
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( {CODE-OF-CONDUCT,CONTRIBUTING,README,SECURITY}.md NOTICE )
+
+S="${WORKDIR}/${PN}-${PV}/"
+
+src_compile() {
+	einfo "Compiling junit-dataprovider-core"
+	JAVA_SRC_DIR="core/src/main/java"
+	JAVA_JAR_FILENAME="junit-dataprovider-core.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":junit-dataprovider-core.jar"
+	rm -r target || die
+
+	einfo "Compiling junit4-dataprovider"
+	JAVA_SRC_DIR="junit4/src/main/java"
+	JAVA_JAR_FILENAME="juni4-dataprovider.jar"
+	JAVA_CLASSPATH_EXTRA="junit-4"
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"core/src/main/java"
+			"junit4/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	einfo "Testing junit-dataprovider-core"
+	JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4,mockito:4"
+	JAVA_TEST_SRC_DIR="core/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing junit4-dataprovider"
+	JAVA_TEST_SRC_DIR="junit4/src/main/java"
+	JAVA_TEST_EXCLUDES=(
+		com.tngtech.java.junit.dataprovider.internal.TestGenerator
+		com.tngtech.java.junit.dataprovider.internal.TestValidator
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "junit-dataprovider-core.jar"
+	java-pkg_dojar "juni4-dataprovider.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "core/src/main/java/*"
+		java-pkg_dosrc "junit4/src/main/java/*"
+	fi
+}
diff --git a/dev-java/junit-dataprovider/metadata.xml b/dev-java/junit-dataprovider/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/junit-dataprovider/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index a9973e414311..c850a78db2f0 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,6 +1,6 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
-EBUILD log4j-core-2.17.2-r1.ebuild 8554 BLAKE2B e4eaf3b001f8c949478aef1e13b7d04d91d5a97108df0d9da886adfdf1730d1a8e34ff10ce0eb27e174ea358d11ddb617865ab49e3b19eed972ad47c94447793 SHA512 0563585afeba69ca1ed5ef393b9ec5a1c1b7110b467595d7e6d62ac8182011a3bada70b2ad8abdd308ff9dc547278fe25cd111cec52e139f25e13347deeed1d1
+EBUILD log4j-core-2.17.2-r1.ebuild 8553 BLAKE2B bc6bc8f4cc716d73170a1853f9f27e03af6cecb4105695289b51bcc88eeed5d802f45d7de15c7d96ae235cbbc091769b0e7dfbe6b02f63b6ecc07333f83b240e SHA512 870587ec012bd54e2fed0be6d71254ae8fc9f1379be60a76fbc019e50e8be5885a719b60fe9a669809fa53f35758de7ca79864f275698521092a15452248aaab
 EBUILD log4j-core-2.17.2.ebuild 8550 BLAKE2B 429e7da14c9aef21fb613522f9a240ae9f731f776a5c1c0b894da7b8f3176f6d7c0ec0dd83ff63c66520e4ecf0c1511bbf94ce58a979fb71f4aa5b4bec262903 SHA512 a13d5761ceabf1c307f82f715e9c71ba2d68135859fdc5c3419e572d2ca293f0c2bf1efbc61b0a0d55dc054b60678d9f1c9b79cf29cb668b7eb187b137036dc6
 EBUILD log4j-core-2.18.0.ebuild 8539 BLAKE2B 6675a0dfe0463d16058f52eb9715ff4f5535156f8c66df0b8c63c5c44b429a6e109779196759136a93c4d1dff0938e68b84251289cef9599314a4f49c2ecf479 SHA512 0ef6883a0b7a8526408537b57fad56d4bed7bcf21448979ea36572953fd4c72d17f5aa2b7ba335878f9fb8ee10caefdf75f22355757a032e95654fc15b32eacd
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
index 4ba81d46a2d7..e08809628b9d 100644
--- a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/memoryfilesystem/Manifest b/dev-java/memoryfilesystem/Manifest
new file mode 100644
index 000000000000..0172aa20673f
--- /dev/null
+++ b/dev-java/memoryfilesystem/Manifest
@@ -0,0 +1,3 @@
+DIST memoryfilesystem-2.3.0.tar.gz 127429 BLAKE2B 74ce26328db840d3fce6aebc089cbe6921c2ab7b7448c63aedcffc7358890785ec10f7823d7bd686e3a82bdfb84b9c7c796f49f377f577473a98b298cd04848d SHA512 1aac6b19fe0f6f6c950f13fff3507c61e3307d8d400cba664ae7907c0b4fab03166482ab6515bf355fe27498775ac8ee2850eca8c510e3e72a481b00fec63078
+EBUILD memoryfilesystem-2.3.0.ebuild 1307 BLAKE2B 9a13607c12d7eff3e7f84f6b0e9e41c6dd778d171827c8473536328d546ebd961f022e419464640ad7496ddc6a26700d02a1c3e6abf5932535859413276b0c73 SHA512 8f96d28fa15dfc8f134c87a8987933c0c2d22c812a44f7de7d99337d15e07be7584339ea0799ce8cc51412390c8c047f0533a0eefc956a6ae6908f2a85c267d3
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
new file mode 100644
index 000000000000..f10d54eba1c3
--- /dev/null
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# 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.marschall:memoryfilesystem:2.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An in memory implementation of a JSR-203 file system."
+HOMEPAGE="https://github.com/marschall/memoryfilesystem"
+SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/jakarta-annotations-api:0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	# https://github.com/marschall/memoryfilesystem/blob/2.3.0/pom.xml#L236-L259
+	cat > src/main/java/module-info.java <<-EOF
+		module com.github.marschall.memoryfilesystem {
+			requires java.base;
+			requires static jakarta.annotation;
+			exports com.github.marschall.memoryfilesystem;
+			provides  java.nio.file.spi.FileSystemProvider with
+				com.github.marschall.memoryfilesystem.MemoryFileSystemProvider;
+		}
+	EOF
+	sed \
+		-e 's:javax\(.annotation.PreDestroy\):jakarta\1:' \
+		-i src/main/java/com/github/marschall/memoryfilesystem/MemoryFileSystem.java || die
+}
diff --git a/dev-java/memoryfilesystem/metadata.xml b/dev-java/memoryfilesystem/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/memoryfilesystem/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index f15755d0229e..7cdf18288e99 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -2,6 +2,6 @@ DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08
 DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
 DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-4.6.0.ebuild 1233 BLAKE2B ce75b72ffe49e4d7e8d39614cbb78a60d90c4cae3874d5b432e66e16f8f28af3d3cf034114ca15e573c5f36de45d5bad98c58f2311af84d2484b286beef587ba SHA512 80cdd01513906a21fcb008ee9d5ba00a177b11fe14a4cbfa9d1ef6cb714e81c21271bab98345318d1ca3ddf81a16af6504963f6a8c1f457b174750609f7ca5bd
-EBUILD mockito-4.6.1.ebuild 957 BLAKE2B 3894338d4b760bcdb9e3394122a5bc581e234eb3241af9415804f1af2d0a97ad10292663973374f4185d25eac5309b502d214ae95dc96b7c853601bfd1bdb169 SHA512 f5203b10e1f2a8389923d14ca3926b4dfdb4aa76a12428d3d6e88d37286614be5fecd887d39637b2f1c45fa35ea55017392e6abb39eb159640d50b99c11968b3
+EBUILD mockito-4.6.0-r1.ebuild 1158 BLAKE2B f2f341f0b9d4b957b0a7020deae5418e691694820543291192d5a5c8b5f6ae55b76d96b42127911ef0f692981c7e1d68b764105f5d4dc061f53a55cf6bbfe6b1 SHA512 2ab4a7d0b98cd44b59ded1bf0dcdc01599cb78ada0a427131f6fd1c235b70fd010f6d5d2fb22083416c3a38276431c7f7f6df66708177ce05970448faf9f6aac
+EBUILD mockito-4.6.1-r1.ebuild 1192 BLAKE2B 545cdd92be86628c23e2e18eb4fac8f1a269bc832696058acd28870a21b153a8f971f2f32021d92d1921cbe2d2c855c2f66bccae0ebd8b5c284dba86ab1370cc SHA512 fa25aea9a07a475900df7491b5f485cb28104033ab13179f2801591db8661493d1ed327883ed0a4794c8d03814808c215df24fca19bb11cf880e5246b630d4cd
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/mockito-4.6.0.ebuild b/dev-java/mockito/mockito-4.6.0-r1.ebuild
index 64fd58db303e..bd3679411683 100644
--- a/dev-java/mockito/mockito-4.6.0.ebuild
+++ b/dev-java/mockito/mockito-4.6.0-r1.ebuild
@@ -24,8 +24,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0
 
 CP_DEPEND="
-	dev-java/byte-buddy:0
-	dev-java/byte-buddy-agent:0
+	<=dev-java/byte-buddy-1.12.10:0
+	<=dev-java/byte-buddy-agent-1.12.10:0
 	dev-java/junit:4
 	dev-java/objenesis:0
 	dev-java/opentest4j:0
@@ -48,8 +48,3 @@ RDEPEND="
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/mockito/mockito-4.6.1.ebuild b/dev-java/mockito/mockito-4.6.1-r1.ebuild
index 6b2aaec5f590..493246812dac 100644
--- a/dev-java/mockito/mockito-4.6.1.ebuild
+++ b/dev-java/mockito/mockito-4.6.1-r1.ebuild
@@ -19,14 +19,14 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
-	dev-java/byte-buddy:0
-	dev-java/byte-buddy-agent:0
+	dev-java/asm:9
+	>=dev-java/byte-buddy-1.12.12:0
 	dev-java/objenesis:0
-	dev-java/opentest4j:0
 "
 
 DEPEND="
 	dev-java/junit:4
+	>=dev-java/opentest4j-1.2.0-r1:0
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
 "
@@ -38,10 +38,18 @@ RDEPEND="
 
 S="${WORKDIR}/${P}"
 
-JAVA_CLASSPATH_EXTRA="junit:4"
-JAVA_SRC_DIR="src/main/java"
+JAVA_CLASSPATH_EXTRA="
+	junit-4
+	opentest4j
+"
 
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
+JAVA_SRC_DIR="src/main/java"
+JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
+
+src_prepare() {
+	default
+	sed \
+		-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
 }
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
index 9a8eca0d8af1..87b3ea0a1e8f 100644
--- a/dev-java/netty/Manifest
+++ b/dev-java/netty/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
-EBUILD netty-4.1.35-r1.ebuild 5857 BLAKE2B 90e00e4ad92865522a5bc5a070aabb8f0980a49ea884d03dcb8af57c3310dabdded6d38b3d7bc403cfa2cb3a59abbf0e57c9c6ea58f2262a3d570d53fb9d2c6f SHA512 9049cfe4ecdacd07d3663df68c5f67aea1655154468ffd835efc9415034573e252f0b1a24089458550bc7e02ea45ac75e4661203e954974b72bf753af9a726ba
+EBUILD netty-4.1.35-r1.ebuild 5856 BLAKE2B 6b71bd5e05bb35f34db31f1b0951f34d58db50894f98fed71a08a718a75de29e4fd71e10c92f38fb37c6303763a9dcdccb71963be0a2b4f8962d5b2db422f6d8 SHA512 1fb665c49fc64d59e87ac6e363786525ab136d1e08682c1d5058519411149e3ed1957f66561d9908fa8ee19560ace44ddaebb1edb13a91dfcc8e981166b73020
 EBUILD netty-4.1.35.ebuild 5853 BLAKE2B a6f9664df891175234eb940606a8232a32ac7dbec4e6a2522bfabd0cc30cdfe7126e7c000f05460ba62791e9402c6bf2791b28180ce6844017fc9efa525db048 SHA512 2e5ddf7410b4f26b7559fd192dcc3242ccc4f84470a09abbc8a387a4c7a56fa2c62abf07619a83b82b8f10937d7589cde4e508ba61b18df9f9d1ca8dac0d74a3
 MISC metadata.xml 507 BLAKE2B 821a563701bddd615a49743269e82ef5f906d5f30d957accbba10cda171b3a8943911733247e05efc9c28b40fd75396e78c2b28c3297a74b15ea8b716dc50ad1 SHA512 5c237af46f2d99e807ad5d442c83af2d1bbd85f3d3ed71e5dc3595c91d2e8104e5025216911e74901817cfd495eb6e96e22248bd1a05c90018c7d13b99d1d494
diff --git a/dev-java/netty/netty-4.1.35-r1.ebuild b/dev-java/netty/netty-4.1.35-r1.ebuild
index fdac02193f25..328ab221e167 100644
--- a/dev-java/netty/netty-4.1.35-r1.ebuild
+++ b/dev-java/netty/netty-4.1.35-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 # We do not build the full range of modules provided by netty but only what
 # was available before in netty-common, netty-buffer and netty-transport.
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index ea07f2e31db1..e29b3fe2a05d 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -4,7 +4,7 @@ AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21a
 AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
 DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
-DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085
+DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
 DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
index 5a5119aad11c..27bd4eb5b28b 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,3 +1,4 @@
 DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
+EBUILD opentest4j-1.2.0-r1.ebuild 769 BLAKE2B 6970178b1af8f933c5c931985eefed01a73899ead983750f94d2548ff0e091e242c91f17d8834c2d4b43d15bbcdc6d4d083009e1e6c2c206ef0c1d176f752333 SHA512 7bf3626d8437b2925dd64b63aec9dad5cd81c528d0025bc69c736ec09539bb7199366e4ed3fde0511613621ae71c2de64d67c7633c4a62bbf6461c374b44e595
 EBUILD opentest4j-1.2.0.ebuild 766 BLAKE2B 8a010437e247e7598d8549d205ba1789c9dbd942c172504216900069854bfc1b43edfdb13246bf721dcb8d07b92480b34c62f1445753291ce03e6ddd57f4d580 SHA512 100dd0c35f45452781f565fc910a06c2e671d500ffaf1ba6109f1234f3a03cded416b74247d31bc0d85a4ca0e1b0206f9e86ff075fd2af46c45387b6751360f0
 MISC metadata.xml 303 BLAKE2B 07307ccd1ef1f074fa091ff02bdacfe83a3f3c0a2d79f7545821d5955834a83391d64d34dc8170cb5a4752302296e746393491f7b628a6936a3f0c2b85e09f29 SHA512 9760587d9dec49089d8ea86b7046d145e41075c6ae02af3be319e795272b3eeaef6540dfbb90564bb85d50974f44acd4bfd71d57956b1ff0e2e216220bf60f48
diff --git a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..1e76405a61ae
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.opentest4j:opentest4j:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index 46f06f53c364..4df7db662ec6 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,3 +1,5 @@
 DIST randomized-runner-2.7.9.tar.gz 1501927 BLAKE2B 41ac32c724a87021c9fd58d3c421cab1fefd00a1e9e25a29d6188b831120c5e1407894f19fa92254df5cd1f2a66a44bf6e4469fa2128d841c1f17d17a623eec9 SHA512 23db6f21a805146d759fa9d3c9a37199b7181d6c53d0f62a4d82c42cbc15816cc25a87a174ef3d533870d648039b3f8dcac9370ffaff4ef76fefb6fc2c38ee88
+DIST randomized-runner-2.8.0.tar.gz 1506178 BLAKE2B 0f142b5f90ea0aaf0934415ad772bf1363c75d371fb964398259e46af1879f2cd3520c9d3eff60b1614bef7fd64003d3ff868302cdc5421197085133dd856ba4 SHA512 e7fba917bf30a7ae4ea68301ec26bfa1b5659ea6124417ef494cc915b26bb07343ce8784dfd718032410ae750601f73ad56cd0a1bab3b2013559fc020694fb7f
 EBUILD randomized-runner-2.7.9.ebuild 1934 BLAKE2B c783f68a3b54df6d17059be6dd8b0aebfaca6156a82fc81b36c040a538ce82daa2965fbcf3d9701b3ade6ddeac6b0ffe7313f8e4517db3f2e09e6c265178c8f9 SHA512 c08ea9e7291fcdd6e8663058151a178d72ad40fea95b7e9e3d969bb6cdf16517cd3e1026fc0a753fd0a3c6685432f414ec171fec2673edeae8b1aeba03cb3fcc
+EBUILD randomized-runner-2.8.0.ebuild 1647 BLAKE2B afe0bee09dc12fbbbf3630840b0398c10a1168046b0392be793aea4f055d49f403d7846835f0218802efe70ca8b6822be5de11dc98edcf21571523d772e604e6 SHA512 a529920dbfa3768178c4253b3becad7496923116f6b2183f47426a42d00b7e04a69158e8730989630a0b3718ed24e47cd547485c35722766c5df318f30bd61d9
 MISC metadata.xml 317 BLAKE2B 3da80829ccd32c18e7f9d05eaffee0f9433c2d0893363e911f1a0fb6d4260507ec4712c7035cdb2bd9d7b3fc7269d60f8346f2d82eb9bf7f3e25c03068ec1edd SHA512 f72fc2cfb58f31854ceb21c43f771b7eaf9b89d444e54179e54b2940ab7759f702640535f89b2101b65585ac8ea73d13c64583ae485608ab5a88e8f35f5a2a94
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
new file mode 100644
index 000000000000..8be9dae04f3c
--- /dev/null
+++ b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
@@ -0,0 +1,57 @@
+# 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/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild randomized-runner-2.8.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
+HOMEPAGE="https://labs.carrotsearch.com/randomizedtesting.html"
+SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/junit:4
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/assertj-core:3
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../{CHANGES,CONTRIBUTING,README}.txt )
+
+S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.nio.fs=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/saslprep/Manifest b/dev-java/saslprep/Manifest
index 391729b5e067..2520b5c99085 100644
--- a/dev-java/saslprep/Manifest
+++ b/dev-java/saslprep/Manifest
@@ -1,3 +1,3 @@
 DIST saslprep-1.1-sources.jar 3735 BLAKE2B 4a2058856f0fa01a6f8ef05ca930d875825653f34c3d2b0bb81d658cb363fc5d4268a212d14e23ce60c666a1482de78e13483605c39783c81a971b148055464c SHA512 63badd75f5444af0077629dcf3f95a7c39d3e12f159a50748f54c36d2aa2cef90887c099d0c89007796174d48da0d25cc93db8ccf07660a8803e3edbbb92da05
-EBUILD saslprep-1.1.ebuild 625 BLAKE2B 429e3d024ebacfa0e9cca917f83d23faf0a6706b003b6dc393746cefb4efbf1bf429afec4f1c501f71af33cd0afa690f6e2ca68f5c4f033b4b0f554224c56e95 SHA512 ca9eec87f8e463b6c0aa72ffb82ce3e4254102363996054496428e286b00674ed9d723b35f79c8d5e33e8586c9c6fde455439fc1a8fc6c44c463b8e6048bb2c3
+EBUILD saslprep-1.1.ebuild 624 BLAKE2B 3ecbf586ceabcaa911f591e1e8d590c09a0adae58cff46b21e3e3039da38d8ff06fddc8a2dab933953f21d0e07be563f7d7f1e9b7604034a5d99b7a3bc2ea483 SHA512 31fcf84b759db4c11574b12627d1d1afb6360628b8b6d2fdf2c928fbda2f9b7a5b5148e29e6fa89b4f350d4947dcc5a05ee6f6c83bee31d021c1c7a8e6d2ae2f
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/saslprep/saslprep-1.1.ebuild b/dev-java/saslprep/saslprep-1.1.ebuild
index c39194d7d0fe..21c4e391750f 100644
--- a/dev-java/saslprep/saslprep-1.1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/sas
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	dev-java/stringprep:0"
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index e4daee228243..5329ccbfabd4 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1,3 +1,3 @@
 DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
-EBUILD scram-2.1.ebuild 2582 BLAKE2B 2260829df18b1bde2d26721ff76df575771a472f2e7515a8228f86694197256cbad1f5ee579a6a42ae268bcd4e9009cac633c38f07bd69bb71c9a6069265af8a SHA512 d6ef2ae8d603c659ad8dbb5be0670d4a2da33323949849c8b2047d0f191cdb0e3be3fee28ce45f4d21a0e5c23982fc03f4e508279e9fdc7cb2614bcfdac16ea1
+EBUILD scram-2.1.ebuild 2581 BLAKE2B 06898159ccbeebc5dd7e85224cfbbcf3ad19546d8850cb1f2dc990d306103af750ea1d0838d9342648f5cbcd65fe736b9c15a4d151874b2032919427bd9e1439 SHA512 40e4e4c78c215c786bb2fa379a56ad33778ed992c602af5cf9c3afaf474dc92f45307308785f9df1502756d174781b47c4436b66a3bcb65465886c27782dc6ac
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index a3af5e23f1dd..f43f944a27e0 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: common/pom.xml
diff --git a/dev-java/stringprep/Manifest b/dev-java/stringprep/Manifest
index bd28ea8f1a0f..3fbf6813ed32 100644
--- a/dev-java/stringprep/Manifest
+++ b/dev-java/stringprep/Manifest
@@ -1,3 +1,3 @@
 DIST stringprep-1.1-sources.jar 23229 BLAKE2B f347262c7b3a7632c94111226333e964b51a3bb8af357b79a62e1f457c5fccd845cb2d232f8d3cca4fc149c2341b962724397eff53224ade10f492a17298a00c SHA512 88cec43ad19a7a2a6194a62999fecb35e17ff04127d72fb0990f4003e41af1d3a5aeb8b2cc3c0c87165cdcb005963faf244f05d78c6f00aac0ab1835d336e565
-EBUILD stringprep-1.1.ebuild 573 BLAKE2B 944a926975ac77a0a38de0a612ddb5fb7eab2011c26977a29200fa22dc5d82b64034c828603549cbec033674a2968513641c3a4d8bc9b98c7670f91fe47536ad SHA512 19f203d301d088397d68dbf83bd8b7c80f994762f0fd173bbc1decd1834901ceecc27aaa34d09801863c946acdfb2b559319157db0fe18bb37af9f3ce4616f1d
+EBUILD stringprep-1.1.ebuild 572 BLAKE2B 4df6a15cadd096612b2a6ede00af3a4ba7adf04f5b7bfefa81f060bcbcd8fc8dbdeddf2ae20426a999d0886fe02a910aaf06854f360aa60bd2a90878ea4f3318 SHA512 2e88c75631b8d624282657325435754adcbbf7a045ca01846423fe10afda74f3e0750ff30fe7358e2eef898a0d9ce7285899819f65aa14b9a718ac7692899a83
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
index 60e5348f25e1..01078539e13d 100644
--- a/dev-java/stringprep/stringprep-1.1.ebuild
+++ b/dev-java/stringprep/stringprep-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/s
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"