5 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
index 43986264fbcd..72eaa9b7c8be 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit eutils java-pkg-2 java-pkg-simple
 
@@ -18,21 +18,26 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-java/stringtemplate:4"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=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
 }
 
-java_prepare() {
+src_prepare() {
+	default
+
 	java-pkg_clean
 
 	# This requires StringTemplate v3 and is only needed for
@@ -42,7 +47,6 @@ java_prepare() {
 
 	# Some tests have to be removed as a result.
 	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
 
 	# 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
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index bd5a11f1f69e..8744497c5c54 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,2 +1,2 @@
 DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
-DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
+DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
index fb6d4152b7e6..fb6d4152b7e6 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
index 9c4ab53070a9..96955e69108a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
index ee865deda9af..1b6455796d4a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"