sping 15/08/08 13:07:19 Modified: ChangeLog javacup-0.11b_beta20150326.ebuild Log: 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)
Revision Changes Path 1.39 dev-java/javacup/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?r1=1.38&r2=1.39 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ChangeLog 8 Aug 2015 12:56:22 -0000 1.38 +++ ChangeLog 8 Aug 2015 13:07:19 -0000 1.39 @@ -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 <[email protected]> + javacup-0.11b_beta20150326.ebuild: + Fix java-pkg_getjars approach (bug #556998 comment #5) 08 Aug 2015; Sebastian Pipping <[email protected]> javacup-0.11b_beta20150326.ebuild, 1.4 dev-java/javacup/javacup-0.11b_beta20150326.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?r1=1.3&r2=1.4 Index: javacup-0.11b_beta20150326.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- javacup-0.11b_beta20150326.ebuild 8 Aug 2015 12:56:22 -0000 1.3 +++ javacup-0.11b_beta20150326.ebuild 8 Aug 2015 13:07:19 -0000 1.4 @@ -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 @@ 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_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 }
