| 1 |
monsieurp 15/01/31 19:34:36 |
| 2 |
|
| 3 |
Modified: jflex-1.5.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch <walch.martin@×××.de>. |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-java/jflex/jflex-1.5.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: jflex-1.5.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- jflex-1.5.1.ebuild 30 Apr 2014 15:27:11 -0000 1.2 |
| 23 |
+++ jflex-1.5.1.ebuild 31 Jan 2015 19:34:36 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.2 2014/04/30 15:27:11 tomwij Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.3 2015/01/31 19:34:36 monsieurp Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
|
| 33 |
@@ -28,7 +28,17 @@ |
| 34 |
IUSE="${JAVA_PKG_IUSE} source vim-syntax" |
| 35 |
|
| 36 |
java_prepare() { |
| 37 |
- cp "${FILESDIR}"/${PN}-1.5.0-build.xml build.xml || die |
| 38 |
+ # use a more convenient version number |
| 39 |
+ sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml |
| 40 |
+ # fix bootstrapping |
| 41 |
+ sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \ |
| 42 |
+ build.xml |
| 43 |
+ # add javadoc capability to build.xml |
| 44 |
+ sed -i s,"\(</project>\)",\ |
| 45 |
+"\n <target depends=\"compile\" name=\"javadoc\">\n <javadoc \ |
| 46 |
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\ |
| 47 |
+sources\" destdir=\"javadoc\" version=\"true\" />\n </target>\n\1",g \ |
| 48 |
+ build.xml |
| 49 |
} |
| 50 |
|
| 51 |
# TODO: Try to avoid using bundled jar (See bug #498874) |
| 52 |
@@ -40,17 +50,17 @@ |
| 53 |
EANT_GENTOO_CLASSPATH="ant-core" |
| 54 |
EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar" |
| 55 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 56 |
-ANT_TASKS="javacup" |
| 57 |
+WANT_ANT_TASKS="javacup" |
| 58 |
|
| 59 |
src_compile() { |
| 60 |
java-pkg-2_src_compile |
| 61 |
|
| 62 |
# Compile another time, using our generated jar; for sanity. |
| 63 |
- cp target/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} |
| 64 |
+ cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} |
| 65 |
java-pkg-2_src_compile |
| 66 |
} |
| 67 |
|
| 68 |
-# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. |
| 69 |
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. |
| 70 |
RESTRICT="test" |
| 71 |
|
| 72 |
src_test() { |
| 73 |
@@ -58,14 +68,14 @@ |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- java-pkg_newjar target/${PN}-*.jar ${PN}.jar |
| 78 |
+ java-pkg_newjar build/${P}.jar ${PN}.jar |
| 79 |
java-pkg_dolauncher "${PN}" --main jflex.Main |
| 80 |
java-pkg_register-ant-task |
| 81 |
|
| 82 |
if use doc ; then |
| 83 |
dodoc doc/manual.pdf changelog.md |
| 84 |
dohtml -r doc/* |
| 85 |
- java-pkg_dojavadoc target/site/apidocs |
| 86 |
+ java-pkg_dojavadoc javadoc |
| 87 |
fi |
| 88 |
|
| 89 |
use examples && java-pkg_doexamples examples |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.17 dev-java/jflex/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.16&r2=1.17 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v |
| 102 |
retrieving revision 1.16 |
| 103 |
retrieving revision 1.17 |
| 104 |
diff -u -r1.16 -r1.17 |
| 105 |
--- ChangeLog 18 Jan 2015 21:16:24 -0000 1.16 |
| 106 |
+++ ChangeLog 31 Jan 2015 19:34:36 -0000 1.17 |
| 107 |
@@ -1,6 +1,10 @@ |
| 108 |
# ChangeLog for dev-java/jflex |
| 109 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.16 2015/01/18 21:16:24 monsieurp Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $ |
| 112 |
+ |
| 113 |
+ 31 Jan 2015; Patrice Clement <monsieurp@g.o> jflex-1.5.1.ebuild: |
| 114 |
+ Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch |
| 115 |
+ <walch.martin@×××.de>. |
| 116 |
|
| 117 |
*jflex-1.6.0 (18 Jan 2015) |
Archives