Bump to EAPI=5, dropped ant, make it compile with >= java 7.

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

4 files changed, 279 insertions, 3 deletions

diff --git a/dev-java/ecs/ChangeLog b/dev-java/ecs/ChangeLog
index 0fe54bb4b196..d1aeb2969151 100644
--- a/dev-java/ecs/ChangeLog
+++ b/dev-java/ecs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ecs
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.21 2007/06/17 15:35:48 caster Exp $
+# Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.22 2014/09/06 15:48:59 ercpe Exp $
+
+*ecs-1.4.2-r2 (06 Sep 2014)
+
+  06 Sep 2014; Johann Schmitz <ercpe@gentoo.org> +ecs-1.4.2-r2.ebuild,
+  +files/1.4.2-java7-enum.patch:
+  Bump to EAPI=5, dropped ant, make it compile with >= java 7.
 
   17 Jun 2007; Vlastimil Babka <caster@gentoo.org> -ecs-1.4.1-r1.ebuild,
   -ecs-1.4.2.ebuild:
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
index 4ab0793c43b0..7f80bd29f0b4 100644
--- a/dev-java/ecs/Manifest
+++ b/dev-java/ecs/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.4.2-java7-enum.patch 9655 SHA256 bb093c90012241c81644acbf2a310c08571cc67d7248037aae59610a1a354a2a SHA512 9be8efb4762dd88ab9b3a05466ec9085b22e6d4f2c10ba11a57a9411b73edb1c3b6a0f9ba940159a8857087b310b49978885469ce9a7e5f8d964770772c5f4f5 WHIRLPOOL 84caf10f718494974cd780bba10a59c598790db05e4a8a6e743aa4370e65a1bc3237645112bc1b6cd26a07cab2f658ffbcf6ba77cbde713920478ade9a0f5f3b
 DIST ecs-1.4.2-src.tar.gz 3435157 SHA256 8e98da4dd0ed5498bdfac1ec7a4bfa429348d1c8733ed189e67923d98adb2a31 SHA512 b7004f9364a24dd9ec8f963f69279471cc2e39fdc81d1c97dc4881cf65ee16f5f4342129b7bdda12994b69edff23944cb12f5d4b4ec140bf962e3a4f9f4e1bb4 WHIRLPOOL 202a8f9f4b81d0714f59b2817a317b85a95e5233efb4832fb787d988126b5d2b8fca46eeb7828f71fef9efea953de80d81c769e1dfa77dbd5b052dc78b750c38
 EBUILD ecs-1.4.2-r1.ebuild 1195 SHA256 006260c7dae539a7ea9f5bf9923626174356be06d8e657416060d4862b0e58da SHA512 1921e70357764c916b43b89dddd3f02080101e9fc14902d614ca8b53a26e3f8615f961f6ff1e88fd9d1ef5f957180ee9e5189d603a3c59a7b5e365efe8593610 WHIRLPOOL abf629e99cd6cac27a34631ae7b2fa40e6bd5faa2d69899abd1197bf35a5fd95630f9b5aaec906ada329a8689d44447f3bfdf47ab2de2f108825ce745e809dbc
