Added patch for variables called "enum" to avoid breaking on >= java 7

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

4 files changed, 187 insertions, 12 deletions

diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index 4b74a0f3b94d..b5365c2b2d58 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/soap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.17 2012/09/29 08:49:34 sera Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.18 2014/09/06 06:36:11 ercpe Exp $
+
+*soap-2.3.1-r4 (06 Sep 2014)
+
+  06 Sep 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/soap-2.3.1-java7-enum.patch, +soap-2.3.1-r4.ebuild:
+  Added patch for variables called "enum" to avoid breaking on >= java 7
 
   29 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -soap-2.3.1-r1.ebuild,
   -soap-2.3.1-r2.ebuild:
@@ -71,4 +77,3 @@
 
   12 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +soap-2.3.1.ebuild:
   new ebuild, added as dependency of dev-java/jmeter, created by me
-
diff --git a/dev-java/soap/Manifest b/dev-java/soap/Manifest
index ec9c4dc8905b..b579d16e0ed5 100644
--- a/dev-java/soap/Manifest
+++ b/dev-java/soap/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX soap-2.3.1-build.xml.patch 1334 SHA256 4828ccf6760b503db626657c1308332aa595f1142ef8cec6ca740ae34b759990 SHA512 623ed03291ce98d90272799435acdd6e02673c333070727f06387ddd43af8544d5ad442766c12bcc0adf11e3fc9687db0395653950d4e00bc0ad66273dbd1551 WHIRLPOOL ae413938f18418919ce9b6fe38fc8d993f2ca1cacd8de2938e808b51244eb9a69e54e58cc453f39f9b40e05bac295c2cde5e64ea9abad5377b93689d75171184
+AUX soap-2.3.1-java7-enum.patch 5978 SHA256 5431184cfc0871dc9ac86ec7ae13071cf9a0acc91c18bf4b34e77b8b1175543b SHA512 08912493da5abf6226866e95e80ce8f42801eea1b70339b6ec36491618f19e5141adbc104351e862fc7149661fbb7b7b9e4f5c1c5d03f2aedf2e1f45fefce3cb WHIRLPOOL 0a7c8e43be8bad38c289fa46bcc67cf68928ca7aef30de4b12acef37370e3880cdacef52a6a3231607f589bf859cc3bad416ec1003d67d2076d0be254a109396
 DIST soap-src-2.3.1.tar.gz 142925 SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87 SHA512 b289f8399b15e28ee2b7fa6c42fe56ee0cf42ed8202c234cfca2c3f2a877518e04a29af2fe07f140d8ac23bd6b19607964b79757f6c9733c0be746e3eaadcbce WHIRLPOOL a0e696fee2e187f111a1323c77fde3ce4c0d05f37e8595d5316cb62d563fac23a8e87c91013e65372091c8ace3a5c6da2c5658c1b77d0412736cd7d906bc5ff6
 EBUILD soap-2.3.1-r3.ebuild 1286 SHA256 2f87647dc4c55d03492c2f285c370e269cc2eaa1c58f35879c7c3608c24067c2 SHA512 79ef4ef5277b6b8bb98251878e7dfc5c8eb77395aa65613c275f0e411eb72096fa03e9e1766e8422cee94868e4e104eeefa302560e33f6b098dacfa1c07e1e5a WHIRLPOOL 20650494c4b471bd6b8f1492cd8c44ba2d9494456bf401f370e87b91c19da396fc607332249e3c91c43c96309acdc0a8b781a1bc98ddc127ccb20eae385dfea9
