diff --git a/www-servers/tomcat/tomcat-10.1.16.ebuild b/www-servers/tomcat/tomcat-10.1.16-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-10.1.16.ebuild
rename to www-servers/tomcat/tomcat-10.1.16-r1.ebuild
index 420c23559c895..9a5e9756ba197 100644
--- a/www-servers/tomcat/tomcat-10.1.16.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-11:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
diff --git a/www-servers/tomcat/tomcat-10.1.18.ebuild b/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-10.1.18.ebuild
rename to www-servers/tomcat/tomcat-10.1.17-r1.ebuild
index 104bd11296688..28598e1cd7efb 100644
--- a/www-servers/tomcat/tomcat-10.1.18.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-11:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
diff --git a/www-servers/tomcat/tomcat-10.1.17.ebuild b/www-servers/tomcat/tomcat-10.1.18-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-10.1.17.ebuild
rename to www-servers/tomcat/tomcat-10.1.18-r1.ebuild
index 7001a52d8c240..28598e1cd7efb 100644
--- a/www-servers/tomcat/tomcat-10.1.17.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-11:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
diff --git a/www-servers/tomcat/tomcat-8.5.96.ebuild b/www-servers/tomcat/tomcat-8.5.96-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.96.ebuild
rename to www-servers/tomcat/tomcat-8.5.96-r1.ebuild
index 7c3cee7e40140..e46a8ec1c5ed9 100644
--- a/www-servers/tomcat/tomcat-8.5.96.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.96-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	doc? (
 		dev-java/jax-rpc-api:0
 		dev-java/wsdl4j:0
diff --git a/www-servers/tomcat/tomcat-8.5.98.ebuild b/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-8.5.98.ebuild
rename to www-servers/tomcat/tomcat-8.5.97-r1.ebuild
index 56f524f6912d8..73bd9ff31cc16 100644
--- a/www-servers/tomcat/tomcat-8.5.98.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	doc? (
 		dev-java/jax-rpc-api:0
 		dev-java/wsdl4j:0
diff --git a/www-servers/tomcat/tomcat-8.5.97.ebuild b/www-servers/tomcat/tomcat-8.5.98-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.97.ebuild
rename to www-servers/tomcat/tomcat-8.5.98-r1.ebuild
index 571c2a833db26..73bd9ff31cc16 100644
--- a/www-servers/tomcat/tomcat-8.5.97.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.98-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	doc? (
 		dev-java/jax-rpc-api:0
 		dev-java/wsdl4j:0
diff --git a/www-servers/tomcat/tomcat-9.0.83.ebuild b/www-servers/tomcat/tomcat-9.0.83-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-9.0.83.ebuild
rename to www-servers/tomcat/tomcat-9.0.83-r1.ebuild
index b8cee4425eb70..99d05ee6f55bb 100644
--- a/www-servers/tomcat/tomcat-9.0.83.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit
 		dev-java/easymock:3.2
diff --git a/www-servers/tomcat/tomcat-9.0.85.ebuild b/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-9.0.85.ebuild
rename to www-servers/tomcat/tomcat-9.0.84-r1.ebuild
index 7580b033f5255..182ffc6d37731 100644
--- a/www-servers/tomcat/tomcat-9.0.85.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit
 		dev-java/easymock:3.2
diff --git a/www-servers/tomcat/tomcat-9.0.84.ebuild b/www-servers/tomcat/tomcat-9.0.85-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-9.0.84.ebuild
rename to www-servers/tomcat/tomcat-9.0.85-r1.ebuild
index 64cc1be4e61c0..182ffc6d37731 100644
--- a/www-servers/tomcat/tomcat-9.0.84.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	dev-java/ant-core
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-17:*
 	test? (
 		dev-java/ant-junit
 		dev-java/easymock:3.2