Patch to set failonerror to false when running antlr target.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 25 insertions, 7 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index bc973678f78c..418765cc24f5 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.99 2015/06/13 18:04:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.100 2015/06/27 18:15:35 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jython-2.7.0-build.xml.patch, jython-2.7.0.ebuild:
+  Patch to set failonerror to false when running antlr target.
 
   13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> jython-2.7.0.ebuild:
   Sort out an error with dependencies specified in EANT_GENTOO_CLASSPATH.
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch b/dev-java/jython/files/jython-2.7.0-build.xml.patch
new file mode 100644
index 000000000000..4e27af771eb4
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2015-06-27 16:12:08.442000000 +0000
++++ build.xml	2015-06-27 16:12:15.684000000 +0000
+@@ -448,7 +448,7 @@
+     </target>
+ 
+     <target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
+-        <java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
++        <java classname="org.antlr.Tool" failonerror="false" fork="true" dir="${jython.base.dir}">
+             <jvmarg value="-Xmx512m"/>
+             <arg value="-Xconversiontimeout"/>
+             <arg value="2000"/>
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index 31a70dae0f5b..75459c8f2778 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild,v 1.2 2015/06/13 18:04:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild,v 1.3 2015/06/27 18:15:35 monsieurp Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc examples source"
@@ -28,7 +28,6 @@ CDEPEND="dev-java/ant-core:0
 	dev-java/guava:13
 	>=dev-java/java-config-2.1.11-r3
 	dev-java/jffi:1.2
-	dev-java/jline:0
 	dev-java/jline:2
 	dev-java/icu4j:52
 	dev-java/jnr-constants:0
@@ -54,9 +53,10 @@ S=${WORKDIR}
 RESTRICT="test"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,jnr-constants"
-EANT_GENTOO_CLASSPATH+=",script-api,servlet-api-3.0,stringtemplate,xerces-2"
-EANT_GENTOO_CLASSPATH+=",icu4j-52,netty-transport,jnr-posix-3.0"
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
+EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
+EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
+
 JAVA_ANT_CLASSPATH_TAGS+=" java"
 
 EANT_BUILD_TARGET="developer-build"
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
 	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
 	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
 )
 
 java_prepare() {
@@ -105,6 +106,8 @@ src_compile() {
 	java-pkg-2_src_compile
 }
 
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
 src_test() {
 	java-pkg-2_src_test
 }
@@ -122,7 +125,7 @@ src_install() {
 
 	dodoc ACKNOWLEDGMENTS NEWS README.txt
 
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use doc && java-pkg_dohtml -r dist/Doc/javadoc
 	use source && java-pkg_dosrc src/*
 	use examples && java-pkg_doexamples Demo/*