commit: 61d7c2ca752cf8d5edd6553f75a0d8e0bcad6ae9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu May 8 09:37:43 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Jul 10 07:51:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d7c2ca
dev-java/openjdk: avoid circular dependency with java-dep-check This commit adds JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" in order to avoid a circular dependency with dev-java/java-dep-check which is now forced into BDEPEND. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42182 Closes: https://github.com/gentoo/gentoo/pull/42182 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../{openjdk-11.0.27_p6.ebuild => openjdk-11.0.27_p6-r1.ebuild} | 3 +++ .../{openjdk-17.0.15_p6.ebuild => openjdk-17.0.15_p6-r1.ebuild} | 3 +++ .../openjdk/{openjdk-21.0.7_p6.ebuild => openjdk-21.0.7_p6-r1.ebuild} | 3 +++ dev-java/openjdk/{openjdk-25_p19.ebuild => openjdk-25_p19-r1.ebuild} | 3 +++ .../openjdk/{openjdk-8.452_p09.ebuild => openjdk-8.452_p09-r1.ebuild} | 3 +++ 5 files changed, 15 insertions(+) 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 ba7e3619b7b0..35db12835477 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 f0982bf4f8a9..1eee98b11d28 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 642d38e436f8..ee2b10848f73 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 8d8d8b9b9b4f..61d001dda5d8 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 26ed1d33fa31..a355c53aae1a 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
