| 1 |
monsieurp 15/01/31 19:42:17 |
| 2 |
|
| 3 |
Modified: jflex-1.5.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Patch to fix jflex-1.5.0 (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.2 dev-java/jflex/jflex-1.5.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: jflex-1.5.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- jflex-1.5.0.ebuild 8 Mar 2014 16:17:17 -0000 1.1 |
| 23 |
+++ jflex-1.5.0.ebuild 31 Jan 2015 19:42:17 -0000 1.2 |
| 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.0.ebuild,v 1.1 2014/03/08 16:17:17 tomwij Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v 1.2 2015/01/31 19:42:17 monsieurp Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
|
| 33 |
@@ -28,7 +28,7 @@ |
| 34 |
IUSE="${JAVA_PKG_IUSE} source vim-syntax" |
| 35 |
|
| 36 |
java_prepare() { |
| 37 |
- cp "${FILESDIR}"/${P}-build.xml build.xml || die |
| 38 |
+ cp "${FILESDIR}"/"${P}"-build.xml "${S}"/build.xml |
| 39 |
} |
| 40 |
|
| 41 |
# TODO: Try to avoid using bundled jar (See bug #498874) |
| 42 |
@@ -40,17 +40,17 @@ |
| 43 |
EANT_GENTOO_CLASSPATH="ant-core" |
| 44 |
EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar" |
| 45 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 46 |
-ANT_TASKS="javacup" |
| 47 |
+WANT_ANT_TASKS="javacup" |
| 48 |
|
| 49 |
src_compile() { |
| 50 |
java-pkg-2_src_compile |
| 51 |
|
| 52 |
# Compile another time, using our generated jar; for sanity. |
| 53 |
- cp target/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} |
| 54 |
+ cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA} |
| 55 |
java-pkg-2_src_compile |
| 56 |
} |
| 57 |
|
| 58 |
-# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. |
| 59 |
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. |
| 60 |
RESTRICT="test" |
| 61 |
|
| 62 |
src_test() { |
| 63 |
@@ -58,14 +58,14 @@ |
| 64 |
} |
| 65 |
|
| 66 |
src_install() { |
| 67 |
- java-pkg_newjar target/${P}.jar |
| 68 |
+ java-pkg_newjar build/${P}.jar ${PN}.jar |
| 69 |
java-pkg_dolauncher "${PN}" --main jflex.Main |
| 70 |
java-pkg_register-ant-task |
| 71 |
|
| 72 |
if use doc ; then |
| 73 |
- dodoc doc/manual.pdf doc/manual.ps.gz src/changelog |
| 74 |
+ dodoc doc/manual.pdf changelog.md |
| 75 |
dohtml -r doc/* |
| 76 |
- java-pkg_dojavadoc target/site/apidocs |
| 77 |
+ java-pkg_dojavadoc javadoc |
| 78 |
fi |
| 79 |
|
| 80 |
use examples && java-pkg_doexamples examples |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.18 dev-java/jflex/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.18&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.18&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.17&r2=1.18 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v |
| 93 |
retrieving revision 1.17 |
| 94 |
retrieving revision 1.18 |
| 95 |
diff -u -r1.17 -r1.18 |
| 96 |
--- ChangeLog 31 Jan 2015 19:34:36 -0000 1.17 |
| 97 |
+++ ChangeLog 31 Jan 2015 19:42:17 -0000 1.18 |
| 98 |
@@ -1,6 +1,11 @@ |
| 99 |
# ChangeLog for dev-java/jflex |
| 100 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.18 2015/01/31 19:42:17 monsieurp Exp $ |
| 103 |
+ |
| 104 |
+ 31 Jan 2015; Patrice Clement <monsieurp@g.o> |
| 105 |
+ files/jflex-1.5.0-build.xml, jflex-1.5.0.ebuild: |
| 106 |
+ Patch to fix jflex-1.5.0 (bug 505498) courtesy of Martin Walch |
| 107 |
+ <walch.martin@×××.de>. |
| 108 |
|
| 109 |
31 Jan 2015; Patrice Clement <monsieurp@g.o> jflex-1.5.1.ebuild: |
| 110 |
Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch |
Archives