gentoo resync : 25.03.2022

45 files changed, 189 insertions, 433 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ff2d8d1cc973..d0427e82754f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index a9053371d965..d86fac3dee36 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,5 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9-r3.ebuild 4061 BLAKE2B 45d5aeaa00d77df364d15c62cb7c6eb3a032c2f9abbd4136d16534b2b480c3b3f446bc5217c8fbbfcff9295f2de5cdb3fa664e8dad615b963b497c499958588a SHA512 70d0bbdb182cfa4521211842138c31db2ead843a464997ad7cce461fc7957f935468927d6183563cbfcf4f9c8bd9794cd969f79a946c694ebb41ff3147a22ab0
-EBUILD ant-core-1.10.9.ebuild 2743 BLAKE2B 5cfca20522c55dd4894f3ab31d027d68343b363fff462bc4cc0acfcebc4f2f0552676ce8c10caed56577cc87325f3ac91f63d74a4c6b30b8a34243cdbe248e7d SHA512 cd338b8e765ee7081d49d8ccb21c5353a49c4af9f6600a7ff103252edadb093da33348e5b4695b69eb4bb4417a01bb265685f4c7b746e88bd41d4018544d91cc
+EBUILD ant-core-1.10.9-r3.ebuild 4057 BLAKE2B 40a30d4699248c6a88f292a304e3a017e0a12d3b88622c24fd5dc69dfc2e7ab89a6f536c0d04475a2d67db491df321597f463cc930a58b7aba87dac66c40cd40 SHA512 f0c129658bdf6b0b0a68f6d6ce2163f497579876b0e8da5bcf931b4e2fe8b14eaddad502e139a824d21bfda078a4bfef8608fd428a8dcfed09d13b5fd23a6f18
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 5e02bb8b0df4..6ceeeb9e569f 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${CDEPEND}
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
deleted file mode 100644
index 86eeb87ed9ba..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-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"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/${PV}-build.patch"
-	"${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify "${S}/src/script/ant"
-
-	# Fixes bug 556008.
-	java-ant_xml-rewrite -f build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	# See bug #196080 for more details.
-	java-ant_bsfix_one build.xml
-	java-pkg-2_src_prepare
-
-	# Remove JDK9+ stuff
-	einfo "Removing JDK9+ classes (Jmod and Link)"
-	rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
-	export ANT_HOME=""
-	# Avoid error message that package ant-core was not found
-	export ANT_TASKS="none"
-
-	local bsyscp
-
-	# This ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
-		$(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	dobin src/script/ant
-
-	dodir /usr/share/${PN}/bin
-	for each in antRun antRun.pl runant.pl runant.py ; do
-		dobin "${S}/src/script/${each}"
-		dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
-	done
-	dosym ../${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym ../${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant"
-
-	dodoc NOTICE README WHATSNEW KEYS
-
-	if use doc; then
-		dodoc -r manual/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/apple-java-extensions-bin/Manifest b/dev-java/apple-java-extensions-bin/Manifest
deleted file mode 100644
index de1e7058d602..000000000000
--- a/dev-java/apple-java-extensions-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST apple-java-extensions-bin-1.5.zip 18036 BLAKE2B 413ff37758ca59ab0114c747745619dc0886b47b7ebf05b0383f819eee12e3d0d2c01f95520395cdf5586ceaa784cb2ccb89ba13f56c6dbc6bb2879e37b64813 SHA512 9f3e9a8eab3980feda8584ca75d58da8b31ec0ed77fb2a4a1488d0b2ca0efd845ff705fc372ba3958753690f839b0ccb2e9310d6896564317b625ff9ba9cc456
-EBUILD apple-java-extensions-bin-1.5-r2.ebuild 580 BLAKE2B f1fe47b26f1d81b3cd5bb1e728c626842275c2a2c040af602c29e8d393c267edc96942b10b66eb3d2b30ea26b895acedc310a3bca740b03c57ad51dad9e892b0 SHA512 4ab7802da61f63659a18dc45d28165052d4d3f7e1cd4fbd178b7d795429dcfc35c4d0e4006f135e901c01fd327dea62192b9664de92a13e57688a487bd2488b5
-MISC metadata.xml 502 BLAKE2B 1d2d749abee6ac33914a9cf4556506e37bb231408d34fd66ec6260fdd2d00f1feb82865522f5ded111d5aa3a2f62c140777c3cbba6e7214e18309cbee995cb0d SHA512 12bb5eaee44c6b3505fce480c5432e655b2d05a0e1c152337ed97b411f220f006010051ea953bed0e38ab498919ab8bb03635df700d905f88b85554350bdf047
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
deleted file mode 100644
index aaef7a010e5e..000000000000
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="Apple eAWT and eIO APIs for Java on Mac OS X"
-HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
-SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
-
-LICENSE="Apple"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S=${WORKDIR}/AppleJavaExtensions
-
-src_install() {
-	dodoc README.txt
-	java-pkg_dojar AppleJavaExtensions.jar
-}
diff --git a/dev-java/apple-java-extensions-bin/metadata.xml b/dev-java/apple-java-extensions-bin/metadata.xml
deleted file mode 100644
index 3fac767f5f0c..000000000000
--- a/dev-java/apple-java-extensions-bin/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="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-This is a pluggable jar of stub classes representing the new Apple eAWT
-and eIO APIs for Java 1.4 on Mac OS X. The purpose of these stubs is to
-allow for compilation of eAWT- or eIO-referencing code on platforms other
-than Mac OS X
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 4a6d85b0a896..2a1a87b660a8 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,4 +1,4 @@
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
-EBUILD c3p0-0.9.5.5-r1.ebuild 1323 BLAKE2B 5cde191eaedc48e18707bc8435fbae52d08e6ef926f2183e11267f7e0f66ae0ff54a2ae3d379eb9810e2fd18bd07c3bb391442492e59cc46d260559c79ed5df9 SHA512 debcdd2ffaf4d734c2566a4b715f7fa71fa6ef9a07641673a8198900059c7efba1da43bbd6bcec4a918473ef80576365e3d064b1ae9876883a6e740d8ce8d47c
+EBUILD c3p0-0.9.5.5-r1.ebuild 1322 BLAKE2B f73ed9d33c5e510b8a5c8b5b3b4a10ef97940f67a0fc1a74059ecb1e78d4aa3c09ee3fea3c82b607cd860c68a45b076724c122a6270049072d7d41e196d4bf96 SHA512 b9cd8f8b80bb4564c52210752722f312978b8e81e7d1692eebd3375cbd0f63e73410956014502b7ef545a6f1f025f50fa78aecedd18a2d37e7c6aef2b41ec729
 EBUILD c3p0-0.9.5.5.ebuild 1304 BLAKE2B 12e0e9d144e0e14582e0ca37c40e4df33d746377697942d62dbeb5811cc76991e7c33d8c59f3dc4b1cdbff48fbf58a10336734932c412156a31e2fe3db8cda0a SHA512 b822c1570529ab43716475125273364df68f973f82155dc1d486b5ac234b68b7fbc7ad00288d7e0b78522fb3137794f509728265b4b6780aec227fc82ffac757
 MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
index daecaa205752..cc33ee96ffbd 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 659bbef75151..bf7bdec40bcd 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,4 @@
 DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
-EBUILD cglib-3.3.0-r1.ebuild 2080 BLAKE2B 99f585d8c06c9f2c19cf01f807eaa9da1826f58da7d91b207170ae1f4e5229c2bdbb98bd06dded6077fda98e89569fc8f3061eba0315d6374a2ee17aaf81aeed SHA512 19e265bfa2f1a17d3386012d8a5c4fb40d775ba6f2af901e8e62373958e85ade8408e395a381cf6af53e6365e567c1d383aff3540f071cd4730af8c61ac3af15
+EBUILD cglib-3.3.0-r1.ebuild 2078 BLAKE2B 5b08824f25fdcbaf87201b2328a7f31353662f1724eda0fe59e01f9d757657d3e06be2ffc7986c06553d633db9b192d0ed932da1084c0fa7d66cfe980a0338b5 SHA512 fb49e9889e13df00d0d64de33caaab86fc9f212b2720710484a81dc90769b9cf8e8a8e7b50f064d73234a62332a1fb973d7604e584d31abd3927c2cfc30405c0
 EBUILD cglib-3.3.0.ebuild 1488 BLAKE2B c0547570011c4dc76a9fe6a769499dd806278bb1ff7c70b4cd2cb388915f44d103bc5f4d1e3f26dcbf5251db68fe86ae4d86a19e4a814c5c2db40a29a72f1137 SHA512 984fa1a2fe01a3add9b9fe3f616a2a416356a43e499a76f8a5b21d738660ab184384e97de2391cdaaa9e4e28d6bb83f5258577715363e58a13a6dd8445c036cd
 MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
index 26ae3e989c16..3a73e5eb1fb1 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/asm:9
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index ce7e16c4cb2b..7af931309cb6 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1,4 +1,3 @@
 DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
-EBUILD cortado-0.6.0-r1.ebuild 734 BLAKE2B 07a8b8685ffa611ff2bd577457b8a42b09422a9f445ef4bae52edf920a1fa5a65f3af43cbdf76c673797c71c83792ec717507b6a2b4f08f220b4e91eac588df6 SHA512 f8c0690ecd8789fd2c4010abe713a1860e7db4651f4493c27d5ebe02308308dbebe57019d60c20041343a0bded91e3ee48f63573cb6ef1958c9a7743beca895d
-EBUILD cortado-0.6.0-r2.ebuild 922 BLAKE2B 83542958dcf904da1087a3ca5b363fb2a751ef64c82a52403fd795618415bf746ecf5ba36a3f7babe182dcd5a85a1aff9fc7ab5a1de163b8111c52cc9a694d8b SHA512 8156c9dca71b4bde8e0e50c0cc551f30b56d5467174a487a894482e96a2d44435baecfd8a909bd37dc528026345517f02c927d267451b0104db5865f8ef0b8e8
+EBUILD cortado-0.6.0-r2.ebuild 921 BLAKE2B e2c4598ece91e7db0676036cbf758f1c1e6fe9ec037e4b6b8bc25cdfe0797c215e03d45bc6dc16039f225816e22e97e9d8120d7c7e956087eb2616352f0cb582 SHA512 451240d260e8701a6845e5134d4368612865cea88548739dfcd2a9774a800f0cf0ec67ee1cd3c66d7f18aed891c8c0e4d9bdef50667038eebaa96b9cba874f5c
 MISC metadata.xml 1039 BLAKE2B 2c718f02922e15112d22a0f9289787c129f7bca4b2d448e31a42edd961b2d238f3e7bb4f24a11a5e029d40fae48c521fb904891f32fc7e80140d51bff1a10925 SHA512 f4a9cb54e8b282812f1e73db192a575ca0cee2827c049ca1585a04c4b2f12557ec3df8b530f95dcf6af056fd7b50a733d29a09eb9b8c4d373ebccd3467a5fd80
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
deleted file mode 100644
index fe8148871378..000000000000
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multimedia framework for Java written by Fluendo"
-HOMEPAGE="https://www.theora.org/cortado/"
-SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-EANT_BUILD_TARGET="stripped"
-
-src_prepare() {
-	echo "#!/bin/sh" > scripts/get-revision || die
-	echo "echo ${PV}" >> scripts/get-revision || die
-}
-
-src_install() {
-	java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
-	dodoc ChangeLog HACKING NEWS README RELEASE TODO
-}
diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild
index fc6c3c123ab1..903bdfbfd5bf 100644
--- a/dev-java/cortado/cortado-0.6.0-r2.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Package 'sun.audio' seems to have moved to 'javax.sound'.
 # More work would be needed.  Presently we restrict to jdk:1.8
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
index e34fc2d26c47..c478ac90d4ca 100644
--- a/dev-java/httpcomponents-client/Manifest
+++ b/dev-java/httpcomponents-client/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
-EBUILD httpcomponents-client-4.5.13-r1.ebuild 2237 BLAKE2B 219a200df3588666a745ed83474edde7e2e253503ab2d6fc496ca0fef96621c19d4bf7060a63f24b6bd99cda9b56041fb8d7fc3c2d7fcd202bc44d9582494e72 SHA512 c9300c81ecaf4af3239e8e8d46dd09fa69520da01ccb353b51ae15ce5178364233292dc35f3f4ee8bba66fb53dcceb4cf7b0390414b62ff613b1bc27e3653748
+EBUILD httpcomponents-client-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
 MISC metadata.xml 310 BLAKE2B b068de1d99141665479706b2ee3af6195a1eb34cb7a063d2dd51434b4a5c6bbff26a06c94436fd352fd079cfa9ac6a9364cbf379991e803d771c04bdb9e12294 SHA512 26ec17ca1d7ccc803139a9f17dc51ef9cdf8e0bc697f0442c1718dd1807460add3d0560cd8f10ba2234f8e32990b922428b5903c0acfcd7d5e815dc9ba11280d
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
index 651201475e47..38274be97d07 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index e59491573c70..1a6f079e78ca 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,6 +1,6 @@
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
 EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1336 BLAKE2B 29fe4d5a86ec6cbd57037c32cd5dcad29df07d323b7805d373671cfffefaea588cea0d1ca37e166acf9db4d085dff0d11c61b6f8ef15075ddd293cda28aee5a1 SHA512 d64d1b4c323cdc147cc5dc171f06bf674a6fb5035147936177698f63c2ed401d3b53e0d96222aa5a34b724af16fa9732c7d786736c73318b227a64db9033b180
-EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2091 BLAKE2B 2e18caad07fec96b7801460c1db441a357d19fc357344de37718c87b586fcdfc653002c6d0c048674092eb44e04d9f6313dabe10aa2de5ebeb5e242675ccd481 SHA512 1dbced75f1be447f4fd14ed88402fec60d2a30f16cce802a83e6a61c496aef8c77155c86d4ebd95354a107171eec7bab6c4354b29565747c191e9b486a8c50eb
+EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2088 BLAKE2B 594b7ea4a6088bc044e1cc1c344c6b638ee7387acbfe76a4b4eba0258ad7b763c729dcafbca1fbe6811a66f87afd1f88ceccb93eae342d7956a4c0b2fe233bea SHA512 865f14061d7d22b1c64e6b581a38ce967c355ab710f12f049d907fcdbdceb87a10e8082b6a6d873684c7366ef62bba1e9156322347189f2a91eda79a2bc3762d
 EBUILD jackrabbit-webdav-2.21.7.ebuild 2082 BLAKE2B 87576a5edaa1ee1a2ba080d5e97663e468425e2be50bae6816eb8a3096f40272541625b805d8d181dd9cdab4101245bd9123cf2ba5c514879fd9ee973e4655d9 SHA512 f6122353276b1f8ef8b754dea98b09dc01b9cf5ddac97c996b2da31dc54329b256972fc29a0cb6534dfb7313d7236b56543b0e3aa0ddd9774ca5042f06a9f2c6
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
index 9a02a05c7708..e0f65097e26b 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 3bfd69435e36..4e7caa520468 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,3 +1,3 @@
 DIST jackson-dataformat-xml-2.13.0.tar.gz 3009443 BLAKE2B eaad5101f74ba5fdc0b91bc1c2b1f6174e812a63aea43d64ae9626bd22f5623fd9fb8dcd98384124e6860ea60dec4f4bb25196bd0be21daa9cf71e59a3b0252b SHA512 ad8bff16efe62cd9b8a509bc6677f771cf8e8f76bf320b8a463fe4d63d533e2cf7e3d9eda8c665c32383cf70b790f0847ea5e63a0cfcad5d4ea6918db21d6573
-EBUILD jackson-dataformat-xml-2.13.0.ebuild 4706 BLAKE2B 4a73e70a2249fd16202c43b790c1e1f2c24cbdc85792c01cbcc106a9db9654eb94699a562d740a13fb4d32f93f254d6cd483994e0567f6fca6fa6cfd05c4b5dd SHA512 368b584da61e517e55fee01d9c9cb0d0ff5da08a725da3eebdc98ec667b1fed35c0cbce314cbe49bf6d686e6cca4c4549828b8cc77bd66cee56d197fa03a3f89
+EBUILD jackson-dataformat-xml-2.13.0.ebuild 4705 BLAKE2B 3b16243ca8f8d96a2e14c94ec3f8daa120625f6d0e156e9a04e7fb1a4c3b22d12db77be74d7863c6beda7c89a33b9ee328f4dcecf998bf28a5d8c570b4c9c50a SHA512 c930c58cae4b92976d92d55283aa2ddc0e4bd70bd0ff53fd2193ba777bd860dc225f293fcd70f1c143cdaf4b42d6577e80fb075170aa446952c70ee1aff8ee96
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
index f1ee5befc428..4430aa547511 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index b0580a303930..694a2582cfe5 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
-DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
+DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
 EBUILD json-20150729.ebuild 700 BLAKE2B 28d118fc07ab4f4bc52e00f43d36f49291fa69fc91304ee2d89df9c111e72a09f7eea10e659d06ac8eccd5c3a9d038d7ac57dca5f50fcf9d9246873bba6559c9 SHA512 112177c08691722e2b9e0d0bbcc11bbe68da87c281a4918ff6e4ef64160b7137ecb1187a697bf0f7c3db01acc9cc4baa79a67b7e9385af9cdbf5b3cd4036b26c
-EBUILD json-20160212.ebuild 700 BLAKE2B 982fb6fc37f874641f6984877eef6ea42a5b106fcfc59080f85737ed2ccc61df3834c7ef5d974a155ff822bdcf55d91dc8503eec38d7229178b2b4b51fb84be4 SHA512 23df25d4363faa278ab84475c26b992374f61a39ed816868f8695567f66e0bfae4e54c6021bca5c38dc87110206146576cd14b02d713ca576d2c6d60f8cc38b4
-MISC metadata.xml 328 BLAKE2B d2b6f07acd968fa03336692666d5a76cc7036d99a661652f5ac542f967cf3dcb334eb7f33a25592086d269eee6dfc808cc05bc06876062071f325b4f3df7ddbd SHA512 95a7a77c5802e88f4001a9e74edefbbed6f6a321150d953dd7e584bfe45574e7079f6ca0d3bd45f25de20e1ff9d7e3eaa1c03e0b607ad176ec7099c5d6489a0b
+EBUILD json-20220320.ebuild 1484 BLAKE2B 9da92b57c7ca603d4e81c2affe103f33ad2c52012782a256b9fbffd246f8b598bf720ed80afee7428a98cb80a12e63c5a18ede9686247a2c86f0c62d0a61b852 SHA512 64e2e83d134dff838139499715c7b8aedd5ead16086d9bf6ce2cdbdc2628ee29d4d68f736f8efdd271067d0d1cc99ade7bc3b5cf5494a9e8c81ea03235bb2141
+MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
deleted file mode 100644
index e0a506eb6468..000000000000
--- a/dev-java/json/json-20160212.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	chmod a-x *.java || die
-	mkdir -p src || die
-	mv *.java src || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README
-}
diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
new file mode 100644
index 000000000000..0151873d71ab
--- /dev/null
+++ b/dev-java/json/json-20220320.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 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://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.json:json:20220320"
+# We don't have com.jayway.jsonpath:json-path
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#		>=dev-java/mockito-1.9.5:0
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {README,SECURITY}.md )
+
+S="${WORKDIR}/JSON-java-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index c7e742473ea0..44f2fdc3862b 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">douglascrockford/JSON-java</remote-id>
-	</upstream>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/stleary/JSON-java/issues</bugs-to>
+		<doc>https://github.com/stleary/JSON-java/wiki/</doc>
+		<remote-id type="github">stleary/JSON-java</remote-id>
+	</upstream>
+	<longdescription>
+		JSON is a light-weight, language independent, data interchange format. See http://www.JSON.org/ The files in this package implement JSON encoders/decoders in Java. It also includes the capability to convert between JSON and XML, HTTP headers, Cookies, and CDL. This is a reference implementation. There is a large number of JSON packages in Java. Perhaps someday the Java community will standardize on one. Until then, choose carefully. The license includes this restriction: \"The software shall be used for good, not evil.\" If your conscience cannot live with that, then choose a different package.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 9601bde1d5be..915502beb967 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,3 +1,3 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
-EBUILD log4j-12-api-2.17.1.ebuild 3117 BLAKE2B 6be65ea15be5ba1990b0f221d9886088ffb3c335f87161abbf42859e61cb6aa88fa5cbe1e7fb772eb074cab9edbdb053aa34e277cbd1bb7562621602307dd739 SHA512 60312afbd6442c064edb3fd54cbaa3e4305773d3a9473d175f0ed474affd7699ccb673a7f54e4836245fa96ab399ede336df0e3f6083c300db163c5967bc3418
+EBUILD log4j-12-api-2.17.1.ebuild 3114 BLAKE2B 7562325f5e69a7214ba566703a02a25e68711c97586d86bc9890a7130ae7c866c593cc57bfe17b7054a71a195fcd24749a5ed4b0a6bff25bd10bbd67e4e9d47f SHA512 b3132797dd6e578b5c560a97181b7ed4793564067d4164315eb537f417a195c36b64c3ad571d90e665ccf85e97ca79f172480533f048851c2ea84bb64a1d3fb4
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
index b623dce8e57d..fff8bf02ece8 100644
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
index dec3535e1897..ec08e86283fa 100644
--- a/dev-java/log4j-api-java9/Manifest
+++ b/dev-java/log4j-api-java9/Manifest
@@ -1,3 +1,3 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
-EBUILD log4j-api-java9-2.17.1.ebuild 1532 BLAKE2B f74496a314f839b04f84478859ea4d05ecc9f4dc5e0a0c94e3e99fa9b24bbabc4f41be23e72ff6d5acc45decc11daf07566915079c127503953cfcd7e08225a7 SHA512 bedcb16778351ac65a58021007a8e8b0f7f3df17414f47525958f36d7e587b2f853733f758bbe32d5f5be05b50703b4fabda4bb84b30ee03b9bf0e2a8618556a
+EBUILD log4j-api-java9-2.17.1.ebuild 1531 BLAKE2B b62af1c2ecfe9d66d8001db9f5082b32fc6a3cf50182e1434a50ab97e78313cc2f70118f93146fc1e031421a02375726c676cadb8f427ba8ce6048ff87667a16 SHA512 4ccab859e3b171a4eb25e19007e76c36a0e9338b8cf85bbafd67cc85f4dd3dac04f4211a5181306d9bbe22ad1fab558e234825571b98c9e222f0089b5bcfaa20
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
index 6ebd34f1d05f..428acb0e79bf 100644
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 # junit-jupiter is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index e8c5fee6c6b7..7114dd2eee76 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,3 +1,3 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
-EBUILD log4j-core-2.17.1-r1.ebuild 8265 BLAKE2B 31059517d4b240f7c9a93c0201c37b40f8c564f63c3ba7cb573f944e732f6256413587a688688e53cca5fba9e1c320c94a35d6cfd2bfd3b851a017bd15adf85f SHA512 7ee26ceddb2100a5573a54d80be95c875c9cd584fe2a7643df49da2be89a15f98992d52b6649dbd5f4c179e902d89afdc15d19a6fcc95f12ec368340e5ec727b
+EBUILD log4j-core-2.17.1-r1.ebuild 8262 BLAKE2B 2f2014a50da0d4d488773cd2fb07bc83dc101c300b490ffd12f19b9fbdc415898398f9eb841b71d7e1691a19c107bcf3a4cd7bf0d23c9a78135e3ad990722c18 SHA512 599aee21fc409744a86ba3a8e98002fdf7cac966f6042174272870c8bb2aa634177bda8e85b2b1bc3cf2ffb433757514d9b732916e03e2cda5597c081facccf8
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
index 79d595da15bf..d8b17937938b 100644
--- a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index b83a961cbae1..8cb2e4683a05 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,9 +1,7 @@
-DIST 0.9.10-assembly 63268137 BLAKE2B a87553608f9269e529227b4bb13bfca32cf82f3feb7b947dd849d66e86721f390d1862df897184306d84251b635ecd089e1e817244ee6e241a7ebab6c60fe1fc SHA512 dd551aac47b99d7a33f7900f80ac16eba60d1a93f68c87329f3faee8d219102424e19de899b78619568e55f09f2b081948bd21356179d608847c722157a55208
-DIST 0.9.11-assembly 63268510 BLAKE2B 2594800c42d23d3a91ec5b676e968200bb0a5f8e26a4163f05e6badd1377b593fa3b091f63bfca2b7cf3263fefa9d9bace5882b9a1061631f71ba647b65edeeb SHA512 3d6e67e1a301761209a83f3a12fbd692f5589af919ef4e30fe9017ef49a3ba5ff66a00ee372c184ab1d35932f014513c7fd4c7221463ecbc878efea0323c2920
 DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
 DIST mill-bin-0.10.1 67217004 BLAKE2B 4df576762b86e909b2fdbab49e5f8025d73ea0f6b60e25c6d1ec0b55acd91af44c5fbeb5088ea7e0138c4e418e36e60eaf2248b6867a7936aa6612749101f46f SHA512 0fd727aa0bd2f67536ef7155a5f57166bcd13b2fccf0d9b03c3081b8ce9ab1e7290b5705b52aad7e993a4bc0421ea6d57f94d76c0f240ce41df9e05e61dce940
+DIST mill-bin-0.10.2 67225385 BLAKE2B d3ec7f45344312fb3097142aebcbf7ccbafa1f2e2aeccd4b83c83b6dc4f90b5e7feeeb994dad930accee546106b2580bf37acc38dd83c9efb599e8b79b2ce8e3 SHA512 79b71bbbe4a05e314495cd97ae2fc926d35d5ba7134c8ff48c09a8fd0fe826b824dd8ccd7e27089acd84b0673acfcbebcf3ef77ac4d3b3d8a6b117244b1a80f5
 EBUILD mill-bin-0.10.0.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 EBUILD mill-bin-0.10.1.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
-EBUILD mill-bin-0.9.10.ebuild 462 BLAKE2B 0b33b8aea299741600f108c52c46408ec29442b91cc81716a5c7d7c07face2135d51a9ba107e71711528f9971588d2bd1959aceeeb44ba68b477a7008d027c88 SHA512 de66509bb517bbdb36f1b1fb6c9f64871ace3a859e7d33b552a27685f341ffb95ae3360830ece8fdea7521a2dcf6fbdbba7a1f88aff65eb01644e40fe558f2a3
-EBUILD mill-bin-0.9.11.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
+EBUILD mill-bin-0.10.2.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.9.10.ebuild b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
index bface58632d1..e8485c57dfd6 100644
--- a/dev-java/mill-bin/mill-bin-0.9.10.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN=${PN%-bin}
 
 DESCRIPTION="A Java/Scala build tool"
 HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly"
-KEYWORDS="amd64 ~x86"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,6 +17,10 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}"
 
+src_unpack() {
+	:
+}
+
 src_install() {
-	newbin "${DISTDIR}/${PV}-assembly" ${MY_PN}
+	newbin "${DISTDIR}"/${P} ${MY_PN}
 }
diff --git a/dev-java/mill-bin/mill-bin-0.9.11.ebuild b/dev-java/mill-bin/mill-bin-0.9.11.ebuild
deleted file mode 100644
index abd33534fe99..000000000000
--- a/dev-java/mill-bin/mill-bin-0.9.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_install() {
-	newbin "${DISTDIR}/${PV}-assembly" ${MY_PN}
-}
diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
index 851bfefe5037..0ec8f5cd4adb 100644
--- a/dev-java/rome/Manifest
+++ b/dev-java/rome/Manifest
@@ -1,5 +1,3 @@
-AUX rome-0.9-build.xml-test-upstream.patch 527 BLAKE2B 5c5d4f057298071912472b4a7bdfd7a8a184a78bc45bdb75e892497dd297771ff4a633f0ff9904545fdb12d43f1c0364fa55598670ea8d56e06cd1863b53c36c SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781
 DIST rome-0.9.zip 248755 BLAKE2B dcd19b49a9c5aa9849f5807508e4d10c7effaa9ec9247ffd5039cda7a08afb525a095ac7bbb72d0443566d08a0ebf75919b3dae018aba8957a94c4389d7df82d SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff
