Adding metadata

15 files changed, 38 insertions, 342 deletions

diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 293f425488f6..48f6029868a2 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1 +1,2 @@
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
+DIST bcel-6.5.0-src.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
diff --git a/dev-java/bcel/bcel-6.5.0-r3.ebuild b/dev-java/bcel/bcel-6.5.0-r3.ebuild
index 54af8629d599..4e54d469c6db 100644
--- a/dev-java/bcel/bcel-6.5.0-r3.ebuild
+++ b/dev-java/bcel/bcel-6.5.0-r3.ebuild
@@ -14,7 +14,8 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Apache Commons Bytecode Engineering Library"
 HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
-SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -33,9 +34,9 @@ DEPEND="
 		dev-java/commons-collections:4
 		dev-java/commons-io:1
 		dev-java/commons-lang:3.6
-		dev-java/jna:4
-		dev-java/jmh-core:0
 		dev-java/javax-mail:0
+		dev-java/jmh-core:0
+		dev-java/jna:4
 	)
 "
 
@@ -51,25 +52,34 @@ JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,javax-mail"
 JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	# Invalid test class
-	"org.apache.bcel.data.AnonymousClassTest"
-	"org.apache.bcel.verifier.tests.TestArray01"
-	"org.apache.bcel.verifier.tests.TestArrayAccess01"
-	"org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
-	"org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
-	"org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
-	"org.apache.bcel.verifier.tests.TestReturn01Creator"
-	"org.apache.bcel.verifier.tests.TestReturn02"
-	"org.apache.bcel.verifier.tests.TestCreator"
-	"org.apache.bcel.verifier.tests.TestReturn03Creator"
-)
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	sed \
+		-e '/public void/s:testB79:notTestB79:' \
+		-e '/public void/s:testB295:notTestB295:' \
+		-i src/test/java/org/apache/bcel/PLSETestCase.java || die
+	sed \
+		-e '/public void/s:testLocalVariableCount:notTestLocalVariableCount:' \
+		-e '/public void/s:testLocalVariableTableCount:notTestLocalVariableTableCount:' \
+		-i src/test/java/org/apache/bcel/CounterVisitorTestCase.java || die
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testRemoveLocalVariable()/i @Ignore' \
+		-e '/testRemoveLocalVariables()/i @Ignore' \
+		-e '/testInvalidNullMethodBody_MailDateFormat()/i @Ignore' \
+		-i src/test/java/org/apache/bcel/generic/MethodGenTestCase.java || die
+}
+
+src_test() {
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-wholename "**/*TestCase.java" \
+			! -name "Abstract*TestCase.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 26d456730a41..53b1379edb09 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,3 +1,2 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
deleted file mode 100644
index 9f68faecb6bf..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
-+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
-@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
-      */

-     @Factory

-     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {

--        return allOf(Arrays.asList(matchers));

-+        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));

-     }

- 

-     /**

---- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
-+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
-@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
-      */

-     @Factory

-     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {

--        return anyOf(Arrays.asList(matchers));

-+        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));

-     }

- 

