diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-08-08 13:07:19 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-08-08 13:07:19 +0000 |
| commit | ed9e05f32e5f29a524ea6387e5cea626cf4f7702 (patch) | |
| tree | f7fcaf8c7ade66dce97b3cc92e2c38b8707594c2 | |
| parent | dev-java/javacup: Resolve calling of svn (bug #556998) (diff) | |
| download | gentoo-2-ed9e05f32e5f29a524ea6387e5cea626cf4f7702.tar.gz gentoo-2-ed9e05f32e5f29a524ea6387e5cea626cf4f7702.tar.bz2 gentoo-2-ed9e05f32e5f29a524ea6387e5cea626cf4f7702.zip | |
dev-java/javacup: Fix java-pkg_getjars approach (bug #556998 comment #5)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
| -rw-r--r-- | dev-java/javacup/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/javacup/javacup-0.11b_beta20150326.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog index a7ecf9bdb126..f0350adbfa85 100644 --- a/dev-java/javacup/ChangeLog +++ b/dev-java/javacup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/javacup # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.38 2015/08/08 12:56:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.39 2015/08/08 13:07:19 sping Exp $ + + 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> + javacup-0.11b_beta20150326.ebuild: + Fix java-pkg_getjars approach (bug #556998 comment #5) 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> javacup-0.11b_beta20150326.ebuild, diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild index 82dcbafb52dc..d7168e5729f1 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.3 2015/08/08 12:56:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.4 2015/08/08 13:07:19 sping Exp $ EAPI="5" @@ -25,13 +25,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebs IUSE="userland_BSD system-jflex" # find for bug #214664 -CDEPEND=">=dev-java/ant-core-1.7.0:0" DEPEND=">=virtual/jdk-1.5 system-jflex? ( dev-java/jflex:0 ) !userland_BSD? ( >=sys-apps/findutils-4.4 ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" + >=dev-java/ant-core-1.7.0:0" +RDEPEND=">=virtual/jre-1.5" S="${WORKDIR}" @@ -50,13 +48,15 @@ src_prepare() { } src_compile() { - eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" + local classpath="$(java-pkg_getjars --build-only ant-core)" + + eant -Dgentoo.classpath="${classpath}" rm bin/java-cup-11.jar || die cp dist/java-cup-11b.jar bin/java-cup-11.jar || die eant clean einfo "Recompiling with newly generated javacup" - eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" + eant -Dgentoo.classpath="${classpath}" use doc && javadoc -sourcepath src/ java_cup -d javadoc } |