monsieurp 15/01/31 19:42:17 Modified: jflex-1.5.0.ebuild ChangeLog Log: Patch to fix jflex-1.5.0 (bug 505498) courtesy of Martin Walch <[email protected]>. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 dev-java/jflex/jflex-1.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?r1=1.1&r2=1.2 Index: jflex-1.5.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jflex-1.5.0.ebuild 8 Mar 2014 16:17:17 -0000 1.1 +++ jflex-1.5.0.ebuild 31 Jan 2015 19:42:17 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v 1.1 2014/03/08 16:17:17 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v 1.2 2015/01/31 19:42:17 monsieurp Exp $ EAPI="5" @@ -28,7 +28,7 @@ IUSE="${JAVA_PKG_IUSE} source vim-syntax" java_prepare() { - cp "${FILESDIR}"/${P}-build.xml build.xml || die + cp "${FILESDIR}"/"${P}"-build.xml "${S}"/build.xml } # TODO: Try to avoid using bundled jar (See bug #498874) @@ -40,17 +40,17 @@ EANT_GENTOO_CLASSPATH="ant-core" EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar" JAVA_ANT_REWRITE_CLASSPATH="true" -ANT_TASKS="javacup" +WANT_ANT_TASKS="javacup" src_compile() { java-pkg-2_src_compile # Compile another time, using our generated jar; for sanity. - cp target/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} + cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} java-pkg-2_src_compile } -# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. +# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. RESTRICT="test" src_test() { @@ -58,14 +58,14 @@ } src_install() { - java-pkg_newjar target/${P}.jar + java-pkg_newjar build/${P}.jar ${PN}.jar java-pkg_dolauncher "${PN}" --main jflex.Main java-pkg_register-ant-task if use doc ; then - dodoc doc/manual.pdf doc/manual.ps.gz src/changelog + dodoc doc/manual.pdf changelog.md dohtml -r doc/* - java-pkg_dojavadoc target/site/apidocs + java-pkg_dojavadoc javadoc fi use examples && java-pkg_doexamples examples 1.18 dev-java/jflex/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.17&r2=1.18 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 31 Jan 2015 19:34:36 -0000 1.17 +++ ChangeLog 31 Jan 2015 19:42:17 -0000 1.18 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/jflex # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.18 2015/01/31 19:42:17 monsieurp Exp $ + + 31 Jan 2015; Patrice Clement <[email protected]> + files/jflex-1.5.0-build.xml, jflex-1.5.0.ebuild: + Patch to fix jflex-1.5.0 (bug 505498) courtesy of Martin Walch + <[email protected]>. 31 Jan 2015; Patrice Clement <[email protected]> jflex-1.5.1.ebuild: Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch
