gentoo resync : 04.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
commit: 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree: 44068672445b1418489aed82de58df3c470289e7 /dev-java
parent: 0f15659d48c193027158492acb726297501202c5 (diff)
160 files changed, 450 insertions, 2855 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ea28c1b0de42..2be4e3ff31f2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 3a36d7256ec6..af2af1d3b9c1 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -4,5 +4,5 @@ DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae183
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
 EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f
 EBUILD ant-ivy-2.3.0-r3.ebuild 2206 BLAKE2B 81ecc8890da54bcda84c4d74e3125e01a0f390264e1e243172c35cfec6629f00d2deee6441a3dce2d1e2e3dda1148cf63d8dab013f556a02705af0eee15fc8b2 SHA512 2405021491feb8fb173f0d7da0333debdb53f260a6de1b58178d3f2440ecebb21430333c733bc0ee0c298152d5cef34ab77ffb5842d3ccc8e632eb9a1f55435e
-EBUILD ant-ivy-2.5.0.ebuild 8498 BLAKE2B 6b9d3612a6a4633b52e0d56b7fdbb2ef55861704558cecb3a5185fec0a8c92a3331cc45e2aeef4e4a59b8e055773ac30a2d4e004dcde04deaa8d095c08e44f79 SHA512 708f93401a2e35fa1e49722820984c21f5203ea50b8372e00c43dd5288c6ab96cf58965f99214731e16341100ef0507c4ed412874add0ab48a42bb0ccf853223
+EBUILD ant-ivy-2.5.0.ebuild 8496 BLAKE2B 8e10ef67d8e600974ca477ea53274efb96c37735de6575e8a03705db40d74a4ca5a5b809373216f860612cd6ec51bb9892a2b974962f2c3e2394fc8cd562b6df SHA512 6ea2eb0b486529cb9efd683d1d009748f92fa4efae8805073c10a403bda443d231dbf3a8c6acd60aa6c5d259fa87c1548398dc8686adff086b3518408730b42f
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index caa5b3a8f254..36f2a11d943f 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest
index e4c2c2fd9597..f3588c35d2d3 100644
--- a/dev-java/apache-rat-core/Manifest
+++ b/dev-java/apache-rat-core/Manifest
@@ -1,4 +1,4 @@
 AUX apache-rat-core-0.13-commons-lang3.patch 1813 BLAKE2B 6351b49b0155381902ac2585014ce1c5775444ce2d1fe1292ca9e995316596210ee8afa41603f656c4f02565489231905bb4b157f1fdbcf0e993a9cd40c2dcf4 SHA512 ef0863a0954f47196f45b2ea2a8eb1bf06556535c19b39c5cd7cfee72605dc63f7a3bfa1e1613336b3a357578ab8e419c431a7a41261ab6cda236ebe7adc2567
 DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
-EBUILD apache-rat-core-0.13.ebuild 1993 BLAKE2B ca130b38169df33fb92e5529949bcc5db87db42dbe84777eaff9ca30f11752497292430d1d4fcc52a4e1773fcc244bc7700672e96238a85845ad25f8af4fed53 SHA512 a7479db10e8cf614215d7b7dc18db5f4a07278721d546538c7d2cde4d3a5855c3bb8ce11f4666c9eeba48b584aee30168a79b0edf8b093463478ef54f05eef5e
+EBUILD apache-rat-core-0.13.ebuild 1992 BLAKE2B 1962a7222046941867f8622a7292542bc7063b6d6057f25ad74cdc305b818f6821e60696c3a634f9eb4d90f69864956258f62ad71efa593f508fdcc5086732f3 SHA512 c953cc8b98376b5af8dc4982b631fc857c27d8d02fbfc576cea96001297488b3ffdf000a9258dbf2d0519b404373bdfc48e9b609716a42bd3ba5c5eb6637f4de
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
index 5e67269064c2..5e26db26f1a7 100644
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin."
+DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin"
 HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index ae31d6e6b0fd..be711525d722 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,4 @@
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
-EBUILD bcel-6.5.0-r1.ebuild 2866 BLAKE2B 25feebba95342fac816e5995a9ef4a79655299bb82a6d66df4cd92ca70a87e813526328aae1cfc52fc644a0e7270d3036f20c4d31136a827b042a29043f06412 SHA512 e4372d8efbbec49f8247540a26b40813b95957f67daac00045c6cb0ded9f199894a18c0e5144ff35942c492f94def02c9b6e149241ca67baf0f8f1c3401cd236
 EBUILD bcel-6.5.0-r2.ebuild 2906 BLAKE2B a5b768b3cac2ed376918cdb0b0d3c5aa32a747d251d334f27f010c7dc2ef0347894904ad47bfe4bf5c1e1eeb3f055c72fc7d0a49dd4d383cd7b4e1bc536b38df SHA512 854c89beaab4e3c54632f1a78dd06f3233150135089921aafa8f7c750f7bf95ebc714fe1b405e79e816a78266c428c64dd4294d0246017f227cca587f9442f23
 EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
 MISC metadata.xml 820 BLAKE2B a425bc2cd30a5f47f2dc92ef014869042d68c09b1ace76007fdb08d53f52162e75f357af8debf6ab4ca5454960bd44d769190e8aae40b07a5e1ad94306f833b1 SHA512 0cb5154eb87c302868af21bd968b588317584d1f8f932e09444dde078efff02ccdb8e1e45a2e2e7fb9574eb04fd6a1c3a2afb45520261601f81ff9e35783bef7
diff --git a/dev-java/bcel/bcel-6.5.0-r1.ebuild b/dev-java/bcel/bcel-6.5.0-r1.ebuild
deleted file mode 100644
index 183c85a56fa3..000000000000
--- a/dev-java/bcel/bcel-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.bcel:bcel:6.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
-SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? net.java.dev.jna:jna:5.5.0 -> !!!groupId-not-found!!!
-# test? net.java.dev.jna:jna-platform:5.5.0 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	!arm? (
-		!arm64? (
-			!ppc64? (
-				test? (
-					dev-java/commons-collections:4
-					dev-java/commons-lang:3.6
-					dev-java/jna:4
-					dev-java/jmh-core:0
-					dev-java/oracle-javamail:0
-				)
-			)
-		)
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	# Invalid test class
-	"org.apache.bcel.data.AnonymousClassTest"
-	"org.apache.bcel.verifier.tests.TestArray01"
-	"org.apache.bcel.verifier.tests.TestArrayAccess01"
-	"org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
-	"org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
-	"org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
-	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
-	"org.apache.bcel.verifier.tests.TestReturn01Creator"
-	"org.apache.bcel.verifier.tests.TestReturn02"
-	"org.apache.bcel.verifier.tests.TestCreator"
-	"org.apache.bcel.verifier.tests.TestReturn03Creator"
-)
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 18f57a4bc030..2d1bcb2a0848 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,5 +1,5 @@
 DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
 DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73
 EBUILD commons-beanutils-1.9.2.ebuild 1829 BLAKE2B 987acca0c9832be1c004a01d37d88973295cff44640884edbec92aa35e7e70c68cd0721038dc10c5907149c134408bba6598ecae73ae11834b4617cd44d7444e SHA512 b05fec1515bf71928fd9463de580ec191200549cf3a079027725bdf5b0f1029047608de5f893863c22f690b3bffec3d03b3273c1aef0b0e2002ce1b358e530be
-EBUILD commons-beanutils-1.9.4.ebuild 2210 BLAKE2B 1567a8fbded5a1634b7b703487e519f5131ffbff844debb52c93328f4f55ccfa625c8cd3bea3657da585591563f191d513a23698dc658bbc069aa94e5a4b1350 SHA512 38c25f0e231c9c4e9967b0c8e9c9fd030a5d942fd51b5edc949d0beb1993b0a0e02b197bb939136ca08eda0911267cd3855c0db0056c08aba8f1a2acbb728cae
+EBUILD commons-beanutils-1.9.4-r1.ebuild 4624 BLAKE2B e8142e5028d4960da7886dae50ed229bea902b1879dbc3e08dc3cfaa25fcc6513aeab438b4bc1edb3389082d798ff6c4fbf10ce3321c34299fe2dfc5dfe039e7 SHA512 16804bc672b5f32a352919bae336578364142f37eeb9a25b0d5a9e63e890d469d5191f8a88f9e1064e994354d4890ea9c3052f21775dd2ae17c37541be365bf0
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..b7f3e06ece9c
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
@@ -0,0 +1,101 @@
+# 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 mirror://apache/commons/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
+HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
+SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Common dependencies
+# POM: pom.xml
+# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/commons-collections:0[test]
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 1293, Failures: 0, Errors: 0, Skipped: 3
+	"org.apache.commons.beanutils.TestBeanPublicSubclass"	# Invalid test class
+	"org.apache.commons.beanutils.TestBeanPackageSubclass"	# Invalid test class
+	"org.apache.commons.beanutils.TestResultSetMetaData"	# Invalid test class
+	"org.apache.commons.beanutils.TestResultSet"	# Test class can only have one constructor
+	"org.apache.commons.beanutils.TestBean"	# Test class can only have one constructor
+	# https://github.com/apache/commons-beanutils/blob/32ceb2c92512d44f97638805e2f3fd9d70dfcfc6/pom.xml#L378-L383
+	#                 <!-- This test case is known to fail, and there isn't any proposed fix
+	#                   -  so we will just exclude it until someone comes up with a solution.
+	#                 -->
+	"org.apache.commons.beanutils.converters.MemoryTestCase"
+)
+
+src_test() {
+	# There were 8 failures:
+	# 1) testPropertyUtilsBean_descriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 2) testPropertyUtilsBean_mappedDescriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 3) testMappedPropertyDescriptor_MappedMethodReference1(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 4) testMappedPropertyDescriptor_MappedMethodReference2(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 5) testLocaleConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 6) testWrapDynaClass_dynaClasses_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 7) testMethodUtils_cache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	# 8) testConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+	# java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" == "11" ]] ; then
+		JAVA_TEST_EXCLUDES+=( "org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase" )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
deleted file mode 100644
index a36a6aea1cef..000000000000
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 mirror://apache/commons/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
-HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
-SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Common dependencies
-# POM: pom.xml
-# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!!
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		dev-java/commons-collections:0[test]
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-#	JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	"org.apache.commons.beanutils.TestBeanPublicSubclass"	# Invalid test class
-	"org.apache.commons.beanutils.TestBeanPackageSubclass"	# Invalid test class
-	"org.apache.commons.beanutils.TestResultSetMetaData"	# Invalid test class
-	"org.apache.commons.beanutils.TestResultSet"	# Test class can only have one constructor
-	"org.apache.commons.beanutils.TestBean"	# Test class can only have one constructor
-)
diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest
index 9754c4a0f8dd..d13984b857f0 100644
--- a/dev-java/commons-csv/Manifest
+++ b/dev-java/commons-csv/Manifest
@@ -1,3 +1,3 @@
 DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8
-EBUILD commons-csv-1.9.0.ebuild 1661 BLAKE2B 4bd0b3540b07053ff1b9c4b9ebddb59ee8cff2bc7c2871d4052e244785df81a7276bfe7fb993b68d38f69c33da766d7c1e20e3b702120cc960f98ea87d81132a SHA512 462a73faa494fdc97de3b591e3b1544d0c6c49868eb1f26b878d1dca64b972a48d7a36c73772b6fc7ffa17f2ab800c44209512d82cfa71de9bbcb767eaebc9e4
+EBUILD commons-csv-1.9.0.ebuild 1660 BLAKE2B fac0bf3a678bf60cfe427349d6eb4a109c5fee7e0593b17e532ac839306c9277e3b23ca8e69d95155d7b328efe11eb6d24b41c2eef957dd51ec10df4bf8a55b0 SHA512 029751f9905e372e8aa64ef737d4ae51e6e5f491d646bd1cc36d854b22fb3fa8c85605ff9db9d909e3c996aa43a8a966e46d361dc54dd180b57f6f7829f1b7ec
 MISC metadata.xml 416 BLAKE2B 193c84e7cdd7d31c475be29d0f00c44f86dba7226d4c9d3de052b9ecc8e2dae8fe9b402cdd797b04d714253591b39b3f858be13caf0584b1e67f6756cbae7bce SHA512 9c3695f3b80d8efb699cf1f1b8801aa173480a71604abdcc8cf3d093f9631fbf0ef2c6cfbf22ae106831b0b58747219184966904b9c3622c1ce424d4325e18b6
diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index f7048a2fa233..8860918b9973 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-csv:1.9.0"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Simple interface for reading and writing CSV files of various types."
+DESCRIPTION="Simple interface for reading and writing CSV files of various types"
 HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
 SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 3470c20dca0d..ac793302e58e 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
 DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3
-EBUILD commons-io-2.11.0.ebuild 1830 BLAKE2B 01b3bc9281d43f2b3fb55fec949cc48592e929ffe420a16e498bd098d1d599daf29e6de3cec7f432f82c3f345a9f29895fcb144c3917c35d716edcb6c1aa8fe9 SHA512 9c05ac5d49ad7ccd67f5eb9e10dc711d3893a72a053ce4218c3b1b276afc2dc9a1bfcc4dd9fe063c09b020a150b2b11c3b77f84c25d413c6473b01cd01105be8
+EBUILD commons-io-2.11.0.ebuild 1829 BLAKE2B 9752da4af980cd2a649eb50802af49560f0b1cb2db6ba2716222bf53e1ce7650954accf2c68551034428eb939ada28e406a1320b01045772a158b4b6394b7f8e SHA512 6cf2465163855384be4bb0f542f86fc1efe0c99a13c1d476d871478307c073cc83be815018fa77aa4a0d63fa714b11dc1acc5b6b7e306cc269a582139d790d0a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
index 8aa24e232dfb..f6f4b5f8feb0 100644
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="commons-io:commons-io:2.11.0"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more."
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
 HOMEPAGE="https://commons.apache.org/proper/commons-io/"
 SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index 1e66ec2e4ed6..bc2b21e5be2b 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,4 +1,5 @@
+DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
 DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
 EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
