gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-java
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
295 files changed, 462 insertions, 10449 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9f17fadd32a0..c79386ab1caf 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 271f24335c11..0833c8818940 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -11,7 +11,7 @@ DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
 EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r9.ebuild 1126 BLAKE2B d39a0e5d9d46d345dd23ce49cf44c1f40bb1a8c2929dfe98acb0265fb24c06466ead638cfc004999bd60b4a163439846a589062dcc2d1a829b8b7b14ac82c09e SHA512 6af7b69db4a2eab58bdc2ec16872b67e76027c40bfb8d13426c2036d4a788ebc3ce0599dd2bc84f12535325a9c0c68f4ab606dc8a5b2c0412ec3f5f8f78d1f24
+EBUILD antlr-2.7.7-r9.ebuild 1155 BLAKE2B c7b2ba6a11db4ed11ca61e716a800dcc7d285b2d021a22f638e007967a0bd95ebd91aa6464606b320e72f8dcf90b29ab54e1b266c478876b2b2028b3a301cf4e SHA512 cfcf41dd63df29abdde02f7333baa1982f875577ee2f32df5d7e8ac72c74f74d43e6a933c92ff6489a3008d793af7c210eac8767bb9f6a6a3b8c02bb8eabd250
 EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
 EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
 EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index f7a428518635..5b7e3a5f797a 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="antlr:antlr:2.7.7"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/boilerpipe/Manifest b/dev-java/boilerpipe/Manifest
deleted file mode 100644
index 2be1d12df8c2..000000000000
--- a/dev-java/boilerpipe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST boilerpipe-1.2.0-src.tar.gz 46279 BLAKE2B 21e146bc772b6025dd22939fab64777bbbb55b3016ccb9627dfb7c1c4d3eb2fd61243aae2e22cd973e77a11eccba45b9a5837f08db265edb703779a46f08abe3 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6
-EBUILD boilerpipe-1.2.0.ebuild 800 BLAKE2B 52acc306bf9782794dfd21beb710851a8a59df3be8ab1c990bb6bd6d8c6f45295b518ff9a7eb186da525c8285639b9b9aff7cd261ae7d89feaa2d8d675d6682c SHA512 13826a7c84190fabb2ffeed05e9fee0e3dcfaa63ea1f0f6e9cb70db9433ed803f0da87f5731853bb73ff744b9e9b6c2f3c65cc4422c47842120c192be4167e19
-MISC metadata.xml 255 BLAKE2B 287d65f3a6609362260b1406a0226c14b3be2b9ed17b5c4f422e718693a57b37c871914d2e8c60609eddf7339e4aba2fc257585e4a58c174f07395077a1a7485 SHA512 d11126781bff8c65605f533936f2817d35cfd1d88e89b33cc37ffa5af1d2b93bf22987c822b710719e9a0c0839563990acf4082ee30a5a0af6b0df3f8377ab62
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 07ba689dd861..000000000000
--- a/dev-java/boilerpipe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">kohlschutter/boilerpipe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/brotli-dec/Manifest b/dev-java/brotli-dec/Manifest
index 9da9112232a9..479e44475c1f 100644
--- a/dev-java/brotli-dec/Manifest
+++ b/dev-java/brotli-dec/Manifest
@@ -1,3 +1,3 @@
 DIST brotli-dec-0.1.2-sources.jar 89491 BLAKE2B 68bb997d4e9513cfa50c22d93065a713340cf7ef75b6e08ba4fddbdeaed5a4423f2b51e7a277dbe435e835ccebed8fe5c80a2a61baaefc725e3a2840df1f54c3 SHA512 00ebbda7e3d8e558651523f8d3ab3f66aa20e300422ae2f5de57fca9a95538cb12751b87a959c8229a228878e61661ba01c4f08077b1e540c3a2d2219a71f070
