gentoo resync : 24.07.2021

38 files changed, 332 insertions, 135 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 470e30cbbd00..a7b4cdae926b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 15de79a6518a..c8284a792671 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -14,5 +14,5 @@ EBUILD antlr-2.7.7-r9.ebuild 1152 BLAKE2B 46708d1153f7d4bfc9a58f5e7f19b3c4129c23
 EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
 EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
 EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3-r1.ebuild 2522 BLAKE2B 57b57fb24b9066d3491036acc4ad8e95ff456866a51882f1de869b5b01a8a027521bd91194d458d3658593be3a8ae41e41839dcc27bfa69c5b828b39ea7985f9 SHA512 2be264b788fde22e8225d8b4b2979820bc9cfbebf59f874a2cb8f847a76d5ece8d699311794dd1e01fe17e262d16f02589d2730130fed1a64a13563c6f470c0b
+EBUILD antlr-4.5.3-r1.ebuild 2521 BLAKE2B 439d098a1ae5b7238d89f896723418a212ca4fc1c59ab4da70ede8f3d245fe63befc4ae1c81c8c41a5a1aa351b643e56be916cff04d213aad8ef044483a5ce2c SHA512 35fb47714fc1187138706791bee5f352c3c8df99a1e4efbce67df358a311d531be27c4a4214c2e7c114667e5de656b0130e45cfe2cbf47662c08aedaf6e83c10
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index 3c70f1210ae3..b9cfe8237899 100644
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="4"
-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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 0f7922e30b0c..17683d390fe9 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -3,5 +3,4 @@ DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7e
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
 EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
 EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
-EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
deleted file mode 100644
index 3cb523c4cd89..000000000000
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-collections4:4.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-SLOT="4"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.7
-	test? (
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc RELEASE-NOTES.txt
-	docinto html
-	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 45472d5a010f..8cdffe228601 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -2,5 +2,5 @@ AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
-EBUILD commons-httpclient-4.5.13-r1.ebuild 2224 BLAKE2B df78302c2e2a43e993ef8415ec9ba3a32871a50ead217eaf14c2b73707f7f561322f5f866ccadf94444b52ec4ca29eb60084d9a0c6f9148661909e06a1ee30dd SHA512 adfb02f15e6e5bd9aa9fc180e0e1ac8b60d5ce64a4dd5a3de865eb5b5781f246cf055bf876495a44489c3b370466c151cc0fa22dbc30c4c295d80f3fb6b5d2ce
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2223 BLAKE2B 0289176e10c609a13f173314f6aada1f74011c729309889a96e5485aa05c28517da26621988c962d1ff79c0bd5526d964ac9cf275021687c7c148536fd78eb63 SHA512 a2913be90a81fc105f2a1ea12faa38eb07ba0a52a16b2c65d2d3b0398fde21b4be4582818af3d1434934bba6cd177459efbeefd98c6d8dd4c599645b01390425
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index a9080209c2fd..c13ad1428399 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-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 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index f9020e6424b1..cd1283bfc878 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,7 +1,7 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
-AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095
+AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
 EBUILD commons-vfs-1.0-r1.ebuild 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd
-EBUILD commons-vfs-2.0-r1.ebuild 1555 BLAKE2B 6b63d2ba8e44911ee0bbb849b2818b9db99c7e054d5fa4c8f70d1a041f8ee6c32ce34ed94e4e5b6ea135c803b4b1cdf1b842f9a7fd1a6ed6fcac3ddf2d34a371 SHA512 717232ee5632658753e44637acd0edc9424782311bc370ffc2f3dd494ca46c188d79347dc67c1ea67c658809170fb452f4d522bd3d60029d0d3fa0a8b07f945b
+EBUILD commons-vfs-2.0-r2.ebuild 1631 BLAKE2B 9febe1a1166ca72b1d0c1804fe4713a265e02482091304f68ae1382141a32e8c1ff68ce8ccc07f2782896516b6bf3e3cdbda4bb3daa9f4bc7ea534b996cfc1a5 SHA512 7c315b76f89ca88c8a3d24f925eb4b6eb33413bc6873aa72b5cbdafacbf1764bba6c2aa06a107995b2f2e08c68071f6c95a13790552ae33745d5db4d54ee8539
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
index e8991f3641cf..8f5598d5645b 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,25 +22,19 @@ CDEPEND="
 	dev-java/commons-net:0
 	dev-java/commons-httpclient:3
 	dev-java/jackrabbit-webdav:0
-	dev-java/jsch:0
-	"
+	dev-java/jsch:0"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
 
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${P}/core"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-incompatibility.patch
-
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+PATCHES=(
+	"${FILESDIR}"/${P}-incompatibility.patch
+)
 
-	java-ant_rewrite-classpath
-	java-ant_ignore-system-classes
-}
+S="${WORKDIR}/${P}/core"
 
 EANT_GENTOO_CLASSPATH="
 	ant-core