-EBUILD commons-jxpath-1.3-r4.ebuild 1427 BLAKE2B 080e1600ea5b3733a56b4b455b87892713a81fbf2b5a9d910526ee16cd275259ec81ebeb90bf4888c9033228c32fef719331d01b0977c8bfdb401969a1b6ba48 SHA512 ffc15c19ad39277d0f2d2977985762e4d77dfc92d210eb7fe2cd64215a5e4f3ef4986af21b001cabff21a4e4c97e8648f5a658a3eb12abf5b8514438185bb65a
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD commons-jxpath-1.3-r5.ebuild 1791 BLAKE2B c909ccb9d29baff6e6339387cb74658e22890f03326c2f3b72dc743c20411ad5f7dce16c2ae7d342f0573cf447a5f2e327cce451d882f74372a044ac0dfca0a8 SHA512 762825b9434a362a0407399fa8611406adfcc63b8f3bf8e1a138eba81f3943824669fec9b03278d786a034569e4b1195a780d5e79119cc3058c087739afada89
+MISC metadata.xml 463 BLAKE2B 1b7774556b00869ef427316f8ce3465dfaa4a666ac45e35099054c09c8956743ead7e1f3483169ac15c9bc208e9d72b0abee49d7103db93f8ae8462f3ae2408a SHA512 a703759ea4165486b35c1ce02dfc35ad5cf5899af03c1bc0580288ae51b931c0fd12da6a741a42d365bf452ed1d56f4296fd6afcebc6c490ce7e48f9234087d7
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
deleted file mode 100644
index bc77ab2d8ed2..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
+++ /dev/null
@@ -1,63 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="https://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-S="${WORKDIR}/${P}-src"
-
-CDEPEND="
-	dev-java/jdom:0
-	java-virtuals/servlet-api:3.0
-	dev-java/commons-beanutils:1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/commons-logging:0
-		dev-java/commons-collections:0
-	)
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
-ANT_TASKS="ant-junit"
-EANT_TEST_TARGET="test"
-
-src_prepare() {
-	default
-
-	# Don't automatically run tests.
-	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-
-	# This one needs mockrunner. See #259027.
-	rm -v src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
new file mode 100644
index 000000000000..82e008be5830
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
@@ -0,0 +1,62 @@
+# 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 mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-jxpath-1.3-r5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-jxpath:commons-jxpath:1.3"
+# Tests depend on mockrunner-jdk1.3-j2ee1 which we don't have
+# JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
+HOMEPAGE="https://commons.apache.org/jxpath/"
+SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.7.0 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# jdom:jdom:1.0 -> !!!groupId-not-found!!!
+
+CP_DEPEND="
+	dev-java/commons-beanutils:1.7
+	dev-java/jdom:0
+	java-virtuals/servlet-api:3.0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:jsp-api:2.0 -> !!!groupId-not-found!!!
+# javax.servlet:servlet-api:2.4 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.4.0 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.04 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? com.mockrunner:mockrunner-jdk1.3-j2ee1.3:0.4 -> !!!groupId-not-found!!!
+# test? junit:junit:3.8.1 -> >=dev-java/junit-3.8.2:0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/xerces:2"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE}.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_CLASSPATH_EXTRA="xerces-2"
+JAVA_SRC_DIR="src/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
index 6021501589e0..f918f7019466 100644
--- a/dev-java/commons-jxpath/metadata.xml
+++ b/dev-java/commons-jxpath/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		A Java-based implementation of XPath 1.0 that, in addition to XML processing, can inspect/modify Java object graphs (the library's explicit purpose) and even mixed Java/XML structures.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
deleted file mode 100644
index 07aae0cdbcd7..000000000000
--- a/dev-java/commons-pool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
-EBUILD commons-pool-2.2.ebuild 1081 BLAKE2B f14a83155a34530a1d8b04d30572cf622f5f7ee7d51fb67d677f2e659b62d6f3ad1938bed2cf7f178e83accc7ef0994153c8f38b140954b968ed85aa06fba538 SHA512 de717fe70ed9ee2298874a00d6ff1541e94cafb4f5c1c1711e288b4eabc6388a66959199a99df52e7b967c2d56050649db7df21618880e7907a34e7c717cbb38
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
deleted file mode 100644
index 162292b43aa1..000000000000
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ /dev/null
@@ -1,49 +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
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Provides general purpose object pooling API"
-HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-COMMON_DEP="dev-java/cglib:3
-	dev-java/asm:4"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-EANT_BUILD_TARGET="build-jar"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="cglib-3,asm-4"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${MY_P}-SNAPSHOT.jar ${PN}.jar
-	dodoc README.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-pool/metadata.xml b/dev-java/commons-pool/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/commons-pool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index 9e7c3b402e26..582b5cec8aff 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,3 +1,3 @@
 DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
-EBUILD commons-text-1.9.ebuild 1143 BLAKE2B 1616648ac3c24caea3f78a60fb1b037026a41b68bc41abf113c76aecda63466af202af533ea9da4eb6ea2122878b9b9fe1c66e91bc71f327211d04eef7a8a912 SHA512 45d442d13ac8b586759a17a2e5bdc05887787cf84b8f434446f35e7900dc3778ab2a0a1f052952e258236aea08aefdd2cb85a6e55b714275c0fe59de2b0713c7
+EBUILD commons-text-1.9.ebuild 1142 BLAKE2B 0beeef324dac52e6201d090bf55e4d1d090d88d82ccf3a6beaa2b7d1cfb7670295cf294c0c071863583f3512dcd4bf38f24e53f94fa972f1f82e14d9262f947d SHA512 658d2fd0186f9dded92492d975f2262f35c2a618a25dd85a6c2e1d82a4663a7f833703675ad1bedebeae4234fbe90269bf28f61d2c1e2d0bc659faa6ab36a6c1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
index 67823fa867ac..530b720f0f19 100644
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-text:1.9"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings."
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
 HOMEPAGE="https://commons.apache.org/proper/commons-text"
 SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
index a29350da55d9..6f4e2cad7306 100644
--- a/dev-java/core-specs-alpha/Manifest
+++ b/dev-java/core-specs-alpha/Manifest
@@ -2,7 +2,7 @@ AUX build.xml 1403 BLAKE2B ed4b7cb7f98192fb467df4353c17d5c61f84598f36cbab35b9310
 DIST core-specs-alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f80137833e156a5136e4f53f6123d158bdbe676e9bacdfe76728b1320986589e8242c52f49a4d8922bda5374e34fe52969ddc SHA512 6ddf20bf9be36f7493104f69f4e9402fc62f49005471a967843c7cfee898c67aaf5046886db73e6b54942538beed9556d83f4582e85fd02ef4cb755cb5a18d34
 DIST core-specs-alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
 DIST core-specs-alpha-0.2.56.tar.gz 11780 BLAKE2B 088d0b32dea7ec49ddaf0f461703762a5a877ff4028b775eb35998e6a5a3436ad57b35d7d9431b6911ca2304403e95043d375bac80080ecaf6144a77b3ebcf4c SHA512 afbfc04b9708a21ae6c6b29b8653fc62b23efcb271b973534c4b8421a7d73df3ad24bd28d7115a2fe926954dc45571de86971637736f3a494799f6f1ba1765c8
-EBUILD core-specs-alpha-0.1.24.ebuild 884 BLAKE2B 70d8e88cedeb0a133411990f3849b479f24896f644ab5620fe3c3377b793cc6c553177fb6386eed57becfd0876557eea2c512bb0be837e635e24f214cfb9c2ca SHA512 7a93646083f75faedb51925814ad00463348424d704fefc8eee4f780199e8a363b8e343421cc62439d0e4744f03418c65b59495a87a1560dd1590f0b99d9e06d
-EBUILD core-specs-alpha-0.2.44.ebuild 884 BLAKE2B eecf5279ed83fde8cf61cf672f017bfdb38ad4ca58a18eb56b1e550417271ee0b9dac6da589c7769d78fc3768b30e70b62e9663bbfb1f9d7ded797332087ad9a SHA512 d4628a9171862783508b7e7d522db649af73724234ece129e851d14bacee696c5c348f95a76860f4483119403c6a0a7a441677fc016ad8354b6a4b4afc8e33f5
+EBUILD core-specs-alpha-0.1.24.ebuild 883 BLAKE2B 6eb4577971e98dd87e2ee2a7c785030603690a9bd24a0fe9f27cc97df714634555b4a74eca5ffaa0cadd52427cd96c565b2a5aa4dd252fac135e03a862b5e827 SHA512 a504b493697d284a9a5ae833dc0f740f354bc24265280d30d2df54c35996952ad294f22a3b7a673a81dcaf11f6e7adcc7ce6ed22adfba12fd380b1c64a4de52c
+EBUILD core-specs-alpha-0.2.44.ebuild 883 BLAKE2B 0ba279bbe00dca4ae1bee997bd664f1aae06913f00c1ffc43a7e6371bd991e3fdbf91ff6712227d06be6bb81eb3ac10187d8bb76063e0c9b1ffcb7863b40f7e0 SHA512 0b4f633bf9fe85ceba3c904505560ce09d372dc9c0d268ac79a3e98e2b4566b3a286c88202da5a8504c0e2ed6b11ce90c593ee395a17d422416f202e73abac6d
 EBUILD core-specs-alpha-0.2.56.ebuild 977 BLAKE2B 583984b0c05b35f825de6a1d60a0f3753f2d820184d0b0031678665f8e134e4df5518ad9a34cc30928f28675cfe9484215d54a28c5be717d1a420e66da6b98a2 SHA512 bbe9210bfe14e19c4b3d4b4a7a9a5adf0634606e3b9f10925ae781ab668ca925ce71067224b9471e439d1a68399037fa3387c1ad2b60c4599d8e42d502af071f
 MISC metadata.xml 482 BLAKE2B d434904a31cda60ca3797aece58d7e1572bc1a1999cd452c720e102aae3c9ae73b2f331620113f7c4bebb3af0f51658d58a1784dc170abdcb724cffdc875596e SHA512 2cfd6d5157caf8fda83d3d2733dda0b737a49132ddeadfe23c173cd087af819831a11cbd563738ca1bd557c87825e2b4575aa075e0f364bfc6f0ffee18c93a06
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
index 1dbd7e477390..a04c6e5dd6ac 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="43815fc"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
index ebab256dc34e..f54ad2867014 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="d69f559"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/dict4j/Manifest b/dev-java/dict4j/Manifest
deleted file mode 100644
index d17c005693ff..000000000000
--- a/dev-java/dict4j/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict4j-1.1.jar 50269 BLAKE2B 70f7a46549384a063e1240bdb375a8c12e81c6a07a4c15bc1abcdb603ac89a2157a2cc2561960e4ab955d079dab3419708ae89e7f59bed51cc1da53649e52714 SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6
-EBUILD dict4j-1.1.ebuild 509 BLAKE2B e50616a00e99520e5aa08f605f4d26e40dd013a33b999d531e63d373dd565c6a0e39108e94b65f3d53c34b3781a38a4145662771e436dcfeb024311923fe134c SHA512 9b4eb2d394166ea08010b4343ae7cde4755cb8fbb28468c9013d114198e9c9ab4533dc69d3c5cd8274a5449635d335400a692d9c204c43949e7c252de3b35dbf
-MISC metadata.xml 394 BLAKE2B 7de9593472bd042928d72da2e7ce3d9d83853aa046ed8e854414e7235fbdbe75abfe76ab97080c826afc06c2009326906d9ce2482cbb1fced9fed33d6031b54c SHA512 d397959909e828baa32b8dd0c4f1b187b18d455f2ad4e643668c96f85de6cf64cae856888d3d367e9bc271b59f3638d8d775cf331ea54cac5acf1337fe8da48a
diff --git a/dev-java/dict4j/dict4j-1.1.ebuild b/dev-java/dict4j/dict4j-1.1.ebuild
deleted file mode 100644
index 70e12c0b2ae4..000000000000
--- a/dev-java/dict4j/dict4j-1.1.ebuild
+++ /dev/null
@@ -1,24 +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="Dict protocol implementation in Java"
-HOMEPAGE="http://dict4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-JAVA_SRC_DIR="net"
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/dict4j/metadata.xml b/dev-java/dict4j/metadata.xml
deleted file mode 100644
index bbb3474e75bc..000000000000
--- a/dev-java/dict4j/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dict4j</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/felix-gogo-command/Manifest b/dev-java/felix-gogo-command/Manifest
deleted file mode 100644
index 2d4e58cc3afe..000000000000
--- a/dev-java/felix-gogo-command/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX felix-gogo-command-0.12.0-build.xml 14407 BLAKE2B ffcc8e547f6e670bcd510e2da8cf036b50400cef62a9527d4e93c27de53871dd4a2ffeddfffca8560822735e8c8a5c4871bd40bfe80e1f0204b96bdfbb81610a SHA512 c99fd734167c6481b0228c3f58d14602f74bd0837fd12f4596314c0a4655b6ec75f15a889fff4872f825eeb447f63aa88ddf678ca1a6276d831f15f8e655204d
-DIST org.apache.felix.gogo.command-0.12.0-project.tar.gz 26454 BLAKE2B 0a0ed6b1ce7e66e90a32c71aa3786d290c907c68124a4056078907d1fe7d85546327d9540c68ee0bf3b90e28ef06fcd286e290d86799b6675fd642fbba30ad9e SHA512 8d7afa4b34be6460df9e1e91ecc42b34ecfc1888f5574add206a3c6fbc54647672e34d4f3a4e59eb39f8b2b9fd94b468647c0e95d5fc04649ab7a283e172a061
-EBUILD felix-gogo-command-0.12.0.ebuild 994 BLAKE2B 580a08305b3a53229e10f4a95f0fd6bcdd060d60133f22a057d6a62deb3486cafe4951a19a00e449ed7b011b716cc74683f4bd6e1639a4019e123ab3d43d04ca SHA512 a7c1453ba38dd8cabaa0b3a6da5a9aa46c5d969b6220046630abf5e9974904481566c86650f73610e2962fd9ed8c81e3413d3dfc3ccc78b56ddd819ffe8dc9a6
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
deleted file mode 100644
index b2f275c09e15..000000000000
--- a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +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-ant-2 java-osgi
-
-DESCRIPTION="Felix Gogo Command"
-HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.gogo.command"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="
-	dev-java/felix-bundlerepository:0
-	dev-java/felix-gogo-runtime:0
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0
-"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium,felix-gogo-runtime,felix-bundlerepository"
-
-src_install() {
-	mv target/{${MY_P},${PN}}.jar || die
-
-	java-osgi_dojar target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml b/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
deleted file mode 100644
index b31bcdccdc01..000000000000
--- a/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
+++ /dev/null
@@ -1,276 +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/10/13 7:05 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.gogo.command-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="org.apache.felix.gogo.command-0.12.0"/>
-  <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.resourceDir.1" 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">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <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>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE*"/>
-        <include name="NOTICE*"/>
-      </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}"/>
-  </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}"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0"/>
-    <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0"/>
-    <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
-    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
-    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/felix-gogo-command/metadata.xml b/dev-java/felix-gogo-command/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-gogo-command/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 0d74fd79e87b..2da22b135ec2 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,5 +1,3 @@
-DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
 DIST icu4j-70.1.tar.gz 65661187 BLAKE2B 9d2d38fa91092d8f2fa39c773b722019f1d0c9b06ba6e8abaf05c3d3b50977232d6f1a37fd5ab6be6461d133dd361dae9b8633e22c9f165ef4e6e4b8029f6b8a SHA512 f1a653452f42605f799de7ec1d5bf27aa4b715f2ec18534cd3b52bd9be7ddbe7a6d18b47e3a5b36c7a63442bc38304ddc80f519ac65b9a91978ab15b462d9456
-EBUILD icu4j-54.1.1-r1.ebuild 1295 BLAKE2B f2bacdbc333dcf7e25503cca563ac8eac94d470a348feaa71b3053f99d246b83ff104cef218b53aa2a22cf3b67e069c2973904ea1d42afb8fe7900b41cf7f4e6 SHA512 e98b2308eb5a8ce3eebede4ce91668978e2551938141af3951683a2088efe7b837e0b3a0fbb7ae8689e4c19a8f1b1d0fb3e5825c6dc291de8fea2f45a57eff69
 EBUILD icu4j-70.1.ebuild 6898 BLAKE2B ad622c6b4b24175e73ca520a3410b13b7890aceb060e052a88766d1533841db31680eb5b57dadcb37c4477ec9e495a8b7fc21d065eaad8df4951b057dc1b6582 SHA512 48928ca0cfc6041023880c1bce496aca4e446404a1e692826cb9d4284a2f0af6b946dca548381a6c63047c82e7dd712fbad42d2bec7c4067f3fd30cc05fee7c5
 MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-54.1.1-r1.ebuild b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
deleted file mode 100644
index 640cdc0756f7..000000000000
--- a/dev-java/icu4j/icu4j-54.1.1-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=7
-
-# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
-# but *.res files. These *.res data files are needed to build the final jar.
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="52"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# the build system does not support java > 1.8
-# also the package does not compile with newer jdks because of missing classes
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-HTML_DOCS="readme.html"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar ${PN}-charset.jar
-	java-pkg_dojar ${PN}-localespi.jar
-
-	einstalldocs
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 0b690967bb44..866a54af1b08 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,4 +1,4 @@
 AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
 DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
-EBUILD jackcess-4.0.0.ebuild 1989 BLAKE2B d433e8ae866e9f13c4da2b3c1a5912d2fb24870f6d01a15560cb7dc8b4148bf6d23a8d21cc3196b9938de7e3e548a361ac03b8a8476951d53bd934b3435e014d SHA512 3c95487efccef386b673fba6dbeb1edf0da21442df7b92ae93aa3bb9a2ff2df0c05d8198199ff98bf777658224c283f4665d01211c97f442c74c5da0ed3a102e
+EBUILD jackcess-4.0.0.ebuild 1988 BLAKE2B adcdb641a92371693e55c18212e63b05778a5496d3d910d8c5d6473da75d780c10426696080a2c443446c3cdbf38d8254690acab261b6f44e77f1d7187138df9 SHA512 815bd4308d8a319cdfe63052fc877255d439db67831d2da7b279745d932922500980da54f49bbc70ffba4a32170055e4936a1b5eb1854620192a0dd7d9617a73
 MISC metadata.xml 315 BLAKE2B 04a9ef5dc6dae2166726ffdbbb1ab50dbc42d44286f2e2392a3ac5277b08c3ace57ddf88791b08d822a5a08f0217f0f915a3d48be85e677050f4af68ed6e57c9 SHA512 333904e9a8b92f902c4903cbeca86a106acdb7783f6bedc79685b2a5c3afafda68a9e8d886048b21828d683c0359945f9f2f7752474fcc725eb772db57ad1867
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index 7d2a8161da68..2d583cbc5fe7 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="A pure Java library for reading from and writing to MS Access databases."
+DESCRIPTION="A pure Java library for reading from and writing to MS Access databases"
 HOMEPAGE="https://jackcess.sourceforge.io"
 SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
 
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 117c5f82d67e..9c827eeb05e0 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,3 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
-EBUILD jakartaee-migration-1.0.0.ebuild 2877 BLAKE2B c6fc88baf5abd7df3c31b25326154c546f259cfc697b4cea9581b4b900ec5d1bffc3d017eac1b201c728cfa4b3056da72ba102f13ba0171e27e8229c8e2ca344 SHA512 eee4baddab8ec054a4001b77bf5291ce755d6ea3385e76b2ee7577b970284fd1789ff3894ce194ac09a137ce0893c0434dd3dbaf4252b99e80a5e32bd729469f
+EBUILD jakartaee-migration-1.0.0.ebuild 2876 BLAKE2B 46a8801f556665922b81dc55f548429ecbeded7e6dd03cd61aee6806d29eedc6e8e106d0b010e03e72776587efc492fad8738f796d85cf473ccb4e34b65cee19 SHA512 87855b3f6e73782f902a7e68a9308849c923316a3fef72899aaedff4164254f70b5f1b986d67151f3360fceb648369b58a279642ed9b6ec1d344a3e66241409a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
index a5a06c63d545..405fd366f61b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9."
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
 HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/jama/Manifest b/dev-java/jama/Manifest
deleted file mode 100644
index a4f8d091c26d..000000000000
--- a/dev-java/jama/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jama-1.0.3.tar.gz 82188 BLAKE2B 35de815f770b192cd1b86a56ddf1919e12675d898ec4473489d3ce2c3899185f9d96eda39b6f7520fc67edfd17fe58b585f788f6a6967220150fc9a334b219ea SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d
-EBUILD jama-1.0.3-r1.ebuild 557 BLAKE2B 1e2d29785a4ef7fab835f29e78a6a0604c91cddc963e81cc3c1967df1fc5c2d4f406078c79b726641a8c383bb5f7dfb0128bc60cad5bd2088a313272b41f7acc SHA512 03451f7a89f194fc5feed9ae19dbb83c243c1fdc84738e85041e675275ccbf83276f33b924f83f604412fb76af5eb0fbd18d2b5b133ad654e69204431937ef73
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
deleted file mode 100644
index c3d99e6cda66..000000000000
--- a/dev-java/jama/jama-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +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="Jama"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Java Matrix Package"
-HOMEPAGE="https://math.nist.gov/javanumerics/jama/"
-SRC_URI="https://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jama/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
deleted file mode 100644
index 9e5e5c46feb1..000000000000
--- a/dev-java/janino/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST janino-2.7.0.zip 992669 BLAKE2B cc9ba79d0fc9af5bbe73f167dee6d15619b40b75852fcc227eaf5399e427cde2aeca4b6ef3ff21f303b71dbc21f432cc3e844583cafce3cb073eec1a1498c45a SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f
-EBUILD janino-2.7.0.ebuild 1111 BLAKE2B 96bba70bbd3777e7bf2732ae7c4684bd6e1f649d2b4caac1f90396f4d613e7971874937bad58354b179e819a10172887695db3f4396597a2a9f06a6eba8a15d6 SHA512 80c05cda932ec89ced7d3d065db2a8f9107c557dd28665c7dced26ee1dc768f144fd7e1c73fc4265b4c1cef01b3de9faa7b267a8dc37d3eccc173f5246924bf3
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
deleted file mode 100644
index 92ea09bfe8cc..000000000000
--- a/dev-java/janino/janino-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +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 examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An embedded compiler for run-time compilation purposes"
-HOMEPAGE="http://janino.net/"
-SRC_URI="http://janino.net/download/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/unkrig-nullanalysis:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="ant-core,unkrig-nullanalysis"
-
-java_prepare() {
-	unzip "${S}"/janino-src.zip -d ${JAVA_SRC_DIR} && \
-	unzip "${S}"/commons-compiler-src.zip -d ${JAVA_SRC_DIR} || die
-	find -iname '*.jar' -delete || die
-
-	mkdir -p target/classes && \
-		mv src/org.codehaus.commons.compiler.properties target/classes || die
-
-	mkdir examples || die
-	mv src/org/codehaus/commons/compiler/samples/* examples/ || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples/
-}
diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/janino/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index d63c03ef0731..f5a9de75ee28 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,5 +1,5 @@
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
 EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
-EBUILD jaxen-1.2.0-r1.ebuild 1913 BLAKE2B b25661c32fe81cfbbedc1cec06a8473c107c8b4e7b854df1d725e97b6211b34bdba4663398d155ce2d5549cba144f4ceddcc4e11d10f0afed2a4ba076f2c046a SHA512 91b9f4fbd7a2f80b6125cceaedb67097f122613143314f81e0b291717241fec783c230067aab717cd7b6ec124cd4a07dc4adf45d9ffe50ac5acbb53e5a7829f9
+EBUILD jaxen-1.2.0-r1.ebuild 1912 BLAKE2B b7c2b6d75ae49f3df6a46c20a23488f9084fc81d39cec91e3d5258c8ba26532bc03c7da45a4520c245a5b9132d40437cf93b0ab7eefa18459401fe6e091ce1e0 SHA512 f9a9252c02312941af0c08073956449834a5baaf19ff0ebe32fd279cda927e0e6b951c928270e3699d3fccf54b8867f5198aec24ddf8977339e78dbad6d3f3d8
 MISC metadata.xml 719 BLAKE2B 81b0a7991de9a06ca79c793dc619356856370488753d22fbfc77d92e5323ab6a5cd489fe9098a60d1de248fa481d906696a20032e7a27972f9630d72a8175906 SHA512 221fb2b9430c909ea27039513feb2c9395992cd67ec087e008cc284dcb3a8d19fd373405c52d59f0ad41cf481586ce58588c04b05e864cc7731d6c4162a3544d
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 211abc53f20a..263da0bf4a88 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Jaxen is a universal XPath engine for Java."
+DESCRIPTION="Jaxen is a universal XPath engine for Java"
 HOMEPAGE="http://www.cafeconleche.org/jaxen/"
 SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/jchardet/Manifest b/dev-java/jchardet/Manifest
deleted file mode 100644
index 1668bcff2dbe..000000000000
--- a/dev-java/jchardet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jchardet-1.1.zip 82782 BLAKE2B 08ceb3119615ab25a43030392ce0114a03b00ae7dd5488cbafac66f36e8963cc200f3c80afff6a99cf0a1f6bdfac8c22a27a5f0d2e4a217443916eda75752cac SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28
-EBUILD jchardet-1.1-r1.ebuild 556 BLAKE2B 99804c82f24dc9aa341886d55ce7a53a01363ee78f59fc5500f4259782e50d30266a06beca56ae6525051b8e399953f46b742a4a92bef1bf7ccc06231c8ed5ae SHA512 4feafe3e025905bf329c8c7c858a76a314b59228928451ebb352ed520c15a86d52972926e57a30f156ee2ca6f2829b0b936e0895d0faa73791edce123e4c17e3
-MISC metadata.xml 315 BLAKE2B af18300a856357a0d2801e6f7674ed89cc4901631611fbd8baa033f2d21dc573ff3685a39e921cdc87abc812a36da67aafb5ab557ad1bdb1e7a5db914c837f08 SHA512 8f90ff88d1166e5ebac797df53bb3e5ac7b604ebaf972035c23fa287da2341ab8dd07c6c610f42de88a2ac82b5afb53af3a12d7288c1a629913a8371642ed0d5
diff --git a/dev-java/jchardet/jchardet-1.1-r1.ebuild b/dev-java/jchardet/jchardet-1.1-r1.ebuild
deleted file mode 100644
index d566bb21eb07..000000000000
--- a/dev-java/jchardet/jchardet-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +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="Java port of Mozilla's Automatic Charset Detection algorithm"
-HOMEPAGE="http://jchardet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
deleted file mode 100644
index e9bb6ac81133..000000000000
--- a/dev-java/jchardet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jchardet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
deleted file mode 100644
index 8527e3c0c63d..000000000000
--- a/dev-java/jcommon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jcommon-1.0.23.zip 1373666 BLAKE2B 23c87cd18339ea8f5991933c1430464ca5a408d4d4afb42847ee8c3b941d8fd7ed9695af74ec9ff7fc5867758b826d49b5def73923e893910efc0a0d77f26f75 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b
-EBUILD jcommon-1.0.23.ebuild 1383 BLAKE2B 67fc5f1f71d9915e062ab99ef5be7196aec2a50a95159fe5384ce0d61683caea394e5dc3528673145e37873b7331a170fbc76326ed056a3d1ede36cbcf51d42c SHA512 e2d8b97a0503ea3cffb721208e698ba1347dd3c0a354efdc323bc81bafaec425d26aeadbd65c254cbb8c7889a34c6afe80d0d028fe6375ef96688d0a029cad73
-MISC metadata.xml 317 BLAKE2B 9a0fbfbde47c05871d15921063944d7e6c761a26cbf6f6845a52f89cfb931d6f056bae3a7af19f5d25b355e9755b313c6be87e08169ed1743e5254d1ffb9a49d SHA512 bb74200b288652a4b942a72ba7034eba3ab54b58fedb8f1bd30c93952710dc32b5586ad92ba75d02941585de365488ebc03a1f80c3b79811602724b161f422cb
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
deleted file mode 100644
index 208f734743d6..000000000000
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ /dev/null
@@ -1,56 +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 versionator
-
-MY_P=${PN}-$(replace_version_separator 3 -)
-DESCRIPTION="A collection of useful classes used by JFreeChart, JFreeReport and others"
-HOMEPAGE="http://www.jfree.org/jcommon"
-SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="1.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"/"${MY_P}"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -print -delete || die
-
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-}
-
-src_compile() {
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-	eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-# No tests defined in build.xml. Let's turn them off.
-# src_test() {
-# 	java-pkg_jar-from --into lib junit-4
-# 	eant -f ant/build.xml compile-junit-tests
-# 	ejunit4 -cp "./lib/${P}-junit.jar:$(java-pkg_getjars junit-4)" \
-# 		org.jfree.junit.JCommonTestSuite
-# }
-
-src_install() {
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.md
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/main/java/com src/main/java/org
-}
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jcommon/metadata.xml
deleted file mode 100644
index 1cf7db5ba34e..000000000000
--- a/dev-java/jcommon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jfreechart</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
deleted file mode 100644
index c38fe5907528..000000000000
--- a/dev-java/jdynamite/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jdynamite1_2.tar.gz 216501 BLAKE2B d945ad40e7b174722dc81b23f50f02c67e92f5ca274a0e6de48e80921d6f3081a4fc41b977ee457e0184d1c628e67702ef93da0440744fe392399e3f65265f14 SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea
-EBUILD jdynamite-1.2-r1.ebuild 703 BLAKE2B d9e9c3c480f6bd93f5eb7ae47ab84a03a25b2898cb7c2e03b3de3649a3a918720e2f3411707d902267467d698b1839e07f72efac60c720ddead0c1f05ecf0842 SHA512 0a874cd9a657e9bc6b43345146094770c28f8854a9af17ca98e03707f8df8585e5d0f4acf34b2bd9c0d5263760e19cff40b3759083c255b30cf580fd17012b75
-MISC metadata.xml 316 BLAKE2B bcd60b570815379802450a0c7723df4ca44a84c64aa6ba86732da60e515fe95108f39a55cf484e849a2c08a2b598aa8f5e1bd07b2f2764b881d3558bec7da2a8 SHA512 d5b4f2b6257f6659e561fd9becbd6d5a332de7df81370abba4a9f4a1a83c1cbe2581ab8481ca0eff311bfe3f61d554fa71fb35f4428355ab1f6318cc49aa59b7
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
deleted file mode 100644
index 484edc88acf1..000000000000
--- a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
+++ /dev/null
@@ -1,35 +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_PV="${PV/./_}"
-DESCRIPTION="Dynamic Template in Java"
-HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/gnu-regexp:1"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}${PV}"
-
-JAVA_GENTOO_CLASSPATH="gnu-regexp-1"
-JAVA_SRC_DIR="src/cb/jdynamite"
-
-java_prepare() {
-	rm -fvr "${S}"/{lib/*,cb,src/gnu,build.xml} || die
-}
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
deleted file mode 100644
index be045c436226..000000000000
--- a/dev-java/jdynamite/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jdynamite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index e684c13a99c3..7c4b6bc4b1c0 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -4,6 +4,6 @@ AUX jffi-1.3.6-GNUmakefile.patch 740 BLAKE2B baeea64e4fadd0d76aa9d4a38fe48115365
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
 DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
-EBUILD jffi-1.2.9-r1.ebuild 3003 BLAKE2B cc6f67a1b539172dd951f084571cc5f308429e1189e613e3700875817556f384d1bd3d27d17c8c66e97ad98c6dc2fe0889358ba8a0201bcb4e327a1f6545a5bc SHA512 a94628868e81d3c1ad2ebea77b9ee4b462d9851d9852f80faaa4ef11030696a95ba1fc9b26f53716dd877213a623bd461415588f56ac1709f63da3e7cd000f47
+EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41
 EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 6c6b7d259e42..ef103551c7d9 100644
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-libs/libffi:0="
 
diff --git a/dev-java/jfreesvg/Manifest b/dev-java/jfreesvg/Manifest
deleted file mode 100644
index 299127567505..000000000000
--- a/dev-java/jfreesvg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST jfreesvg-2.1.zip 2042545 BLAKE2B 702ea55c6e51bca156a41c5e624452fdad8c1a5472c204cbf58f796134ed6027259abd0a48719bbb5f83f6891ab3aec5db58c8726b0275b894065148a07ec179 SHA512 6c1556c640e749778aeb969540db7724895fe2113a7ceea732793730301dd04a1beafef35249b27b75696271bcd67a59236a15c106f7717482561011a1a08bc4
-DIST jfreesvg-3.0.zip 1946062 BLAKE2B 58aa3c95db3a0472de1e2c184f1e8bc9aa72b86f508dd7d41f169f03c8f07380269a36d0a22a71378ab7c2d45427fb479994b907c4e25317794814da69f79d7c SHA512 7d0bdcbf56f0a7110058137d53e291c41e53040cbc19442989a0c6d28f5d6d3ed26ecedbfc947ce845b8a971729e2d784e8ce5a041f6f095ff626a3494a55715
-EBUILD jfreesvg-2.1-r1.ebuild 857 BLAKE2B d21ba43d7e9e6326be9e4fa5e9a80e3522fef691c986f9d6a768a04fa59aff242444081495a367677893f4abb4444bb2c6f5f51f455e41cca2a5e62b1679065f SHA512 f1008bff54e47306623df1a972085adff1b95872192587a5aa361b8cc4f6d2a387cfc1e0c5d7864368ef2bbaf07d1413cabe4ed8d91ef893ed8f446997cb521b
-EBUILD jfreesvg-3.0.ebuild 891 BLAKE2B 5a1549132e6cc1949651abb8804764399109b7457fa5594d2f613c87394c2b27ff8dd1f743f3eca5d45936cc819f9e0ea82904e654fee8ee0a9a16d652872d7f SHA512 23bd9825d7b44024c7218dee3761ea0fae08a8b0c6fb2834d9da2bbdb852573a6248852ede1f38194ac01710055dfba4d66adbb57c57822bc85440b1d5f8eaff
-MISC metadata.xml 490 BLAKE2B 4ba7f55809f5dd8e1c13cd72e94b77a83d4f5c4c846dcf4755d1107f52619b31719b7eb5742807b8e1c361f7bf93a706959a255ee0e86e78acdaf5cc4ff4e441 SHA512 16b27c80f600276a8ebd51e897c125aa77c923afc0f8bb1ec53e6c36c3ee7b85dc9fd3383fa1aaf52641f1b2b692b343513d168a8db9d5874a0485940d5d172a
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
deleted file mode 100644
index 948b007cad2d..000000000000
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.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 source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
-HOMEPAGE="http://www.jfree.org/jfreesvg/"
-SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="2.1"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_compile() {
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-	eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_install() {
-	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
-	dodoc README.md
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
deleted file mode 100644
index 2b3e2fef8407..000000000000
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ /dev/null
@@ -1,39 +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-ant-2
-
-DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
-HOMEPAGE="http://www.jfree.org/jfreesvg/"
-SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -print -delete || die
-}
-
-src_compile() {
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-	eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_install() {
-	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
-	dodoc README.md
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jfreesvg/metadata.xml b/dev-java/jfreesvg/metadata.xml
deleted file mode 100644
index 143da0106709..000000000000
--- a/dev-java/jfreesvg/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="debug">
-			Enable debugging during compilation.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">jfreegraphics2d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
deleted file mode 100644
index 8409743283ef..000000000000
--- a/dev-java/jgrapht/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jgrapht-0.8.3.tar.gz 1268147 BLAKE2B 78b9c6a4787adead9c27a4cf74f9ce821bab1ff35a62828383d058d50e4b568118f54bb0270449d75268aaae4d4d47231349342d064d185b4906ceb6b19022d1 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6
-EBUILD jgrapht-0.8.3.ebuild 1055 BLAKE2B d65974a3acfe4a2e8b80280a0341ef27ecb9dd9437ebc171299471301cb3f2119e0a4de6e174c8189b10bf2699304321c9cb6c8c106e0998fbcc44f27a5f1ba1 SHA512 81e0723609e3bc3ee9e5a1ae6a37056f10a84c32980ebda39f9b05ddd50c66b96203e3dd7e4ecc6025ed408cc497dffb3710cdc985011181dc76a1c0ec27ff8c
-MISC metadata.xml 314 BLAKE2B fb0b2b8158988a76bb6c23ec8d202b48a5a324a40ac91ac35183e9cd275e45b875398399cf2239c69e3ab84cc00b101e0698dfb6360484d42dd333061a4570be SHA512 baed6564a1d789d442559d7d3ff5ff50c07b1e4eb5e974bb1ed14b83c5351d1601625bddec281f1cda822d98c0b130700ef9f65028434aff530617d570939ded
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
deleted file mode 100644
index 1ea27d57362a..000000000000
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ /dev/null
@@ -1,48 +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 test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Graph library that is a simpler and faster alternative to JGraph"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://jgrapht.sourceforge.net"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-CDEPEND="dev-java/touchgraph-graphlayout:0
-	dev-java/jgraph:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0
-		dev-java/xmlunit:1 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph"
-EANT_DOC_TARGET="javadoc"
-
-java_prepare() {
-	rm -rf "${S}/lib" || die
-	rm -v "${S}"/*.jar || die
-}
-
-src_test() {
-	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} xmlunit:1" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${PN}*.jar || die
-
-	dohtml README.html
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/jgrapht/metadata.xml b/dev-java/jgrapht/metadata.xml
deleted file mode 100644
index e5ace7119853..000000000000
--- a/dev-java/jgrapht/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jgrapht</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
deleted file mode 100644
index 3b59718849e2..000000000000
--- a/dev-java/jmdns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jmdns-3.4.1.tgz 665503 BLAKE2B b2ddf4216a39abf8b1fa9629005f83a5b6d3bbc6a2b85fcb716f4591d9435892977086276c1838ff4966d54bb501a589c4eff15948bae4ee7b8d0f035371fcb8 SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb
-EBUILD jmdns-3.4.1-r1.ebuild 631 BLAKE2B 9d94a03b6e27bff53aa7b0c083e91b74400ca71ab9bf4e78e7d148f775c4bedbc0f034347e3c052b8ee8c5415f71c206918e6eab2c3943b396d8026299d74c7a SHA512 8b6697eaec225ec03b51be3159168015866ff8a03b909eff50b619c0925f0b63251fabde7333e3d75309aa43e65227f915ad39df529fe220ac0d0edb709d16a9
-MISC metadata.xml 518 BLAKE2B 13e9230d2196705d41490de5093920cccc838f6d9a1cfae2e698423d267b4bf6a02b67be5f43e285d5f48d52367fe1cddd505a7eddacfa8280efede8719040c8 SHA512 21f3d02d82ff4480ed0fd9f0c8ff41adbaa0b42f7ddfb9f3630c7f537ac9d1e318049f00b2773767e58c6520bb4b02417139852070348ad1b2742c7238722cec
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
deleted file mode 100644
index d33a9ab1c9b7..000000000000
--- a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,27 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	rm "${S}"/build.xml || die
-	find -name "*.jar" -delete || die
-	find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die
-}
diff --git a/dev-java/jmdns/metadata.xml b/dev-java/jmdns/metadata.xml
deleted file mode 100644
index 9431d32002b5..000000000000
--- a/dev-java/jmdns/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-		JmDNS is an implementation of multi-cast DNS in Java.
-		It supports service discovery and service registration.
-		It is fully interoperable with Apple's Rendezvous.
-	</longdescription>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jmdns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index 8c32eba4c674..53abda980a91 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,6 +1,3 @@
-AUX jnr-constants_maven-build.xml 11304 BLAKE2B fad6aa5bfb222be73e0c064802dfabf5370562de03db80c2c35c03423e6829e11622cbb1a87f92929de9a8f2b70c3dfc039071c5e9c1cc5b27e40289a3f92fca SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f
 DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
-DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a
-EBUILD jnr-constants-0.10.3.ebuild 987 BLAKE2B 85c5144a1d6e48e925130158d2f1488394513d525e7f9d122505a6462d9677b19c7c54f217fa8f05b335c8251d2bd8161cb153499247e3777ecaea867a915a02 SHA512 b40296f2991baf73932638a21a03834bbebbdc192f8d4e6c377d51b8c7164182dce34f76b9fde81ef47a1b67013f4d60844ebcab1e9a31b062a27dd622bd0d85
-EBUILD jnr-constants-0.8.6.ebuild 1058 BLAKE2B 512071e039a49fe64ae6432bd51979a1c3e13abf3cd655570f9aba4c74fb66df9eb433014f191d676aa79d7a04ae70394905f72dd812414e74f4d359853199a6 SHA512 d1fe0d566c5b8749bea6015a5cf6955763d187e48d4855147b9660a87dd8f0231f4a678080569f5b0b6ab48024d61948b232a0ef23451420c6969e2ad830d985
+EBUILD jnr-constants-0.10.3.ebuild 986 BLAKE2B 1addcfa23240cea6fed31e32d2fd90eb7208a94dedc612b77eaac5c61e627f87525c57cc188bebde84303f1a92e1d836ebe3044b8af64911679e825ca088893a SHA512 0fc5493a6d907348db6ee86d8e1f03e9cb528dcc013f97ebed07029ec38751a5e20ee71d9147d1edc0775b94e92d229c07f3338d6e0464210ac4f8ca8c2fafde
 MISC metadata.xml 329 BLAKE2B 6ab95abb16b9a4503c12cf6e06ae18a6ecbf217390f9ca6ba52516bedbe0c69c074aa3a01906974cca84efc02751afc2328d51245fce52d86996d64358f1fd08 SHA512 2e04327f332a4a421dcec67655242822cdd5f5ea5a8d2fdd37f24e68069320014a3bda438041f189831ef85087d53b4015c506fae40ec3a7494ef1f1efe41970
diff --git a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
deleted file mode 100644
index 75f8458ee2c2..000000000000
--- a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
+++ /dev/null
@@ -1,259 +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 1/11/12 12:52 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-constants-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="jnr-constants-0.8.2"/>
-  <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.8.2/junit-4.8.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" 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.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <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.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <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"/>
-  </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}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
-    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
index 79937ba00103..03889724207a 100644
--- a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jnr/jnr-constants"
 SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
deleted file mode 100644
index 3f8c33be960e..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.6.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 source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-# SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 681525e15bdb..fd3489644c1e 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -2,6 +2,6 @@ AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58
 AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359
 DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
 DIST jnr-ffi-2.2.8-sources.tar.gz 261959 BLAKE2B 16f7b89c88a61fa07da65d4e5287258f96550b93898bb7313ddd62d1f002276da86aca2c79874eccb466eaebcad5181ff33539996a6558b6d79ce9280cf9c0a9 SHA512 15187d90f15ad82cb6cac0617806ab7d0322bfcb4f44523f2272f93f19ec115625806c9d450bffaa57db32c70906328c8edc905046465b0ec3eb6ff52e500b42
-EBUILD jnr-ffi-2.0.2-r1.ebuild 1474 BLAKE2B 2df6d1c2082afe9b6dd735fe01c790e7be24c5a787d8355a08c0d4667675b7d724c5b8511ac56090e5c3db1c2737c9926958924739e195bcbcb08e4ea7c1209e SHA512 bc809a4120a681aa6cc7bfb40378e2560df71f411c22ca14bad1a07998eaae286d8d3fe8b697354f71652c0497347903e7bd0d0ec783bb7788c57f01caad9fa2
+EBUILD jnr-ffi-2.0.2-r1.ebuild 1479 BLAKE2B 10de36e96180e2943bcf200bc49961c5258cb7dabcaf1536e79bdb2c0c5f58cc023d0c09e591746c889fc86e012c1337ef8a66c6ee8c181e1415a30ebc8869c0 SHA512 0d18e65d626dbcdd69c6f47d21e7505112e3ff98633137c3035d6e5e32536a5a36aed2a333a1f3d34e7da58b4f0e6a2225a6d7f88c3c58a23640170f4a48c9c3
 EBUILD jnr-ffi-2.2.8.ebuild 2061 BLAKE2B dfe1bbdfe2a63a55194bb6352c7de05806ce619ea534d5df55a2bdad30a671a15d366937805f02d4c45a488415621d56276381cd6e6a21173ab0b020a2b288e2 SHA512 ad64a7f90f45a157c9e42eeb6ce4d27a58570354cd1b7dcf92cb4e510390911f67b0014ac0af3ee7653e584ef9b64bbdf265d5cd64ab3f45c54b47305739285d
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
index 20c56e8735fd..2c4a9a83197d 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="2"
-KEYWORDS="ppc64"
+KEYWORDS="~arm ppc64"
 
 # Fixing https://bugs.gentoo.org/736830 would cost too much time.
 RESTRICT="test"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 6e7c87a63e28..c7469767f175 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
-EBUILD jnr-netdb-1.1.4-r1.ebuild 1146 BLAKE2B 00e96bf8c87277a6b93b199195e1dd73fff44bd19399acdaf4aa090380368c76d46883edcee92a27cb218090ee201911665f4a1a60a1968513ab57b03ba282c2 SHA512 23e4ed22fb171fa3a6eedf4d140861633589b91c9abedcde306b95dd7499528879a69f3655af1b978d212d92c96ec2a6b96c7d1fff3e88a3705a9191133050a0
+EBUILD jnr-netdb-1.1.4-r1.ebuild 1145 BLAKE2B ded7e835a1ae0763beb9acfa31e8ef93ae50e961e60a71ed72ad47a79956f32e1edec5ab8ff414700a43444695c34bb83394f8a0e0f3a4be4d4cfdaccd57111f SHA512 554c04ac2e66a4a498e4e7c12391639213c6c5a34a9c21b6aa08c8e84732134da0d20381a94526acc9e17b1b962177e25ec32d253aadeae81c7b4265425b3754
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
index 0445d17f4ead..d4570936987a 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 COMMON_DEP="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 556db3d8e0b4..9c37f69146b6 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,5 +1,4 @@
 AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
-EBUILD jnr-posix-3.0.10-r1.ebuild 1291 BLAKE2B 40d29ee47091ae8e4c6e84c823ae43a85950e8400ea50545a56771fa8e658d6cd6298721af17cb6354a170a97b7c7ee6cf3bbe9cda0c377df7adb378d910ad2b SHA512 82f8d5f9a326076ea8941549f0a75071876fcd47a5a2f075cbbbbda23b9c032b562abd119b945841b6b8ef070f3919801289dc0b3ce0d58ff6f8d6fe218962c3
-EBUILD jnr-posix-3.0.10.ebuild 1245 BLAKE2B 379fa9cea1bf3a8e1dfa79f4d343e6256a337b2aea4490cf24c722361a73a8dea45dae9161b6d22c0741ace715df682710c430589af8dda9075e87cb9b0155e6 SHA512 c6bb0e53e287aafa42a552a4e0e8faa24c559c10b1f181a981c9649fce31bb94cb6d2aaaddbf4a34da6e96f75f669379b398aef1958ba7eac91c020fa22a1089
+EBUILD jnr-posix-3.0.10-r1.ebuild 1290 BLAKE2B 086170dad7dc6fc3d913f16a62b4f5e5fff5d9b8bbe5ba699fbf0ac4d05cc33989d115a0b50259ffa759b373b463b4311fd87fe65cb9573610568fcdb52ca0e5 SHA512 8ecbfe33063041a813cb1977d3347fa7023ffef74e61f3eefe24be1652d8e9f9909ee67d63641fb5dc94a10fddfce40c5e11f1aca11441137da7a69f89f6e4a9
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
index 3c685ec9c53a..287e02e6d650 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="3.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 CDEPEND="dev-java/jnr-constants:0
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
deleted file mode 100644
index 908bb554f1a5..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
+++ /dev/null
@@ -1,53 +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
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-ffi:2"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jsr225/Manifest b/dev-java/jsr225/Manifest
deleted file mode 100644
index a67ae8e5cd3f..000000000000
--- a/dev-java/jsr225/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr225-1.0.jar 58968 BLAKE2B 063cf9c372165a5382345e02cc4a6be9cc856533d18eca86c83c484034f97967e718f408ba701c1afccf8869f35980dba098d837b8cfb6cbe2d6b7adc9c70ef3 SHA512 c7f89904269bb09037599914cc4199b467f9d882b982eeeb7663776b61dbf6868c3aac8d576ca2d8999d0fe3378e3a3896776316c24039487d2501d6e2872712
-EBUILD jsr225-1.0.ebuild 591 BLAKE2B 1952affe734c646a9be11522d91f1a8bac1a0f6c026d9f5bd2baab090733a556b6a5ce6d43df7199943af60a67ae21b26182e05f97c55dfedc2717a642d09786 SHA512 8c320fed17fde4b654b49a1b327179bd39a4ad8f507f5fe96aa5f63c423896514e891b9a90f955090f9c574071154a590f7cc814b1e63dacaf3e1a376850e1de
-MISC metadata.xml 311 BLAKE2B c31537dfb2bfde98d74add9e2949764331123d146e5f30b8a31f9ad9697586848ac073073a56069856f7151aa213e18455a700874c162d743d9d89a417f74950 SHA512 26d5ac20ed832dae782f78a987c29ef86810a9921f8dee496a3046056979776744a1befc3a10ca60e6e351061bb1dd65d5c1194b02229d6a6a3b43edc1e60379
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
deleted file mode 100644
index bef070caa856..000000000000
--- a/dev-java/jsr225/jsr225-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 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
-
-MY_PN="xqj-api"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XQuery API for Java"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=225"
-SRC_URI="https://github.com/cfoster/${MY_P}.0/raw/master/javax/xml/xquery/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
deleted file mode 100644
index 44f32b809032..000000000000
--- a/dev-java/jsr225/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cfoster/xqj-api-1.0.0</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest
deleted file mode 100644
index 06b4faf26978..000000000000
--- a/dev-java/jsr311-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr311-api-1.1.1-sources.jar 70022 BLAKE2B ca1c08bbdc256475adb89642d97ee278f0a26bd1191a29460a928a5148449207e41906eddc7a76bcfa8451cb241230ed8010e261ba8ac37ca0d260d6c4d1a3b9 SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542
-EBUILD jsr311-api-1.1.1.ebuild 481 BLAKE2B 179ced19f3a53bb6aa28125801e7856c421875b157f1571f93a7c985f5ed8cf600791e0bdbf364be6542a66f5345f8a2a8164387b15e60e6c55593cadfd2ff08 SHA512 9fa64ba0a95532e29ba88eb0219e7d6161ef0a8eb2f09f2f61a15a0a5a4ee0499d2b97bf7174010a857a0a5eb6d035145d2b6e5a4ba7c7476a5d5e7bca7232f6
-MISC metadata.xml 312 BLAKE2B da7ab35ce36b470a459b37c199ccaac28e4d3b7eddf56ae2a89ab77ab525cbce71dcaba8433ae916539748776f63db39a9687614db50b824a59f8faead8fb8dc SHA512 3c60911b8d01a6134ea8cfa57eaf796b26453be65fa729e91dcdc00eaa2fa61347d532774f3de2f581ae83f9543102bb86ddaca76543a50ba0e20f4cf515f082
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
deleted file mode 100644
index 0a55c763d1c7..000000000000
--- a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 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
-
-DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=311"
-SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/metadata.xml b/dev-java/jsr311-api/metadata.xml
deleted file mode 100644
index df203e1ca173..000000000000
--- a/dev-java/jsr311-api/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/jsr322/Manifest b/dev-java/jsr322/Manifest
deleted file mode 100644
index fd8210355a2e..000000000000
--- a/dev-java/jsr322/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr322-1.5.jar 86462 BLAKE2B e39aa3573ec711c721ed1cdf6ba3a3d58eb267ff6e05222852ba0d424100dfd9048f39e3f22910e70da60c8cbfff7ecd552488122789ade09a21972d8373e589 SHA512 e96d54f8ac8279e53754a3950590382f7857abf26a0a97f7ad70dc72e0da66c11c537627a329bee943756ffbb4d96e47b0501663b51c3775fb1dd5e8bfe3a9ae
-EBUILD jsr322-1.5.ebuild 536 BLAKE2B 9e1a143300b114a09852793177a2af8758814dbe4d61a0dbdafb859ecab35e154bb81b79f7b9712f4f599216a352ce8a2869bdac733f63c58ebb2c01d63fe007 SHA512 7996cd39fdcf80da79498a55ae1f91b20a6044e049e688d912dbfe523b4b70957c998948f5706be3710cb1e55a3a6a8f20063ea33281a7178a74f98eb5f5b237
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
deleted file mode 100644
index a6017011f867..000000000000
--- a/dev-java/jsr322/jsr322-1.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source doc"
-
-MY_PN="connector-api"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java EE Connector Architecture"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=322"
-SRC_URI="https://repo1.maven.org/maven2/javax/resource/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr322/metadata.xml b/dev-java/jsr322/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/jsr322/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
deleted file mode 100644
index a258fe8830f7..000000000000
--- a/dev-java/jss/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX jss-3.4-target_source.patch 421 BLAKE2B 469c4ba398466b32d77dd3987b2215808e4b1a6675002c2e258b555ea3be34fb64b82cd2c07c50cd076c169e0616af2f09b1202578d23d8d8e39bbb9e66f2d02 SHA512 ced7c6246dd82f7e0c49f2ba403694941e62b5f786bfc3a126f496d44b2c7fd73c4ddbf0f654507ca985d60afaac315be93656e825ec1dfdaf481c4272b09475
-AUX jss-4.2.5-use_pkg-config.patch 851 BLAKE2B c833490023ff63ad6789c03faeb3238e20fc1bdb7804b73edf53696eee859a8837d168b3da72606000b8b41e222439bf5cf863206aac31de60167689dd09a359 SHA512 5087408b0b50f08e919668d193531530c37e9b0a4a27138c76377ab2efa9a00f5489c3b0029a7e75dfe0fee51aa0f647ab9a72c654395fab3445b8edc56f68de
-AUX jss-4.3-cflags.patch 441 BLAKE2B f09b352c6f69005882138126ea36c4ce6282e96630dddee2871a97c93904270690900a2d97f738c57b6b50b44eb13646bdccef1d7c41004bdfd52129f2dbb707 SHA512 83354a23dbe3e0e5874bed2cd9d240231ba37f5f2c886c0ed042e4e34380149c6d400c4206cda223f9d4a24d3220cf77d2408ad452501038351d1ecd8469de2f
-AUX jss-4.3-javadoc.patch 587 BLAKE2B ceebde6b399745acc4e922c078badc26bb3b456ec81d783f7a2a44b71825d62e1f322db9eb7db710bea15f7673fecadc0c066ed4b7cc0da325f5b26c4f5ffb90 SHA512 230b144bab6a3235f70baee7c4f8414f3a23b3ba11eb4ede22c2dd6a02dc718c198bb63df540b6e61a640526731fb788ce05a45cb976e195496c55351cfcdcc7
-AUX jss-4.3-secitem.patch 4251 BLAKE2B caa2f2445c90501aa8a656a7f4cd817cd29af782fa71ba8b9d7b3b59acb5c703b2fd7558eec05bb51974c8aef03c7df9c8a79664e1df86e069bdac71cbd96f15 SHA512 0c17388db50c82d80e77082d73cceadbdd1192936a33591c70e0fc2ce397cababd48eede0f5ab62a8b3c2e34738bbbe93a9e6e7d846d6380e530b5333e42f6d1
-AUX jss-4.3.2-ldflags.patch 392 BLAKE2B c4b93c84bf3ed54c4ae8f885d8995a5226b72fc3358a6a92b6d44becbd21420ea0492ce6c7c453d57eb207e961eaba67b6f3623fb40d2be924c249b0e16fdf72 SHA512 b62a949200b0cb301d2e82f425fe6b593a12c2f1e8f8de970ae43c2892ab1a818d99a1600eee24cbc6da8449153f30dbae91f28edd7be4756bbc66bd1ab35072
-DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
-EBUILD jss-4.3.2.ebuild 2779 BLAKE2B 78d9c4c19b977a3346beb0a8d42f70c4437ae1646c9f0a0557b40ebf0175dcabe5796f0edf14b533d6e94af25dbc4228cf447f4e9521351a97e56f1b8784a673 SHA512 c00aa7a32d424ab09b0886aee25ab94d0a03752fd93d75e674f58a7f48ffdaa21ce47d7a6bc0b29ad349ed2235f29f1a544e4e3c2b6dc905c3f0db40839012a2
-MISC metadata.xml 509 BLAKE2B 84854ccb6eb95c177c5713833f99172ce0cf2bb8d76864feb7c61d3fe909e25cc7f2140421bfc0f3ac75473e5ba9c020f527e31a02f5d120443e25f000bae7ef SHA512 c649b40d09b3ccfa832f885c3c43a649a17550fc7b58563babe6dcab488d68c73b709195b4e4a1bae6151d59113fdb95485aeb7d1dcc2d19a306b6257b2fe816
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
deleted file mode 100644
index 5d5ce6409654..000000000000
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/security/jss/build_java.pl
-+++ b/mozilla/security/jss/build_java.pl
-@@ -190,7 +190,7 @@
-     #
-     if( scalar(@source_list) > 0 ) {
-         ensure_dir_exists($class_dir);
--        print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
-+        print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
-             "$classpath " . join(" ",@source_list));
-     }
- 
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
deleted file mode 100644
index adf2862c90e6..000000000000
--- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted By: Mario Fetka (mario-fetka at gmx dot at)
-Date: 2007-10-06
-Initial Package Version: 4.2.5
-Origin: me
-Upstream Status: #392775 UNCONFIRMED 
-Description: this patch adds pkgconfig support to jss coreconf 
-!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
- 
---- a/mozilla/security/coreconf/location.mk
-+++ b/mozilla/security/coreconf/location.mk
-@@ -67,6 +67,13 @@
- 
- GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
- 
-+ifdef USE_PKGCONFIG
-+    NSPR_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSPR_PKGCONFIG)`
-+    NSPR_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSPR_PKGCONFIG)`
-+    NSS_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSS_PKGCONFIG)`
-+    NSS_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSS_PKGCONFIG)`
-+endif
-+
- ifdef NSPR_INCLUDE_DIR
-     INCLUDES += -I$(NSPR_INCLUDE_DIR)
- endif
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
deleted file mode 100644
index 8b9705ca1e3d..000000000000
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/command.mk
-+++ b/security/coreconf/command.mk
-@@ -45,7 +45,7 @@
- CCF           = $(CC) $(CFLAGS)
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
- RANLIB        = echo
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
deleted file mode 100644
index 87941029bcee..000000000000
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/jss/build_java.pl
-+++ b/security/jss/build_java.pl
-@@ -323,7 +323,7 @@
-     ensure_dir_exists("$dist_dir/jssdoc");
-     my $targets = join(" ", @packages);
-     print "$targets\n";
--    print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-+    print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-     print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
-     print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
- }
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
deleted file mode 100644
index a215bc628ea7..000000000000
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/security/jss/org/mozilla/jss/CryptoManager.c
-+++ b/security/jss/org/mozilla/jss/CryptoManager.c
-@@ -35,7 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- #include "_jni/org_mozilla_jss_CryptoManager.h"
- 
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secmod.h>
- #include <cert.h>
- #include <certt.h>
---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-@@ -36,7 +36,7 @@
- 
- #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
-+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
- 
- #include <plarena.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <keyt.h>   /* for PQGParams */
- #include <pk11pqg.h>
---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-@@ -36,7 +36,7 @@
- 
- #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <pk11sdr.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-@@ -40,7 +40,7 @@
- #include <pk11pqg.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- #include <jssutil.h>
- #include <pk11util.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <keyt.h>
- 
- /* JSS includes */
---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-@@ -43,7 +43,7 @@
- #include <secerr.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- #include <jss_bigint.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-@@ -35,7 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <secmodt.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-@@ -53,7 +53,7 @@
- #include <jss_bigint.h>
- #include <Algorithm.h>
- 
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "java_ids.h"
- 
- #include "pk11util.h"
---- a/security/jss/org/mozilla/jss/ssl/callbacks.c
-+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
- #include <java_ids.h>
- #include <jss_exceptions.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jssutil.h>
- #include <certt.h>
- #include <keythi.h>
---- a/security/jss/org/mozilla/jss/util/jssutil.c
-+++ b/security/jss/org/mozilla/jss/util/jssutil.c
-@@ -38,7 +38,7 @@
- #include <nspr.h>
- #include <plstr.h>
- #include <seccomon.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "jssutil.h"
- #include "jss_bigint.h"
- #include "jss_exceptions.h"
---- a/security/jss/org/mozilla/jss/util/jssutil.h
-+++ b/security/jss/org/mozilla/jss/util/jssutil.h
-@@ -39,7 +39,7 @@
- /* Need to include these first.
-  * #include <nspr.h>
-  * #include <jni.h>
-- * #include <secitem.h>
-+ * #include <nss/secitem.h>
-  */
- 
- PR_BEGIN_EXTERN_C
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
deleted file mode 100644
index 11687fac4a09..000000000000
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/Linux.mk
-+++ b/security/coreconf/Linux.mk
-@@ -142,7 +142,7 @@
- ARCH			= linux
- 
- DSO_CFLAGS		= -fPIC
--DSO_LDOPTS		= -shared $(ARCHFLAG)
-+DSO_LDOPTS		= $(LDFLAGS) -shared $(ARCHFLAG)
- # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
- # incorrectly reports undefined references in the libraries we link with, so
- # we don't use -z defs there.
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
deleted file mode 100644
index 5c5137e81997..000000000000
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ /dev/null
@@ -1,95 +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 multilib toolchain-funcs java-pkg-2
-
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
-# 4.3.2 was released but was seemingly never announced. The binary jar
-# exists on Mozilla's servers but Chewi could only find a source tarball
-# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
-# need to register in order to download it, hence he has mirrored it.
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-CDEPEND=">=dev-libs/nspr-4.7.1
-	>=dev-libs/nss-3.12.5"
-
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
-	test? ( dev-libs/nss[utils] )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/mozilla"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
-	epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
-	epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
-	epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
-
-	if java-pkg_is-vm-version-ge 1.8; then
-		epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
-	fi
-}
-
-src_compile() {
-	local ARGS=(
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR) cr \$@"
-		"OS_RELEASE=2.6"
-		"BUILD_OPT=1"
-	)
-
-	tc-export PKG_CONFIG
-
-	export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
-	use amd64 && export USE_64=1
-
-	cd "${S}/security/coreconf" || die
-	emake -j1 "${ARGS[@]}"
-
-	cd "${S}/security/jss" || die
-	emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
-	use doc && emake -j1 "${ARGS[@]}" javadoc
-}
-
-# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
-# remainder fail due to JSS not having kept pace with the ciphersuites
-# in NSS. There's not much we can do about that. The suite also leaves
-# java processes running and exits successfully on failure.
-RESTRICT="test"
-
-src_test() {
-	# Parts of NSS are required for the tests.
-	ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
-	ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
-
-	# The tests must be run from this directory.
-	cd security/jss/org/mozilla/jss/tests || die
-	BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-
-	# Use this instead of the one in dist because it is a symlink
-	# and doso handles symlinks by just symlinking to the original
-	java-pkg_doso ./security/${PN}/lib/*/*.so
-
-	use doc && java-pkg_dojavadoc dist/jssdoc
-	use source && java-pkg_dosrc ./security/jss/org
-	use examples && java-pkg_doexamples ./security/jss/samples
-}
diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
deleted file mode 100644
index e72f25cb0541..000000000000
--- a/dev-java/jss/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
-
-Network Security Services for Java (JSS) is a Java interface to NSS. It supports
-most of the security standards and encryption technologies supported by NSS. JSS
-also provides a pure Java interface for ASN.1 types and BER/DER encoding.
-
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
deleted file mode 100644
index a98d2c5b35cd..000000000000
--- a/dev-java/jung/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
-EBUILD jung-1.7.6-r1.ebuild 660 BLAKE2B 782c19117a4c1d230c7bf2b9dd0fc884cfa4b25bc1ce452782fd3140b3aefe7a623bbbba6533db43baf9027dab450cf85b3855591c93ef7a3ee0e9b3356f175c SHA512 f5676eaa00faba26d7e9f1dd9227bb9f5798753cc55d1e322e64c0a88ffd284bdb6aafbd5dfa5321060813552056074838480b8fed1a890baae5877d4dc0eb2e
-MISC metadata.xml 533 BLAKE2B 84b5ab4c6a702105e749f0cfe7a43939a368f33ce14c95b758d26235bc6bbac57c800be6d814c7a3749d308eb17fe44a0a830ab511825f87a18d26955ffc84c4 SHA512 859272230068045c18c05a0d40cc17283c322421738d7299df14198a6d4d9be719f19a22b011353152885f4ffd7968f18abb1d9a2dd14260e33b20b10deed592
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
deleted file mode 100644
index 529a37e622f1..000000000000
--- a/dev-java/jung/jung-1.7.6-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"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Java Universal Network/Graph Framework"
-HOMEPAGE="http://jung.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/colt:0
-	dev-java/commons-collections:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_SRC_DIR="src/edu"
-
-JAVA_GENTOO_CLASSPATH="
-	colt
-	commons-collections
-"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/jung/metadata.xml b/dev-java/jung/metadata.xml
deleted file mode 100644
index e0688a63f6b5..000000000000
--- a/dev-java/jung/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		A software library that provides a common and extendible language for
-		the modeling, analysis, and visualization of data that can be
-		represented as a graph or network.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">jung</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/junit-clptr/Manifest b/dev-java/junit-clptr/Manifest
index ce8490233b9e..760008134ce6 100644
--- a/dev-java/junit-clptr/Manifest
+++ b/dev-java/junit-clptr/Manifest
@@ -1,3 +1,3 @@
 DIST junit-clptr-1.2.2-sources.tar.gz 11418 BLAKE2B 9089cb4ce38ac4318ff7a26db978a1b1a9bf70d4efd4c35e94a88a312d05100cd53a2ebe7b162885904e0cec04a513393e3e5a137ec3ecba684b70653cef22e6 SHA512 28400aca95686d67bb81c7ce8fd0bd2804ec33cabc86aceb01cbb2fd42d89b3c4b4c5f3a1670ecd3d0b486a087ebbd3e7b41fd18061c0653246b17bae557032d
-EBUILD junit-clptr-1.2.2.ebuild 1143 BLAKE2B 8d6f25accab6c8c20ec234df3558d760a00a527e695378ede46f7333771e44a6f34088644cf032d72d0c2a0e1342d95ce5b2868f634c7bb512d480e348c4cf65 SHA512 b4a367579e8021bc3fb25f3915a80970936590b2c23eb322556aaac6babee5605eed63c618ba41680e93025de2605e17caf693fc436e8a432a4cf934fa20da8b
+EBUILD junit-clptr-1.2.2.ebuild 1142 BLAKE2B 01179f8038a70df491ead451bdab3c822b787c3fd41e3f6c75a42b61eef0d6fce0f9b047836be186721d4c7bceb3830ad3c022c419b342e5fc56da6c97950db2 SHA512 951c845802b11dfe4cfa953246997768bd1052f5e08daee42b805707fa5784033f65f22f25459c447bd476305b83f4deaa0767548168296160f79acd560cf89e
 MISC metadata.xml 414 BLAKE2B c9f78424051f0f72a7d80dd49f535369e04fc0b1b472b6963c028b331598de9f81bdcdb630d3daafc6eadcb92e4e83b0baeabdcf77d49c06ccaf94c1d9ca46d4 SHA512 f6939cdba0d7ec03bdadd7b183324f29d8a5d6fc54a4cf0517da23c97a31f5e0701d361f6972195d723d136e3c6e7df312edc3535f402b35c3e5016ce3a6f0a4
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
index 9a946560a51c..e3c61f82a351 100644
--- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\"."
+DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\""
 HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
 SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 3c117b49b716..91ce455ae8d2 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,6 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r2.ebuild 4300 BLAKE2B 0fe18858265152bb9ee70f08dfd91ef6e11772b6f418d6babf003a609fb287ef3ecdfa58d4328d139da2b635317f0d58896816db6b6118a1fb9e1ebb93b964da SHA512 1a19bfc4b4cb676d9336d7ed3911a2cf816ebc7af6abfe9fbe9ad259d4e96e39d371cbdbdbe2790c372ea443ab60ae8d0ca7406d382f97676d035485f669241a
-EBUILD jython-2.7.0-r4.ebuild 4287 BLAKE2B f5f2c337993a92e0aa635dd086cc4f27e7a82657cd486cde2a5a4e7303198d4694e7d3d3967368823a355761b33bab3702fe91b56ec5940a31f19771a5c5c344 SHA512 046257a31b38ef29aa4f8dfd962c1bba65f6dba37b2c45c0656d3f064b0c8336de30f21c4044f36a52639ad67dd3b4c034f758e73c6278a003437b32cb5fe5c5
+EBUILD jython-2.7.0-r4.ebuild 4292 BLAKE2B eed667f0e6c069444978bc4ba013b321f11ce9e73cab284c1ac95d1cbed5dc66358ebce85382703ab2ce7b8752ac4976e01861f1f245dec55d013780d616ce13 SHA512 c5b73640dc31a4b72d2ff54213921747770bdff7a9ce35969c5bfa000ccafe62480b53ae2fb1c6d3089764fac77d652f023ad889922a90af372113349e64bba8
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
deleted file mode 100644
index f4ecf1593584..000000000000
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,151 +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 eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
-	dev-java/netty-transport:0
-	>=dev-java/asm-5:4
-	dev-java/commons-compress:0
-	dev-java/guava:20
-	dev-java/jffi:1.2
-	dev-java/jline:2
-	dev-java/icu4j:52
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/ant-core:0
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-	"${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
-	default
-
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	# needed for launchertest
-	chmod +x tests/shell/test-jython.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# apparently this can cause problems
-	append-flags -fno-stack-protector
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local instdir=/usr/share/${PN}-${SLOT}
-
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto ${instdir}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dohtml -r dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	# we need a wrapper to help python_optimize
-	cat <<-EOF > "${T}"/jython
-		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-			-Dpython.home="${ED}${instdir}" \
-			-Dpython.cachedir="${T}/.jythoncachedir" \
-			-Duser.home="${T}" \
-			org.python.util.jython "\${@}"
-	EOF
-	chmod +x "${T}"/jython || die
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
-	python_export jython${SLOT} EPYTHON
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# some of the class files end up with newer timestamps than the files they
-	# were generated from, make sure this doesn't happen
-	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 424604dcc202..06257d2dd02c 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index 0e83552228c6..1829ed1eda79 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -2,5 +2,5 @@ AUX libreadline-java-0.8.0-gmake.patch 367 BLAKE2B 149491acf9d5383fe095a8533b6ff
 AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
 AUX termcap-to-ncurses.patch 502 BLAKE2B 4695fdfcb2329e8f2ba555fc06be7e9b3d1039509e046aa1059e8bd954840f641d1b0f8be7dff04850ef5dd54435a204cfe468e778f4767f1a8c6ddf1391cef1 SHA512 a7d157fe3455b10641ea15285ab610a1ef3d4c8b8906408e9caa483f8453c96143e02dcdd193bb11514a4e4c1e53c810de5346e88ea843ad39166a624c33f8f9
 DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r5.ebuild 1401 BLAKE2B 6b0a9a489e55326bec9b2bd7a20d395538a4e32ca811379554491b89804672f6ec66ff4ef83b22a8d52c45fe1697031bc6e7b0a1b28e2b9b45981cfc601182ff SHA512 b9ae06546b2860a3145cd2f31e67c7ef1c826f5896f898ab914ed5c7b97e92248ee1713af1a99bd4497c0228069ade1a4a09315dba3edfb9c724ef0755d5dd25
+EBUILD libreadline-java-0.8.0-r5.ebuild 1264 BLAKE2B 496df754a1a4e06fb0e3f5fecc99459178a510e5b935d4dd6ac619f27050239b24f1c8680f1b4e71075cc9e1e1672480c75f64abd517ed4ec92c5b9843583833 SHA512 d7d62621f63661971ca6256dd278f7ce80c69dc6496d45aee46a4840034458ff723e53a58afb92b3eb43ebc6604aac1f590ba0071535687e06be271ef661caaf
 MISC metadata.xml 320 BLAKE2B 2bd0d1c0fed3e404aa3046a37d3a5575b7b3c04d6108ca5f039edd31a19df3f02d5a337f3b1dfc82463d2dfe816db53b31aced60cc894a833a00f2c69e58f97b SHA512 492d7ea973a27f3864b8386b5464f0a21e54b689c34cddba54c75199b0b523dec5237581fa06fde57724a0b04c8b4a4475dfc9b87e28e7477968c8db23f1b0d1
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
index 32411ad2c864..7df017e7b4cf 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-IUSE="elibc_FreeBSD"
 
 CDEPEND="sys-libs/ncurses:0="
 
@@ -43,10 +42,6 @@ src_prepare() {
 
 	# See bug #157390.
 	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
-	fi
-
 }
 
 src_compile() {
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
deleted file mode 100644
index b04bf43c759f..000000000000
--- a/dev-java/mojarra/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mojarra-2.2.12-Util.java.patch 1196 BLAKE2B ce5eefa43f1531a2ae0f2bec2644c25daee9529f972eed974ac3b5ca2c40248a2e440a690eb9240069fd39795099a4e9df18c0cde8b2e2a2b4080e510297797d SHA512 b3f2f1fb0f7541eb5fae494d3a0f254553aaed7de2016f5bf8f4433e88ce9cfb59cae6d6e3e169040b77ba1ae9038beaaae2591610a71f0fc194ac6fba295732
-DIST javax.faces-2.2.12-sources.jar 3105808 BLAKE2B 347daf8b44171a94e7ebf09c8ad22b1b20255355f589def6c537c49e37275605caf80f219be21dd8561597c94c15e6fe2cc0c0c713297ceaf8d6be669b6a6e78 SHA512 b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
-EBUILD mojarra-2.2.12-r1.ebuild 1238 BLAKE2B 17c0a8b66fdbe8dcf56594ba2675508c6079715f01bc70a2f5ddf9ad32f5168b449976bd3b77d7226d3f4cd3aa99dd5d25f209f3f3e286cf2cd48c82a0386e94 SHA512 4453e29687ecd426d1df64e8e010ed4629d7ff9e6faeadbcb6daac24dfc578cd93192ab1e45443a83dfa94e5f144c2cb1fa6602be17bb3ccefbad8140526724f
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
deleted file mode 100644
index 23033f652969..000000000000
--- a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/com/sun/faces/util/Util.java.orig	2015-09-03 14:43:30.953486000 +0000
-+++ src/com/sun/faces/util/Util.java	2015-09-03 14:43:57.692486000 +0000
-@@ -354,13 +354,15 @@
-         // as the same adapter in a standalone program works as one might expect.
-         // So, for now, if the classname starts with '[', then use Class.forName()
-         // to avoid CR 643419 and for all other cases, use ClassLoader.loadClass().
--        if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
--            if (name.charAt(0) == '[') {
--                return Class.forName(name, true, loader);
--            } else {
--                return loader.loadClass(name);
--            }
--        }        
-+        //
-+        // Disable Groovy support.
-+        // if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
-+        //     if (name.charAt(0) == '[') {
-+        //         return Class.forName(name, true, loader);
-+        //     } else {
-+        //         return loader.loadClass(name);
-+        //     }
-+        // }        
-         return Class.forName(name, true, loader);
-     }
- 
diff --git a/dev-java/mojarra/metadata.xml b/dev-java/mojarra/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/mojarra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
deleted file mode 100644
index 735e0e7b91bc..000000000000
--- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/glassfish-persistence:0
-	dev-java/glassfish-ejb-api:0
-	java-virtuals/servlet-api:3.0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/validation-api:1.0
-	dev-java/javax-inject:0
-	dev-java/cdi-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="
-	glassfish-persistence
-	glassfish-ejb-api
-	tomcat-jstl-spec
-	tomcat-jstl-impl
-	validation-api-1.0
-	cdi-api-1.2
-	servlet-api-3.0
-	javax-inject
-"
-
-java_prepare() {
-	mkdir src || die
-	mv * src
-
-	# We *MUST* bump Groovy to 2.4 at some point
-	# to make this stuff work correctly.
-	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
-	epatch "${FILESDIR}"/${P}-Util.java.patch
-}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 5793df7f23fd..fcb6f435246f 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-common-4.0.36-r1.ebuild 1902 BLAKE2B e55144811f5420fb32aac5cb0d8e0995d56567926e1afbd027348db3c7ba58815ef91786d7ec5c9702f2641427357ddee9f07512d44e00245eaba22c5cfad348 SHA512 402056e0a715a97af66ffdbadfa850dc2913c36ae481d474a12eec64232e56aed168744432a03eeafed8207e48e4380a7c6c28096f38265d7ed4b7d2d244647f
+EBUILD netty-common-4.0.36-r1.ebuild 1983 BLAKE2B ae0ae050a9a955247ff4f269bcbe9141d6de1400725aae106109cff5cdc98450cbd3721586fe5dda972b030ad0004c1edca3928d53b264f2d8b629010efe7780 SHA512 87903e87630ec96c46594e969405b95ed495238172682ecb0299d56ae084d8f0a03e0bc09c0ecbec4c1b4c85e516b53fd35ff21d9474b8bf558ae17fbb3a2c42
 EBUILD netty-common-4.0.36.ebuild 1604 BLAKE2B 1fd6224706f910a51e93b64603e2866912893b0083bdcb1ac4a4171a5bf2e12b772663120c8aa80e167478f3c40c5d76ba44609f2760e31e33463e6e169e2626 SHA512 ac48ea4c6910645f0db1831f41f49ed7ed304ce26267c3311fede9d70b3694f55438d2cd207a48aade49148d7412afde4eb79529c971ac7a4552da9f4f344742
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
index 74b75f768b49..064d971361f7 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
@@ -16,7 +16,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+
+# Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221
+RESTRICT="test"
 
 CDEPEND="dev-java/commons-logging:0
 	dev-java/javassist:3
diff --git a/dev-java/neuroph/Manifest b/dev-java/neuroph/Manifest
deleted file mode 100644
index b33c6097800f..000000000000
--- a/dev-java/neuroph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST neuroph_2.4_nb.zip 20050658 BLAKE2B a05e9feeb7c0dd8dd505cc9f85f33f40058b26521d9a80b00991ed84cb150240caedf6c00bcf4a7562f5559a6e5efeac7d150017a17c882e2119e6c3f4b35e10 SHA512 9c675f0d2194c5c1b822af8adffd8120f97962d22eb8e99561cfc78f2d87bb76e73d335c1c8ee5278964f3717bfde41c8ae91527e78efca63f5914529ae6d61a
-EBUILD neuroph-2.4.ebuild 856 BLAKE2B 4c1f02ae7554ff9ba21a73f36e4d427c30cbb557d221c59cef6bfddda375fca9715af667facdb2b993aa00beb7cce740e90c25f961777bc924e901c7b8301385 SHA512 7ed88d6a86a1ca147fde7bb06c655d6193b0ef9b9a12d588bfaa53af361e821debf5a4fcca71fbfefbf9694d382d550dde9a5dec4c4bb66c72f5a7d3fe7f9c23
-MISC metadata.xml 314 BLAKE2B b7bbd1ce14b156a6272572aa290b61d6385192ebe6a12843bd8c9c73a16c6c4a637c8201be397d45ee1e93d7da05731f327a58a3613a382fef3a282cb3d7b657 SHA512 173b9bfedb16b1ee4a03ba96c316766d74a8b721f72b4f2cb3c740a1c44c2670fd65aeda1ffa5452b4944fd908ba6e3eb74ae18f6e8ae920f4b86d5608858bcc
diff --git a/dev-java/neuroph/metadata.xml b/dev-java/neuroph/metadata.xml
deleted file mode 100644
index 0d7bd436c24a..000000000000
--- a/dev-java/neuroph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">neuroph</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/neuroph/neuroph-2.4.ebuild b/dev-java/neuroph/neuroph-2.4.ebuild
deleted file mode 100644
index c2bd142ce233..000000000000
--- a/dev-java/neuroph/neuroph-2.4.ebuild
+++ /dev/null
@@ -1,39 +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="A lightweight Java neural network framework"
-HOMEPAGE="http://neuroph.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_nb.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}_${PV}_nb/${PN}"
-
-java_prepare() {
-	find "${WORKDIR}" -iname '*.jar' -delete
-	find "${WORKDIR}" -iname '*.class' -delete
-}
-
-EANT_BUILD_XML="nbbuild.xml"
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="javadoc"
-EANT_EXTRA_ARGS="-Djavadoc.additionalparam=\"\""
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/ognl/Manifest b/dev-java/ognl/Manifest
deleted file mode 100644
index ac8f32cd029d..000000000000
--- a/dev-java/ognl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST OGNL_3_0_8.tar.gz 3564389 BLAKE2B c39c5d4e51727d0a0b12b3908953ff01a9dd6458a5d6b6b6c654a860e4c0d1f4414fb3b79288c4ef0a86fdcdcbf3666c9af4c05a39ba85ff593c021319e6fb68 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6
-DIST osbuild.xml 5939 BLAKE2B 7d34f6713a53cddc17d526af7bf30fe03c13897fad4e02b87454811a1943f7aca03abd9fd889ed3566484252d3076007595fd4c85a0c9b3fea823b5ab18acfda SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416
-EBUILD ognl-3.0.8.ebuild 1081 BLAKE2B a49434435a9b037592b3cde25976ae0c87a005f45f193f43fb43b0d98c2698044bfaa214d72e7b04e64e4c6c9ccb728a4b4c5ec7620616f4269e9af9924c9e8e SHA512 f352879f869a3f89d251db0a49813f93e339618518e017cecae299d18805d4b3e9aeaddfc017cd74416f886ca6511aa0701a4bbfa56d6a663c85ef164ad73381
-MISC metadata.xml 325 BLAKE2B c4dec644f82bac699fe9b69224ba804c65005aa05616c58f3825dff44d0f8589ebd87d615c5382f5fc5bc582d55a0854ff9daf9626c53c46d255c80396e41469 SHA512 398a0518aef7e98c1411642b2f6a111a73404e23a06b52eb46c8b9b523ca2ca1ecf56e28d8b879277bb3f800d9ff295c0171142700025e642747c610e72638e4
diff --git a/dev-java/ognl/metadata.xml b/dev-java/ognl/metadata.xml
deleted file mode 100644
index 4976911c999e..000000000000
--- a/dev-java/ognl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jkuhnert/ognl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/ognl/ognl-3.0.8.ebuild b/dev-java/ognl/ognl-3.0.8.ebuild
deleted file mode 100644
index c3d11389846b..000000000000
--- a/dev-java/ognl/ognl-3.0.8.ebuild
+++ /dev/null
@@ -1,52 +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-ant-2
-
-DESCRIPTION="Object-Graph Navigation Language: get/set properties of objects"
-HOMEPAGE="http://www.ognl.org/"
-SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
-	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
-
-LICENSE="Apache-1.1"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/javassist:3"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
-
-java_prepare() {
-	java-pkg_clean
-
-	cp "${DISTDIR}/osbuild.xml" "${S}/" || die
-
-	sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
-		-i osbuild.xml || die
-
-	cd lib/build || die
-
-	java-pkg_jar-from javassist-3
-}
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar build/ognl-2.7.2.jar "${PN}.jar"
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 38214ddba0c7..58dbd04e3942 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -20,7 +20,7 @@ DIST openjdk-jaxws-8.312_p07.tar.bz2 2544672 BLAKE2B cdf1e2ca85a91163599d4ce9473
 DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846ee2d76e461939c5eb9c458c29ddc9c854f5278d464e3cc98112976b2b34268fa5a628e21183b8ea117eb53a805494182ef22 SHA512 cda0fcb171fec3d652340475c91b2c9099d7cb951ca352122236648272e94ccdf153bdf616cb772185cd7c9300b6e6b10490082ed5887d83e368edbefe2a4f8f
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
-EBUILD openjdk-11.0.13_p8.ebuild 8055 BLAKE2B 89cfb1296b197fa9645a2b515c1593c9508eeda9ed86b4c33887abbda7028f96cb9186f950408050e41745036b27531ee7426d3db592174a5eefc47c7ed9ed1f SHA512 704e720f8d43b857aa4e6fa4d417ac0670d7fefaabf04a093d989ac8c55b5c7c3569b651fb9ec5173ed176b7b4eba441610bd11e32ac3573471cd01f76e1486d
-EBUILD openjdk-17.0.1_p12.ebuild 7798 BLAKE2B 82c6eb4714f39bb960dce03aadf914e07bc5ba51e6d6795f52f32fe4893128976ef5aa47095240daba19571873435eba0db2da164de08efb01ab749b3cac8d20 SHA512 e059d74bb5475187bdf5b25748ba6e7402738aa86e0c489e3691211d9e923121a47ec44680bb5c1e9d40cfbc0973d99a5ad3777416b20c910fef1b854df9bfc4
+EBUILD openjdk-11.0.13_p8.ebuild 8113 BLAKE2B e1d69fa6d069b9670ab22c047d00e1c63c77f6313e5e3642150f2ed7c85dda480f748bcc88e27ccff0b34d9b9cf122529fe92e087228b2b1563eb4c29da6cfb4 SHA512 206cb6c0dafb2d410d98e5316d66bca9a47f1db12b4d6159ce9aa334e560727694d7e600be77b1df0acaba53e022816734483bbbde6c28e67370481d38bb4efc
+EBUILD openjdk-17.0.1_p12.ebuild 7856 BLAKE2B 068fee5fbb84db490521cf628614a24f796f485d8ed6d5b5e6d45d6e1607c4e1a1b2838d888a8e02cf1f7af9ac8232d76ddcb3790850851e60c6743195457541 SHA512 55edabf0d9bc980c8ea6d56e4fce65ce911cc02d7bc9793658cd72e31d5d7e0da4b96e3acff8cbbff67c776dccd78f95da90268e4fecda34779afcf40a369a67
 EBUILD openjdk-8.312_p07.ebuild 7400 BLAKE2B ad43ad78fb789a080b35a78d932ede47359f2c810122982d23c6974f1d491ecf229a04b454518e8356a5d606c7c59e4d8ea35535d00399985570bdbb526f07a0 SHA512 d520d183f5341f78c0332bf18a9acc8f70bb27cdaee8344c9b18313c0c990d94f06b252c5f11be5666d561bfa452d74ca100dc647eafa967ae280b49ee26267b
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
index 6adabb372624..9a2b30aa4483 100644
--- a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
@@ -211,6 +211,7 @@ src_compile() {
 		JOBS=$(makeopts_jobs)
 		LOG=debug
 		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images product-images)
 	)
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
index 9491e94edeca..6472dfd14950 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -205,6 +205,7 @@ src_compile() {
 		JOBS=$(makeopts_jobs)
 		LOG=debug
 		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images product-images)
 	)
diff --git a/dev-java/piccolo/Manifest b/dev-java/piccolo/Manifest
deleted file mode 100644
index a01b3fbb0668..000000000000
--- a/dev-java/piccolo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST piccolo-1.04-src.zip 252316 BLAKE2B 04e0ba00f0b79880a100a1b904d06715a793f891af9d59ffae15579c59fd5ec2ef313241cd9d28975244bb08f2ca00b586e3415d526d47444ab84e99078c0399 SHA512 fa0809e8d9eb43713144bdf193975c62344269bc1b24d12159c98c98776de4633c95234bbbb023d445e00786903fcd9b49d37053f03d8d6a1e2c84b93668f947
-EBUILD piccolo-1.04.ebuild 638 BLAKE2B 9bd7f798a5db9e4c78e8f7ebf52d383435bf4e0e005b7ccda5b1be7745f0d3af876c0bae9cdfb9edd8d77ae707446cf3d1774b63ad648d8b5e68a462d27fabf6 SHA512 8940b9a289161a4046073d7bb99a25d4d271f760a09c1625642caceeea4df923756f583fbbe14a5ea92bcdd31552b92c470b806aabf2005e2f3a1ec403c9b9c0
-MISC metadata.xml 314 BLAKE2B 98a16eb842db1b9e15786c80ce9d81b2cb4a23346bfc7b2374943ab91998022abdce164679865f1efa9612cf99665673a3617c3b4dd0828b7d4a78a9bb3e3653 SHA512 634f986321bc284896fcc1c12205a4842f87828f0a079676eaf8b96bc7087c8fd2a9396fa937d438067b6b39312eb4a10f4790d483a8d4fc06692f7a90e01a3a
diff --git a/dev-java/piccolo/metadata.xml b/dev-java/piccolo/metadata.xml
deleted file mode 100644
index 37a940d0a14e..000000000000
--- a/dev-java/piccolo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">piccolo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/piccolo/piccolo-1.04.ebuild b/dev-java/piccolo/piccolo-1.04.ebuild
deleted file mode 100644
index c8224f463a1c..000000000000
--- a/dev-java/piccolo/piccolo-1.04.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-ant-2
-
-DESCRIPTION="A small, extremely fast XML parser for Java"
-HOMEPAGE="http://piccolo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-EANT_BUILD_TARGET="build"
-
-src_install() {
-	java-pkg_dojar lib/Piccolo.jar
-
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc doc/javadoc
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/portletapi/Manifest b/dev-java/portletapi/Manifest
deleted file mode 100644
index f67098858804..000000000000
--- a/dev-java/portletapi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST portletapi-1.0.tar.gz 212229 BLAKE2B b1efcb7f78d056e6c4c9ed26bd6cbedd0ebcf0e6cc164f862bf3acd6e428feb8f373b3d313aa1cd934edbe9e5af98219bdcf4d173eafb6fc4b09bc5fdd1710bc SHA512 e47da8672be075036989774c90d7a512f7354e090eab3685af90295f07c2842d37a858665a5a2aa3b378e0172c65cbc520180f89e4f08673baeaf19105c0661b
-DIST portletapi-2.0.jar 124636 BLAKE2B f885bf1d042d0eb3230ab2588aa673dfc4fb4da7a8bca577abdac0eb31e9298c76b0600c1a7266d6ec8b072e4b89cafb08c60f4f1de0f5f878bef412a168ff0f SHA512 cf02030850d746b19b85bb3aa204fa7602af47fdda70d5be4c317dea01939abce96915d08186ac876b3081cd8023687e9c4bcef6f4f9a28e8a3456eaa56c8d8f
-EBUILD portletapi-1.0-r1.ebuild 467 BLAKE2B 8a33918de4973ccd714db16c67f5c628b04a9c74a03424ff5ae36b4abe09af90d0b64182978cfaffd91b32b5e07fdb42d6fb6dd9c1da636479c3dd6720d9e446 SHA512 68d8b78c0c0774e0970dca3e7b3c9402587509e827ec715ee0dd89af9d3a0807861f3f973ed1728efe103900970bcada510813e4a1d6d899e66ef5bc1d8c376b
-EBUILD portletapi-2.0-r1.ebuild 764 BLAKE2B 76c0e24366b288b65655d99d7e037c5662de3ba443b21c51a4eabb19762cd3a88b8067158fc628aa8142a7fc60261f86a804349718cb75abd148cc3697d76d64 SHA512 9aef2dccde8c2d03f2b1a5f218a9901f7f8d52df1187501fa74c1c18b9517ddcda613114cf56961eb8559ae1c090ceeb99f2e8113b04ddd5f84d15a22481e1a7
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/portletapi/metadata.xml b/dev-java/portletapi/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/portletapi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/portletapi/portletapi-1.0-r1.ebuild b/dev-java/portletapi/portletapi-1.0-r1.ebuild
deleted file mode 100644
index 6ddc04673e50..000000000000
--- a/dev-java/portletapi/portletapi-1.0-r1.ebuild
+++ /dev/null
@@ -1,23 +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="Portlet API implementation of JSR 168"
-HOMEPAGE="http://portals.apache.org/jetspeed-2/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6"
diff --git a/dev-java/portletapi/portletapi-2.0-r1.ebuild b/dev-java/portletapi/portletapi-2.0-r1.ebuild
deleted file mode 100644
index c4c81fe914f3..000000000000
--- a/dev-java/portletapi/portletapi-2.0-r1.ebuild
+++ /dev/null
@@ -1,36 +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="portlet-api"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Portlet API 2.0 developed by the Java Community Process JSR-286"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=286"
-SRC_URI="https://repo1.maven.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/tomcat-servlet-api:3.0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="javax"
-JAVA_GENTOO_CLASSPATH="tomcat-servlet-api-3.0"
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index ca6ab681b0a2..a230405b72bf 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,3 +1,3 @@
 DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
-EBUILD randomized-runner-2.7.8.ebuild 1479 BLAKE2B abab28f7fce02837dad4107cbc562b9b0283dee842840b03b7eaa726ee8781517ae7b8472e9f8a4e092fb86429cf0677816a4d22b1b92677dabc9752bf8728ed SHA512 897d847c369267db9ddcd1f677e7f3b08d10e8799f60dfd5f3681509e5b3decf91f7fde138d20ec23085ff4ba5ea81612c12e0d6c5d82d5f1c224a06ca2250a5
+EBUILD randomized-runner-2.7.8.ebuild 1478 BLAKE2B a5343169066ccd6e511864f3ba7dd60325d9d9e706f461d9d7e908bc9a46e7a3be616bffa63dcd158bad1dda108f4f2b5db88b0ba49e25172e67527fd9f1f7e6 SHA512 864f760005e08b96297e72bf13f33a4f0d01fc0b77ba9b1ecd309bdba189d5fe90ba41b2db4d0fac37078846848327655f267219a8e0a7b9c6a9698324822b28
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index 638cef4a653e..599c16068738 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness."
+DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
 HOMEPAGE="https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner"
 SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
index 1035e12672b9..c72106f3057f 100644
--- a/dev-java/rat/Manifest
+++ b/dev-java/rat/Manifest
@@ -1,2 +1,2 @@
-EBUILD rat-0.13.ebuild 659 BLAKE2B 51f0b992ff7ee1bf289d39ce9c2dad1e794f95c7caca2063c4f54a3febe1466f031e0a68e3c634f1a80881c032317b63ad181af4dc4088a701e46fe6f30886dd SHA512 ed9676736f720cc6b9d6727f070f7ef9aa0fb7efd6d042b370553eac76b4876cb83b516915d600f0bb1e41cf849bfc7e113214a7bb4e4889f052f2256043d8ed
+EBUILD rat-0.13.ebuild 658 BLAKE2B 7ab35a4f702208d77255f78f104504b79d64cb3b675bc4dddd532d8d107842c1473b9fed641dad98961c7c58e820fbb90e93871ebce9dd3e885666286095eab9 SHA512 0be0e32e816a220a473f6c92a85a477f1078e79dee648b5a4ed36fa9019bc1582115860e3359a56a4f52febca58cc5b94549ef60313f3a5e4b96f53c569293c3
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild
index ad082bb240bc..2d6facdeddae 100644
--- a/dev-java/rat/rat-0.13.ebuild
+++ b/dev-java/rat/rat-0.13.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit java-pkg-2
 
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
 HOMEPAGE="https://creadur.apache.org/rat/"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 41d593e1e95f..9c02a85efdb5 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,8 +1,10 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
+DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468 SHA512 498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
-DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
+DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a SHA512 649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
+EBUILD resin-servlet-api-4.0.27-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
 EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
-EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
+EBUILD resin-servlet-api-4.0.46-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
index 0263bbaf7018..4e73714c0d20 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
@@ -1,33 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+HOMEPAGE="https://caucho.com"
+SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.1"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/resin-${PV}"
 
-java_prepare() {
+src_prepare() {
+	default
 	cd "${S}"
 	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
 	java-ant_bsfix_files build-common.xml || die
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
new file mode 100644
index 000000000000..4e73714c0d20
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="https://caucho.com"
+SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_prepare() {
+	default
+	cd "${S}"
+	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+	java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
index 8d41dd2ddd10..8a1af59ec474 100644
--- a/dev-java/spec-alpha/Manifest
+++ b/dev-java/spec-alpha/Manifest
@@ -2,7 +2,7 @@ AUX build.xml 1397 BLAKE2B 12b251335c0b4303eced7a3263d20fb69da00d4856bc5068b8d91
 DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
 DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
 DIST spec-alpha-0.2.194.tar.gz 39101 BLAKE2B 86de07fd83495b72d3b7d85b803ee9ecafba9a72d8541b5c62f22ad32d4e16b0c7be758ea8d30b743eba6fe994e09898e2f59b2b720913e7e1ab3732b496423f SHA512 3170883c1d62acf9af1435a5ca1ced34a318c53d1cd443d58a74afdcae4888553b9dba91fb81ccea8824c3a0c2396a0efbfaeb8ab408d8bbcf1aea0d3da9c82e
-EBUILD spec-alpha-0.1.143.ebuild 869 BLAKE2B d901bd0b70f0312d0e4d581b45d7d6350265200533dd6bf157705aad03ea3878e772a8995d0054cdb928a8ee45d92d2c47c46c2989472e8f7500c641729f649e SHA512 efc9183c36885f20caba13f61514afc0f2b05bb663bb4790c779be15a8c82a8a08b99a64ff30c8a37f673fa1c55dfefa4a267a08adbffe30f0057aaf8483bebf
-EBUILD spec-alpha-0.2.176.ebuild 869 BLAKE2B a67b4f7a48c6ec63f39c474e57734c255be135ce0b400f8e7c958f1dadd7f7a7d46aae1fd4d7d298fb7083fcebecde093f987a6426c0b8975c2b5176530311bd SHA512 ffb2c5f5fae16ca5f18bd439b4087eda56f0c4aabaffbafea253d76e10806790558c573716cba07c29fcf2b6fa03a12c5a46525654e0d96c7346a9a16205a2ba
+EBUILD spec-alpha-0.1.143.ebuild 868 BLAKE2B eebb6f5c7121daa14a55ea40ea277f5f5d678f1725a0b44504bae6259a7d68690abba76013fa2d66a560c247f3662a1669ff6fcdbef74b6678b4d10c59b8a53e SHA512 9156aa6d7bd23426132884c999fe7d5b0199b2f8a84fef529cda16ca1e36482ccc1c73de1293a524f8aeaaccb38571094f2c88e32b295cc6c55ca30f353fdde3
+EBUILD spec-alpha-0.2.176.ebuild 868 BLAKE2B e3229858830b4302618a9b079287ef32a203d358fc673ad662348d189f8e26c3366d2c467fbb55264be2c1dcbdfefdcd44ceb9b0be672288029ef443496bbf4a SHA512 e939189e9652132ca06d027901fe8959b3a75a1452f15f8aa49c17b31c1ff1140e7a88d42b54e6b9f5d6a77cf8a32b94e5fae6bb15ae61e08c0e5b9dac07ae16
 EBUILD spec-alpha-0.2.194.ebuild 810 BLAKE2B d5924c9ba50ca29a1288b5eb288eb7e4253373768b428df7e780ec5cc42ba33c6df3f54f3792c018b8790cf80c7b6fcb1513850c3b1df9ba750b197f11baf6dc SHA512 c3ae5f4b207762968ae58db54d574f85f649909feb110532480679852f50c493c92ef4c31b1d10823b89c9b671e169f00067154084d066d53bb5267cc8a661a4
 MISC metadata.xml 476 BLAKE2B a4aba1942183ed5eea5e1af477007d1c652356e65ed97ee7fe4284a7df481eba6c6799d5b00ef78cc778a0a59fbffb3c8d7d73560f4bb7521aa6c7797decfa39 SHA512 78e9c9ccdf5af9f599b2c67c6ee0699007c3d6c90c330e0c937e0905324f9275ae2649db1ace2e0a59342968ce93f85782d5df81d2df6ef2104cd06376c1ee34
diff --git a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
index d4a4e473b091..73eff1ee42cf 100644
--- a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
+++ b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="51b64c0"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library to describe the structure of data and functions."
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
index 5558df7e2a14..42a9a4dd23fd 100644
--- a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
+++ b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="59af4cf"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library to describe the structure of data and functions."
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index d3aab2a5a425..c1b64c1a1693 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -16,7 +16,8 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e
 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
-EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
-EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
+EBUILD swt-3.7.2-r3.ebuild 4364 BLAKE2B 8c238643fbcdbb8c3536a6ba3b931ddca6dcf1593cd987893f71f025ca90f8fb539b2a20b9d06e0a984e49966c368d8be51f8a7e1483cf4365a5e90aca840083 SHA512 f78cb150abf666a4b48ee5a1f926c36c88db2cefc69a02151b49ee0a9b31f22bbf635594e28168483a7691e8b4a53f57c7bad689d8c8f90d850e34434e2520ec
+EBUILD swt-3.8.2-r3.ebuild 4167 BLAKE2B 9ecd08f8b5604aacc7d662e221bfac8b40267957dc1d61ea6da93efe4fd94a8de9799842f59d32a872a5706f84ffce8f1f5300e9f604fcb27991a1124a724b58 SHA512 ed61b6ad2899efe069df78d6b798efc755c78bfdef9dc1939346dbf6c110e6b8719c173a2480a55a2df52fa88cd130e7d77f72e6c905e4a00a7438d9b4319682
+EBUILD swt-3.8.2-r4.ebuild 4161 BLAKE2B f49d7e6ffed9da09772c8ae6a3a9588c21e405ee7963cd0ee32562b4b62bac16fb497e559fc1d99bab5c495bb285737aabaa042038dc0bcd47aabc8b6c977f84 SHA512 60bdc6cdcf9f6bf230ca1482e4f65c1d6843c65b02ac008bf970b80f4f900b0cbba74a27fc4591b50e4dd891f319a2484f318fff18db9239dde0431132320c37
 EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
 MISC metadata.xml 519 BLAKE2B 5c132bb4b8d9fbacfae3262a550e34932088ecbd204c3a8c2c13d782b0b0fa37a3b255bc84c388ee13f874b427a87a4321e605d0c614308300c18715c9631ab5 SHA512 ef81d6d7cc9f8e2309dcb8bdd78ea942a7a300ba4ed8506a93f12150c9142a5f62a153c0d77e3000f78637d5523367b7fce1186bbac01cafae10d4d0af6c959d
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 24e69a974015..12ccd36700f1 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -108,11 +108,7 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
 
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
 	${make} make_awt
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index d65297c3817c..604916b2de09 100644
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -99,11 +99,7 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
 
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
 	${make} make_awt
diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild
new file mode 100644
index 000000000000..341e66a35938
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.8"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cairo opengl"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/jdk:1.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/lib.*/libswt-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/swt-3.8-as-needed-and-flag-fixes.patch
+	"${FILESDIR}"/swt-3.8.2-gthread.patch
+)
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+src_prepare() {
+	default
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+
+	mkdir -p "${S}/src"
+	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dodoc about.html
+}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 0aa50209fdb2..cf8440856daa 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-2.3.ebuild 5228 BLAKE2B a1bea9f621a20a0656ca15d0d3b1c9a99096573ab70e22a065600284780f803eb96ef4b0226e9d875df1a339921ea9206537222302539a99a0e80e2207a7cafc SHA512 32b0faef82404dc79b4a4d00018c12d0631c3e2c3ecfb63fbf12f8afe6dafb5d805296c59eacf60914dbe7301a617d6302f940f8852195e11d3d6d9d0e8333f5
+EBUILD velocity-2.3.ebuild 5227 BLAKE2B 764469f382df39a516df2f5968f963e603182399652de317f67ef7dae760e049a941415a19b9732004089bc38c79d4389a0220d8d4edbe3375200fae07777b97 SHA512 8c4541c93011711bfb47d9d96f8cfdd01709cf1d9c63184f332b557dadb530641a2226929cee9c9c3aad2544e495983058f848c456124b4303eaf289972fa2aa
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 8f22d0cafb1a..0a414c4fb11f 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Velocity is a general purpose template engine."
+DESCRIPTION="Apache Velocity is a general purpose template engine"
 HOMEPAGE="https://velocity.apache.org"
 SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/vldocking/Manifest b/dev-java/vldocking/Manifest
