Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/xp/files/, dev-java/xp/
Date: Fri, 19 Feb 2016 20:07:32
Message-Id: 1455912283.3d43557288bdb9311b5dc3a920714981b493267f.monsieurp@gentoo
1 commit: 3d43557288bdb9311b5dc3a920714981b493267f
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 19 15:52:36 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 19 20:04:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d435572
7
8 dev-java/xp: Switch to java-pkg-simple.
9
10 Package-Manager: portage-2.2.26
11
12 dev-java/xp/Manifest | 1 +
13 dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch | 30 +++++++++++++++++++++
14 dev-java/xp/xp-0.5-r3.ebuild | 36 +++++++++++++++++++++++++
15 3 files changed, 67 insertions(+)
16
17 diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
18 index 7c79dc5..b557fa2 100644
19 --- a/dev-java/xp/Manifest
20 +++ b/dev-java/xp/Manifest
21 @@ -1 +1,2 @@
22 +DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
23 DIST xp.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
24
25 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
26 new file mode 100644
27 index 0000000..d2c11ab
28 --- /dev/null
29 +++ b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
30 @@ -0,0 +1,30 @@
31 +diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
32 +index 2b0d90a..d1efd3e 100644
33 +--- a/com/jclark/xml/sax/Driver.java
34 ++++ b/com/jclark/xml/sax/Driver.java
35 +@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
36 +
37 + DTD dtd = event.getDTD();
38 +
39 +- for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
40 +- enum.hasMoreElements(); ) {
41 +- String name = (String)enum.nextElement();
42 ++ for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
43 ++ enumx.hasMoreElements(); ) {
44 ++ String name = (String)enumx.nextElement();
45 + Entity entity = dtd.getEntity(DTD.NOTATION, name);
46 + String systemId = entity.getSystemId();
47 + if (systemId != null) {
48 +@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
49 + }
50 + dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
51 + }
52 +- for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
53 +- enum.hasMoreElements();) {
54 +- String name = (String)enum.nextElement();
55 ++ for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
56 ++ enumx.hasMoreElements();) {
57 ++ String name = (String)enumx.nextElement();
58 + Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
59 + String notationName = entity.getNotationName();
60 + if (notationName != null) {
61
62 diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
63 new file mode 100644
64 index 0000000..c1e0a46
65 --- /dev/null
66 +++ b/dev-java/xp/xp-0.5-r3.ebuild
67 @@ -0,0 +1,36 @@
68 +# Copyright 1999-2016 Gentoo Foundation
69 +# Distributed under the terms of the GNU General Public License v2
70 +# $Id$
71 +
72 +EAPI=5
73 +
74 +JAVA_PKG_IUSE="doc source"
75 +
76 +inherit java-pkg-2 java-pkg-simple
77 +
78 +DESCRIPTION="XP is an XML 1.0 parser written in Java"
79 +HOMEPAGE="http://www.jclark.com/xml/xp"
80 +SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
81 +
82 +LICENSE="MIT"
83 +SLOT="0"
84 +KEYWORDS="~amd64 ~x86"
85 +IUSE=""
86 +
87 +RDEPEND="
88 + >=virtual/jre-1.6"
89 +
90 +DEPEND="
91 + >=virtual/jdk-1.6
92 + app-arch/unzip"
93 +
94 +S="${WORKDIR}"
95 +
96 +PATCHES=(
97 + "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
98 +)
99 +
100 +java_prepare() {
101 + java-pkg_clean
102 + epatch "${PATCHES[@]}"
103 +}