gentoo auto-resync : 07:04:2023 - 11:29:55

9 files changed, 427 insertions, 10 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9fee0f5ee2d6..8d187a1c6562 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4d19cebd8a30..e8f96636cd1b 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,3 @@
-AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
 DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
 DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
 EBUILD batik-1.16-r1.ebuild 6520 BLAKE2B 168b507f647f73db2e51ee899269cf737602fde22bc8f9c6d1eed8546283cedbdc3d1e61d3394995b49499c3f3d7da7b3e96d8834c35d4082bee34ee698fed8e SHA512 ea78c70ab833ed6fec2c64f13d89bd4f26f6c53ee5bab5cfed03df6e104aa8d3b96c28fe9d88742c7381de60b360cfe6e7f77c5869fea0066ab90d7e55c41286
diff --git a/dev-java/batik/files/batik-squiggle.desktop b/dev-java/batik/files/batik-squiggle.desktop
deleted file mode 100644
index 95bb990177c7..000000000000
--- a/dev-java/batik/files/batik-squiggle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Squiggle
-Comment=SVG browser
-Exec=batik-squiggle-1.14
-Icon=init
-Terminal=false
-Type=Application
-Categories=Graphics;VectorGraphics;
-MimeType=image/svg+xml;
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 95ee32ee2057..1eb29628b511 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,8 @@
+AUX fop-2.8-skip-failing-tests.patch 2005 BLAKE2B 09e9d3625bce2422aa24a7af5e395f9e92a830a2630010478082591bf1a9f12b04a8667107f40b084bda1d431c0dd665bf2355be1d61155cebaa75fecec64373 SHA512 fb18b67c8c70a0c87d818ae9f73eabfe0747932a12df3cb378441a67937e2f84e9eb885bb6981abde97863f861beec6013cad183da8d2e372cafadc18c6401ee
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
+DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de
+DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
+EBUILD fop-2.8-r1.ebuild 5406 BLAKE2B fcb10267ec55275224deadf206f60a2a983b61ed35750ade82c5f5e5f959e7dc1da390034fcaaa422adb154afc2681f6452a1cabb27b1b8b16ef573df2172998 SHA512 4d2c53a6692f33191d5a9857efd6bb3857b8152212a56e5cfa2a398cb21ba4365d41a1c4c6ef1135e36d0ae5df598590cfb5dba29016947dd39638cf8f493301
 EBUILD fop-2.8.ebuild 4393 BLAKE2B 7c5aa2c102b5300d830f5d6e35441050eeffbf2f1e5d3532c765c56cad3d5015a4b50b643cb55dd60bd02572b6e21ae68d7d26713bf3a05b5213cc392cb3f9cf SHA512 1f0778c3411a729120de6d56cfe73f701a28c8849588c606fb5e091949f1d7a87330369bb7bf1336abef9a01c3e054139fec62c989687079da6b82aae44733fa
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
new file mode 100644
index 000000000000..729795e93fd2
--- /dev/null
+++ b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
@@ -0,0 +1,48 @@
+# https://bugs.gentoo.org/903880
+--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
++++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
+@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
+ 
+ import org.custommonkey.xmlunit.Diff;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.w3c.dom.Document;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.AttributesImpl;
+@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
+         assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRemoveBlocks() throws Exception {
+         keepEmptyTags = false;
+         compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n"
+@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
+                         + "</structure-tree-sequence>\n");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRemoveTableHeader() throws Exception {
+         keepEmptyTags = false;
+         String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", "");
+--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
++++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
+@@ -25,6 +25,7 @@ import java.io.File;
+ import java.io.IOException;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xml.sax.SAXException;
+ 
+ import static org.junit.Assert.assertEquals;
+@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest {
+      * Test using a standard FOP font
+      * @throws Exception checkstyle wants a comment here, even a silly one
+      */
+-    @Test
++    @Test @Ignore
+     public void testPDFEncodingWithStandardFont() throws Exception {
+ 
+         /*  If the PDF encoding is correct, a text dump of the generated PDF file contains this (excerpts)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
new file mode 100644
index 000000000000..487cd4d7cade
--- /dev/null
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="
+	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+	https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
+	verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
+"
+S="${WORKDIR}/fop-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2.8"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/batik:1.16
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	dev-java/fontbox:0
+	dev-java/qdox:1.12
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	dev-java/javax-servlet-api:2.2
+	dev-java/sun-jai-bin:0
+	test? (
+		dev-java/mockito:2
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="dev-java/xalan:0"
+
+DOCS=( NOTICE README )
+
+PATCHES=( "${FILESDIR}/fop-2.8-skip-failing-tests.patch" )
+
+JAVA_CLASSPATH_EXTRA="
+	ant-core
+	javax-servlet-api-2.2
+	sun-jai-bin
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	JAVA_JAR_FILENAME="fop-util.jar"
+	JAVA_SRC_DIR="fop-util/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-events.jar"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-core.jar"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
+	pushd fop-core/src/main/codegen/fonts > /dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd > /dev/null || die
+	java-pkg-simple_src_compile
+
+	# Update "fop-core.jar" with "event-mode.xml" files produced manually
+	# by running "mvn package".
+	# Upstream does this with maven-antrun-plugin:
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
+	mkdir event-model && pushd $_ > /dev/null || die
+		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
+	popd > /dev/null || die
+
+	jar -uf "fop-core.jar" -C event-model . || die
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
+	rm -r target || die
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
+
+	einfo "Testing fop-events"
+	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+	java-pkg-simple_src_test
+
+	einfo "Testing fop-core"
+	pushd fop-core/src/test/java > /dev/null || die
+		# Excluding one test, see https://bugs.gentoo.org/903880
+		local JAVA_TEST_RUN_ONLY=$(find * -type f \
+			-name "*TestCase.java" \
+			! -name 'MissingLanguageWarningTestCase.java' \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd > /dev/null || die
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
+	# <workingDirectory>../fop</workingDirectory>
+	pushd fop > /dev/null || die
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
+		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
+		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
+		java-pkg-simple_src_test
+	popd > /dev/null || die
+}
+
+src_install() {
+	local module
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar "${module}.jar"
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 341c61a86ac2..ca8d3a3d1bd2 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,5 +1,8 @@
+AUX mockito-2.28.2-skip-failing-tests.patch 2622 BLAKE2B 70862d1fe8376ad2514fa53c15e1f6e83dde17d7ff1a8a09701897d89b27ca6a339c532b2615436da727b10c8ec69a0fadda5c841ebb64be12fbd8e8ded6b5ad SHA512 646649ec712b958f02c862ee8d2a52259e5458812f838d9d2622544154c35270a5f5a731c8193850fc804ede87fde1a7d54abef8d4136b5619ac01664f9539e8
+DIST mockito-2.28.2.tar.gz 875085 BLAKE2B d0aab378c028530724156f999700506fe64f5bf19371dc9b957e34924d3d17b8191f093054c6dde4f5879d61ddf9614a60b1fd597aae09b92abf559c08fbcdf7 SHA512 9921fe9ffbdff4d7a9a8de56aa5078e68eb6bee38f379f58059dcc42da07a59b7e5953309d646e1fb760f7135f5076e201529370cc5df56d685f7acb08311ea5
 DIST mockito-4.11.0.tar.gz 1050218 BLAKE2B 7f7298e233c9cdb0b475aa201300a1063fd8efc587f3a4de0cb1caedd6f6506a32f8e9b0548fa5898892515ec96625153a1a2ad65fc8070b7dc6c254206fbbfd SHA512 b1de01c8e9b2fc4eef0013af562efeac7e22babdebbd8c7842ecd55071627e11c5e6ab575436990ea70d4ceefb56fc260333278c8d4b833e454956bf89841fc5
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
 EBUILD mockito-1.9.5-r3.ebuild 713 BLAKE2B d46334ba15f68eef38b979b4c8bd84ad51fdfd61f2d33f77f3230876802c753a6fdbbb0422edae5de79f931b314c7bfbc63266de9dabbc9327ed7b1a302d517a SHA512 73886d139804085b34e67902a67af34358c7abd1083bbd2e21d6cec7b149d273307312d42351236fe6628e237685c4e1f62bcfc7333e1af32017fb97183e7f34
+EBUILD mockito-2.28.2.ebuild 3325 BLAKE2B 482449d78d6f9f254ace1d669981f766423e5d38351d4c794b38875bdd6b80668db8fd6a636f0d3202b7216cb70fda81ebd587dc2f9bf60cf9f23561d336cce2 SHA512 ac0109f40d058dd98975478d420f95a85f9bee75fbc24e5fa630a89aaca1871f696876434cebacdbda380f2f64c607742948193e93751fdb0c3a98e9b326e9e2
 EBUILD mockito-4.11.0.ebuild 1237 BLAKE2B baf80f24433502cae15d281ca1f2f020c22c3dd82d8a4e0068ceb6f82e0c336b2b6fc65ea77e3eab305c3402d73326886d8a166de38c2b67a5a5c121ff6d1fba SHA512 e23720020cfd5047ae59927a66dc8d2a709b50f47b71035493e06ec1fc2b83dac08bbdacd06fb131d610047e7f55f91cefcff1be28ec8b65f08407b2eb1647a5
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch b/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch
new file mode 100644
index 000000000000..06bf5bcd6346
--- /dev/null
+++ b/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch
@@ -0,0 +1,82 @@
+# https://bugs.gentoo.org/903897
+--- a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
++++ b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
+@@ -6,6 +6,7 @@ package org.mockito.internal.creation.bytebuddy;
+ 
+ import net.bytebuddy.ByteBuddy;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.mockito.Mockito;
+ import org.mockito.internal.creation.MockSettingsImpl;
+ import org.mockito.internal.handler.MockHandlerImpl;
+@@ -134,7 +135,7 @@ public abstract class AbstractByteBuddyMockMakerTest<MM extends MockMaker> {
+         }
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void instantiate_fine_when_objenesis_on_the_classpath() throws Exception {
+         // given
+         ClassLoader classpath_with_objenesis = ClassLoaders.excludingClassLoader()
+--- a/src/test/java/org/mockitousage/matchers/VarargsTest.java
++++ b/src/test/java/org/mockitousage/matchers/VarargsTest.java
+@@ -19,6 +19,7 @@ import org.assertj.core.api.ObjectAssert;
+ import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+ import org.mockito.ArgumentCaptor;
+ import org.mockito.Captor;
+@@ -78,7 +79,7 @@ public class VarargsTest {
+         verify(mock).varargs((String[]) isNotNull());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneNullArg_eqNull() {
+         Object arg = null;
+         mock.varargs(arg);
+@@ -86,7 +87,7 @@ public class VarargsTest {
+         verify(mock).varargs(eq(null));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneNullArg_isNull() {
+         Object arg = null;
+         mock.varargs(arg);
+@@ -94,7 +95,7 @@ public class VarargsTest {
+         verify(mock).varargs(isNull());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_nullArrayArg() {
+         Object[] argArray = null;
+         mock.varargs(argArray);
+@@ -118,21 +119,21 @@ public class VarargsTest {
+         verify(mock).varargs((String[])any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneArgsOneAnyMatcher() {
+         mock.varargs(1);
+ 
+         verify(mock).varargs(any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_twoArgsOneAnyMatcher() {
+         mock.varargs(1, 2);
+ 
+         verify(mock).varargs(any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_twoArgsTwoAnyMatcher() {
+         mock.varargs(1, 2);
+ 
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
new file mode 100644
index 000000000000..c055b2705a67
--- /dev/null
+++ b/dev-java/mockito/mockito-2.28.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mockito:mockito-core:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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"
+S="${WORKDIR}/${P}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/asm:9
+	dev-java/byte-buddy:0
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	dev-java/junit:4
+	dev-java/opentest4j:0
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? ( dev-java/assertj-core:3 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+# see https://bugs.gentoo.org/903897
+PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
+JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+	org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
+	org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
+	org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
+	org.mockito.junit.TestableJUnitRunner # No runnable methods
+	org.mockitoutil.TestBase #  No runnable methods
+)
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
+JAVA_TEST_RUN_ONLY=(
+	# This needs to run separately, otherwise one of its 4 tests would fail.
+	org.mockito.internal.junit.JUnitRuleTest
+)
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+	# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
+	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
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
+	jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
+}
+
+src_test() {
+	# Increasing number of test failures with higher Java versions
+	# Test failures are documented in https://bugs.gentoo.org/903897
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 11; then
+		JAVA_TEST_EXCLUDES+=(
+			org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
+			org.mockitousage.bugs.GenericsMockitoAnnotationsTest
+		)
+	fi
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXCLUDES+=(
+			org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
+			org.mockitousage.matchers.InvalidUseOfMatchersTest
+			org.mockitousage.serialization.DeepStubsSerializableTest
+			org.mockitousage.stubbing.StubbingWithDelegateTest
+		)
+		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/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
+	fi
+	# First run what needs to run separately
+	java-pkg-simple_src_test
+	# And then the other tests
+	JAVA_TEST_RUN_ONLY=""
+	java-pkg-simple_src_test
+}