4 files changed, 1 insertions, 159 deletions
diff --git a/dev-java/openjdk/openjdk-8.382_p05-r1.ebuild b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
index 4ffbf386f2c7..a0f00644cae2 100644
--- a/dev-java/openjdk/openjdk-8.382_p05-r1.ebuild
+++ b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
@@ -62,6 +62,7 @@ DEPEND="
 	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
 	)
 "
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
deleted file mode 100644
index ac8cfa2b4bc9..000000000000
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xalan:serializer:2.7.3"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
-HOMEPAGE="https://xalan.apache.org/"
-SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )"
-
-S="${WORKDIR}/xalan-j_${PV//./_}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
-
-JAVA_MAIN_CLASS="org.apache.xml.serializer.Version"
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# kill all non-serializer sources to ease javadocs and dosrc
-	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
-
-	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
-	mkdir -p resources || die
-	pushd src > /dev/null || die
-	find org -type f \
-		! -name '*.java' \
-		! -name 'Version.src' \
-		! -name 'package.html' \
-		| xargs cp --parent -t ../resources || die
-	popd > /dev/null || die
-}
diff --git a/dev-java/xalan/xalan-2.7.3.ebuild b/dev-java/xalan/xalan-2.7.3.ebuild
deleted file mode 100644
index 523e44d542b7..000000000000
--- a/dev-java/xalan/xalan-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xalan:xalan:2.7.3"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
-HOMEPAGE="https://xalan.apache.org/"
-SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )"
-
-S="${WORKDIR}/xalan-j_${PV//./_}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CP_DEPEND="
-	dev-java/bcel:0
-	dev-java/javacup:0
-	~dev-java/xalan-serializer-${PV}:${SLOT}
-	dev-java/xerces:2
-"
-
-DEPEND="${CP_DEPEND}
-	virtual/jdk:1.8"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
-
-JAVA_MAIN_CLASS="org.apache.xalan.xslt.Process"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# serializer is packaged separately
-	rm -r src/org/apache/xml/serializer || die "cannot remove serializer"
-}
diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild b/dev-java/xerces/xerces-2.12.2-r1.ebuild
deleted file mode 100644
index c74ab4cdedaa..000000000000
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.2"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
-	verify-sig? ( https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/xml-commons-external:1.4
-	dev-java/xml-commons-resolver:0"
-
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
-DEPEND="
-	${CP_DEPEND}
-	virtual/jdk:1.8"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xerces-j.apache.org.asc"
-
-DOCS=( LICENSE NOTICE README {LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
-HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
-
-S="${WORKDIR}/${P//./_}"
-
-JAVA_SRC_DIR="src"
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
-	mkdir -p "resources/META-INF/services"|| die
-	pushd "src" > /dev/null || die
-		find -type f \
-			\( -name 'javax.xml.*Factory' \
-			-or -name '*DOMImplementationSourceList' \
-			-or -name 'org.xml.sax.driver' \) \
-			| xargs mv -t ../resources/META-INF/services || die
-		find -type f \
-			! -name '*.java' \
-			! -name 'manifest.xerces' \
-			! -name 'package.html' \
-			! -name '*Configuration' \
-			! -name '*DOMImplementationSourceImpl' \
-			| xargs cp --parent -t ../resources || die
-	popd > /dev/null || die
-}