gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /dev-java
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
119 files changed, 628 insertions, 1928 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1a7765869b41..f569db99c39d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/angus-activation/Manifest b/dev-java/angus-activation/Manifest
new file mode 100644
index 000000000000..9b311600bbb1
--- /dev/null
+++ b/dev-java/angus-activation/Manifest
@@ -0,0 +1,3 @@
+DIST angus-activation-1.0.0.tar.gz 26068 BLAKE2B 45151d8d0bc3c2b1835d2ceab62e9d4ab5294dcfbbf606d3298013f0dd5f27a7bbe950effbd053a6e54ec1179884870c167e8967b3536dd79902dbda506bb8c8 SHA512 e6e7b32f1aab8d293d5855a3e6b155922c18aeddf13b3daab6928c1b95b4af6dd292c5670351a70870723bc80a58ef4366e8b4fe40c5f5b995266751bccfdef6
+EBUILD angus-activation-1.0.0.ebuild 1318 BLAKE2B c7be66e41af57493208a8beb28be646f14c14f75f34ce33968ed33c2cbe898b4a093d307a709078178aedc72f5d7f408b2a528705e481aaa24b4fe51bc72a127 SHA512 07f30cbc9230307e11fb5add71cf5c170d072c1859aa4865b4f5b3ada886bb1322c6bc3e45ba6f47c5c7cefa229577a04feac0dd089353034e4e11be7435810b
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
new file mode 100644
index 000000000000..20dddabd6c04
--- /dev/null
+++ b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild angus-activation-1.0.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.eclipse.angus:angus-activation:1.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides the implementation of the Jakarta Activation Specification"
+HOMEPAGE="https://github.com/eclipse-ee4j/angus-activation"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> !!!suitble-mavenVersion-not-found!!!
+
+CP_DEPEND=">=dev-java/jakarta-activation-api-2.1.0:2"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}/activation-registry"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/trident/metadata.xml b/dev-java/angus-activation/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/trident/metadata.xml
+++ b/dev-java/angus-activation/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
index 2ef504e95f75..2c156a9dc02f 100644
--- a/dev-java/animal-sniffer-annotations/Manifest
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -1,3 +1,4 @@
 DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
+EBUILD animal-sniffer-annotations-1.15-r1.ebuild 653 BLAKE2B 66b80fcb62f2686dbc13d709c40c98c2ca6fcac8b2a83b13ba97b646c62777cc371a71337275896e98ab4cac373bf2cc75519c92543c984d7dce0b26e8eeaf2d SHA512 39dd3a582ae8f60a721a1669ee690d393233517ff0f7ba6f75e05feae302fafc04721b37d56cf7439cb4e531505b2f62205036f714a9f79ff4cc0798456c6e36
 EBUILD animal-sniffer-annotations-1.15.ebuild 645 BLAKE2B 16ed0faeecea74941c20bb0eb59dafa940263cad0dba9e4cc5724b9adc56789a4db1a93d8d21bb2ea3e75b94180a0a008957f60f2cd2f70a3240b17a9032ad44 SHA512 29b609d7357aa0a1dbd2075ec0e54dd762d5a0665cb9490f7bb8bc1791c4b2b284ecc81b030e6a7a6b3a1f64f565930ae1c0fbfec80cdf58b077e749600f654c
 MISC metadata.xml 325 BLAKE2B 96e92a307063c6d997316abf0b9395c65445907c3141313f07aa336eed839cb909f624bce9b67d6960c7703b79537e136beaf01025d7cf39dcbbe6262a0093f8 SHA512 032db77bc61e5e86c039cb49faa6d50363e4b94c0b14b2ef5192e8ee6fdba3592616e1970ad6f87d662ad01b187627e7b6fb6774664839fa549e76aa3e9bbe7b
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
new file mode 100644
index 000000000000..deb9566f57c0
--- /dev/null
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-annotations}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for marking methods that Animal Sniffer should ignore"
+HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
+SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_PN}-${MY_PN}-parent-${PV}/${PN}"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 81f3f0d35ebc..5a73c18df826 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,6 +1,3 @@
-AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
 DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
-EBUILD ant-contrib-1.0_beta3-r2.ebuild 1814 BLAKE2B a2bb1cab559d3e71813493337aa09865010665855ea4321e8cbd4132105d09c169da9fc1a4dccee2931d586fc63f225a39d95151f4d23e8a86bd4d5d9b556c17 SHA512 e46e91963aa9f9fb1fcfa61e4689fa9fa06b2c880ee4c21bfb70bc1f55725d0e59153b8a978856bad417afcb7ea07b30035e64fee2b5ee84fdfb91fa86185d85
-EBUILD ant-contrib-1.0_beta6_pre20201123.ebuild 2269 BLAKE2B 3eed3cd16b0b73c5991f421cb854528c5c7a81619d05c015236508835e571bcfa9ea83a6ea74f2901122041b29cc2065faf3f8dab4293d10ad360604921ace93 SHA512 0e492df4e615af11202b2df13c7808a3c1c5df107680bf124b2558fbb939a60fe34643e7da553e1abb3c25e8ea2014cf9ef555b48621f8e4e847e384f82bd0d9
+EBUILD ant-contrib-1.0_beta6_pre20201123-r1.ebuild 2247 BLAKE2B 07506ad4330f5273f2a7a1ccfe8c1e4bcc2ea27a6ecfbfc0ed279dbf13b1df82c7cfb153cccd528cfcac2e2394612f4b2c1d73449972e509dd488d42078f9006 SHA512 084e1dffb72fd0a13b34506c7f154aeb833a351b07ae1db9dc681e0207a727184355e0d261f688d0cd2fa8a74b50cf6b1aa460d4c9a58ef61334c54278fd112b
 MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
