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

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

4 files changed, 90 insertions, 18 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/Manifest b/dev-java/xp/Manifest
index 470078ccd690..b12d7184ef0c 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.5-fix-jdk-1.7-enum.patch 1320 SHA256 0175fb1eb3b55b5c445a331a68c92ad326ccc6cf908939a265c4d7e83b0d2eaf SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14 WHIRLPOOL b83f3c750dcf2b7b48f3563312a804ee4c53738d7df2551c8903441184af1eaf7f83343d00af38bbc32eb2c1cb03a683a4523fa08203087983e8b8e61b2ea701
 AUX build.xml 261 SHA256 4ee82d7a9c569bf51fae490c90ecab7157e09eb30c30b1b4896126e0677978e2 SHA512 eda2307effbfe8fed1c9e9803ea8cce7ed00d0aa7c92189e69d0f9c9279ca747113416108e382f4b2b0a8cd171e76b91060ce160e5a85a3d4c77950667cefd23 WHIRLPOOL 9359199a912142d621ba0457e09343599fed81495061ce48db6380cf0ca1c77cabb0831708e123c57b70b673fd1f1e79f5f5272206ca0d67d01a401e7cdcc6b9
 DIST xp.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 EBUILD xp-0.5-r1.ebuild 850 SHA256 7ff26b23944f660367a3fc681ad4128953896a1692161ca6abf11fa673f05115 SHA512 92a2d030d2a6655c753e1a56b051681e7c809553addbad0a1942b90b2667a13ca75c93f8104a2e1f7d6c90037615f6dc945a60a3693f5d543af69c8256505369 WHIRLPOOL be17391e0ac94cb462d708e33a88e2e82b0f85af9c66bcf7aa730728e13ffed09ebc5a04a1e59803cc1de1aecb2593737ed39915a0603676d888d7fb52ad62be
-MISC ChangeLog 1512 SHA256 e4638d0a93a6ffab818ba0abe01213c1a3054d8d2ca4b81a6af6c1e1528924d4 SHA512 22fdd3c6c3806cb40fdcf9a386bd28a55bd51018554393e53fdf18af4e32879c65a367156c42d75902fccc473d1d903af22a2d8d7a8e4f971057d4865af9da3e WHIRLPOOL 4864f9b9993f065251255e9c1696f7663161a1c3c68e161bfaf3467d16eeb12d7530b52907a7101051a42e3a318714c36e0b9a1e9ad3b20ea247580ae223c7fd
+EBUILD xp-0.5-r2.ebuild 890 SHA256 026218e94e3f91e80b8a9994ce778678d5aede5362e6763ec8ef6c464752a318 SHA512 405f9bfb955a1f092af65f9e3e4c650f2bc87ea32619d224d0d4558deef6cbabfbd1b85057f7301d22cede0eaa287a40891c6b2edd066a031ca29337f91e6c0b WHIRLPOOL 805c2283c2e5047e4b19a0d262fb20fd1a73a2d9b5519ba730c1ca4274c9f4422cd7e672ada8250cffdf4c6be3e2358677c505c16cc617bb9e2ec5455e2e5ace
+MISC ChangeLog 1716 SHA256 931fb5f49ebe5e91462c6e5df5635534e7ea49b1207f62acac7c37c639e4e51f SHA512 4dfedcee6bda96d8537169f8eab2acb0ca8ae86a22c6add499fd73ef3fed727ac1e20cdabf464f8141a6572069bd14c4de20c739bbe733998403d45c8f88cbd5 WHIRLPOOL 5b2c5408938db8d38318059bbc50c47c29c0dbff62fd6035874b883bf067d77ceb5d26fe3491474865ca3cb53f4c936b8ca39ac866c85b26928f35e3b864fdaf
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpgl8AAoJEDxpGckxwJCBaaEP/1DG7mFC/32I/Etg9TN9rUyl
-uCerdHVi4mxaUXAcgkRJQOnVuXHYbzk8/Jil5Ry62i/CREPoqsBtn2uyen1IUJD+
-SwVP9i0/hzxxuGJz1khEDd3ob2Pt6BpB40n0xyo8QdF8tv8W/+1vpjGWEAR7rhAk
-2mS3ioaFXzXdBs63B0Qb7m00HctO4wIdFOrdayAxzjO+mTFknRuRSlT37IRN0bXA
-D9p0ndXMY8eH5AvyR1wlnHecxWMCNoujd5+UPjsXY7AiMlRu3B2vGtZ3A7jAQQVO
-2t+aLfJILpdaOZKWZwa5lLQZQOdU27mNgLQA3wXTvcT9Fjsn9Nps63IoIu2nnP0X
-jBypwm3OXPUadvIn/Kj3nSg4BISRTfNgier6r1wTK5au4RSeo9Q6u0Fgyw0dqzxo
-FNiJ5o5F0d238yAZeXYNlIcsUi7qNXktLkEp6Xk5WnNlo87JOziI1cJ4S9rcWoxp
-fu16gYyCFqn7iwrs5iPCcOKg7thAsEBQb88oCvN3zy2Cj61soZJVc8QdBFroQsla
-Nwe/uj5/cwjDuKbBYAVWgyx9MRV/pcqyb+o0q9Iqjbr/HVrjJZofpOomHYcky4pn
-T8te3r/UEmyI6s3XZ1Te3NvW5htFtTLV8JKvvTwWmP+oWivR/CLRS9o7WGchTYOE
-TF4TFueGjgdZ2OkstzuT
-=OBrE
+iQEcBAEBCAAGBQJTpS6SAAoJEKCEBkJ3xQHt3O4H/iPwMcWUvHd8qovXL2LwX3HM
+JMNGn7cji0MnMUI3F7EJRXZkLgAZJWdobopex1xyuWpcL67lFr3T0c0Pms0wt2P4
+ja4Eo2ywtHhBuhjilZekOLLA+WuQyMXhIeEK/dgb4DllG517AT6u8WzvXfmVsSVc
+sVs4wh9GkNbCeCAYLvI7t8MI+oxf3IgzU6U2hzgtTNTtIziWGlLkEJxT1Q+Bs49e
+GljV3Jju63HITlR0EvvC24m/Om6laMdvtvgz8o7SUqq/16g6TMJ/mXz7Ije5Jzid
+1FhsN11r8/FnR8RjwNQlJdbqb8wAATYgWj7T7aUShzo5ylOEiG78T1JlEVYp8iY=
+=waNO
 -----END PGP SIGNATURE-----
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
+}