EAPI bump; ebuild QA; fixed compilation error with jdk 1.7 (#514070)

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

3 files changed, 79 insertions, 3 deletions

diff --git a/dev-java/xp/ChangeLog b/dev-java/xp/ChangeLog
index cd0e66ccae9b..1cc227351735 100644
--- a/dev-java/xp/ChangeLog
+++ b/dev-java/xp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xp/ChangeLog,v 1.11 2012/11/16 09:37:10 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xp/ChangeLog,v 1.12 2014/06/21 07:04:40 ercpe Exp $
+
+*xp-0.5-r2 (21 Jun 2014)
+
+  21 Jun 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/0.5-fix-jdk-1.7-enum.patch, +xp-0.5-r2.ebuild:
+  EAPI bump; ebuild QA; fixed compilation error with jdk 1.7 (#514070)
 
   16 Nov 2012; Ulrich Müller <ulm@gentoo.org> xp-0.5-r1.ebuild:
   Update LICENSE, this is exactly the MIT/X11 license, only with different
@@ -40,4 +46,3 @@
   14 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +files/build.xml,
   +xp-0.5.ebuild:
   initial import, submitted by Jan Brinkmann <lucky@the-luckyduck.de>
-
diff --git a/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..d2c11ab3ed59
--- /dev/null
+++ b/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
@@ -0,0 +1,30 @@
+diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
+index 2b0d90a..d1efd3e 100644
+--- a/com/jclark/xml/sax/Driver.java
++++ b/com/jclark/xml/sax/Driver.java
+@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
+ 

+     DTD dtd = event.getDTD();

+ 

+-    for (Enumeration enum = dtd.entityNames(DTD.NOTATION);

+-	 enum.hasMoreElements(); ) {

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

++    for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);

++	 enumx.hasMoreElements(); ) {

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

+       Entity entity = dtd.getEntity(DTD.NOTATION, name);

+       String systemId = entity.getSystemId();

+       if (systemId != null) {

+@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
+       }

+       dtdHandler.notationDecl(name, entity.getPublicId(), systemId);

+     }

+-    for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);

+-	 enum.hasMoreElements();) {

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

++    for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);

++	 enumx.hasMoreElements();) {

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

+       Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);

+       String notationName = entity.getNotationName();

+       if (notationName != null) {

diff --git a/dev-java/xp/xp-0.5-r2.ebuild b/dev-java/xp/xp-0.5-r2.ebuild
new file mode 100644
index 000000000000..1ee9a8c140d8
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xp/xp-0.5-r2.ebuild,v 1.1 2014/06/21 07:04:40 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp"
+SRC_URI="ftp://ftp.jclark.com/pub/xml/xp.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm -v xp.jar || die
+	cp "${FILESDIR}/build.xml" . || die
+	epatch "${FILESDIR}"/${PV}-*.patch
+}
+
+#premade javadocs
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar xp.jar
+	dodoc docs/copying.txt
+	#has index.html and javadocs here
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc com
+}