gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Volkmar W. Pogatzki
2025-05-16 10:44:26 +02:00
committed by Sam James
parent 6c892e09de
commit a044497080
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-java/javacup/javacup-11b_p20160615.ebuild → dev-java/javacup/javacup-11b_p20160615-r1.ebuild
View File

@@ -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}

7
dev-java/jflex/jflex-1.6.1-r3.ebuild → dev-java/jflex/jflex-1.6.1-r4.ebuild
View File

@@ -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"

8
dev-java/qdox/qdox-1.12.1-r6.ebuild → dev-java/qdox/qdox-1.12.1-r7.ebuild
View File

@@ -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 )
"