-EBUILD brotli-dec-0.1.2.ebuild 530 BLAKE2B fc2215c60b16a629fdd5f9ed38f939a70965aa7e0c8ea29fe1893ff059e14d3ce4d37e9748235dad978f645a71bd5e77526084bb8dff8ed5ed88d44cb1a3e923 SHA512 c814aaab6adb95d22620182e32012e2108f0a3db1c3549b7b27092ea16399f0e3145be904db0c08f3291104556b550182db2d101729ede4e17832ca4482efe1d
+EBUILD brotli-dec-0.1.2.ebuild 528 BLAKE2B 1bfbba103027918b8b4cba2c60ce0b65146ca14fd733a60f3de503adacf7cd84a311eba1da5eb4e36b0139cbe34b8dc03b5cfc1f29de8c334b48d82f4a780ec4 SHA512 ea3b2b5393f5ce9669a03abb927ddb6186ced791cbf82231eb68643d748783d0c80301b2fefaa15f701a80d062c0d7d002a7c92e8d46c60b647c5598cbd68fa5
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
index 37bd8ac39308..58ed175f29ab 100644
--- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.j
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
deleted file mode 100644
index ee940c539eeb..000000000000
--- a/dev-java/cdegroot-db/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faabe942900e4770a6fddae86de4193299b7f738cb71634bde0cc15e356c5b186892b8b8d6fdae0 SHA512 b7d08ecfbecd1615d9a73ba1ab95b10d07ebddda0d4d273dadba770b662957006d84f8057d86f59dd1506cab0fa9f0fc79df7577b7ba1620fbf0d2d6d446de32
-AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
-DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
-EBUILD cdegroot-db-0.08-r2.ebuild 843 BLAKE2B 7c5c0495721f0bffb03f1876e35367a28c5a6acfd666729304c0d82ec9ebbbe25c97a04b6ad09181b689870fefc84a7669ea95970eb2fbc2cb852a540999058f SHA512 85c7106b41293ad19b4cdf8b3fefc118682484a9210ccafdc50f6680b12e5c9776bf5a6ce1aa5cac967255e507392ea47788e9cab4f775f49501f42f93dd0a79
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
deleted file mode 100644
index 13e8e42b1526..000000000000
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ /dev/null
@@ -1,38 +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="OO database written in Java"
-HOMEPAGE="http://www.cdegroot.com/software/db/"
-SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/com.${P/-/.}"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
-src_prepare() {
-	default
-	rm -rv src/db/test lib/*.jar || die
-	cp -v "${FILESDIR}/build.xml" "${S}/build.xml" || die
-}
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	dodoc TODO VERSION CHANGES BUGS README
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/cdegroot-db/files/build.xml b/dev-java/cdegroot-db/files/build.xml
deleted file mode 100644
index 282ebdfc70e5..000000000000
--- a/dev-java/cdegroot-db/files/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="cdegroot-db" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="src/db" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
-	<property name="target.jdk" value="1.3" />
-
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"/>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs" depends="init">
-		<javadoc sourcepath="${src.dir}"
-			packagenames="com.*"
-           		destdir="${docs.dir}"
-           		author="true"
-           		version="true"
-           		use="true"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-        <!-- zip the sources -->
-        <target name="sourcezip">
-		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
-                        <zipfileset dir="${src.dir}" />
-                </zip>
-        </target>
-
-</project>
diff --git a/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch b/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
deleted file mode 100644
index f99584fdff1d..000000000000
--- a/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -urpN src.orig/db/com/cdegroot/db/hash/EntryPage.java src/db/com/cdegroot/db/hash/EntryPage.java
---- a/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:40:17.191151504 +0100
-+++ b/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:54:14.045930240 +0100
-@@ -25,7 +25,7 @@ final class EntryPage extends PageHeader
-     /**
-      *  Constructs a page view from the indicated block.
-      */
--    EntryPage(BlockIo block) {
-+    public EntryPage(BlockIo block) {
- 	super(block);
-     }
- 
-@@ -33,7 +33,7 @@ final class EntryPage extends PageHeader
-      *  Factory method to create or return a data page for the
-      *  indicated block.
-      */
--    static EntryPage getEntryPageView(BlockIo block) {
-+    public static EntryPage getEntryPageView(BlockIo block) {
- 	BlockView view = block.getView();
- 	if (view != null && view instanceof EntryPage)
- 	    return (EntryPage) view;
-diff -urpN src.orig/db/com/cdegroot/db/recman/BlockIo.java src/db/com/cdegroot/db/recman/BlockIo.java
---- a/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:40:17.192151352 +0100
-+++ b/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:58:02.990125432 +0100
-@@ -31,7 +31,7 @@ package com.cdegroot.db.recman;
-  *  @see java.io.DataInput
-  *  @see java.io.DataOutput
-  */
--final class BlockIo implements java.io.Serializable {
-+final public class BlockIo implements java.io.Serializable {
-     private long blockId;
-     private final byte[] snapshot; // committed snapshot.
-     private boolean snapshotValid = false;
-@@ -44,7 +44,7 @@ final class BlockIo implements java.io.S
-      *  Constructs a new BlockIo instance working on the indicated
-      *  buffer.
-      */
--    BlockIo(long blockId, byte[] data) {
-+    public BlockIo(long blockId, byte[] data) {
- 	// removeme for production version
- 	if (blockId > 10000000000L)
- 	    throw new Error("bogus block id " + blockId);
-@@ -108,7 +108,7 @@ final class BlockIo implements java.io.S
-     /**
-      *  Returns the current view of the block.
-      */
--    BlockView getView() {
-+    public BlockView getView() {
- 	return view;
-     }
- 
-@@ -172,17 +172,25 @@ final class BlockIo implements java.io.S
-     /**
-      *  Reads a short from the indicated position
-      */
--    short readShort(int pos) {
-+    public short readShort(int pos) {
- 	return (short)
- 	    (((short) (data[pos+0] & 0xff) << 8) | 
- 	     ((short) (data[pos+1] & 0xff) << 0));
- 	
-     }
-+   
-+    public byte readByte(int pos) {
-+	return data[pos];
-+    }
-+
-+    public void writeByte(int pos, byte value)
-+    {	data[pos] = value;
-+    }
-     
-     /**
-      *  Writes a short to the indicated position
-      */
--    void writeShort(int pos, short value) {
-+    public void writeShort(int pos, short value) {
- 	data[pos+0] = (byte)(0xff & (value >> 8));
- 	data[pos+1] = (byte)(0xff & (value >> 0));
- 	setDirty();
-@@ -191,7 +199,7 @@ final class BlockIo implements java.io.S
-     /**
-      *  Reads an int from the indicated position
-      */
--    int readInt(int pos) {
-+    public int readInt(int pos) {
- 	return
- 	    (((int)(data[pos+0] & 0xff) << 24) |
- 	     ((int)(data[pos+1] & 0xff) << 16) |
-@@ -202,7 +210,7 @@ final class BlockIo implements java.io.S
-     /**
-      *  Writes an int to the indicated position
-      */
--    void writeInt(int pos, int value) {
-+    public void writeInt(int pos, int value) {
- 	data[pos+0] = (byte)(0xff & (value >> 24));
- 	data[pos+1] = (byte)(0xff & (value >> 16));
- 	data[pos+2] = (byte)(0xff & (value >>  8));
-@@ -213,7 +221,7 @@ final class BlockIo implements java.io.S
-     /**
-      *  Reads a long from the indicated position
-      */
--    long readLong(int pos) {
-+    public long readLong(int pos) {
- 	return
- 	    (((long)(data[pos+0] & 0xff) << 56) |
- 	     ((long)(data[pos+1] & 0xff) << 48) |
-@@ -228,7 +236,7 @@ final class BlockIo implements java.io.S
-     /**
-      *  Writes a long to the indicated position
-      */
--    void writeLong(int pos, long value) {
-+    public void writeLong(int pos, long value) {
- 	data[pos+0] = (byte)(0xff & (value >> 56));
- 	data[pos+1] = (byte)(0xff & (value >> 48));
- 	data[pos+2] = (byte)(0xff & (value >> 40));
-diff -urpN src.orig/db/com/cdegroot/db/recman/BlockView.java src/db/com/cdegroot/db/recman/BlockView.java
---- a/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:40:17.193151200 +0100
-+++ b/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:47:57.632153832 +0100
-@@ -28,5 +28,5 @@ package com.cdegroot.db.recman;
-  *
-  *  @see BlockIo.setView()
-  */
--interface BlockView {
-+public interface BlockView {
- }
-diff -urpN src.orig/db/com/cdegroot/db/recman/Magic.java src/db/com/cdegroot/db/recman/Magic.java
---- a/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:40:17.193151200 +0100
-+++ b/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:44:22.164909832 +0100
-@@ -25,7 +25,7 @@ package com.cdegroot.db.recman;
- /**
-  *  This interface contains magic cookies.
-  */
--interface Magic {
-+public interface Magic {
-     /** Magic cookie at start of file */
-     short FILE_HEADER = 0x1350;
-   
-@@ -57,4 +57,6 @@ interface Magic {
-     int SZ_INT = 4;
-     /** Size of an externalized long */
-     int SZ_LONG = 8;
-+    /** Size of byte */
-+    int SZ_BYTE = 1;
- }
-diff -urpN src.orig/db/com/cdegroot/db/recman/PageHeader.java src/db/com/cdegroot/db/recman/PageHeader.java
---- a/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:40:17.193151200 +0100
-+++ b/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:50:10.236994832 +0100
-@@ -28,15 +28,15 @@ import java.io.*;
-  *  This class represents a page header. It is the common superclass for
-  *  all different page views.
-  */
--class PageHeader implements BlockView {
-+public class PageHeader implements BlockView {
-     // offsets
-     private static final short O_MAGIC = 0; // short magic
-     private static final short O_NEXT = Magic.SZ_SHORT;  // long next
-     private static final short O_PREV = O_NEXT + Magic.SZ_LONG; // long prev
--    static final int SIZE = O_PREV + Magic.SZ_LONG;
-+    public static final int SIZE = O_PREV + Magic.SZ_LONG;
-     
-     // my block
--    BlockIo block;
-+    public BlockIo block;
-     
-     /**
-      *  Constructs a PageHeader object from a block
-@@ -45,7 +45,7 @@ class PageHeader implements BlockView {
-      *  @throws IOException if the block is too short to keep the file
-      *          header.
-      */
--    PageHeader(BlockIo block) {
-+    public PageHeader(BlockIo block) {
- 	initialize(block);
- 	if (!magicOk()) 
- 	    throw new Error("CRITICAL: page header magic for block " 
-@@ -66,7 +66,7 @@ class PageHeader implements BlockView {
-      *  Factory method to create or return a page header for the
-      *  indicated block.
-      */
--    static PageHeader getView(BlockIo block) {
-+    public static PageHeader getView(BlockIo block) {
- 	BlockView view = block.getView();
- 	if (view != null && view instanceof PageHeader)
- 	    return (PageHeader) view;
-diff -urpN src.orig/db/com/cdegroot/db/recman/RecordFile.java src/db/com/cdegroot/db/recman/RecordFile.java
---- a/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:40:17.193151200 +0100
-+++ b/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:45:38.616287456 +0100
-@@ -33,7 +33,7 @@ import java.util.*;
-  *  The set of dirty records on the in-use list constitutes a transaction. 
-  *  Later on, we will send these records to some recovery thingy.
-  */
--final class RecordFile {
-+final public class RecordFile {
-     private final TransactionManager txnMgr;
- 
-     // Todo: reorganize in hashes and fifos as necessary.
-@@ -48,7 +48,7 @@ final class RecordFile {
-     private boolean transactionsDisabled = false;
- 
-     /** The length of a single block. */
--    final static int BLOCK_SIZE = 8192;//4096;
-+    final public static int BLOCK_SIZE = 8192;//4096;
- 
-     /** The extension of a record file */
-     final static String extension = ".db";
diff --git a/dev-java/cdegroot-db/metadata.xml b/dev-java/cdegroot-db/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/cdegroot-db/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/codemodel/Manifest b/dev-java/codemodel/Manifest
deleted file mode 100644
index d84185c5bbf3..000000000000
--- a/dev-java/codemodel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST codemodel-2.6-sources.jar 178745 BLAKE2B d04979e3d912af5f16b0d0f6842c87e741abd32c8294fa429276a7457b328d577ed42352d8ea1874e9092845f7e8932df569f09f053702c5de635d243513d404 SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7
-EBUILD codemodel-2.6.ebuild 474 BLAKE2B 82e0476feca46ebe6aa760706a105b851964823e8f525fcb80950248c7ca52640506bc37982a7a0eb8dabed317344fc051bd7026f07da13bfb0c66103786c86e SHA512 c0bf6249f1b201ad3111a62f962a39d9aa082c3b44b5ec1b0a7ef368d665e5afcce3fd54c7b812ca855623641ea663d9089f0189fcb85110bd3f031d748adc50
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
deleted file mode 100644
index 649702793616..000000000000
--- a/dev-java/codemodel/codemodel-2.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library for code generators"
-HOMEPAGE="https://codemodel.java.net/"
-SRC_URI="http://repo.maven.apache.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/codemodel/metadata.xml b/dev-java/codemodel/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/codemodel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 24985b51a08a..8a3e59b0cc03 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,3 @@
-DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
 DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
-EBUILD commons-cli-1.3.1.ebuild 1075 BLAKE2B 8d8ab4b92f22e80245d27ea1085add0e1c4c68e01349ba23c262f309ed85242e556db93f78951c6f54d03b9821a36bc795bd74600cc66b1a13dbf2703d2eeca3 SHA512 b344ecb5000fe89157cd20969b29e01ca7345605af4414b3e6d3afdf5c655532f6f2805d98ec260f61c5533f833bad19f0b0e39c38dfda3e563d7ac1f5ce2db7
 EBUILD commons-cli-1.4.ebuild 1073 BLAKE2B 47369d5c19d43c955e2cfafed597607929c8cac3d940a7bfd07abad0a9f7527453c55e6ce47c98ec53c2f741884c1049015a5b4d02f1187c0558367865d6068c SHA512 6158af3b2d265f06499174fd392f95ac46feaad3d5b76b8e85448600e724ebbfd6de2614b35d8e3f31b6bd120baf0265403487c42d1c20e2271a1a0df0ed8750
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
deleted file mode 100644
index 7e54b865b6bd..000000000000
--- a/dev-java/commons-cli/commons-cli-1.3.1.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"
-MAVEN_ID="commons-cli:commons-cli:1.3.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="http://commons.apache.org/cli/"
-SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 94b4d3b62183..900bd497b180 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,7 +1,3 @@
-AUX MANIFEST.MF 1222 BLAKE2B a7ec1ac35802d24cbc9ce95d3974004d89e6233aa41f95a33733b08dc447c54bbd6da2a3a01ef2d46cee303578a4dd116704e7e1dc551af1212b0b3ed891ea1e SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d
-AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c25fb96b80d84e83e371debb619efbfbd244f31a0214d7487f38611f8532da838a971b5b8d528 SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89
-DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
 DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
-EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
-EBUILD commons-compress-1.20.ebuild 1082 BLAKE2B 2d4fb689d8bd3fbd7963d63ea1b6a352090ae449973d62b01fb7aa47bccecdeddfd9cde1af683c64407013f3a20e863b9b42cb81f53531e5a12063f2be002ad9 SHA512 5d92f1a8c76d9e984c0398ff940527399b3fdd80e506bedcbbbf174ddc5f0c2dad9725d3964bf1147811e3434b710cad76181d65bfdd413429b97deeb3bba054
+EBUILD commons-compress-1.20.ebuild 1080 BLAKE2B 7f8ec8fd6bc9dd45e53cf4766a419bb2f74c9d3aad7de3641bdbc0c86cc67719e592dfb64583bc0a3df51f3b2b37264eade555133c4cf249a38b10a02bff6053 SHA512 a8f6cff1e9332f5ff83e58f01a6900dd81dcf51e190cc447fb92b0fd02f31583278b5d70aaa50ba114b4c04cffbce8af7d08db3ab2c0da7aacfe1fa1df628e00
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
deleted file mode 100644
index 5670329df835..000000000000
--- a/dev-java/commons-compress/commons-compress-1.10.ebuild
+++ /dev/null
@@ -1,65 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND="dev-java/xz-java:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
-EANT_GENTOO_CLASSPATH="xz-java"
-EANT_BUILD_TARGET="compile package"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,hamcrest-core-1.3"
-
-# Dubious tests.
-JAVA_RM_FILES=(
-	src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
-)
-
-java_prepare() {
-	cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
-
-	# osgi stuff mvn ant:ant doesn't handle
-	mkdir -p target/osgi || die "Failed to create target dir"
-	cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
-
-	if ! use test; then
-		find -name "*.jar" -delete || die "Failed to remove test resources"
-	fi
-}
-
-src_test() {
-	EANT_TEST_TARGET="compile-tests test" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "target/${PN}-1.1.jar"
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
index 111044934f93..2895ec27d09a 100644
--- a/dev-java/commons-compress/commons-compress-1.20.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.20.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
 SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND="
 	dev-java/brotli-dec:0
diff --git a/dev-java/commons-compress/files/MANIFEST.MF b/dev-java/commons-compress/files/MANIFEST.MF
deleted file mode 100644
index ab91795ef624..000000000000
--- a/dev-java/commons-compress/files/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.commons.compress.changes;version="1.1",org.
- apache.commons.compress.archivers.ar;version="1.1",org.apache.commons
- .compress.archivers.jar;version="1.1",org.apache.commons.compress.arc
- hivers.cpio;version="1.1",org.apache.commons.compress.archivers.zip;v
- ersion="1.1",org.apache.commons.compress.archivers;version="1.1",org.
- apache.commons.compress.archivers.tar;version="1.1",org.apache.common
- s.compress.compressors.bzip2;version="1.1",org.apache.commons.compres
- s.compressors;version="1.1",org.apache.commons.compress.utils;version
- ="1.1",org.apache.commons.compress.compressors.gzip;version="1.1"
-Tool: Bnd-0.0.255
-Bundle-Name: Commons Compress
-Created-By: 1.7.0-ea (Oracle Corporation)
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.1
-Bnd-LastModified: 1311506267618
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Commons Compress defines an API for working with c
- ompression and archive formats.  These include: bzip2, gzip and ar, c
- pio, jar, tar, zip.
-Bundle-SymbolicName: org.apache.commons.compress
-Bundle-DocURL: http://commons.apache.org/compress/
-
diff --git a/dev-java/commons-compress/files/build.xml b/dev-java/commons-compress/files/build.xml
deleted file mode 100644
index f42093f83866..000000000000
--- a/dev-java/commons-compress/files/build.xml
+++ /dev/null
@@ -1,269 +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 7/24/11 12:42 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-compress-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="commons-compress-1.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="."/>
-  <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="junit.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </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}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <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, 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"/>
-          <exclude name="**/*Abstract*TestCase.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"/>
-          <exclude name="**/*Abstract*TestCase.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <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" 
-             encoding="iso-8859-1" 
-             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.4" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://java.sun.com/javase/6/docs/api/"/>
-      <tag name="Immutable" 
-               description="This class is immutable"/>
-      <tag name="NotThreadSafe" 
-               description="This class is not thread-safe"/>
-      <tag name="ThreadSafe" 
-               description="This class is thread-safe"/>
-    </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="false" 
-         manifest="target/osgi/MANIFEST.MF" 
-         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>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
deleted file mode 100644
index 7dfe142a4a05..000000000000
--- a/dev-java/commons-el/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX commons-el-1.0-java-1.7-compiler.patch 738 BLAKE2B dd71cf204af414172484d5d537c3bd0acd8d3056eabfff95161d7b30db0490a611cf22cb07c76f8782e4543ab8760602ad391ac6f4de12def16468e096bef7a2 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807
-AUX commons-el-1.0-manifest 557 BLAKE2B 085ab2a725e32c7a277a9713f31f613637ea3be5c43e8e4d3134f0cfd996622b9472fc275776a9c03aa2b58fdeb430ddd7f6179e06a84fce24e209ba4ceadf1c SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e
-DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83
-EBUILD commons-el-1.0-r3.ebuild 1201 BLAKE2B 3c847ac355a0078b8102cd087ac838e594d68b54498ebaf6791303310343186640bc896b3b60d08382bbfb2ed95b551f209f1be33eef99dcf264bc8ab55ff6f6 SHA512 09996f0d1b9c12c3b65f57326587e293723d4a0f21d00af80785f8904440b671001784dbaba05c176fa7b1ec9faeacc2e778de1e8fc5e67f7bb0abb79d609d6a
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 2444066aa02b..000000000000
--- a/dev-java/commons-el/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
deleted file mode 100644
index 4deabfabf76c..000000000000
--- a/dev-java/commons-fileupload/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0001-Remove-bogous-manifest-entry.patch 744 BLAKE2B 88886753a79a47ed7400de168fe7e560173c3427108f44237c86290551e5abe381f5edf9a86ea506b7dcbdb2de5ce327b21fe89e1c920eec337b138ab51d588a SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0
-AUX 0002-Fix-running-tests.patch 736 BLAKE2B 71723de12ca1b3f256c6a83357ecf4ca1f69a7aaa42bf822906851893741649a836953cb4067e036c960b4156c17d0efdc21c7f7ad76ac122693e8e69e7e8524 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289
-DIST commons-fileupload-1.3-src.tar.gz 137105 BLAKE2B bfb5a4604aa69d8490fb1e661d0f82c0851ac9281e8e0e43a2e5d68b9cb330556a8df9f67fe9c2b5eaa1f9b871b3fde2b9a8064f94d6d55f7d13f64d5150bce9 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2
-EBUILD commons-fileupload-1.3.ebuild 1311 BLAKE2B ba7aa174fc42bbfc5a22ef9cfe445877c7e52152ab22dd445c873024173429a259e372dd6740a54814524f77689b3ccb5eec8b7c8009b94ced1450836a60faf5 SHA512 8ff7c877bf2e8a760c75c250c50de899ac6a2f10c7cbb37e115c3e045dc05c5c3b772b156c9babed98467a0b68b4401227a456dbca702ad5ea84fffa576c5456
-MISC metadata.xml 749 BLAKE2B 88142a38969fdeab7a7ef48a0a72e78a24d3ec386cfcc5f8424833c026c3e2a135f02bad3eacc0fb0860633da5c71f85eda3db9d76ac52076c17cd2724236c56 SHA512 e18d72be4bcc733ced0cec17570803ff311fb9b31f28367ea2094779e0da40b379c20134fe2b4e81e9f21acd0372115671d41b7224c2f4a302123dc58d12a8ba
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 d4924df29b60..000000000000
--- a/dev-java/commons-fileupload/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest
deleted file mode 100644
index b2b0461623e1..000000000000
--- a/dev-java/dtdparser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dtdparser-1.21.tgz 138335 BLAKE2B e393b93116cc74811198465819cfe4d059a55a05d13117fe14ce0a6fa2ee82c937d6efe4724bbc28ec5b35600eaee046fa8c07c6ab96fcdb79a6935d5c0ba0b7 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa
-EBUILD dtdparser-1.21-r2.ebuild 602 BLAKE2B 81a45fc20a53523023c99ad04dbfa1918fe791b827d82d16ec1efcfa08acdb8acf1c480c9e33efd189065c6322891651be7d4beac5e6442c5f0ffe662bac67a2 SHA512 d8e863f843e4ecee96e219a3c6df29cee4c442defb71a3df0cc1e036f1e20eb64f5628aabdbf8c543ad068d73447565a6ef613679bb9ba7e6d55cc290cbf2212
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 2444066aa02b..000000000000
--- a/dev-java/dtdparser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/easymock-classextension/Manifest b/dev-java/easymock-classextension/Manifest
deleted file mode 100644
index 0da5b4fcb606..000000000000
--- a/dev-java/easymock-classextension/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST easymockclassextension-3.2.zip 155678 BLAKE2B 5eecb9aabdcb4ef2edd2a2c7bf6b02d1c72c0d15f05ce4c148d646cc980a2358e34c49d7e13f65b31e379d8dbf581fee6c9ebbc1a5753336e251446ec120f476 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0
-EBUILD easymock-classextension-3.2-r1.ebuild 992 BLAKE2B 332b846e0a61fdde73baaaffa8b6f4c8f3e6318a0f1a9402d71ab3c48672f592e5876d7916bedccd8b4c5fd6f47ee3bea204e914e95c140854551e825aa71b9f SHA512 30e6b1a87ce46c2ea0861501dd3b4fc399cbae2cec77e0d186074b4fe08c4d491a82ab9c3bdeb73397b29e0e03fb3b3416dc61eaa383d6b669a914ecf23c39b6
-MISC metadata.xml 314 BLAKE2B 9af04035962b6d333264caf33b4d16e3099709c9a2069f732333a3ec17812dbd88e9086539ec0de3b5009696b92ccebb52bbaf7bd8d543ba2a52bfe926cd7f50 SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f
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/ehcache/Manifest b/dev-java/ehcache/Manifest
deleted file mode 100644
index 38b267bf5110..000000000000
--- a/dev-java/ehcache/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ehcache-1.2.4.tgz 1330344 BLAKE2B 60dbf5f3463562f1a326b13ac10d37d5d9fc1d5faa343e4bf5b197adfc45624832d740270753646e2c08be2e661610512f74fa7b6aa8f26ef3afbeee0d89af72 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed
-EBUILD ehcache-1.2.4-r3.ebuild 929 BLAKE2B e2a9616e3b9082fdea0788dcb56bd4d46a02a8b360d16dfc2d8ba7cf98b53e1a6224d58156a709d9f4622b6e91368e0f90f430d76b428bd457f36dc63262fd97 SHA512 2eb0e4f53fb90aa03e9d0d0013e9c87e42b0e3f99a32288386d4ac901bb11c2f6191cf0d6c82153dd30e624759b125fcf3a29aceff10d0ee4289b1c2a2a0506e
-EBUILD ehcache-1.2.4-r4.ebuild 820 BLAKE2B 0bdf8fff6f02ea2ccc09cb3766c798522a34aca701b1c952f6ccadb5225d5d706c60bab1ef9ad59e663eae179c07e9ef0bd1aa3784f2f3f545bd76a5f328ffd0 SHA512 15d6f73a0e6cc5150122a650a1b07fbf31a6ee00c1ed4e2347ba7f7625bd26f1c13f3eda49b9c6a19696c00ca40af5dca0bb3aa517f66361fa4f394c1aaa4c47
-MISC metadata.xml 313 BLAKE2B d2ded32988d3cb8913c205d47805e270afe93cfd28bd3177dabf0efc3601f052b218f0ca57370435fcbd68f3e6caad88587b0ffc700ee1b969b7d77070f09459 SHA512 6bc82a76cb9ebccb0253e19e3d1f9aa09bd0a3f2aa16e86f61dbbd76449cc77cda7fbca3fe04e8523f5ada48a5d3bfd89b12ba907ae37290bac6b87af2383da6
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 3afcb16647d7..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="http://ehcache.sourceforge.net"
-
-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 c9b41849308d..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="http://ehcache.sourceforge.net"
-
-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 d5a70d04d0dc..000000000000
--- a/dev-java/ehcache/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
deleted file mode 100644
index 53dcb4963fce..000000000000
--- a/dev-java/fastinfoset/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FastInfoset-1.2.11-sources.jar 255054 BLAKE2B b5424f34aff73e6d5510b1ebae537751c84dca4d98c305bc0fea75dee9f8aac1a8e9213b0adfd27b840febcb4001cb1a539f9fddb73fc621efbe0453686eba32 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a
-EBUILD fastinfoset-1.2.11.ebuild 576 BLAKE2B e82254171cd6b284cbffd16497110be0ed270a36328e18dcfff67254ede6f2c14669f69a3f0f2c178f3cbfd41d15f452771a625b05f5b99b34497cf86ce3d7d6 SHA512 8d95577f414b05929170553ded66178519e1a433f1db14e5e3711a51824b236d76db5ebd5ba2db59d631bb999686b6ef9a5f2629e32bd61c2de9a4c5e7c6b0b5
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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 37998bf40746..000000000000
--- a/dev-java/fastinfoset/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
deleted file mode 100644
index 7cb4ac2d761c..000000000000
--- a/dev-java/fscript/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fscript-1.17.tgz 117300 BLAKE2B ffbf993164d822fd8aaa25025c773d98f79127df8cc800d78475be5686a2785e962447f817cd1b705c03350a83b48c5e669b5faaa62649a1b2ead7cd2d4e9288 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50
-EBUILD fscript-1.17-r1.ebuild 814 BLAKE2B 05694ffe8fa35e8a529736fd8ded3b07c2ed0171d120515972aefa460862f970e194f48cb0e6c6b9052e91f59c9db1f435c51214523e943f2dfafe3c0c76fcc7 SHA512 bee7a4ad3cf15d136096fab44c2b935bee896daed5f02a401c40f32e7a9ccebf4f0f62be5fff9efef803987f62285406fac4e1829b7d81c68b33233bcf23c58e
-MISC metadata.xml 313 BLAKE2B 431a725f648a5ad1c888b84ace78b86e6a78404e57fe3d86662b7b44fe20fab91f5ba8a2aaaf3ef7e868b114ca9a0673ee282d879268bd16dd7c8c24196a27e1 SHA512 3d5ab8833eb9f0fddbe88d26cec561da98211b3db51ad3566b15470b0cc1829db2193afdc8a89c358d4ac2ba2441ec0434c439cfe98b3686bf8dd5d3326004eb
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 9d5ac52bc08a..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="http://fscript.sourceforge.net/"
-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 16869cf9dcf0..000000000000
--- a/dev-java/fscript/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/hamcrest-integration/Manifest b/dev-java/hamcrest-integration/Manifest
deleted file mode 100644
index 6ffda7fbc575..000000000000
--- a/dev-java/hamcrest-integration/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.3-remove-targets.patch 3721 BLAKE2B 9d7859da4694366577efbb6ef9a485fb40a1be67a0da3144a97fc7dd2e90c07b4d42665e164c3f7b544f21427f12366946fc400ad8484fa796d4afff488e0c89 SHA512 1af75ef60b6a6ac6a24d4725c548b34493968fd67d93c192867d9da6fa79c26a25ee68f1b2987008160100052d22aca5fde9440133566a55d630b241579f2463
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-integration-1.3.ebuild 1289 BLAKE2B 244fd2ba21a7f07b0b311a4d8d0ac0543cf94364fd9aadf730cb7a62f71280a44326e9d9d06228adc52b8d7c93d4645811bdaeec69a7a1dd09f5e82174cc4988 SHA512 6c145ecf5215028ec16eb7605182f6ea257427d09e4350f55f8a33b98b5ad65e6db5d5239c3d217df4d2536fe90cb8d34380ce2d8a551d8e971bcf8b8f95ef7a
-MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
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 7ee93b2f2b47..000000000000
--- a/dev-java/hamcrest-integration/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/helpgui/Manifest b/dev-java/helpgui/Manifest
deleted file mode 100644
index 6d372a914bb0..000000000000
--- a/dev-java/helpgui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST helpgui-1.1-src.jar 168356 BLAKE2B 4f14e4b7f7ffa91f80913dfaf5c395ac6f49b847f76a5cd75932ba07c2932aefc6964b907dddb2fcac6e0c888feb4c47dffac8b866922a0820ccafe23863ac3f SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77
-EBUILD helpgui-1.1-r2.ebuild 694 BLAKE2B 228ce322dcd52dd4cf603e41c10901019504d5a5d2637ae9d3cfd2e6deeed1495d66ba5beb563c03c42fcb3397427f83dfed750883c30eebd431d191ab1e6201 SHA512 272a61fb0e7e241a35ac0202fb2b54e72b2567daf104ffac991c007e73981d68af754958152611d1fb203896ee80c6b52d6662074bfb2b66f86eafffafdc20c7
-MISC metadata.xml 313 BLAKE2B 629ad9a15596a24dfacf2458cc4b4ebe8430c9ea47b235e88d5ae588eb7939a699f52ffb09f3a002e7013a118efa23c33b4e4bb53bf8cc6454fdd5aa72a28216 SHA512 c359d2269a1a5b9d1b9987366bbbfb678dfd4d35930b235b3e7463edbb9c90377c06ea23c3702f9d3978128b15b2efc7aa7f3a621ba464ca38e4f1a2f88407cf
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 e9d32f2214ae..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="http://helpgui.sourceforge.net/"
-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 e54689ff7887..000000000000
--- a/dev-java/helpgui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/higlayout/Manifest b/dev-java/higlayout/Manifest
deleted file mode 100644
index 6bc7dedd5efc..000000000000
--- a/dev-java/higlayout/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST HIGLayout1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
-DIST higlayout-1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
-EBUILD higlayout-1.0-r2.ebuild 789 BLAKE2B 0b1a134bbb20b7d2d5e5458f826da7e610d601c1d4952746307840d48f4de5e352fa394e62304a9b5af5e4c7a2baa695ea33fd5fc2b54189b052f6dd5c4e457e SHA512 385e04279a658d2a059d4c8574086cb5268e96228073717b8089fa2d644534172ee0c25c1ea0155448c078ef92e834a53e2111d07647f31d310f47de199ba10c
-EBUILD higlayout-1.0-r3.ebuild 726 BLAKE2B fe47707c660a876a8b0a8cf2d33dcb35cd79c4a7f7a38c432a66143e58cbff9b5e6cb9c19e71d2bdf2ff5905bbd66494508a22c3033425269c2b420c217c8bbc SHA512 5607877adc0e9a18bde07cce63f53374a35f6107ee9c63775037bbdec3a5a988880ea2e2f2f8cd3c2a4fe69dddabe2e35837218ae31b2de6371c38b14c297e77
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/higlayout/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
deleted file mode 100644
index ec5d11839a33..000000000000
--- a/dev-java/httpcomponents-client/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX httpcomponents-client-fluent-hc-4.5-build.xml 11280 BLAKE2B 05d575820182e0157b2918c9dad9644bac720a3fa01274f5df2fcae82b983c20f1e47ac8e2b8224012d0ed11449d849fa420e801a619f6b450efa38aa3490c12 SHA512 b38ba2d2820d0085a32519fcc904c1c12e513906c50ef18ba14e2872851d05d64848fe4368f4298f79ea0ad2e1871da6b1bb618018f79f8d88570213a06a7c08
-AUX httpcomponents-client-httpclient-4.5-build.xml 11126 BLAKE2B 0a262a63114e9cbc09dfac041c3d241a6bba89a0ce6aa41d8ab990a599dfc1d5343d319591ed70c48928bba6eb88dffe9da26c1f468a1fb990b9ee75ff9c0ea7 SHA512 482be9717420eac69c5c8e82f5024aa478dac23f0c582c2d6000244375f315365009d24ef04f7ffdf53bcaaed97f555cf215090c863c38546155d79ced8193d6
-AUX httpcomponents-client-httpclient-cache-4.5-build.xml 12511 BLAKE2B 09c4611d33a08223a97bd7793ecc1b79ddc9477b0b80148e3534d0fb5f992a3c5f66c15d42a2d4d6fbaa13129b0c8c02b45cdbbff7bcb0fdd7702415e3b99562 SHA512 34bfd58cca0cdb5566e1c8c8f32da169713dfa13142c1e0febb16a2b16288408573fbe795c9a58122c982e932ad9be5cfb544795a820ced3f26bee87eec544a3
-AUX httpcomponents-client-httpclient-osgi-4.5-build.xml 12090 BLAKE2B 0e01c09e1b05fa99c63573adafd4dedef16c836365a799ddc77ae0036ed1e21f1ffa56c0c1dfb2a5bd3b9b85edad59f9c1b7b19da850160c210b151fc704601d SHA512 812e5d1bb9c2a21f8f664abbe22c85a912bc16ba96560d8fd8a246918c4e421d2a2d5e5034d3d832342b5e840ffc0df974abf192039a97ace2aa90021a950721
-AUX httpcomponents-client-httpmime-4.5-build.xml 11026 BLAKE2B 8c4123cafb64b25747e442a8026ff880b352505e247a0173d5c70cc9c82115f717ee255e67b7137165fc226657bddcea60ef884bb7ad587cc83350beec2d4696 SHA512 85d63d766290fc8055d38779167e64b3ee4ceedb98032227bf36ba76b62437929b0925bddfc3754ae37f42f51bd5f2befd46c2c2c0fac094988793a88a07c073
-DIST httpcomponents-client-4.5-src.tar.gz 782815 BLAKE2B ddf08b8ed4451cdf9eb1d58b207c5e80948ba051c92c9e5e3f4fe0e09405ce916fbedf5e70b037880a09b822ffb99395294645d2518282d35f57b0bf64a786df SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517
-EBUILD httpcomponents-client-4.5.ebuild 3479 BLAKE2B 5359b30d45a5c196c1b9d58a5865a068e1b348e510d82f783f4d5d0d93e67f9cce7903eb2c8b688f08962340daadf92cab42812d6c85e20d30a67931edb6f057 SHA512 5b0c334971cddf4fcd0ab05e6db7fd3f51dc3f748ddc4847048b462a7683d1ced3043cd5683e3600974c9fc5da347b1c42b5b1a54d6c60408bf151be17a7999c
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/httpcomponents-client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/httpcomponents-core/Manifest b/dev-java/httpcomponents-core/Manifest
deleted file mode 100644
index f1cd67aeac8d..000000000000
--- a/dev-java/httpcomponents-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX httpcomponents-core-4.4.1-httpcore-build.xml 10109 BLAKE2B 6dc60391c11190acae50a60d2fa5c6e79dfdc4a54e3e47787fe991bbd12251589da2f95afca627c583191c836e417ee4bcb0423e529a0133f9f4e3718a2bd9e4 SHA512 44cab78a7855d607277d049a906a9ca157cd3f5d491ba7e5c406fda6700d95c6e8aebf0082245fc125bbeb50eea6782a0b70fe69ce5255bad468cf7256245a07
-AUX httpcomponents-core-4.4.1-httpcore-nio-build.xml 10465 BLAKE2B 021f16f8ff3257c291445606577829cd7f15badb1344281751f4ae1adc8f98e5068b33e7fcd5131dde4af1d391ab7d29608b3adc5efc3f4017ff135ba0325821 SHA512 07cf4fe938b802dca43744410d94c6452ac75e9c75aef06f6685597d4f1ec644674c64df4b0cb1c6fd837627059190b1d448e6a3f2df6954f920709bde844377
-DIST httpcomponents-core-4.4.1-src.tar.gz 549481 BLAKE2B b5e84a521d5da16fc0800a2fb4b8ceb304acd409954cbaeac5901bcbb7b00ce1a10c733ae817c1ff7baaefc7a90a7370c74521c2570eaa8c694e90422d68ac35 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99
-EBUILD httpcomponents-core-4.4.1-r1.ebuild 2196 BLAKE2B 98dec68cba571cc558a07a89378a2a5b684a4f95586192182136095362f738b224b9116a86106dbaf0d9dd59cac2e6fbebc366c2703d08d497623f3e67332ae1 SHA512 bd6653819b8606d9e5cc99e954fb2f64f5661cdb28593e3220cac5b8eea69573b4e3478da54a91a95202fcb72be7f863332612807baac49ee1fc8210ce6da22f
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/httpcomponents-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/istack-commons-buildtools/Manifest b/dev-java/istack-commons-buildtools/Manifest
deleted file mode 100644
index d8263ce340c8..000000000000
--- a/dev-java/istack-commons-buildtools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST istack-commons-buildtools-2.22-sources.jar 12689 BLAKE2B 09edcf7a2a968a960d6ea3556bc081883697149c264798680089ff4916e8dcb30193d32250ad3093b104333f8893c8159a607d9e518987c922511032d6a8ab09 SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4
-EBUILD istack-commons-buildtools-2.22-r1.ebuild 651 BLAKE2B 55d51ec4488a306761e2c2ad522226d5a5ea51f3c00cd3feda84227ff070ad8461f5bb9d9480d18a3f8cb1538d95e57d9b4eae2f4e9b4627640a1a818706ce5a SHA512 4de4de048de599bc828a973c7ef434a3133a3812bd4ee809f9b142bcac18136b2e1661cea56b4742a610590f0dcafa452d6a4a3ce406be6d02b0a69f1020eb81
-MISC metadata.xml 315 BLAKE2B 31a00a56a66bec7fb42582aaa8bb567420eff725eb8e73314776200b6d42c45d07268439315c4e140e622ac00349a131c3f237d227d91ec5b4b6eef138af7b0d SHA512 86fa3fc78d08380af738187033c0b738c63c943e9d649b91515988da3f2bbc6e4689cca0c67d6d0ffe4bfb524f323e810580d996eb03bfc68893ba0618c20e47
diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
deleted file mode 100644
index 30069ea5a073..000000000000
--- a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN=${PN%%-*}
-
-DESCRIPTION="IStack Commons - Buildtools jar"
-HOMEPAGE="https://istack-commons.java.net"
-SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/codemodel:2"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,codemodel-2"
diff --git a/dev-java/istack-commons-buildtools/metadata.xml b/dev-java/istack-commons-buildtools/metadata.xml
deleted file mode 100644
index 01a2a84c7317..000000000000
--- a/dev-java/istack-commons-buildtools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
deleted file mode 100644
index 675d51bbbf58..000000000000
--- a/dev-java/j2ssh/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.2.9-extras.patch 7597 BLAKE2B a3ff2d110ac76e91a7cc3f5287fd80fcd26ea4f073a42c5c430a961afc4ef36beb53a29303b8646cc19370dd318d67065f901fac78818f9b432e326aea51a502 SHA512 e60f449e7cd39c1cc551a012c97f5b1cca229d6a08c06abfea6c47a0e2577d36887ce5e710dae2a1db5d1436b1eb0a13c5bdcef84555c678d3b54124fe6ce17d
-AUX 0.2.9-no-versioned-jars.patch 2187 BLAKE2B 42409b824c8fae59ecf42a531618432f1fa9ca873388b44e7cbbb94e3ad46dedd460b029e802a39a85f3da0d380e16965089e51e544b97495f72b6679f9c62e2 SHA512 5ef6e3f1f51a241f0a45810a561f4a77ddb2fe706e7ae4d0f6e36c28416435eed50cdec33debf7434f788c28f5b147987df3b1a12e59f8a0fade31183f57332f
-DIST j2ssh-0.2.9-src.tar.gz 2182523 BLAKE2B 1c5424ac99a466d3ac114160c133d8d6daed430f67bce35300290e14bc7540c73d5698f728f2cd43f7050877c2f89978c118a420375ffb5bc6c207c397e5afd2 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8
-EBUILD j2ssh-0.2.9.ebuild 1012 BLAKE2B e70137bd0c8bb3bdbc3eb2be5841316315d7fe3338413e50c1e2e3ac9d6981416681c2fae8dfed8f2467a7234b866562c40bb15dc75a6b84ccdf6ac5955801f7 SHA512 3b4c8c5577fde52092aac8f22c4669f63f28b71c947c4257892d0a9a87e69613be8b4eeabb9963b8c090434fce360363888db31181c85ed32ba6f6b970ae8b63
-MISC metadata.xml 494 BLAKE2B a9ae8d475130ee65e10ad589ab2a28f974463f20822b7d2bd082cea309f658609375ac0b597801c636d9f27917e94f08c9c65e3b48dda4b5ba3ad803df11ef8f SHA512 dc20b956e35a2a5098710ed97d00cd15979a6da488b4618cd262803f093e9281fdeb00f5a828cc0026c7b809c186d10f77683498b2380ed8c46d519696308b18
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 6b55c013d0a1..000000000000
--- a/dev-java/j2ssh/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
new file mode 100644
index 000000000000..37a117d27424
--- /dev/null
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
+EBUILD jakarta-activation-api-2.0.1.ebuild 935 BLAKE2B 22cb90a9b6b5397636ede15bfcf6d1c039cbc5b4228be4d908e64d7d595b80c4421ca85a04487da7db670d8118c7f6baaa4ef94c49a90e9ebcc0271a5df2fc25 SHA512 7cae470ad71954dab9e526b3580b2c251f01098aea4b26bca366d2c80d277f984addb90f451d3a914cbc4cce6579417ed7651c8e8270efc8d5370d7cd7c543d1
+MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild
new file mode 100644
index 000000000000..c3224df283ed
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	>=virtual/jre-11:*
+"
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/easymock-classextension/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml
index 144ebe414735..55432e8ce804 100644
--- a/dev-java/easymock-classextension/metadata.xml
+++ b/dev-java/jakarta-activation-api/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">easymock</remote-id>
+		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
+		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jarbundler/Manifest b/dev-java/jarbundler/Manifest
deleted file mode 100644
index e72b86ec1265..000000000000
--- a/dev-java/jarbundler/Manifest
+++ /dev/null
@@ -1,5 +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
-EBUILD jarbundler-1.8.1-r2.ebuild 858 BLAKE2B 7628d00b2a2305bb2ce03bf924255aeb8499c0bdbc6008c00a0823f62f1055d54d58c638df34ca08938cd4c9c912291b4eaa1cf6d0077f8d42a79d561b85fedf SHA512 463872852f0aa9bfb42104a5849c3c504262416623d19936820ccd23130f1627f16116bd63bf3a902e4ee38dee89caf483b909034d1d39a87c20913d95abf92a
-EBUILD jarbundler-2.3.1.ebuild 857 BLAKE2B cbb9f259ab1d89966536101bfa7b5f878bc2417ff50d96d97c912be86de6d54d8c0ee07a8ad7b3cdf9a8795f3cd94ac605607866eb886140cd6b5ded1e56dfc6 SHA512 af06e14cb5fdf291cbc3d84616120871fe84393064d605cf355a4d89421b8a00eb7d62c14b76672f7884362b0371fc2c906e25fcc1f8b0d07a7a173b0bda814e
-MISC metadata.xml 322 BLAKE2B 6ea89460d4813d9c2db72652dc86a873698694cd3f3059db367be4493d959992d97467e546495cca4b2dbcf2e589d0e21abe698119b52412db2f7dbc14fb5d67 SHA512 acb71ede8573f755de74312313f408b689412ad7d045759b847be295374150608cda014779b38c47cdf408792bf794c26d4c53ba81294990f78fdd770e375f67
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 0ffa001ad9d4..000000000000
--- a/dev-java/jarbundler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index a5e5a91e4859..d26fd0fda015 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 1081 BLAKE2B ac6894dc4677d4d8591085af5bb627c606ae057694d06170b0d8e14205d5e96345a12b20ec3849c006b926ca2561aeeb3ee8f1224449e8fc93470f68b64c1b8f SHA512 c974b1a60fa584f8b579f060a67a151c2e4966e64cb537296c3790d3630b6019bc412f21609b233a31abfb8a3b6997f9367fb8fa764ba613ba098e7b1fba973a
-EBUILD java-config-9999.ebuild 1208 BLAKE2B 52dddbec6d35da935c1bd59d940d37616cb3e87e07d5bd5f4f7f9ce8cf626074e9081e89e126f9787dd2defd6044556d212d4dab0c1b04d2f492ebbeb3f5cb94 SHA512 05df8a1a3a987e7bcaec9fcfe09449073a0258476e28b87a969a404fa0fb464e4db188530712e081da4c2ae3173b7d676285f73d9cf7295fa6e63d75c2b70dde
+EBUILD java-config-2.3.1.ebuild 1049 BLAKE2B 7e27d29e6e7cba055690f80d26556c9fbbef36186156c258969ac1c128a5e661fd5916e5e69d3a14fd346aed2622713e1511c752fa905b44c4ddebbeb8f53685 SHA512 7bfb8013b3704edbc1e0d8bba4e0c949557a583737da06d108cd7c920b5ce90fe3375070cd863d754d41059480d7cfae590cce8d0f229dcfcc0890a6e9a8ebab
+EBUILD java-config-9999.ebuild 1178 BLAKE2B 1bba6503aaeb02613ff3a9fe188531a19f31ab96eaf286cf7a3f336fcc0d166aaf49f71aa07864f24fd09b107ce50e1edc2c9cf8d6560fa4456165fdb3237822 SHA512 ba77b62518c397f06fd9ff6f03dc591e6da1cd21a942cee418ec15e91bfc3edaf668d7a7a0da277c323853beb690358ee8a87142edea83d6fe3f1803b78290d0
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 3c577e741546..69ba112dacfd 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -23,7 +23,6 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
-	!dev-java/java-config-wrapper
 	sys-apps/baselayout-java
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 44dee61b0d82..b0bfd8b90715 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -29,7 +29,6 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
-	!dev-java/java-config-wrapper
 	sys-apps/baselayout-java
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 5bcbc95929e9..bbe4d74ffaea 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,6 +1,6 @@
-AUX java-service-wrapper-3.5.25-as-needed.patch 7033 BLAKE2B dc74a0794917171dd7b84cc54a0f6536ee9a36d5082535219f1ade57f6b1482e6c68ac71b20e1c8c9fd4495ebc246f7680c8a7a567e338b55ce2e8021e164784 SHA512 6fbaead84aec096aec6f05414d0250ab0d2407e09616eb8c0e72a67e61c2b127433f41f89d6513ac55aef43e5427b3cedda841618138e6c1b18d8b26a1e1cf86
-AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
+AUX java-service-wrapper-3.5.25-as-needed.patch 7061 BLAKE2B e3dd530192faff52f0580fa6593dbc26314d90dbc2456414e843b2fc041f1f788afd5faaf08411153cac384b8a4325d5b0d6da483ed80fb07698f29cd9284482 SHA512 d79958b7a46e21c7a003c9d4e913f2581ec984f5e8ef1c902f84ae8e83cc2c03a23162ceec1b36e94ba44a35fb2518964831dc74bd548692a07b8a767cbbd803
+AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1260 BLAKE2B 6d48e0ea2537343f76d6c7114c99aba4a9887bfba1b184076f8fae636f3888c8494251d6022946f2632ea24d1cb8b03030caa9de71ae21b8a7f1fc3e9acacf64 SHA512 1581a01ec1e4a352d86939e43e659c86fe8f99420e67ded44ed8ec42462b35a540b7763a8d1c055d8710dae422b8163d8ff650df016779f68ec6672cd8fc1150
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
-EBUILD java-service-wrapper-3.5.25-r1.ebuild 1429 BLAKE2B 57c933a9bdc7c7626961a238cca4de56718bd8f0414e1f128dbdd8b91c7512f81203b1316a93d96c6ffb4f48b82c110e232430b4c245f83d9e5027ab78553d71 SHA512 e3f2d6ce64feed5fd416a0000054a727e156a6be5d76d421ee2db756e401aea61389e3c45e571e7c4b259acfb9ace7d5689502c15ce9a4f1617307b3508c9b5b
+EBUILD java-service-wrapper-3.5.25-r2.ebuild 1402 BLAKE2B e3c683aa9f2e18ef85f60d9cdea56cedf23a43ade7b9eafe734fa681a9f8d40447ebb84d92ce753a76c8bd5fb18750b5a650553d88a1bf6520050cfca43a6fc2 SHA512 31c53a9f6c76a1dd679fa353da0e23ce12b4303b94131575a0be1d4e8718e08a90016832c97ee4079d41621accc5914fbc191cc09c6b92afc19dbb9216577210
 MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
index 85d3d791199e..3eac44c0dc6c 100644
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/622806
 https://sourceforge.net/p/wrapper/patches/25/
---- src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
+--- a/src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
 @@ -33,14 +33,14 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -21,8 +21,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
+--- a/src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
 @@ -33,14 +33,14 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -42,8 +42,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
+--- a/src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
 @@ -33,14 +33,14 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -63,8 +63,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
+--- a/src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
 @@ -33,14 +33,14 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -84,8 +84,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
+--- a/src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
 @@ -33,14 +33,14 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -105,8 +105,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
+--- a/src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
 @@ -36,17 +36,17 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
@@ -130,8 +130,8 @@ https://sourceforge.net/p/wrapper/patches/25/
  	@-cp .deps/$(*F).pp .deps/$(*F).P; \
  	tr ' ' '\012' < .deps/$(*F).pp \
  	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
+--- a/src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
 @@ -36,17 +36,17 @@
  	if test ! -d .deps; then mkdir .deps; fi
  
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
index 34e94bb77ed6..a859a893bd1c 100644
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -11,8 +11,8 @@
 |  symbolic link.
 |
 
---- src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
-+++ src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
+--- a/src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
++++ b/src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
 @@ -4908,7 +4908,7 @@
      if (!path) {
          log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
index 3357c265306f..5ad4333b0e62 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
-inherit epatch java-pkg-2 java-ant-2 toolchain-funcs
+inherit java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN="wrapper"
 MY_P="${MY_PN}_${PV}_src"
@@ -17,9 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	>=virtual/jre-1.4"
+	virtual/jre:1.8"
 DEPEND="
-	>=virtual/jdk-1.4
+	virtual/jdk:1.8
 	test? (
 		dev-java/ant-junit:0
 	)"
@@ -34,8 +34,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-testsuite.patch
 )
 
-java_prepare() {
-	epatch "${PATCHES[@]}"
+src_prepare() {
+	default
 
 	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
 }
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
deleted file mode 100644
index c93f17d531e1..000000000000
--- a/dev-java/javolution/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 4.0.2-fix-java7.patch 1066 BLAKE2B 4ee9987e936138594bab0f033ce684e082271fc0cdb1abc0504cf86f25b2d18f34181ccdde5e45976def75a0b92b74cf9daa43060e30edc76304d266cb93a666 SHA512 11a9e64002486a52ef4aa35ab0d4e5faf370b2d7e6e16534e2429ddc32ce6213075c9190c06e441fdfd15d0a330826c457cc5c26b2a24ce59540c31da8021e66
-AUX javolution-6.0.0-javadoc-fix.patch 788 BLAKE2B 6b8407412e6825fba02b252568ab1c81b50988b185e1d53ca9018e6690f6f3c2976b41950488aa487909d0b085762e7a54877053650d5576ba3d918dde79a3fb SHA512 244d561628e7444c4ab22f8bf3a4241d67aba6dd6ce593f02647e3023c81b36e83322bb7adf40a277e63165246265870de8654e5bd826564e58af37f71fd1824
-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
-EBUILD javolution-4.0.2-r1.ebuild 859 BLAKE2B 48f86824d47e4fb7e0a15fee04a58b8cfa8040e855f855b359e3a2132053a527a99e70a1f1d6ea2a47bafcce33da46811db67e262235131c60ccf49ed0355d79 SHA512 c3047c0d3fdf4f5cd592993cc7de2d7e36c2ea3525e7c2200bebf5bc379802b313f66d778f867ba35cb228aff108c6af3a17fc053e0a2173d2394c2053da4b8a
-EBUILD javolution-6.0.0.ebuild 1359 BLAKE2B a03bb5a832d6381b6cea9c55bdbe00d7f4393bb3bb9967d2be57f1c6d9ff844c08cd671459986cd2c53a2adc32a9e55d1f8ea1b9f77246a738ba6f16247d1ac3 SHA512 9719d2ad63d57e897fae5692a08e67cc91da5a89a9e5dfbaf8b9a27dd6dfe07e186791bb4d88ae4ef5d59da58daf80e1a11d4b5da60e31e2d2c8872e97945a4b
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/javolution/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
deleted file mode 100644
index 3cbb70ac1d57..000000000000
--- a/dev-java/jboss-logging/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jboss-logging-3.1.4-MDC.patch 5607 BLAKE2B 9ea9acc22592ac5a4fa573cf9b06d473b266e8919bd34a98fb8e4290a3c1ff226e2a432ee774cc98514d1ee3868160329da9494a130ca2e61efcc4c1296d5dae SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535
-AUX jboss-logging-3.1.4-build.xml 9295 BLAKE2B aada8601b25a428a6049ded0143ebd508d50743d677f869a88a69d9ac6956ad0bf0174b88618d14f6e3928504b0979601903dad2996f0441a0e579bbdaf3a5e1 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14
-DIST jboss-logging-3.1.4.tar.gz 25018 BLAKE2B abc91a70cd75132621dffa44c4c2314635e0009f8eaff96c97cd6f95869a078672eac452ce4d5fb2791785d01d7fc4af208d34f4f00d635e496022792d1c14f9 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a
-EBUILD jboss-logging-3.1.4.ebuild 1355 BLAKE2B 99f30b00adf55bf6d8dd6d2210bbd1f6f33e55f85aa12ebd10b44d3807ef4dcd49bf9c2a88704264894764294d6ead703b332ebbc6807ae9133b6c2a1428b474 SHA512 850398339f49aaf4b5ec22bdb074c6ffd8babb74d18c80478b90a0427c69f0750a6a6e929b22c85bba42afdae6d6d4b448f1101aa6ea81b39361dadd44d94297
-MISC metadata.xml 328 BLAKE2B bf2ad3aca2591452aa1578a2c32db911530ca47fcbbc7ad5199b57e4ded87d513c63f8c79c1bdcd0cb39bb38dc11bd038a43e7bafc4bea35fd78f633aefdb135 SHA512 acbf51ab138d93d7b6d137542047e019fd30e7230ba9e0ecabfac72faa1ebea3419fd8531ab9f1304ca1d735bf2082994ac4ab57e87e6febcf30588d4a0f91da
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 75c29510cedb..000000000000
--- a/dev-java/jboss-logging/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jboss-logmanager/Manifest b/dev-java/jboss-logmanager/Manifest
deleted file mode 100644
index 1c069c903ce8..000000000000
--- a/dev-java/jboss-logmanager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jboss-logmanager-1.5.1.tar.gz 132910 BLAKE2B ebca4f63801e539c53bc5a00f76189b8ef9acadcbd1bff07bfc572350b3af3d65c80ac314130ab592f8655d849cefa8cc046ddddd237198f00654973c0e1f29d SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768
-EBUILD jboss-logmanager-1.5.1.ebuild 665 BLAKE2B c07f8e323ae8ec6d953a9e5564371ed4c84481d489c15ffffb76cfb3992ee27716a13a147a74ae995b22fae1af21e51b05d3418432811b367a853fcc4a9beca9 SHA512 69331af9e4004c291d0db8aa5755600584e1c790111e6d95f3ebf5be4294c258645f591dc88a587d8def0adc0b6023d4ef38603cec66c70098fa50b8add569ac
-MISC metadata.xml 331 BLAKE2B 77ed3ea318e75a2565d7690936371d0b89083b31da0322848ef4f2d5f7f57d006dca2118343f98a29d81488bafdad4fd33633e0fd338dc30b8109c29f226b2e3 SHA512 253e11bb23b5321b44483a7880aeb28747d3bee372fbfae830ff95d1e80d24049e8378750d9a84b931f08830e95d24991b999fb42df9b4a576e6397f4487a0d7
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 10cbaa482e79..000000000000
--- a/dev-java/jboss-logmanager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
deleted file mode 100644
index 5c29c47834c7..000000000000
--- a/dev-java/jcmdline/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX jcmdline-1.0.2-gentoo.patch 934 BLAKE2B a7e94aeeb042722c1feae194e396a7083095a017d8dc77d45035c515ac27c5bb8dd54e66fe02158a0154ab7cda964aa2568b844824df48c0586cda2f84bf24b7 SHA512 1326e1867b6fcc0ad37e0f0d557f518c5df5b8a2d87be91c66c2d9e72c044221713df5a864f5500e3820f853b415bea0612f02d8e30525d28aa10bb5002d2608
-DIST jcmdline-1.0.2.zip 397472 BLAKE2B 6c40c27397b11d21400d9e251cb4a84f13281fa8aaa0a772390724fed0fbbad7613a0c13f6dda1b53acb311be37a3a5ed63a4475a271d63d48322572d5215a2b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7
-DIST jcmdline-2.0.0.zip 395547 BLAKE2B 0dd00785a970fe614aef86e0d1fc8a465c9cffc96d2e157a03ed7e68e4f471a6cfdef8d7af5d90171da1fdeb6130f9a5f34b5dfb8765463e2ee7fdcfdd2991b1 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9
-EBUILD jcmdline-1.0.2-r2.ebuild 750 BLAKE2B 7b63b5a73f7b89be2cddb16f3dd04469936dc046eff2829be68c51fc582364e8dcefc1e9bad6fc55d2c4484393b34051c46d63dac388e6ee90c235de51a13982 SHA512 e16dafb7c4603b9eace2f0216091b1da1cf7527c8d7023f22a89a4a5310350d92b31fcacb951e8a7ab56ebb8950b2975ebc6ddc5fb3e8b7e6abedc6ae8026eb0
-EBUILD jcmdline-2.0.0.ebuild 545 BLAKE2B 98674e04b67b757aeb7f1d18de9e9ef07d346f633fe50a338e7e50f880cfa65da759829a079214bb640a007fc0e018c02596f22ea449b7f03060d22e10d366b6 SHA512 2a148a9d420453e550e7343037d7e607835a539904b53c08ca9d57b32ec09335efb4b9683099a6d6e0d93fb0bd5eefff5836c980ad7d3c5917f45ce4d4b5da01
-MISC metadata.xml 489 BLAKE2B 141339c5c28f928c1dbc166edb8ccb77078b7a5ce578ae4af3188c4f6a39c165cf784774c2916c7ae127e7f71a25a23953917b47646e28854e4a950435754044 SHA512 c332bc5180c891457f2cd34ea744b01771ff771b0ad4b1138ce01a0563d82212fa9f2988967ab0c1b7e41947bf25d8c0f627732dea9dda728fd887c287206430
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 bfb0643d18f1..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="http://jcmdline.sourceforge.net/"
-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 d31750c15e5e..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="http://jcmdline.sourceforge.net/"
-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 5f0350538012..000000000000
--- a/dev-java/jcmdline/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
deleted file mode 100644
index f1485fdee5a5..000000000000
--- a/dev-java/jdbc2-stdext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
-EBUILD jdbc2-stdext-2.0-r3.ebuild 1540 BLAKE2B 146a0d55ecc9e6e115844cc091a73d144738bc29756faab2b36b7599198662169fd6c8ac8b2544158d524a6f55b1b344de34c0ef6b19c26251ec2917b8930dbf SHA512 b94b09f843dc560b56999e7fce4ccfbc9bbb78a272edaee044a5485397b1491af85f245fa8608769b4c23bf2ba8a666cd5c2652507fac6d952b5e3ac9f4bf875
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 2444066aa02b..000000000000
--- a/dev-java/jdbc2-stdext/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
deleted file mode 100644
index 6f944f9985db..000000000000
--- a/dev-java/jdbm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jdbm-0.12-buildfile.patch 2267 BLAKE2B 156d36b09fe3aadb1128a7c157e5970d2fe8444978018de933006bd45bb49f941da4946a2b797e8bd20b4d1cb3eb61163936f6c05dbfe9d0a292f8522569bc22 SHA512 b54ff93a3af363efef7495fa32aa5fcc0ba1317d3a65059d9b64147393d2a51f5a344e267ec7b660843b66c0bd0c4cc1bcb5d4c5d3a9e32584e6118ab5470063
-DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
-EBUILD jdbm-0.12-r3.ebuild 839 BLAKE2B 7fb7f1eca265dabc58b71f91b8d930965e7d45561ab1604696d47cbb51da40943fd1aa9e3cca5266eff27c74c5b5ff791c6abb14b34b72e3b326f0ba425dca1a SHA512 e884de0c8f8d9bf391fa81ee4c0e262b0a4868317cee9dfad9f9c737201026e9b21c5ecc9821408ca7999947f967b5d27fc6f344145cfdfd2ed1a7f35cfd20f3
-MISC metadata.xml 310 BLAKE2B 39f67322e71ef31c835b666cf49f3e80d6c16b122d878ac9f19217664f518f69f64cfcd395f5c61512be2e4362117902feb3c661a9596c15c97934e0aee31445 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724
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 8549fd23a8d2..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="http://jdbm.sourceforge.net/"
-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 a0bbdd29a363..000000000000
--- a/dev-java/jdbm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jebl/Manifest b/dev-java/jebl/Manifest
deleted file mode 100644
index 38016cd27871..000000000000
--- a/dev-java/jebl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jebl-2013.02.18.tar.xz 306444 BLAKE2B d30a2fa1701cbb87c21a33745e081dbe2f56f823e4127d3f4326bdaeefb636352d4df5efa1576569949badd1e8b9a149a468da56bcbeef4a8df6ce7445e00918 SHA512 2f18ebbe30efbaab879a290a771a6e3d8fd1ba8afb6b8e0b3e9fb36252a4f65adf0929b77ef6922def61f9430ffcfc8486d822cd463f7ca6752418139d41aafb
-EBUILD jebl-2013.02.18.ebuild 683 BLAKE2B 4f76dbda747dff3f2ec87edce29110a3fe06de5a97c0d61edcb52d688ccb8eb3ce719c4424f1d83d30cf7adfc4e29dbaaa7e2ff885a5a07d66f48df0649347d3 SHA512 60f1e9eb39b5d5e2b96e726dd2788208a05c5ec5aeeab3e9b3195a70db87832d5dc5c39774dd0891b5af5825b1c0ae6451ca8ffbcb65fd99ed5f581ab23fe194
-MISC metadata.xml 310 BLAKE2B e652da023e0cc28b4612ff556fe46459b5f9758ce3f24623434c2b74e2461bcf37a34049235797dc22928e8740f186a0fba7f67d79e717545334a83c84755b47 SHA512 658351d53da5fe4c1409376f11154e1efbedf0563253af62356e7c63589973fcfc6c1fabd1d8951b2f40029b8da9e900b5dd5edc29d9f18d184f3bfb6aa35dbc
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 63fb36ae0fed..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="http://jebl.sourceforge.net/"
-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 e2a8a649349e..000000000000
--- a/dev-java/jebl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
deleted file mode 100644
index 1563bbd4d260..000000000000
--- a/dev-java/jettison/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jettison-1.3.7.tar.gz 63200 BLAKE2B b33f53a1605b0fa4acd0204602193e4fb7a994c777accf2e64dd77f865501be648aff0d3293730348b9f0c2812c39e74c776adc20780bb902e6f75a538a764a2 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4
-EBUILD jettison-1.3.7.ebuild 966 BLAKE2B fae138b34ef078f879bc8bce2f835ab1f23af9414e6aa4a4ecad1ae9683c8bdcfd9dbe15161b08fa3b63e2418c472139545ffd5dc843a5698bbcfbaead9b6a62 SHA512 48ab640617fef0715e15e35b1e87d9df42d6defeb3b4045c70c92272754ec54a54838e932ea1dd1c5b83080bf2e1a43bfb46de5487b13214af111ab5c7a0d721
-MISC metadata.xml 607 BLAKE2B 39b24dd0be0b0264413e3b4ca99b7e1989d36004b289f3f243d1fc69894e47ac61340ea521acc9061c5bac7862f08b4e9dd2b1f6857e4ddea4884d73b4787e74 SHA512 1dc350358996542f846e7d41e4348efba367610a1905c0f40992b2cf9eaeccab077eabc7f11cd38730579e4bcbd8f32630c825c79a1214d77153c65f81c2337c
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 9a6adedc8b13..000000000000
--- a/dev-java/jettison/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index a20bac201d79..36e3af6bb904 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -6,5 +6,5 @@ DIST looks-1_2_2.zip 1811849 BLAKE2B 47dd516b5523b655757c08ba108b58e7b1e2e113ae4
 DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
 EBUILD jgoodies-looks-1.2.2-r2.ebuild 951 BLAKE2B 4ae873faf78ee14aa149df23dc3e8f35afa17e15aa4d465ee6faab2b8f5082d321c3a319131e1b5a6d06e78a5f9e8d302136bf1bc0a9310848d8fefccd49c2be SHA512 9fa06f4d662fa9be1fbabe0660d0f30ef6f128c930aa7683a11c0b32e885034807a4ea75ad969922e4900e502f51f218adf8675ea8328bafcdcc39079965007e
 EBUILD jgoodies-looks-2.3.1-r1.ebuild 1438 BLAKE2B df30740411e427a0ad83274b39bcfa59c8c09c1d4dde39e5c4c320b5687a59f97bbf3114f3e9d6ae6d363c11498af3260bff2a75c83aa1cfb75c3b99e8fee157 SHA512 50fe058d0def9efc4d0d0c42c1a9bb97d7affee754a297c7a2cd600a6bbd59739fec5e2a9abfc400c8e0807af7cc40726c56470321c74dc02b30cfd3db27dabc
-EBUILD jgoodies-looks-2.6.0.ebuild 779 BLAKE2B 4acc9508d50f8be4892f2d082bb8949a5df0be8a2f8002b3568163a161dacf9333d6ba97131c8346ed0eeff1be0cdd67e738c2703b7369cf625776313a42bf50 SHA512 c5999ca3a392652c2b3cb36e88dbc7081fa9ff0e2d24acc179bb0c983a414775eb3f67ca3adf66ef309d9dc275d2f6f25089c4705f59cdd9ca4522712771d788
+EBUILD jgoodies-looks-2.6.0-r1.ebuild 790 BLAKE2B dc04734968f212409aaa29f971d801f07181cc89f731eea94746ffd978f7e8a079fb8ee0c43a6945bc52c2ef87c6075e682f0a401f2d55d11366570cc26182e2 SHA512 5bc5a205744541f9551c453b391389ed7541ef64b61401cc84fa9b961a315b6d901f168bc8263bb3160086b4bd2f50807b443739c69f34c702ef0222aeb75463
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
index bc04265b83bd..b66de1813650 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -24,19 +24,22 @@ CDEPEND="dev-java/jgoodies-common:1.8"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	virtual/jre:1.8"
 
 DEPEND="
 	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
+	virtual/jdk:1.8"
+
+BDEPEND="
+	app-arch/unzip"
 
 S="${WORKDIR}"/${P}
 
 JAVA_SRC_DIR="src"
 JAVA_GENTOO_CLASSPATH="jgoodies-common-1.8"
 
-java_prepare() {
+src_prepare() {
+	default
 	mkdir src || die
 	unzip ${P}-sources.jar -d src || die
 	rm "${S}"/pom.xml "${S}"/*.jar || die
diff --git a/dev-java/jid3/Manifest b/dev-java/jid3/Manifest
deleted file mode 100644
index 52022e1d8a99..000000000000
--- a/dev-java/jid3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.46-javadoc.patch 521 BLAKE2B a185db564d999096252bfc0f382d116b023b45d794083c038127c3d85a8b7bba6fbb0df9243d74b4955fa4ef1fc8d0813de9dcbb50bc63efa5a9612a98a9c70c SHA512 88a57f0c15f1915ac072bec7d420bf8a9eb1ca199175d56828f5439958f474b62d33f49a2eddcbcc01bb39dd07a22febccbfa58aa95be5e6b5413c54b94bca48
-AUX 0.46-tests-and-unicode.patch 17518 BLAKE2B c484cad7507d1b6c3c41d04a100102161d0f3f2cc2c9e64a636f11b61a927fc95e511ca38d4974fa05a34708268d9f6a16a739d57778c72776d78581b484aeca SHA512 d1448b2474af1d404999d1ac1df126814405840d8d80074ec90b7f4e2506a6d3497e2b6defa8c9c04b6fb7d86d815aec7dc3b7d7455f5fde41ade590db4452ff
-DIST jid3_0.46.tar.gz 972609 BLAKE2B f04e2055eeac530ae5256e43ea1cca2d528ee6b3027d43234c60be5150103212cecb68da5f1d6081462a9f215223f4b4377932b77c72b4de1c8dc816603cc9ea SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707
-EBUILD jid3-0.46-r2.ebuild 1266 BLAKE2B 219cee9d35120d0ad928a513f6d2c49873bbb888623332b1d5d22ade532824e95c8db453276fbf120c40a1627a0ed45e611de39b5180ea25878b3f17303a5eb6 SHA512 622dbe7edf46a04fe5110d867353ad972f084a991ca3707a09753405449180e9ad7a7b82dbe36a792a2163b6739e63d9df53e48a5e197745050b9929d67e8bb5
-MISC metadata.xml 458 BLAKE2B e62d6ad7013a3437846647124bed30d2332dd2fa35a8fca6e179f6ecf5282d4c5ba6f2b02299d3936d9c8c596a1f2c60005cdd35f60f87a3148c95f80af0649e SHA512 8dbbc0044f192093b672832681e521d55ff3ea2b3f3c74975cb493b0192c03f76279caf358f702449589d8d836a0b035c590c1fd4e0efc450740b354727fdc1b
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 9c54bd0250a2..000000000000
--- a/dev-java/jid3/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest
deleted file mode 100644
index 0d158f5e67e8..000000000000
--- a/dev-java/jinput/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX javah-classpath.patch 469 BLAKE2B 6cf9c5c6fb5048a074fd8e654cd4851779d1df9155ba81b7a38c716af1acda9eafc5e1fb2392cd05c9e2f14859daf93ec93fa5acf5d09784d3367a24f76af1a0 SHA512 a10b34e593980e24e0d9dbf0419cdacdb9c03059b54d3a811f3dadc8838d223cc3e4800feeb1ad0cf3b65d75117a0dbc7061740b40e051c683c4180a323bc916
-AUX nostrip.patch 431 BLAKE2B 5633db9dd6cf803c8a960dbfa38dce803b247efe107d20430b41c24aad057041750e1f05af1cc2e26d3d4b241260a0a3cdc5d295d713ae91c1748487d3f4f760 SHA512 0f1cccfef58afca9c1db074ae179bc9d06c0ae758a859671e362c229279d2b3c570356ca2e06bd319f1ba6674f601f4fd15479adf1e1410779a52eec9e1172c9
-AUX remove-getDeviceUsageBits.patch 4109 BLAKE2B 89518857ae50e74688fa1f9c0f493c8bcd34a0db44b39e5768c581019cced7d9c568813f3add70ba26eb42963291da9131238c9b3c96b703bd73e15897d55663 SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176
-AUX unbundle.patch 354 BLAKE2B 87bbc929c3449e786c61810bd4f3ef2beeb9d8bd7efdc006afede6898a6608accea69a6a935ab383cd5d5689f4c0956367043c5d1f856486c379f0b2b997deb1 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e
-DIST jinput-2.0.6.tar.gz 1590738 BLAKE2B ceb296af7ca4309913708fac5c67c6fec9cd94ef3dad454c41a99ffee7e390545ab6424354dd0dc9755dfb4c0711b449b29b423b395c0f2f504a73d2d7019645 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba
-EBUILD jinput-2.0.6-r1.ebuild 1248 BLAKE2B 05e7a789ef2f7037eac0d322a7d166070bc84b828cc63f666d81743ef5d81cf57f72010efe315bff69e9687a236ab8fd11b0d73ddaf84b4e7064da307c5199d1 SHA512 846133445e9202b7d5f6b70a9ce1530fb54e9e97b51cc988c13226ab5a31970a80607ab21fd33fa34698f4faa718d29cbc1870a6ebf3e389ae21fc82ce2e7775
-MISC metadata.xml 657 BLAKE2B 17302de7620eb88fba8aca2a04148cd31cb9176a0e2e539e3e181d68ca0e98f98c6a2a1a2fc254c16e2f19c4a8d206af893e80581c0be3f18c9280376868f08a SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac
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 bf2bb954c526..000000000000
--- a/dev-java/jinput/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jisp/Manifest b/dev-java/jisp/Manifest
deleted file mode 100644
index 82aec63d7826..000000000000
--- a/dev-java/jisp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jisp-2.5.1-java15.patch 1828 BLAKE2B fe995052b054f43498911df78b4776c4df7b9a047b5e1f1a6f5c7b99d1d67cba12bb9459dd573e51c1e00c0c94d058f03caef5e0a4b8f524b1ac8cc88c6f830e SHA512 b6221e375ad98ec8d4eb86b3a0d720b898358d9528966b31e8f4f39e8eba595424ecca3d5eaddb0866efbdc056d2dc68b1c1e4e7e09ab2bf637f7e7e00c4b039
-DIST jisp-2.5.1-source.tar.gz 63282 BLAKE2B d2e8bbc91f2db1fbe1c8411dade375a8934f3cc662f1c7604097341ba1f0430b4e450dac7e77f1479d4078be4cb4c2878c243c3d1c84b36f6bd1ee9318046b90 SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0
-EBUILD jisp-2.5.1-r3.ebuild 794 BLAKE2B ce1de7f465223a4731f8b0773e3d568bbefcb405d9774a6885e727e4f869a452768d794ac4c27d8a8929d08d3a3a33f98e39509b5a1cf1f993c12b15846c131f SHA512 5e7b9bbb49d74a777a8f1c04af5bd0454d17cb4028038827317638646687555b588813b7852c5aa01e2a60db7a7b8c393f9acf62d8d57d91d28d4a89e7da9bb3
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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 37998bf40746..000000000000
--- a/dev-java/jisp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest
deleted file mode 100644
index 2c8f2b3691c0..000000000000
--- a/dev-java/jlibeps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jlibeps-0.1.zip 85686 BLAKE2B 54214d74007f63bafc7a0a88643ca82d488357501eef2f186162b6c8d6c913f77eb0074e7e156fd41954584f7398f47c6f883a802ceda39608ac5f60b4e9def9 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a
-EBUILD jlibeps-0.1-r1.ebuild 534 BLAKE2B 02f25fa2d797e9dc39f1980da4288fe29bb8bddc3ac9105ef01dc2597e81e990069a645e02ed483c04e1c52a67d84edf5cd9fded95ec3bf4b1f5c086d5dc8ae4 SHA512 b915aba64fc8dde67616dab0fbcf1892b3bffd3c531414a38d4582fe14b44ab98b377dc987265e0167a4b36833cf162375f7ccdb42c41029dbe89cc6d0c3ca80
-MISC metadata.xml 313 BLAKE2B c47ec481752d1492e2f8cd12c0e6fec4b90aebc7ce5f0f148926514aa88cef8829a667c5c3dd79f16f199ddb4cdc522c5f7cff9502bea9bd3405384149622d63 SHA512 5009d20a82fd81237740bebc3aa937b90a189286cf4dcae62ad69c5fc0830b150864a520ef0eb2d87528d78abca4bd64a3c8106b53069dfa78911c64fc4e4a19
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 2f75afc4bff6..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="http://jlibeps.sourceforge.net/"
-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 8e0eb0d87c46..000000000000
--- a/dev-java/jlibeps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jortho/Manifest b/dev-java/jortho/Manifest
deleted file mode 100644
index f92d19da3636..000000000000
--- a/dev-java/jortho/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST JOrtho_1.0.zip 278599 BLAKE2B 3a8180005b0f34301aeeb5def5ea1b9854f404f14d8c27fd07a74209eeb7e27e1857568a12f7633a0da0ad9ce19324a07baa89370d670a2c8cd7501861fc9c9c SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c
-EBUILD jortho-1.0.ebuild 913 BLAKE2B ab9484ec70cea53307989c72838a72a4dd03b66856cff00692c0a20b79b2a4f0a484efa38d520d0c42514b60a4a0684451bde0b3272cf563e196f5a46b187fd3 SHA512 f1f6b6c0133aedef93ac8ba3378dfe73f778ff354f701284b9e9eeccf9cbd8667649415eb6ed66de7ccb46b55a36434c7d932ce5de785e4cdf1f286b7ead65cd
-MISC metadata.xml 312 BLAKE2B fade487164fa1518f3f4febf1ad785530d1d3e717394152800d50d6460e518ef440629a75f70a16c7ba02525e673b445f616bf48bb85b8a7f5851ea9544f0178 SHA512 eaa94dcf310fb056e6d27e7a9ccec7cfa8aa0f36c0e827dad5d839e39e4d7558296d603deeb584b6f4ee8e9ea92058c03102bc6b8ae6f3e4870dd26b4524b9b3
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 0149fc6a4907..000000000000
--- a/dev-java/jortho/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jreleaseinfo/Manifest b/dev-java/jreleaseinfo/Manifest
deleted file mode 100644
index e09dc8ea6615..000000000000
--- a/dev-java/jreleaseinfo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jreleaseinfo-1.3.0-src.zip 38437 BLAKE2B 614c60b47e2e662751eeada60d5b0985cf0ffd090ebc9563c26f7d1a58177a3f375772946f85dd1c91227c5230d7cedbfcdde36b7dcfdc066183651eaf0d2bb8 SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f
-EBUILD jreleaseinfo-1.3.0-r2.ebuild 764 BLAKE2B 3c56a8222c7db94cd13dd0a8fea7fe725a88a756179b1290ee39b9552c200a55e87696476c907e57c7e54b890c7d6469f49667c7304a6fbb5af499703703f073 SHA512 f8c1eab6bc6cf17db07844425868026c1e1ce7103054b159944bbed50d5017016657fdfea2e4cf9ce04de71b3b11595d83ce23d64e06c08aea7e730d62238c8e
-MISC metadata.xml 318 BLAKE2B 2f8cb4708e471344e269f99d7a3ad4ea0db5e50101841f7a834501616cd1a9806de0627957164b0cccee81f34ca371032e7b35ed0d6fd09c4519b40ce3e0290d SHA512 99675027c08cb4257cc954a308d74352466f09399640cfbb48939dc788938db92c899427f1bc6a1746625052b4f709265eecbdbde7e8af2fa5c69a76958aa6d9
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 104f130ffd4f..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="http://jreleaseinfo.sourceforge.net/"
-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 405d643779b0..000000000000
--- a/dev-java/jreleaseinfo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jstun/Manifest b/dev-java/jstun/Manifest
deleted file mode 100644
index 9469e8f0de32..000000000000
--- a/dev-java/jstun/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jstun-0.7.3.src.tar.gz 173666 BLAKE2B d417b95f2adf5f072b35ca5ea50d3c32c60b0ae7d2095b4ffaa79f6dc9817bc730657189da0abf59f6e3bd362ae34c3c3ad9c02e8456e84a33e02c9cab3bfa65 SHA512 03dd54331c79992ef2c387eb78fde8c98b58e3818515bf57beafb6157914fe9295d3ff043ac8aab78490ac2582969c07e1891ddbefaa702c3816ddac061ceb18
-EBUILD jstun-0.7.3.ebuild 1321 BLAKE2B e1367511b25baa145e056836e4eaf5a364645c1fc6b8b4af01ca1c295ff8316b674666d56ac28dcd8be09841501e8a09c4ff296531609a119b8d1c717dec600f SHA512 46ba021dd9caea66a97808171b8d53387d33fd31f91ac998b884571442015874e7d5005bfa2dfcb31144f5a832138a128fa21a3b90bdf0e922147fe0f878349d
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 2444066aa02b..000000000000
--- a/dev-java/jstun/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
deleted file mode 100644
index 67afea4d5b56..000000000000
--- a/dev-java/junit-addons/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.4-build.xml 8725 BLAKE2B bdc668244b90693cd60f294d188b200b51929093c988ce96bda06231ae0df781515de678115cb6f8810aeda1f6c380f0405350bd9dc6e8804fb1240042d5c311 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12
-AUX 1.4-common.properties 540 BLAKE2B 48c40f53f6f5557f5b97753209782ef3c57c53817ad2e7e04de7cc234ce84cf1abc9b7bdeefad992d3ea0586fb8aa72fe37942d63833cc3ceba01b400f23b432 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6
-DIST junit-addons-1.4.zip 293750 BLAKE2B f305ae548ee9577ff9c5be01846768fe111a2cc7c523a080f5bfe823f6e2def5880fce091cd3e460eeae831e639616ec7cbf203dcee1dce66a7075a6343df1df SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a
-EBUILD junit-addons-1.4-r1.ebuild 1437 BLAKE2B 434e9b2a883d331018fab1cd4611bb4ee1733139592ec14caecf84a57d90925f9d467930e729b987d31383f4a22a573a16bb41bbc3bcdb5b50d154398c9a069a SHA512 010bf3f55fa7e2b3f094dea7d58649dcf6ea5882d1b89c2ce6fc510d463b130c6dd6f9b9687efc73fd0bf8ff0fce8af56bd7739b5ffacd2a33e63fca8144faa0
-MISC metadata.xml 490 BLAKE2B 01319745e5907693e1cc616f05f66b4e049258cfe26a585af35a4ba5e56c7d78a338b374ff42558ce05c7523da5d330084b274aa91967f8a6ad4a06adab4e564 SHA512 bfa7b8058d0f28bd1455f2ab6841b562f369a62d90bd6a1a875c67c991dc75ade65c6e854351a4dee83d2ae059185e82a84f3159095a174aa48fdbfa8070b3fa
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 06a2a1928cc5..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="http://junit-addons.sourceforge.net/"
-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 3a46e0a4fd94..000000000000
--- a/dev-java/junit-addons/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/junrar/Manifest b/dev-java/junrar/Manifest
deleted file mode 100644
index aea24d2ace65..000000000000
--- a/dev-java/junrar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST junrar-0.6.tar.gz 70631 BLAKE2B a3702814247c30e5eade940ddacef5c561df53e511057f3321776a80d8d550e2d2fa0f87a228571ffda64d07f5ad818d175f704f408fbbf016953068294db4df SHA512 21da07fabb9f9c605191beaadad6a7abbdd1c02c8daab6913232889e735178954c0e2e7c4546734bb3b530d851d9016a549fbb68cc7795d005119fd176c15991
-EBUILD junrar-0.6.ebuild 726 BLAKE2B ece9e1c213d3f359bd94ac5a114b30ff69f2cdf95608c772f3a3d7633402af224757f0c6d606a3ef24b36b2588781eea771a8855f4659b2b16f8b1d992e19865 SHA512 4f51e3c2f02c78b30b94a12a582b73090a808bf3d048050aaa479eb19598c9767c54b2144e068a7d7e92e85f46605a62f7a241e27eb3cf225b209e4a18e853d0
-MISC metadata.xml 321 BLAKE2B 59c4a4df8a68c9c47bf5bcf1ddbbc95fbab7c442d3aaaf2e05c4a69217811ef9ad39c46e726441cdade036d52db98285afc92f14ae48714d219003f41331f666 SHA512 429cc777075ac0714111d1ee012b8bc93628e16477e64ba5716e3b96d457d54f2055a15c204e473db3593079baaa1e33b48ed557e7f9bfa360ab2eed624513ef
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 581cef5a47f9..000000000000
--- a/dev-java/junrar/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
diff --git a/dev-java/jvmstat/Manifest b/dev-java/jvmstat/Manifest
deleted file mode 100644
index d80921bd29f4..000000000000
--- a/dev-java/jvmstat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jvmstat-3_0.zip 153629 BLAKE2B 9191873c9d719a0aab33e3eb7d8ef056dc93861f81c09ef10f7adea457fbfb39f347d34d0b84410457b0b0c52479620bde1060bc5fbc6f7dd1c23efe643d385c SHA512 c3967f5c11ef70aac3b3131c7ca1330c4ea377e59a2e9fb18329cfd9c82a8363efd960c9fb71e4d5f7e81867bd24e5bb6263d2f38b95878222c9184c0aaf4f12
-EBUILD jvmstat-3.0-r1.ebuild 1078 BLAKE2B 63dc6a036a2e5208974060337161ceb3aa40b4785debcc76dc7471b6b2abfbfd63d5b50a75654deef8131003f74be68b2060a1e75834c8a74c8750f4ffde03d5 SHA512 151125cc2e05ec10d7af5c30e7f17a2b686307c22f2a3ae4fa71cf9fa3789dd43ed6053c7b967190cc2c15f9cb0c984509cba68ebb2178491c4bad0925d9cefe
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/jvmstat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index 6c61bef1ef4a..cd20170db481 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,5 +1,3 @@
-DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
 DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.0.7-r2.ebuild 744 BLAKE2B b902748fdadbf73d5d6161cbccbbae7bda8b3d8decad11702b7a96da92554fc10fa0e8ddbcb8a99e6aac7d20e6eb0c2340d5117a51d91568a8c8a887816d4865 SHA512 c6951bb1a71a5b1ad6b25a1b94764502e8381408654f6093bb4c7d079195e599e28a23453876d14e7d3b708fff28a93bee13be62a9eccfb92e57448ede9ac6e4
-EBUILD jzlib-1.1.3-r1.ebuild 1312 BLAKE2B 367eaf5cc1e3daf94117a8e20b106cc9e6c21041930ca92d7658de6f4c7456587ebbfca572e8ab564ffd55483ea016b4d155891577d9229005b41c72a57102c0 SHA512 533bc6796918f37ac7c5aeb2d6f7f0a76994dbf1cc2d6ae6ff1f0a159c3ad2dc74fc26b11e2820c3cba56525e115dfbb8d2b97aa791af85ed0dce89d55999d4c
+EBUILD jzlib-1.1.3-r2.ebuild 1312 BLAKE2B f010a9c7dc70ff37c862c44a922e6106cae46b7cd5e84f5a2e3f0cbbafde1e361f610f6a58a60b3918f5bbe0eae6bd3f69f0a2ad21c3f8ef91efabedb0e29747 SHA512 77250bd8531793c7774bf2d47be9bf10a0364c8ad7d344266796c73ff3434adbae943714f2ba5cfce8931e836bc846c148a334edf628ea7c6b57dc100b317ad9
 MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
deleted file mode 100644
index cb18a81912d8..000000000000
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
-HOMEPAGE="http://www.jcraft.com/jzlib/"
-SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="com"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README ChangeLog
-	use examples && java-pkg_doexamples example
-}
diff --git a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index b58fc292b34a..615a5512fc00 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -12,13 +12,13 @@ HOMEPAGE="http://www.jcraft.com/jzlib/"
 SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="1.1.3"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 DEPEND="
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.8:*"
 #	test? (
 #		dev-lang/scala
 #		dev-java/junit:4 )"
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
deleted file mode 100644
index ac3054380e0b..000000000000
--- a/dev-java/l2fprod-common/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX l2fprod-common-6.9.1-nodeps.patch 1776 BLAKE2B c7cf298871612ea9c168555fb5d0536fae85de786ae9cb3206f83816bfce86d8657dc36992e9864d342a2f7e97985d8d99f6ae72fcaa684addf02334c11131ea SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086
-DIST l2fprod-common-7.3.tar.bz2 475662 BLAKE2B 40e41e7fc335220c437befd866bd4c5ff9413235f8efc6cc64922f8f9dbb8661f2acee0491ca9d90599bf314038bf0b2a30099e5ff2a323c39d8d60c3a6b0433 SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a
-EBUILD l2fprod-common-7.3-r2.ebuild 1170 BLAKE2B 316924656377447943da3eba4f4c0a8362f24fd2dfd064542ff94aa725c5e1ba00f5e4ccd4e639ca9df7553038ab3f25f2f84c6798c1cf6b03054a301e7e2ba7 SHA512 c1f0b8f4c400860f99b9f5c29955e7f79f77b9d38c33fdf00d21662b2dd6f6b8d02b5bfb4483ca25effef0095085c7acedee39f1093c1b2f6f3d52c2a4f8d83a
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 952a4b9b605c..000000000000
--- a/dev-java/l2fprod-common/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
deleted file mode 100644
index 5e336d7ad52c..000000000000
--- a/dev-java/ldapsdk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 BLAKE2B 44a69a7364592f1913f04a8ddd4f9b9792093e644084b2e0414f2168e788de87511d5c0e91d3ded0de8abd78bcc52e8c76cf1e68a2d5cee7ae733735dfef809c SHA512 b62749328c9ca64342550771a4aeed8321b2995a81b15a103c8c3383beaa471f657c13b9eefa6035f0820c7b39e4640f6af1eec4af8bcbbce75a2d97252bc20e
-AUX ldapsdk-gentoo.patch 5569 BLAKE2B ade856d7048ab2ab7b728bc3bc7b49ad9c3bac9dcf8e1fa860c8ab6a164e57df1e570c0611c153f7da3a391e0a299dafb1a20ee5b0f0bc4b4a5d08398867235b SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c
-DIST ldapsdk_java_20020819.tar.gz 1068301 BLAKE2B bb49f97908014218ed7a2c38bbc4ee4cb84e63866a7cc300a484588e0868a844367428c7a1008f6d69ba7e40031f03bd50ae595c2122d7a5b1fed91d4570b082 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d
-EBUILD ldapsdk-4.1.7-r4.ebuild 1309 BLAKE2B 9f0a6a0248bb9288e3875ff29baae0a9c656db77efc6287c5457662e4178a05ed0af16001f6c8041637c7d672d7c431df9696a8f332d7e60b8a2d87b5e275cfa SHA512 8c6b76e8f3f72016c2fec988d4faf90530e8d0c1e45a7fcec313d78ac734591500325b1fcf7a6bec8411c9204abcb6818447d5019e8f039b5c1bf2d498dfc205
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 2444066aa02b..000000000000
--- a/dev-java/ldapsdk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
deleted file mode 100644
index fa584308f0d2..000000000000
--- a/dev-java/libmatthew-java/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 BLAKE2B 9662d03e04b55a3041807661b9503644b0595e3cf0ae4479eef9818dbd9edbfa5d7c4a9886e51c1adfc194dec5c06746ac18c559bd4d6768a49c3a8bfef802c9 SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3
-DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a
-EBUILD libmatthew-java-0.7.2-r2.ebuild 1344 BLAKE2B 8be14f4753f0115a80917a799e154ebcc74de813ebfa74182238d729b011c790630d1889794e4586330013b2362711c534187ade14f160ba9899ff3c6e1ae950 SHA512 cbe3f643bd0ba0f03d5b0a8996408979e056d31ac7fe30b694d42106fd5c3fa7dc6e68a2bd505e2e4a232becaa770617e013c495f5dd7ed374735c9e5b27e615
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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 37998bf40746..000000000000
--- a/dev-java/libmatthew-java/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 548c3d0718f0..fc3b5b8ad9dc 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,7 +1,4 @@
-AUX metainf-services-1.6-build.xml 8356 BLAKE2B 1f73238ca0f06f0a9b31d756313a492333dae4098f93979978eaa369498994671cbeb3da185c3628a013bae0fe2537aa0b55dca14246e982b7a185cfed17a5bd SHA512 22ae17b70e0760553cdc6dd641a79533712c8512a4f43b81a97eadeb674037fc0e1019afe82d7d98dc6e5346c048343ffe7ce747ab81f51a52f555974545a012
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
-DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
-EBUILD metainf-services-1.6.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
-EBUILD metainf-services-1.7.ebuild 569 BLAKE2B 50ecf097920c3ab248fd7f5b0d1e99bb26f18648cfd64eceaec2fa806b1d9ceb98529ca28292c336cbea8ba5c88447db6cd6c4228b2588908ebc549b2352fb16 SHA512 1fd05a9dbad8d60b06362be0876869751558268cd816409a5495592816b271ee256ec26e507ab60931192681a54a978380eb01534877111090bc69c27481f7e8
+EBUILD metainf-services-1.7.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
 MISC metadata.xml 335 BLAKE2B 6b80ceaeaef798225f8d929e5e86677482395de9bb24ad765759f68e7a788ade7de997d230a35aa92b97145ef7dd0c8d319a9c1c2597149e161adbcdab373947 SHA512 7dda5e5b222befb2e0a0040429d96d8e9bcc721a22576400b0ee16d827011dbbed85edd85383ed3b398564645d94da56ea48fc7aa3c8a65655334df74b8a6f5a
diff --git a/dev-java/metainf-services/files/metainf-services-1.6-build.xml b/dev-java/metainf-services/files/metainf-services-1.6-build.xml
deleted file mode 100644
index 98e53f439d22..000000000000
--- a/dev-java/metainf-services/files/metainf-services-1.6-build.xml
+++ /dev/null
@@ -1,192 +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 7/13/13 1:12 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="metainf-services-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="metainf-services-1.6"/>
-  <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"/>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" 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}"/>
-  </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"/>
-  </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="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </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>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-  </target>
-
-</project>
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
deleted file mode 100644
index bb7d68cfe2f2..000000000000
--- a/dev-java/metainf-services/metainf-services-1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generates META-INF/services files automatically"
-HOMEPAGE="http://metainf-services.kohsuke.org/"
-SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-}
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
index a10038783c8f..bb7d68cfe2f2 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index f5cd1c7c0c36..401a1212f40f 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,3 +1,4 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
 EBUILD miglayout-4.0-r1.ebuild 1274 BLAKE2B 8d7d2db7d2fe14b4a827ff1f089083476fee8daf84c5ce96cae6ebc886d37234e106da7d8f72693d77a321d5675c6b6e99ba58d2f06ac7cfeeea0f71e4862ee9 SHA512 a51a700c956e4693eded18a36c848da2b8e6582c5527b75ada686f00fb8ad95b313f6fcd3de725d46f113bfacdcc9d62b7e06f3e7e7f6c5d920cd0b02ec5d572
+EBUILD miglayout-4.0-r2.ebuild 1273 BLAKE2B d196a79d9846086ddfed5d887c828711365b4004e8d5cc02feca6e150d2d8c3fcac6c0f45e08ca737a0104ad71bb86a2fb428e1a6c7608b75152d01f43c85aad SHA512 862bda7cddea4ce4dce7be1849b28600bf6eaabed710889eab5b008cd23a7530da813d77a650ee0d8f0a82a66644864c58972fabbc0f0006272c4017e007e01a
 MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild b/dev-java/miglayout/miglayout-4.0-r2.ebuild
new file mode 100644
index 000000000000..863e44285ea3
--- /dev/null
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
+HOMEPAGE="http://www.miglayout.com/"
+SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="swt"
+
+COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	mv net/miginfocom/{demo,examples} . || die
+	mv demo/* examples || die
+
+	if ! use swt; then
+		rm -r net/miginfocom/swt || die
+	fi
+
+	find net -name '*.java' > sources.lst
+}
+
+src_compile() {
+	local classpath
+	use swt && classpath=( -classpath "$(java-pkg_getjars swt-4.10)" )
+
+	mkdir classes || die
+	ejavac "${classpath[@]}" -d classes @sources.lst || die
+	jar -cf ${PN}.jar -C classes . || die
+
+	if use doc; then
+		javadoc "${classpath[@]}" -author -version -d api @sources.lst || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc api
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc net
+}
diff --git a/dev-java/minlog/Manifest b/dev-java/minlog/Manifest
deleted file mode 100644
index 9674588a7e3d..000000000000
--- a/dev-java/minlog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST minlog-1.2.zip 19766 BLAKE2B e7bbbe5c2aba1bd44ffa793c397061cbae30bdbcc3e1ce7c7293f05ec8a35e898ab52e1dc4c953cda114002a143a503188eff2f33a40303549afa3b257b8208d SHA512 79c341288fc4c18ceb307011b3591e239d00a356fc78379449bbcc4d93b0355665a4425dd31a23d83c79eeebf19a591b9d3fb34d6107a4a503125dc683b4519c
-EBUILD minlog-1.2.ebuild 494 BLAKE2B f91b4f0339e6b58a482d895923593082f3be5d3497c43f9615c2d973c329303d79f20dbaae9b0fa1875ae999a78790da5ffcecc90532986a23d0ab1dbaa9d338 SHA512 c6d39530eb2ac19a33a099960e7ab22a0aac4888b4f16fb7495f766563a58833dbe025db3e49d226d81cc9355e081bc471434b0061b00ac93c146225820d1730
-MISC metadata.xml 324 BLAKE2B 74203b4ba970f32333e2af69015245ab2f3555ed3f5602d8e2cbf93115f5b306946c37b96c167de0b7ff63b25ffa3f8827621a1a1f9474b94b5b19ac5e361706 SHA512 f760fad4ddc817e31066df080e17a53c44cacd3434bb5de1d1f9ec7ccf82acc1e3f2a40b2dd4ac34a31f609cd69fcbcd1555996130d24a77107978653758f444
diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
deleted file mode 100644
index d27e594b9ae4..000000000000
--- a/dev-java/minlog/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 fdf92ca2f88a..000000000000
--- a/dev-java/msv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
-EBUILD msv-20130601.ebuild 1180 BLAKE2B 08777a62410fc570a1a566e6735d306c70ee6003317567d41a92004142ebb5ac9f2ab4d35a6e1b530666f3a9e2fb90cde4516077f39dc11e3b1b55ca8b12ccef SHA512 6dd92ad41a6243bb3b32f86e88d18f2a9e6b93ea1a712bd3c3cd891121164cc06ee5ae6b92c91298df27db8fa5def08e29d9b4723f294d61ac1ee773267b693f
-MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
deleted file mode 100644
index 5793ba043a01..000000000000
--- a/dev-java/msv/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 a50547043c93..000000000000
--- a/dev-java/nekohtml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 BLAKE2B 891239b5b4586ccf542394da265036d29b8e4850258e697f6289f42e1bf2aeb924be92f912f064431165632e5fd8c7f027d36b7553320b4591f478fbe5138fa1 SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937
-DIST nekohtml-1.9.18.tar.gz 10471968 BLAKE2B b033158c2ae6742c615d6bcc58ef05eb18f2395cab5052de20a485adb573b924202ed04dfbcf39bfefb4eec524aa0d5d9216fdd151c4a8722b5277c2808cc878 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb
-EBUILD nekohtml-1.9.18-r1.ebuild 1223 BLAKE2B a50e7ae4c211359f51859cdc95e30aa5af836987ade913f8ee28380d2e78c5ca05011822f4b09b65ade48da8591ec434532dc1299a94616580f270b2ace038e0 SHA512 100c619240755354db61c82b8a9edc445153bbcb5fa95a1fe2f4df11767295890011a2aeba77b69e22cf885113eb258f4c7fc6a7bb70a6091ffc78f4f17ab828
-MISC metadata.xml 314 BLAKE2B 073d261d268fe26737f695f2c376829add4b29affddea58a4ad61764facd3bcf32eb5f5f7a80b26f989c8722da1cff4247672b2fecf535b59afd9e21235b1b55 SHA512 a8b454129fe31dd7b221ea1094a331ad78feb7cbf558e256fad7a49a28c7ceb99874504c4430c1fad04e854b25a5e1005005f3c2320eafe985ee934c758351f6
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 7b1fb1901602..000000000000
--- a/dev-java/nekohtml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 1b787d352632..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="http://nekohtml.sourceforge.net/"
-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 362569a3e081..000000000000
--- a/dev-java/netty-codec-http/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-http-4.0.36.ebuild 1692 BLAKE2B 398e0a06ddc5bed42c3c389b3af68b9f1ca356bce50e12bfd552760e4eb6f655a7a9669cd9ce152eec11b41f77b8b5d0d96408836ce071d6eea2931616124432 SHA512 d23ab6808084f407ce58ea775feb1df8816fa8868195001f6ba20cd5f731a1e8caff45b07b547f627a9f3f789e0e6e2ba2b95fd9dd12371598f458c70afdf56b
-MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec-http/metadata.xml b/dev-java/netty-codec-http/metadata.xml
deleted file mode 100644
index 3a4bd0130d1b..000000000000
--- a/dev-java/netty-codec-http/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 407f6ef8918a..000000000000
--- a/dev-java/netty-codec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-4.0.36.ebuild 1590 BLAKE2B 65ef11c7facc282dec406401c347fc9f54d4cf15a8cd8009f0a7f09f010ebeef05f4fac75c040d8f597b9c7e4e12ad878a41909b5c77e0af676f183a8d874bb0 SHA512 f84c091e6f036e515aff04f7ceecc08549b8d65de4d715bb61c19f0b4b4376bff1c3b6d1b372ad3870163cb738e2cd9da9c94c9a6682c15008f05788449ffc00
-MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec/metadata.xml b/dev-java/netty-codec/metadata.xml
deleted file mode 100644
index 3a4bd0130d1b..000000000000
--- a/dev-java/netty-codec/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 2e0c55e2d431..000000000000
--- a/dev-java/netty-handler/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-handler-4.0.36.ebuild 1732 BLAKE2B a0c9297e10c32bc0d8f56e4ee58688b3083183d80b8b9d2efd454e9bf0541ef9c069dc278b908edd69a6679b097f8eb15972f959932c8297ed985ec48ce68085 SHA512 de098d7010163ef45114950b449cd338fa3aa7a3fa74355c991e8347f6ee2adc7e3cd4cafaf13cb3cae4ece16263233c33b72941458606e0f55b37218c313f0f
-MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-handler/metadata.xml b/dev-java/netty-handler/metadata.xml
deleted file mode 100644
index 3a4bd0130d1b..000000000000
--- a/dev-java/netty-handler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3da9b42b7787..f589d06af0b0 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -5,22 +5,11 @@ DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae12
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
-DIST OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz 98247854 BLAKE2B de96234507ae2831548c8bfc04d46ddca19d17dad6292cc51021f6001338ddd0722e16bba886cf06187f5df7e8dca34a972696be74dc1ba23be7dbad91c8d3ce SHA512 9cc2240c04f0945beb75536ee85b8e1d19acc9357e2ba844000db7e9f64c6247bd57cd0193c1ac66cbbd79e6f1197d68604519689fdff88a8b90193dba3237ef
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d1b32f76359362bc101678b0123d29d32bd720a10b806a55cf9b4cd3e9d5cf2ec50f985a4de85ae41ec4b90376e7b7e2f501bfe86ad9ba832813444a8f9a SHA512 2999972ecd574169d50afc6c7ff3e7b3f892939b125a9d02184b09ac11ed32b741e1bacac64f93fd4fce75bb4b16130290c1011d3948c66095132208cfc05839
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
-EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3625 BLAKE2B 4397d7271d15583b6f47fa5235ea55a240e53bcdbf23a59df15a0be7087278de2bb28776922243702ae2ca2bb750f2d85358c6704ac9e47ae65e20440c60596a SHA512 d8a7aff506f41ecd1f69c13ba36d64e33b93b96879740c3cf00f2af16a5a12381f2743c7613d96b392f1bccc85d23afc0eb722a1538412050408a09164a5fc38
-EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
-EBUILD openjdk-bin-8.282_p08.ebuild 3021 BLAKE2B 735b8008dfc7ebaf4fe04eeeed41fb1f3f4a4ce511aa5df1872f06cecf5adf1358c73b32bf9dd66196a081951eb8bb0c4e171935f329bd41416da40f55b34e3c SHA512 4d8465e324810fa5f828a6aca1a6bb3a8547741ba87e59e80bf722398106a97bbbd0ab3bc81099795052fac78c5a3a492ebe1fcd300cc51002e6d0a41432f51c
+EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
 EBUILD openjdk-bin-8.292_p10.ebuild 2990 BLAKE2B 30fd8d4a745ec3f8635ec9186505f1b3affcec34afb2a78f5fd9daf104a093d70661ed77437e7917088fc1b0ecb7098ed0a9f5eacedf9bf7bea6ce15a16f0b71 SHA512 4a6de5b9d6ae9ad3b1db2352cbc4169839a0f371275d1fb1631c6b7eedebd51e82b4c00c1e65813aa12ee3061e37df29f2d74c6e06f920190d064f8a911bf085
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
index b48f46e2a16e..b103904be5a9 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
deleted file mode 100644
index e4bdf87e57ca..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples headless-awt selinux source"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	arm? ( dev-libs/libffi-compat:6 )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_unpack() {
-	default
-	# 753575
-	if use arm; then
-		mv -v "${S}"* "${S}" || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv jre/lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v jre/lib/*/libjsoundalsa.so* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr sample || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-			{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	rm -v jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
deleted file mode 100644
index fa7d21f0c5f1..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	local os=linux
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
-		)"
-}
-
-# they have different tarball names for different arches...
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64 jdk${MY_PV})
-	$(abi_uri arm arm jdk${MY_PV})
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 x64-macos)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
-
-IUSE="alsa cups examples headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		>=sys-libs/glibc-2.2.5:*
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		arm? ( dev-libs/libffi-compat:6 )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)
-"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_unpack() {
-	default
-	# 753575
-	if use arm; then
-		mv -v "${S}"* "${S}" || die
-	elif [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# this does not exist on arm64 hence -f
-		rm -fv jre/lib/*/libfreetype.so* || die
-
-		if ! use alsa ; then
-			rm -v jre/lib/*/libjsoundalsa.so* || die
-		fi
-
-		if ! use examples ; then
-			rm -vr sample || die
-		fi
-
-		if use headless-awt ; then
-			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-				{,jre/}bin/policytool bin/appletviewer || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	rm -v jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 5897ba6f5d89..cd5b1dbe5c81 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,15 +1,7 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz 43146855 BLAKE2B eab22a4134dd94143adc5f6da6932d015874ec1ae58fda927279c85190b9c90a13de2c08e9f1d6d2d91f9c13f3999d2e76b8fd511c17f66e4d18f687d0bc2047 SHA512 2cb56a58aa9c0644374d437d20eb908a8a997f6b8e49e4a3589e4d79d0d15eb4dc574e815cbba2cffce62e4e20fefec706e0c4a76d42212e10365ed90f8b6263
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz 41371208 BLAKE2B a6ca557a33a9d917a3e26824d7c1e3c8b17b90eb4fad8a3d63dac4e2f5a024c9b4328194a366b28c05605f249f35efd332145706696d3721b8883ac023deb10c SHA512 4717ed22d9716ab24175cec7091b400254d633045c8e64e45d05112566a5b489d716cd9af1e4572d7da70cd06d048d84a0fd735402ea60b9210d8214f4ba53d0
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
-EBUILD openjdk-jre-bin-11.0.10_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
 EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
-EBUILD openjdk-jre-bin-11.0.9_p11.ebuild 2659 BLAKE2B 64af93f9838f36e31f67aea9c0cebbe74932bb6f88eded2f2b3e5efc820808adabac60bf4b44276d305caf01803b3f36185fb2da0466f973bccbc035c3723c7b SHA512 a78a4445c19ef5fe09810f0ad2f00d072658d2cb82aa985cca995a7a69a52599f38785c43673f5cc36f4bb43e169491f8956682af38fef801b3c7648d6f3add2
-EBUILD openjdk-jre-bin-8.272_p10.ebuild 1802 BLAKE2B 290351a68bb64e3e4d7f48a8c5c2262ac81d6ebd9e48ef24a2248fa8463d0c8e0e303d4becff1f24d63256ee47d9518d69d989fcd5d4c14641606b29a604986e SHA512 90a02c3138c1bd1e55407a1f2a099b65905b67d282d20088b416065e8508e7cc8453b64256b2221aa5cfd55c1504bc7d582cd029a00e595fa42dfc599e200355
-EBUILD openjdk-jre-bin-8.282_p08.ebuild 1803 BLAKE2B 79a0d0b9c88426451bae46b1b39260c0e3b7e5cea9a48a5f27c153dcc9a2427f8814801d015afcec5bbdfc00dfc44f0bab0467055bd5a1e94bedc85a1d84912d SHA512 8b383a4b580eeecc9253e1a45d5f1b2994b15b26ff036b75cd5e277947cfc1934ba1cd9c0bc74aa5da93593074ed245f7ff8c740b4e8d4a8a83f84ab880c8e9f
 EBUILD openjdk-jre-bin-8.292_p10.ebuild 1802 BLAKE2B d7b2300d8b5896e2aaaa17f67bd2b436aba77be2fbd68a0035dc66ee24ee48a220da5e609d2e2185509abc94ec5ba43bda9494bd205e1dc29505704a77551ac2 SHA512 7bb823c6144ec8aa219782cbae8b73a2ae662aa056ce79524cc4efd37a81ff65d3cf9f8364013b78c49419ac53f684ded95c8eb2ef0d1bb8b48c51c07eee6676
 MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild
deleted file mode 100644
index 441b2550e44a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild
deleted file mode 100644
index a6aade59d9e1..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild
deleted file mode 100644
index 16aae21f0a4a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild
deleted file mode 100644
index 569ea64aa3eb..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f3d80fe3a174..7b050d7b529c 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,56 +2,22 @@ AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603bee
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e
-DIST openjdk-8.272_p10.tar.bz2 457222 BLAKE2B 51e487d36c1922c5fc04d8922f1000a776e4872142517933ef5e8d5fd825f221fa02325bd755bf3f48f7f3221a2da3ca182301fb303675cb7d712d7b2f1c7751 SHA512 488b7fa0ed725936d483efd54242dbf4409752c685f29277023fb47c4375b5700b34e743d819d7d7c2406a2f8845d1c3d4fc548c156b6c7c30e43574c1b51527
-DIST openjdk-8.282_p08.tar.bz2 457358 BLAKE2B 4451b2de340136ceb152615a32e33a3db60ff0f000d00e758d992f549af0110c4f64e3724abdd6ca7d679862e927557d475a2a36e923f0c3c5dd48fcb81b9b45 SHA512 40ccce0a25da6a6eef5cadfc0d6b208d0243ccd1fbc2a7aaef4c627802144122dbda96677c2d3ba45e05c5ac123a058ed37f59b8f035f0afcf34e832d50e8c35
 DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
-DIST openjdk-aarch64-shenandoah-8.272_p10.tar.bz2 462755 BLAKE2B abeabf704d2135da9df6746545209f5a658ec547be5852041bb9bd1dfc4546cef143541df61b4705b6d2181ae7ec91a8c64e2b27347c24d146da49bbf8c228ef SHA512 7cae0cf80e09e1d2ad3eef8bf6740942788d0af4d3c9821bb0785ea42d4b38319d0ec57a8d21add25a40eebdc5ecba8234c9f04e6922e87c80480f71b04e2e3d
-DIST openjdk-aarch64-shenandoah-8.282_p08.tar.bz2 463565 BLAKE2B dfdcadb0fc914fd9dbe61b20cc94c4298dce7f1875073a545a3e9ec043914514be54e9934465df4ec827881c35e10dc0ae4b21778a991ab42a1709a36b2cb49e SHA512 3e430c93726a12f60eeb27b1693c0c61fedabf0f19512df4b14732565b910a660bd9e776651caf7c0154ad93e0c90ac26aae1d5155a35ed29dda0cd601070d6a
 DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e
-DIST openjdk-aarch64-shenandoah-corba-8.272_p10.tar.bz2 1052989 BLAKE2B 8d6f79758ccf1719396fb56fd47c258c2440beea79516025b4911027a59b6cf4b5826c5eb01ba3a4c45847915531989c74665cbedf6349541df38732e7b828de SHA512 12547c8b5f1fe4efcc58f5b148977d519c954b964e814fc3fce717bd6d6221c2e7eda98a0e1e8157ed2f509f3b89e1e7b529da81cd1ee768daf4ad6369c57e8b
-DIST openjdk-aarch64-shenandoah-corba-8.282_p08.tar.bz2 1051633 BLAKE2B 0f4ea71b4bfcb87f7305876065bee4184939e09c5d2b38728f28e1e6407d850a70de1840d10f5c98a6d4709403838a42cd3f104a6a38c1a32f65ac127cc3271a SHA512 dd4e31baf81ed286b45ab2ac0a96f23306fb51b8d387ce6a846c7e1134ca45811fbe1842379bd54f486c97df8cc76a674941f4fe07ce5e5bc1ce3e8c85c9c782
 DIST openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 1052188 BLAKE2B b4acda6a4d97cdfb4cfe16e1442dac6989af5fec82143dabb914ee31632b5421bc091708b06e37f95d552b21dbf24ed681b026635e96d32f05ac7d964eb53ac0 SHA512 9f4cfdf8a2580414f90ce0b128fd2ebbeb46977994605d3182ee5033be92898f3b292bafe6c0ca3a0fc767c03de598c93e25cbbc06726383b35961d40c601cee
-DIST openjdk-aarch64-shenandoah-hotspot-8.272_p10.tar.bz2 8767088 BLAKE2B 85b2dcbd696c58db72a7aeb4dc9a4752d742ed90bfd2e06ce5ddd8ed4ec5c63ab2de40a41aab5747fa120d8865c1d57f02a99b27a6ebf7c68c0891e19f5a7f27 SHA512 7866495487b271228f1a2d95cecfa6b76bb912d8c1c63d3d92e7b2cda88dd151b3b6c4c3bc717e37a0bd972762620ae7fb456c1aee281772a145a1dd1b11758b
-DIST openjdk-aarch64-shenandoah-hotspot-8.282_p08.tar.bz2 8771899 BLAKE2B 436b57d6c405fa43a08f36221175e86d0cac7880cff964216f627c62e6fc59795906624241d3e73909dc633ff40176ed4560fd6d8f98eb2d7987fed99bb935a1 SHA512 d99b034288a857250d5054f1d2342f79f75efa400c9776fe75a139cd94faddf7abe407dca80a776cef975ab3608168f6d21b31c8a0602b302be3d600b24c9fd3
 DIST openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 8787501 BLAKE2B 628c84ad165e82b782a66c159ea2bfc2e739eafa41981d353272911bce3338b8eedeb204bf5c8238270ef22259c215301dbf30bcbcc366bbb1c1ed05c6bcf0fc SHA512 50a97c8bbf225c7b2dae50d398eb17831ad761fafb210a481942101bac54164604c76353ca4f0ec7c3a601039eb80164afdfc62f509c0b87e9c948970c0e6140
-DIST openjdk-aarch64-shenandoah-jaxp-8.272_p10.tar.bz2 2718084 BLAKE2B 1e6cc999d84a49c03731a2a2ca73dfe684940509a64199ad52571ef51b3da035e41b41bf262ea88af9f77418c7b1b5721724d86f67a5f737e53eaf3673f4eab8 SHA512 a73e5a4628c936cf9b19082ad49ed2134984d15a1165c45206c74dff45118c50922fd0a668efe93a46c3839775ec567d56eee19cd0e3a9f90e7995d1b6a42f11
-DIST openjdk-aarch64-shenandoah-jaxp-8.282_p08.tar.bz2 2726328 BLAKE2B 27325d12954e94baaed304fd7b4782a0028e71352b2357ed0710df5e61b0ba7b9d26110cc8424b85d987f723c2ee46b04ff03d0445ca7e654e480d0328e8546b SHA512 5e66838889f3e22ceb11ef6dbd7a20f9f090c51526440c2e54b9b2d733a7e10da47c36df1dbc0b33ea38fb324f1f32475f0448a24feb9aede211be92f4d72057
 DIST openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 2726660 BLAKE2B dc720b115212084ab59a4af6b257b485592a84e630650445ed3bdc0c471d529bdc8a1f2b73c5e38fbdd65ff1c221309e814adbba851c59279c8b3740b4560d90 SHA512 43c0e6327c3f7ff2d6320e7d1504f1575c0993c53a207dcabc75a0e1785fcca2aac7f78856db374198e3e95bce4bb05520a9a4e94f2ec03446b28f4d65cd69b6
-DIST openjdk-aarch64-shenandoah-jaxws-8.272_p10.tar.bz2 2558262 BLAKE2B 3b00ca162f3b758ee65090011551f074f7675f499f179ae0d4c8c62b1d70c942d7d2082d48e84cece6cd2be7ea319c1707fc6239e82fd5e79297f796838688e4 SHA512 d64a15cf35df014c4dca2edddea2015905bafe252d3d2bdfd1bc8f72683ac827e5d0347e36d5d94cda354b31a6b0782017b1cea6571443e073caf9f26c7bebda
-DIST openjdk-aarch64-shenandoah-jaxws-8.282_p08.tar.bz2 2559051 BLAKE2B cf808ef4d6aa5e5bb699fde4cd36ce9032f9d5c14b7151279170a3a1556fcb56ded67d03865b2d093950f0f64c638b41d0cebb873d2a7e8563e711249e64484b SHA512 09b01fa9c967aa771f2d14b4613a5b5d26c396b47c7726b707bb87f0c1ddae406a400c3ee9a93caec3ec8d41deab030ffca101f64865d8ecba3325f9cacd0ef5
 DIST openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 2560138 BLAKE2B 6e40ca6fd363c6ef9500b6b40c7f6c836b496899d289d0626f0e52412924498eb6b000291b58af8d42b9bc7dcc2beb1374ef6b8ea18d483841568d3848230842 SHA512 0ffbe33f375f18679797a7e724b621015650a6a9374ff231814f8e8ad0eafe42f281f76a83e87e234604c266ccbc15bd6e84692c3d7e272e702be316ce0048b2
-DIST openjdk-aarch64-shenandoah-jdk-8.272_p10.tar.bz2 48370921 BLAKE2B 98026a28463ce3f520feab2b146830bf91acdccac5aa28488ffdbe4328b9a2cbbc17e95eeb36a60364cab470eeb26efcfa06a588e1bebcb6e978821459536feb SHA512 1bc5baa799282a2d7c0014d2cf55b350c7d99dbd129643d2cfeadebd467b2f6f9a8b8a97d34f66c656103db3ee3d5a57d6ff57dc45bc655258dd5093506d89b5
-DIST openjdk-aarch64-shenandoah-jdk-8.282_p08.tar.bz2 48636508 BLAKE2B cd2b5e1b3a10eab1fd869dd707c8c7f3970bec3559f6699f9b68b2715a279e1c5d4ee37a172e62ab32abe5608813d72e9bac91fe5670f6596dfa8debabd26cc3 SHA512 70c2e327f602249e3472a8b0ed2391ab7ea08cddab28ad3f04bbccec76bfa7f749f7b1ac1eac7440da9723f824f4d564e6f19db3520260875137b7f95798afde
 DIST openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 48705934 BLAKE2B ab8995ef30267d635f670791417124ce63435f4cde095c057e4b506cbc23b879bf308986ea0960392836acd46aa6fd7be9a09fea011a85c981388ad58a876f0a SHA512 7f76a8e81cf759989657101a4b71ae0e896273571e5d61790100e412dc1c211118251b6f068da3764ff1059635f98079d88c6cdddf04f676c5db3a665d3d9d8b
-DIST openjdk-aarch64-shenandoah-langtools-8.272_p10.tar.bz2 2397200 BLAKE2B 1d985e852f07ab69e0af01a17cc3874cf903b1e3e2c4a909b7403087b3243beaf57a1e9b7792b52469a80764c7db614e3bb6ec4b43527d022219f3e79af21457 SHA512 76118b6c56481bcd3a6a709006d0d114faeef2b2a3c353e4a5ef2af5f03429dddd78d2d5951e9245fb5e41443e871e43634921825c0dbae8907f3f49fb3dea0c
-DIST openjdk-aarch64-shenandoah-langtools-8.282_p08.tar.bz2 2400152 BLAKE2B d1f5752bab7a2bd01f220796e24bec018a44ed69bc10d4c0b8deab28c3ae18eb573b71ad7d48ac2219fde0c23170a593b050f53d87e6bfc8dacd323c25c76468 SHA512 48e861ba9d98f3c48d6f70ea13aa34e0cbb25272a5bdf20fe5f9e6daf1a2d2a4b754816bd1be1d1c251bb56849487ac494582e2eb94c8c04eecf60aea4b8a6e7
 DIST openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 2402059 BLAKE2B 707654793fa26f2a992c2ded6130d5710efac6a91661914bde150a91720fcf08a54931fcd1a56fbc31dc1a61a5216b61e3871d963a2b03803ae8cbcfa8b095ab SHA512 6dc82a18edeb5390d078a3113d2f7c7510737b9a9761b1a714d855d36afe4530b41a6e980af0bb090b31e8f95f67e097190d656d265c8518f3971526ee5e4001
-DIST openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 2838876 BLAKE2B 40d011a11122b2dd19349282468c756a58afbc1ff2a33424d6c4e82cde1f664e3317eb1616533b0d2bc24604c68ffd0b1b92d3271dd633f3a39aad22c84ca781 SHA512 1f50c2c1a6a5d271d63906cb1cf3e87d7b6fe61e92c90cf2974ec40e956be0e8388c2694d189c85ec7072abfd21566671498b8652c2ae9cb2021c6ec4d548f66
-DIST openjdk-aarch64-shenandoah-nashorn-jdk8.282_p08.tar.bz2 2839986 BLAKE2B 9c42469bab74ef6c36702499017b7ae3f98fb86f04b7336659d6f1fbe132a8513de5308c0c2bb4065063f05a8c0fe2acb81d2b2daf0610ac58cc309879475d57 SHA512 424b764e0b9360df972305a1df8b7655fe69697c69250beeebd1e719e42bc94681d21331c92b47e3d38a9650bbe7cd39311230c3eda2aac090f3a83e0ad04acc
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 2841484 BLAKE2B 4d95d38c6af366fa4be8e9ad2d3cf09d6ad1ac05d25ca94d15200a051cdfcc67af666420a5487f0b2782040dc3483475bf2515b0b5d40e520f162e78f768d5c5 SHA512 523e1292169a6a791c2b90672295cd3210a09b8c973cc038e9ebda7e89afc0339568a993909eb108985998060ccdd13601a9bd9a8e4890ac606febf07578a887
-DIST openjdk-corba-8.272_p10.tar.bz2 1033649 BLAKE2B db9d72dabe4b1727dbbe1de01e46f62676c48668e7ec960e10643c19374a2553dee3c2b5b576f85d09b541b570756b20980e1307fc614e4b4bee9789affc650e SHA512 1426b3ce6983429fe6399da77fb102fb5d54ebf65ab83ad4e3c0ee789e33e2a0afc1bbfb7b8f942334ff9b03be0696494919c374ce1b793b179ecc43e2c4384a
-DIST openjdk-corba-8.282_p08.tar.bz2 1034749 BLAKE2B 394e1d6fcccf1e512a0c241c4053ebf1da7df65e3d05d75c243c184ac6990b61fe9e55596513baf291d2dcc99d01d7ba94f31247d617b1cd316dfcdc8ecc663e SHA512 aa0eea3f1efb4c4da8d03b902cf5cdbbe475365427a96ff74bbac21af4c2f4eff1fa8b05a0f4b1cfb64385860aa963e53736e4a3ff314cec2e141524f3001613
 DIST openjdk-corba-8.292_p10.tar.bz2 1033217 BLAKE2B f6ac60ad0aab0c1ca149fdf2b26648d38ab083ee6fa36b2f82aca19e79037ac7166c43f91c193493923ea4dabd57de3bcccd75a73aeb6439c1d464729afa957b SHA512 7bbc2b61421a81ca2f0e1080bf5c3bd065f737c0dbc822f123875f2675515b947b4f8efbf0ddb3b8d887b90ab5c646fbb12ae35607ff295d9ca489737ff4fac9
-DIST openjdk-hotspot-8.272_p10.tar.bz2 8206390 BLAKE2B 6822635a29f919696c7a260bf7db20a749ec8598e6c751a8a5e3973c780c17f3ff16a1ed64eb44353be72136fd1ea945dc6620f18d0d876a5773c897bca8705f SHA512 48444d86bacaef503303fb160dca538546e74f7bd71fd34fc2b9faa4e0b1cf7710a6262e9ead161c1b0e8e02e8f96e56a6407d442bbfb01ff8ab835cd840d834
-DIST openjdk-hotspot-8.282_p08.tar.bz2 8207755 BLAKE2B 1cf5e81275199a6659aca8ee29092131572797dcf71d2ea9fa61bcc00d8ba7c056ae96787aa684fc6f9d68cd1d628ab2d2fd4a9837a6750b91d5c008d9860139 SHA512 c2f2a62348aacfc022ade44d7b1bf733723ccd0f2388153ba595cfecb38a1c3abca3349ac2388274830614ca17c428981beb6c5cf2efbd1eb95d3a2be277776b
 DIST openjdk-hotspot-8.292_p10.tar.bz2 8558678 BLAKE2B 02aaa0cef73dc7aa7e9db426fb021d00f25321426438365f672e0fcbec476826d62c92d897b520f0162ab63f2bf72ecdbf6d8e8a7241d455900d427aafa22bb8 SHA512 ae1e174fad6c41f30593abb4c0be17752d6f7de0fa0a1b83c383cb7cd0848e462ca88feb391c9a8427e167c06e6c3d01230fb769f711dcfddd007f8e43d4c481
-DIST openjdk-jaxp-8.272_p10.tar.bz2 2692905 BLAKE2B e8fa9e6a7fd4c4ebeba82a3c55b17e4eba9cb03660baa8d478a8cfced1ab9673465faa1a0f690ebbe2634b2cf2741d7321f2c20c748339237eba7b772a2cea14 SHA512 15efb3db0dc28fd375d769037f248b3527e40d2c190fed57ca1d6a09e59aa79465c0e6516d2a122f6c7ee55f7cfeadaa76669884f74fa34b11ccfdfd76e71f6d
-DIST openjdk-jaxp-8.282_p08.tar.bz2 2682951 BLAKE2B 91c50452d450bb748d42b2e5e556aa9f7356aa66554ac45766e7a573cda901bda038acd984587cc150990cd2b8a02e7069d0fdd5d5ed44fbb433f4b45338efaa SHA512 ab17c2be397505a944d3b2d8090fa9b7c3db97f5b301fe8a485956318d6acfe065447959cfb7261e58e8506c25da7c0a7bef6075082ad6c89c52463284d1d227
 DIST openjdk-jaxp-8.292_p10.tar.bz2 2684063 BLAKE2B 7130d33afb81d83f0ec3afb5e6e161c318e7c6b36189dd7f88410a7edc07a17ebe2d5c15c5991b31d180d4d1c70c683953a9cfcac1c3eded64a4ab679d4a0366 SHA512 92a15a693440cda28aebe9033675aadcbc099a913f9148b26eae90004d54b246152b326e0005b3da6178286ee21f71f12ecd2f395c09b6707679239506154849
-DIST openjdk-jaxws-8.272_p10.tar.bz2 2543199 BLAKE2B 3deae4cef17a5f3d513c1a748a72b50bacb3a0d9b6fb33e5ded121f4d209cc2eb2d59d7b7c182015811426e49eb3e2b463279fa201992c51a5c4a94a184931c9 SHA512 51c0ee76a7e0587ac9c2533d62717f24224ec8bc643df6af2e2fac89cd79cc4f228c7c57427e43f354a594568d16bb5bbf3295af9ce52717339c35b56d6c375a
-DIST openjdk-jaxws-8.282_p08.tar.bz2 2543297 BLAKE2B 69db522a4bd508ad6d15fd0272bcc29a84ad3829fa4496501f8351cad3acfaae24a440dd3c98638b7807cc8270f0eadbe8aec44700a5386cb0a75f240b475607 SHA512 d17163f42dc617187376962e9a99fecb6b71c3119a84bb0d57d43a09eabc090dc9e120ad4546b7b7b03ba832c54fa148f6751053d6eede69f7ac804c3fb78792
 DIST openjdk-jaxws-8.292_p10.tar.bz2 2543680 BLAKE2B f39b7e939de9ba19f9ff53d2748e2fee7acc82bd4d85a4d8e1f49e3b0919daa03c4996e63a46e908da966dbebbf7051955104b291178f9b059d60e8208dce51c SHA512 5106a28819da3708f8a71e4595cb0191099a7d2e06b7190981beea6af504681927be6c07ebcbe77340735bb22c365e1cf001709311c0a57940247d9584a0ee48
-DIST openjdk-jdk-8.272_p10.tar.bz2 48273590 BLAKE2B 80717a644df7d9741e5786708c816483f4fea1cfeb02438df17fb4183c0702fe6e3fcbeaefcee84a4f847d5cbafb0a9e80af63b56cf0c6381e0fbeb535d2f147 SHA512 85d20763f6cda66f2eac3b2a1e672e6b828c437386575d16a1c70b27a56c718fc0f44c712e6261eb89f6dd273fd2c21a2c4baa3f562cafa2911a5e2467d7ba13
-DIST openjdk-jdk-8.282_p08.tar.bz2 48584190 BLAKE2B 6c5949abe6a18c4f633f2ef5c3e93db8421845f4578f6ddc783fe0af581b2df0ec6e7c833716c4b181547c289f9cb74b0b6b96893c45120a13061a45a70fbda3 SHA512 99adf9270f132e4a59c466b56069598058ffd4b41c7b0698ba8362e92d4b9529fbc9a166b5ae70d518b1c56eba80e4d5e51efef82df919df63bde42e8e6df296
 DIST openjdk-jdk-8.292_p10.tar.bz2 48746031 BLAKE2B a54a832a305b87cbd4ceda4eb5bcea07e2a3d4b9f5648f21f52b4e29cf6053b830f876591a0c2c1a6447473354bfcf79d70c260c7bb24505743bd3ba67ba2568 SHA512 c10a64086e0fd63f2ecab884b7baa88c3dcdaad83f2240d7fe3d590913af252a57c9d735268acb1e75bda2883c4c41d47f405db0c15f82d833d33d08c824b9d6
-DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96ae658c3c43ecbc54750c3b854cc90efdbd3c4d5abdda012d55c4e81d4ab805d9184b5ea7429fba5927bf3192fcce2a17d9ef11744 SHA512 54698e8a74119f39971024ee165707fa9e27cd0008b59801f05a194362d723ba67269b1f34c181e2a0b1ce9cd36f52cf3ad3ad980c4670f7cfa476a0fa78fec8
-DIST openjdk-langtools-8.282_p08.tar.bz2 2399247 BLAKE2B 5f2fe1eb3422053df33ce3df2ce99c6334d9867098485e90e08cc84d8df81399efd8c8169b9665b42df84048bfcdd964643861d93bc27c3be67e7a732704b5ef SHA512 9b29e6bfd6e12dc810a5e5339a92410b0f6fbf20e4f0e727da25f954ec8d3dfccc4f7decf285a7f8b1e6710971ae363c0ee1f8d2738dc54b57989699300dfe59
 DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420116e47f4f1515d1e935bfb6830a67a9de3894c94a6289a7952153bef971369cdbdf2374154cd4895950fe49f8a21af5e3316dfa8a SHA512 ba66be7f37ca8268d1dd0b8d4e68c90ae19f815ac3b64aa1f1abf02a722a09ec46c7605d5124ac960bd44335b053da12b36d4b0562b3675ac503fd838d4924d7
-DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
-DIST openjdk-nashorn-8.282_p08.tar.bz2 2850710 BLAKE2B c3a4eab94946d43e4b1f3b78d16c016dfd3e84addc7be79a70a083266f2e87948a2b704ce2131c4603739828d613a9f91374af9ae5c915bbb9a0771115016321 SHA512 f46a17dd811276c381ab3af333a901a18fe10ea67f487dcb7c7696c0b3c6247569ebbd1a438cfb056d4e42a6f4e509fb8c21e3b1bfad675a743dbf404f298464
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
-EBUILD openjdk-11.0.11_p9-r1.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
-EBUILD openjdk-8.272_p10.ebuild 7239 BLAKE2B e1543b8b5f1a15ead1feb98a03cde07657734ec0fcd33066d425d7f704ddb906ca5ffd99e3c14fdde4bae7924552616ee7fea0c189a935d5b71a8903afdd445b SHA512 f59a740c3acec9a47e13dfa1be11ad14a14f24576313add1fb9092bf0bf9cc2f55be0e17c2ead9004f154b3fa4f5bd7c717bfc93baaa052203e12f7fb9d59bbf
-EBUILD openjdk-8.282_p08-r1.ebuild 7312 BLAKE2B c2771e19437b22e234a5be8deec7642688f377bc66d67a81cfb0911addf16c7a71560966ac5321268876244525ac47a6f136224136772b3d88272eb135dbaa56 SHA512 abf540f2160c45add83e8e64dc9c9d7605ee6e46ee879c16664bcb9008e6bd5deae0a5352c3bfb6b3bc5e9bd9f1f0cc9cd43235b10757cad839f3d9a48df9552
+EBUILD openjdk-11.0.11_p9-r1.ebuild 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
 EBUILD openjdk-8.292_p10.ebuild 7308 BLAKE2B cd181ac6880639f21fb6d91eb78bf3539c9221a3a271da18be8888b504e8ce5e098d5a6084be16f20f9e657b84517314151c444a13cd971b8e1202fcbdbf25fa SHA512 68fba677c735e3a5b11e352112bdcba32cb9c0d228bca094bda3b15b6d4e31e92d800587471573eb8874f946d1c77cda10daf555911eb44099603c409d5cd2fb
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
index e6cf8c5cdf7b..789f3f0fde3b 100644
--- a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.272_p10.ebuild b/dev-java/openjdk/openjdk-8.272_p10.ebuild
deleted file mode 100644
index 73cd8367b504..000000000000
--- a/dev-java/openjdk/openjdk-8.272_p10.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need latest -ga tag from hg, but want to keep build number as well
-# as _p component of the gentoo version string.
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
-MY_PN_AARCH64="${PN}-aarch64-shenandoah"
-MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
-MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	!arm64? (
-		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-	)
-	arm64? (
-		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
-		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
-		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
-		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
-		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
-		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
-		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
-		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	default
-	mv -v "jdk${SLOT}u"* "${P}" || die
-
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		mv -v "${repo}-"* "${P}/${repo}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${EPREFIX}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild b/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild
deleted file mode 100644
index 94a4e170e54b..000000000000
--- a/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need latest -ga tag from hg, but want to keep build number as well
-# as _p component of the gentoo version string.
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
-MY_PN_AARCH64="${PN}-aarch64-shenandoah"
-MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
-MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	!arm64? (
-		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-	)
-	arm64? (
-		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
-		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
-		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
-		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
-		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
-		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
-		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
-		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	default
-	mv -v "jdk${SLOT}u"* "${P}" || die
-
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		mv -v "${repo}-"* "${P}/${repo}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${EPREFIX}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 530b201cbb86..06fc0eb39e6e 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -31,6 +31,6 @@ DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb657
 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
-EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B ff736eb45f3c448c54c918da73ca36b49b917a0e4e7181f79bd3d0665fed434295e43ec09c9054f07d546a28312ab7bb92d28e4d2714608b355080dd5471e476 SHA512 1e34a7876c9dadf87edc96ae2e3c3159069c9fb2d057f2a98546f231e67724c338fb06e1a9c7045e5da390c45d2c84232fb7241d6442d5fc48f14b0581c493aa
+EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B 66c761d6aedd70903b302a3e41664b0c2a3161ce54b7fd286dd89aa262451ddfd8ce50576d8e6c5b0857586a46f400f3aab6b87ea4d4b115472b00325699cce0 SHA512 681bc70763d33dac6e7cddd39f5bc3b1b2f452336acca5b677fb50af7be686c26e4d76a9481c86f0b1ebd16b660d4bd369a8343a35e007a0442899995aff087b
 EBUILD openjfx-8.1000.ebuild 5593 BLAKE2B 94aa4d3f54e66afb33d0abf7a46c3adfefb8d0bc3cc4150798502f967f69df37a88bdd3c915e1169ad616b188c4a7f6bb59d1c12f0fb61e5347a4281db85ce25 SHA512 ef058af9f7fdc56f8f5d1ea80e11180ec3c8a35403e555143ea3181336946d347d5b307ac77bb66bf3695fb62eece9737e5a552c9c0745269aff6a93744834b4
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
index 119aa94597c6..489a905614c1 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -184,7 +184,7 @@ src_configure() {
 	if use doc; then
 		local jdk_doc
 		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
 	fi
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index 67365f2899bc..e4bf979eaa99 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0.ebuild 1049 BLAKE2B ed9e90dffd1612cd2015b29d96eee846edb4ede516c12beedd2083bc98e4a1c7c847126fc52b28ad8ba2a32a3c67975ef726d5b4382f847897fea61e91836acf SHA512 1631e3fd424c3ab264b0c7921eea60ff53ea8b0ae2f1dd908b6ad513671e81945093089a5c3a18da5bc1fa558affd7fbf38e959bd19ec5ac1f3b7a80897db3e6
+EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 803 BLAKE2B 0ded27b699ab17eebbe01552ed223cce38c4b9c1071b3ed1bc616ec5e5468e3bd1ea36d8b0480d6d2c62453d2cd782d095fcfae8f90f4fb31a753064f6b6930f SHA512 a7c650c8c10eec854cdc3cd3e083a4060d1388b466d0f2d5161daad88c5ff75ef1af8302c08e017af6d93debeb926a44ebb1e122fe33e2aa9726c5d44ff5be03
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
index 54d3162af6cd..6150e0d2c5f0 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
@@ -1,45 +1,38 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
-SRC_URI="http://www.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 HOMEPAGE="http://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 
-RESTRICT="bindist fetch"
+RESTRICT="bindist"
 
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	java-virtuals/servlet-api:2.5"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 	app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
 JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
 
-pkg_nofetch() {
-	einfo "Please download osgi.enterprise-${PV}.jar from"
-	einfo "  http://www.osgi.org/Download/Release5"
-	einfo "which you can find listed as"
-	einfo "  OSGi Enterprise Release 5 Companion Code"
-	einfo "after accepting the license."
-}
-
-java_prepare() {
+src_prepare() {
+	default
 	rm -r org || die
 }
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
index dabc045872d5..f009553ab27d 100644
--- a/dev-java/piccolo2d/Manifest
+++ b/dev-java/piccolo2d/Manifest
@@ -1,3 +1,5 @@
+DIST piccolo2d-3.0.tar.gz 402866 BLAKE2B b78b93084e13c738126ab04babab4ee502deca869dc28a5bd066c13b46f455af55cf76531270d546d6cf56d56c0e48f2edbbda40944479cb9762db56421fb021 SHA512 609b38e27386ea0dac821f8d0a23bbf57afa056ed928944d63c2c8d1572c4f8b6541d27f5d26ab167948724c9f1198069fb6e0b76ce2770fe795662c76151100
 DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
 EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b
+EBUILD piccolo2d-3.0-r2.ebuild 1136 BLAKE2B 4525d1dd512a02c807e93ee16d3dbf657b038c03673023b5283835197697532370362ab7be8cf4d22e6deb128749aa6c0b89242a77a7748603e67e9e2fd39bce SHA512 c27935af5fa4d1c2fd1d2ca587d46bebfcacd4acbc706e5af8a27508c94790a44ee98e69bde55b1deeb904c4241a32d77c55f9127a0c26df71b2f68eaf3f2bcd
 MISC metadata.xml 379 BLAKE2B 8e4337e2de075e9c1697e3a9497b50f9c3e549ca16bc7ec5e242bf8021e75154d28dedf7a7fc481d2177a8a70e2012ff8547cacea4666bbe173c611cb1892855 SHA512 6411900dad2b5f7e410713dc14fd3d968d28a4c0a8235435e60e67d2ceeb9576681b8fd33efe9c9324a04869c29f73ee69d0469b5a56656eb2e256cc58849fd7
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
new file mode 100644
index 000000000000..bfe1cbbc3322
--- /dev/null
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Structured 2D Graphics Framework"
+HOMEPAGE="https://github.com/piccolo2d/piccolo2d.java"
+SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+CDEPEND="dev-java/swt:4.10"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
+
+JAVA_GENTOO_CLASSPATH="swt-4.10"
+JAVA_SRC_DIR=( "core" "extras" "swt" )
+
+src_prepare() {
+	default
+	rm -rf core/src/test extras/src/test swt/src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc Readme.txt ReleaseNotes.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/src/main/java/org/piccolo2d/examples/*
+		dodoc -r examples/src/main/java/org/piccolo2d/tutorial
+		dodoc -r swt-examples/src/main/java/org/piccolo2d/extras
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
deleted file mode 100644
index 5e30b24ca6dc..000000000000
--- a/dev-java/picocontainer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST picocontainer-1.1-src.tar.gz 83564 BLAKE2B 193d042400e4509e82c8dd521fc4ee8a246f0b8111cd875810260d510bef08970ac632f3e81c370290e6074dcc75348af7db71abc9047e49b323910d03e932f4 SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777
-EBUILD picocontainer-1.1-r1.ebuild 1210 BLAKE2B 9381142489327a2f0b3b649197bba21994874fabba059f0778139a3ce2acf4e6417e13f051df4f32737814a83336c6f566d9ad4da9fcc1eff2820d6c324297b8 SHA512 c9e86aeb5700b4aa4f9f47c62c1065c695df206503bc0db082b20100ffe2a18353c3fcf3618df5048b625193027363b18544a572d69401fed40cc97606235fd9
-MISC metadata.xml 628 BLAKE2B 0a6d660b64c4a9bd642e3f990fd715e02037fe67526e0215631f65afdececeaea34486a166e7e5a4b811fa6e7494a90f685a3e27fd5df15c0e2071eff332aa9b SHA512 24a5b116cc43b3dbefa809f4ba45c50b08f5a3f8ad2db6a93fa8618e2f9dee6b1a09163d03b036f3ecad5f7f475748fac05c6ab213d61031942b9a0e24ba3cab
diff --git a/dev-java/picocontainer/metadata.xml b/dev-java/picocontainer/metadata.xml
deleted file mode 100644
index 7c03ea6b885a..000000000000
--- a/dev-java/picocontainer/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 8def47a74113..000000000000
--- a/dev-java/prefuse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
-EBUILD prefuse-20071021_beta.ebuild 1067 BLAKE2B 1728970ae824f34a7c49d9bc8c1fc8eb872fa6407bcb4310bfcde096f6bd71536e4daa7aef840b754ce19d5e9e2967d6b676093dcc2e0a02cf3e7754006cf11c SHA512 873497e2f5aa231a0edf3ae37d4ea819e51440db21e25f996c17420c697f175bcd5de72c1c66b5ad5b3f9ef18301577d7b53e3b883103b2b807d2766f0d52b08
-MISC metadata.xml 313 BLAKE2B 4c58464a558ef769445dc029aff83a61f00a624b682a6833afd628af131a6199dd2026207e1588a17fc76130887067fd77ba5dcdc91b7c32a2bcc4bb000876e8 SHA512 101594b620b635c505b85a05d8978894d22ee7fb60709ffc0c5144fe1e8b949e64932a62c2e9530fbe6fc37ea15b29178e0465c39f0001e3635de00d2ba18745
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
deleted file mode 100644
index 0a5f19a7b6de..000000000000
--- a/dev-java/prefuse/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 83f43eab6c6e..000000000000
--- a/dev-java/radeox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST radeox-1.0-BETA-2-src.tgz 1720998 BLAKE2B 2142933e8eca18578333c8d144c7cdd79b62c96433c479578e3b9a779de77f9535140f8cb69f399ca868a2dda445099cc60f4df35e7cf26fe3bd72b3acdc6363 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2
-EBUILD radeox-1.0_beta2-r1.ebuild 1079 BLAKE2B 844be5ee20d3a714ed198d5a156faf6056ecca81db87fe444874f07b70618068c4d8b868f7e2f8dd26c5e4c8914aeaa9683d412a86f194a4c1d8bcaf1da1658a SHA512 461a9afa749f5bad179928ba176a78b036dd47968e099c8def9bb4eb482a4b7c3ffece83b9765334eb77d2a4cbfbccf27b017b4b3b9fa5f47254309f600a2387
-MISC metadata.xml 655 BLAKE2B 4a37407e7b85b3053cbd8287272c070f53c3be44c760c172cde49e85131d23bcc8fb7defbd7f8b3a1db83a0b6270a6b38be67e2996bc452cf1076114c3d830b6 SHA512 71964076f4e7cda88973c4f51c28f40df3400be100b322da00f811b68755ec2a4008bc4fb61dde3babdfa6a06d6c55b0e17addd86ee9f40a695c20ff9a4cfe96
diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
deleted file mode 100644
index c229ff6ebea8..000000000000
--- a/dev-java/radeox/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 e2b0b2582030..000000000000
--- a/dev-java/relaxngcc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.12-fix-jdk-1.7-enum.patch 925 BLAKE2B 56bc32e9317027c7ff5b9a72f5bc9074fd31ec9e6f4193f9ef3f3726cbc5cd479a3de5028ba99aa4648fd8de8143fdc94624c6db2f6af5bd864cc5577edc1e1f SHA512 5a459bdd6d4d9f173f4e0cd7f23476ef5655f5918cc291eda43c0b847ad190f81d10db55bb76126804dc84efe5122335c11849577130aae09c5e73ca801c5a40
-AUX build.xml-1.12-r1 1052 BLAKE2B f80d529a495fd5ab37788a3a50d03ffa6eb9f7196d6b31007d90fa1d94c7359ba8155340fef0550f7f67ab5b4f053e9920cb2941f3518097b4555dd1121d5e10 SHA512 cd0412dd263ac0e933216bdb99cdb3f45e0ff58f0c836d62a6bbaf57a3cc984980dd76ec9c7791c8719cdb56e80991ab4a5f716919570321169cfeeb8b191854
-AUX relaxngcc-1.12-SwitchBlockInfo.java.patch 509 BLAKE2B 198306ff259d830ce1db6fc2d4d38a926fb64fccdb81c07f51a64a3ef47cd4ab6258a7efa35deb1e6719dee0b5513e8b7068c786bff75b15b408d20c0a1a87e4 SHA512 d9e8fbf64b588a66a44af5a768adad5099f970a8c705898928a73704e6e809f5ba7a8d851bf4ed356dc47c0b0a0a4674583daf87e0271a7edf171e529886f815
-DIST relaxngcc-20031218.zip 2162036 BLAKE2B a5efd9941229e6dbc2d2d223e9d2799a0f56cc6010331175e16cfa2b77b886c060062fd7206bf7d1f9cbbc831a2d06efee176460ced81620ec8ceaed89334921 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b
-EBUILD relaxngcc-1.12-r3.ebuild 1384 BLAKE2B d64cac19e4b27abfdc3fba1642ac09335a2787aaa71134eca67ccee5a1fecb655e62f24bbf6a1b3a76639e2cd96485e06e4d47d928841824c1d0426100dc1485 SHA512 4c634f63561b9814807065ab30be9ef0e2d01877bfa088240d2070f0e5da54d566a4ad4570b285486f7be1c49a623397463691701146960b3e0d2faf5b0bc61e
-MISC metadata.xml 315 BLAKE2B d93ab01a7b525398306e5c60dfe4949a084b824f80b0099f5aa17dcc2b4d3a0997be633179e131c52972e594d5aaecb5d62bc40cb6df3a3eb606d0dd3d8a9e8e SHA512 3fd8f24dacd7aae0d04568ce951c8d9559e0c25dc52f7713136d3f4398c14873ff8420e0d12f858d3006397e9539a7278a21ec85cd549ee1aad516063738caa3
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 2f5a2039e705..000000000000
--- a/dev-java/relaxngcc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 db4dfd79d2bc..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="http://relaxngcc.sourceforge.net/"
-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 2a3afbb6137d..000000000000
--- a/dev-java/sblim-cim-client/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 2.2.1-no-network-tests.patch 2189 BLAKE2B 279e37abe9d43333099ed671a4652283f125d1aba243beaa236e430cfb3b3996ca3b9815477347d747e834de2393f16b26e7ed2c3d980af0e8b631831dba9b60 SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160
-DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
-EBUILD sblim-cim-client-2.2.1-r1.ebuild 981 BLAKE2B 104a1ffb9ff7c88528f6ac2cedb03cb43f97a03f3c45b752ac371adf70ba5c838b2f88d4ea284c1f7145236a340cd6884fa4b65e88aac26645f8c0d81145f57c SHA512 30e641fa4c5f83cd71e0dc503f930e4e641ae3258e73c4d02f234cb5ea2f58859c6e383b18d512f65ad1dfc5087192fc6b8403ce864c41bb4a316677e4972fa6
-EBUILD sblim-cim-client-2.2.1.ebuild 903 BLAKE2B fd7682148248b6aafb7e5c70f5d2feabfbbe940882042ca9a3e1b037f2a3d4d0142dc0dcb2c7cdba4167d340a8d133fce3b27c15775f77b1362c3b02e9ed73f6 SHA512 ab8f73955cccf307ccd1e16eda8166c2e32d7755dc2f8de7755a4d0fa3d83cbc6445f5d05bec53ee2226e02f40d6011547d2bee3bd01de02a283c97fecb45d25
-MISC metadata.xml 311 BLAKE2B 8b486e7644b87a394ec5ccc61dab397aefb22e4db94bc1a42ef764b072897f71143a992c7dae561da05b4d3c04a361583584f4401b8687b982e8e87f3baa7891 SHA512 8675574db0408285a6c8ea63bbd507d1f594f3d67b33769fd31fda4ff215d4bf451922b45f2adb92a714f89c27e0296776938aac5fcd38667ee35cb5ee36d111
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 30c9b9a40524..000000000000
--- a/dev-java/sblim-cim-client/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 006a7007097f..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="http://sblim.wiki.sourceforge.net/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 9d80134c7297..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="http://sblim.wiki.sourceforge.net/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 b838330ce1b1..000000000000
--- a/dev-java/skinlf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX skinlf-6.7-build.xml 10712 BLAKE2B c9fd2045a56b230ce4acb836a90bed998b39ee2d075bd4e05618ea90b36a7602acf57e143b7463baeefa3b817770ea2b663110877a9110adc6a0d365a8b2100e SHA512 0d4ecaabdcab41095bdf94388a92812095ae40afd81229d093183926ee4ff29672c98bda8c7dc549a692c26ba238751f623eafb8727f9214759d0ea4ee9bf45c
-AUX skinlf-6.7-common.xml 5452 BLAKE2B a71f3553dc85a0a08b6926389a87574133b004d642d28007699eafc51f120bc3e59af860d23d0bf4cfb3cbc3313accaa998b468ddd554b32de405a4c55da8b46 SHA512 0703e8b463d62355aabba1705d7c05aeb8c700c3a494d3898c356f781172dd09e777d1357ddeb0225753b85242f2d15052733c73c5656f263875570a3c4d896d
-AUX skinlf-6.7-image-utils-without-jimi.patch 2935 BLAKE2B e9d8a10a5f5848bb9c1d4b13c8e294907d72b93a98cd69fd6bea89bed997b8aa676f275d4c7244257b5b46092381461a30cd1f8b8d3099e173228d1a41eba493 SHA512 b05e63e4decb26e325c3a902d8f1391c0026c41114146462fa1cb87e9ff5431941a69615da96751689c8f3ff10fb31f277711b355778c621a7a3d38bfecba033
-DIST skinlf-6.7-20060722.zip 827174 BLAKE2B 72ada5c0b04023b0e51778698ce0b93da1d02457837cd5aedcb6f651e231e1c1a9dede2490bc182d18af9849f8f182542f71d6c864e02d4c2abbfc4c8bdab7f5 SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6
-EBUILD skinlf-6.7-r1.ebuild 1352 BLAKE2B c51246820585a86b3c16e2a48ede8e5e58152869bdf315a5f36a7b196834f509a8cc7ef77f7fd6d0cc4c5e1c7fdb7b1ec6b146634eaf0b4194de9a2521e26005 SHA512 c11d99cb647f59d5cc02ea4ad6cb2f61159d4cbeba69e5e7459ac1aa123f03c5882da26e8863d1dda42bd6b1f5dc6bacb088d6567927f6efadfee0b7ca41df35
-MISC metadata.xml 230 BLAKE2B f980b23f7e5db048ac5b7b660bd9140a5212c9648c15ffcb566afcd151bb8f136ccbede3513a61cb587ab9bdd793622183b30718465fdb42d22491443ffb7d35 SHA512 476218dbd8032db6ef1b9ff1fe425808b717eb4b19668ffd21fea661bed536104bfb0c0766fd98de7c99be9677af6b17a5209ee70c7e9568e814bc6ed85d6a3e
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 0cd2a3b2609e..000000000000
--- a/dev-java/skinlf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>java@gentoo.org</email>
-<name>Java</name>
-</maintainer>
-</pkgmetadata>
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 9234e71e07aa..000000000000
--- a/dev-java/spymemcached/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spymemcached-2.9.1-sources.jar 305723 BLAKE2B fb79ecc9d808a47da09e749bb54ef73b40638735a04e827c8b0487a8e44c5baf1daf4ddd434920b9d97ee81f65baefaf23f36f14da79d0ceeaa405938603a32f SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614
-EBUILD spymemcached-2.9.1-r1.ebuild 700 BLAKE2B 5c873009ac449c10b0db409f4ec407309a1e9209494b39ab860f2862b31a6118ca004335be5d3d06121032bd027e5ac2fc96a89965553ede2cf9b1b7e955dbc9 SHA512 141808b4ea57d7f0a887f17a2cc066d2fb1bf5677158a5de6558c85fb8b5593e977c94524b5fee47cdc5e446c2a1db2477e1126cc7022d25e6745398b0f40c4d
-MISC metadata.xml 318 BLAKE2B e35924d7b1c657bbc0a445352156bc420ba501ad86c0b6812122c2780d8dec5b1d704062c24c0049ce0d23ce01c1187d1c706f07b3b9b125bc282857232a9850 SHA512 67100a68ab4d88b02e279fb87b835a6fef444a8893cba844d1217784379830e0d73df6625ed4fd9e782fe85d665b7ef0f3e3d178266074bfa266128667f9867e
diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
deleted file mode 100644
index f120820fba70..000000000000
--- a/dev-java/spymemcached/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 4d9c7460713b..000000000000
--- a/dev-java/stax-ex/Manifest
+++ /dev/null
@@ -1,5 +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
-EBUILD stax-ex-1.0-r5.ebuild 535 BLAKE2B ed9b7da0035932c20f04e5b15b7d575cc8a9da995972776884dfae469804e3a634fd15042badb406460bac71264647d484d89026845e81f237da62c4f711cef3 SHA512 6a798dcab359f386266dd7b2f47b416d75aacb24e4b989f8e1c8a1ece04038f92e120ca90e32dec4c1c16fa8cac26fe8441da9eb9cfcfd3312659ef183b3bed5
-EBUILD stax-ex-1.7.6.ebuild 551 BLAKE2B 2ec94db653018c40c487fc0aedef62f9472a681f1b0a961a7c9032e8e7051186c0124f53a82289517f5ac143dc76e391d708707253bbb70ced68ac2b10512205 SHA512 a29bbd5b49aaedfd7110234342bf2d3392f7c694a3105b044f27f430fa858cc691339e1e70650e9ce2eb72e636fdbbade5aede54d8d8b3226c4cca116507d4e7
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/stax-ex/metadata.xml b/dev-java/stax-ex/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/stax-ex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
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 2d6f68b1423d..000000000000
--- a/dev-java/stax2-api/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST stax2-api-4.0.0.tar.gz 127125 BLAKE2B 43d29aa29ce010b950489811fd4128b37b86a329464bc02ae9259fceefd407b1f7b4f3cff1da27395003b6c893946e863c6f443e7e7708a487685740713ddac0 SHA512 a8636de873c97534fe17738efb9892d38c52a1a6adfec9502b727082f24b57dc5bfd10a67b5f5d9e196a53d7ee461978dcf8e6c306168bd1cf96a6d67c655b5b
-EBUILD stax2-api-4.0.0-r1.ebuild 629 BLAKE2B f14e3910c11dca344b7860c2a88792011758b2dfa96768c69d708fc6c6f2440ec17edf53b754e22c9b056d2403c8c79b370f88c652e3acea620d4606a924b225 SHA512 6104826e7a18439e1e0c8983ae6670ceba1920c848ed4e6a21d62df682c92b943e3659df32cfc83ccd1726424134e8deb04be9df39a11a79dcfaf31dee9489d3
-EBUILD stax2-api-4.0.0.ebuild 706 BLAKE2B 9bbcbb76f2941283897541b51f75e01b17302c00c30b003d974393744eb4bf492685db641e1132e41b33cf1e385d2c96f823763e9c029262789482662bde3b1a SHA512 ff448fdcc22f9a63efd3955b33c2241343b3799a1b4298c32dd314213c6d686f55893a17935f6c487b2a786f0a7a28ed9b557f512017c94fbf14b3f7a196466b
-MISC metadata.xml 490 BLAKE2B 53a191b4d6a0b130deda8b41200fa4c44281fe48a4ce658dee84ce6160f72c28fade0e34b117ab2e915d6f8f5695c49efe07bf0500787c26aaa15c65a6caa366 SHA512 831b369d2f9fdc3753e4951d289a3256805e5d30928225acff71d60c7e72ce5886dabc2c7c61f9aca8d3c8f31ce4f4131a7207f27423217b21a0dad75266a8cc
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
deleted file mode 100644
index fa93f6583abd..000000000000
--- a/dev-java/stax2-api/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index d19fe70405c8..fbff1f032f22 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,8 +1,10 @@
 AUX 3.2.1-test-fixes.patch 1706 BLAKE2B e3bb6f698109d0290b67221807eb8648642e40aed936502ce4c86d57c2d44355bdaa70ce5147bb8f2a86fcb8123f5e5982e61acd2fb9fcd93f7f216916def4aa SHA512 c161e28851d40e6b9615f7880f746f0a2426a1f705609cfbb10f66c1c3fc3935bc5ee6f4f76991d57e6261bba05269e3ce1eb33fe72e50e7199dab629372cee7
-AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda557442719a907145a4d9a4fa26d206b0b2d1299cc122cf4ace014d97b2d93dd9588b3a929323822af3c472594fc03a4a SHA512 505bca326ae571974c6fdec1fc0d5e66066db5175960ff6dbec682f41244502e52cbd05f2e6119029954b546e52305addc14202223e4c3f2f04118c527606b4b
+AUX 4.0.8-r1-test-fixes.patch 3059 BLAKE2B 8b278f4d13067c5abc4994aca7cf7a011712d59fbe4595eb86a07a095680bba4a14fb5f1ae4ccee2705b21e0ad857562725c4e773a361eb4d392d64e8031dd09 SHA512 d1ed78332950c1ee81846f51086acec62e19c84293cf45d01a07379e4e96d0dfcfc3af933e78eb986d087a1083eeeead0d5bd80c2ed040861ca931df112d795d
+AUX stringtemplate-4.0.8-fix-tests.patch 2956 BLAKE2B 698727b248f9ebbeda46f099c3880b104a6713c600d820f7576757ba69f72d207ff4ecb7271afd8113a4250d51dd63d16f908a3f2aeff76f6112637934dce411 SHA512 29d33536a6abbbb3b0c99263b15a3ba4cc90b5beb03965884598c5d946c41a4727d582b5143d3e7356c9f22fc148ad899efa3281927bf3aca0c4d9dc758d1a8e
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
-DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
+DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B 24dbc49a93f0e63d886adbb12c06769b6015554eb1c74756a6f48642e92f3489b06e4524287503c2bdafa7bff4349c419afff66710ace2b425feeec593214fbe SHA512 fd1ff2ae25cbcaf37a1f193f8791415f8605e548a2e3f6fe5e310fad8b8720f19d279935c927589829b5957bceea686076f750d5f8d94d648ae9cd6158aece99
-EBUILD stringtemplate-4.0.8.ebuild 2179 BLAKE2B 4c75c9863cfef6fc6baf77ec421f4c9e4a484b1454f473c7b5e86c7cc9fa8518a7dea32c13d288d7180849cdd5a817da5a54c7eca85756f22a5a32666d72edf0 SHA512 e903e57beb2a5975715873b2f13a4c83f2cf65304f36d37c8028e5f7782ed214bcccd75aabe321d6bfb88f9ea5d81facbdf160bb7f092e4bd0385061656afb80
+EBUILD stringtemplate-3.2.1-r2.ebuild 1561 BLAKE2B 3e2674b791144f38cf05a6eb7d519e07022281522b11eb204cc7828532759f7d6d3ab88c46b9b3a5a0d578b27d33fbe2c9a346fe927a7fe499bdece9d0680003 SHA512 5ad8941f4c4669b1ffcb341ace024d0c7572f6bec3e9ee982843d837f7699b7b300b5a66a776c514d1e69e48402d8e35e2c45ed68ae567a55975d89dbb6f1c69
+EBUILD stringtemplate-4.0.8-r1.ebuild 2227 BLAKE2B 10d792caffab1e99e83eb551fc53603107f9be7f662fab164bc8b1573fbe577c777d509e8dbf1b1ea0e2cc899cf1c1b168f7314a5d98c817a74b019772ae785e SHA512 281ce1c2835412d72dd327dce4fb1df38a5e493ebb2f76ee59ce75945ecf4b4c4a45c6ea2e417e287ca1f422dd319bf693eafe19b4c52e84e04876454dab8b97
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
new file mode 100644
index 000000000000..0834ccf9bcce
--- /dev/null
+++ b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
@@ -0,0 +1,73 @@
+--- a/test/org/stringtemplate/v4/test/TestGroups.java	2014-03-25 11:55:55.000000000 +0000
++++ b/test/org/stringtemplate/v4/test/TestGroups.java	2015-09-13 11:01:07.999800299 +0100
+@@ -29,6 +29,7 @@
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.ST;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+@@ -527,6 +528,7 @@
+ 		assertEquals(expected, result);
+ 	}
+ 
++	@Ignore
+ 	@Test public void testUnknownNamedArg() throws Exception {
+ 		String dir = getRandomDir();
+ 		String groupFile =
+--- a/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2014-03-25 11:55:55.000000000 +0000
++++ b/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2015-09-13 11:01:05.011850826 +0100
+@@ -28,6 +28,7 @@
+ package org.stringtemplate.v4.test;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+ import org.stringtemplate.v4.STGroupFile;
+@@ -36,6 +37,7 @@
+ import static org.junit.Assert.assertEquals;
+ 
+ public class TestGroupSyntaxErrors extends BaseTest {
++	@Ignore
+ 	@Test public void testMissingImportString() throws Exception {
+ 		String templates =
+ 			"import\n" +
+--- a/test/org/stringtemplate/v4/test/TestRenderers.java
++++ b/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -59,7 +59,7 @@ public class TestRenderers extends BaseTest {
+ 		group.registerRenderer(GregorianCalendar.class, new DateRenderer());
+ 		ST st = group.getInstanceOf("dateThing");
+ 		st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-		String expecting = "datetime: 7/5/05 12:00 AM";
++		String expecting = "datetime: 7/5/05, 12:00 AM";
+ 		String result = st.render();
+ 		assertEquals(expecting, result);
+ 	}
+@@ -85,7 +85,7 @@ public class TestRenderers extends BaseTest {
+         group.registerRenderer(GregorianCalendar.class, new DateRenderer());
+         ST st = group.getInstanceOf("dateThing");
+         st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-        String expecting = " datetime: 7/5/05 12:00 AM ";
++        String expecting = " datetime: 7/5/05, 12:00 AM ";
+         String result = st.render();
+         assertEquals(expecting, result);
+     }
+@@ -102,7 +102,7 @@ public class TestRenderers extends BaseTest {
+         	// set Timezone to "PDT"
+         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+         	st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-        	String expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
++        	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
+         	String result = st.render();
+         	assertEquals(expecting, result);
+         } finally {
+@@ -358,6 +358,6 @@ public class TestRenderers extends BaseTest {
+ 		cal.set(2012, Calendar.JUNE, 12);
+ 		st.add("date", cal);
+ 
+-		assertEquals("12 de Junho de 2012", st.render(new Locale("pt")));
++		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
+ 	}
+ }
diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
deleted file mode 100644
index 9480abe3ed3f..000000000000
--- a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java test/org/stringtemplate/v4/test/TestGroups.java
---- test.orig/org/stringtemplate/v4/test/TestGroups.java	2014-03-25 11:55:55.000000000 +0000
-+++ test/org/stringtemplate/v4/test/TestGroups.java	2015-09-13 11:01:07.999800299 +0100
-@@ -29,6 +29,7 @@
- 
- import org.junit.Assert;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.ST;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
-@@ -527,6 +528,7 @@
- 		assertEquals(expected, result);
- 	}
- 
-+	@Ignore
- 	@Test public void testUnknownNamedArg() throws Exception {
- 		String dir = getRandomDir();
- 		String groupFile =
-diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
---- test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2014-03-25 11:55:55.000000000 +0000
-+++ test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2015-09-13 11:01:05.011850826 +0100
-@@ -28,6 +28,7 @@
- package org.stringtemplate.v4.test;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
- import org.stringtemplate.v4.STGroupFile;
-@@ -36,6 +37,7 @@
- import static org.junit.Assert.assertEquals;
- 
- public class TestGroupSyntaxErrors extends BaseTest {
-+	@Ignore
- 	@Test public void testMissingImportString() throws Exception {
- 		String templates =
- 			"import\n" +
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
new file mode 100644
index 000000000000..994fd42ad5e6
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
@@ -0,0 +1,72 @@
+From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
+From: parrt <parrt@cs.usfca.edu>
+Date: Thu, 8 Nov 2018 11:40:24 -0800
+Subject: [PATCH] make tests work with java 10 and 6, 7, 8
+
+---
+ .../stringtemplate/v4/test/TestRenderers.java | 24 +++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java b/test/org/stringtemplate/v4/test/TestRenderers.java
+index bc5406f7..7b7536e0 100644
+--- a/test/org/stringtemplate/v4/test/TestRenderers.java
++++ b/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -48,6 +48,8 @@
+ 
+ public class TestRenderers extends BaseTest {
+ 
++	String javaVersion = System.getProperty("java.version");
++
+ 	// Make sure to use the US Locale during the tests
+ 	private Locale origLocale;
+ 
+@@ -73,6 +75,9 @@ public void tearDown() {
+ 		ST st = group.getInstanceOf("dateThing");
+ 		st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+ 		String expecting = "datetime: 7/5/05, 12:00 AM";
++		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++			expecting = "datetime: 7/5/05 12:00 AM";
++		}
+ 		String result = st.render();
+ 		assertEquals(expecting, result);
+ 	}
+@@ -99,7 +104,10 @@ public void tearDown() {
+         ST st = group.getInstanceOf("dateThing");
+         st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+         String expecting = " datetime: 7/5/05, 12:00 AM ";
+-        String result = st.render();
++	    if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++		    expecting = " datetime: 7/5/05 12:00 AM ";
++	    }
++	    String result = st.render();
+         assertEquals(expecting, result);
+     }
+ 
+@@ -116,9 +124,13 @@ public void tearDown() {
+         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+         	st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+         	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
+-        	String result = st.render();
++	        if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++		        expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
++	        }
++	        String result = st.render();
+         	assertEquals(expecting, result);
+-        } finally {
++        }
++        finally {
+            	// Restore original Timezone
+            	TimeZone.setDefault(origTimeZone);
+         }
+@@ -371,6 +383,10 @@ public void tearDown() {
+ 		cal.set(2012, Calendar.JUNE, 12);
+ 		st.add("date", cal);
+ 
+-		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
++		String expected = "12 de junho de 2012";
++		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++			expected = "12 de Junho de 2012";
++		}
++		assertEquals(expected, st.render(new Locale("pt")));
+ 	}
+ }
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..5ad6b886170b
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild stringtemplate-3.2.1-r2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.antlr:stringtemplate:3.2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
+DESCRIPTION="A Java template engine"
+HOMEPAGE="https://www.stringtemplate.org/"
+SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# antlr:antlr:2.7.7 -> >=dev-java/antlr-2.7.7:0
+
+CDEPEND="
+	dev-java/antlr:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+DOCS=( {CHANGES,README}.txt )
+
+S="${WORKDIR}/${PN}3-${MY_COMMIT}"
+
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
+JAVA_TEST_RESOURCE_DIRS="test"
+
+src_compile() {
+	local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
+		antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+	done
+
+	java-pkg-simple_src_compile
+}
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
index 30f96503ef2e..72831a73fdbb 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 ANTLR3="3.5.2"
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit epatch java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/"
 SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
+	https://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
+
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 # StringTemplate has a cyclic dependency on ANTLR 3. The runtime classes
 # are needed at build time and runtime and the tool is also needed at
@@ -35,13 +34,18 @@ S="${WORKDIR}/${PN}4-${PV}"
 JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/antlr-${ANTLR3}-complete.jar"
 JAVA_SRC_DIR="src"
 
+PATCHES=(
+	# These tests are broken but are probably fixed in current master.
+	"${FILESDIR}/4.0.8-r1-test-fixes.patch"
+	"${FILESDIR}/${P}-fix-tests.patch"
+)
+
 src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-java_prepare() {
-	# These tests are broken but are probably fixed in current master.
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
+src_prepare() {
+	default
 
 	# Some of these tests requires a graphical display.
 	rm -v test/org/stringtemplate/v4/test/TestEarlyEvaluation.java || die
@@ -52,12 +56,6 @@ src_compile() {
 	java-pkg-simple_src_compile
 }
 
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
-	dodoc {CHANGES,contributors,README}.txt
-}
-
 src_test() {
 	cd test || die
 	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4):${JAVA_GENTOO_CLASSPATH_EXTRA}"
@@ -69,3 +67,9 @@ src_test() {
 	ejavac -classpath "${CP}" $(find -name "*.java")
 	ejunit4 -classpath "${CP}" ${TESTS}
 }
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
+	dodoc {CHANGES,contributors,README}.txt
+}
diff --git a/dev-java/sun-httpserver-bin/Manifest b/dev-java/sun-httpserver-bin/Manifest
deleted file mode 100644
index e027244a4fee..000000000000
--- a/dev-java/sun-httpserver-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST JAXWS2.0.1m1_source_20060817.jar 8993405 BLAKE2B 85661cb9c5c60035c0d9f506f20671d3602a2ffc22d94a608f6d926d4caa966ac7edc77decbf218254b786c41afc2a49621861592c6612688b628c7b182c64ed SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314
-EBUILD sun-httpserver-bin-2.0.1-r1.ebuild 733 BLAKE2B a42a81482928e7eba3eec4c6497f7a70befdca1c4c8ced120d7617c60a5a5e7d038a7a3b9358dc14c3a45ec371ea79ae7ea5a8e16806fd9d137ed9d78ef9be3f SHA512 2c50ca6f9527aab2eaa5bb13fca39b8f4ee28111fb573294eec5cef47632de624f972d43e1e659b8842327d8a4603667a5f111948f848e8634f3cf523b50f46e
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-httpserver-bin/metadata.xml b/dev-java/sun-httpserver-bin/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/sun-httpserver-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
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 dbb0f6468a4a..000000000000
--- a/dev-java/sun-jmx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1284 BLAKE2B 146bb33f0efc01b4acaab426ada1d455599c3e2c22c97934bf586f8f8f1c77deda287c503cba3c62d67f49d0027ebd8b948210cad346f453493882ab88ee8be3 SHA512 90931350bf84e669520a3bf76cd26824d491a3b14a33d18fefbb183564e5f8e97ffdfd1921ff0502ce83e0540205e8af06fb051b70f8fd55c7c62a93c5c31869
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/sun-jmx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
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/swingx/Manifest b/dev-java/swingx/Manifest
index c0d298cae35a..746930b3cf2e 100644
--- a/dev-java/swingx/Manifest
+++ b/dev-java/swingx/Manifest
@@ -1,4 +1,4 @@
 DIST swingx-all-1.6.4-sources.jar 1296323 BLAKE2B a0d7073df80a30053f7e0bd653ae615c88f6e7c6ab46d09f1f823b7abba5de38d0293469ec8349389d2c1379f942698bf44ed43503d63438e92737cf2dca3b8c SHA512 d58964507b3e11b74089040f07699076c84520ab46feb8cb6aeea3e0f23c0cdb14f66d2c019ff8f7f0e911599efe543a47c103f7b1fc4829a483d65458f3fb55
 DIST swingx-mavensupport-1.6.4-sources.jar 2793 BLAKE2B 20910dc8c1935bc88b5f91dfec98f1b379a0b50c2e4fe40a55be04a66b16161d469c296a693d7dbc25d7ed3dadcca483ce9f533d75bb1883e998b6768b88348e SHA512 48fde1b0367373516e549919912f08e751fc4e0f964a9f8ae86d9d93813006253782ce2097e54663dd5eb639ab82dbf59fe61defedecd64a0e36e25a14a40d45
-EBUILD swingx-1.6.4.ebuild 845 BLAKE2B ad70120c22589de641fdb27df15e4ce6313039074f4b7573fff005bfb61e1611a89e83c0c197a7bcca189ebb3324813ab3494ec1578b9013deb9bb78337fb62a SHA512 db538dacce74b9c619da1977e3af6ef406ad20fe3f67f2ad781543962a1eb96084ea695143a1b9c2b1095b0c876d0c1d799762eb950f6b6ed5fb252ce0fdfad9
+EBUILD swingx-1.6.4-r1.ebuild 760 BLAKE2B 5ff9a4d92147e55b0a5520e958638b0072c2ba527f5ce6d14953eedca0d32faa2671444e9b7f7eb6cb1ceb04bb1b35f65a9a82fdf08da747617a78f3b454c70f SHA512 45d5ccc2f5c4bba024c4785292e6c9fa2c01242e1ecfddf0a7835df34ff8e5c71a2aec2e7a673284403c214fef3e90f53651326d6fbc6eb2cebfddaad4cb3a18
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/swingx/swingx-1.6.4.ebuild b/dev-java/swingx/swingx-1.6.4-r1.ebuild
index 98db1f30a104..2e8043147f75 100644
--- a/dev-java/swingx/swingx-1.6.4.ebuild
+++ b/dev-java/swingx/swingx-1.6.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A collection of powerful, useful, and just plain fun Swing components"
 HOMEPAGE="https://java.net/projects/swingx/"
-SRC_URI="https://java.net/projects/${PN}/downloads/download/releases/${PN}-all-${PV}-sources.jar
+SRC_URI="https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/${PV}/swingx-all-${PV}-sources.jar
 	https://java.net/projects/${PN}/downloads/download/releases/${PN}-mavensupport-${PV}-sources.jar"
 
 LICENSE="LGPL-2.1"
@@ -18,17 +18,10 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/metainf-services:0"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND="virtual/jre:1.8
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND="virtual/jdk:1.8
 	${CDEPEND}"
 
 JAVA_GENTOO_CLASSPATH="metainf-services"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index dbafb0f597db..35ab56dd4dc7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -20,7 +20,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.108.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
+EBUILD tomcat-servlet-api-7.0.109.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
 EBUILD tomcat-servlet-api-8.5.65.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.66.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.45.ebuild 3174 BLAKE2B 8142c3911554979940a3ef71fd28d834cd10dd7cbe6c2ecaa46198a8873b5a1b787c499f59e1f4ae42ad1b2a9f8fded31f93e9af8fbec6e486b214ae526e6ef7 SHA512 cc57dd3eb335d5fc4d650ddf85bda93472330b86b7f91513efcdfa006df4f3e360e85a7984ad44a53fdf5df06616e157b83a17c46920982170921bcf9251ea16
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
index e168928a7d05..c750d5ea6f6f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/velocity-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
deleted file mode 100644
index b1411e634ff9..000000000000
--- a/dev-java/velocity-dvsl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST velocity-dvsl-1.0.zip 91539 BLAKE2B 747c735804b24d6d775c658e505a5fbe22289e98ede55577354da7ec0a7908031312febeef8f698aba033d0c9b1553b4e46eb6a5cbf6683ba4f16f87b178fa32 SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01
-EBUILD velocity-dvsl-1.0.ebuild 920 BLAKE2B 7de327ee1fb19d7f227616dfc2e3e78294a85f0363a4f6cb4c693db1f821b8e5d27da518b0423a05de3f5385f02bb347bb505fc9bb3a5e22279db429e68b412f SHA512 1ab3c58b1245d13f8145cd9bbe681dc525c6464df301e819dbca6bfd1549a0a02d284e43833973593158c03599c3709753a42324961eba7152c6db23f58e493d
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/velocity-dvsl/metadata.xml b/dev-java/velocity-dvsl/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/velocity-dvsl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
deleted file mode 100644
index c771f2541a41..000000000000
--- a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
+++ /dev/null
@@ -1,54 +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 examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Declarative Velocity Style Language"
-HOMEPAGE="https://velocity.apache.org/dvsl/devel/"
-SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/dom4j:1
-	dev-java/velocity:0"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="
-	dom4j-1
-	ant-core
-	velocity
-"
-
-java_prepare() {
-	java-pkg_clean
-	rm -rv src/test || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher "${PN}" --main org.apache.dvsl.DVSL
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/wstx/Manifest b/dev-java/wstx/Manifest
deleted file mode 100644
index 4cb18f6cfcdf..000000000000
--- a/dev-java/wstx/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wstx-3.2.9-build.xml.patch 389 BLAKE2B ddb6b3e359aaffeab92a7cf21bfd00070a178c9baf594d0d742dd393f2cbe5fa81d13ce8c2a1555eeecc9efe58e3797274547d3b9c9e746247fa34727a438132 SHA512 e9fb8f3c81957970b9b2fb73bdeb8d3b91d1fe30712829aa3dfa2efc3b0be5b97f0a3b668c99570d5d6ebd1893d0dfd11d8f1961af700a8ff4826ce3250ffcb5
-DIST wstx-src-3.2.9.zip 2218419 BLAKE2B 98daf8a6bca50085cfa3f281c65567da5a51fd376042f6bb4fcb6bd1f77a442acbae8e27507e9aea8bc5da8da969f30c38a8e253f55d535f6669a3a0690c850e SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117
-EBUILD wstx-3.2.9-r1.ebuild 1248 BLAKE2B a99aaaa70c10b7e48a28118b252110df743865018e9a3be90a01ba12708ab7581994c98f42a99e99fa304654d071830a8f864577fb8e3a31a804045652209598 SHA512 16f531b9d01b177a1b90a813320e6b501e01f9d6bbfb1e9bfa98b5fdc3f8381d800e1ce5ad844dca8f2cd3b0aae7501988b7e64cfd20986f0465b0690418e03d
-MISC metadata.xml 498 BLAKE2B 527aeb1edb2d32a86b920d0fe640c3665f62ed3c03d0512ae7bb7c3b2c011b94b487804dfa07bba68bc03ea46b69a05c2f4fad0e66738891615120a220d4807c SHA512 fe5cf72ac01bc004dc57fbf57a49e1c28b3b8191f236d5ef025dee65bfad7b44028abd374c02b4cc1107564e2a1706ef8c44e23c5b89a0dfda950cac4a6f75c1
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 596d71c6cea1..000000000000
--- a/dev-java/wstx/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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 f2ac0934d5fd..000000000000
--- a/dev-java/xmlstreambuffer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST streambuffer-1.5.3-sources.jar 63319 BLAKE2B f41af2d3ab6bd085779fb7aa4e5025727762878f408f0b1908a6471ed31c6674d576db6eb7dd269e3f071bd12beab899e46df5699971711401099dcfe4fe8fd9 SHA512 5f906af01bc2a796efb8f3221c60da3faf20c2a695d0d86afcc1439857ce55a90ecd9df6853b3717e28736c02524e05735770300eecbe83ba58c217c9da92740
-EBUILD xmlstreambuffer-1.5.3.ebuild 658 BLAKE2B 5ab0a9d869767b34602272e34071eb0870b2398886183a85671d62bf28efaf86681fed1c53b8fe008e7802524924ed7c9a45bcffb4efb55e04868b281425429b SHA512 b6d39cc06677483d8df56cd587bfb0320f9fae1ed0cba66fff27a33c6ab854967fb91d089502e36eec9d9a3fdb662b4af9641f6f6eb6c7d49b27fba4d3657b97
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/xmlstreambuffer/metadata.xml b/dev-java/xmlstreambuffer/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/xmlstreambuffer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
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 15346cf67059..000000000000
--- a/dev-java/zeus-jscl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zeus-jscl_v1_64.zip 585558 BLAKE2B 10b106d34953a9306b10ef4d73b2c8d34eadb0849a5facb0ac3682a1f6cd3e39c7ef789da0b32ce2e720698694c466385d32c33a57785c7603e67af18375e8da SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10
-EBUILD zeus-jscl-1.64-r1.ebuild 666 BLAKE2B 7e51c511de0d3f9239f5fd7cee0bb054f393f6209cdedb378e064b014eadc1b541c94584c8372b80eaa5964b5ea98348d2ed1b4a20bc46dbcca69f312a6ed258 SHA512 b763303f1912f2846bf1e8e1237fa5c5a84c11040b2ee0f03c4f270516718b56c9a1790de5a3d1b977ad1d7280501c7942c20a91cc90d6138a6e8bebeb07adf4
-MISC metadata.xml 315 BLAKE2B e8b708785f1dbf82874f5d77edad7b916d085116cf0f7a9967e23cdb7983a946d7cfaae994bd8f39eb945f83a63404e30b56774658422d119d689cb3a04a8078 SHA512 411cfa7471ea811aca7e961c1896af9ec7efc9b3fc042e7ef897039601e769d8ff3f7a7ae3290656cba4792394d9ff1af8fd9b598613fe6a36ee71de635010e0
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
deleted file mode 100644
index 9894d377af36..000000000000
--- a/dev-java/zeus-jscl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/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>
-</pkgmetadata>
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
-}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 064568beae33..9286e5d40b31 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,3 +1,3 @@
 DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
-EBUILD zstd-jni-1.4.9.1.ebuild 1177 BLAKE2B dc9b42cbdb4580fdd067952cbd55efff985d13d254e27a685565b9bff80f055a68996251711a0a5e172499b55e8c024f9ecf4fcb714ecb465f5537af8be3ab80 SHA512 5761e72056c1c226db6cb5ec3e02a7d35d285ebacb9f1f1b77dc7b53dd70689cf8c80fef7b298ecbaf7e1f148506d09218e49ea3485cfc23ba682be211ab6143
+EBUILD zstd-jni-1.4.9.1.ebuild 1175 BLAKE2B 05110ee23b299827046cf47a18734131394944a6495701c71fdc486df616e6b1ebb2348407500000a4e0669343b3f02774d78ef5171de8ca1bbf533ed7155ba8 SHA512 2c858cf1079cbf408d8623fecaf010ca38a019d9d9364fbd538e7b21fc76f2c7cc9242e4a6e168777c4b0d9d8edbe26689f10269fa1681b721230f8b1eb9b232
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
index df596aa3d20b..6428adfaaec3 100644
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-java
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)