From 76bb4b4dec50d740c75a1fda415c975307d22eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org>
Date: Fri, 12 Mar 2021 11:20:50 +0100
Subject: [PATCH] dev-java/xpp2: eapi7, min jdk/jre 1.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 .../xpp2/files/xpp2-2.1.10-fix-java5+.patch     | 17 +++++++++++++++++
 ...2-2.1.10-r2.ebuild => xpp2-2.1.10-r3.ebuild} | 14 ++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch
 rename dev-java/xpp2/{xpp2-2.1.10-r2.ebuild => xpp2-2.1.10-r3.ebuild} (92%)

diff --git a/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch
new file mode 100644
index 0000000000000..883bf5fa2d9a9
--- /dev/null
+++ b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch
@@ -0,0 +1,17 @@
+diff --git a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
+index 7c66608..6c128e9 100644
+--- a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
++++ b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
+@@ -273,9 +273,9 @@ public class Node extends StartTag implements XmlNode {
+         oneChild = null;
+ 
+         if(children != null && children.size() > 0) {
+-            Enumeration enum = children.elements();
+-            while (enum.hasMoreElements()) {
+-                Object child = enum.nextElement();
++            Enumeration elements = children.elements();
++            while (elements.hasMoreElements()) {
++                Object child = elements.nextElement();
+                 if(child instanceof XmlNode) {
+                     ((XmlNode)child).setParentNode(null);
+                 }
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
similarity index 92%
rename from dev-java/xpp2/xpp2-2.1.10-r2.ebuild
rename to dev-java/xpp2/xpp2-2.1.10-r3.ebuild
index bb124374b5c72..db77c7e64ae02 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -23,21 +23,27 @@ IUSE="test"
 RESTRICT="test"
 
 CDEPEND="dev-java/xerces:2"
-DEPEND=">=virtual/jdk-1.3
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )
 	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.3
+RDEPEND=">=virtual/jre-1.8:*
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-java5+.patch"
+)
+
 EANT_GENTOO_CLASSPATH="xerces-2"
 EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
 EANT_BUILD_TARGET="intf intf_jar impl x2impl"
 EANT_DOC_TARGET="api"
 EANT_TEST_TARGET="junit"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	rm -r build/ lib/ || die
 
 	# Our usual rewriting stomps over the existing classpath, which