3 files changed, 138 insertions, 2 deletions
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 654726319316..a84a96a8c143 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1,4 @@
 DIST batik-src-1.18.tar.gz 13699469 BLAKE2B 003a467b6948b902f56f004bf5c7d41f369bf49520d55fd70af3d3b8edef02d04557fdad5e4da70395a30c755f777791c89714edaa094eaa2964972eb81bdbf1 SHA512 209c6f4c76769cf1db616c5fe43c71d23c92afeb62e11bc7605baaa18bf9177efbb7a91a98bf03c3b4cd917bd7b7bd83e87083d16b11b3e57d3f31beeb8e1d7b
 DIST batik-src-1.18.tar.gz.asc 833 BLAKE2B a779b94a666edcab5b4c69866b4e7388ce6b8d9869d59773b084d870152cffd8c8cfd74df0f2a4ef06e5d598acb3b7bc00ec841871411b379f514b3fe2019765 SHA512 2fe6de9394f89c90e5ad2ede241c57bfbe5da4627b3730d445b2daa06b1ae71945bd65cda0d7a6bd46db536f318f755778a5b5a5b52080872a3143acd0d4677d
+DIST batik-src-1.20.tar.gz 14157209 BLAKE2B 122e5deb6831472481f6d2681f7acf7167aece6d264f0fb76be0883a34f27e28cdc6764d29ff0ea0205eefb80201b115b8a69ec337d1da53b5a15632b38eef92 SHA512 b9387551551d2846a8b7039c80cacc4860487abd450218e300441a734bc836aab68abfb50b240f97d56d7317d1e98532e6bd60f6d95d77d790fb7e07eed01264
+DIST batik-src-1.20.tar.gz.asc 833 BLAKE2B 7e0ff9ed06838a37d553de90245e3f6df5b08955b098257f49815a8553bb4185f535127df4c8fc2b3f09dce4365b0ae8d4b73b633e6bfcd3294827711cb30f71 SHA512 824bddc0825cb9d2790c1f1ea43390e1d8d79410fe9ec4c1303a7fee114e5568ae1311ed428076c1b9aae9b9f0b857cfa40d9f4711a98e03b5026502c0d5d19d
diff --git a/dev-java/batik/batik-1.18-r2.ebuild b/dev-java/batik/batik-1.18-r3.ebuild
index f9ae5259b2f1..7441bef36394 100644
--- a/dev-java/batik/batik-1.18-r2.ebuild
+++ b/dev-java/batik/batik-1.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ CP_DEPEND="
 	>=dev-java/rhino-1.8.0:0
 	dev-java/xalan:0
 	dev-java/xml-commons-external:1.4
-	dev-java/xmlgraphics-commons:0
+	~dev-java/xmlgraphics-commons-2.10:0
 "
 
 DEPEND="
diff --git a/dev-java/batik/batik-1.20.ebuild b/dev-java/batik/batik-1.20.ebuild
new file mode 100644
index 000000000000..19460d62ebc3
--- /dev/null
+++ b/dev-java/batik/batik-1.20.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple verify-sig xdg
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
+	verify-sig? ( mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics )"
+
+CP_DEPEND="
+	>=dev-java/rhino-1.9.1:0
+	dev-java/xml-commons-external:1.4
+	~dev-java/xmlgraphics-commons-2.12:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGES NOTICE README )
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR=( ! -path '*test*/src/*' ! -path '*/jacl/*' -path '*/src/main/java/**.java' )
+JAVA_TEST_EXCLUDES=(
+	# JAXP00010003: The length of entity "%SVG.Presentation.attrib" is "15,002"
+	# that exceeds the "15,000" limit set by "jdk.xml.maxParameterEntitySizeLimit".
+	org.apache.batik.svg.ValidateDTDTestCase
+	# org.apache.batik.test.TestException: Cannot build Test instance of class : . Got exception of class :
+	# java.lang.IllegalArgumentException with messages test-references/samples/anne.png and stack trace :
+	# java.lang.IllegalArgumentException: test-references/samples/anne.png
+	org.apache.batik.test.xml.JUnitRunnerTestCase
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS=( batik-util/src/test/resources test-resources )
+JAVA_TEST_SRC_DIR=( -path '*/src/test/java/**/*TestCase*.java' )
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/apache-xmlgraphics.asc"
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	# We drop support for jython due to bug #825486.
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die
+
+	cat > "batik-squiggle.desktop" <<-EOF || die
+		[Desktop Entry]
+		Name=Squiggle
+		Comment=SVG browser
+		Exec=batik-squiggle
+		Icon=init
+		Terminal=false
+		Type=Application
+		Categories=Graphics;VectorGraphics;
+		MimeType=image/svg+xml
+	EOF
+
+	mkdir resources || die "mkdir"
+	# collect resources from all those modules' directories
+	local module
+	for module in $(find ! -path '*test*/src/*' -path '*/src/main/resources'); do
+		pushd "${module}" >/dev/null || die
+		find -type f ! -name '*.java' ! -name 'LICENSE' -printf '%P\n' |
+			xargs cp --parent -t "${S}"/resources || die "copy resources"
+		popd >/dev/null || die
+	done
+
+	mkdir -p src/test/resources || die "test-resources"
+	mv {batik-bridge/,}src/test/resources/circular.svg || die "circular.svg"
+}
+
+src_test() {
+	einfo "building batik-test.jar"
+	JAVA_GENTOO_CLASSPATH_EXTRA="batik.jar:batik-test.jar"
+	JAVA_JAR_FILENAME="batik-test.jar"
+	JAVA_SRC_DIR=( -path '**/*test*/**/*.java' )
+	java-pkg-simple_src_compile
+
+	einfo "compiling and running tests"
+	java-pkg-simple_src_test
+
+	# a mistake in java-pkg-simple.eclass suppresses this test-class
+	# but we can run it separately
+	JAVA_TEST_RUN_ONLY=( org.apache.batik.util.Base64TestCases )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="batik.jar" # avoid installing 'batik-test.jar'
+	JAVA_SRC_DIR=( batik-* )
+	java-pkg-simple_src_install
+	domenu "batik-squiggle.desktop"
+	newicon -s scalable \
+		batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg \
+		squiggle.svg
+
+	grep mainClass */pom.xml |
+		sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' |
+		sort | uniq | while read line
+		do
+			local launcher=$(echo "${line}" | cut -d. -f 5) || die
+			java-pkg_dolauncher "batik-${launcher}" --main "${line}"
+		done
+
+	# java_policy_file is copied from previous version
+	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
+	insinto "$(dirname "${java_policy_file}")"
+	newins - "$(basename "${java_policy_file}")" <<- _EOF_
+		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
+			permission java.security.AllPermission;
+		};
+	_EOF_
+	java-pkg_register-environment-variable \
+		gjl_java_args \
+		"\$gjl_java_args -Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+}