commit: fa940fec362e6da2c159b59d70f9bd94ea17ff4b
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 10:19:11 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 10:21:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa940fec
dev-java/nanoxml: treeclean
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/nanoxml/Manifest | 1 -
dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch | 208 ---------------------
.../nanoxml/files/nanoxml-2.2.3-lite-enum.patch | 53 ------
dev-java/nanoxml/metadata.xml | 11 --
dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild | 45 -----
profiles/package.mask | 1 -
6 files changed, 319 deletions(-)
diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
deleted file mode 100644
index 56e112e3528b..000000000000
--- a/dev-java/nanoxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nanoxml-2.2.3.tar.gz 426111 BLAKE2B
ac9980502c8c6ec50c6aebd19c0d08319701a508eea2a58847b804dcb3a3a93ca8d41ee1f08f4ec48527e669fc1695ec945933688516775373458ac7b6564895
SHA512
6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
deleted file mode 100644
index f3992f845b85..000000000000
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- a/Sources/Java/net/n3/nanoxml/XMLElement.java.orig 2016-03-04
09:21:07.908000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/XMLElement.java 2016-03-04
09:35:16.283000000 +0000
-@@ -484,9 +484,9 @@
- * @return the child element, or null if no such child was found.
- */
- public IXMLElement getFirstChildNamed(String name) {
-- Enumeration enum = this.children.elements();
-- while (enum.hasMoreElements()) {
-- IXMLElement child = (IXMLElement) enum.nextElement();
-+ Enumeration myEnum = this.children.elements();
-+ while (myEnum.hasMoreElements()) {
-+ IXMLElement child = (IXMLElement) myEnum.nextElement();
- String childName = child.getFullName();
- if ((childName != null) && childName.equals(name)) {
- return child;
-@@ -506,9 +506,9 @@
- */
- public IXMLElement getFirstChildNamed(String name,
- String namespace) {
-- Enumeration enum = this.children.elements();
-- while (enum.hasMoreElements()) {
-- IXMLElement child = (IXMLElement) enum.nextElement();
-+ Enumeration myEnum = this.children.elements();
-+ while (myEnum.hasMoreElements()) {
-+ IXMLElement child = (IXMLElement) myEnum.nextElement();
- String str = child.getName();
- boolean found = (str != null) && (str.equals(name));
- str = child.getNamespace();
-@@ -534,9 +534,9 @@
- */
- public Vector getChildrenNamed(String name) {
- Vector result = new Vector(this.children.size());
-- Enumeration enum = this.children.elements();
-- while (enum.hasMoreElements()) {
-- IXMLElement child = (IXMLElement) enum.nextElement();
-+ Enumeration myEnum = this.children.elements();
-+ while (myEnum.hasMoreElements()) {
-+ IXMLElement child = (IXMLElement) myEnum.nextElement();
- String childName = child.getFullName();
- if ((childName != null) && childName.equals(name)) {
- result.addElement(child);
-@@ -557,9 +557,9 @@
- public Vector getChildrenNamed(String name,
- String namespace) {
- Vector result = new Vector(this.children.size());
-- Enumeration enum = this.children.elements();
-- while (enum.hasMoreElements()) {
-- IXMLElement child = (IXMLElement) enum.nextElement();
-+ Enumeration myEnum = this.children.elements();
-+ while (myEnum.hasMoreElements()) {
-+ IXMLElement child = (IXMLElement) myEnum.nextElement();
- String str = child.getName();
- boolean found = (str != null) && (str.equals(name));
- str = child.getNamespace();
-@@ -585,9 +585,9 @@
- * @return the attribute, or null if the attribute does not exist.
- */
- private XMLAttribute findAttribute(String fullName) {
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- if (attr.getFullName().equals(fullName)) {
- return attr;
- }
-@@ -606,9 +606,9 @@
- */
- private XMLAttribute findAttribute(String name,
- String namespace) {
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- boolean found = attr.getName().equals(name);
- if (namespace == null) {
- found &= (attr.getNamespace() == null);
-@@ -860,9 +860,9 @@
- */
- public Enumeration enumerateAttributeNames() {
- Vector result = new Vector();
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- result.addElement(attr.getFullName());
- }
- return result.elements();
-@@ -897,9 +897,9 @@
- */
- public Properties getAttributes() {
- Properties result = new Properties();
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- result.put(attr.getFullName(), attr.getValue());
- }
- return result;
-@@ -915,9 +915,9 @@
- */
- public Properties getAttributesInNamespace(String namespace) {
- Properties result = new Properties();
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- if (namespace == null) {
- if (attr.getNamespace() == null) {
- result.put(attr.getName(), attr.getValue());
-@@ -1007,9 +1007,9 @@
- if (this.attributes.size() != elt.getAttributeCount()) {
- return false;
- }
-- Enumeration enum = this.attributes.elements();
-- while (enum.hasMoreElements()) {
-- XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+ Enumeration myEnum = this.attributes.elements();
-+ while (myEnum.hasMoreElements()) {
-+ XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
- if (! elt.hasAttribute(attr.getName(), attr.getNamespace())) {
- return false;
- }
---- a/Sources/Java/net/n3/nanoxml/NonValidator.java.orig 2016-03-04
09:36:05.247000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/NonValidator.java 2016-03-04
09:36:25.195000000 +0000
-@@ -587,10 +587,10 @@
- int lineNr)
- {
- Properties props = (Properties) this.currentElements.pop();
-- Enumeration enum = props.keys();
-+ Enumeration myEnum = props.keys();
-
-- while (enum.hasMoreElements()) {
-- String key = (String) enum.nextElement();
-+ while (myEnum.hasMoreElements()) {
-+ String key = (String) myEnum.nextElement();
- extraAttributes.put(key, props.get(key));
- }
- }
---- a/Sources/Java/net/n3/nanoxml/XMLWriter.java.orig 2016-03-04
09:36:53.616000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/XMLWriter.java 2016-03-04
09:38:11.868000000 +0000
-@@ -182,10 +182,10 @@
- }
- }
-
-- Enumeration enum = xml.enumerateAttributeNames();
-+ Enumeration myEnum = xml.enumerateAttributeNames();
-
-- while (enum.hasMoreElements()) {
-- String key = (String) enum.nextElement();
-+ while (myEnum.hasMoreElements()) {
-+ String key = (String) myEnum.nextElement();
- int index = key.indexOf(':');
-
- if (index >= 0) {
-@@ -203,10 +203,10 @@
- }
- }
-
-- enum = xml.enumerateAttributeNames();
-+ myEnum = xml.enumerateAttributeNames();
-
-- while (enum.hasMoreElements()) {
-- String key = (String) enum.nextElement();
-+ while (myEnum.hasMoreElements()) {
-+ String key = (String) myEnum.nextElement();
- String value = xml.getAttribute(key, null);
- this.writer.print(" " + key + "=\"");
- this.writeEncoded(value);
-@@ -229,10 +229,10 @@
- writer.println();
- }
-
-- enum = xml.enumerateChildren();
-+ myEnum = xml.enumerateChildren();
-
-- while (enum.hasMoreElements()) {
-- IXMLElement child = (IXMLElement) enum.nextElement();
-+ while (myEnum.hasMoreElements()) {
-+ IXMLElement child = (IXMLElement) myEnum.nextElement();
- this.write(child, prettyPrint, indent + 4,
- collapseEmptyElements);
- }
---- a/Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig 2016-03-04
09:38:44.521000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/StdXMLParser.java 2016-03-04
09:39:08.028000000 +0000
-@@ -492,10 +492,10 @@
- extraAttributes,
- this.reader.getSystemID(),
- this.reader.getLineNr());
-- Enumeration enum = extraAttributes.keys();
-+ Enumeration myEnum = extraAttributes.keys();
-
-- while (enum.hasMoreElements()) {
-- String key = (String) enum.nextElement();
-+ while (myEnum.hasMoreElements()) {
-+ String key = (String) myEnum.nextElement();
- String value = extraAttributes.getProperty(key);
- attrNames.addElement(key);
- attrValues.addElement(value);
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
deleted file mode 100644
index 602cd9f87909..000000000000
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/Sources/Lite/nanoxml/XMLElement.java.orig 2016-03-04
09:16:52.339000000 +0000
-+++ a/Sources/Lite/nanoxml/XMLElement.java 2016-03-04 09:19:03.213000000
+0000
-@@ -63,8 +63,8 @@
- * The following example shows how to list the attributes of an element:
- * <UL><CODE>
- * XMLElement element = ...;<BR>
-- * Enumeration enum = element.getAttributeNames();<BR>
-- * while (enum.hasMoreElements()) {<BR>
-+ * Enumeration myEnum = element.getAttributeNames();<BR>
-+ * while (myEnum.hasMoreElements()) {<BR>
- * String key = (String) enum.nextElement();<BR>
- * String value = element.getStringAttribute(key);<BR>
- * System.out.println(key + " = " + value);<BR>
-@@ -478,9 +478,9 @@
- this.children = new Vector();
- this.entities = entities;
- this.lineNr = 0;
-- Enumeration enum = this.entities.keys();
-- while (enum.hasMoreElements()) {
-- Object key = enum.nextElement();
-+ Enumeration myEnum = this.entities.keys();
-+ while (myEnum.hasMoreElements()) {
-+ Object key = myEnum.nextElement();
- Object value = this.entities.get(key);
- if (value instanceof String) {
- value = ((String) value).toCharArray();
-@@ -2168,10 +2168,10 @@
- writer.write('<');
- writer.write(this.name);
- if (! this.attributes.isEmpty()) {
-- Enumeration enum = this.attributes.keys();
-- while (enum.hasMoreElements()) {
-+ Enumeration myEnum = this.attributes.keys();
-+ while (myEnum.hasMoreElements()) {
- writer.write(' ');
-- String key = (String) enum.nextElement();
-+ String key = (String) myEnum.nextElement();
- String value = (String) this.attributes.get(key);
- writer.write(key);
- writer.write('='); writer.write('"');
-@@ -2189,9 +2189,9 @@
- writer.write('/'); writer.write('>');
- } else {
- writer.write('>');
-- Enumeration enum = this.enumerateChildren();
-- while (enum.hasMoreElements()) {
-- XMLElement child = (XMLElement) enum.nextElement();
-+ Enumeration myEnum = this.enumerateChildren();
-+ while (myEnum.hasMoreElements()) {
-+ XMLElement child = (XMLElement) myEnum.nextElement();
- child.write(writer);
- }
- writer.write('<'); writer.write('/');
diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/nanoxml/metadata.xml
deleted file mode 100644
index d2350524ebbd..000000000000
--- a/dev-java/nanoxml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>j...@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">nanoxml</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
deleted file mode 100644
index fb78db838106..000000000000
--- a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-MY_P="NanoXML-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="NanoXML is a small non-validating parser for Java"
-HOMEPAGE="http://nanoxml.sourceforge.net/";
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/${MY_P}.tar.gz/357c7136417ea996cf714278ea84f2df/${MY_P}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-CDEPEND="dev-java/sax:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="sax"
-
-JAVA_SRC_DIR="Sources"
-
-PATCHES=(
- "${FILESDIR}"/"${P}-lite-enum.patch"
- "${FILESDIR}"/"${P}-enum.patch"
-)
-
-src_prepare() {
- default
- java-pkg_clean
- rm -rf Test || die
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 6dad550d9ebf..c44e9aeb4485 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -180,7 +180,6 @@ dev-java/glassfish-transaction-api
dev-java/jnlp-api
dev-java/kxml
dev-java/myfaces-builder-annotations
-dev-java/nanoxml
# James Beddek <tel...@posteo.de> (2022-01-19)
# FFmpeg 5.0 ABI/API changes break many packages.
