commit: 0c3d0633e401244cabe56e285da172418accec0d Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Mar 16 16:03:29 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 16 20:19:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3d0633
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 <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19955 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/jflex/jflex-1.6.1-r1.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild index 0306f5b6643..6c0b6396e1f 100644 --- a/dev-java/jflex/jflex-1.6.1-r1.ebuild +++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild @@ -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