-EBUILD rome-0.9-r3.ebuild 953 BLAKE2B 39bf7d53a8e6b5a2182e978a52e8c8e4df74748a5074881a7c19d3dd657f921ee000a596afe5997bdaf62deeb8fe45e28636a4a7f9187087223c8ddfd6bd498d SHA512 3ce722cac645508e768c9c6788d26ee8032e6b5710fd0bd363bbc4d45dfe67614e7dd86171b2fe03596dbfc2bc6896b24ea948997be0c651e053d7cd7a15587b
-EBUILD rome-0.9-r4.ebuild 1191 BLAKE2B e8c53b8d1bbe024ac9fb4c8576669a78a6cfcf417b44cb124a71902842ce931a7660045c72a02ffb03e0f765e9b4df17376db7b41a5f862e6dc436c834c7dc5d SHA512 0f6124d5f02b252d6d195198f3579623f98c9cb9cd85a6ad522e3a0e73444cbad4824a17c2c36cf3a5d49e6fcf636a4c4a5e9aab8fed6a761128d31314d55aec
+EBUILD rome-0.9-r4.ebuild 2221 BLAKE2B 6975178cf1db3547939aa05488e79bd21e712c28f6fc19c3d628608d6ae7b1948855b700bc51e82596d7d79c11952c5f7d59b32397f7182e5a26f177529658d1 SHA512 cbc2d03c2c751e6ef613aa89092ea0555718497d4a971c66db95b2e9207b8ac12eeef3fdca622ecd030d8a49daed93d255676ff532bbc1e00e2e1f3f0ea16e56
 MISC metadata.xml 296 BLAKE2B 01dcba6c8b28c78d2e690f04b22002ffe6585a213667574be6168d84734ce2210993dafde1b93f464590273dfe72218f3d61bd8f0748ba15617228ca43d713d2 SHA512 0e447adc03a21da5afb4a929a8341c99a01b553517012035dd1f0b2dedff583d2ae1746d59a38417d16979bd3ad9ee627c65e9954bbf36bf0ab838daddb3bb47
