mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 10:17:08 -08:00
dev-java/jflex: fix regression (circular dep)
Closes: https://bugs.gentoo.org/776736 Previous commit introduced circular dependency ( DEPEND="dev-java/javacup:0 ) Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19955 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.8:*
|
||||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
|
||||
${CDEPEND}"
|
||||
|
||||
DEPEND="dev-java/javacup:0
|
||||
>=virtual/jdk-1.8:*
|
||||
DEPEND=">=virtual/jdk-1.8:*
|
||||
test? ( dev-java/junit:4 )
|
||||
${CDEPEND}"
|
||||
|
||||
@@ -35,7 +34,7 @@ JAVA_SRC_DIR="src/main/java"
|
||||
|
||||
src_prepare() {
|
||||
# See below for details.
|
||||
eapply_user "${FILESDIR}/icedtea-arm.patch"
|
||||
eapply "${FILESDIR}/icedtea-arm.patch"
|
||||
|
||||
# We need the bundled jflex.jar.
|
||||
rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
|
||||
|
||||
Reference in New Issue
Block a user