7 files changed, 67 insertions, 323 deletions
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 13c699aeb189..96f8c3b66e92 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,19 +1,12 @@
 AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
 AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
-AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd2bdeac8426d65d0a16610a8da4dd3bda23db68b7feafc90449bda5032115ad0f0dbe7c376c4095cb4ccac3e7a70e84 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c
-DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
-DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
-DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
+DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 EBUILD antlr-2.7.7-r9.ebuild 1151 BLAKE2B c5e4df7a9ddc43f3e1b490dbc9e05d252cfef1350a96ef9d4f8cf01dff06953e949a192d5bd36ba80d0315f33e32d91cab07176a4f0d5e7f368088342751891d SHA512 faf7da062bfbd5558d29d9d4fa2036f1cba91d4921e2b83ea3bf30f966a41536de0d657ef14ec19e45c8ed460e28778bc90e55edc4940b3331eac5ea2e3d4056
 EBUILD antlr-3.2-r1.ebuild 3249 BLAKE2B d0c72e2b8052f426e5c001f2860d7af1ca1c1bc213451507fbab4ea6570e3045e1c55307dc1b1dd0820d97d16347ae794d93b64e1b9049976c3b02f56b2ff29d SHA512 5f21e8ab24d2040299e7638d74a2f764a165c31c36128c07414960c317d1895804bc79dffe2c6ea760b21cd1e4a27aa01a8ebb44c4ef21dfae42edc51e4a6080
-EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
-EBUILD antlr-3.5.2-r2.ebuild 1608 BLAKE2B fadedd1d088db569aad09256c054e5b49c47d3356037e50e018346ee20b08ccd98805cde1aadec086e680004c8c3c3c8eb26bda303529a8a2b647ba3d3d56c9b SHA512 4f72f00bb7660d89b222d1fa3db088563f3ca8357ccb7cb1e59bb1ccfd0dda930d8077a13e98f92952080570197e3bd3d88fb53615249a15340d67adbca7c553
-EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3-r1.ebuild 2521 BLAKE2B 439d098a1ae5b7238d89f896723418a212ca4fc1c59ab4da70ede8f3d245fe63befc4ae1c81c8c41a5a1aa351b643e56be916cff04d213aad8ef044483a5ce2c SHA512 35fb47714fc1187138706791bee5f352c3c8df99a1e4efbce67df358a311d531be27c4a4214c2e7c114667e5de656b0130e45cfe2cbf47662c08aedaf6e83c10
+EBUILD antlr-3.5.2-r2.ebuild 1604 BLAKE2B 8e9c84841818f52589ca22790f7e61c5c8b78b018e1f78dfa45b0bc3245f3c1a10a48f5fa96f1a45c6b5a2d1640ebe24683bd41d705f18e9ddab41a0ee0da5bc SHA512 46ff86ab7b47a783b8080ab7957fda04d8765da069d2e5daed6e9a39b921ed9bc56c21b32807b29ebdb3240282515e355a8ec3ec5d0e15a1ca5fbe997c9a7199
+EBUILD antlr-4.9.3.ebuild 1640 BLAKE2B 408eb5fda7d1598621e34462f177fd641ad36d8e7906e508227377eeea2dd7e55ad3cb71af2a603de6a38cb0da85065ee7b71db42af4309c3ee251e10f5c4bd0 SHA512 485130449328d364975926fc0374e0ed9e12ca2c7d619c9d1af0daaa3dd5879a491bb953d41ffe84ef653702863f7da950b38766414ce9e1823fa1c909ce3174
 MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
deleted file mode 100644
index 0c83334bc403..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/stringtemplate:4"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}3-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4"
-PATCHES=(
-	"${FILESDIR}/${PV}-test-fixes.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	# This requires StringTemplate v3 and is only needed for
-	# output=template. Nothing in the tree currently needs that and the
-	# dependency situation is already hairy enough as it is.
-	rm -v runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java || die
-
-	# Some tests have to be removed as a result.
-	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# to the tests. This is bad but upstream is never going to update
-	# 3.5. At the time of writing, we only use it to build 4 anyway.
-	if java-pkg_is-vm-version-ge 1.8; then
-		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-	fi
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src/main" || die
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src/main" || die
-	java -jar "${DISTDIR}/${P}-complete.jar" $(find antlr3 -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
-	cd tool/src/test/java || die
-	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-
-	# ejunit automatically adds all registered subdependencies to the
-	# classpath, which is annoying in this case because of the cyclic
-	# dependency on stringtemplate. It will blow up when trying to find
-	# antlr-3.5 on the system before it is installed. The easiest but
-	# somewhat ugly way to avoid this is to unset JAVA_PKG_DEPEND_FILE.
-	JAVA_PKG_DEPEND_FILE= ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index c085043de3e4..3dc31c7456f2 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
deleted file mode 100644
index 4c411e077bb3..000000000000
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
deleted file mode 100644
index b9cfe8237899..000000000000
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.antlr:antlr4:4.5.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}
diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
new file mode 100644
index 000000000000..be89da27f17e
--- /dev/null
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr.org/"
+# Reuse tarball for DOCS
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}4-${PV}"
+
+DOCS=( CHANGES.txt CONTRIBUTING.md contributors.txt README.md doc )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
+	java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
+
+	java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.v4.Tool
+	einstalldocs # https://bugs.gentoo.org/789582
+}
+
+pkg_postinst() {
+	# If upgrading from a version of this slot that installs JARs,
+	# display a message about submodule split
+	local changed_ver="4.9.3"
+	local should_show_msg
+	for replaced_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
+			should_show_msg=1
+			break
+		fi
+	done
+	[[ "${should_show_msg}" ]] || return
+	elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
+	elog "Please find the JARs from files installed by submodule packages"
+	elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
+}
diff --git a/dev-java/antlr/files/3.5.2-test-fixes.patch b/dev-java/antlr/files/3.5.2-test-fixes.patch
deleted file mode 100644
index f2609ac1f0b5..000000000000
--- a/dev-java/antlr/files/3.5.2-test-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
-@@ -2131,7 +2132,7 @@
- 		assertEquals(expecting, found);
- 	}
- 
--	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
- 		String grammar =
- 			"grammar T;\n"+
- 				"options {output=template;}\n"+
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
-@@ -339,7 +340,7 @@
- 		assertEquals("b:alt 2 a:alt 1\n", found);
- 	}
- 
--	@Test public void testSynPredWithOutputTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
- 		// really just seeing if it will compile
- 		String grammar =
- 			"grammar T;\n" +
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
-@@ -141,7 +142,7 @@
- 		assertEquals("alt 1\n", found);
- 	}
- 
--	@Test public void testTemplateOutput() throws Exception {
-+	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
- 		String grammar =
- 			"grammar T;\n" +
- 			"options {output=AST;}\n" +