dev-java/relaxngcc: Add dev-java/iso-relax to classpath to get package to compile with JDK 1.8, courtesy of Dominik Diesch. Fixes bug 546638.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

2 files changed, 82 insertions, 0 deletions

diff --git a/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
new file mode 100644
index 000000000000..7969a27da882
--- /dev/null
+++ b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
@@ -0,0 +1,11 @@
+--- src/relaxngcc/builder/SwitchBlockInfo.java.orig	2015-08-13 01:20:52.344000000 +0000
++++ src/relaxngcc/builder/SwitchBlockInfo.java	2015-08-13 01:21:27.424000000 +0000
+@@ -66,8 +66,6 @@
+             

+             if(prologue!=null) sv.add(prologue);

+             

+-            //elsecode, null‚È‚çerrorHandleMethod‚ŕ‚¶‚é

+-            

+             CDBlock terminal = elsecode;

+             if(terminal==null && errorHandleMethod!=null)

+                 terminal = new CDBlock(errorHandleMethod);

diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
new file mode 100644
index 000000000000..3ee7191278a3
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_DATE="20031218"
+
+DESCRIPTION="RELAX NG Compiler Compiler"
+HOMEPAGE="http://relaxngcc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/msv:0
+	dev-java/xsdlib:0
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-${MY_DATE}"
+
+java_prepare() {
+	mv relaxngcc.jar relaxngcc.orig.zip || die
+
+	rm -v *.jar || die
+	rm -v sample/*/*.class || die
+
+	mkdir lib || die
+	cd lib || die
+
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	java-pkg_jarfrom iso-relax
+	java-pkg_jarfrom relaxng-datatype
+
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+
+	epatch \
+		"${FILESDIR}"/${PV}-*.patch \
+		"${FILESDIR}"/"${P}"-SwitchBlockInfo.java.patch
+
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${PN}".jar
+
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples sample
+
+	dodoc readme.txt
+	use doc && dohtml -r doc/en/*
+}