* [gentoo-commits] repo/gentoo:master commit in: dev-java/ecs/, profiles/, dev-java/ecs/files/
@ 2021-11-21 8:12 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2021-11-21 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 3d4125b8e0f606ea42539bfdfc0a01a6721d7c11
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 08:05:44 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 08:11:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4125b8
dev-java/ecs: treeclean
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ecs/Manifest | 1 -
dev-java/ecs/ecs-1.4.2-r2.ebuild | 42 -----
dev-java/ecs/files/ecs-1.4.2-java7-enum.patch | 217 --------------------------
dev-java/ecs/metadata.xml | 8 -
profiles/package.mask | 1 -
5 files changed, 269 deletions(-)
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
deleted file mode 100644
index b235ca268c56..000000000000
--- a/dev-java/ecs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ecs-1.4.2-src.tar.gz 3435157 BLAKE2B 97719b74c6bda1cbd785f0045aa7686d61e99ef407e2268071f79586f86002f574e9ebfa14f4ec4f053fbc3aa14099b6fe552387bfe5dcbf4ab653ee73135337 SHA512 b7004f9364a24dd9ec8f963f69279471cc2e39fdc81d1c97dc4881cf65ee16f5f4342129b7bdda12994b69edff23944cb12f5d4b4ec140bf962e3a4f9f4e1bb4
diff --git a/dev-java/ecs/ecs-1.4.2-r2.ebuild b/dev-java/ecs/ecs-1.4.2-r2.ebuild
deleted file mode 100644
index 01ab7de4e5d9..000000000000
--- a/dev-java/ecs/ecs-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library to generate markup language text such as HTML and XML"
-HOMEPAGE="https://jakarta.apache.org/ecs"
-SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
- dev-java/xerces:2
- dev-java/jakarta-regexp:1.3"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- source? ( app-arch/zip )
- >=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="ISO8859-1"
-JAVA_SRC_DIR="src/java"
-
-JAVA_GENTOO_CLASSPATH="xerces-2,jakarta-regexp-1.3"
-
-java_prepare() {
- java-pkg_clean
- epatch "${FILESDIR}"/${P}-java7-enum.patch
-}
diff --git a/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch b/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch
deleted file mode 100644
index 08632aef8b9b..000000000000
--- a/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
-index 1138b28..85e7c42 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
-@@ -319,11 +319,11 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
- if(ce.getTagText() != null)
- out.write(ce.getTagText().getBytes(encoding));
-
-- Enumeration enum = ce.registryList.elements();
-+ Enumeration enumx = ce.registryList.elements();
-
-- while(enum.hasMoreElements())
-+ while(enumx.hasMoreElements())
- {
-- Object obj = ce.registry.get((String)enum.nextElement());
-+ Object obj = ce.registry.get((String)enumx.nextElement());
- if(obj instanceof GenericElement)
- {
- Element e = (Element)obj;
-@@ -435,10 +435,10 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
- if(getTagText() != null)
- out.write(getTagText());
-
-- Enumeration enum = registryList.elements();
-- while(enum.hasMoreElements())
-+ Enumeration enumx = registryList.elements();
-+ while(enumx.hasMoreElements())
- {
-- Object obj = registry.get((String)enum.nextElement());
-+ Object obj = registry.get((String)enumx.nextElement());
- if(obj instanceof GenericElement)
- {
- Element e = (Element)obj;
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
-index 76eeac0..990e92e 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
-@@ -342,12 +342,12 @@ public abstract class ElementAttributes extends GenericElement implements Attrib
- }
- out.append(getElementType());
-
-- Enumeration enum = getElementHashEntry().keys();
-+ Enumeration enumx = getElementHashEntry().keys();
- String value = null; // avoid creating a new string object on each pass through the loop
-
-- while (enum.hasMoreElements())
-+ while (enumx.hasMoreElements())
- {
-- String attr = (String) enum.nextElement();
-+ String attr = (String) enumx.nextElement();
- if(getAttributeFilterState())
- {
- value = getAttributeFilter().process(getElementHashEntry().get(attr).toString());
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
-index dcd0db0..effcc0d 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
-@@ -118,10 +118,10 @@ public class RegexpFilter extends Hashtable implements Filter {
- }
-
- String substituteIn = to_process;
-- Enumeration enum = keys();
-+ Enumeration enumx = keys();
-
-- while (enum.hasMoreElements()) {
-- RE r = (RE)enum.nextElement();
-+ while (enumx.hasMoreElements()) {
-+ RE r = (RE)enumx.nextElement();
- String substitution = (String)get(r);
- substituteIn = r.subst(substituteIn, substitution);
- }
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
-index 2a30d8d..ac87ae9 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
-@@ -462,13 +462,13 @@ public class A extends MultiPartElement implements Printable, FocusEvents, Mouse
- */
- public boolean getNeedLineBreak()
- {
-- java.util.Enumeration enum = elements();
-+ java.util.Enumeration enumx = elements();
- int i=0;
- int j=0;
-- while(enum.hasMoreElements())
-+ while(enumx.hasMoreElements())
- {
- j++;
-- Object obj = enum.nextElement();
-+ Object obj = enumx.nextElement();
- if( obj instanceof IMG )
- i++;
- }
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
-index f8f71c2..a9c1f4a 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
-@@ -219,10 +219,10 @@ public class Select extends MultiPartElement implements
-
- public Select selectOption(int option)
- {
-- Enumeration enum = keys();
-- for(int x = 0; enum.hasMoreElements(); x++)
-+ Enumeration enumx = keys();
-+ for(int x = 0; enumx.hasMoreElements(); x++)
- {
-- ConcreteElement element = (ConcreteElement)getElement((String)enum.nextElement());
-+ ConcreteElement element = (ConcreteElement)getElement((String)enumx.nextElement());
- if(x == option)
- {
- ((Option)element).setSelected(true);
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
-index 188d5f0..6737648 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
-@@ -468,13 +468,13 @@ public class TD extends MultiPartElement implements Printable, MouseEvents, KeyE
- */
- public boolean getNeedLineBreak()
- {
-- java.util.Enumeration enum = elements();
-+ java.util.Enumeration enumx = elements();
- int i=0;
- int j=0;
-- while(enum.hasMoreElements())
-+ while(enumx.hasMoreElements())
- {
- j++;
-- Object obj = enum.nextElement();
-+ Object obj = enumx.nextElement();
- if( obj instanceof IMG || obj instanceof A )
- i++;
- }
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
-index 42d57a7..cd842db 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
-@@ -158,12 +158,12 @@ public class TestBed2
-
- Menu menu3 = new Menu("true");
- Prompt prompt2 = new Prompt("Welcome Home");
-- Enumerate enum = new Enumerate();
-- enum.addElement("For ");
-- enum.addElement(new Value("_prompt"));
-- enum.addElement(", press ");
-- enum.addElement(new Value("_dtmf"));
-- prompt2.addElement(enum);
-+ Enumerate enumx = new Enumerate();
-+ enumx.addElement("For ");
-+ enumx.addElement(new Value("_prompt"));
-+ enumx.addElement(", press ");
-+ enumx.addElement(new Value("_dtmf"));
-+ prompt2.addElement(enumx);
- menu3.addElement(prompt2);
- Choice choice1 = new Choice("http://www.sports.example/vxml/start.vxml");
- Choice choice2 = new Choice("http://www.weather.example/intro.vxml");
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
-index 26add7f..1d0425a 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
-@@ -472,13 +472,13 @@ public class a extends MultiPartElement implements Printable, FocusEvents, Mouse
- */
- public boolean getNeedLineBreak()
- {
-- java.util.Enumeration enum = elements();
-+ java.util.Enumeration enumx = elements();
- int i=0;
- int j=0;
-- while(enum.hasMoreElements())
-+ while(enumx.hasMoreElements())
- {
- j++;
-- Object obj = enum.nextElement();
-+ Object obj = enumx.nextElement();
- if( obj instanceof img )
- i++;
- }
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
-index 8d96259..6bd4b45 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
-@@ -466,13 +466,13 @@ public class td extends MultiPartElement implements Printable, MouseEvents, KeyE
- */
- public boolean getNeedLineBreak()
- {
-- java.util.Enumeration enum = elements();
-+ java.util.Enumeration enumx = elements();
- int i=0;
- int j=0;
-- while(enum.hasMoreElements())
-+ while(enumx.hasMoreElements())
- {
- j++;
-- Object obj = enum.nextElement();
-+ Object obj = enumx.nextElement();
- if( obj instanceof img || obj instanceof a )
- i++;
- }
-diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
-index 1a03349..f6de10c 100644
---- a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
-+++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
-@@ -193,13 +193,13 @@ public class XML extends MultiPartElement implements Printable
- public boolean getNeedLineBreak() {
- boolean linebreak = true;
-
-- java.util.Enumeration enum = elements();
-+ java.util.Enumeration enumx = elements();
-
- // if this tag has one child, and it's a String, then don't
- // do any linebreaks to preserve whitespace
-
-- while (enum.hasMoreElements()) {
-- Object obj = enum.nextElement();
-+ while (enumx.hasMoreElements()) {
-+ Object obj = enumx.nextElement();
- if (obj instanceof StringElement) {
- linebreak = false;
- break;
diff --git a/dev-java/ecs/metadata.xml b/dev-java/ecs/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/ecs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index ea6a8dcf896f..b29a3242657a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -395,7 +395,6 @@ dev-java/commons-primitives
dev-java/constantine
dev-java/disruptor
dev-java/dynalang
-dev-java/ecs
# Sergey Popov <pinkbyte@gentoo.org> (2021-10-22)
# Upstream support discontinued, see https://bw.org/2019/03/19/bw-whois/
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-21 8:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-21 8:12 [gentoo-commits] repo/gentoo:master commit in: dev-java/ecs/, profiles/, dev-java/ecs/files/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox