gentoo auto-resync : 09:10:2022 - 13:31:59

14 files changed, 37 insertions, 348 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f3b260b1c9a9..7835ede0f914 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 24f8682b9a35..69b05df4d9c9 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,4 +1,5 @@
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
-EBUILD bcel-6.5.0-r3.ebuild 2781 BLAKE2B b67bdb276275b99e5e0568f16c0acb563d959e5b03041470f024c72416a65b581b217ad91b35dc5cecbd8d16b39e4871e8b5350a5eb2cb15749c93672e20a27b SHA512 21ea468236a8a199903e9fa659b9b15fa6ed78a470f20f51faec8a977fff1333adf7e644b883e175d8b5caa23d7b4c23a83dec516dc6f95662b9048f082fb540
+DIST bcel-6.5.0-src.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
+EBUILD bcel-6.5.0-r3.ebuild 2846 BLAKE2B 9fc25e787de06a3b795707fd1bb0a5c34f8c2a2b447fcd0ffee564bfb606e8479784c133f8e7c54ef90d0c318bb60ef1e0545aeffb0a289741f2f10541602f50 SHA512 5e519ae1f796b45092a2f3183c060ce0f81bdf13e91e25f3f2da5698001e664dd522dd0777ba7faf0314e0719f08a5e8d4d11b7154fdfe8a05a3700cbae9dae1
 EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
 MISC metadata.xml 820 BLAKE2B a425bc2cd30a5f47f2dc92ef014869042d68c09b1ace76007fdb08d53f52162e75f357af8debf6ab4ca5454960bd44d769190e8aae40b07a5e1ad94306f833b1 SHA512 0cb5154eb87c302868af21bd968b588317584d1f8f932e09444dde078efff02ccdb8e1e45a2e2e7fb9574eb04fd6a1c3a2afb45520261601f81ff9e35783bef7
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 84f773d633bf..411a0129100c 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,10 +1,7 @@
 AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
-AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 AUX hamcrest-core-1.3-r3-java-11.patch 1188 BLAKE2B dd2da476e5aa44f48fbc049b53b44c0c9e9daf83ef0e73ebca173e3e5a2ef6b048d1f8d76cea4dd8b3a1609193e50e9e8ef180795421ee1cd43327e90ec2bef9 SHA512 29230981064580eae656bfc28ee8a2e14a7ef09f3182a206ed89d2e2bcc78ce76e9d7e0ad59b7e6c904d35c900a5511ddc49c31255755dfb231fb0ea5c20dd90
-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
 EBUILD hamcrest-core-1.1-r4.ebuild 822 BLAKE2B 2acba6df933c2683c10eba92c74c51a644959ff741b0682eb0b3515e5a86f1fe62dd9a3fb6567ea93e23a0828f9d217bdc42abeca4ac8de3be30e5a919b7aceb SHA512 ff6dbdd7aabb4399a6b9095fc3c3d73def8c0b5e440b4449e148662a96ac131506d0732915cd9731f9978e70a2712239ec0502caa61baf277650c86b0f451e37
-EBUILD hamcrest-core-1.3-r2.ebuild 1438 BLAKE2B 3670974af1592e9764547f8cb1f516b8ef209309b9943ca8a8d5953499f4fbc5f9e7d0756872a1263fab7c6c3243b0e77f93d934a0152def9c2adad5d421c01e SHA512 056d7b062e5150b035f4cd35c69c930f5930ac3157698998c92aff041e452cc68e0fda3d6ecf9403be7dde3b77605d4677ba318c0333152e6066449d3f262d79
 EBUILD hamcrest-core-1.3-r3.ebuild 1436 BLAKE2B 2a0494af0c402367ad9a8755e51d56f53ad9fd0a3c3657d4616701458c35ab6d8f8750a0fdbfc11dd66efac160601f6b74a6df5a4c388814c33f7e582685e4c6 SHA512 79cfc8ce8f6723bf5ef3f9a2caabc28b9b2dc200fa6d66789861bf77ce893276c1698d17033ff27d16ed05946d2df3203e411c8af9663d6df844418486e1c89f
 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
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 cec7c08e842b..d5e1375ce551 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,6 +1,3 @@
-AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
-EBUILD hamcrest-generator-1.3-r3.ebuild 1270 BLAKE2B 2f77de5d517a01a481d80eed57068d89b8a8cb89d627b6ee2976e1f0c845df993a3aae83e0740e9ee2a9a7a49e58c377d0f4f6de7f1833cdc83a5d77ee2d7a80 SHA512 d393b620bae221599e28cdfdf2f84071a782590936312aa41718af293588eb2527a8a586c5b0030ee27fb233a1a713b80faef38491af69dee018194f3676e32d
 EBUILD hamcrest-generator-1.3-r4.ebuild 699 BLAKE2B 6787de96412b903129676f31de0c28de3257ca14e95e3a9248d509b97e739dda95376da90d5fefc4af577c4db0341f3f451cccdd82bfafd917842035bc4ccf0d SHA512 3320042e9bf3c4eb17cda7466e6cddd6cdf92329b831385528e2b2788cbfefa1b64904c9267f6c55eded90491831c9196d95f8da3b2fe1b815c1943d8ac44e19
 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
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 59efed26a176..50a6e4e1e590 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,7 +1,4 @@
-AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 AUX hamcrest-library-1.3-r3-java-11.patch 2291 BLAKE2B 70f93e95538b3110fd4a70b68cd9eee562ebde899716e9c7706be308f917f26abe5ada399722815d873c7a8c99bff1d54b87a226eb94e1835f1912af85fe89b2 SHA512 1767eed42bda30fb799a4e3cb37382c5885eff194b2009fb8c1bf12ac76af903669944fcf581eb8440aca88315adf947297d6f893c18b276e99075398c2cddbb
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
-EBUILD hamcrest-library-1.3-r2.ebuild 1503 BLAKE2B fb98d145b85162ac56a2a832f6e27008024c4f2125ee1e3bf4a1f4b4520c884c2c21377bfef9fbb07afe5b0235f7473b3583e9737d07896fe59b45301248d765 SHA512 334452a0d983ce4cd59fbdcb0738f54548604976f1724318d6cc2701e3496930987b0f65042e2d3e0df169fda2389fa6002839bb9d951dab20dac967d64cfc9e
 EBUILD hamcrest-library-1.3-r3.ebuild 1440 BLAKE2B c091c4b46553e8327d34d2f5640f3d21011319ce12311120417f1c33dee7bea6e8be7823d18774fcbba647dac5cab0da5e2767556339a089e9cb1d28b62c332b SHA512 7fe2d35f7e8328108eafe381557a627529d61cd8f4a2ffc0ea27606113c2e27e8c37a8c98549b4995db46c251ef682b6a5fba189f4ea4803ea2f8f8d68285060
 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
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/mockito/Manifest b/dev-java/mockito/Manifest
index ce4a0458e41c..c7260108d5b6 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,7 +1,5 @@
 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
 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-4.6.1-r1.ebuild 1188 BLAKE2B faf2ac72eb6eb5044c56a4def310778bcc652db2646245666c453dc4d4cd5709c5b97e843ad795238c9e6c925349529bb7aa8395cf4960e7d7f002f14f5f4fc2 SHA512 f996dec945f78f95d973dc720103d9292d971cd1ea181889ee4636f86e581d8e6263f8d6fe4fb6e319a137442f08f8d3bb8308740e0f531a3267d8e1b6999f38
 EBUILD mockito-4.8.0.ebuild 1262 BLAKE2B 9098784d33a42e9a43693c75a845d02fd681df71c402f163e121ea70f9f7f30d1383a3eb70c1ec5ca5cc72bc2353659b7f47dab6148dc983513716321825da3f SHA512 3be5f8404cc604eeb1af0aba9d0c78f3d08d43f98f9ab73d3a7175fbe5f0ac7fa2f1aed08c62ae2055e2029a5ad611e031353fadd7c5afb204d794c353da9509
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
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
-}