diff --git a/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch b/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
deleted file mode 100644
index 95e53f4f7f73..000000000000
--- a/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /opt/sourcecast/data/ccvs/repository/rome/build.xml,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -r1.14 -r1.15
---- rome/build.xml	2006/12/04 21:47:37	1.14
-+++ rome/build.xml	2006/12/26 14:35:46	1.15
-@@ -131,6 +131,9 @@
-       <fileset dir="src/data">
-         <include name="**/*.xml" />
-       </fileset>
-+      <fileset dir="src/test">
-+        <include name="**/*.properties" />
-+      </fileset>
-     </copy>    
-   </target>
-   
diff --git a/dev-java/rome/rome-0.9-r3.ebuild b/dev-java/rome/rome-0.9-r3.ebuild
deleted file mode 100644
index 15f76e221046..000000000000
--- a/dev-java/rome/rome-0.9-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java framework for RSS and Atom feeds"
-HOMEPAGE="https://rometools.github.io/rome/"
-SRC_URI="mirror://gentoo/${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jdom:0"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-EANT_GENTOO_CLASSPATH="jdom"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
-	# Patch build.xml so the tests pass
-	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
-
-	# Keep Ant happy.
-	mkdir -p target/lib || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/rome/rome-0.9-r4.ebuild b/dev-java/rome/rome-0.9-r4.ebuild
index c92d79f20e09..58f961d200e5 100644
--- a/dev-java/rome/rome-0.9-r4.ebuild
+++ b/dev-java/rome/rome-0.9-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -14,14 +14,13 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:0"
 
 DEPEND="
 	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="
 	${CP_DEPEND}
