3 files changed, 2 insertions, 76 deletions
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 6df87f82d765..e30fb8485229 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,5 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r3.ebuild 1402 BLAKE2B 3357b3e97b8d5cbafb588809e6c1e7faafa54f35ab9f910771e0870b2be425998efa2a7ab5376b0f5f0ff67a8822b2f88cf4e6a41ea0a1b5a02d95972839c169 SHA512 74fdbc40ff51b8302639a242e31dd03320832705d7566524ee27be7039ec7974b94625788f4569b45ded38467c6675085ff2b0db3f239d82554fb4af7dd39ebe
-EBUILD javacc-5.0-r4.ebuild 1410 BLAKE2B 11eed861cb1f38d44bf799d3228598245fff56933fa5a04a95910ecfa0b880aaa6fdad56e7f8e59e74edeaeee1549ad3e4c9403444895e1ac6cb0d7c83f52013 SHA512 0ebf0b87a9a7e97784d987a60a1737ffc6a2b50230d3e2314a8fb59ad8c5e2f583530571582ef43083abecfde758e0db3d46610de4a8b082fce7a10f77bdf0c8
+EBUILD javacc-5.0-r4.ebuild 1406 BLAKE2B a14d39d675a7eec5ae330c6aeabf80b2f9980bcc589470a30dfe17bfa762f09cec0a967eee0a153cd10d276dd440761d14273602e1835d0f6bf12c459f3afb7d SHA512 7c043d24cbc0eea4c96b20bb9944471685256d7f8ba1c95c9d27772cdacb6bf6a9e68d8e16fbba6d92061f97dc1c9aee41b89f881f64558909f564f95ec050a4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
deleted file mode 100644
index 2ee54cf55c8b..000000000000
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.java.net/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (	dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="junit"
-
-src_prepare() {
-	default
-
-	rm -v lib/junit*/*.jar || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "bin/lib/${PN}.jar"
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc doc/api
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
-	doenvd "${T}"/22javacc
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
index dac3ebd544ec..0df7bc24b7f8 100644
--- a/dev-java/javacc/javacc-5.0-r4.ebuild
+++ b/dev-java/javacc/javacc-5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"