From 114672fc1bf0174a8ee16360e8de6b5a090c87de Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Fri, 26 Apr 2019 09:34:28 -0700
Subject: [PATCH] dev-java/xerces: clean up old

Closes: https://github.com/gentoo/gentoo/pull/11829
Bug: https://bugs.gentoo.org/683350
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 dev-java/xerces/Manifest                      |  1 -
 .../files/xerces-2.11.0-build.xml.patch       | 46 --------------
 dev-java/xerces/xerces-2.11.0-r2.ebuild       | 61 -------------------
 3 files changed, 108 deletions(-)
 delete mode 100644 dev-java/xerces/files/xerces-2.11.0-build.xml.patch
 delete mode 100644 dev-java/xerces/xerces-2.11.0-r2.ebuild

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 4c869cdd2417..ecb391145d4a 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
-DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
deleted file mode 100644
index 61afcddad9a4..000000000000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Don't reference non existing jar in taskdef. #351394
-Don't let user properties leak into build env.
-Don't bundle stuff from xml-commons-external.
-
---- a/build.xml
-+++ b/build.xml
-@@ -39,18 +39,13 @@ Authors:
-   <property name="tools.dir" value="./tools"/>
- 
-   <!-- enable compilation under JDK 1.4 and above -->
--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
--    <classpath>
--      <pathelement location="${tools.dir}/bin/xjavac.jar"/>
--    </classpath>
--  </taskdef>
-+  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
- 
-   <!-- Allow properties following these statements to be overridden -->
-   <!-- Note that all of these don't have to exist.  They've just been defined
-        incase they are used. -->
-   <property file="build.properties"/>
-   <property file=".ant.properties"/>
--  <property file="${user.home}/.ant.properties"/>
-   <property file="default.properties"/>  
-  
-   <target name="init">
-@@ -247,7 +242,7 @@ Authors:
-     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
-       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
- 
--    <!-- now deal with API's:  -->
-+    <!-- now deal with API's:
-     <unzip src="${src.apis.zip}" dest="${build.src}">
-         <patternset
-             includes="org/xml/sax/** 
-@@ -269,7 +264,7 @@ Authors:
-                 org/w3c/dom/views/**
-                 org/w3c/dom/xpath/**"
-         />
--    </unzip>
-+    </unzip>  -->
-     
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
diff --git a/dev-java/xerces/xerces-2.11.0-r2.ebuild b/dev-java/xerces/xerces-2.11.0-r2.ebuild
deleted file mode 100644
index e0289d295c87..000000000000
--- a/dev-java/xerces/xerces-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/xml-commons-external:1.4
-	>=dev-java/xml-commons-resolver-1.2:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	dev-java/xjavac:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE
-	dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/org
-}
-- 
2.26.2