-MISC ChangeLog 2481 SHA256 6ec50665f79d92c7b0f78e89e3a9546745e69230d0b1dfa6102938a14783a369 SHA512 b3bc452c5aed3ca782f417d3f66e48530dc7183bb179cd394c5a81c0eb1b8fe1cd5b799db8147022a337022e9641fc2fa763525d96f0da48f0b1e24bb3870413 WHIRLPOOL 8392eae37d3f022542823952ad4f6adbe7661b2bf37cbf06af1c0f3b5c8e9ae9a2d16abb000581067f1aa75c3e7c041c0866eab78013e1d1b11c7d37b5086aa0
+EBUILD ecs-1.4.2-r2.ebuild 903 SHA256 8a1e38f2fa8062b351f2756f271dec539c636bfd5ef8cb02aa77054b1e2c5032 SHA512 6505f01ae81463a03d25c8d9b159ab590a2f496afd2ff5109c10b14734631d796d493e4e0327e5c20f5a19c33b0d74929038d6971e387c5b5677c71636a4a611 WHIRLPOOL 7a488b64de9c0bd940189191eb65bca171fbe7ff33da81d71eaef7a9761b3058006173d0fd7227d5890e36c45d794ba4a6e04571e099e8be366f6e04df05a362
+MISC ChangeLog 2677 SHA256 3c83af6399f1f13e686955112d7c78650e35d92a3198213418b089cfb78a8bd9 SHA512 45ea78ac2809f00532d4d7bd273b6c15b67490b8d3255db4d94f615ff14a51bf7fd45d70247f099c0072cbf61609545c6de3dcffdd90434d200b8362f8e71267 WHIRLPOOL 741855cc545261b1a4cad33f90abf052064da7ed3aede7663bb3d97004bd9ba3b46c13f89b8604efd034d16d8fbf9874bb96c0975394ff2e58b58a2087c35b0d
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUCyzwAAoJEKCEBkJ3xQHt/LQIAKNrLbLHJ0lRgNyRCxHSuuLw
+iTKr16K0tMJSvNTHxgnC+IcXlV7dUPHoAQNUxGYJhVkzE8LJBAgHmpT/Zq4k711M
+TquGCmkvgoMOG/xDPU52NDMzq+wa446ovnBTl3pEWWVRuXAdK9SR0ReHTX4Ztvn6
+xvz7euXnj7IO4+jLamnn0lbEYwZqw7a5nWAmeRxyNp5uuCPRX3R1sxLiwKBmN6Su
+DXy+9Di5IvhBD70LWAygOyYy9AttzhR9rDDQtcUMSS7PcqVHg/aAALkOR2gWtX/p
+l8maKtg3b4JSjOsoMEopbgMZ0rUHGFhSXwKzrFEaCfYyhttihVjZZO98zlGK4W0=
+=rh5m
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ecs/ecs-1.4.2-r2.ebuild b/dev-java/ecs/ecs-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..cdb381286fdc
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ecs-1.4.2-r2.ebuild,v 1.1 2014/09/06 15:48:59 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to generate markup language text such as HTML and XML"
+HOMEPAGE="http://jakarta.apache.org/ecs"
+SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/jakarta-regexp:1.3
+	dev-java/xerces:2"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso8859-1"
+JAVA_SRC_DIR="src/java"
+JAVA_GENTOO_CLASSPATH="xerces-2,jakarta-regexp-1.3"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -delete || die
+	epatch "${FILESDIR}"/${PV}*.patch
+}
diff --git a/dev-java/ecs/files/1.4.2-java7-enum.patch b/dev-java/ecs/files/1.4.2-java7-enum.patch
new file mode 100644
index 000000000000..08632aef8b9b
--- /dev/null
+++ b/dev-java/ecs/files/1.4.2-java7-enum.patch
@@ -0,0 +1,217 @@
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
+index 1138b28..85e7c42 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
+@@ -319,11 +319,11 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
+                 if(ce.getTagText() != null)
+                     out.write(ce.getTagText().getBytes(encoding));
+ 
+-                Enumeration enum = ce.registryList.elements();
++                Enumeration enumx = ce.registryList.elements();
+ 
+-                while(enum.hasMoreElements())
++                while(enumx.hasMoreElements())
+                 {
+-                    Object obj = ce.registry.get((String)enum.nextElement());
++                    Object obj = ce.registry.get((String)enumx.nextElement());
+                     if(obj instanceof GenericElement)
+                     {
+                         Element e = (Element)obj;
+@@ -435,10 +435,10 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
+             if(getTagText() != null)
+                 out.write(getTagText());
+ 
+-            Enumeration enum = registryList.elements();
+-			while(enum.hasMoreElements())
++            Enumeration enumx = registryList.elements();
++			while(enumx.hasMoreElements())
+ 			{
+-				Object obj = registry.get((String)enum.nextElement());
++				Object obj = registry.get((String)enumx.nextElement());
+ 				if(obj instanceof GenericElement)
+ 				{
+ 					Element e = (Element)obj;
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
+index 76eeac0..990e92e 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
+@@ -342,12 +342,12 @@ public abstract class ElementAttributes extends GenericElement implements Attrib
+         }
+         out.append(getElementType());
+ 
+-        Enumeration enum = getElementHashEntry().keys();
++        Enumeration enumx = getElementHashEntry().keys();
+         String value = null; // avoid creating a new string object on each pass through the loop
+ 
+-        while (enum.hasMoreElements())
++        while (enumx.hasMoreElements())
+         {
+-            String attr = (String) enum.nextElement();
++            String attr = (String) enumx.nextElement();
+             if(getAttributeFilterState())
+             {
+                 value = getAttributeFilter().process(getElementHashEntry().get(attr).toString());
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
+index dcd0db0..effcc0d 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
+@@ -118,10 +118,10 @@ public class RegexpFilter extends Hashtable implements Filter {
+         }
+         
+         String substituteIn = to_process;
+-        Enumeration enum = keys();
++        Enumeration enumx = keys();
+ 
+-        while (enum.hasMoreElements()) {
+-            RE r = (RE)enum.nextElement();
++        while (enumx.hasMoreElements()) {
++            RE r = (RE)enumx.nextElement();
+             String substitution = (String)get(r);
+             substituteIn = r.subst(substituteIn, substitution);
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
+index 2a30d8d..ac87ae9 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
+@@ -462,13 +462,13 @@ public class A extends MultiPartElement implements Printable, FocusEvents, Mouse
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof IMG )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
+index f8f71c2..a9c1f4a 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
+@@ -219,10 +219,10 @@ public class Select extends MultiPartElement implements
+ 
+     public Select selectOption(int option)
+     {
+-        Enumeration enum = keys();
+-        for(int x = 0; enum.hasMoreElements(); x++)
++        Enumeration enumx = keys();
++        for(int x = 0; enumx.hasMoreElements(); x++)
+         {
+-            ConcreteElement element = (ConcreteElement)getElement((String)enum.nextElement());
++            ConcreteElement element = (ConcreteElement)getElement((String)enumx.nextElement());
+             if(x == option)
+             {
+                 ((Option)element).setSelected(true);
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
+index 188d5f0..6737648 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
+@@ -468,13 +468,13 @@ public class TD extends MultiPartElement implements Printable, MouseEvents, KeyE
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof IMG || obj instanceof A )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
+index 42d57a7..cd842db 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
+@@ -158,12 +158,12 @@ public class TestBed2
+ 	
+ 	Menu menu3 = new Menu("true");
+ 	Prompt prompt2 = new Prompt("Welcome Home");
+-	Enumerate enum = new Enumerate();
+-	enum.addElement("For ");
+-	enum.addElement(new Value("_prompt"));
+-	enum.addElement(", press ");
+-	enum.addElement(new Value("_dtmf"));
+-	prompt2.addElement(enum);
++	Enumerate enumx = new Enumerate();
++	enumx.addElement("For ");
++	enumx.addElement(new Value("_prompt"));
++	enumx.addElement(", press ");
++	enumx.addElement(new Value("_dtmf"));
++	prompt2.addElement(enumx);
+ 	menu3.addElement(prompt2);
+ 	Choice choice1 = new Choice("http://www.sports.example/vxml/start.vxml");
+ 	Choice choice2 = new Choice("http://www.weather.example/intro.vxml");
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
+index 26add7f..1d0425a 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
+@@ -472,13 +472,13 @@ public class a extends MultiPartElement implements Printable, FocusEvents, Mouse
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof img )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
+index 8d96259..6bd4b45 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
+@@ -466,13 +466,13 @@ public class td extends MultiPartElement implements Printable, MouseEvents, KeyE
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof img || obj instanceof a )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
+index 1a03349..f6de10c 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
+@@ -193,13 +193,13 @@ public class XML extends MultiPartElement implements Printable
+     public boolean getNeedLineBreak() {
+         boolean linebreak = true;
+ 
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+ 
+         // if this tag has one child, and it's a String, then don't
+         // do any linebreaks to preserve whitespace
+ 
+-        while (enum.hasMoreElements()) {
+-            Object obj = enum.nextElement();
++        while (enumx.hasMoreElements()) {
++            Object obj = enumx.nextElement();
+             if (obj instanceof StringElement) {
+                  linebreak = false;
+                  break;