diff --git a/dev-java/openjdk/openjdk-11.0.27_p6.ebuild b/dev-java/openjdk/openjdk-11.0.27_p6-r1.ebuild
similarity index 99%
rename from dev-java/openjdk/openjdk-11.0.27_p6.ebuild
rename to dev-java/openjdk/openjdk-11.0.27_p6-r1.ebuild
index ba7e3619b7b0f..35db128354779 100644
--- a/dev-java/openjdk/openjdk-11.0.27_p6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.27_p6-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # don't change versioning scheme
diff --git a/dev-java/openjdk/openjdk-17.0.15_p6.ebuild b/dev-java/openjdk/openjdk-17.0.15_p6-r1.ebuild
similarity index 99%
rename from dev-java/openjdk/openjdk-17.0.15_p6.ebuild
rename to dev-java/openjdk/openjdk-17.0.15_p6-r1.ebuild
index f0982bf4f8a95..1eee98b11d28a 100644
--- a/dev-java/openjdk/openjdk-17.0.15_p6.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.15_p6-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
diff --git a/dev-java/openjdk/openjdk-21.0.7_p6.ebuild b/dev-java/openjdk/openjdk-21.0.7_p6-r1.ebuild
similarity index 99%
rename from dev-java/openjdk/openjdk-21.0.7_p6.ebuild
rename to dev-java/openjdk/openjdk-21.0.7_p6-r1.ebuild
index 642d38e436f82..ee2b10848f739 100644
--- a/dev-java/openjdk/openjdk-21.0.7_p6.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.7_p6-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
diff --git a/dev-java/openjdk/openjdk-25_p19.ebuild b/dev-java/openjdk/openjdk-25_p19-r1.ebuild
similarity index 99%
rename from dev-java/openjdk/openjdk-25_p19.ebuild
rename to dev-java/openjdk/openjdk-25_p19-r1.ebuild
index 8d8d8b9b9b4f3..61d001dda5d89 100644
--- a/dev-java/openjdk/openjdk-25_p19.ebuild
+++ b/dev-java/openjdk/openjdk-25_p19-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
diff --git a/dev-java/openjdk/openjdk-8.452_p09.ebuild b/dev-java/openjdk/openjdk-8.452_p09-r1.ebuild
similarity index 99%
rename from dev-java/openjdk/openjdk-8.452_p09.ebuild
rename to dev-java/openjdk/openjdk-8.452_p09-r1.ebuild
index 26ed1d33fa315..a355c53aae1a5 100644
--- a/dev-java/openjdk/openjdk-8.452_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.452_p09-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # don't change versioning scheme