@@ -61,9 +55,18 @@ EANT_EXTRA_ARGS="-Dlibdir=${T}"
 #	ANT_TASKS="ant-junit" eant test
 #}
 
+src_prepare() {
+	default
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	java-ant_rewrite-classpath
+	java-ant_ignore-system-classes
+}
+
 src_install() {
 	java-pkg_newjar target/*.jar
 
-	use doc && java-pkg_dojavadoc target/site/apidocs
+	# [javadoc] No javadoc created, no need to post-process anything
+#	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java
 }
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
index 298503ec6153..59e2f287afdd 100644
--- a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
@@ -1,6 +1,5 @@
-diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:28:39.072739044 +0200
-+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:30:24.799404027 +0200
+--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:28:39.072739044 +0200
++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:30:24.799404027 +0200
 @@ -50,7 +50,7 @@
          {
              try
@@ -10,9 +9,8 @@ diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/Exception
                  if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
                  {
                      if (DomUtil.hasChildElement(error, "exception", null))
-diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:28:39.072739044 +0200
-+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:31:02.449403426 +0200
+--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:28:39.072739044 +0200
++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:31:02.449403426 +0200
 @@ -63,6 +63,7 @@
  import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod;
  import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod;
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 4121f570479d..f03898e5ef8e 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,11 @@
 AUX fontbox-1.7.1-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
+DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
+DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
 DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
+DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
 EBUILD fontbox-1.8.11.ebuild 1170 BLAKE2B a483121fdab73f9a92f4e9057114b92a90990f26cb3fbcfb3d28f8424af3b01a836b7eb7a8a2af11ba99dfa5db3e027f21761372d55cb00606b6bf626c79c2ea SHA512 dc7940fd45a410e30a147a7d4669aeabbbdcbbbf7415ffe59cce7c9130263980c375decde18aeab7e1956e78b2826ce6c4866393577ff7686b1b32c277dbd607
-MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
+EBUILD fontbox-2.0.24.ebuild 1765 BLAKE2B 602179a3ed887f0201cb62c7596380a486e89e2bc27248c8a1286511133a79ffb04da4326cf145694a13f43f342568cd477232198d75f0ce6509bffb258a225c SHA512 54f58693fe3a152d2cc99c7abc49dce282b44f162d04625c4d785f96ff4d43c0d397b79e370f91cf3118d3a372d6b119ed467c2b651a6cd7992b9261716abd01
+MISC metadata.xml 570 BLAKE2B 80071f93eb72253bed0abd8d049626e10c52327777a440a7325b81ceda3c11f095757c5833b9e572499760b389263824adbc4541787eb99a44faea79f193ecc6 SHA512 66595990acf09fb6e612cca3bffb7f42f3d11df4a08ba998121da77bd877373f36865bfafe43e17f7462a088849046c8c9dd8e1fd6c4e66d9216a2b0a3e8abd4
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.24.ebuild
new file mode 100644
index 000000000000..36fa75e64718
--- /dev/null
+++ b/dev-java/fontbox/fontbox-2.0.24.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="https://pdfbox.apache.org/"
+SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
+	test? (
+		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
+		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
+		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pdfbox-${PV}/${PN}/pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CDEPEND="dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/pdfbox-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	mkdir --parents target/pdfs || die
+	cp "${DISTDIR}"/DejaVuSansMono.ttf \
+		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+		"${DISTDIR}"/SourceSansProBold.otf \
+		"target/pdfs" || die
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
index fac651d95a59..fe29d9c6e1f8 100644
--- a/dev-java/fontbox/metadata.xml
+++ b/dev-java/fontbox/metadata.xml
@@ -5,7 +5,12 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		The Apache FontBox library is an open source Java tool to obtain low level 
+		information from font files. FontBox is a subproject of Apache PDFBox.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">apache/pdfbox</remote-id>
+		<bugs-to>https://issues.apache.org/jira/browse/PDFBOX</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 53f2e92efa58..7486d8910d11 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,3 @@
-DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
 DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
-EBUILD gson-2.7-r1.ebuild 571 BLAKE2B 4822c5d75ea5822d20a3b48e6ccd64e792efa32a2810fc1ccc88f430d5183b7b9a756744a8239d74a3fa3b550707ba9fe7d43d9180ae56638d814b4f1d76e1a3 SHA512 76945946101257ecfbef0c3cf97a3badc2a3e15a9def7e863a551b8ecd52f323fe8b2fdf7a4f4bf912a5d35503a5eefb0c7a71a658567b02d40f9767bf6d9fed
 EBUILD gson-2.8.7.ebuild 1122 BLAKE2B fe36a3255c95238213b909258c3b160d27e09629d14838d6684a3a4db273021434db1cf994093ff6134ee910c030d771ebaab45c045691a8696c4fc27d234f42 SHA512 e7a387f35ade78894858f138ce01e8e3e47a60e6506e7558a7fabd037eb46cac7759de4ffed37da345c94997e0e8abb911459b1ed37f674e2afa619b5476a721
 MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.7-r1.ebuild b/dev-java/gson/gson-2.7-r1.ebuild
deleted file mode 100644
index 54f042e16ae5..000000000000
--- a/dev-java/gson/gson-2.7-r1.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_P="${PN}-parent-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index 70c4c022014c..2615f873513b 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1591 BLAKE2B 86b63de69b8803971a875fd7b1aaf34d7ac65cf2e9f4b7683f99d2d585c0896ea89304c28583dc3301d446d80872af535f69867fb57fb1e8b127a356a7b985c8 SHA512 a2f1b1a16d53d7b0ce562a752a567d951bbc02b1297d9e9cd44ed258891e7c2bee0c61699d2438c4d7d2a43536b1fb932ae2db33f31a2e239301ef70a5960a25
+EBUILD httpcore-4.4.14.ebuild 1590 BLAKE2B d60f9f57fa1d305c754fe2c7c41ba0b84d900f55392e96ba8f340d810ea6446e88893a3542a8668dbafb20f5f66fb0de006c472c33d3220a8bf370febc160ad7 SHA512 d1eb80fd5467a6a7150bbe83facdbaead1068660de3d923a553d2e2b794bc53140fba54702d298520f9f6da1cd00e4fcc0ebdec39d20dd10bcf5dc90f3f2eef1
 MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index f5b9fdf5466a..8e3fe959caa0 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/jai-imageio-core/Manifest b/dev-java/jai-imageio-core/Manifest
new file mode 100644
index 000000000000..d44e8ee7ff50
--- /dev/null
+++ b/dev-java/jai-imageio-core/Manifest
@@ -0,0 +1,3 @@
+DIST jai-imageio-core-1.4.0.tar.gz 1542191 BLAKE2B 3dc8de7cd8e375eb3b4e5a6524e0280bf295ffb0d29b2989a35789f8974f27a6ba50f1b3b82c88af0992cf6ce7b5fba28e38f2892b3ac34b2c20d7245035f2ec SHA512 20d361cbb040b692717acad56d12034ff695859f125acbac080092fb0423f5338bfbd9a39a968b67712f4f0a62cc02a51dc9e2cffbb886efb379c8a923a11ad8
+EBUILD jai-imageio-core-1.4.0.ebuild 1190 BLAKE2B e105e437cc9b4e109556c88bc5c0314b2ac1cc6abe726694401c268cd51a76d6fc056b0f12ece1a16cebe0d59aec2ecbe716ea7906418332407f5a9b542d733a SHA512 1c5ce3dff76c5efa3fb20c1c93b3939610e4ab941acee828b6326a108248b70dfad9ea5c4ee3cfe59c6f457a55cbadbf65a266544df46afd433f44f8328d4745
+MISC metadata.xml 680 BLAKE2B 6e6e777fbbf2800def11c32044034286955b745222eaf2e8ee5b608b288d65f06ec887fc7f63d2d97a05f603e9e95ce8fab59c9cc206e9d816c9481664760629 SHA512 91dd07884ad85aceaf915d2754236033ae68da0845af456da91f2c052b861979d9cc147201f2a6c69b1bcf7685e8eda5e15e9a8db86593dae495015f61fa4f85
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
new file mode 100644
index 000000000000..98cb04b71840
--- /dev/null
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-core-jai-imageio-core-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-core-1.4.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jai-imageio:jai-imageio-core:1.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Advanced Imaging Image I/O Tools API core (standalone)"
+HOMEPAGE="https://github.com/jai-imageio/jai-imageio-core"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Sun-BSD-no-nuclear-2005"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
diff --git a/dev-java/jai-imageio-core/metadata.xml b/dev-java/jai-imageio-core/metadata.xml
new file mode 100644
index 000000000000..964c031aba2f
--- /dev/null
+++ b/dev-java/jai-imageio-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Java Advanced Imaging Image I/O Tools API core, but without the classes involved 
+		with javax.media.jai dependencies, JPEG2000 or codecLibJIIO, meaning that this 
+		library can be distributed under the modified BSD license and should be GPL compatible.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jai-imageio/jai-imageio-core</remote-id>
+		<bugs-to>https://github.com/jai-imageio/jai-imageio-core/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jai-imageio-jpeg2000/Manifest b/dev-java/jai-imageio-jpeg2000/Manifest
new file mode 100644
index 000000000000..7ebc2493369e
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/Manifest
@@ -0,0 +1,3 @@
+DIST jai-imageio-jpeg2000-1.4.0.tar.gz 499964 BLAKE2B 219b53d2264f819ed808495e5c559e8350f965ba100696f28e817ef27cf458fe2b05401957d81a3f4f208f59888a0607b72e4529fdfd37c6763cd1b8da1f2f5d SHA512 6c1129f735d1e6578e8feb233fe5462a62f503979d7afad9942acd749b39714e352df6133fad0b99f4fd84af82de10efbf91196eb0cc9d40c080c9546948f4eb
+EBUILD jai-imageio-jpeg2000-1.4.0.ebuild 1461 BLAKE2B 4fa9253ab83c270847d37edbdd23d27ef16e526b85085b83a224a54f15ff0f89eda0fc08ac2cd1b5cf05220cbea246bbcd68cc0fc9c58870dd7196a41745d5cc SHA512 e074879d9558520a284ca39e73d901400e6592731eec20df72240f69e06053a88194fa47b405949eb94081d3a69c7ef4e21412cf088f018a44e105dfc28e9ab2
+MISC metadata.xml 680 BLAKE2B 09b09844455bb544a14021eb4211bf2ce27133c8dfcf376a03eae85499ce00fc96d0752e18075cd064c77bbaabeb7036992002d9be2ac6de6327ffbd048bebf9 SHA512 8fac9c38dc6eefdd33148479d6e8b596484d3cd534a848463ba8358f2ba743817b3d3a95e66d38639fb47036284f4281e49304e3022dcfea3dc1e44e3ac9378e
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
new file mode 100644
index 000000000000..b3b0973e65d6
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-jpeg2000-jai-imageio-jpeg2000-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-jpeg2000-1.4.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JPEG2000 support for Java Advanced Imaging Image I/O Tools API"
+HOMEPAGE="https://github.com/jai-imageio/jai-imageio-jpeg2000"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Sun-BSD-no-nuclear-2005"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}-${P}/pom.xml
+# com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
+
+CDEPEND="dev-java/jai-imageio-core:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:* "
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="jai-imageio-core"
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
diff --git a/dev-java/jai-imageio-jpeg2000/metadata.xml b/dev-java/jai-imageio-jpeg2000/metadata.xml
new file mode 100644
index 000000000000..e0cf2ba2bd75
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		JPEG2000 support for Java Advanced Imaging Image I/O Tools API core.
+		This module is licensed under the [JJ2000 license](LICENSE.txt) and
+		is therefore NOT compatible with the GPL 3 license. It should be
+		compatible with the LGPL 2.1 license.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jai-imageio/jai-imageio-jpeg2000</remote-id>
+		<bugs-to>https://github.com/jai-imageio/jai-imageio-jpeg2000/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
new file mode 100644
index 000000000000..659d6ce9e967
--- /dev/null
+++ b/dev-java/java-diff-utils/Manifest
@@ -0,0 +1,3 @@
+DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
+EBUILD java-diff-utils-1.3.0.ebuild 978 BLAKE2B 3e286fe911d7ebad7f973913e5fa62571923ec55f621f7f08123a670a4647a6ce2e9ffc7c04b7b2f1d39130f0c57703d5b698f3fa69df4a0a05422a2e61e6d1e SHA512 bd523eb7c76ed3450bf1363f8168f0bb443330852db6d1dc7aeeb859c26f8db00dd22ca5f7fb745a378f82de2c5e925b53623bc87531ecbe1e6822ad19353c01
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
new file mode 100644
index 000000000000..5dd403738076
--- /dev/null
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom diffutils-1.3.0.pom.xml --download-uri https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild java-diff-utils-1.3.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view"
+HOMEPAGE="http://code.google.com/p/java-diff-utils/"
+SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/diffutils-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/java-diff-utils/metadata.xml b/dev-java/java-diff-utils/metadata.xml
new file mode 100644
index 000000000000..0d49beafc75d
--- /dev/null
+++ b/dev-java/java-diff-utils/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jbig2-imageio/Manifest b/dev-java/jbig2-imageio/Manifest
new file mode 100644
index 000000000000..9e2a45ad47d1
--- /dev/null
+++ b/dev-java/jbig2-imageio/Manifest
@@ -0,0 +1,3 @@
+DIST jbig2-imageio-3.0.3-src.zip 2079380 BLAKE2B bb05f81bfdef00b1a0ffcb7a2df2617fe5f5a83957249266917e775ceab57282ee289aedb198c6639201e85df83e89b8cfe8cf2d865fff863d1f2a5acd439721 SHA512 5350b4ce89af72eea5069f6ea5fc830238e4df711712506405aaf0e14546a1b07155b8c5225b47f0d40ce2821032426a2987adbe0df63c536cae4fb319b5c700
+EBUILD jbig2-imageio-3.0.3.ebuild 1321 BLAKE2B 134861334ed032c9b49c63ef69adc8747d7f0be358c4b9d9243bdbabf9d5ca6544684e0420396915d2979284b4b5d56cd415bb01502f5083ddd1f17dd4e2b822 SHA512 427a2e5f7a0d9c861fc94a67223f29c6279e7aa94669de2829d0d327670623243b7d4958cbb9b8d151cd04e7ddadf4a143cd05763d127a2b47c933e1bc03a6bf
+MISC metadata.xml 497 BLAKE2B 991d15b62eadd6ae2919d5c22902f08f93d2999c6d29ac670f11c4e21a0da8f9ed04abac1416d603a376b5021818e95c2e21f0a144605a890698a4e9bfff65bf SHA512 b0910a66f6b6bd091e080edf0673783fea45065cefa8ffc967b45f0d06a426275784fa0bc56dbf2839273e404bc5a597c5c2c0a951527c6951711ff52847229d
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
new file mode 100644
index 000000000000..f6ba1cf47e0c
--- /dev/null
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jbig2-imageio-3.0.3/pom.xml --download-uri https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jbig2-imageio-3.0.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.pdfbox:jbig2-imageio:3.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="PDFBox JBIG2 ImageIO plugin"
+HOMEPAGE="https://pdfbox.apache.org"
+SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${P}/src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class
+	#  1. Test class should have exactly one public constructor
+	"org.apache.pdfbox.jbig2.util.TestServiceImpl"
+	"org.apache.pdfbox.jbig2.util.TestService"
+)
diff --git a/dev-java/jbig2-imageio/metadata.xml b/dev-java/jbig2-imageio/metadata.xml
new file mode 100644
index 000000000000..22254bd7257b
--- /dev/null
+++ b/dev-java/jbig2-imageio/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Java Image I/O plugin for reading JBIG2-compressed image data.
+		Formerly known as the levigo JBig2 ImageIO plugin (com.levigo.jbig2:levigo-jbig2-imageio).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/pdfbox-jbig2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f589d06af0b0..407a5319a6ac 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -11,5 +11,5 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
 EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
-EBUILD openjdk-bin-8.292_p10.ebuild 2990 BLAKE2B 30fd8d4a745ec3f8635ec9186505f1b3affcec34afb2a78f5fd9daf104a093d70661ed77437e7917088fc1b0ecb7098ed0a9f5eacedf9bf7bea6ce15a16f0b71 SHA512 4a6de5b9d6ae9ad3b1db2352cbc4169839a0f371275d1fb1631c6b7eedebd51e82b4c00c1e65813aa12ee3061e37df29f2d74c6e06f920190d064f8a911bf085
+EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
index ed94c334091a..855c583cbcfc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
@@ -113,6 +113,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index cd5b1dbe5c81..d1c223c40903 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -3,5 +3,5 @@ AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
-EBUILD openjdk-jre-bin-8.292_p10.ebuild 1802 BLAKE2B d7b2300d8b5896e2aaaa17f67bd2b436aba77be2fbd68a0035dc66ee24ee48a220da5e609d2e2185509abc94ec5ba43bda9494bd205e1dc29505704a77551ac2 SHA512 7bb823c6144ec8aa219782cbae8b73a2ae662aa056ce79524cc4efd37a81ff65d3cf9f8364013b78c49419ac53f684ded95c8eb2ef0d1bb8b48c51c07eee6676
+EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
 MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
index acb70caacff7..49dddf130391 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
@@ -73,6 +73,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 4af4635d55c1..7b88f2fd548d 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,5 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 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-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
-EBUILD swt-4.10-r2.ebuild 4644 BLAKE2B 3128a781fe1517bee80087d58a5920b6394363dd592d69ddbf733d6331a4eac1b7ca2c2ca2df8ab978a7264269eff3d0dd8147bd169275ab5632077548312438 SHA512 9401c712c6230413da3f4ebcbadce7dd0411f16930cd6adbe79daa193197b83bcfd41ac8f465a5ea27a34264da74a1458a8e8b806975a63e4b1e6ae15be778fa
+EBUILD swt-4.10-r2.ebuild 4314 BLAKE2B ba5c51b5a3b0d809ed5f4b258c973eed2fdb005af8c24a13d4de99d6e2ffb297431a91f9a1b67e6504a1fea1260c16e57ad9c08abbac558fcb51abbd2853b8fe SHA512 fdc24c724ba8e238140f1cee87b310fdd3c50faf805dd51776d6ae88615ec8467a1956def30be559af3d7c5ca5740ac515490daa44d6db770875aa3c6d8c9295
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
index 8c3986977dbe..291a35848865 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -87,23 +87,17 @@ 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) == 'ppc64' ]] ; then
-		# no big-endian support
-		AWT_ARCH="ppc64le"
-	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)"
-	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/lib"
-	else
+	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+	for libpath in "${ldpaths[@]}"; do
+		if [[ -f "${libpath}/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}"
+			break
+		fi
+	done
+
+	if [[ -z "${AWT_LIB_PATH}" ]]; then
 		eerror "${JAWTSO} not found in the JDK being used for compilation!"
 		die "cannot build AWT library"
 	fi
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 9f70e66f72cc..fb00bda45bec 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,7 +14,7 @@ DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a136319
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
 EBUILD tomcat-servlet-api-10.0.6.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.7.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+EBUILD tomcat-servlet-api-10.0.7.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c
 EBUILD tomcat-servlet-api-10.0.8.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
@@ -23,6 +23,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.48.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-9.0.48.ebuild 3011 BLAKE2B 4208db9782f6ba2354476bca2b134ba104bd5cf12a33ff1fc133b914fee21ee5016699da48305e7fbe7c76d4d324192b361d66983c0ac977899fb3050ca1a4b7 SHA512 89a6cfb80295f0a9fc4b6bd87e6d6dcbcd7acc5ec660050796ccfd2d13723804d0e5cd25c531da8ec6174c76e24139dda051e6f771630990558c1b9da3fd949d
 EBUILD tomcat-servlet-api-9.0.50.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
index fb739b89bf7a..c5339740e594 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
index 4a8d22d12869..eb33dde54b1d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"