From 61d7c2ca752cf8d5edd6553f75a0d8e0bcad6ae9 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 8 May 2025 11:37:43 +0200 Subject: [PATCH] dev-java/openjdk: avoid circular dependency with java-dep-check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Part-of: https://github.com/gentoo/gentoo/pull/42182 Closes: https://github.com/gentoo/gentoo/pull/42182 Signed-off-by: Miroslav Šulc --- ...{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-21.0.7_p6.ebuild => openjdk-21.0.7_p6-r1.ebuild} | 3 +++ .../{openjdk-25_p19.ebuild => openjdk-25_p19-r1.ebuild} | 3 +++ .../{openjdk-8.452_p09.ebuild => openjdk-8.452_p09-r1.ebuild} | 3 +++ 5 files changed, 15 insertions(+) rename dev-java/openjdk/{openjdk-11.0.27_p6.ebuild => openjdk-11.0.27_p6-r1.ebuild} (99%) rename dev-java/openjdk/{openjdk-17.0.15_p6.ebuild => openjdk-17.0.15_p6-r1.ebuild} (99%) rename dev-java/openjdk/{openjdk-21.0.7_p6.ebuild => openjdk-21.0.7_p6-r1.ebuild} (99%) rename dev-java/openjdk/{openjdk-25_p19.ebuild => openjdk-25_p19-r1.ebuild} (99%) rename dev-java/openjdk/{openjdk-8.452_p09.ebuild => openjdk-8.452_p09-r1.ebuild} (99%) 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: _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: _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: _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