-     /**

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
deleted file mode 100644
index dc0a524fea35..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
-
-JAVA_SRC_DIR="${PN}/src"
-
-DOCS=( {CHANGES,LICENSE,README}.txt )
-
-PATCHES=(
-	# https://bugs.gentoo.org/751379
-	"${FILESDIR}"/hamcrest-core-1.3-java-11.patch
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# Need to add this in order to generate "CoreMatchers.java" as with java-ant-2 was triggered by "build.xml"
-	"$(java-config -J)" \
-		-cp $(java-config --with-dependencies --classpath hamcrest-generator:1.3):${PN}.jar \
-		org.hamcrest.generator.config.XmlConfigurator \
-		core-matchers.xml \
-		hamcrest-core/src/main/java \
-		org.hamcrest.CoreMatchers \
-		hamcrest-core/src/main/java
-
-	# Compile again, this time including the freshly generated "CoreMatchers.java"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 42f381d82b57..1139a7ccc0a9 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
deleted file mode 100644
index 6cd74732c2c0..000000000000
--- a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml	2013-06-15 21:39:55.005813436 +0200
-@@ -16,13 +16,6 @@
-                      modulename="hamcrest-generator-nodeps"

-                      classpath="lib/generator/qdox-1.12.jar"/>

- 

--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

--            <zipfileset src="lib/generator/qdox-1.12.jar"/>

--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

-         <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

-     </target>

- 

diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
deleted file mode 100644
index 6aa236cef3f7..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/qdox:1.12"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-src_prepare() {
-	default
-	# Don't include source in JAR.  If a Gentoo user wants the source the source
-	# USE flag will be enabled.
-	eapply "${FILESDIR}/${P}-no_jarjar.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 42f381d82b57..1139a7ccc0a9 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
deleted file mode 100644
index fb749dfe7d24..000000000000
--- a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
-      */

-     @Factory

-     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {

--        return containsInAnyOrder(Arrays.asList(itemMatchers));

-+        return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));

-     }

- 

-     /**

---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
-@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
-      */

-     @Factory

-     public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {

--        return contains(asList(itemMatchers));

-+        return contains((List<Matcher<? super E>>) asList(itemMatchers));

-     }

- 

-     /**

---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
-      */

-     @Factory

-     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {

--        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));

-+        return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));

-     }

- 

-     /**

---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
-      */

-     @Factory

-     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {

--        return arrayContaining(asList(itemMatchers));

-+        return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));

-     }

- 

-     /**

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
deleted file mode 100644
index 116e14e5b5b7..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="dev-java/hamcrest-core:${SLOT}
-	>=virtual/jdk-1.8:*"
-RDEPEND="dev-java/hamcrest-core:${SLOT}
-	>=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
-
-JAVA_SRC_DIR="${PN}/src"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-
-DOCS=( {CHANGES,LICENSE,README}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/hamcrest-library-1.3-java-11.patch
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
-	"$(java-config -J)" \
-		-cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
-		org.hamcrest.generator.config.XmlConfigurator \
-		matchers.xml \
-		hamcrest-core/src/main/java,hamcrest-library/src/main/java \
-		org.hamcrest.Matchers \
-		hamcrest-library/src/main/java
-
-	# Compile again, this time including the freshly generated "Matchers.java"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
index 127dbb0f8733..a088c3493f7b 100644
--- a/dev-java/joda-time/joda-time-2.11.2.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 4c502234db5f..ba934fec78a0 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,3 +1,2 @@
 DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
-DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
 DIST mockito-4.8.0.tar.gz 1044264 BLAKE2B cbd8fa0db3b652ad882c6bb8c5f86116cf21772869814ddabe88532ff2522e399e8d7e9d68935b10844c0c496755834dee66c88dc7b2e0231757f7c79233c1fb SHA512 1f1ea9aac907d8ba42874eb6a6870cd5cb46b80a4a9f841c7eca8ff8f651e13baa92a4c3512d95d6596dd7da60e627a606c74e4b1dc56d11b06a14f44e3d53f3
diff --git a/dev-java/mockito/mockito-4.6.1-r1.ebuild b/dev-java/mockito/mockito-4.6.1-r1.ebuild
deleted file mode 100644
index cf24643bfe06..000000000000
--- a/dev-java/mockito/mockito-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests not enabled, wants junit-jupiter.
-# "${S}/settings.gradle.kts"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:4.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/asm:9
-	>=dev-java/byte-buddy-1.12.12:0
-	dev-java/objenesis:0
-"
-
-DEPEND="
-	dev-java/junit:4
-	>=dev-java/opentest4j-1.2.0-r1:0
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_CLASSPATH_EXTRA="
-	junit-4
-	opentest4j
-"
-
-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/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
index f9978f4168dc..28d9adecc441 100644
--- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml