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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 109 insertions, 18 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/Manifest b/dev-java/xt/Manifest
index 2149698195c4..66b4226da036 100644
--- a/dev-java/xt/Manifest
+++ b/dev-java/xt/Manifest
@@ -2,24 +2,20 @@
 Hash: SHA256
 
 AUX 20051206-java5.patch 423 SHA256 6697d7f84e7de456d703713d71a898ff479b690792a391a3330e8afcc3d38567 SHA512 cce668460026212c18d98007419b55b4298e1be7eacebdd0d72f0d29c92662618446ff7c36a1c428d6eb0e561564551414b021669db7f1bc42c8e5af9569a793 WHIRLPOOL 6406e3e41e5f9db43fac7b44cee83ad361ce2a7c3e4947a3264a773363eba3bb05d562dfd7fc032a4e740508553560a0ad3fe65ebcda4ce4a2a0c9c46838dfe6
+AUX enum.patch 1867 SHA256 28ac0ddfe5c01ed2b6a34c4d776f5d6de290a39912e49e8eff1df44ce305751d SHA512 6c184484b77b2d54d61c39d3860ed148deeaf8c30431fb2b79f82db5ff9d34580186f23292dec1ca470151d5793a655df517c52a8773fb79f56613160e79fea8 WHIRLPOOL feed2654eb900e1456bd78891144720acacdf3be42f3c19b0afc6fddbc73b2c8179f0bf2afde6c879bf57deaddf5e2bb4d11ceedabba28d1a68e9edbcdcd6eee
 DIST xt-20051206-src.zip 5111404 SHA256 d485f423afc199b5e4fd448d7ad10979fdc908172ae6a42d7ae06412a98aae30 SHA512 c62aad723302be76f436c63207019feb25e04e5b9c41a8f9d70a2bc3032628287f51caf079d713e29ec32af55d738861db906390dd1dbab2631ee9d2147379a4 WHIRLPOOL 4245f216f574aa65ce24386608331e87e8ece7c7f5b23bd6dfc91e12c0396acb120027af00447665c888e291cc0a57eeefbd29bd7b6e3bd2b2e711281d8a973c
 EBUILD xt-20051206-r2.ebuild 1182 SHA256 543d0b4af28cb5208202f5ca2fdf7aff8f039a0ebba345663b9619b8b4805db1 SHA512 034fe8ad397835456b98c3c034cae2b86924ef8ea539b40e582b1015d90f15d83b1ba755408cbfff0866b86e2fe40eb64ab0245310f81c1bf63d66fe2f9cac8d WHIRLPOOL f78d3eec158a4857714e0c8f150b38fa9eb03843921cdd1981e31314d2e8d9071da583b7a8501bbb4e04a9c162e188ceda99812ccc31c9db028f96069294f248
-MISC ChangeLog 2867 SHA256 6ce4c0c359fb61847a021e6dd1a01b0b9c1f6f3df328878007b0856dee14cfdc SHA512 d9c9901d693028c26c829b8f6c14d2f48aa967a43f3bdffa0bb19eeabde4d2c070aec073dcacdff46266c385ba3234662fa8e0ecad549141de3f04e11f050cdf WHIRLPOOL 8f3d7cf210af20024ddcb549508a0738f07816a78e14715b5ab01225441864fa3338c89ca45a8f9ae8b53910cfbfab58b1e2e65adcd993d2161ff32eef073b18
+EBUILD xt-20051206-r3.ebuild 1219 SHA256 97fcdcf94326ad94b614f8ffc4bdcb7c7ada709d4895da11d1ff8ee390368258 SHA512 d930659a3557f3010953a4486b618893e3fb5658e1e8ac9c81470034305a3cf9e5a31110495df402e77fed9dd76be81845486f2a209e032a643387208e0e19f7 WHIRLPOOL eae9641f8ad1c7f0c61526a8ef98954dbec4cf504dd6cf16e8acbb459e6b01d99437a99532a0a785b4e9922f638b87f827b1ae01abcd7f079297368c8e7bd668
+MISC ChangeLog 3100 SHA256 4ca3eda6ec88f3464265dc64773aaa7632b33163fce77bbffdfdb11e97eaf0ab SHA512 421b0928b06a117a8104a3f19d4bdf9b8254f9216f872c90995a8d2afe15952bffa28e0790e57c995356e775884a23d3ecfca3fc72c17e2255aaffd15b9ba8d8 WHIRLPOOL 34aa01873ece945f47007a0000f74c0e0c2896f8f0848d10d60aabb63eb40e25442b02b0658668396218e031790022d1a5bb0beee607a8659ea2a535f499db51
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQpgnUAAoJEDxpGckxwJCBs9oP/Ro35+Xe+eTe3EqbkjQzozSr
-5lvZG5aOiaG3cGVId5RcGK1eU59LWcZY1PfoHgZpZaCTxsKKg0GCcLbQGq1YlM26
-LDhGu9xSBni5QQ82jJ2R9rayxr/jGGy2vnHtbY2i7JRK0kMbBiEISRUIjN4OeGHN
-AFS1iAet5lZrXEX85Uag3PMM8+YYpyXIvozZPd1Y7AZq9jCVXOQU5ygICpnM+eLY
-WppmogeWvy20D8baTKmn/oGx6RoMuY92Jyavfi0Nihvrb11tzgNfy2DdyPWupSQh
-Bt/WNqf+l+AT+GYAL/U6A7eONq7qWQTds8VgK3memQLF8WBrz7OV/RdiDSnptWPJ
-1xEX47P45R+7JA5MnyWrCXYldAgJQwqzVBW7pw85RzIIT6yKwet8H2PEIu8qoEhI
-bk6YhWaUdlHKBWaNTpQM3tk71YYpPJkH/e4sanoHjeSTsO3xUOnxMoMc8sTty2sz
-AP0z9mY8AVpDXHilAvxTsyhGmtwYFIRPTyr1HApc5v3u3ciHXtQhL/lAbblGpHLP
-inj7S0eeSWkb4AgK9P+o4CKYhvbTbYx/LsnG52dKa9GtAykT9KDop0W3J+o2SEC6
-qc2aGXO8z0eZwEyuhvoGRhVjPP8ByBKtPBaWhwsHAqpFX9g3xmzK1o6sPaoF0xmf
-tSZ7W3Jvv0OKFp5CesJP
-=vzhV
+iQEcBAEBCAAGBQJVBx0eAAoJEKCEBkJ3xQHt4dEH/1tr2kpth4Ox5YLrCowDQQro
+9+I5rNSjQ35BFIFjdIPoZVsRJcO6i5WF4iPoDaxDzl4JJ0uXw9TZz7WCOrOZyhH8
+1QASS3pIyhIUzuNzVGhdiTevQJIWT3/cBlfJZiijhGm7gVjO70UtnFwwRRtIo2/J
+j11fSPDM6Ap7MFHtqKuCrgH7W9f0MDLz4ERQeePpEJIl70sdlEXld+xubRj8aAj2
+Nz9aB1aN5UpFKw+BohGRVPSr369Gq61exQ93Rtd644jKfgI+rqFTgKVWeQsPrN2h
+1v2JAfRFZZPRc5T95htaumO6Cb5FxuzLbBhvIzRI3ybzMAEKJxecvi+iNmvfPcc=
+=Jpv+
 -----END PGP SIGNATURE-----
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
+}