Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-27 01:37:59 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-27 01:37:59 +0000
commit: 4b2d3221bbd9baa6c4b176719b4513c592765867 (patch)
tree: 8cad62399a59b2a751dccc322d97924e9275fc0b /dev-java
parent: 4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3 (diff)
download: baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.tar.gz
baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.tar.xz
baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.zip
218 files changed, 0 insertions, 7982 deletions
diff --git a/dev-java/boilerpipe/Manifest b/dev-java/boilerpipe/Manifest
deleted file mode 100644
index 79622e97abf5..000000000000
--- a/dev-java/boilerpipe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST boilerpipe-1.2.0-src.tar.gz 46279 BLAKE2B 21e146bc772b6025dd22939fab64777bbbb55b3016ccb9627dfb7c1c4d3eb2fd61243aae2e22cd973e77a11eccba45b9a5837f08db265edb703779a46f08abe3 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6
diff --git a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
deleted file mode 100644
index 3ec2b0f9e9a7..000000000000
--- a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Boilerplate Removal and Fulltext Extraction from HTML pages"
-HOMEPAGE="https://github.com/kohlschutter/boilerpipe"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/xerces:2
-	dev-java/nekohtml:0"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="jars"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xerces-2,nekohtml"
-
-java_prepare() {
-	mkdir "${S}"/lib || die
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
deleted file mode 100644
index e9e7ae84cbc4..000000000000
--- a/dev-java/boilerpipe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
-  <remote-id type="github">kohlschutter/boilerpipe</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
deleted file mode 100644
index 3e7dbc3b33f0..000000000000
--- a/dev-java/commons-el/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
deleted file mode 100644
index 931d642c470b..000000000000
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit epatch java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache"
-HOMEPAGE="http://commons.apache.org/el/"
-SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-COMMON_DEP="
-	java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-java-1.7-compiler.patch # BGO 486376
-	# Build.xml is broken, fix it
-	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="servlet-api-2.5"
-EANT_EXTRA_ARGS="
-	-Dservletapi.build.notrequired=true
-	-Djspapi.build.notrequired=true"
-
-src_install() {
-	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \
-		"Apache Commons EL"
-
-	dodoc LICENSE.txt RELEASE-NOTES.txt
-	dohtml STATUS.html PROPOSAL.html
-
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
deleted file mode 100644
index 60f94c512a46..000000000000
--- a/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/java/org/apache/commons/el/parser/ELParser.java.orig	2003-03-30 20:17:07.000000000 -0500
-+++ ./src/java/org/apache/commons/el/parser/ELParser.java	2013-10-13 14:55:24.277749201 -0400
-@@ -1838,8 +1838,8 @@
-         jj_expentry[i] = jj_lasttokens[i];
-       }
-       boolean exists = false;
--      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
--        int[] oldentry = (int[])(enum.nextElement());
-+      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
-+        int[] oldentry = (int[])(enumx.nextElement());
-         if (oldentry.length == jj_expentry.length) {
-           exists = true;
-           for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/dev-java/commons-el/files/commons-el-1.0-manifest b/dev-java/commons-el/files/commons-el-1.0-manifest
deleted file mode 100644
index 86777e8ec2f7..000000000000
--- a/dev-java/commons-el/files/commons-el-1.0-manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.apache.commons.el
-Bundle-Version: 1.0
-Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commons.el.parser;version="1.0.0"
-Import-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.jsp;version="2.0",
- javax.servlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version="2.0",
- javax.servlet.jsp.tagext;version="2.0",javax.servlet.resources;version="2.4"
diff --git a/dev-java/commons-el/metadata.xml b/dev-java/commons-el/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/commons-el/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
deleted file mode 100644
index ae59a3969a54..000000000000
--- a/dev-java/commons-fileupload/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-fileupload-1.3-src.tar.gz 137105 BLAKE2B bfb5a4604aa69d8490fb1e661d0f82c0851ac9281e8e0e43a2e5d68b9cb330556a8df9f67fe9c2b5eaa1f9b871b3fde2b9a8064f94d6d55f7d13f64d5150bce9 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
deleted file mode 100644
index b5ddf03cb6a9..000000000000
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance file upload capability to your servlets and web applications"
-HOMEPAGE="http://commons.apache.org/fileupload/"
-SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-io:1
-	dev-java/portletapi:1
-	java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	epatch "${FILESDIR}"/0001-Remove-bogous-manifest-entry.patch
-	epatch "${FILESDIR}"/0002-Fix-running-tests.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="commons-io-1,portletapi-1,servlet-api-2.5"
-EANT_EXTRA_ARGS="-Dlibdir=target/lib"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}-SNAPSHOT.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
deleted file mode 100644
index 0c5be867489d..000000000000
--- a/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 88920db784bbb37c1043371548642a9ad529d600 Mon Sep 17 00:00:00 2001
-From: Ralph Sennhauser <sera@gentoo.org>
-Date: Sat, 20 Apr 2013 09:51:46 +0200
-Subject: [PATCH 1/2] Remove bogous manifest entry
-
----
- build.xml | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index b207f76..1e18fec 100644
---- a/build.xml
-+++ b/build.xml
-@@ -252,12 +252,8 @@
-     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-          compress="true" 
-          index="false" 
--         manifest="${commons.manifestfile}" 
-          basedir="${maven.build.outputDir}" 
-          excludes="**/package.html">
--      <manifest>
--        <attribute name="Main-Class"/>
--      </manifest>
-     </jar>
-   </target>
- 
--- 
-1.8.1.5
-
diff --git a/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
deleted file mode 100644
index 0eb41212cd29..000000000000
--- a/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec99347a09caeae147c075813543fc839d5b4562 Mon Sep 17 00:00:00 2001
-From: Ralph Sennhauser <sera@gentoo.org>
-Date: Sat, 20 Apr 2013 09:57:06 +0200
-Subject: [PATCH 2/2] Fix running tests
-
----
- build.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index 1e18fec..947f325 100644
---- a/build.xml
-+++ b/build.xml
-@@ -172,6 +172,8 @@
-           <include name="**/*Test.java"/>
-           <include name="**/*TestCase.java"/>
-           <exclude name="**/*Abstract*Test.java"/>
-+	  <!-- base class without tests violationg naming scheme -->
-+          <exclude name="**/FileUploadTestCase.java"/>
-         </fileset>
-       </batchtest>
-       <batchtest todir="${maven.test.reports}" if="test">
--- 
-1.8.1.5
-
diff --git a/dev-java/commons-fileupload/metadata.xml b/dev-java/commons-fileupload/metadata.xml
deleted file mode 100644
index 7cea1351118f..000000000000
--- a/dev-java/commons-fileupload/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-		The Commons FileUpload package makes it easy to add robust,
-		high-performance, file upload capability to your servlets and web
-		applications.
-
-		FileUpload parses HTTP requests which conform to RFC 1867, "Form-based
-		File Upload in HTML". That is, if an HTTP request is submitted using the
-		POST method, and with a content type of "multipart/form-data", then
-		FileUpload can parse that request, and make the results available in a
-		manner easily used by the caller.
-	</longdescription>
- <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons_fileupload</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest
deleted file mode 100644
index 3c4baa01dfcf..000000000000
--- a/dev-java/dtdparser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dtdparser-1.21.tgz 138335 BLAKE2B e393b93116cc74811198465819cfe4d059a55a05d13117fe14ce0a6fa2ee82c937d6efe4724bbc28ec5b35600eaee046fa8c07c6ab96fcdb79a6935d5c0ba0b7 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa
diff --git a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
deleted file mode 100644
index 1c4ef846e1b7..000000000000
--- a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 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="A Java DTD Parser"
-HOMEPAGE="http://www.wutka.com/dtdparser.html"
-SRC_URI="http://www.wutka.com/download/${P}.tgz"
-
-LICENSE="LGPL-2.1 Apache-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}"
-
-JAVA_ENCODING="iso8859-1"
-JAVA_SRC_DIR="source"
-
-java_prepare() {
-	find -name "*.jar" -o -name "*.class" -delete || die
-	rm build.xml || die
-}
diff --git a/dev-java/dtdparser/metadata.xml b/dev-java/dtdparser/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/dtdparser/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/easymock-classextension/Manifest b/dev-java/easymock-classextension/Manifest
deleted file mode 100644
index 83705f21b9e9..000000000000
--- a/dev-java/easymock-classextension/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST easymockclassextension-3.2.zip 155678 BLAKE2B 5eecb9aabdcb4ef2edd2a2c7bf6b02d1c72c0d15f05ce4c148d646cc980a2358e34c49d7e13f65b31e379d8dbf581fee6c9ebbc1a5753336e251446ec120f476 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0
diff --git a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
deleted file mode 100644
index de49d776a308..000000000000
--- a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=${PN/-}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
-HOMEPAGE="http://www.easymock.org/"
-SRC_URI="mirror://sourceforge/easymock/EasyMock%20Class%20Extension/${PV}/${MY_P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/easymock:${SLOT}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-JAVA_GENTOO_CLASSPATH="easymock-${SLOT}"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unzip ${MY_P}-sources.jar -d src/ || die
-
-	if use examples; then
-		unzip ${MY_P}-samples.jar -d examples/ || die
-	fi
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/easymock-classextension/metadata.xml b/dev-java/easymock-classextension/metadata.xml
deleted file mode 100644
index 4c592570a803..000000000000
--- a/dev-java/easymock-classextension/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">easymock</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
deleted file mode 100644
index 557c180a7f35..000000000000
--- a/dev-java/ehcache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ehcache-1.2.4.tgz 1330344 BLAKE2B 60dbf5f3463562f1a326b13ac10d37d5d9fc1d5faa343e4bf5b197adfc45624832d740270753646e2c08be2e661610512f74fa7b6aa8f26ef3afbeee0d89af72 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed
diff --git a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
deleted file mode 100644
index dbe5389c81b4..000000000000
--- a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="https://sourceforge.net/projects/ehcache/"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:2.4"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.4"
-
-java_prepare() {
-	unzip -d src ${P}-sources.jar || die
-	rm -rf src/net/sf/ehcache/hibernate || die
-	rm *.jar || die
-}
diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
deleted file mode 100644
index 7271e3d4df24..000000000000
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="https://sourceforge.net/projects/ehcache/"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:2.5"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
-
-java_prepare() {
-	unpack ./${P}-sources.jar
-	rm -vr net/sf/ehcache/hibernate || die
-	java-pkg_clean
-}
diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
deleted file mode 100644
index e6e1ca403ca1..000000000000
--- a/dev-java/ehcache/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">ehcache</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
deleted file mode 100644
index 5530af963c8c..000000000000
--- a/dev-java/fastinfoset/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FastInfoset-1.2.11-sources.jar 255054 BLAKE2B b5424f34aff73e6d5510b1ebae537751c84dca4d98c305bc0fea75dee9f8aac1a8e9213b0adfd27b840febcb4001cb1a539f9fddb73fc621efbe0453686eba32 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
deleted file mode 100644
index d84fbc04414d..000000000000
--- a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
+++ /dev/null
@@ -1,25 +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
-
-MY_PN="FastInfoset"
-
-DESCRIPTION="Specifies a standardized binary encoding for the XML Information Sets"
-HOMEPAGE="https://fi.java.net/"
-SRC_URI="http://search.maven.org/remotecontent?filepath=com/sun/xml/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
diff --git a/dev-java/fastinfoset/metadata.xml b/dev-java/fastinfoset/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/fastinfoset/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
deleted file mode 100644
index 9e2b40dc6995..000000000000
--- a/dev-java/fscript/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fscript-1.17.tgz 117300 BLAKE2B ffbf993164d822fd8aaa25025c773d98f79127df8cc800d78475be5686a2785e962447f817cd1b705c03350a83b48c5e669b5faaa62649a1b2ead7cd2d4e9288 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50
diff --git a/dev-java/fscript/fscript-1.17-r1.ebuild b/dev-java/fscript/fscript-1.17-r1.ebuild
deleted file mode 100644
index b238ea0a22c5..000000000000
--- a/dev-java/fscript/fscript-1.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based scripting engine designed to be embedded into other Java applications"
-HOMEPAGE="https://sourceforge.net/projects/fscript/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-java_prepare() {
-	rm -v "${S}/FScript.jar" || die
-}
-
-EANT_DOC_TARGET="jdoc"
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-
-	dodoc CREDITS README VERSION
-	# docs/* contains not only javadoc:
-	use doc && java-pkg_dohtml -r docs/*
-	use examples && java-pkg_doexamples examples/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/fscript/metadata.xml b/dev-java/fscript/metadata.xml
deleted file mode 100644
index 6b604a4823d9..000000000000
--- a/dev-java/fscript/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">fscript</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/hamcrest-integration/Manifest b/dev-java/hamcrest-integration/Manifest
deleted file mode 100644
index 480364f4e8f4..000000000000
--- a/dev-java/hamcrest-integration/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
diff --git a/dev-java/hamcrest-integration/files/1.3-remove-targets.patch b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
deleted file mode 100644
index e534eddfb750..000000000000
--- a/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/hamcrest-1.3/build.xml b/hamcrest-1.3/build.xml
-index 1cfd4fb..396ebc5 100644
---- a/hamcrest-1.3/build.xml
-+++ b/hamcrest-1.3/build.xml
-@@ -12,69 +12,14 @@
-     </target>
- 
-     <target name="generator" description="Build code generator tool">
--        <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     modulename="hamcrest-generator-nodeps"
--                     classpath="lib/generator/qdox-1.12.jar"/>
--
--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
--            <zipfileset src="lib/generator/qdox-1.12.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-     </target>
- 
-     <target name="core" depends="generator" description="Build core Hamcrest library">
--        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
--
--        <!-- Generate one class with all static imports -->
--        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
--
--        <java classname="org.hamcrest.generator.config.XmlConfigurator"
--              fork="yes"
--              failonerror="yes"
--              classpath="
--                build/hamcrest-core-${version}.jar;
--                build/hamcrest-generator-${version}.jar;
--              ">
--            <arg value="core-matchers.xml"/>
--            <arg value="hamcrest-core/src/main/java"/>
--            <arg value="org.hamcrest.CoreMatchers"/>
--            <arg value="build/temp/hamcrest-core/generated-code"/>
--        </java>
--        <!-- Append to core jar -->
--        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
--                     modulename="hamcrest-core"
--                     classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
-     <target name="library"
-             depends="core,generator"
-             description="Build library of matchers">
--        <mkdir dir="build/temp/hamcrest-library/generated-code"/>
--        <java-to-jar srcdir="hamcrest-library/src/main/java"
--                     modulename="hamcrest-library"
--                     classpath="build/hamcrest-core-${version}.jar"/>
--        <!-- Generate one class with all static imports -->
--        <java classname="org.hamcrest.generator.config.XmlConfigurator"
--              fork="yes"
--              failonerror="yes"
--              classpath="
--                build/hamcrest-core-${version}.jar;
--                build/hamcrest-generator-${version}.jar;
--                build/hamcrest-library-${version}.jar;
--              ">
--            <arg value="matchers.xml"/>
--            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
--            <arg value="org.hamcrest.Matchers"/>
--            <arg value="build/temp/hamcrest-library/generated-code"/>
--        </java>
--        <!-- Append to library jar -->
--        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
--                     modulename="hamcrest-library"
--                     classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
-     <target name="integration" depends="core, library" description="Build integration with external tools">
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
deleted file mode 100644
index bb0548279c9a..000000000000
--- a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-integration}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Integration library of hamcrest"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/hamcrest-core:${SLOT}
-		dev-java/qdox:1.6
-		dev-java/easymock:3.2
-		dev-java/jmock:1.0"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-
-EANT_GENTOO_CLASSPATH="hamcrest-core:${SLOT},qdox:1.6,easymock:3.2,jmock:1.0"
-EANT_BUILD_TARGET="integration"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
deleted file mode 100644
index 85ed4c59f397..000000000000
--- a/dev-java/hamcrest-integration/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">hamcrest/</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/helpgui/Manifest b/dev-java/helpgui/Manifest
deleted file mode 100644
index 984a8eec341d..000000000000
--- a/dev-java/helpgui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST helpgui-1.1-src.jar 168356 BLAKE2B 4f14e4b7f7ffa91f80913dfaf5c395ac6f49b847f76a5cd75932ba07c2932aefc6964b907dddb2fcac6e0c888feb4c47dffac8b866922a0820ccafe23863ac3f SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77
diff --git a/dev-java/helpgui/helpgui-1.1-r2.ebuild b/dev-java/helpgui/helpgui-1.1-r2.ebuild
deleted file mode 100644
index cfbdc0f81b84..000000000000
--- a/dev-java/helpgui/helpgui-1.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 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-ant-2
-
-DESCRIPTION="HelpGUI is a simple library which develop a help viewer component"
-HOMEPAGE="https://sourceforge.net/projects/helpgui/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-EANT_BUILD_TARGET="helpgui_jar"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	dodoc README
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/helpgui/metadata.xml b/dev-java/helpgui/metadata.xml
deleted file mode 100644
index 206debc2044a..000000000000
--- a/dev-java/helpgui/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">helpgui</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/higlayout/Manifest b/dev-java/higlayout/Manifest
deleted file mode 100644
index abe8b2d906f2..000000000000
--- a/dev-java/higlayout/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST HIGLayout1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
-DIST higlayout-1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
diff --git a/dev-java/higlayout/higlayout-1.0-r2.ebuild b/dev-java/higlayout/higlayout-1.0-r2.ebuild
deleted file mode 100644
index e42e005e2433..000000000000
--- a/dev-java/higlayout/higlayout-1.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Swing layout manager that's powerful and easy to use"
-
-HOMEPAGE="http://www.autel.cz/dmi/tutorial.html"
-SRC_URI="http://www.autel.cz/dmi/HIGLayout${PV}.zip"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	cd tutorial || die
-	for d in *.GIF;
-	do
-		mv $d $(basename $d .GIF).gif || die
-	done
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/dev-java/higlayout/higlayout-1.0-r3.ebuild b/dev-java/higlayout/higlayout-1.0-r3.ebuild
deleted file mode 100644
index 6d9a92e62b28..000000000000
--- a/dev-java/higlayout/higlayout-1.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Swing layout manager that's powerful and easy to use"
-HOMEPAGE="http://www.autel.cz/dmi/tutorial.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-DOCS=( Changes.txt readme.txt )
-
-src_prepare() {
-	default
-	cd tutorial || die
-	for d in *.GIF; do
-		mv "${d}" $(basename ${d} .GIF).gif || die
-	done
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples
-	einstalldocs
-}
diff --git a/dev-java/higlayout/metadata.xml b/dev-java/higlayout/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/higlayout/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
deleted file mode 100644
index 98e1f01e8c9d..000000000000
--- a/dev-java/httpcomponents-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST httpcomponents-client-4.5-src.tar.gz 782815 BLAKE2B ddf08b8ed4451cdf9eb1d58b207c5e80948ba051c92c9e5e3f4fe0e09405ce916fbedf5e70b037880a09b822ffb99395294645d2518282d35f57b0bf64a786df SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
deleted file mode 100644
index 2464c617d438..000000000000
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/24/15 9:38 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="fluent-hc-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="fluent-hc-4.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
-      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
deleted file mode 100644
index b88c13ea80b7..000000000000
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/23/15 11:41 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpclient-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="httpclient-4.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
deleted file mode 100644
index 297c0987b0b1..000000000000
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/24/15 9:48 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpclient-cache-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="httpclient-cache-4.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
-    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
-    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.5.2/easymock-2.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/2.5.2/easymockclassextension-2.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
-      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
deleted file mode 100644
index ef588141aac1..000000000000
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/24/15 6:17 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpclient-osgi-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="httpclient-osgi-4.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
deleted file mode 100644
index d1f578641165..000000000000
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/24/15 5:01 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpmime-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="httpmime-4.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
deleted file mode 100644
index 5dfe16232601..000000000000
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source examples doc test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
-HOMEPAGE="http://hc.apache.org/index.html"
-SRC_URI="mirror://apache/${PN/-//http}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/ant-junit:0
-	dev-java/easymock:3.2
-	dev-java/spymemcached:0
-	dev-java/osgi-core-api:0
-	dev-java/osgi-enterprise-api:0
-	dev-java/commons-codec:0
-	dev-java/commons-logging:0
-	dev-java/httpcomponents-core:4.4
-	dev-java/easymock-classextension:3.2
-"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/mockito:0
-	)
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	commons-codec
-	commons-logging
-	spymemcached
-	osgi-core-api
-	osgi-enterprise-api
-	httpcomponents-core-4.4
-"
-
-# List of modules to compile and test.
-MODULES=(
-	httpclient
-	httpclient-cache
-	httpmime
-	fluent-hc
-	httpclient-osgi
-)
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${MODULES[0]}/target/${MODULES[0]}-${PV}.jar"
-
-java_prepare() {
-	# copy build.xml files to their location.
-	for module in ${MODULES[@]}; do
-		cd "${S}"/"${module}" || die
-		cp "${FILESDIR}"/"${PN}-${module}-${PV}"-build.xml build.xml
-	done
-
-	cd "${S}" || die
-
-	# httpclient:
-	# - copy deprecated sources for compilation
-	cp -r "${S}"/${MODULES[0]}/src/main/java-deprecated/* \
-		"${S}"/${MODULES[0]}/src/main/java/* || die
-
-	# - remove broken tests
-	rm -v ${MODULES[0]}/src/test/java/org/apache/http/client/config/TestRequestConfig.java
-
-	# httpclient-cache:
-	# - copy deprecated sources into main repository
-	cp -r "${S}"/${MODULES[1]}/src/main/java-deprecated/* \
-		"${S}"/${MODULES[1]}/src/main/java || die
-
-	# - remove broken tests
-	rm -v \
-		${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/TestCachingExec*
-
-	# - disable ehcache support altogether
-	# the version in Portage is very old and compilation chokes on missing imports
-	rm -rf \
-		"${S}"/${MODULES[1]}/src/main/java/org/apache/http/impl/client/cache/ehcache \
-		"${S}"/${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/ehcache
-
-	# httpmime:
-	# - copy deprecated sources into main repository
-	cp -r "${S}"/${MODULES[2]}/src/main/java-deprecated/* \
-		"${S}"/${MODULES[2]}/src/main/java
-
-	# fluent-hc:
-	# remove broken tests.
-	rm -v ${MODULES[3]}/src/test/java/org/apache/http/client/fluent/TestFluent.java
-}
-
-EANT_TEST_GENTOO_CLASSPATH="
-	${EANT_GENTOO_CLASSPATH}
-	junit-4
-	mockito
-	easymock-3.2
-	easymock-classextension-3.2
-"
-
-src_compile() {
-	for module in ${MODULES[@]}; do
-		EANT_BUILD_XML="${module}/build.xml" \
-			java-pkg-2_src_compile
-	done
-}
-
-src_test() {
-	for module in ${MODULES[@]}; do
-		ANT_TASKS= \
-			EANT_BUILD_XML="${module}/build.xml" \
-			java-pkg-2_src_test
-	done
-}
-
-src_install() {
-	for module in ${MODULES[@]}; do
-		java-pkg_newjar ${module}/target/${module}-${PV}.jar ${module}.jar
-	done
-
-	if use source; then
-
-		java-pkg_dosrc {httpclient,httpclient-cache,httpmime,fluent-hc}/src/main/java/org
-	fi
-
-	if use examples; then
-		for dir in $(find "${S}" -mindepth 3 -maxdepth 4 -name "examples" -type d -print); do
-			java-pkg_doexamples ${dir}/*
-		done
-	fi
-
-	if use doc; then
-		java-pkg_dojavadoc {httpclient,httpclient-cache,httpmime,fluent-hc}/target/site/apidocs/
-	fi
-}
diff --git a/dev-java/httpcomponents-client/metadata.xml b/dev-java/httpcomponents-client/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/httpcomponents-client/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/httpcomponents-core/Manifest b/dev-java/httpcomponents-core/Manifest
deleted file mode 100644
index 3869f682933d..000000000000
--- a/dev-java/httpcomponents-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST httpcomponents-core-4.4.1-src.tar.gz 549481 BLAKE2B b5e84a521d5da16fc0800a2fb4b8ceb304acd409954cbaeac5901bcbb7b00ce1a10c733ae817c1ff7baaefc7a90a7370c74521c2570eaa8c694e90422d68ac35 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml
deleted file mode 100644
index 9801665958c8..000000000000
--- a/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/18/15 9:03 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpcore-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="httpcore-4.4.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml
deleted file mode 100644
index e0ae145072cd..000000000000
--- a/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/18/15 9:04 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="httpcore-nio-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="httpcore-nio-4.4.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests"
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://hc.apache.org/httpcomponents-core-4.4.x/httpcore/apidocs/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
deleted file mode 100644
index 3e1a5255b294..000000000000
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source examples test"
-
-# "components"
-CMPT=${PN%%-*}
-
-# "core"
-CORE=${PN##*-}
-
-# "httpcore"
-HTTPCORE="http${CORE}"
-
-# "httpcore-nio"
-HTTPNIO="${HTTPCORE}-nio"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
-HOMEPAGE="http://hc.apache.org/index.html"
-SRC_URI="mirror://apache/httpcomponents/${HTTPCORE}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.4"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND="
-	test? (
-		dev-java/commons-logging:0
-		dev-java/ant-junit:0
-		dev-java/mockito:0
-	)
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml || die
-	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml || die
-
-	# Why have these classes been deprecated although other libraries are built
-	# on them (i.e. httpcomponents-client) is mindboggling. See bug 553234.
-	cp -r "${S}"/httpcore/src/main/java-deprecated/* \
-		"${S}"/httpcore/src/main/java/* || die
-	cp -r "${S}"/httpcore-nio/src/main/java-deprecated/* \
-		"${S}"/httpcore-nio/src/main/java/* || die
-}
-
-src_compile() {
-	# first, compile httpcore module
-	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_compile
-
-	# then, httpnio module
-	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="
-	commons-logging
-	mockito
-"
-
-src_test() {
-	# run junit tests for httpcore module
-	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_test
-
-	# run junit tests for httpcore-nio module
-	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar ${HTTPCORE}/target/${HTTPCORE}-${PV}.jar ${HTTPCORE}.jar
-	java-pkg_newjar ${HTTPNIO}/target/${HTTPNIO}-${PV}.jar ${HTTPNIO}.jar
-
-	use source && java-pkg_dosrc httpcore{,-nio}/src/main/java
-	use examples && java-pkg_doexamples httpcore{,-nio}/src/examples
-
-	dodoc {README,RELEASE_NOTES,NOTICE}.txt
-}
diff --git a/dev-java/httpcomponents-core/metadata.xml b/dev-java/httpcomponents-core/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/httpcomponents-core/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
deleted file mode 100644
index 4ab4d979c321..000000000000
--- a/dev-java/j2ssh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST j2ssh-0.2.9-src.tar.gz 2182523 BLAKE2B 1c5424ac99a466d3ac114160c133d8d6daed430f67bce35300290e14bc7540c73d5698f728f2cd43f7050877c2f89978c118a420375ffb5bc6c207c397e5afd2 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8
diff --git a/dev-java/j2ssh/files/0.2.9-extras.patch b/dev-java/j2ssh/files/0.2.9-extras.patch
deleted file mode 100644
index d958cba19b97..000000000000
--- a/dev-java/j2ssh/files/0.2.9-extras.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayReader.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayReader.java
---- j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayReader.java	2007-04-28 21:02:54.000000000 +0200
-+++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayReader.java	2008-01-18 19:27:38.000000000 +0100
-@@ -118,7 +118,13 @@
-         byte[] chars = new byte[(int) len];
-         System.arraycopy(data, start + 4, chars, 0, len);
- 
--        return new String(chars);
-+        try {
-+            return new String(chars, "UTF-8");
-+        }
-+        catch(java.io.UnsupportedEncodingException e) {
-+            // This should never happen, UTF-8 is necessarily supported.
-+            return new String(chars);
-+        }
-     }
- 
-     /**
-@@ -163,6 +169,12 @@
-         byte[] raw = new byte[(int) len];
-         read(raw);
- 
--        return new String(raw);
-+        try {
-+            return new String(raw, "UTF-8");
-+        }
-+        catch(java.io.UnsupportedEncodingException e) {
-+            // This should never happen, UTF-8 is necessarily supported.
-+            return new String(raw);
-+        }
-     }
- }
-diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayWriter.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayWriter.java
---- j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayWriter.java	2007-04-29 10:54:48.000000000 +0200
-+++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayWriter.java	2008-01-18 19:30:36.000000000 +0100
-@@ -190,15 +190,15 @@
-         if (str == null) {
-             writeInt(0);
-         } else {
--            /*
--            writeInt(str.length());
--            // don't use US-ASCII by default!
--            write(str.getBytes());
--            */
--            // patch as of version 0.2.9
--            // for UTF-8 length of string is not necessarily
--            // equal to number of bytes
--            byte[] strBytes = str.getBytes();
-+            byte[] strBytes;
-+            try {
-+                strBytes = str.getBytes("UTF-8");
-+            }
-+            catch(java.io.UnsupportedEncodingException e) {
-+                // This should never happen, UTF-8 is necessarily supported.
-+                strBytes = str.getBytes();
-+            }
-+            
-             writeInt(strBytes.length);
-             write(strBytes);
-         }
-diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java
---- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java	2007-04-28 21:02:54.000000000 +0200
-+++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java	2008-01-18 19:26:58.000000000 +0100
-@@ -38,7 +38,7 @@
-  */
- public class SftpFileInputStream extends InputStream {
-     SftpFile file;
--    UnsignedInteger64 position = new UnsignedInteger64("0");
-+    UnsignedInteger64 position;
- 
-     /**
-      * Creates a new SftpFileInputStream object.
-@@ -48,16 +48,47 @@
-      * @throws IOException
-      */
-     public SftpFileInputStream(SftpFile file) throws IOException {
-+		this(file, 0);
-+    }
-+
-+    /**
-+     * Creates a new SftpFileInputStream object and sets the file offset to the specified position.
-+     *
-+     * @param file
-+	 * @param position the initial file offset, must be >=0
-+     *
-+     * @throws IOException
-+     */
-+    public SftpFileInputStream(SftpFile file, long position) throws IOException {
-         if (file.getHandle() == null) {
-             throw new IOException("The file does not have a valid handle!");
-         }
--
-+        
-         if (file.getSFTPSubsystem() == null) {
--            throw new IOException(
--                "The file is not attached to an SFTP subsystem!");
-+            throw new IOException("The file is not attached to an SFTP subsystem!");
-         }
--
-+        
-         this.file = file;
-+		this.position = new UnsignedInteger64(""+position);
-+    }
-+
-+    /**
-+     * Returns the current offset within the file.
-+     *
-+     * @return the current offset within the file
-+     */
-+	public long getPosition() {
-+        return position.longValue();
-+    }
-+
-+    /**
-+     * Sets the current file offset to the given position. 
-+     * Subsequent calls to read methods will start reading data at this position.
-+     *
-+     * @param position the new offset, must be >=0
-+     */
-+    public void setPosition(long position) {
-+        this.position = new UnsignedInteger64(""+position);
-     }
- 
-     /**
-diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java
---- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java	2007-04-28 21:02:54.000000000 +0200
-+++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java	2008-01-18 19:08:55.000000000 +0100
-@@ -38,7 +38,7 @@
-  */
- public class SftpFileOutputStream extends OutputStream {
-     SftpFile file;
--    UnsignedInteger64 position = new UnsignedInteger64("0");
-+    UnsignedInteger64 position;
- 
-     /**
-      * Creates a new SftpFileOutputStream object.
-@@ -48,6 +48,18 @@
-      * @throws IOException
-      */
-     public SftpFileOutputStream(SftpFile file) throws IOException {
-+        this(file, 0);
-+    }
-+
-+    /**
-+     * Creates a new SftpFileOutputStream object and sets the file offset to the specified position.
-+     *
-+     * @param file
-+	 * @param position the initial file offset, must be >=0
-+     *
-+     * @throws IOException
-+     */
-+    public SftpFileOutputStream(SftpFile file, long position) throws IOException {
-         if (file.getHandle() == null) {
-             throw new IOException("The file does not have a valid handle!");
-         }
-@@ -58,6 +70,7 @@
-         }
- 
-         this.file = file;
-+		this.position = new UnsignedInteger64(""+position);
-     }
- 
-     /**
-diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java
---- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java	2007-04-28 21:02:54.000000000 +0200
-+++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java	2008-01-21 17:48:06.000000000 +0100
-@@ -231,16 +231,28 @@
-     }
- 
-     /**
-+     * Creates the directory with the specified path. The default permissions for the directory are 0755 ("rwxr-xr-x").
-      *
-+     * @param path the path to the directory to create
-+     * @throws IOException if an error occurs
-+     */
-+    public synchronized void makeDirectory(String path) throws IOException {
-+        makeDirectory(path, 0755);  // default to 755 octal (493 decimal): "rwxr-xr-x"
-+    }
-+
-+    /**
-+     * Creates the directory with the specified path and file permissions.  
-      *
--     * @param path
--     *
--     * @throws IOException
-+     * @param path the path to the directory to create
-+     * @param permissions the file permissions of the new directory
-+     * @throws IOException if an error occurs
-      */
--    public synchronized void makeDirectory(String path)
--        throws IOException {
-+    public synchronized void makeDirectory(String path, int permissions) throws IOException {
-         UnsignedInteger32 requestId = nextRequestId();
--        SshFxpMkdir msg = new SshFxpMkdir(requestId, path, new FileAttributes());
-+        FileAttributes attrs = new FileAttributes();
-+        attrs.setPermissions(new UnsignedInteger32(permissions));
-+
-+        SshFxpMkdir msg = new SshFxpMkdir(requestId, path, attrs);
-         sendMessage(msg);
-         getOKRequestStatus(requestId);
-     }
diff --git a/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch b/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch
deleted file mode 100644
index 26d7672a3414..000000000000
--- a/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/j2ssh/build.xml b/j2ssh/build.xml
-index 2c867ee..7ba5814 100644
---- a/j2ssh/build.xml
-+++ b/j2ssh/build.xml
-@@ -52,7 +52,7 @@
-          <mkdir dir="${build.dist.lib}"/>
- 
-          <!-- Build the J2SSH library files -->
-- 	         <jar jarfile="${build.dist.lib}/j2ssh-core-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
-+ 	         <jar jarfile="${build.dist.lib}/j2ssh-core.jar" basedir="${build.dist.classes}">
-                 <include name="com/sshtools/j2ssh/**/*.class"/>
-                 <manifest>
-                    <attribute name="Product-Version"
-@@ -60,7 +60,7 @@
-                  </manifest>
-              </jar>
- 
--             <jar jarfile="${build.dist.lib}/j2ssh-ant-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
-+             <jar jarfile="${build.dist.lib}/j2ssh-ant.jar" basedir="${build.dist.classes}">
-                 <include name="com/sshtools/ant/**/*.class"/>
-                 <manifest>
-                    <attribute name="Product-Version"
-@@ -68,7 +68,7 @@
-                  </manifest>
-              </jar>
- 
--             <jar jarfile="${build.dist.lib}/j2ssh-dameon-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
-+             <jar jarfile="${build.dist.lib}/j2ssh-dameon.jar" basedir="${build.dist.classes}">
-                 <include name="com/sshtools/daemon/**/*.class"/>
-                 <exclude name="com/sshtools/daemon/windows/**/*.*"/>
-                 <exclude name="com/sshtools/daemon/linux/**/*.*"/>
-@@ -78,7 +78,7 @@
-                  </manifest>
-              </jar>
-              
--   	         <jar jarfile="${build.dist.lib}/j2ssh-common-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
-+   	         <jar jarfile="${build.dist.lib}/j2ssh-common.jar" basedir="${build.dist.classes}">
-                 <include name="com/sshtools/common/**/*.class"/>
-                 <include name="com/sshtools/common/**/*.png"/>
-                 <include name="com/sshtools/common/**/*.gif"/>
diff --git a/dev-java/j2ssh/j2ssh-0.2.9.ebuild b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
deleted file mode 100644
index 2decfdada51d..000000000000
--- a/dev-java/j2ssh/j2ssh-0.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc examples"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Java implementation of the SSH protocol"
-HOMEPAGE="https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/"
-SRC_URI="mirror://sourceforge/sshtools/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/ant-core:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-no-versioned-jars.patch"
-	epatch "${FILESDIR}/${PV}-extras.patch"
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/lib/*.jar
-
-	use doc && java-pkg_dojavadoc docs/
-	use source && java-pkg_dosrc "${S}"/src/com
-	use examples && java-pkg_doexamples "${S}"/examples/
-}
diff --git a/dev-java/j2ssh/metadata.xml b/dev-java/j2ssh/metadata.xml
deleted file mode 100644
index 5653aef95f28..000000000000
--- a/dev-java/j2ssh/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-		SSHTools is a suite of Java SSH applications providing a Java SSH API,
-		SSH Terminal, SSH secured VNC client, SFTP client and SSH Daemon.
-	</longdescription>
- <upstream>
-  <remote-id type="sourceforge">sshtools</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jarbundler/Manifest b/dev-java/jarbundler/Manifest
deleted file mode 100644
index 703d080e7573..000000000000
--- a/dev-java/jarbundler/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jarbundler-1.8.1.tar.gz 132101 BLAKE2B 0cd223ca9a63604f93d6bb2d6e89d0e48b48b43befaf510181fc8f435dc2f61388995f11c9efe4439e784b66c60a1395a43ef2041c690967b226a0212e77ef68 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4
-DIST jarbundler-2.3.1.zip 159874 BLAKE2B dbfa00a930a0f1e4c26e4372254f380d67279edbb6bc885db2a964f7fda744a68b9c6dc0a088ca851e62ed55048d33413186f6f340b5c80b52b8d9b4c589a355 SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
deleted file mode 100644
index c3f4540720f3..000000000000
--- a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jar Bundler Ant Task"
-HOMEPAGE="https://github.com/UltraMixer/JarBundler"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-COMMON_DEP="
-	>=dev-java/xerces-2.8.1:2"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4
-	>=dev-java/ant-core-1.7:0"
-
-java_prepare() {
-	find -name '*.jar' -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar"
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc javadoc/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jarbundler/jarbundler-2.3.1.ebuild b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
deleted file mode 100644
index 84ded171f5c0..000000000000
--- a/dev-java/jarbundler/jarbundler-2.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jar Bundler Ant Task"
-HOMEPAGE="https://github.com/UltraMixer/JarBundler"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-COMMON_DEP="
-	>=dev-java/xerces-2.8.1:2"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
-	>=dev-java/ant-core-1.7:0"
-
-java_prepare() {
-	find -name '*.jar' -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar"
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc javadoc/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jarbundler/metadata.xml b/dev-java/jarbundler/metadata.xml
deleted file mode 100644
index beaa0b32e41b..000000000000
--- a/dev-java/jarbundler/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">UltraMixer/JarBundler</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
deleted file mode 100644
index 9a5d6dd99528..000000000000
--- a/dev-java/javolution/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST javolution-4.0.2-src.zip 556097 BLAKE2B 83f009a60e2b981d488b0b5f95572d3f88f724388b0d09eee10d7f1555379b2b51cf1d2f0f0af74d6944718b7e4b2f609f7866a747c19001edb2466611a6192a SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd
-DIST javolution-6.0.0-build.xml.tar.xz 2696 BLAKE2B 825899c903300dd7d031ab372c85f2824b796305dcf56ea9fc162d883a09f2feedc7498d13b6c803ad43d876dcf3dc457704cf834ff9d48411a67e0bec0a28f9 SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab
-DIST javolution-6.0.0.tar.xz 1308148 BLAKE2B 148bd28e7cd9a0fe16d657cb61fd870e92180f4ad64fb9b1a37fa953309a80c1f3b3b9edbe0c7defa2a3a73ba8d3cf200ee29737769cc31fe87300fbc40f2111 SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034
diff --git a/dev-java/javolution/files/4.0.2-fix-java7.patch b/dev-java/javolution/files/4.0.2-fix-java7.patch
deleted file mode 100644
index 19d2275b8e0c..000000000000
--- a/dev-java/javolution/files/4.0.2-fix-java7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/javolution-4.0/src/javolution/io/Struct.java b/javolution-4.0/src/javolution/io/Struct.java
-index 5198030..3def806 100644
---- a/javolution-4.0/src/javolution/io/Struct.java
-+++ b/javolution-4.0/src/javolution/io/Struct.java
-@@ -134,7 +134,7 @@ public class Struct {
- 	/**
- 	 * Holds the outer struct if any.
- 	 */
--	private Struct _outer;
-+	Struct _outer;
- 
- 	/**
- 	 * Holds the byte buffer backing the struct (top struct).
-@@ -145,7 +145,7 @@ public class Struct {
- 	 * Holds the offset of this struct relative to the outer struct or
- 	 * to the byte buffer if there is no outer.
- 	 */
--	private int _outerOffset;
-+	int _outerOffset;
- 
- 	/**
- 	 * Holds the number of bits currently used (for size calculation).
-@@ -155,7 +155,7 @@ public class Struct {
- 	/**
- 	 * Holds this struct alignment (largest alignment of its members).
- 	 */
--	private int _alignment = 1;
-+	int _alignment = 1;
- 
- 	/**
- 	 * Holds the current bit index position (during construction).
-@@ -1607,4 +1607,4 @@ public class Struct {
- 			}
- 		}
- 	}
--}
-\ No newline at end of file
-+}
diff --git a/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch b/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
deleted file mode 100644
index 24530ef6b251..000000000000
--- a/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/core-java/maven-build.xml
-+++ b/core-java/maven-build.xml
-@@ -180,9 +180,8 @@
-   <!-- ====================================================================== -->
- 
-   <target name="javadoc" description="Generates the Javadoc of the application">
--    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized" 
-+    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/" 
-              destdir="${maven.reporting.outputDirectory}/apidocs" 
--             overview="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized/javolution/doc-files/overview.html" 
-              access="protected" 
-              old="false" 
-              verbose="false" 
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
deleted file mode 100644
index 70885aa5b247..000000000000
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/javolution-${PV%.*}"
-
-EANT_BUILD_TARGET="clean _init_1.5 _compile jar"
-EANT_DOC_TARGET="doc"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}*.patch
-}
-
-src_test() {
-	java -jar "${PN}.jar" test || die "test failed"
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-
-	dodoc doc/coding_standard.txt
-	dohtml index.html
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc "${S}/src/${PN}"
-}
diff --git a/dev-java/javolution/javolution-6.0.0.ebuild b/dev-java/javolution/javolution-6.0.0.ebuild
deleted file mode 100644
index c289d27fec73..000000000000
--- a/dev-java/javolution/javolution-6.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Documentation generation is broken.
-JAVA_PKG_IUSE="source" # doc
-
-inherit java-pkg-2 java-ant-2 unpacker
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz
-	https://dev.gentoo.org/~tomwij/files/dist/${P}-build.xml.tar.xz"
-HOMEPAGE="http://javolution.org"
-
-LICENSE="BSD"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/osgi-core-api:0
-	dev-java/osgi-compendium:0"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="package"
-JAVA_PKG_BSFIX_NAME="build.xml maven-build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium"
-
-src_unpack() {
-	unpacker ${P}.tar.xz
-	cd "${S}" || die
-	unpacker ${P}-build.xml.tar.xz
-}
-
-java_prepare() {
-	# Remove bundled libraries.
-	find . -name '*.jar' -print -delete || die
-	find . -name '*.class' -print -delete || die
-
-	epatch "${FILESDIR}"/${P}-javadoc-fix.patch
-}
-
-src_install() {
-	java-pkg_newjar core-java/target/${PN}-core-java-${PV}.jar
-
-	dohtml index.html
-
-	# Documentation generation is broken.
-	#use doc && java-pkg_dojavadoc core-java/target/site/apidocs
-	use source && java-pkg_dosrc core-java/src/main/java/${PN}
-}
diff --git a/dev-java/javolution/metadata.xml b/dev-java/javolution/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/javolution/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
deleted file mode 100644
index 4c5ca081e61b..000000000000
--- a/dev-java/jboss-logging/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jboss-logging-3.1.4.tar.gz 25018 BLAKE2B abc91a70cd75132621dffa44c4c2314635e0009f8eaff96c97cd6f95869a078672eac452ce4d5fb2791785d01d7fc4af208d34f4f00d635e496022792d1c14f9 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
deleted file mode 100644
index e8a3a50a41fd..000000000000
--- a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig	2015-05-17 20:55:35.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java	2015-05-17 20:58:00.000000000 +0000
-@@ -23,27 +23,27 @@
- 
- abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
- 
--    private final ThreadLocal<Map<String, Object>> mdcMap = new ThreadLocal<Map<String, Object>>();
-+    private final ThreadLocal<Map<String, String>> mdcMap = new ThreadLocal<Map<String, String>>();
- 
-     public Object getMdc(String key) {
-         return mdcMap.get() == null ? null : mdcMap.get().get(key);
-     }
- 
--    public Map<String, Object> getMdcMap() {
-+    public Map<String, String> getMdcMap() {
-         return mdcMap.get();
-     }
- 
--    public Object putMdc(String key, Object value) {
--        Map<String, Object> map = mdcMap.get();
-+    public Object putMdc(String key, String value) {
-+        Map<String, String> map = mdcMap.get();
-         if (map == null) {
--            map = new HashMap<String, Object>();
-+            map = new HashMap<String, String>();
-             mdcMap.set(map);
-         }
-         return map.put(key, value);
-     }
- 
-     public void removeMdc(String key) {
--        Map<String, Object> map = mdcMap.get();
-+        Map<String, String> map = mdcMap.get();
-         if (map == null)
-             return;
-         map.remove(key);
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java.orig	2015-05-17 20:16:57.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java	2015-05-17 21:21:25.157000000 +0000
-@@ -34,11 +34,11 @@
-     }
- 
-     @SuppressWarnings("unchecked")
--    public Map<String, Object> getMdcMap() {
-+    public Map<String, String> getMdcMap() {
-         return MDC.getContext();
-     }
- 
--    public Object putMdc(String key, Object val) {
-+    public Object putMdc(String key, String val) {
-         try {
-             return MDC.get(key);
-         } finally {
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java.orig	2015-05-17 20:44:24.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java	2015-05-17 21:22:05.205000000 +0000
-@@ -33,14 +33,14 @@
-         return new Slf4jLogger(name, l);
-     }
- 
--    public Object putMdc(final String key, final Object value) {
-+    public Object putMdc(final String key, final String value) {
-         try {
-             return MDC.get(key);
-         } finally {
-             if (value == null) {
-                 MDC.remove(key);
-             } else {
--                MDC.put(key, String.valueOf(value));
-+                MDC.put(key, value);
-             }
-         }
-     }
-@@ -54,7 +54,7 @@
-     }
- 
-     @SuppressWarnings({ "unchecked" })
--    public Map<String, Object> getMdcMap() {
-+    public Map<String, String> getMdcMap() {
-         return MDC.getCopyOfContextMap();
-     }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java.orig	2015-05-17 21:19:12.964000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java	2015-05-17 21:22:41.639000000 +0000
-@@ -23,4 +23,9 @@
-     public Logger getLogger(final String name) {
-         return new JDKLogger(name);
-     }
-+
-+    @Override
-+    public Object putMdc(String key, String value) {
-+        return null;
-+    }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java.orig	2015-05-17 20:15:41.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java	2015-05-17 21:20:42.844000000 +0000
-@@ -59,8 +59,8 @@
-         }
-     }
- 
--    public Object putMdc(final String key, final Object value) {
--        return MDC.put(key, String.valueOf(value));
-+    public Object putMdc(final String key, final String value) {
-+        return MDC.put(key, value);
-     }
- 
-     public Object getMdc(final String key) {
-@@ -72,7 +72,7 @@
-     }
- 
-     @SuppressWarnings({ "unchecked" })
--    public Map<String, Object> getMdcMap() {
-+    public Map<String, String> getMdcMap() {
-         // we can re-define the erasure of this map because MDC does not make further use of the copy
-         return (Map)MDC.copy();
-     }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java.orig	2015-05-17 19:12:40.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java	2015-05-17 21:22:27.689000000 +0000
-@@ -25,7 +25,7 @@
-     private MDC() {
-     }
- 
--    public static Object put(String key, Object val) {
-+    public static Object put(String key, String val) {
-         return LoggerProviders.PROVIDER.putMdc(key, val);
-     }
- 
-@@ -37,7 +37,7 @@
-         LoggerProviders.PROVIDER.removeMdc(key);
-     }
- 
--    public static Map<String, Object> getMap() {
-+    public static Map<String, String> getMap() {
-         return LoggerProviders.PROVIDER.getMdcMap();
-     }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java.orig	2015-05-17 19:06:30.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java	2015-05-17 21:21:43.083000000 +0000
-@@ -23,13 +23,13 @@
- public interface LoggerProvider {
-     Logger getLogger(String name);
- 
--    Object putMdc(String key, Object value);
-+    Object putMdc(String key, String value);
- 
-     Object getMdc(String key);
- 
-     void removeMdc(String key);
- 
--    Map<String, Object> getMdcMap();
-+    Map<String, String> getMdcMap();
- 
-     void clearNdc();
- 
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
deleted file mode 100644
index 35bbf84f9c39..000000000000
--- a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/8/14 3:59 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jboss-logging-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jboss-logging-3.1.4.GA"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
-    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
-    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="true" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false">
-      <doctitle>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</doctitle>
-      <header>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</header>
-      <footer>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</footer>
-      <bottom>&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2012 Red Hat, Inc.&lt;/i&gt;]]&gt;</bottom>
-      <link href="http://java.sun.com/javase/6/docs/api/"/>
-      <doclet name="net.gleamynode.apiviz.APIviz" 
-               path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="true" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
deleted file mode 100644
index 6c0d7c16803e..000000000000
--- a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JBoss logging framework"
-HOMEPAGE="https://www.jboss.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="dev-java/jboss-logmanager:0
-	>=dev-java/slf4j-api-1.7.7
-	dev-java/log4j:0"
-
-RDEPEND=">=virtual/jre-1.6
-		${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-		${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}.GA/"
-
-EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	# https://github.com/qos-ch/slf4j/blob/master/slf4j-api/src/main/java/org/slf4j/MDC.java#L226
-	# MDC returns a Map<String, String>
-	# https://github.com/jboss-logging/jboss-logging/blob/master/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java#L57
-	# Yet, for some reason, the JBoss folks have decided that it should return a Map<String, Object> :|
-	# This patch mends this mistake.
-	epatch "${FILESDIR}"/"${P}"-MDC.patch
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}-3.1.4.GA.jar
-
-	if use doc; then
-		java-pkg_dojavadoc target/site/apidocs
-	fi
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml
deleted file mode 100644
index a75d72fd3256..000000000000
--- a/dev-java/jboss-logging/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">jboss-logging/jboss-logging</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jboss-logmanager/Manifest b/dev-java/jboss-logmanager/Manifest
deleted file mode 100644
index 0ed6729f169a..000000000000
--- a/dev-java/jboss-logmanager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jboss-logmanager-1.5.1.tar.gz 132910 BLAKE2B ebca4f63801e539c53bc5a00f76189b8ef9acadcbd1bff07bfc572350b3af3d65c80ac314130ab592f8655d849cefa8cc046ddddd237198f00654973c0e1f29d SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768
diff --git a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
deleted file mode 100644
index c6cd07036bc3..000000000000
--- a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="JBoss logging framework"
-HOMEPAGE="https://www.jboss.org/"
-SRC_URI="https://github.com/${PN/logmanager/logging}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/jboss-modules:0"
-RDEPEND=">=virtual/jre-1.5
-		${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-		${CDEPEND}"
-
-S="${WORKDIR}/${P}.Final/"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jboss-modules"
-
-java_prepare() {
-	rm pom.xml || die
-}
diff --git a/dev-java/jboss-logmanager/metadata.xml b/dev-java/jboss-logmanager/metadata.xml
deleted file mode 100644
index 44238fb98468..000000000000
--- a/dev-java/jboss-logmanager/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">jboss-logging/jboss-logmanager</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
deleted file mode 100644
index 19c446da1cfe..000000000000
--- a/dev-java/jcmdline/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jcmdline-1.0.2.zip 397472 BLAKE2B 6c40c27397b11d21400d9e251cb4a84f13281fa8aaa0a772390724fed0fbbad7613a0c13f6dda1b53acb311be37a3a5ed63a4475a271d63d48322572d5215a2b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7
-DIST jcmdline-2.0.0.zip 395547 BLAKE2B 0dd00785a970fe614aef86e0d1fc8a465c9cffc96d2e157a03ed7e68e4f471a6cfdef8d7af5d90171da1fdeb6130f9a5f34b5dfb8765463e2ee7fdcfdd2991b1 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9
diff --git a/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch b/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch
deleted file mode 100644
index c0e593eca335..000000000000
--- a/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- build.xml.orig	2005-02-04 22:07:21.800581304 +0100
-+++ build.xml	2005-02-04 22:11:43.734761256 +0100
-@@ -170,6 +170,11 @@
-         <echo message="jcmdline Unit Test docs have been written to ${docdir}/jcmdline/utapi" />
-     </target>
- 
-+    <target name="jar" depends="build"> 
-+	    <jar jarfile="${basedir}/jcmdline.jar" 
-+             basedir="${builddir}/classes" />
-+    </target>
-+     
-     <!-- Don't distribute anything that will not pass UTs -->
-     <target name="dist" depends="clean, ut, doc"
-             description="prepare distribution files">
-@@ -203,8 +208,6 @@
-         </copy>
- 
-       <!-- add the jar =====================================================-->
--        <jar jarfile="${tmpDistBuildDir}/${projRelease}.jar" 
--             basedir="${builddir}/classes" />
- 
-       <!-- create a gzipped tarball for the Unix crowd =====================-->
-         <tar tarfile="${distdir}/${projRelease}.tar" 
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
deleted file mode 100644
index 09e0d494eb69..000000000000
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Library for parsing/handling of command line parameters"
-HOMEPAGE="https://sourceforge.net/projects/jcmdline/"
-SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
-LICENSE="MPL-1.1"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-EANT_DOC_TARGET="doc"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc CHANGES CREDITS README
-	use doc && java-pkg_dojavadoc doc/jcmdline/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jcmdline/jcmdline-2.0.0.ebuild b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
deleted file mode 100644
index 880f0ad60ee9..000000000000
--- a/dev-java/jcmdline/jcmdline-2.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 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="Library for parsing/handling of command line parameters"
-HOMEPAGE="https://sourceforge.net/projects/jcmdline/"
-SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
-	java-pkg_clean
-	rm -rf testsrc || die
-}
diff --git a/dev-java/jcmdline/metadata.xml b/dev-java/jcmdline/metadata.xml
deleted file mode 100644
index d368d4b99e7f..000000000000
--- a/dev-java/jcmdline/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-		This package facilitates parsing/handling of command line parameters
-		with an aim at adding consistency across various applications.
-	</longdescription>
- <upstream>
-  <remote-id type="sourceforge">jcmdline</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
deleted file mode 100644
index 101d6e83f55f..000000000000
--- a/dev-java/jdbc2-stdext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
deleted file mode 100644
index 2bdf7b0aa246..000000000000
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2
-
-stdext_src="jdbc2_0-stdext-src.zip"
-stdext_jar="jdbc2-stdext.jar"
-
-DESCRIPTION="A standard set of libs for Server-Side JDBC support"
-HOMEPAGE="http://www.oracle.com/technetwork/java/index.html"
-SRC_URI="${stdext_src}"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="bindist fetch"
-
-RDEPEND="
-	>=virtual/jre-1.4"
-
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	local download_url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-database-419422.html#7099-jdbc-2.0-src-oth-JPR"
-
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo
-	einfo " 1. Visit ${download_url}"
-	einfo " 2. Select 'JDBC Standard Extension Source 2.0'"
-	einfo " 3. Download ${stdext_src}"
-	einfo " 4. Move to your DISTDIR directory"
-	einfo
-	einfo " Run emerge on this package again to complete"
-	einfo
-}
-
-src_unpack() {
-	mkdir src || die
-	cd src || die
-	unpack ${A}
-}
-
-src_compile() {
-	mkdir classes || die
-	ejavac -d classes src/javax/sql/*.java
-	jar cf "${stdext_jar}" -C classes/ . || die "jar failed"
-
-	if use doc; then
-		javadoc -d api -source $(java-pkg_get-source) -sourcepath src/ \
-			javax.sql || die "javadoc failed"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar "${stdext_jar}"
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jdbc2-stdext/metadata.xml b/dev-java/jdbc2-stdext/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jdbc2-stdext/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
deleted file mode 100644
index 01ec2b9c740a..000000000000
--- a/dev-java/jdbm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
diff --git a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
deleted file mode 100644
index 0cc6d5e3cc05..000000000000
--- a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/src/build.xml	2005-02-05 23:34:43.000000000 +0100
-+++ b/src/build.xml	2005-02-06 00:02:39.392389088 +0100
-@@ -1,9 +1,9 @@
--<project name="JDBM" default="main" basedir=".">
-+<project name="JDBM" default="main" basedir="..">
- 
-   <target name="init">
-     <property name="project" value="jdbm" />
-     <property name="source" value="./src" />
--    <property name="main" value="${source}/main" />
-+    <property name="main.src" value="${source}/main" />
-     <property name="etc" value="${source}/etc" />
-     <property name="build" value="build" />
-     <property name="classes" value="${build}/classes" />
-@@ -16,7 +16,7 @@
-     <property name="build.compiler" value="classic" />
-     <property name="deprecation" value="true" />
-     <property file="VERSION" />
--    <property name="archive" value="${project}-${version}" />
-+    <property name="archive" value="${project}" />
-   </target>
- 
- 
-@@ -46,7 +46,7 @@
- 
- 
-   <!-- Prepare target directories -->
--  <target name="prepare">
-+  <target name="prepare" depends="init">
-     <mkdir dir="${build}"/>
-     <mkdir dir="${classes}"/>
-     <mkdir dir="${dist}"/>
-@@ -61,8 +61,9 @@
- 
-   <!-- Build all the sources with debug and deprecation -->
-   <target name="main" depends="prepare">
--    <javac srcdir="${main}" destdir="${classes}" excludes="**/package.html"
--           classpath="${classpath}" debug="on" deprecation="${deprecation}" />
-+	  <javac srcdir="${source}/main" destdir="${classes}" excludes="**/package.html"
-+		  classpath="${classpath}" debug="on" deprecation="${deprecation}" 
-+		  target="1.3" source="1.3" />
-   </target>
- 
-   <!-- Same as main, but also cleans and additional targets -->
-@@ -131,7 +132,7 @@
-     <mkdir    dir="${build}/doc/javadoc" />
-     <property name="copyright"
-               value="Cees de Groot (C) 2000-2001. All rights reserved  http://jdbm.sourceforge.net" />
--    <javadoc  sourcepath="${main}" destdir="${build}/doc/javadoc" dir="."
-+      <javadoc  sourcepath="${source}/main" destdir="${build}/doc/javadoc" 
-               doctitle="JDBM JavaDoc" windowtitle="JDBM JavaDoc" bottom="${copyright}"
-               package="true" author="true" version="true" noindex="true"
-               packagenames="jdbm.*" />
diff --git a/dev-java/jdbm/jdbm-0.12-r3.ebuild b/dev-java/jdbm/jdbm-0.12-r3.ebuild
deleted file mode 100644
index 005753faa37b..000000000000
--- a/dev-java/jdbm/jdbm-0.12-r3.ebuild
+++ /dev/null
@@ -1,43 +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"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jdbm aims to be for Java what GDBM is for Perl, Python, C, ..."
-HOMEPAGE="https://sourceforge.net/projects/jdbm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 x86"
-
-# Needs to depend on 1.3 because this uses assert
-# so we need -source 1.3 here.
-RDEPEND="
-	>=virtual/jre-1.3"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.3"
-
-PATCHES=( "${FILESDIR}/${P}-buildfile.patch" )
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	cd "${S}/src" || die
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/jdbm/metadata.xml b/dev-java/jdbm/metadata.xml
deleted file mode 100644
index d95d6cb58ad3..000000000000
--- a/dev-java/jdbm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">jdbm</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jebl/Manifest b/dev-java/jebl/Manifest
deleted file mode 100644
index d1cab4258db0..000000000000
--- a/dev-java/jebl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jebl-2013.02.18.tar.xz 306444 BLAKE2B d30a2fa1701cbb87c21a33745e081dbe2f56f823e4127d3f4326bdaeefb636352d4df5efa1576569949badd1e8b9a149a468da56bcbeef4a8df6ce7445e00918 SHA512 2f18ebbe30efbaab879a290a771a6e3d8fd1ba8afb6b8e0b3e9fb36252a4f65adf0929b77ef6922def61f9430ffcfc8486d822cd463f7ca6752418139d41aafb
diff --git a/dev-java/jebl/jebl-2013.02.18.ebuild b/dev-java/jebl/jebl-2013.02.18.ebuild
deleted file mode 100644
index bcff5ecc34c5..000000000000
--- a/dev-java/jebl/jebl-2013.02.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Evolutionary Biology Library"
-HOMEPAGE="https://sourceforge.net/projects/jebl/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="document"
-
-java_prepare() {
-	rm -rf "${S}/src/org/virion/jam/maconly" || die
-}
-
-src_install() {
-	java-pkg_dojar dist/jebl.jar || die
-	java-pkg_dojar dist/jam.jar || die
-	use doc && java-pkg_dojavadoc doc/api
-}
diff --git a/dev-java/jebl/metadata.xml b/dev-java/jebl/metadata.xml
deleted file mode 100644
index 2577f541fb59..000000000000
--- a/dev-java/jebl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">jebl</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
deleted file mode 100644
index f495103e794b..000000000000
--- a/dev-java/jettison/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jettison-1.3.7.tar.gz 63200 BLAKE2B b33f53a1605b0fa4acd0204602193e4fb7a994c777accf2e64dd77f865501be648aff0d3293730348b9f0c2812c39e74c776adc20780bb902e6f75a538a764a2 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
deleted file mode 100644
index ec0bb15ebbab..000000000000
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="A JSON StAX implementation"
-HOMEPAGE="https://github.com/codehaus/jettison"
-SRC_URI="https://github.com/codehaus/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/wstx:3.2 )"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="${S}/src/main/java"
-
-src_test() {
-	cd src/test/java || die
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,wstx-3.2)"
-
-	local TESTS=$(find * -name "*Test.java" ! -name "DOMTest.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jettison/metadata.xml b/dev-java/jettison/metadata.xml
deleted file mode 100644
index c1d0b2dbc73b..000000000000
--- a/dev-java/jettison/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription lang="en">
-		Jettison is a collection of Java APIs (like STaX and DOM) which read and
-		write JSON. This allows nearly transparent enablement of JSON based web
-		services in services frameworks like CXF or XML serialization frameworks
-		like XStream.
-	</longdescription>
- <upstream>
-  <remote-id type="github">codehaus/jettison</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jid3/Manifest b/dev-java/jid3/Manifest
deleted file mode 100644
index 4ebf24e6cb35..000000000000
--- a/dev-java/jid3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jid3_0.46.tar.gz 972609 BLAKE2B f04e2055eeac530ae5256e43ea1cca2d528ee6b3027d43234c60be5150103212cecb68da5f1d6081462a9f215223f4b4377932b77c72b4de1c8dc816603cc9ea SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707
diff --git a/dev-java/jid3/files/0.46-javadoc.patch b/dev-java/jid3/files/0.46-javadoc.patch
deleted file mode 100644
index 8a17f1de73bb..000000000000
--- a/dev-java/jid3/files/0.46-javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur nbproject.old/build-impl.xml nbproject/build-impl.xml
---- nbproject.old/build-impl.xml	2007-05-05 13:32:49.000000000 +0300
-+++ nbproject/build-impl.xml	2007-05-05 13:32:56.000000000 +0300
-@@ -343,7 +343,6 @@
-             <sourcepath>
-                 <pathelement location="${src.dir}"/>
-             </sourcepath>
--            <fileset dir="${src.dir}"/>
-         </javadoc>
-     </target>
-     <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
diff --git a/dev-java/jid3/files/0.46-tests-and-unicode.patch b/dev-java/jid3/files/0.46-tests-and-unicode.patch
deleted file mode 100644
index 1453cb38b996..000000000000
--- a/dev-java/jid3/files/0.46-tests-and-unicode.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- src/org/blinkenlights/jid3/io/TextEncoding.java	2008-05-27 11:23:03.000000000 -0700
-+++ src/org/blinkenlights/jid3/io/TextEncoding.java	2008-05-26 10:39:01.000000000 -0700
-@@ -91,7 +91,7 @@
-             case (byte)0x00:
-                 return "ISO-8859-1";
-             case (byte)0x01:
--                return "Unicode";
-+                return "UTF-16";
-             default:
-                 return null;    // can't happen because we control construction of this object
-         }
---- src/org/blinkenlights/jid3/test/AllTests.java	2008-05-27 11:23:03.000000000 -0700
-+++ src/org/blinkenlights/jid3/test/AllTests.java	2008-05-27 11:11:32.000000000 -0700
-@@ -44,7 +44,7 @@
- public class AllTests extends TestCase
- {
-     // set root path for testing, so tests can find the test files
--    public static String s_RootPath = "c:/work/jid3/test_data/";
-+    public static String s_RootPath = "./test_data/";
- 
-     public static void main(String[] args)
-     {
-@@ -134,7 +134,7 @@
-             }
-             
-             // a 'visit list' was created by our visitor, recording which frames were visited, so we can compare
--            if ( ! oTestID3Visitor.getVisitList().equals("3=DS+uw_PsKMr(VT$ICBUtvNyEzRL)W[QJO6*-"))
-+            if ( ! oTestID3Visitor.getVisitList().equals("3rstuvwyzBCDEIJKLMNOPQRSTUVW$()_=+[6*-"))
-             {
-                 fail("Unexpected resulting visit list: " + oTestID3Visitor.getVisitList());
-             }
---- src/org/blinkenlights/jid3/test/ID3V2Test.java	2008-05-27 11:23:03.000000000 -0700
-+++ src/org/blinkenlights/jid3/test/ID3V2Test.java	2008-05-26 10:39:01.000000000 -0700
-@@ -540,7 +540,7 @@
-             oTALB.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setTALBTextInformationFrame(oTALB);
-             
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>ATALB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:01><bh:ff><bh:fe>a<bh:00>b<bh:00>c<bh:00>d<bh:00>e<bh:00>f<bh:00>g<bh:00>h<bh:00>i<bh:00>j<bh:00>k<bh:00>l<bh:00>m<bh:00>n<bh:00>o<bh:00>p<bh:00>q<bh:00>r<bh:00>s<bh:00>t<bh:00>u<bh:00>v<bh:00>w<bh:00>x<bh:00>y<bh:00>z<bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>ATALB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>a<bh:00>b<bh:00>c<bh:00>d<bh:00>e<bh:00>f<bh:00>g<bh:00>h<bh:00>i<bh:00>j<bh:00>k<bh:00>l<bh:00>m<bh:00>n<bh:00>o<bh:00>p<bh:00>q<bh:00>r<bh:00>s<bh:00>t<bh:00>u<bh:00>v<bh:00>w<bh:00>x<bh:00>y<bh:00>z";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -744,7 +744,7 @@
-             oTIME.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setTIMETextInformationFrame(oTIME);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00><bh:15>TIME<bh:00><bh:00><bh:00><bh:0b><bh:00><bh:00><bh:01><bh:ff><bh:fe>0<bh:00>8<bh:00>0<bh:00>5<bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00><bh:15>TIME<bh:00><bh:00><bh:00><bh:0b><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>0<bh:00>8<bh:00>0<bh:00>5";
-             
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1258,7 +1258,7 @@
-             oTXXX = new TXXXTextInformationID3V2Frame("description2", "information2");
-             oID3V2_3_0Tag.addTXXXTextInformationFrame(oTXXX);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>aTXXX<bh:00><bh:00><bh:00>3<bh:00><bh:00><bh:01><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>f<bh:00>o<bh:00>r<bh:00>m<bh:00>a<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00>TXXX<bh:00><bh:00><bh:00><bh:1a><bh:00><bh:00><bh:00>description2<bh:00>information2";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>aTXXX<bh:00><bh:00><bh:00>3<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>f<bh:00>o<bh:00>r<bh:00>m<bh:00>a<bh:00>t<bh:00>i<bh:00>o<bh:00>nTXXX<bh:00><bh:00><bh:00><bh:1a><bh:00><bh:00><bh:00>description2<bh:00>information2";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1464,7 +1464,7 @@
-             oWXXX = new WXXXUrlLinkID3V2Frame("another description", "http://www.grebenc.ca");
-             oID3V2_3_0Tag.addWXXXUrlLinkFrame(oWXXX);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>vWXXX<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>another description<bh:00>http://www.grebenc.caWXXX<bh:00><bh:00><bh:00>8<bh:00><bh:00><bh:01><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00>http://jid3.blinkenlights.org";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>vWXXX<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>another description<bh:00>http://www.grebenc.caWXXX<bh:00><bh:00><bh:00>8<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00>http://jid3.blinkenlights.org";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1519,7 +1519,7 @@
-             oID3V2_3_0Tag.addAPICFrame(oAPIC);
-             oID3V2_3_0Tag.addAPICFrame(new APICID3V2Frame("image/jpeg", APICID3V2Frame.PictureType.FrontCover, "Front cover.", new byte[] { 0x05, 0x04, 0x03, 0x02, 0x01 }));
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>bAPIC<bh:00><bh:00><bh:00>/<bh:00><bh:00><bh:01>image/png<bh:00><bh:08><bh:ff><bh:fe>A<bh:00>r<bh:00>t<bh:00>i<bh:00>s<bh:00>t<bh:00> <bh:00>i<bh:00>m<bh:00>a<bh:00>g<bh:00>e<bh:00>.<bh:00><bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>APIC<bh:00><bh:00><bh:00><bh:1f><bh:00><bh:00><bh:00>image/jpeg<bh:00><bh:03>Front cover.<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>bAPIC<bh:00><bh:00><bh:00>/<bh:00><bh:00><bh:01>image/png<bh:00><bh:08><bh:fe><bh:ff><bh:00>A<bh:00>r<bh:00>t<bh:00>i<bh:00>s<bh:00>t<bh:00> <bh:00>i<bh:00>m<bh:00>a<bh:00>g<bh:00>e<bh:00>.<bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>APIC<bh:00><bh:00><bh:00><bh:1f><bh:00><bh:00><bh:00>image/jpeg<bh:00><bh:03>Front cover.<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>";
-             
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1556,7 +1556,7 @@
-             oID3V2_3_0Tag.addCOMMFrame(oCOMM);
-             oID3V2_3_0Tag.addCOMMFrame(new COMMID3V2Frame("rus", "next description", "next actual text"));
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>{COMM<bh:00><bh:00><bh:00>B<bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>s<bh:00>h<bh:00>o<bh:00>r<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:ff><bh:fe>a<bh:00>c<bh:00>t<bh:00>u<bh:00>a<bh:00>l<bh:00> <bh:00>t<bh:00>e<bh:00>x<bh:00>t<bh:00>COMM<bh:00><bh:00><bh:00>%<bh:00><bh:00><bh:00>rusnext description<bh:00>next actual text";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>{COMM<bh:00><bh:00><bh:00>B<bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>s<bh:00>h<bh:00>o<bh:00>r<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:fe><bh:ff><bh:00>a<bh:00>c<bh:00>t<bh:00>u<bh:00>a<bh:00>l<bh:00> <bh:00>t<bh:00>e<bh:00>x<bh:00>tCOMM<bh:00><bh:00><bh:00>%<bh:00><bh:00><bh:00>rusnext description<bh:00>next actual text";
-             
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1605,7 +1605,7 @@
-             oCOMR.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setCOMRFrame(oCOMR);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>tCOMR<bh:00><bh:00><bh:00>j<bh:00><bh:00><bh:01>cad12.99<bh:00>25250101http://jid3.blinkenlights.org<bh:00><bh:03><bh:ff><bh:fe>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00>image/png<bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>tCOMR<bh:00><bh:00><bh:00>j<bh:00><bh:00><bh:01>cad12.99<bh:00>25250101http://jid3.blinkenlights.org<bh:00><bh:03><bh:fe><bh:ff><bh:00>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00>image/png<bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1717,7 +1717,7 @@
-             oGEOB = new GEOBID3V2Frame("image/jpeg", "filename2", "another content description", new byte[] { 0x05, 0x04, 0x03, 0x02, 0x01 });
-             oID3V2_3_0Tag.addGEOBFrame(oGEOB);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:19>GEOB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:00>image/jpeg<bh:00>filename2<bh:00>another content description<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>GEOB<bh:00><bh:00><bh:00>N<bh:00><bh:00><bh:01>image/png<bh:00><bh:ff><bh:fe>f<bh:00>i<bh:00>l<bh:00>e<bh:00>n<bh:00>a<bh:00>m<bh:00>e<bh:00><bh:00><bh:00><bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:19>GEOB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:00>image/jpeg<bh:00>filename2<bh:00>another content description<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>GEOB<bh:00><bh:00><bh:00>N<bh:00><bh:00><bh:01>image/png<bh:00><bh:fe><bh:ff><bh:00>f<bh:00>i<bh:00>l<bh:00>e<bh:00>n<bh:00>a<bh:00>m<bh:00>e<bh:00><bh:00><bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1779,7 +1779,7 @@
-             oIPLS.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setIPLSFrame(oIPLS);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:15>IPLS<bh:00><bh:00><bh:00><bh:8b><bh:00><bh:00><bh:01><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>2<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>2<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>3<bh:00><bh:00><bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:15>IPLS<bh:00><bh:00><bh:00><bh:8b><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>2<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>2<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>3<bh:00><bh:00>";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -1871,7 +1871,7 @@
-             oOWNE.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setOWNEFrame(oOWNE);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*OWNE<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>cad12.34<bh:00>20000102<bh:ff><bh:fe>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*OWNE<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>cad12.34<bh:00>20000102<bh:fe><bh:ff><bh:00>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -2063,7 +2063,7 @@
-             oSYLT.addSyncEntry(new SYLTID3V2Frame.SyncEntry("def", 5));
-             oID3V2_3_0Tag.addSYLTFrame(oSYLT);
- 
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:1a>SYLT<bh:00><bh:00><bh:00><bh:5c><bh:00><bh:00><bh:01>eng<bh:02><bh:01><bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>o<bh:00>n<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:01><bh:ff><bh:fe>t<bh:00>w<bh:00>o<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:02><bh:ff><bh:fe>t<bh:00>h<bh:00>r<bh:00>e<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:03>SYLT<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>rus<bh:01><bh:06>another description<bh:00>abc<bh:00><bh:00><bh:00><bh:00><bh:04>def<bh:00><bh:00><bh:00><bh:00><bh:05>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:1a>SYLT<bh:00><bh:00><bh:00><bh:5c><bh:00><bh:00><bh:01>eng<bh:02><bh:01><bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>o<bh:00>n<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>t<bh:00>w<bh:00>o<bh:00><bh:00><bh:00><bh:00><bh:00><bh:02><bh:fe><bh:ff><bh:00>t<bh:00>h<bh:00>r<bh:00>e<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:03>SYLT<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>rus<bh:01><bh:06>another description<bh:00>abc<bh:00><bh:00><bh:00><bh:00><bh:04>def<bh:00><bh:00><bh:00><bh:00><bh:05>";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -2141,7 +2141,7 @@
-             oUSER.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.setUSERFrame(oUSER);
-             
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*USER<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>T<bh:00>e<bh:00>r<bh:00>m<bh:00>s<bh:00> <bh:00>o<bh:00>f<bh:00> <bh:00>u<bh:00>s<bh:00>e<bh:00>.<bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*USER<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>T<bh:00>e<bh:00>r<bh:00>m<bh:00>s<bh:00> <bh:00>o<bh:00>f<bh:00> <bh:00>u<bh:00>s<bh:00>e<bh:00>.";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -2177,7 +2177,7 @@
-             oUSLT.setTextEncoding(TextEncoding.UNICODE);
-             oID3V2_3_0Tag.addUSLTFrame(oUSLT);
-             
--            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>DUSLT<bh:00><bh:00><bh:00>:<bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>l<bh:00>y<bh:00>r<bh:00>i<bh:00>c<bh:00>s<bh:00>";
-+            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>DUSLT<bh:00><bh:00><bh:00>:<bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>l<bh:00>y<bh:00>r<bh:00>i<bh:00>c<bh:00>s";
- 
-             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);
-         }
-@@ -2599,7 +2599,7 @@
-         ID3Tag.useStrict(false);
-         try
-         {
--            File oSourceDir = new File("c:/temp/mp3");
-+            File oSourceDir = new File("test_data");
-             recurseDirectoryForMP3s(oSourceDir);
-         }
-         catch (Exception e)
---- src/org/blinkenlights/jid3/v2/ID3V2Tag.java	2008-05-27 11:23:03.000000000 -0700
-+++ src/org/blinkenlights/jid3/v2/ID3V2Tag.java	2008-05-27 11:09:51.000000000 -0700
-@@ -50,7 +50,7 @@
-     protected boolean m_bCRCDataFlag;
-     
-     /** Mapping from frame ID to list containing frames. For frames that can only be used once. */
--    protected Map m_oFrameIdToFrameMap = null;
-+    protected SortedMap m_oFrameIdToFrameMap = null;
-     
-     /** Default padding for ID3 v2 frames, if not specified.  16 bytes, because Winamp does not read the last
-      *  frame when there isn't at least 6 bytes of padding following it in a tag. */
-@@ -72,7 +72,7 @@
-         m_bUnsynchronizationUsedFlag = bUnsynchronizationUsedFlag;
-         m_bExtendedHeaderFlag = bExtendedHeaderFlag;
-         m_bExperimentalFlag = bExperimentalFlag;
--        m_oFrameIdToFrameMap = new HashMap();
-+        m_oFrameIdToFrameMap = new TreeMap();
-         //HACK: Default padding of 16 bytes, because Winamp doesn't seem to see the last frame in a v2 tag
-         //      when there is less than 6 bytes of padding.  (???)
-         m_iPaddingLength = s_iDefaultPaddingLength;
diff --git a/dev-java/jid3/jid3-0.46-r2.ebuild b/dev-java/jid3/jid3-0.46-r2.ebuild
deleted file mode 100644
index bfa253213049..000000000000
--- a/dev-java/jid3/jid3-0.46-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-# To make sure the javadoc patch doesn't break things
-WANT_SPLIT_WANT="true"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="ID3 Class Library Implementation"
-HOMEPAGE="http://jid3.blinkenlights.org/"
-SRC_URI="http://jid3.blinkenlights.org/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${MY_P}"
-
-# Feel free to submit a patch that doesn't bundle the classes
-# into the result jar
-DEPEND=">=virtual/jdk-1.4
-	test? ( =dev-java/junit-3.8* )"
-
-RDEPEND=">=virtual/jre-1.4"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-javadoc.patch
-	epatch "${FILESDIR}"/${PV}-tests-and-unicode.patch
-
-	rm -v "${S}"/dist/*.jar || die
-
-	if use !test; then
-		rm -rv "${S}/src/org/blinkenlights/jid3/test" || die
-	fi
-
-}
-
-src_compile() {
-	local junit="-Dlibs.junit.classpath"
-	eant jar $(use_doc) \
-		$(use test && echo ${junit}=$(java-pkg_getjars --build-only junit))
-}
-
-src_test() {
-	ejunit -cp dist/JID3.jar org.blinkenlights.jid3.test.AllTests
-}
-
-src_install() {
-	java-pkg_dojar dist/JID3.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/
-}
diff --git a/dev-java/jid3/metadata.xml b/dev-java/jid3/metadata.xml
deleted file mode 100644
index 7b78435f2ec5..000000000000
--- a/dev-java/jid3/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription lang="en">
-		JID3 is a class library, written in Java and licensed under the LGPL,
-		which provides the required functionality for editing ID3 tags commonly
-		used in MP3 media files.
-	</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest
deleted file mode 100644
index 5acb56a18210..000000000000
--- a/dev-java/jinput/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jinput-2.0.6.tar.gz 1590738 BLAKE2B ceb296af7ca4309913708fac5c67c6fec9cd94ef3dad454c41a99ffee7e390545ab6424354dd0dc9755dfb4c0711b449b29b423b395c0f2f504a73d2d7019645 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba
diff --git a/dev-java/jinput/files/javah-classpath.patch b/dev-java/jinput/files/javah-classpath.patch
deleted file mode 100644
index ae90584691b8..000000000000
--- a/dev-java/jinput/files/javah-classpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/linux/build.xml.orig	2006-07-11 22:07:38.000000000 +0100
-+++ plugins/linux/build.xml	2011-11-16 15:49:21.140789781 +0000
-@@ -56,6 +56,7 @@
- 		<javah destdir="src/native">
-             <classpath>
-                 <pathelement location="classes"/>
-+                <pathelement location="../../coreAPI/classes"/>
-             </classpath>
- 			<class name="net.java.games.input.LinuxEventDevice"/>
- 			<class name="net.java.games.input.LinuxJoystickDevice"/>
diff --git a/dev-java/jinput/files/nostrip.patch b/dev-java/jinput/files/nostrip.patch
deleted file mode 100644
index 8627c0d12251..000000000000
--- a/dev-java/jinput/files/nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/linux/src/native/build.xml.orig	2013-03-25 18:01:56.000000000 +0000
-+++ plugins/linux/src/native/build.xml	2015-04-12 17:36:36.020105790 +0100
-@@ -46,9 +46,6 @@
- 			<arg line="-shared -O2 -Wall -o ${libname}"/>
- 			<fileset dir="." includes="*.o"/>
- 		</apply>
--		<apply dir="." parallel="true" executable="strip" os="Linux" failonerror="true">
--			<fileset file="${libname}"/>
--		</apply>
-     </target>
- </project>
- 
diff --git a/dev-java/jinput/files/remove-getDeviceUsageBits.patch b/dev-java/jinput/files/remove-getDeviceUsageBits.patch
deleted file mode 100644
index 038473d5ba00..000000000000
--- a/dev-java/jinput/files/remove-getDeviceUsageBits.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 3f8a5394be4cddfb5bec584170678aac0f28b763 Mon Sep 17 00:00:00 2001
-From: Endolf <endolf@java.net>
-Date: Fri, 22 Aug 2014 14:38:30 +0100
-Subject: [PATCH] Remove usage_bits call as it doesn't work on v3 kernels.
-
----
- .../net/java/games/input/LinuxEventDevice.java     | 32 ----------------------
- .../native/net_java_games_input_LinuxEventDevice.c | 14 ----------
- 2 files changed, 46 deletions(-)
-
-diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
-index a28c4c7..41a4fee 100644
---- a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
-+++ b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
-@@ -94,34 +94,11 @@ private final static int countComponents(List components, Class id_type, boolean
- 	}
- 
- 	private final Controller.Type guessType() throws IOException {
--		Controller.Type type_from_usages = guessTypeFromUsages();
--		if (type_from_usages == Controller.Type.UNKNOWN)
--			return guessTypeFromComponents();
--		else
--			return type_from_usages;
--	}
--	
--	private final Controller.Type guessTypeFromUsages() throws IOException {
--		byte[] usage_bits = getDeviceUsageBits();
--		if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE))
--			return Controller.Type.MOUSE;
--		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD))
--			return Controller.Type.KEYBOARD;
--		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD))
--			return Controller.Type.GAMEPAD;
--		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK))
--			return Controller.Type.STICK;
--		else
--			return Controller.Type.UNKNOWN;
--	}
--
--	private final Controller.Type guessTypeFromComponents() throws IOException {
- 		List components = getComponents();
- 		if (components.size() == 0)
- 			return Controller.Type.UNKNOWN;
- 		int num_rel_axes = countComponents(components, Component.Identifier.Axis.class, true);
- 		int num_abs_axes = countComponents(components, Component.Identifier.Axis.class, false);
--		int num_keys = countComponents(components, Component.Identifier.Key.class, false);
- 		int mouse_traits = 0;
- 		int keyboard_traits = 0;
- 		int joystick_traits = 0;
-@@ -342,15 +319,6 @@ private final List getDeviceComponents() throws IOException {
- 	}
- 	private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException;
- 
--	private final byte[] getDeviceUsageBits() throws IOException {
--		byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1];
--		if (getVersion() >= 0x010001) {
--			nGetDeviceUsageBits(fd, bits);
--		}
--		return bits;
--	}
--	private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException;
--
- 	public final synchronized void pollKeyStates() throws IOException {
- 		nGetKeyStates(fd, key_states);
- 	}
-diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
-index 90eff09..18913c2 100644
---- a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
-+++ b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
-@@ -112,20 +112,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_LinuxEventDevice_nGetNumEffects
- 	return num_effects;
- }
- 
--JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) {
--#if EV_VERSION >= 0x010001
--	int fd = (int)fd_address;
--	jsize len = (*env)->GetArrayLength(env, usages_array);
--	jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL);
--	if (usages == NULL)
--		return;
--	int res = ioctl(fd, EVIOCGUSAGE(len), usages);
--	(*env)->ReleaseByteArrayElements(env, usages_array, usages, 0);
--	if (res == -1)
--		throwIOException(env, "Failed to get device usages (%d)\n", errno);
--#endif
--}
--
- JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) {
- 	int fd = (int)fd_address;
- 	jsize len = (*env)->GetArrayLength(env, bits_array);
diff --git a/dev-java/jinput/files/unbundle.patch b/dev-java/jinput/files/unbundle.patch
deleted file mode 100644
index 1a8686308d71..000000000000
--- a/dev-java/jinput/files/unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build.xml.orig	2013-03-25 18:01:56.000000000 +0000
-+++ build.xml	2015-04-12 17:11:45.869203820 +0100
-@@ -137,7 +137,6 @@
- 			<fileset dir="plugins/wintab/classes">
- 				<include name="**/*.class"/>
- 			</fileset>
--			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>
- 			<manifest>
- 				<attribute name="Sealed" value="true"/>
- 			</manifest>
diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild
deleted file mode 100644
index ad374628ffc7..000000000000
--- a/dev-java/jinput/jinput-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-COMMIT="790b666"
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="An implementation of an API for game controller discovery and polled input"
-HOMEPAGE="https://java.net/projects/jinput"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/jutils:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX="off"
-EANT_BUILD_TARGET="dist"
-
-src_prepare() {
-	# http://java.net/jira/browse/JINPUT-44
-	# http://java.net/jira/browse/JINPUT-45
-	epatch "${FILESDIR}"/{javah-classpath,nostrip,remove-getDeviceUsageBits,unbundle}.patch
-
-	sed -i \
-		-e "s/\"cc\"/\"$(tc-getCC)\"/g" \
-		-e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \
-		plugins/linux/src/native/build.xml || die
-
-	java-pkg_jar-from --into lib jutils
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso dist/lib${PN}-*.so
-
-	# Only core API docs, others would conflict.
-	use doc && java-pkg_dojavadoc coreAPI/apidocs
-	use source && java-pkg_dosrc */src/java/* */**/src/java/*
-}
diff --git a/dev-java/jinput/metadata.xml b/dev-java/jinput/metadata.xml
deleted file mode 100644
index cd1e86c4f004..000000000000
--- a/dev-java/jinput/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>The JInput Project hosts an implementation of an API for game controller discovery and polled input. It is part of a suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems with intention of making the development of high performance games in Java a reality.</longdescription>
- <upstream>
-  <remote-id type="github">jinput/jinput</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jisp/Manifest b/dev-java/jisp/Manifest
deleted file mode 100644
index bdfb53b71e50..000000000000
--- a/dev-java/jisp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jisp-2.5.1-source.tar.gz 63282 BLAKE2B d2e8bbc91f2db1fbe1c8411dade375a8934f3cc662f1c7604097341ba1f0430b4e450dac7e77f1479d4078be4cb4c2878c243c3d1c84b36f6bd1ee9318046b90 SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0
diff --git a/dev-java/jisp/files/jisp-2.5.1-java15.patch b/dev-java/jisp/files/jisp-2.5.1-java15.patch
deleted file mode 100644
index cfc0b7e2c93e..000000000000
--- a/dev-java/jisp/files/jisp-2.5.1-java15.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru jisp-2.5.1/com/coyotegulch/jisp/SerialObjectOutputStream.java jisp-2.5.1-patched/com/coyotegulch/jisp/SerialObjectOutputStream.java
---- jisp-2.5.1/com/coyotegulch/jisp/SerialObjectOutputStream.java	2003-03-27 13:02:19.000000000 -0500
-+++ jisp-2.5.1-patched/com/coyotegulch/jisp/SerialObjectOutputStream.java	2005-11-06 15:24:33.000000000 -0500
-@@ -83,11 +83,11 @@
-         // Check if we have a list of m_buffers
-         if (m_buffers != null)
-         {
--            Iterator enum = m_buffers.iterator();
-+            Iterator i = m_buffers.iterator();
- 
--            while (enum.hasNext())
-+            while (i.hasNext())
-             {
--                byte[] bytes = (byte[]) enum.next();
-+                byte[] bytes = (byte[]) i.next();
-                 out.write(bytes, 0, m_blockSize);
-             }
-         }
-@@ -101,10 +101,10 @@
-         // Check if we have a list of m_buffers
-         if (m_buffers != null)
-         {
--            Iterator enum = m_buffers.iterator();
--            while (enum.hasNext())
-+            Iterator i = m_buffers.iterator();
-+            while (i.hasNext())
-             {
--                byte[] bytes = (byte[]) enum.next();
-+                byte[] bytes = (byte[]) i.next();
-                 out.write(bytes, 0, m_blockSize);
-             }
-         }
-@@ -126,10 +126,10 @@
-        int pos = 0;
-        if (m_buffers != null)
-        {
--           Iterator enum = m_buffers.iterator();
--           while (enum.hasNext())
-+           Iterator i = m_buffers.iterator();
-+           while (i.hasNext())
-            {
--               byte[] bytes = (byte[]) enum.next();
-+               byte[] bytes = (byte[]) i.next();
-                System.arraycopy(bytes,0,data,pos,m_blockSize);
-                pos+=m_blockSize;
-            }
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
deleted file mode 100644
index e2e75426f252..000000000000
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 epatch
-
-DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine"
-HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
-
-# TODO contact upstream about hosting jisp-2.5 on their site.
-# They only maintain 3.0 at the moment
-# This tarball is from jpackage's jisp2 source rpm
-SRC_URI="http://gentooexperimental.org/distfiles/${P}-source.tar.gz"
-
-LICENSE="SVFL"
-SLOT="2.5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-java15.patch
-
-	mkdir src || die
-	mv com src || die
-}
diff --git a/dev-java/jisp/metadata.xml b/dev-java/jisp/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jisp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest
deleted file mode 100644
index 2c4ce524fcee..000000000000
--- a/dev-java/jlibeps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jlibeps-0.1.zip 85686 BLAKE2B 54214d74007f63bafc7a0a88643ca82d488357501eef2f186162b6c8d6c913f77eb0074e7e156fd41954584f7398f47c6f883a802ceda39608ac5f60b4e9def9 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a
diff --git a/dev-java/jlibeps/jlibeps-0.1-r1.ebuild b/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
deleted file mode 100644
index fb9485dca46e..000000000000
--- a/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 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="Library to create EPS graphics from a Graphics2D"
-HOMEPAGE="https://sourceforge.net/projects/jlibeps/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.4"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.4"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
deleted file mode 100644
index 022fa74c7120..000000000000
--- a/dev-java/jlibeps/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">jlibeps</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jortho/Manifest b/dev-java/jortho/Manifest
deleted file mode 100644
index 5b68cdb6baea..000000000000
--- a/dev-java/jortho/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JOrtho_1.0.zip 278599 BLAKE2B 3a8180005b0f34301aeeb5def5ea1b9854f404f14d8c27fd07a74209eeb7e27e1857568a12f7633a0da0ad9ce19324a07baa89370d670a2c8cd7501861fc9c9c SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c
diff --git a/dev-java/jortho/jortho-1.0.ebuild b/dev-java/jortho/jortho-1.0.ebuild
deleted file mode 100644
index f8d16101d570..000000000000
--- a/dev-java/jortho/jortho-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java spell-checking library"
-HOMEPAGE="https://www.inetsoftware.de/other-products/jortho"
-SRC_URI="mirror://sourceforge/project/jortho/JOrtho%20Library/${PV}/JOrtho_${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-java_prepare() {
-	find . -name '*.jar' -exec rm -v {} + || die
-}
-
-JAVA_SRC_DIR="src/com"
-src_compile() {
-	mkdir -p target/classes/com/inet/jortho/i18n || die
-	find src -name '*.properties' \
-		-exec cp {} target/classes/com/inet/jortho/i18n \; || die
-
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples src/SampleAppl{et,ication}.java
-}
diff --git a/dev-java/jortho/metadata.xml b/dev-java/jortho/metadata.xml
deleted file mode 100644
index 2c7565681312..000000000000
--- a/dev-java/jortho/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">jortho</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jreleaseinfo/Manifest b/dev-java/jreleaseinfo/Manifest
deleted file mode 100644
index 2c7ea1177f91..000000000000
--- a/dev-java/jreleaseinfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jreleaseinfo-1.3.0-src.zip 38437 BLAKE2B 614c60b47e2e662751eeada60d5b0985cf0ffd090ebc9563c26f7d1a58177a3f375772946f85dd1c91227c5230d7cedbfcdde36b7dcfdc066183651eaf0d2bb8 SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f
diff --git a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
deleted file mode 100644
index 8f0805c4e2f9..000000000000
--- a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ant Task for build-time creation of Java source file with version or other info"
-HOMEPAGE="https://sourceforge.net/projects/jreleaseinfo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="source"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	dev-java/ant-core:0
-	source? ( app-arch/zip:0 )"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/ant-core:0"
-
-EANT_GENTOO_CLASSPATH="ant-core"
-
-java_prepare() {
-	java-ant_rewrite-classpath build.xml
-}
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar"
-
-	dodoc LICENSE.txt
-
-	use source && java-pkg_dosrc src/java/ch
-}
diff --git a/dev-java/jreleaseinfo/metadata.xml b/dev-java/jreleaseinfo/metadata.xml
deleted file mode 100644
index ebaf525cf9e3..000000000000
--- a/dev-java/jreleaseinfo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">jreleaseinfo</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jstun/Manifest b/dev-java/jstun/Manifest
deleted file mode 100644
index 9cd5eb0888dd..000000000000
--- a/dev-java/jstun/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jstun-0.7.3.src.tar.gz 173666 BLAKE2B d417b95f2adf5f072b35ca5ea50d3c32c60b0ae7d2095b4ffaa79f6dc9817bc730657189da0abf59f6e3bd362ae34c3c3ad9c02e8456e84a33e02c9cab3bfa65 SHA512 03dd54331c79992ef2c387eb78fde8c98b58e3818515bf57beafb6157914fe9295d3ff043ac8aab78490ac2582969c07e1891ddbefaa702c3816ddac061ceb18
diff --git a/dev-java/jstun/jstun-0.7.3.ebuild b/dev-java/jstun/jstun-0.7.3.ebuild
deleted file mode 100644
index c50d44fcd0f7..000000000000
--- a/dev-java/jstun/jstun-0.7.3.ebuild
+++ /dev/null
@@ -1,62 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java-based STUN implementation"
-HOMEPAGE="https://jstun.javawi.de/"
-SRC_URI="https://${PN}.javawi.de/${P}.src.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
-	>=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-S="${WORKDIR}/STUN"
-
-# Tests contain no main function; demos contain main function, but contact
-# external domains as well as aren't really tests. TODO: A main function needs
-# to be written in order to be able to test de.javawi.jstun.AllTests.
-RESTRICT="test"
-
-EANT_BUILD_XML="build/build.xml"
-
-java_prepare() {
-	rm -v *.jar build/*.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_TEST_TARGET="jar-test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_test() {
-	local cp="$(java-pkg_getjars --build-only junit)"
-
-	java-pkg-2_src_test
-
-	java -cp target/${PN}-test-${PV}.jar:${cp} de.javawi.jstun.AllTests \
-		|| die "Tests failed."
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/jstun/metadata.xml b/dev-java/jstun/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jstun/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
deleted file mode 100644
index 2db9d0abcf91..000000000000
--- a/dev-java/junit-addons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST junit-addons-1.4.zip 293750 BLAKE2B f305ae548ee9577ff9c5be01846768fe111a2cc7c523a080f5bfe823f6e2def5880fce091cd3e460eeae831e639616ec7cbf203dcee1dce66a7075a6343df1df SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a
diff --git a/dev-java/junit-addons/files/1.4-build.xml b/dev-java/junit-addons/files/1.4-build.xml
deleted file mode 100644
index 5b171e1051ab..000000000000
--- a/dev-java/junit-addons/files/1.4-build.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  - Build file for the JUnit-addons Project.
-  -
-  - This script should be started with the following command line :
-  -
-  -     ant <target>
-  -
-  - Run "ant -projecthelp" to get a list of available targets.
-  -
-  - Take from upstream CVS and modified a little for Gentoo:
-  - Version: Revision: 1.15 Date: 2003/04/09 04:41:10 
-  - Author: Vladimir R. Bossicard (vbossica@users.sourceforge.net)
-  -->
-
-<project name="junit-addons" default="build" basedir=".">
-
-    <property file="build.properties" />
-    <property file="common.properties" />
-
-    <!-- directories settings -->
-
-    <property name="src" value="src" />
-    <property name="main.src" value="src/main" />
-    <property name="test.src" value="src/test" />
-    <property name="example.src" value="src/example" />
-
-    <property name="build.dest" value="build" />
-    <property name="api.dest" value="${build.dest}/api" />
-    <property name="classes.dest" value="${build.dest}/classes" />
-    <property name="test.classes.dest" value="${build.dest}/classes-test" />
-    <property name="example.classes.dest" value="${build.dest}/classes-example" />
-    <property name="dist.dest" value="dist" />
-
-    <!-- miscellaneous settings -->
-
-    <property name="compilation.debug" value="on" />
-    <property name="compilation.deprecation" value="off" />
-    <property name="compilation.verbose" value="off" />
-
-    <!--
-      - Initializes the build and check if all libraries are available.
-      -->
-    <target name="init">
-        <tstamp/>
-        <mkdir dir="${build.dest}" />
-        <mkdir dir="${classes.dest}" />
-        <mkdir dir="${test.classes.dest}" />
-        <mkdir dir="${example.classes.dest}" />
-        <mkdir dir="${api.dest}" />
-        <mkdir dir="${dist.dest}" />
-    </target>
-
-    <path id="libraries">
-        <pathelement location="${jdom.jar}" />
-        <pathelement location="${jaxen.jar}" />
-        <pathelement location="${saxpath.jar}" />
-        <pathelement location="${ant.jar}" />
-        <pathelement location="${junit.jar}" />
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${xml-apis.jar}" />
-        <pathelement location="${commons-logging.jar}" />
-    </path>
-
-    <!--
-      - Compiles the source code to the build dir
-      - Copy all other resources to the build dir
-      - which are needed to run the application alone
-      -->
-    <target name="build"
-            depends="init"
-            description="compiles the junit-addons classes">
-        <javac srcdir="${main.src}"
-               destdir="${classes.dest}"
-               debug="${compilation.debug}"
-               verbose="${compilation.verbose}"
-               deprecation="${compilation.deprecation}">
-            <classpath>
-                <path refid="libraries"/>
-            </classpath>
-        </javac>
-
-        <javac srcdir="${example.src}"
-               destdir="${example.classes.dest}"
-               debug="${compilation.debug}"
-               verbose="${compilation.verbose}"
-               deprecation="${compilation.deprecation}">
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <path refid="libraries"/>
-            </classpath>
-        </javac>
-
-        <javac srcdir="${test.src}"
-               destdir="${test.classes.dest}"
-               debug="${compilation.debug}"
-               verbose="${compilation.verbose}"
-               deprecation="${compilation.deprecation}">
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <pathelement location="${example.classes.dest}" />
-                <path refid="libraries"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="test"
-            depends="build"
-            description="tests the junit-addons classes">
-        <java classname="junitx.runner.TestRunner" fork="yes">
-            <jvmarg value="-DPropertyManager.file=${test.src}/tests.properties" />
-            <jvmarg value="-DXMLPropertyManager.file=${test.src}/tests.xml" />
-            <arg line="-verbose" />
-            <arg line="-runner.properties /home/vladimir/projects/junit-addons-runner/src/main/conf/runner.properties" />
-            <arg line="-test.properties ${test.src}/tests.properties" />
-            <arg line="-class AllTests" />
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <pathelement location="${test.classes.dest}" />
-                <pathelement location="${example.classes.dest}" />
-                <pathelement location="${example.src}" />
-                <pathelement location="${junit-addons-runner.jar}" />
-                <path refid="libraries"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="test-old"
-            depends="build">
-        <java classname="junit.textui.TestRunner" fork="yes">
-            <arg line="-class AllTests" />
-            <jvmarg value="-DPropertyManager.file=${test.src}/tests.properties" />
-            <jvmarg value="-DXMLPropertyManager.file=${test.src}/tests.xml" />
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <pathelement location="${test.classes.dest}" />
-                <pathelement location="${example.classes.dest}" />
-                <pathelement location="${example.src}" />
-                <path refid="libraries"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="example"
-            depends="build"
-            description="compiles and runs the examples">
-        <javac srcdir="${example.src}"
-               destdir="${test.classes.dest}"
-               debug="${compilation.debug}"
-               verbose="${compilation.verbose}"
-               deprecation="${compilation.deprecation}">
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <path refid="libraries"/>
-            </classpath>
-        </javac>
-        <java classname="junitx.tool.TestClassValidator" fork="yes">
-            <arg line="junitx.example.ValidationExample" />
-            <classpath>
-                <pathelement location="${classes.dest}" />
-                <pathelement location="${test.classes.dest}" />
-                <path refid="libraries"/>
-            </classpath>
-        </java>
-    </target>
-
-    <!--
-      - Generates the junit-addons API
-      -->
-    <target name="api"
-            depends="build"
-            description="generates the API">
-        <javadoc
-            packagenames="junitx.*"
-            sourcepath="${main.src}"
-            destdir="${api.dest}"
-            overview="${main.src}/overview.html"
-            author="true"
-            version="true"
-            protected="true"
-            use="false"
-            windowtitle="${project.title} v${project.version}"
-            doctitle="${project.title}, version ${project.version}&lt;br>API specification"
-            header="&lt;b>${project.title}&lt;br>version ${project.version}&lt;/b>"
-            bottom="Copyright &amp;#169; ${project.year} ${project.holder}. All Rights Reserved.">
-            <classpath>
-                <path refid="libraries"/>
-            </classpath>
-        </javadoc>
-    </target>
-
-    <!--
-      - Generates a jar archive with the content of the build directory
-      -->
-    <target name="release"
-            depends="clean, build"
-            description="Generate the junit-addons jar archive" >
-        <delete quiet="true">
-            <fileset dir="${dist.dest}/" includes="${project.name}-${project.version}.jar" />
-        </delete>
-        <jar jarfile="${dist.dest}/${project.name}-${project.version}.jar"
-            basedir="${classes.dest}" >
-            <manifest>
-                <attribute name="Implementation-Vendor"
-                           value="${project.holder}" />
-                <attribute name="Implementation-Version"
-                           value="${project.version}" />
-                <attribute name="Implementation-Title"
-                           value="${project.title}" />
-            </manifest>
-        </jar>
-        <zip zipfile="${dist.dest}/${project.name}-${project.version}.jar"
-             update="yes">
-            <zipfileset dir="." includes="LICENSE" prefix="META-INF" />
-        </zip>
-        <zip zipfile="${dist.dest}/src.jar">
-        	<zipfileset dir="${src}" excludes="**/sflogo.png" prefix="src" />
-       	</zip>
-    </target>
-
-    <!--
-      - Delete all generate directories and their content
-      -->
-    <target name="clean">
-        <delete dir="${build.dest}" quiet="true" />
-        <delete dir="${dist.dest}" quiet="true" />
-    </target>
-
-</project>
diff --git a/dev-java/junit-addons/files/1.4-common.properties b/dev-java/junit-addons/files/1.4-common.properties
deleted file mode 100644
index f1e3efd9fa4a..000000000000
--- a/dev-java/junit-addons/files/1.4-common.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# ----------------------------------------------------------------------------
-# Common properties used by both the build.xml and committer.xml files.
-#
-# Taken from upstream CVS:
-# Version: Revision: 1.2 Date: 2003/04/02 04:50:33 
-# Author: Vladimir R. Bossicard (vbossica@users.sourceforge.net)
-# ----------------------------------------------------------------------------
-
-# Project settings
-
-project.name = junit-addons
-project.title = JUnit-addons
-project.holder = Vladimir R. Bossicard
-project.year = 2002-2003
-project.version = 1.4
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
deleted file mode 100644
index f376923838a0..000000000000
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JUnit-addons is a collection of helper classes for JUnit"
-HOMEPAGE="https://sourceforge.net/projects/junit-addons/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-COMMON_DEP="
-	dev-java/junit:0
-	dev-java/ant-core:0
-	dev-java/jdom:0
-	dev-java/jaxen:1.1
-	"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEP}"
-
-java_prepare() {
-	unpack ./src.jar
-	rm -v *.jar || die
-	# Not included so taken from cvs
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	cp "${FILESDIR}/${PV}-common.properties" common.properties || die
-}
-
-_eant() {
-	eant \
-		-Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
-		-Dant.jar="$(java-pkg_getjar ant-core ant.jar)" \
-		-Djdom.jar="$(java-pkg_getjar jdom jdom.jar)" \
-		-Djaxen.jar="$(java-pkg_getjar jaxen-1.1 jaxen.jar)" \
-		"${@}"
-}
-
-src_compile() {
-	# javadocs are bundled
-	_eant release
-}
-
-# Needs junit-addons-runner that again needs this package to build
-#src_test() {
-#	cd src/test/
-#	_eant -f AntTest.xml
-#}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar
-	dodoc README WHATSNEW
-	use doc && java-pkg_dojavadoc api
-	if use source; then
-		insinto "${JAVA_PKG_SOURCESPATH}"
-		newins dist/src.jar ${PN}-src.zip
-	fi
-}
diff --git a/dev-java/junit-addons/metadata.xml b/dev-java/junit-addons/metadata.xml
deleted file mode 100644
index fcfd31db0858..000000000000
--- a/dev-java/junit-addons/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription lang="en">
-		JUnit-addons is a collection of helper classes for JUnit.
-		This library can be used with both JUnit 3.7 and JUnit 3.8.x
-	</longdescription>
- <upstream>
-  <remote-id type="sourceforge">junit-addons</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/junrar/Manifest b/dev-java/junrar/Manifest
deleted file mode 100644
index acd29c422b2f..000000000000
--- a/dev-java/junrar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST junrar-0.6.tar.gz 70631 BLAKE2B a3702814247c30e5eade940ddacef5c561df53e511057f3321776a80d8d550e2d2fa0f87a228571ffda64d07f5ad818d175f704f408fbbf016953068294db4df SHA512 21da07fabb9f9c605191beaadad6a7abbdd1c02c8daab6913232889e735178954c0e2e7c4546734bb3b530d851d9016a549fbb68cc7795d005119fd176c15991
diff --git a/dev-java/junrar/junrar-0.6.ebuild b/dev-java/junrar/junrar-0.6.ebuild
deleted file mode 100644
index b5c290d608f4..000000000000
--- a/dev-java/junrar/junrar-0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="Unrar java implementation"
-HOMEPAGE="https://github.com/edmund-wagner/junrar/"
-SRC_URI="https://github.com/edmund-wagner/${PN}/archive/${P}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-logging:0
-	dev-java/commons-vfs:2"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="commons-logging,commons-vfs-2"
-JAVA_SRC_DIR="unrar/src/main/java"
-
-java_prepare() {
-	find -name "pom.xml" -delete || die
-}
diff --git a/dev-java/junrar/metadata.xml b/dev-java/junrar/metadata.xml
deleted file mode 100644
index e7258f0c8c93..000000000000
--- a/dev-java/junrar/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">edmund-wagner/junrar</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/jvmstat/Manifest b/dev-java/jvmstat/Manifest
deleted file mode 100644
index fea77e8de02a..000000000000
--- a/dev-java/jvmstat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jvmstat-3_0.zip 153629 BLAKE2B 9191873c9d719a0aab33e3eb7d8ef056dc93861f81c09ef10f7adea457fbfb39f347d34d0b84410457b0b0c52479620bde1060bc5fbc6f7dd1c23efe643d385c SHA512 c3967f5c11ef70aac3b3131c7ca1330c4ea377e59a2e9fb18329cfd9c82a8363efd960c9fb71e4d5f7e81867bd24e5bb6263d2f38b95878222c9184c0aaf4f12
diff --git a/dev-java/jvmstat/jvmstat-3.0-r1.ebuild b/dev-java/jvmstat/jvmstat-3.0-r1.ebuild
deleted file mode 100644
index a8fd913ef6f3..000000000000
--- a/dev-java/jvmstat/jvmstat-3.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 versionator
-
-MY_PV=$(replace_version_separator 1 '_')
-
-DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM"
-HOMEPAGE="http://java.sun.com/performance/jvmstat/"
-SRC_URI="jvmstat-${MY_PV}.zip"
-
-LICENSE="sun-bcla-jvmstat"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RESTRICT="fetch strip"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.5"
-
-RDEPEND="
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/jvmstat/"
-
-INSTTO="/opt/${PN}"
-
-pkg_nofetch() {
-	einfo "Please go to following URL:"
-	einfo " ${HOMEPAGE}"
-	einfo "download file named ${SRC_URI} and place it into"
-	einfo " your DISTDIR directory."
-}
-
-src_install() {
-	dodir "${INSTTO}"
-	cd "${S}" || die
-	cp -r jars bin "${D}/${INSTTO}" || die
-
-	einstalldocs
-
-	if use doc; then
-		dodoc -r docs
-	fi
-
-	dodir /opt/bin
-	cat > "${D}/opt/bin/visualgc" <<-EOF
-	#!/bin/bash
-	export JVMSTAT_JAVA_HOME=$(java-config -O)
-	cd /opt/jvmstat/bin/
-	./visualgc \${@}
-	EOF
-	fperms 755 /opt/bin/visualgc
-
-}
diff --git a/dev-java/jvmstat/metadata.xml b/dev-java/jvmstat/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jvmstat/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
deleted file mode 100644
index f5644cd5df46..000000000000
--- a/dev-java/l2fprod-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST l2fprod-common-7.3.tar.bz2 475662 BLAKE2B 40e41e7fc335220c437befd866bd4c5ff9413235f8efc6cc64922f8f9dbb8661f2acee0491ca9d90599bf314038bf0b2a30099e5ff2a323c39d8d60c3a6b0433 SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a
diff --git a/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch b/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
deleted file mode 100644
index 0ada57e1ed0b..000000000000
--- a/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- components.xml	2006-09-02 13:44:46.000000000 +0300
-+++ components.xml.patched	2008-07-21 21:57:20.000000000 +0300
-@@ -179,26 +179,6 @@
-       <include name="com/l2fprod/common/swing/tips/*.java"/>
-     </javadoc>
-   </component>
--
--  <component name="springrcp">
--    <depend>tasks</depend>
--    <depend>directorychooser</depend>
--    <external-depend groupId="org.springframework" artifactId="spring-richclient" version="2006.02.19"/>
--    <external-depend groupId="org.springframework" artifactId="spring" version="1.2.5"/>
--    <fileset dir="src/java/springrcp" includes="**"/>
--    <resources>
--      <fileset dir="src/java/springrcp" includes="**/*.gif,**/*.png,**/*.properties"/>
--    </resources>
--    <classpath>
--      <pathelement location="build/classes/tasks"/>
--      <pathelement location="build/classes/directorychooser"/>
--      <pathelement location="lib/spring/spring.jar"/>
--      <pathelement location="lib/spring/spring-richclient.jar"/>
--    </classpath>
--    <javadoc>
--      <include name="com/l2fprod/common/springrcp/*.java"/>
--    </javadoc>
--  </component>
-             
-   <component name="all"
-              mainclass="com.l2fprod.common.demo.Main"
-@@ -212,7 +192,6 @@
-     <fileset dir="src/java/tasks" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-     <fileset dir="src/java/totd" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-     <fileset dir="src/java/shared" includes="**/Version.java" excludes="**/*.gif,**/*.png,**/*.jpg"/>
--    <fileset dir="src/java/springrcp" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
-     <resources>
-       <fileset dir="src/java/buttonbar" includes="**/*.gif,**/*.png,**/*.properties"/>
-       <fileset dir="src/java/directorychooser" includes="**/*.gif,**/*.png,**/*.properties"/>
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
deleted file mode 100644
index d80325c1fae9..000000000000
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
-HOMEPAGE="http://common.l2fprod.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="dev-java/nachocalendar:0
-	dev-java/jcalendar:1.2"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/jreleaseinfo:0
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-java_prepare() {
-	# Do not build springrcp and sheet for now, would bloat the deps a lot;
-	# potential USE flag material (spring, calendars deps).
-	epatch "${FILESDIR}/${PN}-6.9.1-nodeps.patch"
-
-	java-pkg_jar-from --build-only --into lib jreleaseinfo jreleaseinfo.jar jreleaseinfo-1.2.0.jar
-}
-
-src_compile() {
-	eant init
-
-	java-ant_bsfix_one build/build4components.xml
-	java-ant_rewrite-classpath build/build4components.xml
-
-	eant -Dgentoo.classpath="$(java-pkg_getjar nachocalendar nachocalendar.jar):$(java-pkg_getjars jcalendar-1.2)" jar
-}
-
-src_install() {
-	java-pkg_dojar build/jars/*.jar
-
-	dodoc README.txt
-}
diff --git a/dev-java/l2fprod-common/metadata.xml b/dev-java/l2fprod-common/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/l2fprod-common/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
deleted file mode 100644
index 9a68ef9be31b..000000000000
--- a/dev-java/ldapsdk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ldapsdk_java_20020819.tar.gz 1068301 BLAKE2B bb49f97908014218ed7a2c38bbc4ee4cb84e63866a7cc300a484588e0868a844367428c7a1008f6d69ba7e40031f03bd50ae595c2122d7a5b1fed91d4570b082 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d
diff --git a/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
deleted file mode 100644
index 13cdf30f843b..000000000000
--- a/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
-index a0ba7e8..42834c1 100644
---- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
-+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
-@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
- 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
- 							   numRead);
- 	
--	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
-+	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- 	    
--	_changeTypes = enum.getValue();
-+	_changeTypes = enumx.getValue();
- 
- 	if (s.size() > 1) {
- 	    if (s.elementAt(1) instanceof BEROctetString) {
-diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
-index c73bb68..5539f11 100644
---- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
-+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
-@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
-             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
-               numRead);
- 
--            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
-+            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- 
--            con.setChangeType(enum.getValue());
-+            con.setChangeType(enumx.getValue());
- 
-             if (s.size() > 1) {
-                 if (s.elementAt(1) instanceof BEROctetString) {
-diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
-index e126d47..b5f6809 100644
---- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
-+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
-@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
-      * @see org.ietf.ldap.util.RDN#getAttributeSyntax
-      */
-     public static String[] getAttributesForSyntax( String oid ) {
--        Enumeration enum = m_attributehash.keys();
-+        Enumeration enumx = m_attributehash.keys();
-         Vector key_v = new Vector();
-         String tmp_str = null;
- 
--        while ( enum.hasMoreElements() ) {
--            tmp_str = (String)enum.nextElement();
-+        while ( enumx.hasMoreElements() ) {
-+            tmp_str = (String)enumx.nextElement();
-             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
-                 key_v.addElement( tmp_str );
-             }
-diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
-index a4d9e88..85cc7af 100644
---- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
-+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
-@@ -4519,9 +4519,9 @@ public class LDAPConnection
-         LDAPControl[] controls = null;
- 
-         synchronized(m_responseControlTable) {            
--            Enumeration enum = m_responseControlTable.keys();          
--            while (enum.hasMoreElements()) {
--                Object client = enum.nextElement();
-+            Enumeration enumx = m_responseControlTable.keys();          
-+            while (enumx.hasMoreElements()) {
-+                Object client = enumx.nextElement();
-                 ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
- 
-                 if (msgID == rspCtrls.msgID) {
-diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
-index 8e486c5..9256aa0 100644
---- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
-+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
-@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
- 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
- 							   numRead);
- 	
--	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
-+	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- 	    
--	m_changeTypes = enum.getValue();
-+	m_changeTypes = enumx.getValue();
- 
- 	if (s.size() > 1) {
- 	    if (s.elementAt(1) instanceof BEROctetString) {
-diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
-index 9bab06a..a5836e8 100644
---- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
-+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
-@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
-             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
-               numRead);
- 
--            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
-+            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- 
--            con.setChangeType(enum.getValue());
-+            con.setChangeType(enumx.getValue());
- 
-             if (s.size() > 1) {
-                 if (s.elementAt(1) instanceof BEROctetString) {
-diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
-index 57bce3a..392d7ea 100644
---- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
-+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
-@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
-      * @see netscape.ldap.util.RDN#getAttributeSyntax
-      */
-     public static String[] getAttributesForSyntax( String oid ) {
--        Enumeration enum = m_attributehash.keys();
-+        Enumeration enumx = m_attributehash.keys();
-         Vector key_v = new Vector();
-         String tmp_str = null;
- 
--        while ( enum.hasMoreElements() ) {
--            tmp_str = (String)enum.nextElement();
-+        while ( enumx.hasMoreElements() ) {
-+            tmp_str = (String)enumx.nextElement();
-             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
-                 key_v.addElement( tmp_str );
-             }
-diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
-index 4bcb46d..7b22371 100644
---- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
-+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
-@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
-      */
-     static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
-         LDAPAttributeSet attrs = new LDAPAttributeSet();
--        for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
--            attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
-+        for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
-+            attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
-         }
-         return attrs;
-     }    
-diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
-index 2595b8a..d9bd103 100644
---- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
-+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
-@@ -465,8 +465,8 @@ public class ObjectMapper {
-      */
-     static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
-         Attributes ctxAttrs = obj.getAttributes("");
--        for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
--            attrs.put((Attribute)enum.next());
-+        for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
-+            attrs.put((Attribute)enumx.next());
-         }
-         return attrs;
-     }
diff --git a/dev-java/ldapsdk/files/ldapsdk-gentoo.patch b/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
deleted file mode 100644
index 539b0f79d033..000000000000
--- a/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -uprN mozilla.orig/directory/java-sdk/build.properties mozilla/directory/java-sdk/build.properties
---- mozilla.orig/directory/java-sdk/build.properties	2004-12-13 16:19:25.626622784 +0100
-+++ mozilla/directory/java-sdk/build.properties	2004-12-13 16:23:48.285692536 +0100
-@@ -12,6 +12,6 @@
- # place the location of this file in the following line.
- # the library may be downloaded from http://www.oroinc.com
- 
--#ororegexp.jar=../lib/oroinc.jar
--
-+#ororegexp.jar=
-+#jss.jar=
- 
-diff -uprN mozilla.orig/directory/java-sdk/build.xml mozilla/directory/java-sdk/build.xml
---- mozilla.orig/directory/java-sdk/build.xml	2004-12-13 16:19:25.636621264 +0100
-+++ mozilla/directory/java-sdk/build.xml	2004-12-13 16:36:40.320325432 +0100
-@@ -58,8 +58,7 @@
- 
-     <!-- the following is to setup the correct info for sun jsse which
-         is jdk dependent -->
--    <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss32_stub.jar"/>
--    <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss32_stub.jar"/>
-+	<property name="ssllibs14" value="${jss.jar}"/>
- 
-     <!-- we do not use the users existing classpath and instead build our own
-          comment the following line out if this is not desired -->
-@@ -75,7 +74,7 @@
-    dist-jndi    : will build only the jndi service provider (ldapsp.jar)
-    dist-docs    : will package up all the documentation (ldapdoc.zip)
- 
--   build        : will compile the entire sdk but not package
-+   bild        : will compile the entire sdk but not package
-    build-jdk    : will compile only the ldap jdk jar
-    build-filter : will compile only the filter classes
-    build-beans  : will compile only the ldap beans
-@@ -173,15 +172,21 @@
-         <!-- Compile the java jdk code from ${src} into ${dest} -->
-         <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
-             excludes="cvs/**"
--            classpath="${jsselibs}"
-+	    classpath="${jsselibs}"
-+	    source="1.4"
-+	    target="1.4"
-         />
-         <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}"
-+	    source="1.4"
-+	    target="1.4"
-         />
-         <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}"
-+	    source="1.4"
-+	    target="1.4"
-         />
-       </target>
- 
-@@ -191,6 +196,8 @@
-         <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
-             excludes="cvs/**"
-             classpath="${jdk.dist}:${jsselibs}:${ororegexp.jar}"
-+	    source="1.4"
-+	    target="1.4"
-         />
-       </target>
- 
-@@ -199,6 +206,8 @@
-         <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}"
-+	    source="1.4"
-+	    target="1.4"
-         />
-       </target>
- 
-@@ -207,6 +216,8 @@
-         <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar"
-+	    source="1.4"
-+	    target="1.4"
-         />
-       </target>
- 
-@@ -221,7 +232,7 @@
-                  author="true"
-                  version="true"
-                  use="true"
--                 classpath="${basedir}/ldapjdk:${basedir}/ldapjdk/lib/jss32_stub.jar:${basedir}/ldapbeans" >
-+		 classpath="${basedir}/ldapjdk:${jss.jar}:${basedir}/ldapbeans" >
-         </javadoc>
- 
-         <javadoc packagenames="com.netscape.jndi.ldap.controls.*"
-diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java
---- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java	2004-12-13 16:19:25.601626584 +0100
-+++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java	2004-12-13 16:19:51.198735232 +0100
-@@ -24,7 +24,7 @@ package netscape.ldap.util;
- import java.io.*;
- import java.util.*;
- import java.net.*;
--import com.oroinc.text.regex.*;
-+import org.apache.oro.text.regex.*;
- import netscape.ldap.*;
- 
- /**
-diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java
---- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java	2004-12-13 16:19:25.601626584 +0100
-+++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java	2004-12-13 16:20:23.892764984 +0100
-@@ -22,7 +22,7 @@
- package netscape.ldap.util;
- 
- import java.util.*;
--import com.oroinc.text.regex.*;
-+import org.apache.oro.text.regex.*;
- 
- /**
-  *  Represents an Internal LDAPFilterList object.  This is an internal object
-diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java
---- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java	2004-12-13 16:19:25.601626584 +0100
-+++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java	2004-12-13 16:20:11.728614216 +0100
-@@ -22,7 +22,7 @@
- package netscape.ldap.util;
- 
- import java.util.*;
--import com.oroinc.text.regex.*;
-+import org.apache.oro.text.regex.*;
- /**
-  *  Represents an LDAPIntFilterSet object.  This is an internal object that
-  *  should never be instantiated directly by the developer.
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
deleted file mode 100644
index 9d6a64e8db56..000000000000
--- a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 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-ant-2
-
-DESCRIPTION="Netscape Directory SDK for Java"
-HOMEPAGE="http://www.mozilla.org/directory/javasdk.html"
-SRC_URI="http://www.mozilla.org/directory/${PN}_java_20020819.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="4.1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/jss:3.4
-	dev-java/jakarta-oro:2.0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/mozilla/directory/java-sdk
-
-java_prepare() {
-	cd "${WORKDIR}"/mozilla || die
-	epatch "${FILESDIR}"/ldapsdk-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-*.patch
-
-	echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > "${S}"/build.properties || die
-	echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> "${S}"/build.properties || die
-
-	cd "${S}"/ldapjdk/lib || die
-	rm -f *.jar || die
-	java-pkg_jar-from jss-3.4
-
-	cd "${S}"/ldapsp/lib || die
-	rm *.jar || die
-
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant dist-jdk dist-filter dist-beans dist-jndi $(use_doc build-docs)
-}
-
-src_install() {
-	java-pkg_dojar dist/packages/*.jar
-
-	use doc && java-pkg_dojavadoc dist/doc/ldapsp
-	use source && \
-		java-pkg_dosrc {ldapsp,ldapjdk}/com	{ldapjdk,ldapbeans,ldapfilter}/netscape
-}
diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/ldapsdk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
deleted file mode 100644
index 99addd75711d..000000000000
--- a/dev-java/libmatthew-java/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a
diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
deleted file mode 100644
index 1132a7e1ce76..000000000000
--- a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
---- libmatthew-java-0.7.2/Makefile	2009-04-05 12:46:42.000000000 +0300
-+++ libmatthew-java-0.7.2_patched/Makefile	2010-02-28 12:07:15.000000000 +0200
-@@ -6,13 +6,12 @@
- CC?=gcc
- LD?=gcc
- JPPFLAGS+=-C -P
--CFLAGS+=-Wall -Os -pedantic -Werror
-+CFLAGS+=-Wall -pedantic
- CSTD?=-std=c99
- CSHAREFLAG+=-fpic -fno-stack-protector
- GCJJNIFLAG=-fjni
- JVERCFLAGS+=-source 1.5
- JCFLAGS+=
--INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
- JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
- 
- LDVER?=$(shell ld -v | cut -d' ' -f1)
-@@ -20,9 +20,8 @@
- 
- ifeq ($(LDVER),GNU)
- LDSHAREFLAGS+=-fpic -shared
--else
--LDSHAREFLAGS+=-lc
- endif
-+LDLIBS=-lc
- 
- PREFIX?=/usr/local
- JARDIR?=$(PREFIX)/share/java
-@@ -62,12 +61,7 @@
- io-$(IOVER).jar: .classes
- 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
- unix-$(UNIXVER).jar: .classes
--ifeq ($(DEBUG),enable)
--	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
--else
--	echo "Class-Path: " > Manifest
--endif
--	(cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
-+	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class)
- 
- hexdump-$(HEXVER).jar: .classes
- 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
-@@ -75,7 +69,7 @@
- %.o: %.c %.h
- 	$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
- lib%.so: %.o
--	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
-+	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< $(LDLIBS)
- unix-java.h: .classes
- 	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
- cgi-java.h: .classes
-@@ -91,13 +85,11 @@
- 	tar zcf $@ libmatthew-java-$(MATTVER)
- 
- debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
--	make .enabledebug
--	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
--	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
-+	$(MAKE) .enabledebug
-+	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
- debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
--	make .disabledebug
--	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
--	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
-+	$(MAKE) .disabledebug
-+	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
- .enabledebug: cx/ath/matthew/debug/Debug.jpp 
- 	mkdir -p classes
- 	cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild
deleted file mode 100644
index 2145bc2cde7a..000000000000
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-inherit java-pkg-2 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A selection of libraries for Java"
-HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.5"
-
-DEPEND="
-	>=virtual/jdk-1.5"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile-fixes.patch )
-DOCS=( INSTALL changelog README )
-
-src_prepare() {
-	default
-	sed -i -e '167d;' cx/ath/matthew/unix/UnixSocket.java || die "sed failed"
-	rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed"
-}
-
-src_compile() {
-	CC=$(tc-getCC) \
-		LD=$(tc-getCC) \
-		INCLUDES="$(java-pkg_get-jni-cflags)" \
-		emake -j1 \
-		JARDIR=/usr/share/libmatthew-java/lib \
-		JCFLAGS="$(java-pkg_javac-args)" \
-		all \
-		$(usev doc)
-}
-
-src_install() {
-	java-pkg_newjar cgi-0.5.jar cgi.jar
-	java-pkg_newjar debug-disable-1.1.jar debug-disable.jar
-	java-pkg_newjar debug-enable-1.1.jar debug-enable.jar
-	java-pkg_newjar hexdump-0.2.jar hexdump.jar
-	java-pkg_newjar io-0.1.jar io.jar
-	java-pkg_newjar unix-0.5.jar unix.jar
-	java-pkg_doso libcgi-java.so
-	java-pkg_doso libunix-java.so
-	einstalldocs
-	use source && java-pkg_dosrc cx/
-	use doc && java-pkg_dojavadoc doc
-}
diff --git a/dev-java/libmatthew-java/metadata.xml b/dev-java/libmatthew-java/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/libmatthew-java/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/minlog/Manifest b/dev-java/minlog/Manifest
deleted file mode 100644
index 27a862f3488c..000000000000
--- a/dev-java/minlog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST minlog-1.2.zip 19766 BLAKE2B e7bbbe5c2aba1bd44ffa793c397061cbae30bdbcc3e1ce7c7293f05ec8a35e898ab52e1dc4c953cda114002a143a503188eff2f33a40303549afa3b257b8208d SHA512 79c341288fc4c18ceb307011b3591e239d00a356fc78379449bbcc4d93b0355665a4425dd31a23d83c79eeebf19a591b9d3fb34d6107a4a503125dc683b4519c
diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
deleted file mode 100644
index 04777ed528b6..000000000000
--- a/dev-java/minlog/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">EsotericSoftware/minlog</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/minlog/minlog-1.2.ebuild b/dev-java/minlog/minlog-1.2.ebuild
deleted file mode 100644
index afa340f3c6df..000000000000
--- a/dev-java/minlog/minlog-1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 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="Minimal overhead Java logging"
-HOMEPAGE="https://github.com/EsotericSoftware/minlog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
deleted file mode 100644
index 875c65d2afd6..000000000000
--- a/dev-java/msv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
deleted file mode 100644
index bd5612c25e95..000000000000
--- a/dev-java/msv/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
-to validate XML documents against several kinds of XML schemata.
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
deleted file mode 100644
index 6eb799182641..000000000000
--- a/dev-java/msv/msv-20130601.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV="${PV:4:2}.${PV:6}"
-MY_PV="${PV:0:4}.${MY_PV//0}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
-HOMEPAGE="https://msv.java.net/"
-SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/iso-relax:0
-	dev-java/relaxng-datatype:0
-	dev-java/xsdlib:0"
-
-RDEPEND="${CDEPEND}
-	dev-java/xerces:2
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.5"
-
-JAVA_GENTOO_CLASSPATH="iso-relax,relaxng-datatype,xsdlib"
-JAVAC_ARGS="-XDignore.symbol.file"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres "${PN}.jar" . ! -path "*/doc-files/*" ! -name "*.html"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-dependency xerces-2
-	java-pkg_dolauncher "${PN}" --main com.sun.msv.driver.textui.Driver
-}
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
deleted file mode 100644
index 496575ac357a..000000000000
--- a/dev-java/nekohtml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nekohtml-1.9.18.tar.gz 10471968 BLAKE2B b033158c2ae6742c615d6bcc58ef05eb18f2395cab5052de20a485adb573b924202ed04dfbcf39bfefb4eec524aa0d5d9216fdd151c4a8722b5277c2808cc878 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb
diff --git a/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch b/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
deleted file mode 100644
index 2f4a6c655cac..000000000000
--- a/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru /tmp/nekohtml-1.9.16.orig/build.xml ./build.xml
---- /tmp/nekohtml-1.9.16.orig/build.xml	2012-07-31 18:12:48.559950104 +0300
-+++ ./build.xml	2012-07-31 18:12:53.887883123 +0300
-@@ -103,8 +103,6 @@
- 		unless="compile.skip">
- 	<mkdir dir="${build.classes.dir}"/>
- 	
--	<compileWith xercesVersion="2.0.2" bridge="2_0"/>
--	<compileWith xercesVersion="2.1.0" bridge="2_1"/>
- 	<compileWith xercesVersion="2.2.1" bridge="2_2"/>
- 	<compileWith xercesVersion="2.3.0" bridge="2_3"/>
- 	<compileWith xercesVersion="2.8.1" bridge="2_3"/>
diff --git a/dev-java/nekohtml/metadata.xml b/dev-java/nekohtml/metadata.xml
deleted file mode 100644
index 09cda2d813cf..000000000000
--- a/dev-java/nekohtml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">nekohtml</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
deleted file mode 100644
index ffc9c5dba8c0..000000000000
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
-
-HOMEPAGE="https://sourceforge.net/projects/nekohtml/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP=">=dev-java/xerces-2.7"
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="xerces-2"
-EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit,xerces-2"
-
-# Do not generate docs, use bundled.
-EANT_DOC_TARGET=""
-
-java_prepare() {
-	find . -iname '*.jar' -delete || die
-	epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/javadoc
-		java-pkg_dohtml -r doc/*
-	fi
-
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples src/sample
-}
diff --git a/dev-java/netty-codec-http/Manifest b/dev-java/netty-codec-http/Manifest
deleted file mode 100644
index be03553487f6..000000000000
--- a/dev-java/netty-codec-http/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-codec-http/metadata.xml b/dev-java/netty-codec-http/metadata.xml
deleted file mode 100644
index b39028d0dde8..000000000000
--- a/dev-java/netty-codec-http/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">netty/netty</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
deleted file mode 100644
index 0265bf4dde13..000000000000
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
-	~dev-java/${MY_PN}-codec-${PV}:0
-	~dev-java/${MY_PN}-common-${PV}:0
-	~dev-java/${MY_PN}-handler-${PV}:0
-	~dev-java/${MY_PN}-transport-${PV}:0
-	dev-java/jboss-marshalling:0
-	dev-java/jzlib:1.1.3
-	dev-java/protobuf-java:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/jboss-marshalling-river:0
-		dev-java/jboss-marshalling-serial:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-handler,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,jboss-marshalling-river,jboss-marshalling-serial,junit-4)"
-	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "ZlibTest*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
deleted file mode 100644
index be03553487f6..000000000000
--- a/dev-java/netty-codec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-codec/metadata.xml b/dev-java/netty-codec/metadata.xml
deleted file mode 100644
index b39028d0dde8..000000000000
--- a/dev-java/netty-codec/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">netty/netty</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
deleted file mode 100644
index afea45ba0c34..000000000000
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
-	~dev-java/${MY_PN}-common-${PV}:0
-	~dev-java/${MY_PN}-transport-${PV}:0
-	dev-java/jboss-marshalling:0
-	dev-java/jzlib:1.1.3
-	dev-java/protobuf-java:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/jboss-marshalling-river:0
-		dev-java/jboss-marshalling-serial:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,jboss-marshalling-river,jboss-marshalling-serial,junit-4)"
-	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "ZlibTest*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-handler/Manifest b/dev-java/netty-handler/Manifest
deleted file mode 100644
index be03553487f6..000000000000
--- a/dev-java/netty-handler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-handler/metadata.xml b/dev-java/netty-handler/metadata.xml
deleted file mode 100644
index b39028d0dde8..000000000000
--- a/dev-java/netty-handler/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">netty/netty</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
deleted file mode 100644
index 75b9cdb0c3de..000000000000
--- a/dev-java/netty-handler/netty-handler-4.0.36.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
-	~dev-java/${MY_PN}-codec-${PV}:0
-	~dev-java/${MY_PN}-common-${PV}:0
-	~dev-java/${MY_PN}-transport-${PV}:0
-	dev-java/${MY_PN}-tcnative:0
-	dev-java/bcpkix:1.52
-	dev-java/bcprov:1.52
-	dev-java/jetty-alpn-api:0
-	dev-java/jetty-npn-api:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-tcnative,${MY_PN}-transport,bcpkix-1.52,bcprov-1.52,jetty-alpn-api,jetty-npn-api"
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito)"
-	local TESTS=$(find * -name "*Test.java" ! -name "RenegotiateTest.java" ! -name "SslContextTest.java" ! -name "SSLEngineTest.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	LD_LIBRARY_PATH=$(java-config -i netty-tcnative) ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
deleted file mode 100644
index d56369ecd5dc..000000000000
--- a/dev-java/picocontainer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST picocontainer-1.1-src.tar.gz 83564 BLAKE2B 193d042400e4509e82c8dd521fc4ee8a246f0b8111cd875810260d510bef08970ac632f3e81c370290e6074dcc75348af7db71abc9047e49b323910d03e932f4 SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777
diff --git a/dev-java/picocontainer/metadata.xml b/dev-java/picocontainer/metadata.xml
deleted file mode 100644
index e69a98803e00..000000000000
--- a/dev-java/picocontainer/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-PicoContainer is very simple container for very simple components.  It
-honors the Inversion of control pattern (IoC) in a way that we calling
-it type 3 IoC.  See below for types. Components are typically going to
-live inside the same JVM. The idea is that this might scale from
-embedded containers for simple beans to enterprise and distributed
-applications.
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
deleted file mode 100644
index 426b18e4aeb6..000000000000
--- a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Small footprint Dependency Injection container"
-HOMEPAGE="http://www.picocontainer.org"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	source? ( app-arch/zip )
-	"
-#	test? (
-#	    >=dev-java/junit-3.8.1
-#	)"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Don't run tests automatically
-	sed -i -e 's/compile,test/compile/' build.xml || die
-
-# doesn't pass internal test even when trying vanilla build.xml that fetches own libs
-#	if use test ; then
-#    	    mkdir -p target/lib
-#	    cd target/lib
-#	    java-pkg_jar-from junit junit-3.8.1.jar
-#	fi
-}
-
-src_compile() {
-	local antflags="-Dfinal.name=${PN} -Dnoget=true jar"
-	eant ${antflags} $(use_doc)
-}
-
-#src_test() {
-#	local antflags="-Dfinal.name=${PN} -Dnoget=true test"
-#	eant ${antflags}
-#}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
deleted file mode 100644
index 0cd7627d31fe..000000000000
--- a/dev-java/prefuse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
deleted file mode 100644
index 43e99a30a8fc..000000000000
--- a/dev-java/prefuse/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">prefuse</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
deleted file mode 100644
index adf15daf1e24..000000000000
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=${PV/_beta/}
-MY_P=${PN}-beta-${MY_PV}
-DESCRIPTION="UI toolkit for building highly interactive visualizations of un-/structured data"
-SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
-HOMEPAGE="http://prefuse.org"
-LICENSE="BSD"
-SLOT="2006"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="dev-java/lucene:1"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-beta
-
-java_prepare() {
-	find lib/ -name "*.jar" | xargs rm -v
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	local targets="prefuse"
-	use examples && targets="${targets} demos"
-	eant $(use_doc api) ${targets} \
-		-Dlucene.lib=$(java-pkg_getjars lucene-1)
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	dodoc readme.txt
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples demos/*
-}
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
deleted file mode 100644
index 146551ab57d7..000000000000
--- a/dev-java/radeox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST radeox-1.0-BETA-2-src.tgz 1720998 BLAKE2B 2142933e8eca18578333c8d144c7cdd79b62c96433c479578e3b9a779de77f9535140f8cb69f399ca868a2dda445099cc60f4df35e7cf26fe3bd72b3acdc6363 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2
diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
deleted file mode 100644
index e83c132077df..000000000000
--- a/dev-java/radeox/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-Radeox API is a lightwight wiki markup rendering engine API to make render
-engines for wikis more portable.
-
-Radeox RE is a Wiki rendering engine implementation that implements the Radeox
-API in Java. The engine renders wiki markup to XHTML. The goal is to develop a
-feature rich, easy to maintain wiki library with a low bug count so writing your
-own Wiki implementation is a breeze.
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
deleted file mode 100644
index 0619bfaeff1e..000000000000
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P/_beta/-BETA-}"
-DESCRIPTION="Radeox Wiki render engine"
-HOMEPAGE="http://www.radeox.org"
-SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4:*
-	=dev-java/commons-logging-1*:0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-EANT_BUILD_TARGET="jar jar-api"
-
-src_prepare() {
-	default
-
-	# TOOD:
-	# these would get bundled to the final jar
-	# we should try to run the tests though
-	rm -rf  src/org/radeox/example/ \
-		src/test/ src/org/radeox/test/ || die
-
-	rm -v lib/*.jar || die
-	rm -v src/org/radeox/filter/*.class || die
-	rm -v src/org/radeox/*/*/*.class || die
-
-	cd lib || die
-	java-pkg_jar-from commons-logging
-}
-
-src_install() {
-	dodoc Changes.txt README Radeox.version
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-	java-pkg_dojar lib/{radeox,radeox-api}.jar
-}
diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
deleted file mode 100644
index 25060fa08d43..000000000000
--- a/dev-java/relaxngcc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST relaxngcc-20031218.zip 2162036 BLAKE2B a5efd9941229e6dbc2d2d223e9d2799a0f56cc6010331175e16cfa2b77b886c060062fd7206bf7d1f9cbbc831a2d06efee176460ced81620ec8ceaed89334921 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b
diff --git a/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
deleted file mode 100644
index 69de6caaa184..000000000000
--- a/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
-index b2f0e5e..bca566f 100644
---- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
-+++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
-@@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
-         jj_expentry[i] = jj_lasttokens[i];
-       }
-       boolean exists = false;
--      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
--        int[] oldentry = (int[])(enum.nextElement());
-+      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
-+        int[] oldentry = (int[])(enumx.nextElement());
-         if (oldentry.length == jj_expentry.length) {
-           exists = true;
-           for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/dev-java/relaxngcc/files/build.xml-1.12-r1 b/dev-java/relaxngcc/files/build.xml-1.12-r1
deleted file mode 100644
index 8f1362567653..000000000000
--- a/dev-java/relaxngcc/files/build.xml-1.12-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project name="relaxngcc" default="jar" basedir=".">
-  <target name="compile">
-    <mkdir dir="build"/>
-    <javac srcdir="src" destdir="build">
-      <classpath>
-        <fileset dir="lib" includes="**/*.jar"/>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="relaxngcc.jar">
-      <manifest>
-        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
-      </manifest>
-      <fileset dir="build">
-        <include name="**/*.class"/>
-      </fileset>
-      <!--
-        For a list of resources to include, see the project.xml from the
-        upstream relaxngcc.jar contained in the base directory of the zip.
-      -->
-      <fileset dir="src">
-        <include name="plugin.jelly"/>
-        <include name="relaxngcc/runtime/*.java"/>
-        <include name="**/*.properties"/>
-        <include name="**/*.xsl"/>
-      </fileset>
-      <zipfileset src="relaxngcc.orig.zip">
-        <include name="project.xml"/>
-      </zipfileset>
-    </jar>
-  </target>
-</project>
diff --git a/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
deleted file mode 100644
index 7969a27da882..000000000000
--- a/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/relaxngcc/builder/SwitchBlockInfo.java.orig	2015-08-13 01:20:52.344000000 +0000
-+++ src/relaxngcc/builder/SwitchBlockInfo.java	2015-08-13 01:21:27.424000000 +0000
-@@ -66,8 +66,6 @@
-             
-             if(prologue!=null) sv.add(prologue);
-             
--            //elsecode, null�Ȃ�errorHandleMethod�ŕ���
--            
-             CDBlock terminal = elsecode;
-             if(terminal==null && errorHandleMethod!=null)
-                 terminal = new CDBlock(errorHandleMethod);
diff --git a/dev-java/relaxngcc/metadata.xml b/dev-java/relaxngcc/metadata.xml
deleted file mode 100644
index 9164d9ae477f..000000000000
--- a/dev-java/relaxngcc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">relaxngcc</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
deleted file mode 100644
index a406e7275961..000000000000
--- a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_DATE="20031218"
-
-DESCRIPTION="RELAX NG Compiler Compiler"
-HOMEPAGE="https://sourceforge.net/projects/relaxngcc/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/msv:0
-	dev-java/xsdlib:0
-	dev-java/ant-core:0
-	dev-java/iso-relax:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-java_prepare() {
-	mv relaxngcc.jar relaxngcc.orig.zip || die
-
-	rm -v *.jar || die
-	rm -v sample/*/*.class || die
-
-	mkdir lib || die
-	cd lib || die
-
-	java-pkg_jarfrom msv
-	java-pkg_jarfrom xsdlib
-	java-pkg_jarfrom ant-core
-	java-pkg_jarfrom iso-relax
-	java-pkg_jarfrom relaxng-datatype
-
-	cd "${S}" || die
-
-	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
-
-	epatch \
-		"${FILESDIR}"/${PV}-*.patch \
-		"${FILESDIR}"/"${P}"-SwitchBlockInfo.java.patch
-
-	rm -rf "src/relaxngcc/maven"
-	java-pkg_filter-compiler jikes
-}
-
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_dojar "${PN}".jar
-
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples sample
-
-	dodoc readme.txt
-	use doc && dohtml -r doc/en/*
-}
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
deleted file mode 100644
index baa1681dcfaf..000000000000
--- a/dev-java/sblim-cim-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
diff --git a/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch b/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
deleted file mode 100644
index 28d7ef2b9e52..000000000000
--- a/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
-index 5b0ce56..cf79a8b 100644
---- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
-+++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
-@@ -1,3 +1,2 @@
--discovery.DiscovererSLPTest
- discovery.WBEMServiceAdvertisementSLPTest
--discovery.AdvertisementCatalogTest
-\ No newline at end of file
-+discovery.AdvertisementCatalogTest
-diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
-index 68eab35..1437e75 100644
---- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
-+++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
-@@ -1,3 +1,2 @@
--slp.SLPTest
- slp.ServiceURLTest
--! testcases.slp.internal.txt
-\ No newline at end of file
-+! testcases.slp.internal.txt
-diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
-index 43da29d..26bb35f 100644
---- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
-+++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
-@@ -5,8 +5,6 @@ cim.CIMVersionTest
- ! testcases.discovery.txt
- ! testcases.util.txt
- ! testcases.wbem.txt
--http.SSLConfigurationTest
- cimxml.CimXmlSerializerTest
--http.HttpClientTest
- http.HttpHeaderTest
- logging.LogAndTraceBrokerTest
-diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
-index 4b34dd4..f0e7431 100644
---- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
-+++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
-@@ -1,3 +1,2 @@
--util.WBEMConfigurationTest
- util.XMLHostStrTest
- util.BadDoubleStringsTest
diff --git a/dev-java/sblim-cim-client/metadata.xml b/dev-java/sblim-cim-client/metadata.xml
deleted file mode 100644
index 8e9d74d98aad..000000000000
--- a/dev-java/sblim-cim-client/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">sblim</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
deleted file mode 100644
index a1d75b5f2d87..000000000000
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
-HOMEPAGE="https://sourceforge.net/projects/sblim.wiki/CimClient"
-SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit )"
-
-S="${WORKDIR}/${PN}2-${PV}-src"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="java-doc"
-EANT_TEST_TARGET="unittest"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-no-network-tests.patch
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "build/lib/${PN}2-${PV}.jar"
-
-	dodoc build/lib/*.properties
-	dodoc ChangeLog README NEWS
-
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
deleted file mode 100644
index 1b08d2456d41..000000000000
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
-HOMEPAGE="https://sourceforge.net/projects/sblim.wiki/CimClient"
-SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit )"
-
-S="${WORKDIR}/${PN}2-${PV}-src"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="java-doc"
-
-EANT_TEST_TARGET="unittest"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "build/lib/${PN}2-${PV}.jar"
-
-	dodoc build/lib/*.properties
-	dodoc ChangeLog README NEWS
-
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
deleted file mode 100644
index c1942ccc3621..000000000000
--- a/dev-java/skinlf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skinlf-6.7-20060722.zip 827174 BLAKE2B 72ada5c0b04023b0e51778698ce0b93da1d02457837cd5aedcb6f651e231e1c1a9dede2490bc182d18af9849f8f182542f71d6c864e02d4c2abbfc4c8bdab7f5 SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6
diff --git a/dev-java/skinlf/files/skinlf-6.7-build.xml b/dev-java/skinlf/files/skinlf-6.7-build.xml
deleted file mode 100644
index 42b4c1145aa2..000000000000
--- a/dev-java/skinlf/files/skinlf-6.7-build.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE project [
-  <!ENTITY build-COMMON SYSTEM "common.xml">
-]>
-
-<!--
-  Skin Look And Feel Build
--->
-<project name="skinlf" default="compile.java" basedir=".">
-
-  <!-- Allow user to override settings -->
-  <property file="${user.home}/skinlf-ant.properties" />
-  <property file="build.properties" />
-
-  <!-- Project Identification -->
-  <property name="project" value="skinlf"/>
-  <property name="version" value="6.7"/>
-  <property name="year"    value="2000-2006"/>
-  <property name="project.fullname" value="Skin Look And Feel"/>
-  <property name="project.nativeskin" value="nativeskin"/>
-
-  <property name="javadoc.packagenames" value="com.l2fprod.gui,com.l2fprod.gui.plaf.skin,com.l2fprod.gui.region,com.l2fprod.gui.nativeskin"/>
-
-
-
-  <path id="classpath">
-  	<fileset dir="lib" includes="**/*.jar"/>
-  </path>
-
-  <property name="classpath.asprop" refid="classpath"/>
-
-  &build-COMMON;
-
-  <target name="compile.javacc" depends="init">
-    <javacc target="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj"
-            outputdirectory="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser"
-            javacchome="lib"
-            static="false"
-            javaunicodeescape="true" />
-  </target>
-
-  <target name="compile" depends="init">
-  </target>
-   
-  <!--
-    Utility targets to use the style converters
-  -->
-  <target name="convert.msstyles">
-    <fail unless="msstyle" message="Specify path to msstyle xml -Dmsstyle=pathtoxml"/>
-    <fail unless="skin"    message="Specify themepack folder -Dskin=pathtothemepackdir"/>
-    <java classname="com.l2fprod.tools.msstyles.MsStylesToSkinLF"
-          classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
-          fork="yes">
-      <arg value="${msstyle}" />
-      <arg value="${msstyle}.xml" />
-      <arg value="${skin}" />
-    </java>
-    <copy todir="${skin}">
-      <fileset dir="src/themepacks/skeletonthemepack" includes="**"/>
-    </copy>
-  </target>
-
-  <!--
-    Start Demos
-  -->
-  <target name="demo">
-    <java classname="examples.demo"
-          classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
-          fork="yes">
-      <arg value="${skin}" />
-    </java>
-  </target>
-
-  <!-- Dist targets -->
-  <target name="jar" depends="compile.java">
-    <jar destfile="${build.dir}/${project}.jar">
-      <fileset dir="${build.classes}" includes="*.class,com/**/*.class" excludes="**/region/**,**/nativeskin/**"/>
-      <fileset dir="${java.src.dir}" includes="com/**/*.properties"/>
-      <fileset dir="${java.src.dir}" includes="com/**/*.template"/>
-      <fileset dir="${java.src.dir}" includes="com/**/*.gif"/>
-      <manifest>
-        <attribute name="Built-by" value="${user.name}"/>
-        <attribute name="Main-Class" value="com.l2fprod.gui.plaf.skin.Skinit"/>
-		<attribute name="Class-Path" value="laf-plugin.jar"/>
-        <section name="com/l2fprod/gui/plaf/skin">
-          <attribute name="Specification-Title" value="${project.fullname}"/>
-          <attribute name="Specification-Version" value="${version}"/>
-          <attribute name="Specification-Vendor" value="L2FProd.com"/>
-          <attribute name="Implementation-Title" value="${project.fullname}"/>
-          <attribute name="Implementation-Version" value="${version}"/> 
-          <attribute name="Implementation-Vendor" value="L2FProd.com"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="obfuscate" depends="jar">
-    <taskdef name="proguard"
-             classname="proguard.ant.ProGuardTask"
-             classpath="lib/proguard.jar"/>
-    <move file="${build.dir}/${project}.jar"
-    	  tofile="${build.dir}/${project}-toobfuscate.jar"/>
-    <proguard
-              outjar="${build.dir}/${project}.jar"
-              obfuscate="yes"
-              usemixedclassnames="no"
-              overloadaggressively="yes"
-              printmapping="obfuscatemapping.txt"
-              printusage="obfuscateusage.txt">
-      <libraryjar name="${java.home}/lib/rt.jar"/>
-      <injar name="${build.dir}/${project}-toobfuscate.jar"/>
-      <keep access="public" type="class" name="Skinit">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.SkinApplet">
-        <method name="*"/>
-      </keep>      
-      <keep access="public" type="class" name="com.l2fprod.gui.SkinChooser">
-        <method name="*"/>
-      </keep>      
-      <keep access="public" type="class" name="com.l2fprod.gui.WindowSnapping">
-        <method name="*"/>
-      </keep>      
-      <keep access="public" type="class" name="com.l2fprod.gui.nativeskin.**">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.CompoundSkin">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.IncorrectVersionException">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.LinuxLookAndFeel">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skin">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinButton">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinFrame">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skinit">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinLookAndFeel">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPersonality">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPreviewWindow">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinProgress">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinScrollbar">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSeparator">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSlider">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSplitPane">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinTab">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.*">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.gtk.GtkSkin">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.kde.KdeSkin">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.gui.region.*">
-        <method name="*"/>
-      </keep>
-      <keep access="public" type="class" name="com.l2fprod.tools.**">
-        <method name="*"/>
-      </keep>
-      <keep type="class" name="com.l2fprod.util.**">
-        <method name="*"/>
-      </keep>
-    </proguard>
-  </target>
-
-  <target name="dist.pre" depends="jar">
-    <!-- examples.jar -->
-    <jar destfile="${build.dist.lib}/examples.jar">
-      <fileset dir="${build.classes}" includes="examples/**.class"/>
-      <fileset dir="${java.src.dir}" includes="examples/**.properties,examples/**.gif,examples/**.jpg"/>
-    </jar>
-    <!-- nativeskin.jar -->
-    <jar jarfile="${build.dist.lib}/nativeskin.jar">
-      <fileset dir="${build.classes}"
-               includes="com/l2fprod/gui/region/**,com/l2fprod/gui/nativeskin/**,com/l2fprod/util/OS**,,com/l2fprod/util/Access**"
-               excludes="**/*.html"/>
-    </jar>
-    <!-- batch files -->
-    <copy todir="${build.dist.bin}"
-	  flatten="yes"
-	  preservelastmodified="yes">
-      <fileset dir="src" includes="**/*.bat"/>
-    </copy>
-    <!-- dlls -->
-    <copy todir="${build.dist.lib}">
-      <fileset dir="src/native/win32" includes="*.dll"/>
-    </copy>
-    <!-- default theme -->
-    <zip destfile="${build.dist.lib}/themepack.zip">
-      <zipfileset dir="src/themepacks/whistlerthemepack"/>
-    </zip>
-  </target>
-
-  <!--
-    Publish the new version of SKinLF
-  -->
-  <target name="publish" depends="init">
-    <!-- copy zip to dist folder -->
-    <copy todir="${publish.download.dir}"
-          file="${project}-${version}-${build.version}.zip"/>
-
-    <filter token="WEB" value="${publish.web.url}"/>
-    <!-- update the jnlp website with the new release -->
-    <!-- put skinlf.jar in jnlp folder -->
-    <copy todir="${publish.skinlf.home}/jnlp/" filtering="on" overwrite="yes">
-      <fileset dir="src/jnlp" includes="*.jnlp"/>
-    </copy>
-    <copy file="${build.dist.lib}/${project}.jar" todir="${publish.skinlf.home}/jnlp/"/>
-    <copy file="${build.dist.lib}/examples.jar" todir="${publish.skinlf.home}/jnlp/"/>
-    <copy file="${build.dist.lib}/themepack.zip" todir="${publish.skinlf.home}/jnlp/"/>
-    <copy file="${build.dist.lib}/nativeskin.jar" todir="${publish.skinlf.home}/jnlp"/>
-    <jar destfile="${publish.skinlf.home}/jnlp/nativeskinlibs.jar"
-         basedir="${build.dist.lib}" includes="*.dll"/>
-
-    <!-- copy the documentation
-    <copy todir="${web.skinlf.home}/documentation">
-      <fileset dir="${javadoc.destdir}"/>
-    </copy>
-    -->
-    <!-- Sign all Jars -->
-    <signjar keystore="../common/keystore" alias="L2FProd.com" storepass="L2FProd.com">
-       <fileset dir="${publish.skinlf.home}/jnlp" includes="*.jar"/>
-    </signjar>
-
-  </target>
-
-  <target name="themes">
-    <zip destfile="${build.www.themedir}/cellshadedthemepack.zip"
-	 basedir="src/themepacks/cellshadedthemepack"/>
-    <zip destfile="${build.www.themedir}/whistlerthemepack.zip"
-	 basedir="src/themepacks/whistlerthemepack"/>
-    <zip destfile="${build.www.themedir}/xplunathemepack.zip"
-	 basedir="src/themepacks/xplunathemepack"/>
-    <zip destfile="${build.www.themedir}/toxicthemepack.zip"
-	 basedir="src/themepacks/toxicthemepack"/>
-    <zip destfile="${build.www.themedir}/beigeazulthemepack.zip"
-	 basedir="src/themepacks/beigeazulthemepack"/>
-
-
-    <!-- png for these themepacks are not in cvs -->
-    <zip destfile="${build.www.themedir}/aquathemepack.zip"
-	 basedir="src/themepacks/aquathemepack"/>
-    <zip destfile="${build.www.themedir}/alloythemepack.zip"
-	 basedir="src/themepacks/alloythemepack"/>
-  </target>
-
-</project>
diff --git a/dev-java/skinlf/files/skinlf-6.7-common.xml b/dev-java/skinlf/files/skinlf-6.7-common.xml
deleted file mode 100644
index c2803acc5bab..000000000000
--- a/dev-java/skinlf/files/skinlf-6.7-common.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--
-  Common Target which could be reused by other projects later.
--->
-
-<!-- COMMON PROPERTIES -->
-
-  <property name="debug" value="true"/>
-  <property name="optimize" value="false"/>
-
-  <!-- Java Related -->
-  <property name="java.src.dir" value="src"/>
-  <property name="javac.compiler" value="modern"/>
-
-  <!-- Destination Directory for the build -->
-  <property name="build.dir" value="build"/>
-  <property name="build.classes" value="${build.dir}/classes"/>
-  <property name="build.src" value="${build.dir}/src"/>
-  <property name="build.dist.dir" value="${project}-${version}"/>
-  <property name="build.dist.src" value="${build.dist.dir}/src"/>
-  <property name="build.dist.lib" value="${build.dist.dir}/lib"/>
-  <property name="build.dist.bin" value="${build.dist.dir}/bin"/>
-  <property name="build.www.dir" value="${build.dir}/www"/>
-
-<!-- COMMON TARGETS -->
-
-  <target name="init.properties">
-    <tstamp>
-      <format property="build.time" pattern="MM/dd/yyyy hh:mm aa" locale="en"/>
-      <format property="build.version" pattern="yyyyMMdd" locale="en"/>
-    </tstamp>
-    <filter token="VERSION" value="${version}"/>
-    <filter token="PROJECT.FULLNAME" value="${project.fullname}"/>
-    <filter token="DATE" value="${build.time}"/>
-    <filter token="YEAR" value="${year}"/>
-  </target>
-
-  <target name="init.directories">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.dist.dir}"/>
-    <mkdir dir="${build.dist.src}"/>
-    <mkdir dir="${build.dist.lib}"/>
-    <mkdir dir="${build.dist.bin}"/>
-  </target>
-
-  <target name="init" depends="init.properties,init.directories">
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${build.dist.dir}"/>
-  </target>
-
-  <target name="fixcrlf">
-    <fixcrlf srcdir="${basedir}" eol="cr">
-      <include name="AUTHORS,LICENSE*,README,THANKS" />
-      <include name="**/*.java" />
-    </fixcrlf>
-  </target>
-
-<!-- Java Related Targets -->
-
-  <target name="compile.java" depends="init">
-    <depend srcdir="${java.src.dir}"
-            destdir="${build.classes}"
-            cache="${build.dir}/dependcache"
-            closure="yes"/>
-
-    <copy todir="${build.src}" filtering="yes">
-      <fileset dir="${java.src.dir}">
-        <include name="**/*.java"/>
-      </fileset>
-    </copy>
-    <javac srcdir="${build.src}"
-           destdir="${build.classes}"
-           classpathref="classpath"
-           compiler="${javac.compiler}"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           debug="${debug}"
-           optimize="${optimize}"
-           target="1.3" source="1.3">
-    </javac>
-  </target>
-
-<!-- Distribution Target -->
-
-  <target name="dist" depends="jar,dist.pre">
-    <!-- project.jar -->
-    <copy todir="${build.dist.lib}"
-          file="${build.dir}/${project}.jar"
-          preservelastmodified="yes"/>
-    <!-- source code -->
-    <copy todir="${build.dist.src}"
-          preservelastmodified="yes">
-      <fileset dir="${build.src}" includes="**/*.java"/>
-      <fileset dir="${java.src.dir}" includes="**/*.properties"/>
-    </copy>
-    <!-- regular files -->
-    <copy todir="${build.dist.dir}"
-          filtering="yes"
-          preservelastmodified="yes">
-      <fileset dir="${basedir}">
-        <include name="AUTHORS"/>
-        <include name="INSTALL"/>
-        <include name="README"/>
-        <include name="THANKS"/>
-        <include name="LICENSE"/>
-        <include name="LICENSE_*"/>
-      </fileset>
-    </copy>
-    <xslt in="xdocs/CHANGES.xml"
-          out="${build.dist.dir}/CHANGES"
-          style="xdocs/xsl/text.xsl"/>
-    <!-- zip file -->
-    <zip destfile="${project}-${version}-${build.version}.zip">
-      <zipfileset dir="${build.dist.dir}"
-                  prefix="${project}-${version}" />
-    </zip>
-  </target>
-
-<!-- Source code formatting -->
-
-  <target name="jalopy" depends="init">
-  </target>
-
-<!-- Project Web Documentation -->
-
-  <target name="www" depends="init">
-    <mkdir dir="${build.www.dir}"/>
-    <xslt in="xdocs/www.xml"
-          out="${build.www.dir}/empty.html"
-          style="xdocs/xsl/tohtml.xsl">
-      <param name="output.dir" expression="${build.www.dir}"/>
-      <param name="timestamp" expression="${build.time}"/>
-    </xslt>
-    <copy todir="${build.www.dir}">
-      <fileset dir="xdocs">
-        <include name="images/**"/>
-        <include name="**.java"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${build.www.dir}/javadoc"/>
-    <javadoc sourcepath="${java.src.dir}"
-             classpath="${classpath}"
-             destdir="${build.www.dir}/javadoc"
-             packagenames="${javadoc.packagenames}"
-             private="false" protected="true"
-             windowtitle="${project.fullname} ${version} API"
-             doctitle="${project.fullname} ${version}"
-             version="false" author="false" use="false"
-             stylesheetfile="xdocs/javadoc.css"
-             splitindex="true"
-             bottom="Copyright &#169; ${year} L2FProd.com. All Rights Reserved."/>
-    <delete file="${build.www.dir}/empty.html"/>
-  </target>
-
-  <target name="www.sync" depends="init">
-    <ftp server="${build.www.server}"
-	 userid="${build.www.userid}"
-	 password="${build.www.password}"
-	 remotedir="${build.www.remotedir}"
-	 action="put"
-	 verbose="yes"
-	 depends="yes">
-      <fileset dir="${build.www.dir}">
-        <include name="**/**"/>
-      </fileset>
-    </ftp>
-  </target>
-  
diff --git a/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch
deleted file mode 100644
index 3e797bf08d86..000000000000
--- a/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
---- src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:09:36.000000000 +0100
-+++ src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:19:19.000000000 +0100
-@@ -6,15 +6,12 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
-+import javax.imageio.*;
- 
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
-@@ -22,29 +19,33 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
--
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
- 
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
-@@ -55,7 +56,7 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-+	ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       }
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
diff --git a/dev-java/skinlf/metadata.xml b/dev-java/skinlf/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/skinlf/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/skinlf/skinlf-6.7-r1.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
deleted file mode 100644
index 7d30b4c15a99..000000000000
--- a/dev-java/skinlf/skinlf-6.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="examples source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_P="${P}-20060722"
-
-DESCRIPTION="Skin Look and Feel - Skinning Engine for the Swing toolkit"
-HOMEPAGE="http://skinlf.l2fprod.com/"
-SRC_URI="https://${PN}.dev.java.net/files/documents/66/37801/${MY_P}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/laf-plugin:0
-	dev-java/xalan:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	${CDEPEND}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-image-utils-without-jimi.patch"
-
-	cp "${FILESDIR}/${P}-build.xml" build.xml || die
-	cp "${FILESDIR}/${P}-common.xml" common.xml || die
-
-	cd lib || die
-
-	# assert_built_jar_equals is your friend, upstream your enemy
-	unzip ${PN}.jar '*.gif' '*.template' -d ../src || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from xalan,laf-plugin
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	# laf-plugin.jar is referenced in manifest's Class-Path
-	# doesn't work without it due to class loader trickery
-	# upstream solved this by absorbing laf-plugin in own jar...
-	java-pkg_dojar lib/laf-plugin.jar
-
-	use examples && java-pkg_doexamples src/examples
-	use source && java-pkg_dosrc src/com src/*.java
-
-	dodoc CHANGES README
-}
diff --git a/dev-java/spymemcached/Manifest b/dev-java/spymemcached/Manifest
deleted file mode 100644
index ecaf25e78025..000000000000
--- a/dev-java/spymemcached/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spymemcached-2.9.1-sources.jar 305723 BLAKE2B fb79ecc9d808a47da09e749bb54ef73b40638735a04e827c8b0487a8e44c5baf1daf4ddd434920b9d97ee81f65baefaf23f36f14da79d0ceeaa405938603a32f SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614
diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
deleted file mode 100644
index e71af0ef93ce..000000000000
--- a/dev-java/spymemcached/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="google-code">spymemcached</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
deleted file mode 100644
index 7268e56ee81f..000000000000
--- a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="A simple, asynchronous, single-threaded memcached client written in java"
-HOMEPAGE="https://code.google.com/p/spymemcached/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-sources.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
-
-java_prepare() {
-	rm net/spy/memcached/spring/MemcachedClientFactoryBean.java || die
-}
diff --git a/dev-java/stax-ex/Manifest b/dev-java/stax-ex/Manifest
deleted file mode 100644
index e7effc131b37..000000000000
--- a/dev-java/stax-ex/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST stax-ex-1.0-src.tar.gz 15446 BLAKE2B dbf1e1bf70ea008e03fa7382ade4213e266faa051a4803d995fb1676c607739a13904b12b3e5961c23a892076814d97dfb123dc26de67ed62ebf20fcb3facfd5 SHA512 acb58c7b182c7aced70099027af8e29b03e42e11f97104a75dfcbe8fad6f989733d67d31c203a95072f04d7e008240fdba59b5abfb6c5362268e12c138204938
-DIST stax-ex-1.7.6-sources.jar 49384 BLAKE2B dc65a16f3ad86cadeed2a2a3ac15b082a00fae910ab6fec4a6ccfae8969ed162b1a7b8f426889f03c555856b2a5d5556990306e55070c8219dd65d1ff28348bb SHA512 74bff2e094d29f63fb718c249b7e0fc004ca00e7f374af6634484d0c96ee8f1dbfd793706906e375b473b86b34e7a2c55c1d6b65a1d1b10b0125498b9365efe0
diff --git a/dev-java/stax-ex/metadata.xml b/dev-java/stax-ex/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/stax-ex/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/stax-ex/stax-ex-1.0-r5.ebuild b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
deleted file mode 100644
index d0e9b1b1191e..000000000000
--- a/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Extensions to complement JSR-173 StAX API"
-HOMEPAGE="http://stax-ex.java.net/"
-SRC_URI="https://stax-ex.java.net/files/documents/4480/44372/${P}-src.tar.gz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	default
-	rm "${S}"/build.xml || die
-}
diff --git a/dev-java/stax-ex/stax-ex-1.7.6.ebuild b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
deleted file mode 100644
index 1d5307c0d826..000000000000
--- a/dev-java/stax-ex/stax-ex-1.7.6.ebuild
+++ /dev/null
@@ -1,24 +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="Extensions to complement JSR-173 StAX API"
-HOMEPAGE="http://stax-ex.java.net/"
-SRC_URI="https://maven.java.net/content/groups/public/org/jvnet/${PN/-/}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEPEND}"
diff --git a/dev-java/stax2-api/Manifest b/dev-java/stax2-api/Manifest
deleted file mode 100644
index ecb71b1e39c1..000000000000
--- a/dev-java/stax2-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stax2-api-4.0.0.tar.gz 127125 BLAKE2B 43d29aa29ce010b950489811fd4128b37b86a329464bc02ae9259fceefd407b1f7b4f3cff1da27395003b6c893946e863c6f443e7e7708a487685740713ddac0 SHA512 a8636de873c97534fe17738efb9892d38c52a1a6adfec9502b727082f24b57dc5bfd10a67b5f5d9e196a53d7ee461978dcf8e6c306168bd1cf96a6d67c655b5b
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
deleted file mode 100644
index 35aeadd9dd75..000000000000
--- a/dev-java/stax2-api/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>Stax2 API is an extension to standard Stax API ("STandard Api for Xml procesing"), pull-parser API of JDK, added in JDK 6.</longdescription>
- <upstream>
-  <remote-id type="github">FasterXML/stax2-api</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
deleted file mode 100644
index 7ac668e79e29..000000000000
--- a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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="Extended Stax (STandard Api for Xml procesing) API"
-HOMEPAGE="https://github.com/FasterXML/stax2-api"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-${P}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../README.md ../release-notes/VERSION
-}
diff --git a/dev-java/stax2-api/stax2-api-4.0.0.ebuild b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
deleted file mode 100644
index 63a661dec1c3..000000000000
--- a/dev-java/stax2-api/stax2-api-4.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 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="Extended Stax (STandard Api for Xml procesing) API"
-HOMEPAGE="https://github.com/FasterXML/stax2-api"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="java-virtuals/stax-api:0
-	>=virtual/jre-1.5"
-
-DEPEND="java-virtuals/stax-api:0
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}-${P}/src"
-JAVA_SRC_DIR="main/java"
-JAVA_GENTOO_CLASSPATH="stax-api"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../README.md ../release-notes/VERSION
-}
diff --git a/dev-java/sun-httpserver-bin/Manifest b/dev-java/sun-httpserver-bin/Manifest
deleted file mode 100644
index f75a76ceef9b..000000000000
--- a/dev-java/sun-httpserver-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JAXWS2.0.1m1_source_20060817.jar 8993405 BLAKE2B 85661cb9c5c60035c0d9f506f20671d3602a2ffc22d94a608f6d926d4caa966ac7edc77decbf218254b786c41afc2a49621861592c6612688b628c7b182c64ed SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314
diff --git a/dev-java/sun-httpserver-bin/metadata.xml b/dev-java/sun-httpserver-bin/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/sun-httpserver-bin/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
deleted file mode 100644
index f4d927f6dc62..000000000000
--- a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="Sun sun.net.httpserver classes"
-HOMEPAGE="http://jax-ws.dev.java.net/"
-DATE="20060817"
-MY_P="JAXWS${PV}m1_source_${DATE}.jar"
-SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
-
-LICENSE="CDDL"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/jaxws-si"
-
-src_unpack() {
-	MY_JAVA=$(java-config -J)
-
-	echo "A" | ${MY_JAVA} -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
-
-	unpack ./jaxws-src.zip || die "unzip failed"
-
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar lib/http.jar
-}
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
deleted file mode 100644
index aff90230b6d2..000000000000
--- a/dev-java/sun-jmx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/sun-jmx/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
deleted file mode 100644
index 7564581f335d..000000000000
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples"
-
-inherit java-pkg-2
-
-MY_P=jmx-${PV//./_}
-DESCRIPTION="Java Management Extensions for managing and monitoring"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html"
-SRC_URI="${MY_P}-ri.zip"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-arch/unzip"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-RESTRICT="bindist fetch"
-
-S="${WORKDIR}/${MY_P}-bin"
-
-DOWNLOADSITE="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html"
-
-src_compile() { :; }
-
-pkg_nofetch() {
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo
-	einfo " 1. Visit ${DOWNLOADSITE} and follow instructions"
-	einfo " 2. Download ${SRC_URI}"
-	einfo " 3. Move file to your DISTDIR directory"
-	einfo " 4. Run emerge on this package again to complete"
-	einfo
-}
-
-src_install() {
-	java-pkg_dojar lib/*.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/api
-		java-pkg_dohtml -r doc/doc doc/index.html
-	fi
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/wstx/Manifest b/dev-java/wstx/Manifest
deleted file mode 100644
index f14fee50ae86..000000000000
--- a/dev-java/wstx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wstx-src-3.2.9.zip 2218419 BLAKE2B 98daf8a6bca50085cfa3f281c65567da5a51fd376042f6bb4fcb6bd1f77a442acbae8e27507e9aea8bc5da8da969f30c38a8e253f55d535f6669a3a0690c850e SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117
diff --git a/dev-java/wstx/files/wstx-3.2.9-build.xml.patch b/dev-java/wstx/files/wstx-3.2.9-build.xml.patch
deleted file mode 100644
index 58f689039cf6..000000000000
--- a/dev-java/wstx/files/wstx-3.2.9-build.xml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -104,10 +104,6 @@
-         <include name="org/codehaus/stax2/**/*.class" />
-     </patternset>
- 
--    <!-- 02-Mar-2009, TSa: Let's try automating Maven builds
--      -->
--    <import file="build-maven-deploy.xml" />
--
-     <!-- And then something nifty, for creating minimal jars! -->
- 
-     <classfileset id="j2meInputMinimal" dir="${BuildClassesDir}">
diff --git a/dev-java/wstx/metadata.xml b/dev-java/wstx/metadata.xml
deleted file mode 100644
index cc6567f705d4..000000000000
--- a/dev-java/wstx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription lang="en">
-		Woodstox is a high-performance validating namespace-aware StAX-compliant
-		(JSR-173) Open Source XML-processor written in Java.
-	</longdescription>
- <upstream>
-  <remote-id type="github">FasterXML/woodstox</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
deleted file mode 100644
index ddddc0b42a6c..000000000000
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Woodstox is a high-performance validating namespace-aware XML-processor"
-HOMEPAGE="https://github.com/FasterXML/woodstox"
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/sax:0
-	dev-java/msv:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadoc"
-
-# Don't need to make a folder
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	rm -v lib/msv/*.jar || die
-	rm -v lib/*.jar || die
-
-	# Get rid of a missing include.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-EANT_GENTOO_CLASSPATH="sax,msv,relaxng-datatype"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar build/"${PN}"-api-"${PV}".jar "${PN}"-api.jar
-	java-pkg_newjar build/"${PN}"-asl-"${PV}".jar "${PN}".jar
-	use doc && java-pkg_dojavadoc build/javadoc
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/xmlstreambuffer/Manifest b/dev-java/xmlstreambuffer/Manifest
deleted file mode 100644
index c27d2d9bea66..000000000000
--- a/dev-java/xmlstreambuffer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST streambuffer-1.5.3-sources.jar 63319 BLAKE2B f41af2d3ab6bd085779fb7aa4e5025727762878f408f0b1908a6471ed31c6674d576db6eb7dd269e3f071bd12beab899e46df5699971711401099dcfe4fe8fd9 SHA512 5f906af01bc2a796efb8f3221c60da3faf20c2a695d0d86afcc1439857ce55a90ecd9df6853b3717e28736c02524e05735770300eecbe83ba58c217c9da92740
diff --git a/dev-java/xmlstreambuffer/metadata.xml b/dev-java/xmlstreambuffer/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/xmlstreambuffer/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
deleted file mode 100644
index 52d9d6ba51ca..000000000000
--- a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 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
-
-MY_PN=${PN/xml/}
-
-DESCRIPTION="A stream-based representation of an XML infoset in Java"
-HOMEPAGE="https://xmlstreambuffer.java.net/"
-SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/${MY_PN}/${PV}/${MY_PN}-${PV}-sources.jar"
-
-LICENSE="CDDL GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="dev-java/stax-ex:1"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="stax-ex-1"
diff --git a/dev-java/zeus-jscl/Manifest b/dev-java/zeus-jscl/Manifest
deleted file mode 100644
index a97397dc5bae..000000000000
--- a/dev-java/zeus-jscl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zeus-jscl_v1_64.zip 585558 BLAKE2B 10b106d34953a9306b10ef4d73b2c8d34eadb0849a5facb0ac3682a1f6cd3e39c7ef789da0b32ce2e720698694c466385d32c33a57785c7603e67af18375e8da SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
deleted file mode 100644
index ad4514d46aa1..000000000000
--- a/dev-java/zeus-jscl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="sourceforge">zeus-jscl</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
deleted file mode 100644
index 219e7e9f13c4..000000000000
--- a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}_v${PV//./_}"
-
-DESCRIPTION="Zeus Java Swing Components Library"
-HOMEPAGE="https://sourceforge.net/projects/zeus-jscl/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.5
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	use source && java-pkg_dosrc src
-	use doc && java-pkg_dojavadoc doc/api
-}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-27 01:37:59 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-27 01:37:59 +0000
commit	4b2d3221bbd9baa6c4b176719b4513c592765867 (patch)
tree	8cad62399a59b2a751dccc322d97924e9275fc0b /dev-java
parent	4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3 (diff)
download	baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.tar.gz baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.tar.xz baldeagleos-repo-4b2d3221bbd9baa6c4b176719b4513c592765867.zip