dev-java/xp: Switch to java-pkg-simple.

Package-Manager: portage-2.2.26

diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 7c79dc5ee865179ccdb7e4a37dcd1d88ad62d2dc..b557fa2fbc7624fdb7a61db919be6ebbc382c971 100644 (file)
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1 +1,2 @@
+DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 DIST xp.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5

diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
new file mode 100644 (file)
index 0000000..d2c11ab
--- /dev/null
+++ b/dev-java/xp/files/xp-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
+ \r
+     DTD dtd = event.getDTD();\r
+ \r
+-    for (Enumeration enum = dtd.entityNames(DTD.NOTATION);\r
+-       enum.hasMoreElements(); ) {\r
+-      String name = (String)enum.nextElement();\r
++    for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);\r
++       enumx.hasMoreElements(); ) {\r
++      String name = (String)enumx.nextElement();\r
+       Entity entity = dtd.getEntity(DTD.NOTATION, name);\r
+       String systemId = entity.getSystemId();\r
+       if (systemId != null) {\r
+@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
+       }\r
+       dtdHandler.notationDecl(name, entity.getPublicId(), systemId);\r
+     }\r
+-    for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);\r
+-       enum.hasMoreElements();) {\r
+-      String name = (String)enum.nextElement();\r
++    for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);\r
++       enumx.hasMoreElements();) {\r
++      String name = (String)enumx.nextElement();\r
+       Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);\r
+       String notationName = entity.getNotationName();\r
+       if (notationName != null) {\r

diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
new file mode 100644 (file)
index 0000000..c1e0a46
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+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/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+       >=virtual/jre-1.6"
+
+DEPEND="
+       >=virtual/jdk-1.6
+       app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+       "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+java_prepare() {
+       java-pkg_clean
+       epatch "${PATCHES[@]}"
+}