11 files changed, 29 insertions, 116 deletions
diff --git a/dev-java/asm/asm-9.7.1.ebuild b/dev-java/asm/asm-9.7.1-r1.ebuild
index a4632a9dad61..67a1e694913e 100644
--- a/dev-java/asm/asm-9.7.1.ebuild
+++ b/dev-java/asm/asm-9.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,6 +14,9 @@ MAVEN_PROVIDES="
 	org.ow2.asm:asm-util:${PV}
 "
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
diff --git a/dev-java/asm/asm-9.8.ebuild b/dev-java/asm/asm-9.8-r1.ebuild
index 5577d5c7a8c8..15a97313e9f0 100644
--- a/dev-java/asm/asm-9.8.ebuild
+++ b/dev-java/asm/asm-9.8-r1.ebuild
@@ -14,6 +14,9 @@ MAVEN_PROVIDES="
 	org.ow2.asm:asm-util:${PV}
 "
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0-r1.ebuild
index aa26f2dcf967..398b628679dd 100644
--- a/dev-java/commons-cli/commons-cli-1.9.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,6 +7,9 @@ EAPI=8
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="commons-cli:commons-cli:1.9.0"
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="A Java library for working with the command line arguments and options"
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r6.ebuild
index 17e607401925..c1758c8a65c0 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5-r5.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r6.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java Dependency checker"
diff --git a/dev-java/openjdk/openjdk-11.0.27_p6.ebuild b/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
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
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
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
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
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 8e6333e26c1d..60eca865a569 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,2 +1 @@
-DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
 DIST rhino-1.8.0.tar.gz 5003746 BLAKE2B 101e9ab0c7612402de15936d932af1e1cc40078d1da9fed7390984603bd1f900bcfc6cc548ccd35f57e55bb00b801d374beb0d7653ce95a2d1a086bdb03550b3 SHA512 6f0397d9aaee775e4beefd3ff7aaf726e547d5f6e88ac652bd2c37fb12b6d559d7715f89f39843338937c93a027a81947f2316cabce1441f9b30da65986d087c
diff --git a/dev-java/rhino/rhino-1.7.14-r1.ebuild b/dev-java/rhino/rhino-1.7.14-r1.ebuild
deleted file mode 100644
index f5f009acdc19..000000000000
--- a/dev-java/rhino/rhino-1.7.14-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.mozilla:rhino:1.7.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-HOMEPAGE="https://github.com/mozilla/rhino"
-SRC_URI="https://github.com/mozilla/rhino/archive/Rhino${PV//./_}_Release.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1 GPL-2"
-KEYWORDS="amd64 arm64 ppc64"
-SLOT="1.6"
-
-# There are too many test failures:
-# FAILURES!!!
-# Tests run: 10504,  Failures: 613
-# With openjdk-11 tests even fail to compile:
-# ./testsrc/tests/src/com/netscape/javascript/qa/liveconnect/LiveConnectTest.java:104: error: cannot find symbol
-#         global  = JSObject.getWindow( this );
-#                           ^
-#   symbol:   method getWindow(LiveConnectTest)
-#   location: class JSObject
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit]
-		dev-java/emma:0
-		dev-java/jakarta-xml-soap-api:1
-		dev-java/jmh-core:0
-		dev-java/hamcrest-core:1.3
-		dev-java/snakeyaml:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DOCS=( {CODE_OF_CONDUCT,README,RELEASE-NOTES,RELEASE-STEPS}.md {NOTICE-tools,NOTICE}.txt )
-
-S="${WORKDIR}/rhino-Rhino${PV//./_}_Release"
-
-JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
-JAVA_RESOURCE_DIRS="res"
-JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
-JAVA_TEST_SRC_DIRS="testsrc"
-JAVA_TEST_RESOURCE_DIRS="testres"
-
-# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L81-L87
-JAVA_TEST_EXTRA_ARGS=(
-	-Djava.awt.headless=true
-	-Dmozilla.js.tests=testsrc/tests
-	-Dmozilla.js.tests.timeout=60000
-	-Duser.language=en
-	-Duser.country=US
-	-Duser.timezone=America/Los_Angeles
-	-Dfile.encoding=UTF-8
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	mkdir -p res/org/mozilla/javascript/tools/{resources,debugger} || die
-
-	cp -r "src/org" "res" || die
-	find "res" -type f -name '*.java' -exec rm -rf {} + || die
-
-	cp {toolsrc,res}/org/mozilla/javascript/tools/resources/Messages.properties || die
-	cp {toolsrc,res}/org/mozilla/javascript/tools/debugger/test.js || die
-
-	mv {src,testsrc}/org/mozilla/javascript/engine || die
-	cp -r "testsrc" "testres" || die
-	find "testres" -type f -name '*.java' -exec rm -rf {} + || die
-
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectDrv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectEnv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavDrv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavEnv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/MacRefEnv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavDrv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavEnv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/ObservedTask.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefDrv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefEnv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoDrv.java || die
-	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoEnv.java || die
-}
-
-src_test() {
-	# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L71-L77
-	rm -r testsrc/benchmarks || die
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -gt "1.8" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/javax.swing.table=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}