Bug #540762, reported by Toralf Förster: Renamed enum variable to make it compilable with newer jdks

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

3 files changed, 98 insertions, 3 deletions

diff --git a/dev-java/xt/ChangeLog b/dev-java/xt/ChangeLog
index 6dcf5395d3e1..02043a8224d5 100644
--- a/dev-java/xt/ChangeLog
+++ b/dev-java/xt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.25 2012/11/16 09:38:38 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.26 2015/03/16 18:12:40 ercpe Exp $
+
+*xt-20051206-r3 (16 Mar 2015)
+
+  16 Mar 2015; Johann Schmitz <ercpe@gentoo.org> +files/enum.patch,
+  +xt-20051206-r3.ebuild:
+  Bug #540762, reported by Toralf Förster: Renamed enum variable to make it
+  compilable with newer jdks
 
   16 Nov 2012; Ulrich Müller <ulm@gentoo.org> xt-20051206-r2.ebuild:
   Update LICENSE, this is exactly the MIT/X11 license, only with different
@@ -75,4 +82,3 @@
   14 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +xt-20020426a.ebuild:
   now builds from source, submitted by Jan Brinkmann <lucky@the-luckyduck.de>
-
diff --git a/dev-java/xt/files/enum.patch b/dev-java/xt/files/enum.patch
new file mode 100644
index 000000000000..75cf8926b40f
--- /dev/null
+++ b/dev-java/xt/files/enum.patch
@@ -0,0 +1,34 @@
+diff --git a/xt-20051206/src/xt/java/com/jclark/xsl/expr/PatternList.java b/xt-20051206/src/xt/java/com/jclark/xsl/expr/PatternList.java
+index e33c724..8d5cf1b 100644
+--- a/xt-20051206/src/xt/java/com/jclark/xsl/expr/PatternList.java
++++ b/xt-20051206/src/xt/java/com/jclark/xsl/expr/PatternList.java
+@@ -126,9 +126,9 @@ public class PatternList
+             case Node.ATTRIBUTE:
+             case Node.PROCESSING_INSTRUCTION:
+             case Node.ALLTYPES:            // for "node()" node test
+-                for (Enumeration enum =
+-                         nameRules.elements();  enum.hasMoreElements(); ) {
+-                    append((Vector)enum.nextElement(), ppb, obj);
++                for (Enumeration enumeration =
++                         nameRules.elements();  enumeration.hasMoreElements(); ) {
++                    append((Vector)enumeration.nextElement(), ppb, obj);
+                 }
+                 append(anyNameRules, ppb, obj);
+                 break;
+diff --git a/xt-20051206/src/xt/java/com/jclark/xsl/tr/AppendAction.java b/xt-20051206/src/xt/java/com/jclark/xsl/tr/AppendAction.java
+index 0859b4b..fe3eea1 100644
+--- a/xt-20051206/src/xt/java/com/jclark/xsl/tr/AppendAction.java
++++ b/xt-20051206/src/xt/java/com/jclark/xsl/tr/AppendAction.java
+@@ -16,9 +16,9 @@ class AppendAction implements Action
+     public void invoke(ProcessContext context, 
+                        Node sourceNode, Result result) throws XSLException
+     {
+-        for (Enumeration enum = sequence.elements();
+-             enum.hasMoreElements();)
+-            ((Action)enum.nextElement()).invoke(context, sourceNode, result);
++        for (Enumeration enumeration = sequence.elements();
++             enumeration.hasMoreElements();)
++            ((Action)enumeration.nextElement()).invoke(context, sourceNode, result);
+     }
+ 
+     void add(Action action)
diff --git a/dev-java/xt/xt-20051206-r3.ebuild b/dev-java/xt/xt-20051206-r3.ebuild
new file mode 100644
index 000000000000..7b925216203e
--- /dev/null
+++ b/dev-java/xt/xt-20051206-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20051206-r3.ebuild,v 1.1 2015/03/16 18:12:40 ercpe Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Java Implementation of XSL-Transformations"
+SRC_URI="http://www.blnz.com/xt/${P}-src.zip"
+HOMEPAGE="http://www.blnz.com/xt/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	java-virtuals/servlet-api:2.4"
+RDEPEND="
+	>=virtual/jre-1.4
+	dev-java/xp:0
+	${COMMON_DEP}"
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -delete || die
+
+	epatch "${FILESDIR}/20051206-java5.patch"
+	epatch "${FILESDIR}/enum.patch"
+
+	java-pkg_jar-from --into lib servlet-api-2.4
+}
+
+EANT_BUILD_TARGET="compile"
+EANT_EXTRA_ARGS="-Dunzip.done=true"
+
+src_install() {
+	java-pkg_newjar lib/${PN}${PV}.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.jclark.xsl.sax.Driver
+	# loads this only on runtime
+	java-pkg_register-dependency xp
+
+	dodoc README.txt
+	dohtml index.html
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/xt/java/com
+}