dev-java/*: restict javacup, jflex and qdox:1.12 to revisions

There is a circular dependency between javacup and jflex and in the past
we used to build jflex with a bundled javacup-runtime. The newer version
of jflex-1.9.1 however does not provide such bundled javacup-runtime.

This commit restricts the existing revisions to what we have in order to
allow updating jflex.

- javacup-11b_p20160615-r1
  Restricted to ~jflex-1.6.1 in order to allow switching the emerge
  order. javacup-11b_p20160615-r2 will be used by jflex-1.9.1 but not
  depend on it.

- jflex-1.6.1-r4
  Restricted to max javacup-11b_p20160615-r1. The next revision,
  javacup-11b_p20160615-r2, will not depend on jflex.

- qdox-1.12.1-r7
  The patch 'jflex-1.6.1.patch' which is used by this revision does not
  allow building with a newer version of jflex.
  We restict this revision to ~dev-java/jflex-1.6.1 and will add another
  revision which can build with the newer jflex.

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44017
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 15 insertions, 6 deletions

diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615-r1.ebuild
index 3b5077688dcb4..da0a5793dc108 100644
--- a/dev-java/javacup/javacup-11b_p20160615.ebuild
+++ b/dev-java/javacup/javacup-11b_p20160615-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
@@ -16,8 +16,10 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ant-task"
 
+# Restricted to ~jflex-1.6.1 in order to allow switching the emerge order.
+# javacup-11b_p20160615-r2 will be used by jflex-1.9.1 but not depend on it.
 DEPEND="${CP_DEPEND}
-	>=dev-java/jflex-1.6.1-r3:0
+	~dev-java/jflex-1.6.1:0
 	>=virtual/jdk-1.8:*
 	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
 RDEPEND="${CP_DEPEND}
diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r4.ebuild
index ee3f226e1d98b..0cdfce644742f 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r4.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
@@ -31,7 +31,10 @@ DEPEND="
 	test? ( dev-java/junit:4 )
 "
 
-PDEPEND=">=dev-java/javacup-11b_p20160615:0"
+# Restricted to max javacup-11b_p20160615-r1 in order to allow switching
+# the emerge order. The next revision, javacup-11b_p20160615-r2, will not
+# depend on jflex.
+PDEPEND="<=dev-java/javacup-11b_p20160615-r1:0"
 
 JAVA_SRC_DIR="src/main/java"
 
diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r7.ebuild
index 4cfeb6815df52..18241f060101b 100644
--- a/dev-java/qdox/qdox-1.12.1-r6.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r7.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
@@ -20,11 +20,15 @@ KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos"
 IUSE="ant-task"
 REQUIRED_USE="test? ( ant-task )"
 
+# The patch 'jflex-1.6.1.patch' which is used by this revision does
+# not allow building with a newer version of jflex.
+# We restict this revision to ~dev-java/jflex-1.6.1 and will add another
+# revision which can build with the newer jflex.
 DEPEND="
 	>=virtual/jdk-1.8:*
 	dev-java/byaccj:0
 	dev-java/jmock:1.0
-	!x86? ( dev-java/jflex:0 )
+	!x86? ( ~dev-java/jflex-1.6.1:0 )
 	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
 	test? ( dev-java/junit:0 )
 "