deleted file mode 100644
index 68d5f869ed7b..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-ivy"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-CP_DEPEND="
-	>=dev-java/ant-core-1.7.0:0
-	dev-java/ant-ivy:0
-	>=dev-java/bcel-5.1:0
-	dev-java/commons-httpclient:3
-	dev-java/xerces:2
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.4"
-
-# javatoolkit for cElementTree
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.4
-	>=dev-java/javatoolkit-0.3.0-r2"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/tests-visibility.patch )
-
-rewrite_build_xml() {
-	python <<EOF
-import xml.etree.cElementTree as et
-tree = et.ElementTree(file='build.xml')
-root = tree.getroot()
-root.append(et.Element('path',id='test.classpath'))
-root.append(et.Element('path',id='compile.classpath'))
-skip=['resolve','classpath']
-for target in tree.getiterator("target"):
-	if target.attrib['name'] in skip:
-		target.attrib['if'] = 'false'
-
-tree.write('build.xml')
-EOF
-	[[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
-src_prepare() {
-	default
-	rewrite_build_xml
-	java-pkg_clean
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-
-# Can't load bcel for some reason
-RESTRICT="test"
-# for tests
-EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc target/docs/api
-	use source && java-pkg_dosrc src/java/net
-
-	java-pkg_dohtml -r docs/manual
-}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index f652e7eadd71..38db7e73b27e 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -4,7 +4,7 @@
 # Skeleton command:
 # java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
@@ -14,12 +14,15 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
 DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+HOMEPAGE="http://ant-contrib.sourceforge.net"
 SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
+
+# Too many tests fail
+RESTRICT="test"
 
 # Common dependencies
 # POM: pom.xml
@@ -31,11 +34,11 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 # xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
 
 CDEPEND="
-	>=dev-java/ant-core-1.10.9:0
-	>=dev-java/ant-ivy-2.3.0:2
-	>=dev-java/bcel-6.5.0:0
-	>=dev-java/commons-httpclient-3.1:3
-	>=dev-java/xerces-2.12.0:2
+	dev-java/ant-core:0
+	dev-java/ant-ivy:2
+	dev-java/bcel:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
 "
 
 # Compile dependencies
@@ -43,18 +46,14 @@ CDEPEND="
 # test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
 # test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
 
-DEPEND="
+DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*
-	${CDEPEND}
 	test? (
-		>=dev-java/ant-core-1.10.9:0
-	)
-"
+		dev-java/ant-core:0
+	)"
 
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
 
diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch
deleted file mode 100644
index 182a17f054e0..000000000000
--- a/dev-java/ant-contrib/files/tests-visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
---- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java   2008-03-05 23:56:16.000000000 +0200
-+++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java       2008-03-05 23:56:55.000000000 +0200
-@@ -76,7 +76,7 @@
-     * @param filename            name of project file to run
-     * @exception BuildException  Description of the Exception
-     */
--   protected void configureProject( String filename ) throws BuildException {
-+   public void configureProject( String filename ) throws BuildException {
-       // find the build file
-       File f = new File( filename );
-       if ( !f.exists() ) {
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index f3364501c391..29f861178e92 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,5 +1,3 @@
-DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
 DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
-EBUILD aspectj-1.9.6.ebuild 1173 BLAKE2B 4c8d8cbce69324c37f5063c541a0908c8e329ddb89514358dff7a864038ebea551defce25fe001a05718d8021b4159e686fcb566b1a2a485ff0f553c089a8fd8 SHA512 6817518bc3776e7df086c81155c3d8d03dc135dd3bbc4ac3f598d1cade97c3f403aebeb4c7194a556b4e721d406debeb4b4b0e0e94726cacbb33bd262d7b7819
-EBUILD aspectj-1.9.7.ebuild 2315 BLAKE2B 5240251e776248d9933bc7c62808f84158cf6359b8225ae54b4fc9d98e3cf2eefe898386f9dc528626a1f26e36cf463753d6238ff42a5a96c75271be61877053 SHA512 bb7ecee75fb607bfcbc2c8103839d9311d00a9915e7bd01db8dd251e70a3626aeddc5e01ad98f3fb1e04d0f026bf6cdc3acc7800f0f597e8e43b25758cea880e
+EBUILD aspectj-1.9.7.ebuild 2313 BLAKE2B 6ec1765f0b2018eb76c6d0d7094c907bd9cb07afbb0a03f45a218b477c01b6df5e8fede2564242cdef31927dcd5d08c1092ef44b3041a845658c41d89c4bea61 SHA512 daa24009e8c0d31da47b832f576edbe854c836819098487ba84d2e8618efb48e6b15440db0b0e1d76a0faa6b649f3a8f05f20c1bc6838089f7db63cb5ae376b2
 MISC metadata.xml 383 BLAKE2B c149ffc9749aead74e303a161c98d052328b8e5a7fc5c7f81f4ca7ff51ba6a5ba6d3456131ddb53d8d6339c211646f689f8712021485fec300f29d83952fe606 SHA512 33d9e6df4103d1fd3f10dcd95780325178b8cdebe4f747ae1983239fc8273c1a5461c7a763a9447556e3fb9641af000789235aefb5933698590f340865c2b161
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
deleted file mode 100644
index b1bc3636c59f..000000000000
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="https://eclipse.org/aspectj/"
-SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/asm:9
-	dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-S=${WORKDIR}
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-9"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
-	default
-	unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
-}
-
-src_prepare() {
-	default
-
-	# needs part of BEA JRockit to compile
-	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
-	# aspectj uses a renamed version of asm:4
-	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
-	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
-}
diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7.ebuild
index 92f77bf5becd..4f7ef2231ed2 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.ta
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
 	dev-java/commons-logging:0
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index e713c8156036..3470c20dca0d 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
 DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3
-EBUILD commons-io-2.11.0.ebuild 1825 BLAKE2B 163727f39e7b9aee6321fbd31b2f7eed868edb4982405fc2bf494e427b1607a2637cd1c61ae2feb23ea727313a7d32f424bc5e67529af5c30bc4ca8c237d5142 SHA512 c541793ee71f7292a8f941689e957827dbcbc3f46476a77351ae499559eeeb0dfb93872dce0326cbb8240d05696c68292f59da129b1a9059dcbba96fc6a9d24a
+EBUILD commons-io-2.11.0.ebuild 1830 BLAKE2B 01b3bc9281d43f2b3fb55fec949cc48592e929ffe420a16e498bd098d1d599daf29e6de3cec7f432f82c3f345a9f29895fcb144c3917c35d716edcb6c1aa8fe9 SHA512 9c05ac5d49ad7ccd67f5eb9e10dc711d3893a72a053ce4218c3b1b276afc2dc9a1bfcc4dd9fe063c09b020a150b2b11c3b77f84c25d413c6473b01cd01105be8
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
index a8b4bf854d9e..8aa24e232dfb 100644
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/"
 SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index f9c4d7a8934d..a087ee5da93f 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,5 +1,5 @@
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
 EBUILD commons-lang-2.6-r2.ebuild 940 BLAKE2B 7099bc7cf2c34f571689352f915f53d1f0279cf925a31b1ae890acf55bcf7f9b321d6bce0c001e9a128c79cf9dc7412858a2008352d9d051b3e29653922a87a4 SHA512 dc3ce86ceae7d667572578748ad0e831091ed10e1706901e580232eb03489fb1c67b7cdd31495f6ef6fd140b1ef2e278a4554b051473482022ea8b1df1e1d0e2
-EBUILD commons-lang-3.12.0.ebuild 1036 BLAKE2B 23160f04bf20a6431d0b569a93c56bbdd08a4ea5ea3a135d1da55c52800fda51524877c507ac244e8e0cba93c7cae8d9210e13df1590ab5021cd2b0e01b9e706 SHA512 530f95c61531f1a1dd96e15dfc48e1224908bb76cb2d1e1edd3b6cf7ab629a8c482344f0a78b28a74bc196fc8606a838e5a86f9c3061620f1d49174ab7b26097
+EBUILD commons-lang-3.12.0.ebuild 1041 BLAKE2B 02381abbcbe5d8d96a61f07ff790a0f17a3c572b13daaee9da2596036be717dbe0c024cf2669771810fcf5a467580d15e3fdace6e0cbb29db732bbae2bc222a4 SHA512 70b53a8ad37fe32132c11789b8cb6f89e8abe38737a5f6c77e42377fd2650026a8d64e7b7eeec639b9a864ff38398d12c848bee5d3beb1f0b2cc35bb62750e10
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
index 26e34f109aa1..4979efe4b1eb 100644
--- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
 SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index cdc196e037cb..f4c1f8da48ca 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -3,9 +3,7 @@ DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9e
 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
 EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
deleted file mode 100644
index 8177f7c9f41d..000000000000
--- a/dev-java/fontbox/fontbox-1.8.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-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/${MY_PN}/${PV}/${MY_P}-src.zip"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-java/commons-logging-1.1.1:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.txt
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "*Test.java")
-	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/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 0910059dd3b9..ef7af4759ea4 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,9 +1,9 @@
 DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
 DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
-DIST gradle-bin-7.3.zip 158812238 BLAKE2B 463c2ad907a914eddf6dd29b1909e97a872fbc014b8cff7c996284fdaf106ac5d9fd24394df59403722be9c44de5729928424ef76539915d2aecc0568bb6ad8c SHA512 56f2dbc88469ed0d8ac94b8b5e37e66e954f80e4daa10e32a6dde9a1167bff8ee75749cc0ac48369d9fb227950253b3cb757d568aff9206528b11b411f38774a
-EBUILD gradle-bin-6.8.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
-EBUILD gradle-bin-7.1.1.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
+DIST gradle-bin-7.3.2.zip 158875135 BLAKE2B 52ae669eb4bea61aa13ac734f8e660db63d0beb865bdb07250cfc14e4a2e8a7fea9613629ec8a1949042463d0a3056949f7bd7c9944e663eee64d900bd92bec4 SHA512 86ca78148bf1df1642ee8a89fb2d560522dd01666de8dd4002f5425ac17b178d108cca99a3311700a84b7dc1d962a2392ab5da6b446177702dfea52c29b6fa40
+EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
+EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.2.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
-EBUILD gradle-bin-7.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
+EBUILD gradle-bin-7.3.2.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
index dfbd1549205b..1e7b593a8227 100644
--- a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
index dfbd1549205b..1e7b593a8227 100644
--- a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.2.ebuild
index dfbd1549205b..dfbd1549205b 100644
--- a/dev-java/gradle-bin/gradle-bin-7.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.3.2.ebuild
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index f3bb496e4ed1..5e533a864f82 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,4 @@
 DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
+EBUILD guava-20.0-r1.ebuild 848 BLAKE2B 9eabed972891b3e2284c3133181fab6188ddfd0ab3988cf6ee5391d028bb8e762d5e6faf947f734e5f732f1a9f424daba4d0f2cf72344e936d93eccdea5df95e SHA512 c4be9028b341fbf960f160e94839af2b2d2672bbfd191336d7d8aa8fb4462086eba3e4f4fc6415451b590200853bd1d31f09d44b02635dacd4e73c5886ec6d75
 EBUILD guava-20.0.ebuild 840 BLAKE2B 35dfd34ff420d4442efcf7a2ce2f85a983e36642359a829132dc6b98125f363c9258d8a8085f71d4b2cfb35a2358bddd7ae2feb0ffd0a66c23a7613ae12a53b3 SHA512 665225fee88e207a37e43da0e1b05c09b273031e3e3fbdae02c2cc83a5abf3122e50d682563f66a55866ba3b00aaf9b7d2f634f81876d846f1332490c3b59114
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-20.0-r1.ebuild b/dev-java/guava/guava-20.0-r1.ebuild
new file mode 100644
index 000000000000..91ac8943a4bd
--- /dev/null
+++ b/dev-java/guava/guava-20.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:20.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="${PV%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/animal-sniffer-annotations:0
+	dev-java/error-prone-annotations:0
+	dev-java/jsr305:0
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/j2objc-annotations:0"
+
+S="${WORKDIR}/${P}/${PN}"
+JAVA_SRC_DIR="src"
+
+src_configure() {
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
+}
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 2c12ee6c32af..7608183e62cb 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,3 +1,4 @@
 DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
+EBUILD j2objc-annotations-1.2-r1.ebuild 603 BLAKE2B 5e4c80fb81dfce5187eeb9a84bf5ec3269d538ed67e74caa976293b93a707e178c8e0c8f4e56c3b5f99d908616807bb90b1a5a4c96ed17c357da1d8597323878 SHA512 6bc412682c0dd7bbbb69997fcf1aef906c76c50d3d4a076f0b523b2a7f36dd1f140d444900fa0bdc3d656801beae7fcf9989bd2a252e1ce6d466a2344dac1d40
 EBUILD j2objc-annotations-1.2.ebuild 595 BLAKE2B cc0646e0ee79815bbf523994d222c2f4bcd3d6934565ab7d1d7acaed8dd888bfd8ff62c402699bdad36707d3b8e3facd9638f9ffcdbf29fcf82fe221086e43d0 SHA512 5f791a23b6dbad302ba069f1fcf49cbf5850b4ee4c70e13af3ce3a101652effa52aa61105fe4a1803ee25632ad91f251f36166d54bd31fe7105f5b0a530ce570
 MISC metadata.xml 315 BLAKE2B 5403ef9a3b61aa4b5bef35fe46ff921be35190630f344563cdd60c8ca0fa6e3f8b1e612ad05df478f69257d85f30c36cd265e2f9664cc41d67e05fc47622f784 SHA512 fd176c272bbae6a6c861625828e363bebee5d92298540a8ec0bd9574d8adbc3f44f273ccb9ac576ac097a9d1c9deb8ff28c9f59ae001e951b030d5276f3a95ec
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
new file mode 100644
index 000000000000..c4d6059dcd6c
--- /dev/null
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
+HOMEPAGE="http://j2objc.org"
+SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 15ad71a95103..b40ccfc27af4 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,7 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
+DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
 EBUILD jakarta-activation-api-1.2.2.ebuild 1590 BLAKE2B ba56e982f02880249e8a1cd29da6b83d3e8cf0d6ed78675da877cca54067f70f0d1e5655c2e83b759db7968740bffaea1ed124ff2ff1f8ff82533a4af68f19aa SHA512 a762af840f87fbb91659e96aad528f0fb2b3163f8579ec154a1c997ad9f5569d751cbf38653396cbd84d47e7f89e7df8f0b4ddb32a11dbc98ed6eca293d360ec
-EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1556 BLAKE2B 8b4cdc1b8139f03d37890f6fe44bc021468dbc12f6c519dd0e79630cd21ebe6bb2f9d05de35f303303ec00a1556c9c3dc8402fb40f65fd27d239d267a2682489 SHA512 3146719d2e89d9f187f907b42ae72b92e61be8a9a7ce040e557a12a183547f19fd816af093dafc84cdcfb53f9b96774961ebd572f5df19c9c36cb0b913d7889f
+EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1554 BLAKE2B 1a21f77cfb5bf7a881a459e4f2bc5fe7674e924579c585cf37dd3432eb04840072209f6475fe0299c31125e6be3d1ac20e303030ed78a568535167ac4c3d8012 SHA512 0253f8930c4b1a6c7308e5a8d61dddcff04abcf62477889a1c97d259f23b2d0fa8525ef92e9f0552233a7c3fc9b0cfdbf06c807b83b9e6f2b37302fe3a4ec528
+EBUILD jakarta-activation-api-2.1.0.ebuild 1066 BLAKE2B 907d27532becffb23593908da6fd85e03923de18d032c13c8f62ca4976f39fac181bea5b36a5de0785d3f8f61be9dfb3a09fb31b8b7cc8e62afaddc7d855a380 SHA512 6617679916c43dc48681214dff8289f237b7f9cfd3aa49b1254bbc908d68c57cd0165b19691a89565d6344b29917f2d7983dafefc9a199e8eab01aa513e8e5a2
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
index 66b3c87f408d..aa778d2687d5 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
new file mode 100644
index 000000000000..5677cb497fbf
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/jaf-${PV}/api"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 59d014e74b96..69d79450abaf 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-1.2.2.ebuild 1628 BLAKE2B 51d96a87b66ac220a184f5567ef77289b72af6f2e85c8093b26a52b36fd0f8843859feb164582cad28f288d443221bbcd3401095046b03de31b7a30c04434b4f SHA512 a723d67df419b3679224139c5739fa9f179b728854bec01c0acbdf4864eaf01e03de9d84e66986c199ac25bb42800c85e098d2878e0ea55c4740dac9858a21da
+EBUILD jakarta-activation-1.2.2.ebuild 1609 BLAKE2B ea8344052807a8d93da556279f8fef6a42a99317be98ccab2cb8e18d7834d04f4fe54821b9511ada0506b36979b2af4720860e858955590af578080aefcff750 SHA512 27a2dd8955cf3ed76927da79ae25b3d738b14fac05cda428ecb2527d00c146ff36281d2b02bd219de068e58a3ab1e307d2f2a1d7adfbe567fc75ac23289872c5
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
index 1fa05d077c0d..4c78c930809f 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
 SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index e8ef866b3970..9e070b31c75b 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r3.ebuild 1397 BLAKE2B d148e1d0c39c955ec1b518d7ca0940cb3800490bd3d91fbb1ac44bd1f721a1767aa22a766c199ddb077864e4e122f13f0e7d9f83b01a1b0dddf3089e2c9e5f7f SHA512 f5082d4a6ad6d86ffd5384d186602b4fcb9f8526328c4a3076f0287f1a72f35697a11d1cc7ad031ccd57492856fb55fc3ca76d8dd1c611661258cca6cf0da9d3
+EBUILD javacc-5.0-r3.ebuild 1402 BLAKE2B 3357b3e97b8d5cbafb588809e6c1e7faafa54f35ab9f910771e0870b2be425998efa2a7ab5376b0f5f0ff67a8822b2f88cf4e6a41ea0a1b5a02d95972839c169 SHA512 74fdbc40ff51b8302639a242e31dd03320832705d7566524ee27be7039ec7974b94625788f4569b45ded38467c6675085ff2b0db3f239d82554fb4af7dd39ebe
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
index a400ba3f05bb..2ee54cf55c8b 100644
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/jnr-enxio/Manifest b/dev-java/jnr-enxio/Manifest
deleted file mode 100644
index e95ad7555626..000000000000
--- a/dev-java/jnr-enxio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jnr-enxio-0.7-build.xml 17106 BLAKE2B b008c295c93839e2bd7086199b4b81c96adcda8ad26e33ece7b0a061b53041e6f481bc73db290d1d9fb15f7bed5a1a3649b79ad20cbcdef299ca6544bc1c2c4a SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e
-DIST jnr-enxio-0.7.tar.gz 10520 BLAKE2B 762c36ad59473d6be4f2c2b8c62ce489fe46ce30afe9b32101aa41ab703c50247cfa0908499f8c2fa79c2ac8c33972abe203984c5cbbe5111416e4684e4c79ed SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834
-EBUILD jnr-enxio-0.7-r1.ebuild 941 BLAKE2B 5e3cc61f215fa1432d6d2a01ba4099d54883fdda044e50f5323e75546b7ff602ac741913532c34efe1c0323639b6ee0c3be9c43de58e340d64a5e47777d3b12b SHA512 e3457d222de26e86948170130453b6470c5f7e63d7e01cf5f42c39389c775bb6322523e93f3d589d99ab8a31b8a39fa0a25d73e1938709207df742c16423c12f
-MISC metadata.xml 325 BLAKE2B a5e522a466e1394c04203a7add3bd2ba2eb53a291be6530afe36c43d7b84c411f675c41bc1f751d0cf0d6a5d550499275106ea913f094fb4cbc4e83ebefbf8a2 SHA512 9ffecfa855189daef3b3196f0829814180ccf556284709b4d3280bbe75649ac286b925dc4721b5b4e032289261b63e23004f96dbabc2a7447805a8d43c71515f
diff --git a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml b/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
deleted file mode 100644
index efdb518451e1..000000000000
--- a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/6/13 12:27 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-enxio-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-enxio-0.7"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
deleted file mode 100644
index a5257b885a5e..000000000000
--- a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Native Runtime Enhanced X-platform I/O"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-enxio"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-enxio/metadata.xml b/dev-java/jnr-enxio/metadata.xml
deleted file mode 100644
index d8701322c286..000000000000
--- a/dev-java/jnr-enxio/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">jnr/jnr-enxio</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jnr-unixsocket/Manifest b/dev-java/jnr-unixsocket/Manifest
deleted file mode 100644
index 6f1f7f919bab..000000000000
--- a/dev-java/jnr-unixsocket/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jnr-unixsocket-0.6-build.xml 17192 BLAKE2B fc3e951c539e98bb9d47a32e232a1838c90e4f25ab04756884ff7fd8ae079df9400e204b99e503af3bc12bc7565bcff681920c3b22d786ee7574544094ba0758 SHA512 d9d33107fa8d28ff5630e806a6a0415cba0fb0962520918f6e6373163a6eefb6ad58a4c3a1f87ca041f6c0dfc48c5bee95e729d591472199b8f07153f9ca9426
-DIST jnr-unixsocket-0.6.tar.gz 6756 BLAKE2B a011f3f660526b0a7e4973a5e2168f9b0ee8a408ad2c9c1b622d9aae7659d915e258a0588f010fb56e0ac5740590b89988d77579884930f70675aff4ffe056bf SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249
-EBUILD jnr-unixsocket-0.6-r1.ebuild 999 BLAKE2B b4c078dd766043c55711f70dc47a59ed023dec0d0e3f3e994b366bcc8427a4b91ea52f46b8fb4ecb496d0e3efb99aae28c5330e2aa397d0512e142048e976ed0 SHA512 3ca6ba21c64f3dec69f2478258c086c54ad609bbc56a7c07293c13439267968682cede11d7e3ca17649df02004c6ff8dcd23ea49408f01a44d795dbe56aa4908
-MISC metadata.xml 330 BLAKE2B 38f412c704fb21b6182b0d202d1685c5522891e500641100ef1f2edcde559fa1f11d7e685524499ad147b1d78d4e253b12274f46db18f758ece8e79a6b645dcf SHA512 aceab1c9614fc05c6d75560029a84533754a10eba547b03726a00ca35a6181e0290c931e051bd315e315f3310ed9ec8788e379269ccaa2bc952b4a81a7fd6225
diff --git a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
deleted file mode 100644
index 4ef23a7785e3..000000000000
--- a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/6/13 12:11 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-unixsocket-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-unixsocket-0.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
deleted file mode 100644
index 4b92a5c3baaa..000000000000
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Unix sockets for Java"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-enxio:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-unixsocket/metadata.xml b/dev-java/jnr-unixsocket/metadata.xml
deleted file mode 100644
index e746f31f954d..000000000000
--- a/dev-java/jnr-unixsocket/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">jnr/jnr-unixsocket</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 2f71b022d44b..447342903765 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,6 @@
 AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
 DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
-EBUILD joda-convert-1.3.1-r1.ebuild 937 BLAKE2B fac1da48190698adab6b76f1f3bf9f83f43f13e07d1fab52062e8650309e7b59547a1692d2e71e49b23b249a781c987df706efe87a55ff9ba39970ac837e9b3c SHA512 389b9b40b38b2d7a720ddf63d57e293d47912ad40b1725bc2cd6c5dbe635843bc7ea558447da79cbe3faf55933e2998fbb3edecb3268435a57429aa6bce2fe86
-MISC metadata.xml 319 BLAKE2B 8effac0f7bbb056b42b58598eb277775583ec45ca172e3ddd743dd9ae5845f90fa966f7e87771b48548dd48bc7ec87527c83774419866f2dc6c8ec5bd40153ce SHA512 a01502a0e630c0665e38c7b5af500022fef3cff85b68ba4fecd6adb8cfc5e85c919990d63750c824409d973fc506c1bf2a0351cb97ad1f4b74ca6e10ad5784bf
+DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
+EBUILD joda-convert-1.3.1-r1.ebuild 942 BLAKE2B 96596d5ed6b726d26d1fd810899d670aa0a16deb1f7435408fd3c815a7903fbe5bf1ec3c703099bc5a0b673a2842fa1e210f8be9eca927a91fe14219a74487a5 SHA512 4235f69d1569e7876eae13ac7552df5c393658574a7f4d936f3b6371a973ec2d7af12bb1a673f38cdbf3c6aa5cce6e010a4630f9fe895298fb611ac40262b9ec
+EBUILD joda-convert-2.2.2.ebuild 2014 BLAKE2B 9f00473e39b592a3d5508709cd14ca639ccf851bd95a8f17cb14b6b5a4e17dfaa480c9a68d76adb107e64786ad7740ad663cc4a7f5808b56e48a35f7b2a76369 SHA512 a80345d746b73e9c281b892ed299677c8fbcb376ab70014061665139cc144ac0bd8b265d75cc8769d5eafaa2450185918adac5062ce4bd84020395447d6c305b
+MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
index 03fe03d70345..97c617bf57a4 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="virtual/jdk:1.8
 	test? (
diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
new file mode 100644
index 000000000000..6472c40d5e36
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild joda-convert-2.2.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.joda:joda-convert:2.2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library to convert Objects to and from String"
+HOMEPAGE="https://www.joda.org/joda-convert/"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:20
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+#	JAVA_RESOURCE_DIRS=""
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-20,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 186, Failures: 0, Errors: 0, Skipped: 0
+	# All following: No runnable methods
+	org.joda.convert.test1.Test1Class
+	org.joda.convert.test1.Test1Interface
+	org.joda.convert.test2.Test2Class
+	org.joda.convert.test2.Test2Factory
+	org.joda.convert.test2.Test2Interface
+	org.joda.convert.test3.Test3Class
+	org.joda.convert.test3.Test3Factory
+	org.joda.convert.test3.Test3Interface
+	org.joda.convert.test3.Test3SuperClass
+	org.joda.convert.test4.Test4Class
+	org.joda.convert.test4.Test4Factory
+	org.joda.convert.test4.Test4Interface
+	org.joda.convert.TestRenameHandlerBadInit
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index e96bce731a65..9286c1123b77 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">joda-convert</remote-id>
+		<remote-id type="github">JodaOrg/joda-convert</remote-id>
+		<bugs-to>https://github.com/JodaOrg/joda-convert/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index e2d3c6d01a89..8b0047187ad6 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,3 +1,3 @@
 DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
-EBUILD joda-time-2.10.10-r1.ebuild 1961 BLAKE2B cc6691ff95273c231027f4a62e715878bbf6966d3109b295a5bbaf5baa12b9eb5def94542b6735fb801b512ae35c123734af7731ebe6504a7fc2fccaf0f0f17f SHA512 4811558713385466841d8ae3d99c369d351bd1e5ace85be2ef434af10794bd5a10d5d2f4fd7e866b94aa15edb245744dd43e9baf1fa23f5f7c21c5821e5761de
+EBUILD joda-time-2.10.10-r1.ebuild 1966 BLAKE2B 4f7b94c9db701439aaa82d4fd7762181e4e7ca57cf56f5d43fc0c95ad5f252bbb726e66b589041a53ed18b7beaaeb251aa0faef1b25301a75054e1c9d8f07431 SHA512 ee10fa7103410768ddb6f084734f90c2966b692271b1874d9dbe15cdeba6b30fbf532b31534d4d681243a8ed64dd668670e7929a567065d05a63b721b4e68310
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
index 83349323f9fb..408ed0ec0688 100644
--- a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: ${P}/pom.xml
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
deleted file mode 100644
index 1f4354f332b7..000000000000
--- a/dev-java/jsoup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsoup-1.8.3a.zip 370626 BLAKE2B 9ba471a8e161ef4ad5f0abd54feb29075400a53622dcd1a9934307a123bfad087bea9fc17f3cf020929aadbf51a47b0df1aa1ad5201487394faaaf4c44a793a9 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85
-EBUILD jsoup-1.8.3.ebuild 1186 BLAKE2B 449200eb4701d4a2214eeadfbbdf9f77393ef203bbb3bb3a42392cae184655e49d219728e146941fbf14d480b73d6c1ee4d7cf1d9e60c34187be74c2a6ff7ab1 SHA512 31ba7a27aaee5707d38d2a8b47f91d082cadcba8137e5163036858be8508b7af6a7a9df4e1e0dd17740ecb8e85529c5473b8a64222f04f22975185276e54a234
-MISC metadata.xml 833 BLAKE2B 1b5f90c7895c48dd280b13d57ac5e88402174b0ec56c13a6dd82a189f9f7522a130c075d3f65e6d14bb507873fc2af681ee8eebb3725b3abac91fd1e21971492 SHA512 4ae6d4fbb3b66342123f7508b417e342af8039fc45eaee70586557e5fb634e2a099ce494a4dbe8cdb64ff20c13d43a9efcb8791afbc424288967844da4798bd1
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
deleted file mode 100644
index 103a8ed904c7..000000000000
--- a/dev-java/jsoup/jsoup-1.8.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV="${PV}a"
-MY_P="${PN}-${PN}-${MY_PV}"
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="https://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes/org/jsoup/nodes/ || die
-	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-	cp -r src/test/resources/* target/tests || die
-
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/jsoup/metadata.xml b/dev-java/jsoup/metadata.xml
deleted file mode 100644
index de1e1a4fcf8e..000000000000
--- a/dev-java/jsoup/metadata.xml
+++ /dev/null
@@ -1,20 +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">jhy/jsoup</remote-id>
-	</upstream>
-	<longdescription>
-		jsoup is a Java library for working with real-world HTML. It provides a
-		very convenient API for extracting and manipulating data, using the best
-		of DOM, CSS, and jquery-like methods.
-		It implements the WHATWG HTML5 specification (http://whatwg.org/html),
-		and parses HTML to the same DOM as modern browsers do. It's designed to
-		deal with all varieties of HTML found in the wild; from pristine and
-		validating, to invalid tag-soup; jsoup will create a sensible parse tree.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index 228e911bd118..df30267300f0 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1,3 +1,4 @@
 DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
+EBUILD jsr305-3.0.2-r1.ebuild 516 BLAKE2B 1e6d71e3a0794ac6c029ae827101456f7e9e2d6a43517315820f10f1db031c95e707e45af719da048a267d4ab1ec01dd9b85c47a73ab8789b51fa530affdcefa SHA512 a006e6d286a0856c853eb4025e5a37e5102fcb19914ad05355bbe73aeb7377eec553fda46bddb937a824fa9557908c0a96552105c3ab1233e342e6fbc71b30be
 EBUILD jsr305-3.0.2.ebuild 508 BLAKE2B d14a889cb232b351db2331dd58f77de603108312555a42324fa6018e099c27b8bca1a59139b8a74a853a7a4aa67913f83642a7c435a0eb894dcd0bdd40722c1b SHA512 71f8b31a1c7bf7f5461fe240e3034ef53d3c706537500887bd4401679086c3aec254016b28e401eb76bc05fed191da5a37c9726390ccffad23ede1f0740f7600
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..50cee08b8834
--- /dev/null
+++ b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for Software Defect Detection in Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
+SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
new file mode 100644
index 000000000000..045221d1256b
--- /dev/null
+++ b/dev-java/log4j-api-java9/Manifest
@@ -0,0 +1,3 @@
+DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
+EBUILD log4j-api-java9-2.15.0.ebuild 1551 BLAKE2B 44ffc336a3535f462e73cb30e6dc8f5cf94b7fc55ca86a3f76a45bf9b7c7be6a7fd2dfbe71613075b6aff0cf8110a11039f828e5f5770d417d922ddad31236e2 SHA512 9fbf1ab640d31db0eaa043a39a8a42d9f92969fafabf9844488557fd453ad7eea9adc6ba5863afb6f52ab887f0d60a85279649972581298af1290f39561d4f39
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
new file mode 100644
index 000000000000..fc6b19c9ff55
--- /dev/null
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-java9-2.15.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.15.0"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j API (Java 9)"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+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"
+
+# junit-jupiter is not available in ::gentoo
+RESTRICT="test"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/assembly"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/log4j-api-java9/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/milton-mail-api/metadata.xml
+++ b/dev-java/log4j-api-java9/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
new file mode 100644
index 000000000000..a1c4aa4f5513
--- /dev/null
+++ b/dev-java/log4j-api/Manifest
@@ -0,0 +1,3 @@
+DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
+EBUILD log4j-api-2.15.0.ebuild 3375 BLAKE2B 088b7ae0b330c542ba653f3da205891343037d79feb0ece1b2e8cfdf15f211e672f3ca17b5b4d8d83701c7b72c7f9a426a83cb7c1c7fe78b1c2d19797c8cd1b0 SHA512 acc7c15befa203bbc4924fa6d7865d1cfbab5cb7adfdab07082804f64f9fa53282cf701e4272638b79d575728cd7a7389957b18e0c8507203f34b19fd075914e
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.15.0.ebuild b/dev-java/log4j-api/log4j-api-2.15.0.ebuild
new file mode 100644
index 000000000000..10e57a693ca9
--- /dev/null
+++ b/dev-java/log4j-api/log4j-api-2.15.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.0"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j API"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+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"
+
+# junit-{jupiter,vintage} is not available in ::gentoo
+RESTRICT="test"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
+# org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
+# POM: ${PN}/pom.xml
+# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
+# test? org.assertj:assertj-core:3.20.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*
+	dev-java/osgi-core-api:0
+	dev-java/log4j-api-java9:2"
+#	test? (
+#		!!!groupId-not-found!!!
+#		!!!suitable-mavenVersion-not-found!!!
+#		>=dev-java/commons-lang-3.12.0:3.6
+#	)
+#"
+
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"${PN}/src/test/resources"
+#	)
+
+src_prepare() {
+	default
+	mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
+	pushd log4j-api/src/main/resources/META-INF/versions/9 || die
+		jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
+			org/apache/logging/log4j/util module-info.class || die
+		rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
+	popd || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/milton-api/metadata.xml b/dev-java/log4j-api/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/milton-api/metadata.xml
+++ b/dev-java/log4j-api/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/milton-api/Manifest b/dev-java/milton-api/Manifest
deleted file mode 100644
index a6287f716da6..000000000000
--- a/dev-java/milton-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST milton-api-2.7.1.3-sources.jar 240367 BLAKE2B 9c6ff4484336b5dc2d8f4506398d4e522cbad102473f6a2fb59fad8b98c6154a4b09c18378adceaa698a9db0bc495dd1b83fcc93c5afcd153876e52a4df99e5f SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08
-EBUILD milton-api-2.7.1.3.ebuild 612 BLAKE2B 851a3f42c8632288835b25f69bb7682d9fe75272e91a4552ff82c8f131ba047a457753a1759f440fd26fde6419112b1102af08d3fdbfbda2d5fc0aeef642defd SHA512 201dc2312ea3d727d56884f0c06ea4656b5fe6830371f201284fcc3725ad0190f9223d2cfa1dd2746bb960dd6e63ae34ee3616535a4ac065584d660054765507
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/milton-api/milton-api-2.7.1.3.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
deleted file mode 100644
index 72136a1b758f..000000000000
--- a/dev-java/milton-api/milton-api-2.7.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-codec:0
-	dev-java/commons-io:1
-	dev-java/slf4j-api:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-mail-api/Manifest b/dev-java/milton-mail-api/Manifest
deleted file mode 100644
index 1a9105540e6f..000000000000
--- a/dev-java/milton-mail-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST milton-mail-api-2.7.1.3-sources.jar 34106 BLAKE2B 3307f0bbc700c529d1988648d1aab306dbefe6b5c6ca78d9706b0342b6f122836d05de99971d67c2c99bfdd07014f85307b8a87d97ef85337dbc8096fc4a289a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67
-EBUILD milton-mail-api-2.7.1.3.ebuild 619 BLAKE2B d6840aaf27a1f52ee31978d12bb40099c59c5fd747675cf3bf65ba37c698fb3b00e30d238ddf6b39c7f20b3853d0aa72bd0ecdc3d80199b0cb27fe3a6cf2fa5f SHA512 2d29a0622006e52609b2ac50eddca9ee2ff1debb662c1a1c30f36051067a64f2be3214a20e1d006385d07cb03a891c4a549ae1febc790abe2759fbcd495e037a
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
deleted file mode 100644
index 13bf1e501a5a..000000000000
--- a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/slf4j-api:0
-	dev-java/milton-api:0
-	dev-java/oracle-javamail:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	slf4j-api
-	milton-api
-	oracle-javamail
-"
diff --git a/dev-java/mina-core/Manifest b/dev-java/mina-core/Manifest
deleted file mode 100644
index dcf310a30b0c..000000000000
--- a/dev-java/mina-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mina-core-1.1.7.jar 272148 BLAKE2B 08017722d3e85f233725c0f3495372d4c189a18bea346ff56ab2911dd35fa65df3697101a577424c8702b4fe52dee2701a13bdb2a90f187ff9df0f038fdfa02e SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832
-DIST mina-core-2.0.7.tar.bz2 1953751 BLAKE2B 973e7d67f2328a8bc9fec31f693280b7f640fc3856912e7186b9c7f1d4b506303c4857304f26138a07b0cc10b6e6ff7516be504388980e4042f0ac450ddb5fbd SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e
-EBUILD mina-core-1.1.7-r1.ebuild 507 BLAKE2B c4952376f87b5cc28d69f72e019ad3f0c6b628f72c3372f60cda7a4a3cc04f5ba4b74a65b3602d778edc72bda1a473da017dc5b29231455d66b0ce5544dc0685 SHA512 80b5b73bd90119d97b2344852e7a801970f540ffcafb90f4fa4c255dbac4c56d3afd3f017ce63a62500f342161720ac6521b376a620e94bc355f6c22bdcf6e8b
-EBUILD mina-core-2.0.7-r1.ebuild 706 BLAKE2B f00019624844162811f6bd1432de45835cc07a441371978328a9d299eecddbfe67bc74943cbb107c6fc28932fc0ef710b1bb932a20be79a954448f845386c0ab SHA512 1ef2dfb2ebf9bb12fc3dbadf3fe54fdc93de9b03d948a54ce85fab12115805dbb1d9766b1ac703448e8e51eefddda54146bf92487a8dbc6d32dca9aea24f04f5
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/mina-core/metadata.xml b/dev-java/mina-core/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/mina-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild b/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
deleted file mode 100644
index bb2d5a60560a..000000000000
--- a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://gentoo/${P}.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
diff --git a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
deleted file mode 100644
index 443f413218fe..000000000000
--- a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="apache-mina-${PV}"
-
-DESCRIPTION="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://apache/mina/mina/${PV}/${MY_P}-src.tar.bz2 -> ${P}.tar.bz2"
-KEYWORDS="amd64 ppc64 x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-
-JAVA_SRC_DIR="my_src"
-
-src_prepare() {
-	default
-	mkdir my_src || die
-	mv src/mina-core/src/main/java/org my_src || die
-}
diff --git a/dev-java/moshi/Manifest b/dev-java/moshi/Manifest
deleted file mode 100644
index 5a6ec877ea94..000000000000
--- a/dev-java/moshi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST moshi-parent-1.1.0.tar.gz 85572 BLAKE2B 22a2192c47142591f1a3bc56525bd715247b94c61c0e97f2db942ddca1cdba914ef5eab61d19632f4eccd02425f29ad27f288e030e0f6af238095c75a6e20a9f SHA512 58557f20a84f4b59f0b603b6e6dbe803285f5c066451dac72e9926ca57131b62fddd222b995dc233e1c7120fc7787fa5b2c6ddab33d0b8e69b8ea1147ca06549
-EBUILD moshi-1.1.0.ebuild 775 BLAKE2B 79e14da0a7eaec3b481d8a31846a67ef70e7160607c625727a440ca19bfde14ed1e0fcddbc318f71d2422a1de153454d0d7b9a014db6360900e4eaa36720c1d7 SHA512 cca48d24345b1319ba26bd7b116af6b952bb02445fa8f451929f4831ee00d3b06b00f321bd09d0f30826b745fe9226b07835ba94d11e9c79bef0223299b806d5
-MISC metadata.xml 314 BLAKE2B 3cafd1d32f8e97b94a25051ff8dda3b152aab0f5d0741059d97ce8bcbf1945dd55139600ae1d3fb52e3594c2cdf6a76b46893b527e4c6a7ef4daa50a1d3b15a6 SHA512 db790fe5e91a5464f6a4e003dc7fa62cf997b068c792174cc3488cdfb3261af12211aa5d2d20c6ca0aa613aacc2164acb1abc508cab919763b7315a00f66c4d2
diff --git a/dev-java/moshi/metadata.xml b/dev-java/moshi/metadata.xml
deleted file mode 100644
index d69bf7b2e09b..000000000000
--- a/dev-java/moshi/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">square/moshi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/moshi/moshi-1.1.0.ebuild b/dev-java/moshi/moshi-1.1.0.ebuild
deleted file mode 100644
index 5348dfbdb2f7..000000000000
--- a/dev-java/moshi/moshi-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-parent-${PV}"
-
-DESCRIPTION="A modern JSON library for Android and Java"
-HOMEPAGE="https://github.com/square/moshi"
-SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/assertj-core:2
-	dev-java/junit:4
-	dev-java/okio:0
-"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="assertj-core-2,junit-4,okio"
-
-JAVA_SRC_PATH="${WORKDIR}/${MY_P}/${PN}/src"
-
-src_prepare() {
-	# Some don't compile, not putting effort into it now
-	rm -rf "${WORKDIR}/${PN}-${MY_P}/${PN}"/src/test
-}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 703766be0084..5793df7f23fd 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,3 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-common-4.0.36-r1.ebuild 1902 BLAKE2B e55144811f5420fb32aac5cb0d8e0995d56567926e1afbd027348db3c7ba58815ef91786d7ec5c9702f2641427357ddee9f07512d44e00245eaba22c5cfad348 SHA512 402056e0a715a97af66ffdbadfa850dc2913c36ae481d474a12eec64232e56aed168744432a03eeafed8207e48e4380a7c6c28096f38265d7ed4b7d2d244647f
 EBUILD netty-common-4.0.36.ebuild 1604 BLAKE2B 1fd6224706f910a51e93b64603e2866912893b0083bdcb1ac4a4171a5bf2e12b772663120c8aa80e167478f3c40c5d76ba44609f2760e31e33463e6e169e2626 SHA512 ac48ea4c6910645f0db1831f41f49ed7ed304ce26267c3311fede9d70b3694f55438d2cd207a48aade49148d7412afde4eb79529c971ac7a4552da9f4f344742
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
new file mode 100644
index 000000000000..74b75f768b49
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j:0
+	dev-java/slf4j-api:0"
+
+RDEPEND="virtual/jre:1.8
+	${CDEPEND}"
+
+# It does not build with java 11, https://bugs.gentoo.org/788364
+# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
+#                Cleaner cleaner = (Cleaner) cleanerField.get(direct);
+#                ^
+#  symbol:   class Cleaner
+#  location: class Cleaner0
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}
+	test? (
+		dev-java/asm:4
+		dev-java/cglib:3
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+		dev-java/slf4j-simple:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
+
+src_prepare() {
+	default
+	# Needs Mockito 1.10.
+	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/okio/Manifest b/dev-java/okio/Manifest
deleted file mode 100644
index 98d8d3259a13..000000000000
--- a/dev-java/okio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX okio-remove-maven-animal-jre.patch 1631 BLAKE2B e43c497a63d598ceb825716de40a6f1869e39a45eccbb4759c128805bfcf52a5b95658bb776299a32e7ef2970dc6466dcfb5d422032c460675d416ec2412fc09 SHA512 5bd6cacf2ca9cf51ee7b80fc5deead8174fb579dc3a8422f65b7af80492f37d24ccad4605896f0653984852db89c2ca9ce0b78bd0ea2630ad8c71e1808b9a3f7
-DIST okio-1.11.0.tar.gz 95398 BLAKE2B 6d31d61f1ac0d34289e601bdf4a35768f81ada35883958d0a7fddd6ba9fcbbe36ca75f87ad1879a207d3b587d22a096b41945102c5c8829b094e9954901fe87e SHA512 12b6d63cf037be2679c01e71bd6318ea1f8bd19f7f2a38f58c210d6bbb4650db6ba5aa527808c109ca02af2ccd663dc31102dd1b8ea6c6ce326dd7be7c1d8071
-EBUILD okio-1.11.0.ebuild 755 BLAKE2B 7777f501f8fe43dc54c5b24d1bca2bae4e2dcbd4007523eefc51354265b1b17b01f1c90f046670b7e30e0600341d723fecfb389f7ec55ef01b1835f9aa0e2a51 SHA512 7ae388363ea125b514d162ae30cf2600d9f80e21d8dc169ae7e408b0b63ccd79e9045b96d73f147d8fd35a2b28a6ad17007f1042182262c2d3708f2f57492413
-MISC metadata.xml 313 BLAKE2B cacc9ff6ed67dd5870cb6ebf1165de6ff54fd24e1e02a39c83c90a81d506e4567680c076e392d41a1dc596a9bb34d967a2f8c81038b7e1330249459d50592c48 SHA512 7ce5d45a1442494e2cf9f60495238dea92564782024998a1eb1b793aee3f5d9c950480bd2b8e0748c44bff501affcb3bc35fecfd9db0d05d8f528b32f453b896
diff --git a/dev-java/okio/files/okio-remove-maven-animal-jre.patch b/dev-java/okio/files/okio-remove-maven-animal-jre.patch
deleted file mode 100644
index 0e5e5d62880e..000000000000
--- a/dev-java/okio/files/okio-remove-maven-animal-jre.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- okio/src/main/java/okio/DeflaterSink.java	2016-08-22 12:01:19.828823222 -0500
-+++ okio/src/main/java/okio/DeflaterSink.java	2016-08-22 12:01:25.039823574 -0500
-@@ -17,7 +17,6 @@
- 
- import java.io.IOException;
- import java.util.zip.Deflater;
--import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
- 
- import static okio.Util.checkOffsetAndCount;
- 
-@@ -79,7 +78,6 @@
-     }
-   }
- 
--  @IgnoreJRERequirement
-   private void deflate(boolean syncFlush) throws IOException {
-     Buffer buffer = sink.buffer();
-     while (true) {
---- okio/src/main/java/okio/Okio.java	2016-08-22 12:03:23.819831591 -0500
-+++ okio/src/main/java/okio/Okio.java	2016-08-22 12:03:34.874832337 -0500
-@@ -30,7 +30,6 @@
- import java.nio.file.Path;
- import java.util.logging.Level;
- import java.util.logging.Logger;
--import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
- 
- import static okio.Util.checkOffsetAndCount;
- 
-@@ -167,7 +166,6 @@
-   }
- 
-   /** Returns a source that reads from {@code path}. */
--  @IgnoreJRERequirement // Should only be invoked on Java 7+.
-   public static Source source(Path path, OpenOption... options) throws IOException {
-     if (path == null) throw new IllegalArgumentException("path == null");
-     return source(Files.newInputStream(path, options));
-@@ -186,7 +184,6 @@
-   }
- 
-   /** Returns a sink that writes to {@code path}. */
--  @IgnoreJRERequirement // Should only be invoked on Java 7+.
-   public static Sink sink(Path path, OpenOption... options) throws IOException {
-     if (path == null) throw new IllegalArgumentException("path == null");
-     return sink(Files.newOutputStream(path, options));
diff --git a/dev-java/okio/metadata.xml b/dev-java/okio/metadata.xml
deleted file mode 100644
index dd9868b67a8e..000000000000
--- a/dev-java/okio/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">square/okio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/okio/okio-1.11.0.ebuild b/dev-java/okio/okio-1.11.0.ebuild
deleted file mode 100644
index 743f89f4b4cb..000000000000
--- a/dev-java/okio/okio-1.11.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-parent-${PV}"
-
-DESCRIPTION="A modern I/O API for Java"
-HOMEPAGE="https://github.com/square/okio"
-SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-CDEPEND="
-	source? ( app-arch/zip )
-	dev-java/jmh-core:0
-	dev-java/junit:4"
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="jmh-core,junit-4"
-
-src_prepare() {
-	epatch "${FILESDIR}/okio-remove-maven-animal-jre.patch"
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3b47c57ccb6b..7a5a5c60462a 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -19,7 +19,7 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
 EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3620 BLAKE2B 343cd234fdaec2108ead00f219789f8415e8a1a5e9a4614d924cabe2ca5b0c379264fe574da4717c0b36bb4afbec02161f019c2f9a48ad3d340c9b31678c1f65 SHA512 f9f00739fdee5d8647e1c68a2bd7ce42a27b4cc3d41b3b27d1252f2372d9ba45d4301c71742bdd089ba1f6eb3702094cddca2d288d03328e173d19d51cd37586
 EBUILD openjdk-bin-11.0.13_p8.ebuild 3617 BLAKE2B 2bb109caa07d44bdaea3c8cfc8d71e7f3f37980a99ad2c99b2fa793442cc154cb5e3f61e9ceba1a3bb400ad2b8fbe5a3bfd2bc6afd350efd3e3bf7918ba5e387 SHA512 c199f61d9991087b6b0a3b6935f88cff625997aa0246127ea3cdd65bc14611b50bfcd7a3d16d5cd7778f7a20ce7a153aae7763e9457b0a43b68f7e26f88ad330
-EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3822 BLAKE2B 471adc63b2ded892aac6d2900e3a0f19ef87a5b416df5b6047adc4bff094217e5c06cb1191da870edb8789aa1e7e82704de1d2bca25959a37eb24c9c99b040cd SHA512 a0c7e5f2e18a172fcd07ff61f96d9573745b46d92410c187739aa898a19c08ed59655ac2006eb3aa0ca4628f41a33a480a856004f66a7b3e411ec030ae6c6573
+EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3819 BLAKE2B eaea576eaa4ffe4486e8fb0f3b48e3f584aad925e48ea5466f08367b83ac7e77ef8fe97ff04fecd3b7e57595445f51b3658baaf1c87e7a627f5341ef364f840c SHA512 b883e19d4075b247ad9ed251987e376d7dcafebef8e45c99a78eaaed1ad65b4e13dacb5f171a2aea8e521fac4c63c9f106ce1e05b3a1a224312146a0235ef210
 EBUILD openjdk-bin-17.0.1_p12.ebuild 3822 BLAKE2B 46e746cd152d9d389b8b50e0e07ec89ed77c3c040a5441678403f392888197cd838ffdce0c5f3621a3b3811fc71ac5dd72d9fcd723ddb6a5a880dbd8a6ab4836 SHA512 151d8aad48b04f137f95eccf213919ac702cf3e11c96ad78aeaafe8e9e9724508a4f81ca03522ad9c3095c1b40deb4c6a49bac3434c206bb65b64ea77bf21a68
 EBUILD openjdk-bin-8.312_p07-r1.ebuild 3040 BLAKE2B 90208fa931daca30a7e54e2929b64c9400b414b22120b9dc39ca18bbea880eb5b88189c274f1f9c050c06542fad39563d8d69309dd6c5d7b8dde3c74306a91f6 SHA512 4b0a2b496b89c669421331f078a5c5f26bbc2f5ef3dd00efc4c9837d6bc243dd764118d16fb9d8d88be4e428bd6b3ff0d3da4eeff665abcb37784817a8734e79
 EBUILD openjdk-bin-8.312_p07.ebuild 3047 BLAKE2B e636d705075e18d16bdb5fab3c018db59af78afb52c189c21400990c11929bec7edba0592fc14e5b800bc0e898cbe13f352e3572426e7320b5d524e6c2cf4152 SHA512 406fc714f07b1e743fd3f5b0570c2a0f9805bacecbe2c97fdae8c8551dd51ad789dfa1ec51b23321801dbe1a0f44575af58485f2d6dc3662e7432b29d95ebd1d
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
index e95578814cd8..bdeb4a67273d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index a0a5497e071a..38214ddba0c7 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -21,6 +21,6 @@ DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
 EBUILD openjdk-11.0.13_p8.ebuild 8055 BLAKE2B 89cfb1296b197fa9645a2b515c1593c9508eeda9ed86b4c33887abbda7028f96cb9186f950408050e41745036b27531ee7426d3db592174a5eefc47c7ed9ed1f SHA512 704e720f8d43b857aa4e6fa4d417ac0670d7fefaabf04a093d989ac8c55b5c7c3569b651fb9ec5173ed176b7b4eba441610bd11e32ac3573471cd01f76e1486d
-EBUILD openjdk-17.0.1_p12.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
+EBUILD openjdk-17.0.1_p12.ebuild 7798 BLAKE2B 82c6eb4714f39bb960dce03aadf914e07bc5ba51e6d6795f52f32fe4893128976ef5aa47095240daba19571873435eba0db2da164de08efb01ab749b3cac8d20 SHA512 e059d74bb5475187bdf5b25748ba6e7402738aa86e0c489e3691211d9e923121a47ec44680bb5c1e9d40cfbc0973d99a5ad3777416b20c910fef1b854df9bfc4
 EBUILD openjdk-8.312_p07.ebuild 7400 BLAKE2B ad43ad78fb789a080b35a78d932ede47359f2c810122982d23c6974f1d491ecf229a04b454518e8356a5d606c7c59e4d8ea35535d00399985570bdbb526f07a0 SHA512 d520d183f5341f78c0332bf18a9acc8f70bb27cdaee8344c9b18313c0c990d94f06b252c5f11be5666d561bfa452d74ca100dc647eafa967ae280b49ee26267b
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
index b5e1cacf9515..9491e94edeca 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index 0b32b29bbf09..b9a88acf7879 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
-EBUILD osgi-core-api-5.0.0-r1.ebuild 590 BLAKE2B 6d97015b3687f35cc8d102d5d8d3c5352085dd81eada93efd944450d421053eaa50c692650c6f9bf50eeedb4032d22ba525881ca4cfbe1e7237f510c0f270d3c SHA512 ad1c514c92333fa85598bc859eeaa76dcbef1ef077b8d537e325e518bfd1729bf8055ac8a669b6319c409f147874f681e0a9a6037c18bd04031f383e1e1823ae
+EBUILD osgi-core-api-5.0.0-r2.ebuild 642 BLAKE2B 4ba55f807511e19b9d2172ff3d52c7dbb1934c9c6e4536bbfeede846e2415b47f5480582890629f780291a9b2ea90471764c33724604caa945454f239b65245a SHA512 01630584faaf4709f3040bb43012bf909a83c01c915f2e8fcb3d8ee79536e5e5a59ce871b33984b09011882d09ceec114eda3539bed19a9e5b7702c30f911d17
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
index 086622b79278..687d31892300 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:org.osgi.core:5.0.0"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -13,18 +14,16 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
-RDEPEND="
-	>=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
-DEPEND="
-	>=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
 	app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -r org || die
 }
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
deleted file mode 100644
index c74d31578855..000000000000
--- a/dev-java/piccolo2d/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST piccolo2d-3.0.tar.gz 402866 BLAKE2B b78b93084e13c738126ab04babab4ee502deca869dc28a5bd066c13b46f455af55cf76531270d546d6cf56d56c0e48f2edbbda40944479cb9762db56421fb021 SHA512 609b38e27386ea0dac821f8d0a23bbf57afa056ed928944d63c2c8d1572c4f8b6541d27f5d26ab167948724c9f1198069fb6e0b76ce2770fe795662c76151100
-DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
-EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b
-EBUILD piccolo2d-3.0-r2.ebuild 1134 BLAKE2B 105de0bc203751415cdcc5001ece11cc3dfb7033e0f6dc52add05059939d2aeb6849b49c586435952cec184e0f115d3709b4e8a68013507fa871f4543a12d4b3 SHA512 a3e50a18e9ccbc48ac964e055f38b88b7826c148e831b71e598bb98d7cf78e9efe06e5406da2f52d4ae8c9b6a11b1fc83f1d98320931e62856456bd4cc825aba
-MISC metadata.xml 380 BLAKE2B 95dfc731b4fdaffa11f636e612a9f41115f5ce8ba0462aef339f21d1b2c3df4c202e3e75188d00eb71e0284a18dba0a265d608fd8bf84e5d4e7766941e88da1b SHA512 149a7bcf0869bd58ceafe681d22b0113c65ae3c497a16ea3848d8b36e5ca5f6a8e0432e9805c9f17bc736b609fc0d211026b46c13c79e28b2b0b58971802cd09
diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml
deleted file mode 100644
index 2718e253557b..000000000000
--- a/dev-java/piccolo2d/metadata.xml
+++ /dev/null
@@ -1,12 +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="google-code">piccolo2d</remote-id>
-		<remote-id type="github">piccolo2d/piccolo2d.java</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
deleted file mode 100644
index bd8cd931c7e7..000000000000
--- a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Structured 2D Graphics Framework"
-HOMEPAGE="https://github.com/piccolo2d/piccolo2d.java"
-SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-java/swt:3.8"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
-JAVA_GENTOO_CLASSPATH="swt-3.8"
-JAVA_SRC_DIR=( "core" "extras" "swt" )
-
-java_prepare() {
-	rm -rf core/src/test extras/src/test swt/src/test || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc Readme.txt ReleaseNotes.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/src/main/java/org/piccolo2d/examples/*
-		dodoc -r examples/src/main/java/org/piccolo2d/tutorial
-		dodoc -r swt-examples/src/main/java/org/piccolo2d/extras
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
deleted file mode 100644
index 84bb299ca780..000000000000
--- a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Structured 2D Graphics Framework"
-HOMEPAGE="https://github.com/piccolo2d/piccolo2d.java"
-SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-
-CDEPEND="dev-java/swt:4.10"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
-
-JAVA_GENTOO_CLASSPATH="swt-4.10"
-JAVA_SRC_DIR=( "core" "extras" "swt" )
-
-src_prepare() {
-	default
-	rm -rf core/src/test extras/src/test swt/src/test || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc Readme.txt ReleaseNotes.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/src/main/java/org/piccolo2d/examples/*
-		dodoc -r examples/src/main/java/org/piccolo2d/tutorial
-		dodoc -r swt-examples/src/main/java/org/piccolo2d/extras
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
index 058f91f4584e..3707e20851ee 100644
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@@ -1,5 +1,3 @@
-DIST picocli-4.6.1-sources.tar.gz 13467061 BLAKE2B fd7dc19d572e975a4b47ac0bd9a7ab4be0f5fdf1e3e03c2d3b5026ee9ad6cbcf5e6214234746551d61c427915095e067f44c1d3dfb27071456e76db26d567b23 SHA512 e2c6c6171c3ec9cbe35e7034e119dfe922993c9e7b8d81ea94faeb8b24c9c4c26023be1edb5d67041119c4bf73077d522fbe711e8c1af788063663e2bb06ab1f
 DIST picocli-4.6.2-sources.tar.gz 13488726 BLAKE2B dbec032bd0f40a45172e7c72884c32c9f769a9df0bdacc1904f3d45f4b02d1a3cc7c541a2ae4ca8a6754d67b5351412e4d91f2dc6fbbb3fc37bc4e2776ccdd68 SHA512 83ae37666a3c703b186cdb920095ad46de46de9a092841c352ec7db33877fa102afbd24227a1f73cad8be8a75b800f5c1487a8720d7080bdc8aa20dd8acafbe4
-EBUILD picocli-4.6.1.ebuild 1247 BLAKE2B 56c3c7700421d893aa08bc19f31a868ecbc6d8347883c9f88b5e01435e9aab49bce8725bffc8ebae621cbbaaa477a3490424fbe38cffb728e15cdde4cd40c938 SHA512 d4822745a22635ca00fb9870ebd8ac4ed7996650138d9107722ff38a5a2a800338fd70dce131569b2a268ac0dfb5e4789340f39cfa2b742bb0d7ef518c4d03d3
-EBUILD picocli-4.6.2.ebuild 1211 BLAKE2B ef88ce4a8f08d847b87a183f1fc7ff611079dba66fa405c0c021ae3da632ac442c1e84886d0d4f242780bea0272f3c934454944d4a51067dde4e8b5d41e20f0a SHA512 2ababe0418c0992436daea6d0a3dda255d1144dbddec1e469d2ebf814bc86171305855e1ec24f16ab67f51e2b655157ac41693c01c5083f2242d1b8b847f171a
+EBUILD picocli-4.6.2.ebuild 1208 BLAKE2B 2dc89bbe4c5eaf514d1d4bc7a955824a7f232bf56811a272a4932c38cc4b2009dbd8fbbaf97d9ec805077f2d811936bcefe42d59756ed889f59e1cbe29f14e90 SHA512 3d80b53b77b67f78afe9366a8b383c16df58b2e3b2d403b6ad7c6b53471a23c119dc394ce1b42fc81322b666e4af0a45abf6adde8ee54628f1103e543145d04e
 MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
diff --git a/dev-java/picocli/picocli-4.6.1.ebuild b/dev-java/picocli/picocli-4.6.1.ebuild
deleted file mode 100644
index e3c258f625d4..000000000000
--- a/dev-java/picocli/picocli-4.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x68" --ebuild picocli-4.6.1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="info.picocli:picocli:4.0.0-alpha-3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java command line parser with both an annotations API and a programmatic API"
-HOMEPAGE="http://picocli.info"
-SRC_URI="https://github.com/remkop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-sources.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-# package org.junit.contrib.java.lang.system does not exist
-RESTRICT="test"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/jansi:0 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE README.md RELEASE-NOTES.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="jansi,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/picocli/picocli-4.6.2.ebuild b/dev-java/picocli/picocli-4.6.2.ebuild
index fc331f6ba11f..779e7aef18b7 100644
--- a/dev-java/picocli/picocli-4.6.2.ebuild
+++ b/dev-java/picocli/picocli-4.6.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://picocli.info"
 SRC_URI="https://github.com/remkop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 # package org.junit.contrib.java.lang.system does not exist
 # the project is here: https://github.com/stefanbirkner/system-rules
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 28ef962c3c61..0877fef74c23 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-api-1.7.30-r1.ebuild 1365 BLAKE2B 3bea2f16ae8b2180146426855f896e65764db90c822988045dd2d706704487cadd86d22223e4b76f8d8cc67f6cffab32c9781996e0db7318b90822f6dec77ebb SHA512 b193257213af552180060750e3be79ff83d2bc67addc46134c8c83080b15ceb0b6431a089b88229104f959c632b1a76626b7d056f0ab72e97e30dd12b76fc139
+EBUILD slf4j-api-1.7.30-r1.ebuild 1370 BLAKE2B 1f3f7b0777335c12c72a2b6cc7b2f86755350d973db339d269fe352317e70ad8b36d0024d08818c959d0f61f2df02ee11ce32c15e7f3818a9b4d972a33bc4d16 SHA512 c505fdcb9b95845e745ab22246728386872a19a26e2b4ba906a1542bc6ebbe50a0f038922494fcec06ed9f7fdc547ae21269fe7270e01830c9d73402a1a5b395
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
index ef4a91e9b8c8..2acf963a0925 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 4a5b26b73c29..72a0807c7bcb 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-simple-1.7.30-r1.ebuild 2029 BLAKE2B fd67f7fff9c61eb77772563aa1add97d60f4dd991593acc5ea5489fe5549e3b9c92505b678418ccf47d11683244351d5d9ca33b12eecadf1d992d64c678dd06f SHA512 ee327da362c9bc4df050084da4b6945a7d0ac2057b83c73e63d1f5656263dccc1bb5b814baa76c3153673982e9e230bd469976f8df152f637568e1da01a630f2
+EBUILD slf4j-simple-1.7.30-r1.ebuild 2034 BLAKE2B 148495626c3660c22e6b531a77a6284e9c9a5b27a2d34559ceb910221be7d79e7b6929cc5884eaa326f71162921ba02ce4118014b6905701a371ffe761e39e5c SHA512 4a7e43a61501da86e90830dcc298a21ff9e408238678dc9a85fc6c935853dee0f9303e2979346b4f9dee6755e92d2612ae385ae688ed9bb52823302ad5d6c269
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
index 202e4fdc8890..1cea0263a4b9 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: slf4j-v_${PV}/${PN}/pom.xml
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index e84d11b10abe..02c7996972eb 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,4 @@
 AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-EBUILD snakeyaml-1.28-r1.ebuild 2959 BLAKE2B f86fe6dd0170d5a6bcbb8953c29bcadb0382e4e29429624b9f06b6f25a3a81741e91dd6d2c4c929ce73df77fc7f309625bf07dfeea671f3edc4ecab7ad30bf90 SHA512 8f430bcb73ef4cd4419f572e9f127f3ebdd0c7df90b88ba7b83497deae4a3ce05ef90cb401bf5fbd9520de2ad292b8dc717c74d1c846b00f9f89ab4c50d8f544
+EBUILD snakeyaml-1.28-r1.ebuild 2964 BLAKE2B bf8a1757ad1d41516cc55ac05737d48c6dbc681fe33fd8ead62de25a1fb0006059c778858e945c85bab913a37928869d33281ada50e4c6b8e7afbddb98dd38be SHA512 a70b5a39e84eb98623536a9e3eafee142c1d99f50697680b9f9b6db4415c247a9a7053294cbdbc9dbc6d75a3d2b6e2b22e0c30e1763d8b13584b12bba5a84570
 MISC metadata.xml 321 BLAKE2B 289b6f22e9b660717461d5da64ab6fc7543bc6d46dc803e79ac0694ad1836297469eec4ab224b1c5dccf8a77e7e750b688e0cfcdab371506aff143fce090794c SHA512 b4a92e6a613847f4b8d59e723505b223ee34cc03a31ab656b5d4f8424ff76f3073ec626dbe4ef6cabb93674c62a4ac923756d05bec8a110c25f0b9880effa5d7
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index 4170130a4453..771b05ba5ef1 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index ac90644f3352..29c0facf7da6 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -1,5 +1,3 @@
-DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc4284d83bac9064a9dfc4db1a1bc95f28e835c45e6aa57a6b47a407926d01273c8ec0ea3bfa22052608c0106ca52a53 SHA512 722f8642e3a7c7825dd44cf01eca624b1d8a6bbfa829dbd7be326b53bf9d5467f48293489bbac6466ba9e74d991caaa6c9d56f0b7a08d205133926413517ca28
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
-EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16
 EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a
 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
diff --git a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
deleted file mode 100644
index bb050ca9a791..000000000000
--- a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
-HOMEPAGE="https://java.net/projects/swingx-ws/"
-SRC_URI="http://central.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-httpclient:3
-	dev-java/jdom:0
-	dev-java/json:0
-	dev-java/jtidy:0
-	dev-java/rome:0
-	dev-java/swingx:1.6
-	dev-java/swingx-beaninfo:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.4"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-src_prepare() {
-	default
-
-	# Fixes for newer swingx-beaninfo.
-	sed -i "s:BeanInfoSupport:org.jdesktop.beans.\0:g" org/jdesktop/swingx/*.java || die
-	find -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingx\.(editors|BeanInfoSupport|EnumerationValue):org.jdesktop.beans.\1:g" {} + || die
-
-	# GraphicsUtilities moved in later SwingX versions.
-	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
-		org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar .
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8deb149e80ab..b448d89de714 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,24 +1,22 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b
 DIST apache-tomcat-10.0.13-src.tar.gz 6070494 BLAKE2B f588dc6fac49b07dcdd70958ed477cc9e5e4f5c76f56d41e4baf654b8b7e4be80432b3a4510fdb030855940d3e93045c0f54adde277bec2fe1152b43a96c6f85 SHA512 91993c9236af381cc7ae6f96126d0fba30c2d082ad88b816b151fb847373d93d527de5784dd1e2295adb6cfbb5fd591e8a9cab0c1b1ef96ba54b8b3ec0f91e9e
+DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.72-src.tar.gz 5954383 BLAKE2B ddf342e3bb604ffd5d70e9b822a110654434aac0da0bd28e8649a0ce312706c202f48077ee18f43398d91bc000ea5287d87e0fd2bda9d2c8493e1b6b012945fc SHA512 69c27076d193a874416c83a1dcb80f71af78cb201b0990795d389f0a389e0537749b62256408c6249031abd2e62f268c8b451328284dbbff50a457937cfa6f6d
 DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
-DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b
 DIST apache-tomcat-9.0.55-src.tar.gz 6136319 BLAKE2B ac49abc3198bcc2fed1310839d0c9a30b5aefb7c0a679c3bb69f7aadd82b32b7d523cc24bdd55ba9edc363e181fc93c323944ebd5801ed2b9d38e8d1b3486d4f SHA512 abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c
-EBUILD tomcat-servlet-api-10.0.12.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.13.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
+EBUILD tomcat-servlet-api-10.0.13.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
+EBUILD tomcat-servlet-api-10.0.14.ebuild 3018 BLAKE2B 27dd8444f63e6842aa42a05fc47f9e5af713ff0dce2bf027d86525b0d268ce8853e666cbc80048673b6cd8d7fc0d6c65b5fb042ba1304ed81e13efd5369bf627 SHA512 8fc3ebd3ca8082de85d97af1bfd67771893f50fbf33d74a5a6251051825efd70836e8cdefe184a31f587fa65aaccdebfc4a9e57a9c9e671b522ac53d8de264e6
 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
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.72.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.73.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.54.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.55.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
+EBUILD tomcat-servlet-api-9.0.55.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
+EBUILD tomcat-servlet-api-9.0.56.ebuild 3013 BLAKE2B 2d9e24eb17a9dee04bd8e4c9bb8af8fd7fdb1d372b145bdb42bef7444a0011be5d194d80ced06702d384b981ca4aad59bece95f47b713d034d320e257879b57c SHA512 0d0a2e328117552fa6df0edd1edd3e0feb7b1d69a12631d850c86738025a1a4c8a4277bb7b968d50508028b2750901771878c22e6fddd8e5235f20491a59359f
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
index fb739b89bf7a..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.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-10.0.12.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
index e360880764ab..7366df4ba5ad 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
@@ -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-8.5.72.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.72.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.72.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
index eaffc40f4037..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
index 4a8d22d12869..4811db9874c5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.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:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
index 4811db9874c5..65f8feefd348 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
@@ -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:*"
diff --git a/dev-java/trident/Manifest b/dev-java/trident/Manifest
deleted file mode 100644
index 72e3dc824958..000000000000
--- a/dev-java/trident/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.3-build.xml.patch 2112 BLAKE2B e014eb8632086256f7abf0068bc076b544dae4e4bcb1f8ffb7cd7ea132d87663f44e672aef93e6d18071d555486f9e526a70d2436d72c26c75592b82636310d1 SHA512 f4790f0f7551d2734c0db2495c1dff5f6580c1734aab596fd0e419447b8c085d3ba2b4010dea972e6e3c400141d619a10baed10a2d4b8f4135e9855e9ec9b6e6
-DIST trident-1.3.zip 112050 BLAKE2B 62f5ae9266714524c50e92c00d3d13810d47727596b0247786c056490b5366015fd35b2e859925734eae26c01b8070474d24e0770ac2eb644024f32754a6c5b7 SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b
-EBUILD trident-1.3-r1.ebuild 1075 BLAKE2B 39ad6c87ee1a0e8741d8a813df8a605105cc924a9dcf5ca27a39729017b23d2d8edc4195f83e0ee54197bbabf1e0e2ad95337f1f2e2aa66eabc743765ac725b9 SHA512 17cad181dc27fa9a80068d9a28413fd7f80bd41307b0be23195a1f280d2c5a7c09c875f7a4b56ea63e3f2aafda9ece1fcb71ee1533757a59f8feb85f2199a305
-EBUILD trident-1.3.ebuild 998 BLAKE2B 8356f3bfcfc2e909b897738f4b40bf23e01eda8b8aa2aee5b8a62e8db2c6ff24ce849567e0a70260db1ca71a3a89e295ba7bf95884e1edc4c9bbdb3e790829ae SHA512 859285924da73f45e601a0cb9553e301f908718f79cce6ad104688fc8f9486f13324ea8cb8aaabe212184e0004671c01b9edede2ffcbc128787243159c804282
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/trident/files/1.3-build.xml.patch b/dev-java/trident/files/1.3-build.xml.patch
deleted file mode 100644
index c82c3a18df3f..000000000000
--- a/dev-java/trident/files/1.3-build.xml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 808ea3c..36e5859 100644
---- a/build.xml
-+++ b/build.xml
-@@ -84,7 +84,7 @@
- 
- 	<target name="compile.module.trident.production" description="compile module trident production classes">
- 		<mkdir dir="${trident.output.dir}" />
--		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true" executable="${module.jdk.home.trident}/bin/javac">
-+		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true">
- 			<compilerarg line="${javac.args.trident}" />
- 			<bootclasspath refid="trident.module.bootclasspath" />
- 			<classpath refid="trident.module.classpath" />
-@@ -102,7 +102,7 @@
- 
- 	<target name="compile.module.trident.test" description="compile module trident test classes">
- 		<mkdir dir="${trident.output.dir}" />
--		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true" executable="${module.jdk.home.trident}/bin/javac">
-+		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true">
- 			<compilerarg line="${javac.args.trident}" />
- 			<bootclasspath refid="trident.module.bootclasspath" />
- 			<classpath refid="trident.module.classpath" />
-@@ -189,4 +189,4 @@
- 	<target name="clean" depends="clean.module.trident" description="cleanup all" />
- 
- 	<target name="all" depends="timestamp, init, clean, compile.module.trident, jar, compile.module.trident.test, jar-tst" description="build all" />
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-java/trident/trident-1.3-r1.ebuild b/dev-java/trident/trident-1.3-r1.ebuild
deleted file mode 100644
index 36ac31b42c4f..000000000000
--- a/dev-java/trident/trident-1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java animation library"
-HOMEPAGE="https://kenai.com/projects/trident/pages/Home"
-SRC_URI="https://kenai.com/projects/trident/downloads/download/version%20${PV}%20-%20stable/${PN}-all.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RESTRICT="test"
-
-CDEPEND="dev-java/swt:4.10"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/1.3-build.xml.patch
-)
-
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
-EANT_GENTOO_CLASSPATH="swt-4.10"
-
-src_prepare() {
-	default
-	mkdir build/classes -p || die
-	rm -r src/org/pushingpixels/trident/android/ || die
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Djdk.home=$(java-config -O)"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar drop/${PN}.jar
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/trident/trident-1.3.ebuild b/dev-java/trident/trident-1.3.ebuild
deleted file mode 100644
index 4310cd5b1f56..000000000000
--- a/dev-java/trident/trident-1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java animation library"
-HOMEPAGE="https://kenai.com/projects/trident/pages/Home"
-SRC_URI="https://kenai.com/projects/trident/downloads/download/version%20${PV}%20-%20stable/${PN}-all.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT="test"
-
-CDEPEND="dev-java/swt:3.7"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
-EANT_GENTOO_CLASSPATH="swt-3.7"
-EANT_EXTRA_ARGS="-Djdk.home=${JAVA_HOME}"
-
-java_prepare() {
-	mkdir build/classes -p || die
-	rm -r src/org/pushingpixels/trident/android/ || die
-	epatch "${FILESDIR}"/${PV}-*.patch
-}
-
-src_install() {
-	java-pkg_dojar drop/${PN}.jar
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index d4e5aa8625a6..0aa50209fdb2 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-2.3.ebuild 5223 BLAKE2B 93e469120158e740469297e866e2d8e0459299ef1bb1d9edc4f0fdd5bedc3af5b7ee6bb42172bf77d933e6ef5eedfa830be382694a138c883317486b007895b5 SHA512 40ac95f678066733aaacb0d57efd3e5ad063035dc810d91f9463877a6ed0d524fc0afec11f94594360bdbab6ecaa98b8d2033fafa84c9152b947de7385e99b52
+EBUILD velocity-2.3.ebuild 5228 BLAKE2B a1bea9f621a20a0656ca15d0d3b1c9a99096573ab70e22a065600284780f803eb96ef4b0226e9d875df1a339921ea9206537222302539a99a0e80e2207a7cafc SHA512 32b0faef82404dc79b4a4d00018c12d0631c3e2c3ecfb63fbf12f8afe6dafb5d805296c59eacf60914dbe7301a617d6302f940f8852195e11d3d6d9d0e8333f5
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 4ad7f61976e9..8f22d0cafb1a 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index 69df21f28eb1..fbbb2cfbbedd 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,6 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
 EBUILD xml-commons-external-1.3.04-r1.ebuild 1136 BLAKE2B 11a888f3719764a06ea3c6ad0d7ac5732410e8b67c3e4a431386e9e969d30104a5f02131fe2005f091b26df2f3a996366be5c82519b867ee66143ce118f3a015 SHA512 32e690d333a743c4ba1ea36763edb0510f8d8e9a43ba0272164e42df3a35d11e495d357ff7955bcc0dbe670957aa9224f21fda4fe6f084a2d37f082f9ea7d73a
-EBUILD xml-commons-external-1.4.01-r1.ebuild 741 BLAKE2B eaa58ef734007ff018e74195868fc75f95b96d0c9b8760cb8af5b04136758f2f45cd56e86401bcc0cba844e00f96bfe0f1c26251b1b931d6729fce4736707ca0 SHA512 fd6c527195c0e2406ed69c983f999f2814609985badbec8b2bd474005bce7e65a4afc654276df9cbb0e007a8c073d585a8cd7093e4a8053b8d65d5e9a342a415
-EBUILD xml-commons-external-1.4.01-r2.ebuild 745 BLAKE2B b12a002d78265159011576376c0ae8a2ead7c10c12d18695b08097ff7ad5aad4462f5fb058710ee1d6216640d99e5be8e9cc1b4f2f6313d4d75e04ab88752edc SHA512 0b4a591c2a37ee3a7c292bbed0e81ca9e790ca6709ae67e9c485c538d66a3a85a4dcfcc0ecc3560c55a0e81ed88f6bb14e02cfff8781fa5829b0fe6c412f56cc
+EBUILD xml-commons-external-1.4.01-r2.ebuild 741 BLAKE2B 31917e3062b14189e5024a98a104fe447d8f431b2427e65cefee60b2a41d5d1e3582886048ad1f3792e3b599ca810189463389eb39f58d5fc27843fc9b54fdb6 SHA512 9a5121fefe8d3850b7086a3bdd714c38e2ce9e14425103fab8e91ab8d15b7754bbf11a0a698d461be7e90ba01b007be56783f2de3dd4f678c4e5408bf5cac5d4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
deleted file mode 100644
index 6be447012ce9..000000000000
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="xml-apis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
-HOMEPAGE="https://xerces.apache.org/xml-commons/components/external/"
-SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.4"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
index 940862af2f32..76a70dc51431 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.
 
 LICENSE="Apache-2.0"
 SLOT="1.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"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 90d830adefbb..99df7a1a372f 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,4 +1,3 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
-EBUILD xml-commons-resolver-1.2-r1.ebuild 836 BLAKE2B 83d0bbd597087abd3df5639033fdfdaea6b532de20cafa92e34c235af846d82f534b9885addd4f99622fc5a296987973dc0c5dfb463d4ec7396d42a8ee385f7f SHA512 02e04857be619112b24ac90609c41e7e69b938c554a270492d5f1a959976a0499365c3b726038b17e27293db07a013d78a24e0e0e0bfa839aabb840e2cf58cd9
-EBUILD xml-commons-resolver-1.2-r2.ebuild 842 BLAKE2B 1544470d5d18fb72aad32d86bb59ff1e7b0d42889fd107f8a81f6cb6866456f93b8e68924f34147b44b793c1dd674de4bf66aeb3aedfdbb2118ba4d1554ab464 SHA512 fc53eb690d4aaabc2845d0bfdcc1e242de8ea4a37ffa166f6e5d4de6ddea472b735063694a3d8bdbbca80bee6045c621f122e4b54e6cf363599b8c2415f9e5a3
+EBUILD xml-commons-resolver-1.2-r2.ebuild 838 BLAKE2B 80c9b8e63c333b12e016db4c0259de39d04acc722a3773ec66189b5aaea5609afd4ddce367c3248d93111ff864795d536975070ca5a0752eb7ff8d1004f4e01b SHA512 ee1f023f3d694f541f0028aca315d3d9bc1a75afc2e24581021676490d2c320a971244a818f3950b888c8e005928dcd6ff77d15f78a446cb7f9cb8a967125dd5
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
deleted file mode 100644
index fffd980059af..000000000000
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
+++ /dev/null
@@ -1,37 +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="xml-resolver:xml-resolver:1.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML Entity and URI Resolver"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-DOCS=( KEYS LICENSE.resolver.txt NOTICE-resolver.txt )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	rm -rv src/org/apache/xml/resolver/tests || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
index 33c5c8d83ee5..65f5894d45ab 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
new file mode 100644
index 000000000000..c79ab4a005f2
--- /dev/null
+++ b/dev-java/xmpbox/Manifest
@@ -0,0 +1,3 @@
+DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
+EBUILD xmpbox-2.0.24.ebuild 1792 BLAKE2B 9aa92b786eb98701ff25409b483af27502521935b281666008d237c30bb7c6162e5ef951fdba1aa5aeb443e7ef18efcd8d2522263f8601822dd7283b8eab551f SHA512 004dca1c9f97d1f70a961aa42c949f8f4a3dece4edaf7bf613e72283a55eac3ab73a5f42ef98861fbc3cb02655cddb08b5a56d694aacf83607c2f98e19e82395
+MISC metadata.xml 519 BLAKE2B 49b3df59011f9aeb072d3e42abbc7955b3b49198c2be44684d629d47d69a9c48cee8e2b6e48e3983c9d1c06cd9070149b3472716fde75ff3ec110f3d35237b68 SHA512 45f490395e7eb8e0f4bcaf452ec1ac2839232c3f4028e7c3d98d0ae292112ec3290f4d59270343df5ef6f9cc5cc4138a4ec9488656dd19de9501eb226b400566
diff --git a/dev-java/xmpbox/metadata.xml b/dev-java/xmpbox/metadata.xml
new file mode 100644
index 000000000000..838ea475ab48
--- /dev/null
+++ b/dev-java/xmpbox/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The Apache XmpBox library is an open source Java tool that implements Adobe's XMP(TM) specification. It can be used to parse, validate and create xmp contents. It is mainly used by subproject preflight of Apache PDFBox. XmpBox is a subproject of Apache PDFBox.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
new file mode 100644
index 000000000000..c96dec5d9b60
--- /dev/null
+++ b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/cc/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.24.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.24"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification."
+HOMEPAGE="https://pdfbox.apache.org"
+SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="dev-java/jaxb-api:2"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.xml.bind:jaxb-api:2.3.1 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( README.txt )
+
+S="${WORKDIR}/pdfbox-${PV}/${PN}"
+
+JAVA_CLASSPATH_EXTRA="jaxb-api-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# 1) initializationError(org.apache.xmpbox.parser.PropMappingTest)
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class 'org.apache.xmpbox.parser.PropMappingTest':
+	#   1. No runnable methods
+	org.apache.xmpbox.parser.PropMappingTest
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /dev-java
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)