@@ -32,8 +31,28 @@ BDEPEND="app-arch/unzip"
 JAVA_ENCODING="ISO-8859-1"
 JAVA_SRC_DIR="src/java"
 JAVA_RESOURCE_DIRS="res/java"
+
 JAVA_TEST_SRC_DIRS="src/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/data"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+JAVA_TEST_EXCLUDES=(
+	# 1) testParse(com.sun.syndication.unittest.TestDateParser)
+	# junit.framework.AssertionFailedError
+	com.sun.syndication.unittest.TestDateParser
+	# 2) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.FeedOpsTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.FeedOpsTest
+	# 3) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.FeedTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.FeedTest
+	# 4) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.SyndFeedTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.SyndFeedTest
+)
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/swing-layout/Manifest b/dev-java/swing-layout/Manifest
index 10eff475f9b1..9de529985e1a 100644
--- a/dev-java/swing-layout/Manifest
+++ b/dev-java/swing-layout/Manifest
@@ -1,4 +1,3 @@
 DIST swing-layout-1.0.4-src.zip 69859 BLAKE2B ccf30c659e6dacecbd0bbe4f3cedbbb7088c108f7af615f7ba465a36f70181da4744c364529ded933ba5c402dddf6f640d8ea1ebd739bb425861605a71315f27 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae
