summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/javacup/javacup-0.11b_beta20150326.ebuild')
-rw-r--r--dev-java/javacup/javacup-0.11b_beta20150326.ebuild18
1 files changed, 11 insertions, 7 deletions
diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
index 8d10fc8806fa..ab0ef7e21c56 100644
--- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
+++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.1 2015/08/07 19:58:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.2 2015/08/08 01:05:15 sping Exp $
EAPI="5"
@@ -22,14 +22,16 @@ SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="userland_BSD"
+IUSE="userland_BSD system-jflex"
# find for bug #214664
+CDEPEND=">=dev-java/ant-core-1.7.0:0"
DEPEND=">=virtual/jdk-1.5
- dev-java/jflex:0
- !userland_BSD? ( >=sys-apps/findutils-4.4 )"
+ system-jflex? ( dev-java/jflex:0 )
+ !userland_BSD? ( >=sys-apps/findutils-4.4 )
+ ${CDEPEND}"
RDEPEND=">=virtual/jre-1.5
- >=dev-java/ant-core-1.7.0"
+ ${CDEPEND}"
S="${WORKDIR}"
@@ -38,8 +40,10 @@ src_prepare() {
find . -name '*.class' -delete || die
- rm bin/JFlex.jar || die
- java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+ if use system-jflex; then # break the circular dependency
+ rm bin/JFlex.jar || die
+ java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+ fi
java-ant_rewrite-classpath
}