-MISC ChangeLog 2712 SHA256 5a30dd433a521bc8a406280481d833cbe655b0ee507d8064419953d7fd617362 SHA512 eadd3aebe24c92df22f7cc65c15f5773a22883dcc7fd7f72927d14bb7f404a133218de0095a05c21301c21edb024cebd74645d3f07a777f88cac2e8bdb1d8f35 WHIRLPOOL d23cd624cf8e12ee3c49529592a03f5d04599faabc73ef305627bdf833b4620169958e6940da720ee80c342e2d26880ec9afdeab12c4eec1aa41faa0946df27b
+EBUILD soap-2.3.1-r4.ebuild 1331 SHA256 64c12f42bddb63c9e6d9051005c92d70a5a0e9358af08656e290c6499772fa86 SHA512 f379266dfddaba552b283f4e4d1819097266898fb0b63a5fb0f5b7166f1a193e71d0d4f6901357d08c4f23037519314574f0d9ad21ad224f17176507b963a893 WHIRLPOOL 2eda3e843068908c7ccf18ea7cc516434aad983e97983a43ea12cd89005fcd17d5f8eb42a01c5a0a618b843e0467194b07907f6227663fb6f33d25e2fcf947a2
+MISC ChangeLog 2926 SHA256 8691a61a18bf9a80facc6ab5f59ff633216dba701db3f9475d550d18ca11e643 SHA512 13aa2d80331f5e9cefe711b1984b89c1a9ed42f30b23b4f287a16779b74bb076168e008c0819b91975d5f40fb9c403d187318bbbc0a28dc180c97b0a3b77f635 WHIRLPOOL c4760a19989d0893e51d6a6f0db1244a67c85ae7776385d0725663ef12571b7fb7e0b91607ac8fd43cbcb4a21ea523581ec668d1191c42f75e4d4bcee523e041
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQZrYrAAoJEIUJ+svaV163mOUH/jKntmpp2+w3WUDulsraqzGp
-1gicBQlvFKVSHvuu5ovrIKd81hc++KW8qMYMepbUUiPxQZWfO3tMBcRyyIPRCRPd
-cWTRdsUq5CIOwWXXKRN0N9eXfmM22v/8PSevFcgDOcXjEO9Oeeqm/Xq4CvGjgHDJ
-lfCXMxgBXIFW7avKiH2mg8e1HxK5nLXzdw24z05/qJGKhO+7o1mhGMXquG750zS1
-O6dBrym8ebToJ9R4CTBcty6EzXSaxR7TBvUs/n6KF0ixlmrtl6ZI00SNSI+fQjko
-4Ow2rgZXCYCIaABL59+F0UCnIHUiLm7vrxUK0rpCuJ/Va+s3uae0uEtiyqRfoKY=
-=Ld3P
+iQEcBAEBCAAGBQJUCqtjAAoJEKCEBkJ3xQHtqmIIAJpSpmkZaiEwwsxbVxmsGwaz
+JONX6/aQjVJbYKMw6cIF3TDcRoC6q6PsJ8BQnyw+HgkmgesJZpOSTm9C8scwc15X
+/Q1B+O9yQhhL2qpDr8t5e6RQtIO1yhh6w96jb3PuecYWuvuchk2Zlp5TmuPvyxvw
+aRGrhQL8T+1dwqgYPKe5NPOKnUBLaT32ciIz/YbASd5Q+F7k4JT3yFZqpVJwnChP
+9UJy6wprpJkLkxLId6lQCEZZDvfGGdkRqbDezH4iuzIeCOYRloJxhdroxCiMWH+H
+xFMas+OJP4gOwZOV84tSpBQ+J0claxgxLhqcj8LtM7h9+/C1R57neH6Fd2wvfYs=
+=7zo2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/soap/files/soap-2.3.1-java7-enum.patch b/dev-java/soap/files/soap-2.3.1-java7-enum.patch
new file mode 100644
index 000000000000..65d74c4060d9
--- /dev/null
+++ b/dev-java/soap/files/soap-2.3.1-java7-enum.patch
@@ -0,0 +1,116 @@
+diff --git a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
+index 61c9b6a..ac603b3 100644
+--- a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
++++ b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
+@@ -92,7 +92,7 @@ public class VectorSerializer implements Serializer, Deserializer
+                         src.getClass().toString() + "' to VectorSerializer");

+ 

+         String lengthStr;

+-        Enumeration enum;

++        Enumeration enumx;

+         