-EBUILD swing-layout-1.0.4-r1.ebuild 506 BLAKE2B 19386f4f5d579fd2782b5f88867d60ef1c290bfc04d01b9ecd5f5faf99812aa030859aec8f17a47d59b01532fc1037d3beb40fb495e189b39077e6f882ee7773 SHA512 17c1ec85b611fad3b8c734d1ec9298d65c95cfc3afcfc8e6db3f5e2450654a076921a4f9ba8dbe6a0c63d060e0bd04c4dfc7ba812dfda3580b7cb6859d663188
-EBUILD swing-layout-1.0.4-r2.ebuild 509 BLAKE2B 21e936326c2e4b874112a3f0140251f279077f3be0d962a75f9dfcd5d7261ddc2c4a996a154c654c7e5515d9435dc5dff6da853ab98f0c5a6e87be9738ab2208 SHA512 7a49aadd883e2729eedeee86c2380687617c779000a3b1ee11475bc7d67b42c64f77d7732d73952aefcfe8e106bd1c03b15d26b8af64504a06a075ebd8dfdd5d
+EBUILD swing-layout-1.0.4-r2.ebuild 507 BLAKE2B c013a4705b0838be9b0a7de2a835721148c7152591eb9c163bd21112ed7439cbc28720e8fe3ceba1d7656eb4d546d03ea009767a1a3af781b69fec129977709a SHA512 51ce07761cf2076c0187efbca1d2016c1702d43e361794bc5979c590de62de4597a6e59b9a88fdd1c9911b70bb6fe25fd71860f097ffb3763f87921aacb61354
 MISC metadata.xml 452 BLAKE2B e89e076ddc599049c2575ba125244ea4f69edd3fc28b4e91a89f82a60100a6cdb8bdfc4b7c17f46c9d9a1160ced3cb9361e6c973ac4cd281040520161ca523e0 SHA512 e60ee7f2a6911d2fee83d2843b0fbec05666ec5e99001403796d6d93f56288bd80683847431b345cc3f85c96f694f046007fb6f79e4ebad320b5e450c9cc8367
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
deleted file mode 100644
index 13cbbd704cfb..000000000000
--- a/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Professional cross platform layouts with Swing"
-HOMEPAGE="https://swing-layout.dev.java.net/"
-SRC_URI="mirror://gentoo/${P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	default
-}
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
index bdf33b331bc8..e7338fbad6a8 100644
--- a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index b621a73f8980..d50e15344c54 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.31-src.tar.gz 428057 BLAKE2B 9e76c2c4c6e3721c36331f21026c00dda40e811ed34b6deb024f3511159c96ec624131aa3d9e0cc26fb97286bd9f0133d03d742fa5616d05ed18ecacb05d3d51 SHA512 2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
+DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e
 EBUILD tomcat-native-1.2.31.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
