Bump to EAPI=5; fixed bug #514072: renamed variable named "enum" which cause compile errors with jdk 1.7

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

3 files changed, 87 insertions, 1 deletions

diff --git a/dev-java/relaxngcc/ChangeLog b/dev-java/relaxngcc/ChangeLog
index 30e8256b2ed3..244eac54a85c 100644
--- a/dev-java/relaxngcc/ChangeLog
+++ b/dev-java/relaxngcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/relaxngcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.14 2014/06/17 11:29:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.15 2014/06/21 06:51:25 ercpe Exp $
+
+*relaxngcc-1.12-r2 (21 Jun 2014)
+
+  21 Jun 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/1.12-fix-jdk-1.7-enum.patch, +relaxngcc-1.12-r2.ebuild:
+  Bump to EAPI=5; fixed bug #514072: renamed variable named "enum" which cause
+  compile errors with jdk 1.7
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -relaxngcc-1.12.ebuild:
   NM: Cleanup superseded ebuilds.
diff --git a/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..69de6caaa184
--- /dev/null
+++ b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
@@ -0,0 +1,15 @@
+diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+index b2f0e5e..bca566f 100644
+--- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
++++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+@@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
+         jj_expentry[i] = jj_lasttokens[i];

+       }

+       boolean exists = false;

+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {

+-        int[] oldentry = (int[])(enum.nextElement());

++      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {

++        int[] oldentry = (int[])(enumx.nextElement());

+         if (oldentry.length == jj_expentry.length) {

+           exists = true;

+           for (int i = 0; i < jj_expentry.length; i++) {

diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
new file mode 100644
index 000000000000..0e31ec8eecc4
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild,v 1.1 2014/06/21 06:51:25 ercpe Exp $
+
+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.4
+	dev-java/relaxng-datatype:0
+	dev-java/msv:0
+	dev-java/ant-core:0
+	dev-java/xsdlib:0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+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 relaxng-datatype
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+	epatch "${FILESDIR}"/${PV}-*.patch
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar relaxngcc.jar
+
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples sample
+
+	dodoc readme.txt
+	use doc && dohtml -r doc/en/*
+
+}