deleted file mode 100644
index 6089562421cb..000000000000
--- a/dev-java/vldocking/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vldocking-3.0.5.zip 1734159 BLAKE2B 98ff048558b2c520192b83e56c4900072761c8e0f80d594b2166b10249cf6ba572102070914ca417879609f9b9ebb75a5fbd6d460859f131c2f4a403058d8f5d SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8
-EBUILD vldocking-3.0.5.ebuild 641 BLAKE2B 5befa88a850b73e7bd7493558819eeccdbf60d9db35cc5a5afe8f43375006c5630b3d3e603dd7a33e4d9718a8a7b25bcf9795b129982b44b8771a236f4728109 SHA512 8f95ffb948230631b6eb638279722a129f0130217360d9b72bb28f08155429fa583db491be5536ee9ad9384de5ea800730f13f4d4a4f3be6e40e5297b5fb4b75
-MISC metadata.xml 430 BLAKE2B 0a8806756017402f90d2626c21d662ee5f0c3fe5bba3de0dba332940e40bc6deafc6d19d9577cb5a91c81af6d02346aef280bb6d80095b83238bde6a1f1aa38b SHA512 0773969102679729d532dc724327ddbf58a96135907ff1a449b52e45d3eb09e1e3e4249c99723e89f39d130850b7201d02764cb6ac5b763e47f5ce6993f45cdb
diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
deleted file mode 100644
index 0f197b34ca79..000000000000
--- a/dev-java/vldocking/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">cmadsen/vldocking</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
deleted file mode 100644
index 75e885bd5de0..000000000000
--- a/dev-java/vldocking/vldocking-3.0.5.ebuild
+++ /dev/null
@@ -1,38 +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="Docking solution for Java Swing"
-HOMEPAGE="https://github.com/cmadsen/vldocking"
-SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	slf4j-log4j12
-	slf4j-api
-"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/ws-commons-util/Manifest b/dev-java/ws-commons-util/Manifest
deleted file mode 100644
index 0e024696bf1f..000000000000
--- a/dev-java/ws-commons-util/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ws-commons-util-1.0.1-src.tar.gz 24838 BLAKE2B ca39646a40513eaf1905cd910779a045b24f0b4901c1818a10367f7326a7a50122d031a9b91ab6884baae15388e1e91903f21b3bb23cabb09e3f0dfe4738ca0d SHA512 4eefe61daf462105ca8cfb8ec42ef42ef414d1426b201da044fe9a72e9ab7d3fd34bd80d19d8f6220f1f91d9de7cab3d8d2dec4c267784ba3d3bbd69a1c62c4c
-EBUILD ws-commons-util-1.0.1-r1.ebuild 610 BLAKE2B cc0eeb93b0ad96b230639dfc7a4aca31e9798c562f8af64216b5806a56ee5b52b75859074702789046033fbcaa830ece09f39d9c00f1f87a3846a142914fd3c2 SHA512 456607419ceaff657a1d959e2a2c68783ab2ee7dc2c7918c2f14e0940278acf35fcc0cbb90aa2a03abb17f74d769c65e9c719b79174177e3cb17bf57d69c66fb
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ws-commons-util/metadata.xml b/dev-java/ws-commons-util/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ws-commons-util/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
deleted file mode 100644
index 3e6b2e2c676e..000000000000
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 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
-
-DESCRIPTION="Utility classes that allow high performance XML processing based on SAX"
-HOMEPAGE="http://ws.apache.org/commons/util/"
-SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	mv "${S}"/"${P}"/src . || die
-	rm -rf "${S}"/"${P}" src/test || die
-}
diff --git a/dev-java/xml-security/Manifest b/dev-java/xml-security/Manifest
deleted file mode 100644
index 6f30ed8fd15f..000000000000
--- a/dev-java/xml-security/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.5.7-build.xml.patch 1124 BLAKE2B e51aa373776a51657f6047c8baf15ff0041aa82dcf660846e4218b85b67f7049d4e138c789f24094e170db5a29656fdd6be5501f38197d64fdcef748884a78a9 SHA512 9fd53bf8efde00c0602b007e5d54d00c923432357eb56c727f6f09845a43557b8b168704842e206ac5c78d6718bfd8f3629ee808b6e08e9f18e3097aa7f099e1
-DIST xml-security-bin-1_5_7.zip 9164667 BLAKE2B ea0756f745c27767634bafaae1b3584ba6843cd9d6fe4d9c7cb080058015a576dc8a3f117d32ed3b139a42373057d7dc4ad33f0e25db4abbbaf140a0cc115e01 SHA512 ae8e538fe7c90013a89d139358efc06d8921b1b0050a686dcacd123f5a8a8f100be163e88fef59998ea0ba27ebe9855f06d1f33b1ac92fa3f31acbce9934bd36
-EBUILD xml-security-1.5.7-r1.ebuild 1540 BLAKE2B 193a3e3e0c9d7363040e314ab66fa8a23cfbef908824915cb71ce8e4d9fc3321d0489fa096dd9db4f8462020b8fc3f081488872c12bde76c9111345b52b6d8a9 SHA512 cbf0401c097e6e06274833a2fc6539c5b82d7c9b87bc60a70b4aeabaa46c8a31ba762d9554cdd133f15b7daa0589559f3609f8acc4a395f19cbf0ec30ed9bd20
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xml-security/files/1.5.7-build.xml.patch b/dev-java/xml-security/files/1.5.7-build.xml.patch
deleted file mode 100644
index 294c059574d6..000000000000
--- a/dev-java/xml-security/files/1.5.7-build.xml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/xml-security-1_5_5/build.xml b/xml-security-1_5_5/build.xml
-index d959d67..d91f98e 100644
---- a/xml-security-1_5_5/build.xml
-+++ b/xml-security-1_5_5/build.xml
-@@ -668,7 +668,7 @@
-     </target>
- 
-     <target name="build.jar"
--	    depends="manifest,build.src,build.test,build.samples">
-+	    depends="manifest,build.src">
- 
- 	<!-- Main Library -->
- 	<jar basedir="${dir.build.bin}"
-@@ -678,24 +678,6 @@
- 	     manifest="${jar.manifest}">
- 	  <metainf file="${dir.manifest}/*.txt"/>
- 	</jar>
--
--	<!-- Samples -->
--	<jar basedir="${dir.build.samples}" 
--	     excludes="org/apache/xml/security/temp/**" 
--	     includes="org/apache/**, javax/xml/crypto/**"
--	     destfile="${jar.samples}" 
--	     manifest="${jar.manifest}">
--	  <metainf file="${dir.manifest}/*.txt"/>
--	</jar>
--		
--	<!-- Tests -->
--	<jar basedir="${dir.build.test}" 
--	     excludes="org/apache/xml/security/temp/**" 
--	     includes="org/apache/**, javax/xml/crypto/**"
--	     destfile="${jar.tests}" 
--	     manifest="${jar.manifest}">
--	  <metainf file="${dir.manifest}/*.txt"/>
--	</jar>
-     </target>
- 
-     <target name="build.src.jar"
diff --git a/dev-java/xml-security/metadata.xml b/dev-java/xml-security/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/xml-security/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
deleted file mode 100644
index 0754ce115bfb..000000000000
--- a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,66 +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
-
-MY_PV=${PV//./_}
-DESCRIPTION="An implementation of the primary security standards for XML"
-HOMEPAGE="http://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/java-library/${MY_PV}/${PN}-bin-${MY_PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-logging:0
-	dev-java/xalan:0
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="commons-logging,xalan"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}"/build/xmlsec-${PV}.jar
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_TARGET="build.test test"
-WANT_ANT_TASKS="ant-junit"
-
-# Buggy tests.
-JAVA_RM_FILES=(
-	src/test/java/org/apache/xml/security/test/encryption/BaltimoreEncTest.java
-	src/test/java/org/apache/xml/security/test/encryption/XMLCipherTest.java
-	src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
-)
-
-java_prepare() {
-	epatch "${FILESDIR}/${PV}-build.xml.patch"
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/build/xmlsec-${PV}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-	use doc && java-pkg_dojavadoc "${S}"/build/docs/html/javadoc
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index c79ab4a005f2..40adcf557961 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,3 +1,3 @@
 DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD xmpbox-2.0.24.ebuild 1792 BLAKE2B 9aa92b786eb98701ff25409b483af27502521935b281666008d237c30bb7c6162e5ef951fdba1aa5aeb443e7ef18efcd8d2522263f8601822dd7283b8eab551f SHA512 004dca1c9f97d1f70a961aa42c949f8f4a3dece4edaf7bf613e72283a55eac3ab73a5f42ef98861fbc3cb02655cddb08b5a56d694aacf83607c2f98e19e82395
+EBUILD xmpbox-2.0.24.ebuild 1791 BLAKE2B 994e8c6a8bbc8024b8249b35b7c76988f9126552af735b12b6cc85700401c1cd45a13be6647f284533531bfe46bc2188e86b6ca8334e33e90a02b577d918c196 SHA512 a3cc86bee86ff01809459c9fc65ce1f3938e2fdde89ec97d96470be4c6ec04ba57e6bffdb80eeb2700ae66383829281005b391fc7949340e036b18c0e224afd5
 MISC metadata.xml 519 BLAKE2B 49b3df59011f9aeb072d3e42abbc7955b3b49198c2be44684d629d47d69a9c48cee8e2b6e48e3983c9d1c06cd9070149b3472716fde75ff3ec110f3d35237b68 SHA512 45f490395e7eb8e0f4bcaf452ec1ac2839232c3f4028e7c3d98d0ae292112ec3290f4d59270343df5ef6f9cc5cc4138a4ec9488656dd19de9501eb226b400566
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
index c96dec5d9b60..428edda56d82 100644
--- a/dev-java/xmpbox/xmpbox-2.0.24.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification."
+DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification"
 HOMEPAGE="https://pdfbox.apache.org"
 SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
 
diff --git a/dev-java/xmpcore/Manifest b/dev-java/xmpcore/Manifest
deleted file mode 100644
index 98bbe68b62f0..000000000000
--- a/dev-java/xmpcore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmpcore-5.1.2-sources.jar 136918 BLAKE2B 521a2ae6093a51a0845ede16e56d4f9e2525ff7c7ad2c877ecd08a6673befd76002a1c35c635966d8664a2ef601f0d10a1e8a9562dc4c0564d4eaf48ea27cac0 SHA512 ad4c78a68f1d32a358b79bfb4acacbcc56eaa294af5afbb29eb916a1a488dba547e72c4d94809222fae63fd7c66940d9ce7cb6c06598f9c7b8691d0feaabdad8
-EBUILD xmpcore-5.1.2.ebuild 499 BLAKE2B df5454aedbbc68ccf30499839eba794a9abd592df75fb36f93845420d50963b2a4b92811bb392e3a43d6df1f79e0c5ceba2d8bf2c382b5b8195b1f1ecf4ac1ca SHA512 08ee2a9ba00868f2d69f2e9498f5e8b216b16e81e34c568ad5832609bc58c29ee163623c82e3c1a3808ae37ab3df5b902e88ccd8289c03295be110348f2f93ec
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xmpcore/metadata.xml b/dev-java/xmpcore/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/xmpcore/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/xmpcore/xmpcore-5.1.2.ebuild b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
deleted file mode 100644
index bc4a6b95771f..000000000000
--- a/dev-java/xmpcore/xmpcore-5.1.2.ebuild
+++ /dev/null
@@ -1,18 +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 based on the Adobe C++ XMPCore library with a similar API"
-HOMEPAGE="https://www.adobe.com/devnet/xmp.html"
-SRC_URI="http://central.maven.org/maven2/com/adobe/xmp/${PN}/${PV}/${P}-sources.jar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
author	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
commit	3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree	44068672445b1418489aed82de58df3c470289e7 /dev-java
parent	0f15659d48c193027158492acb726297501202c5 (diff)