+EBUILD tomcat-native-1.2.32.ebuild 1183 BLAKE2B 72151cd98fadc6c5b01b6d41335aa922546a866e67959b85429941a3f14279a7008251b60e511d69a01d71cd0936366b247cd826d3a457176d5461a7afb97541 SHA512 372060e6f4641fe0886a9f1a43788722c12d49c6497d52c277f1edab3b31e59b1cefa38873dc77c60f03b81bfde5d3ca201b50c2e8f5696f0bd79dc2b216b306
 MISC metadata.xml 807 BLAKE2B 38715d09df2df7390b4f1bb3179d2d5cb65874f438ea434cc30e52aa8068ae9d9fb60f147f69cda6300cef97aeaa8eb950c55027f5cc3ca67f9afdaf0457b21a SHA512 fc6ae086e1855089491a9ba0b1abb007005a15eb85b5b213d8d36451ff10968dbd810f229795dc384e0e48ab1b9dabffacac333397c4b526c5490de5f99d7d5d
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
new file mode 100644
index 000000000000..1d527ab32b16
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
@@ -0,0 +1,62 @@
+# 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
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/upnplib/Manifest b/dev-java/upnplib/Manifest
deleted file mode 100644
index b2dab10a2eda..000000000000
--- a/dev-java/upnplib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST upnplib-1.0.7.tar.gz 349943 BLAKE2B 509474e1478a791ef01d70380976e17628a8c68115b068602875091d3b10c1c2ecfcd4be6b7917d9605da8c4c7ef6da8437c3dd905811513c42f132789071a31 SHA512 b44d1f539ebf2ff3860f3d3fd664343148c81437a6e3fb69f2941c6dafcdf9a48a1f682d8ed250848edc656dc38858cf3a630dc026e9e3be340ef5b39fd7b8cd
-EBUILD upnplib-1.0.7.ebuild 894 BLAKE2B 6c748e74c39f7d85de37f2009a06b9730f7564c5736e09b848ebf6188cbd5b3b6d473ff7053f75829f792089946fa5a8e9316e53e6bd2ddfc71ef5e2f019c135 SHA512 e178fa93e7c923e7b002aa41ae1e740c2501bf7b4d4f6132e8b23f7557afb857c4885506b38e963cf443ac64a74890351722505c7c9827a7d9c1a0850977965a
-MISC metadata.xml 317 BLAKE2B f71bba6322a0d7bff9ba3b7148123a33935b04cc33a585d3eeabc76f3cfa53862cf46204ef4bcfcbe244eca4a689e8e734fdd486f791c726d20b8ee63fb46c3d SHA512 3dce8de3b0916d6b2a0ff75c251c88eb8513f1f0d533b0b26a4dbe6ea546379050dd47513ddd9a7b145411288c52cc6ed6338be62d473cef5840c05cf9370737
diff --git a/dev-java/upnplib/metadata.xml b/dev-java/upnplib/metadata.xml
deleted file mode 100644
index 274b6a97d477..000000000000
--- a/dev-java/upnplib/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">RPTools/upnplib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/upnplib/upnplib-1.0.7.ebuild b/dev-java/upnplib/upnplib-1.0.7.ebuild
deleted file mode 100644
index b9406fece2ba..000000000000
--- a/dev-java/upnplib/upnplib-1.0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-COMMIT="33d17845e34c7c8b897224d0d1c243951398f853"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="UPnP port mapping library for Java based on sbbi-upnplib"
-HOMEPAGE="https://github.com/RPTools/upnplib"
-SRC_URI="https://github.com/RPTools/upnplib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/commons-jxpath:0
-	dev-java/log4j:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="commons-jxpath,log4j"
-JAVA_SRC_DIR="src"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-java_prepare() {
-	# mx4j has been last-rited.
-	rm -rv src/net/sbbi/upnp/jmx/ || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use doc && dodoc README.md docs/html/*.pdf
-}