+         if (src instanceof Enumeration) {

+                 /** TODO: Right now we don't include a length on Enumerations,

+@@ -100,11 +100,11 @@ public class VectorSerializer implements Serializer, Deserializer
+                  * doing the length calculation (at the cost of traversing the

+                  * Enumeration) for a particular installation/service/call.

+                  */

+-                enum = (Enumeration)src;

++                enumx = (Enumeration)src;

+                 lengthStr = "";

+         } else {

+                 Vector v = (Vector)src;

+-                enum = v.elements();

++                enumx = v.elements();

+         

+                 lengthStr = src != null

+                        ? v.size() + ""

+@@ -132,7 +132,7 @@ public class VectorSerializer implements Serializer, Deserializer
+ 

+       sink.write(StringUtils.lineSeparator);

+ 

+-      for (Enumeration e = enum; e.hasMoreElements(); )

++      for (Enumeration e = enumx; e.hasMoreElements(); )

+       {

+         nsStack.pushScope();

+ 

+diff --git a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
+index 8d9e773..6498e05 100644
+--- a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
++++ b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
+@@ -189,8 +189,8 @@ public class StatefulEJBProvider implements Provider {
+         remoteObjRef = (Remote) ret.getValue();

+       } catch (ClassCastException cce) {

+         // Try to cast to an enumeration:

+-        Enumeration enum = (Enumeration) ret.getValue();

+-        remoteObjRef = (Remote) enum.nextElement();

++        Enumeration enumx = (Enumeration) ret.getValue();

++        remoteObjRef = (Remote) enumx.nextElement();

+       }

+       // Set the return value to null, so that the remote object is not

+       // included in the response destined for the client.

+diff --git a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
+index bbf3021..533223f 100644
+--- a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
++++ b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
+@@ -160,10 +160,10 @@ public class MessageRouterServlet extends HttpServlet {
+       if (factory != null) {

+         try {

+           Properties props = new Properties();

+-          Enumeration enum = servletConfig.getInitParameterNames();

++          Enumeration enumx = servletConfig.getInitParameterNames();

+ 

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+diff --git a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
+index b723d4a..ac6a75c 100644
+--- a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
++++ b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
+@@ -178,10 +178,10 @@ public class RPCRouterServlet extends HttpServlet {
+ 	  /*First we put in the servletContext parameters, and then

+ 	    overwrite them with the servletConfig parameters if 

+ 	    they are present.*/

+-          Enumeration enum = servletContext.getInitParameterNames();

++          Enumeration enumx = servletContext.getInitParameterNames();

+ 	  

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+@@ -189,10 +189,10 @@ public class RPCRouterServlet extends HttpServlet {
+             }

+           }

+ 

+-          enum = servletConfig.getInitParameterNames();

++          enumx = servletConfig.getInitParameterNames();

+ 

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+diff --git a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
+index 6e7530d..cf6c3e4 100644
+--- a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
++++ b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
+@@ -397,8 +397,8 @@ public class SOAPHTTPConnection implements SOAPTransport {
+    */

+   private static String getHeaderValue (Hashtable headers, String headerName)

+   {

+-    for (Enumeration enum = headers.keys (); enum.hasMoreElements ();) {

+-      String key = (String) enum.nextElement();

++    for (Enumeration enumx = headers.keys (); enumx.hasMoreElements ();) {

++      String key = (String) enumx.nextElement();

+ 

+       if (key.equalsIgnoreCase (headerName)) {

+         return (String) headers.get(key);

diff --git a/dev-java/soap/soap-2.3.1-r4.ebuild b/dev-java/soap/soap-2.3.1-r4.ebuild
new file mode 100644
index 000000000000..ccaf146165a5
--- /dev/null
+++ b/dev-java/soap/soap-2.3.1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/soap-2.3.1-r4.ebuild,v 1.1 2014/09/06 06:36:11 ercpe Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
+HOMEPAGE="http://ws.apache.org/soap/"
+SRC_URI="http://archive.apache.org/dist/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="
+	>=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND="
+	>=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}"/${PN}-$(replace_all_version_separators _)
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	# get rid of automagical tests, add gentoo.classpath to <javac>
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	epatch "${FILESDIR}/${P}-java7-enum.patch"
+}
+
+EANT_GENTOO_CLASSPATH="javamail,jaf,servlet-api-3.0"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-optional-dependency xerces-2
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+}