monsieurp 15/01/31 19:34:36 Modified: jflex-1.5.1.ebuild ChangeLog Log: Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch <[email protected]>. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.3 dev-java/jflex/jflex-1.5.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?r1=1.2&r2=1.3 Index: jflex-1.5.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jflex-1.5.1.ebuild 30 Apr 2014 15:27:11 -0000 1.2 +++ jflex-1.5.1.ebuild 31 Jan 2015 19:34:36 -0000 1.3 @@ -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.1.ebuild,v 1.2 2014/04/30 15:27:11 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.3 2015/01/31 19:34:36 monsieurp Exp $ EAPI="5" @@ -28,7 +28,17 @@ IUSE="${JAVA_PKG_IUSE} source vim-syntax" java_prepare() { - cp "${FILESDIR}"/${PN}-1.5.0-build.xml build.xml || die + # use a more convenient version number + sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml + # fix bootstrapping + sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \ + build.xml + # add javadoc capability to build.xml + sed -i s,"\(</project>\)",\ +"\n <target depends=\"compile\" name=\"javadoc\">\n <javadoc \ +packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\ +sources\" destdir=\"javadoc\" version=\"true\" />\n </target>\n\1",g \ + build.xml } # TODO: Try to avoid using bundled jar (See bug #498874) @@ -40,17 +50,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 +68,14 @@ } src_install() { - java-pkg_newjar target/${PN}-*.jar ${PN}.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 changelog.md dohtml -r doc/* - java-pkg_dojavadoc target/site/apidocs + java-pkg_dojavadoc javadoc fi use examples && java-pkg_doexamples examples 1.17 dev-java/jflex/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 18 Jan 2015 21:16:24 -0000 1.16 +++ ChangeLog 31 Jan 2015 19:34:36 -0000 1.17 @@ -1,6 +1,10 @@ # 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.16 2015/01/18 21:16:24 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $ + + 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 + <[email protected]>. *jflex-1.6.0 (18 Jan 2015)
