| 1 |
monsieurp 15/06/27 18:15:35 |
| 2 |
|
| 3 |
Modified: jython-2.7.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Patch to set failonerror to false when running antlr target. |
| 6 |
|
| 7 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 dev-java/jython/jython-2.7.0.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: jython-2.7.0.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- jython-2.7.0.ebuild 13 Jun 2015 18:04:56 -0000 1.2 |
| 24 |
+++ jython-2.7.0.ebuild 27 Jun 2015 18:15:35 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 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/jython/jython-2.7.0.ebuild,v 1.2 2015/06/13 18:04:56 monsieurp Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild,v 1.3 2015/06/27 18:15:35 monsieurp Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
JAVA_PKG_IUSE="doc examples source" |
| 33 |
@@ -28,7 +28,6 @@ |
| 34 |
dev-java/guava:13 |
| 35 |
>=dev-java/java-config-2.1.11-r3 |
| 36 |
dev-java/jffi:1.2 |
| 37 |
- dev-java/jline:0 |
| 38 |
dev-java/jline:2 |
| 39 |
dev-java/icu4j:52 |
| 40 |
dev-java/jnr-constants:0 |
| 41 |
@@ -54,9 +53,10 @@ |
| 42 |
RESTRICT="test" |
| 43 |
|
| 44 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 45 |
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,jnr-constants" |
| 46 |
-EANT_GENTOO_CLASSPATH+=",script-api,servlet-api-3.0,stringtemplate,xerces-2" |
| 47 |
-EANT_GENTOO_CLASSPATH+=",icu4j-52,netty-transport,jnr-posix-3.0" |
| 48 |
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2," |
| 49 |
+EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0," |
| 50 |
+EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0" |
| 51 |
+ |
| 52 |
JAVA_ANT_CLASSPATH_TAGS+=" java" |
| 53 |
|
| 54 |
EANT_BUILD_TARGET="developer-build" |
| 55 |
@@ -73,6 +73,7 @@ |
| 56 |
"${FILESDIR}"/${PN}-2.7_beta1-ant.patch |
| 57 |
"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch |
| 58 |
"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch |
| 59 |
+ "${FILESDIR}"/${PN}-2.7.0-build.xml.patch |
| 60 |
) |
| 61 |
|
| 62 |
java_prepare() { |
| 63 |
@@ -105,6 +106,8 @@ |
| 64 |
java-pkg-2_src_compile |
| 65 |
} |
| 66 |
|
| 67 |
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
| 68 |
+ |
| 69 |
src_test() { |
| 70 |
java-pkg-2_src_test |
| 71 |
} |
| 72 |
@@ -122,7 +125,7 @@ |
| 73 |
|
| 74 |
dodoc ACKNOWLEDGMENTS NEWS README.txt |
| 75 |
|
| 76 |
- use doc && java-pkg_dojavadoc dist/Doc/javadoc |
| 77 |
+ use doc && java-pkg_dohtml -r dist/Doc/javadoc |
| 78 |
use source && java-pkg_dosrc src/* |
| 79 |
use examples && java-pkg_doexamples Demo/* |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.100 dev-java/jython/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.100&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.100&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?r1=1.99&r2=1.100 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v |
| 93 |
retrieving revision 1.99 |
| 94 |
retrieving revision 1.100 |
| 95 |
diff -u -r1.99 -r1.100 |
| 96 |
--- ChangeLog 13 Jun 2015 18:04:56 -0000 1.99 |
| 97 |
+++ ChangeLog 27 Jun 2015 18:15:35 -0000 1.100 |
| 98 |
@@ -1,6 +1,10 @@ |
| 99 |
# ChangeLog for dev-java/jython |
| 100 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.99 2015/06/13 18:04:56 monsieurp Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.100 2015/06/27 18:15:35 monsieurp Exp $ |
| 103 |
+ |
| 104 |
+ 27 Jun 2015; Patrice Clement <monsieurp@g.o> |
| 105 |
+ +files/jython-2.7.0-build.xml.patch, jython-2.7.0.ebuild: |
| 106 |
+ Patch to set failonerror to false when running antlr target. |
| 107 |
|
| 108 |
13 Jun 2015; Patrice Clement <monsieurp@g.o> jython-2.7.0.ebuild: |
| 109 |
Sort out an error with dependencies specified in EANT_GENTOO_CLASSPATH. |
Archives